Add 2 pre-setable markers for the graph

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 1b4fd2384a0630cda9cacd66a68d0c1bc9379946..cce390890d98caf5174a8e3d4bbb07e215b627ea 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -176,8 +176,8 @@ void printEM410x(uint32_t hi, uint64_t id)
                } else{
                        //output 40 bit em id
                        PrintAndLog("\nEM TAG ID      : %010" PRIX64, id);
-                       PrintAndLog("Unique TAG ID  : %010" PRIX64,  id2lo);
                        PrintAndLog("\nPossible de-scramble patterns");
+                       PrintAndLog("Unique TAG ID  : %010" PRIX64,  id2lo);
                        PrintAndLog("HoneyWell IdentKey {");
                        PrintAndLog("DEZ 8          : %08" PRIu64,id & 0xFFFFFF);
                        PrintAndLog("DEZ 10         : %010" PRIu64,id & 0xFFFFFFFF);
@@ -1907,6 +1907,12 @@ int CmdGrid(const char *Cmd)
        return 0;
 }
 
+int CmdSetGraphMarkers(const char *Cmd) {
+       sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos);
+       RepaintGraphWindow();
+       return 0;
+}
+
 int CmdHexsamples(const char *Cmd)
 {
        int i, j;
@@ -2419,6 +2425,7 @@ static command_t CommandTable[] =
        {"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
        {"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
        {"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
+       {"setgraphmarkers", CmdSetGraphMarkers, 1, "[orange_marker] [blue_marker] (in graph window)"},
        {"scale",           CmdScale,           1, "<int> -- Set cursor display scale"},
        {"setdebugmode",    CmdSetDebugMode,    1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
        {"shiftgraphzero",  CmdGraphShiftZero,  1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},