Fix define typo

[proxmark3-svn] / winsrc / command.cpp

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index 3a858ddc7090800c9095210dd4a0a5d4210f3987..5892a8e551b50b91c089448d5aa83c8385400d1e 100644 (file)
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -207,6 +207,20 @@ static void CmdHi14asnoop(char *str)
        SendCommand(&c, FALSE);\r
 }\r
 \r
        SendCommand(&c, FALSE);\r
 }\r
 \r

+static void CmdLegicRfSim(char *str)\r
+{\r
+       UsbCommand c;\r
+       c.cmd = CMD_SIMULATE_TAG_LEGIC_RF;\r
+       SendCommand(&c, FALSE);\r
+}\r
+\r
+static void CmdLegicRfRead(char *str)\r
+{\r
+       UsbCommand c;\r
+       c.cmd = CMD_READER_LEGIC_RF;\r
+       SendCommand(&c, FALSE);\r
+}\r
+\r

 static void CmdFPGAOff(char *str)              // ## FPGA Control\r
 {\r
        UsbCommand c;\r
 static void CmdFPGAOff(char *str)              // ## FPGA Control\r
 {\r
        UsbCommand c;\r


@@ -663,6 +677,15 @@ static void CmdLosim(char *str)
        SendCommand(&c, FALSE);\r
 }\r
 \r
        SendCommand(&c, FALSE);\r
 }\r
 \r

+static void CmdLosimBidir(char *str)\r
+{\r
+       UsbCommand c;\r
+       c.cmd = CMD_LF_SIMULATE_BIDIR;\r
+       c.ext1 = 47; /* Set ADC to twice the carrier for a slight supersampling */\r
+       c.ext2 = 384;\r
+       SendCommand(&c, FALSE);\r
+}\r
+\r

 static void CmdLoread(char *str)\r
 {\r
        UsbCommand c;\r
 static void CmdLoread(char *str)\r
 {\r
        UsbCommand c;\r


@@ -1799,6 +1822,40 @@ static void CmdNorm(char *str)
        RepaintGraphWindow();\r
 }\r
 \r
        RepaintGraphWindow();\r
 }\r
 \r

+static void CmdAmp(char *str)\r
+{\r
+       int i, rising, falling;\r
+       int max = INT_MIN, min = INT_MAX;\r
+       for(i = 10; i < GraphTraceLen; i++) {\r
+               if(GraphBuffer[i] > max) {\r
+                       max = GraphBuffer[i];\r
+               }\r
+               if(GraphBuffer[i] < min) {\r
+                       min = GraphBuffer[i];\r
+               }\r
+       }\r
+       if(max != min) {\r
+               rising= falling= 0;\r
+               for(i = 0; i < GraphTraceLen; i++) {\r
+                       if(GraphBuffer[i+1] < GraphBuffer[i]) {\r
+                               if(rising) {\r
+                                       GraphBuffer[i]= max;\r
+                                       rising= 0;\r
+                                       }\r
+                               falling= 1;\r
+                               }\r
+                       if(GraphBuffer[i+1] > GraphBuffer[i]) {\r
+                               if(falling) {\r
+                                       GraphBuffer[i]= min;\r
+                                       falling= 0;\r
+                                       }\r
+                               rising= 1;\r
+                               }\r
+               }\r
+       }\r
+       RepaintGraphWindow();\r
+}\r
+\r

 static void CmdDec(char *str)\r
 {\r
        int i;\r
 static void CmdDec(char *str)\r
 {\r
        int i;\r


@@ -2229,9 +2286,11 @@ static void Cmdaskdemod(char *str) {
        int c, high = 0, low = 0;\r
 \r
        // TODO: complain if we do not give 2 arguments here !\r
        int c, high = 0, low = 0;\r
 \r
        // TODO: complain if we do not give 2 arguments here !\r

+       // (AL - this doesn't make sense! we're only using one argument!!!)\r

        sscanf(str, "%i", &c);\r
 \r
        /* Detect high and lows and clock */\r
        sscanf(str, "%i", &c);\r
 \r
        /* Detect high and lows and clock */\r

+       // (AL - clock???)\r

        for (i = 0; i < GraphTraceLen; i++)\r
        {\r
                if (GraphBuffer[i] > high)\r
        for (i = 0; i < GraphTraceLen; i++)\r
        {\r
                if (GraphBuffer[i] > high)\r


@@ -2239,6 +2298,10 @@ static void Cmdaskdemod(char *str) {
                else if (GraphBuffer[i] < low)\r
                        low = GraphBuffer[i];\r
        }\r
                else if (GraphBuffer[i] < low)\r
                        low = GraphBuffer[i];\r
        }\r

+       if(c != 0 && c != 1) {\r
+               PrintToScrollback("Invalid argument: %s",str);\r
+               return;\r
+               }\r

 \r
        if (GraphBuffer[0] > 0) {\r
                GraphBuffer[0] = 1-c;\r
 \r
        if (GraphBuffer[0] > 0) {\r
                GraphBuffer[0] = 1-c;\r


@@ -2483,7 +2546,12 @@ static void Cmdmanchesterdemod(char *str) {
 \r
        /* Detect first transition */\r
        /* Lo-Hi (arbitrary)       */\r
 \r
        /* Detect first transition */\r
        /* Lo-Hi (arbitrary)       */\r

-       for (i = 0; i < GraphTraceLen; i++)\r
+       /* skip to the first high */\r
+       for (i= 0; i < GraphTraceLen; i++)\r
+               if(GraphBuffer[i] == high)\r
+                       break;\r
+       /* now look for the first low */\r
+       for (; i < GraphTraceLen; i++)\r

        {\r
                if (GraphBuffer[i] == low)\r
                {\r
        {\r
                if (GraphBuffer[i] == low)\r
                {\r


@@ -2776,6 +2844,22 @@ static void CmdSetDivisor(char *str)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

+static void CmdSetMux(char *str)\r
+{\r
+       UsbCommand c;\r
+       c.cmd = CMD_SET_ADC_MUX;\r
+       if(strcmp(str, "lopkd") == 0) {\r
+               c.ext1 = 0;\r
+       } else if(strcmp(str, "loraw") == 0) {\r
+               c.ext1 = 1;\r
+       } else if(strcmp(str, "hipkd") == 0) {\r
+               c.ext1 = 2;\r
+       } else if(strcmp(str, "hiraw") == 0) {\r
+               c.ext1 = 3;\r
+       }\r
+       SendCommand(&c, FALSE);\r
+}\r
+\r

 typedef void HandlerFunction(char *cmdline);\r
 \r
 /* in alphabetic order */\r
 typedef void HandlerFunction(char *cmdline);\r
 \r
 /* in alphabetic order */\r


@@ -2785,7 +2869,8 @@ static struct {
        int             offline;  // 1 if the command can be used when in offline mode\r
        char            *docString;\r
 } CommandTable[] = {\r
        int             offline;  // 1 if the command can be used when in offline mode\r
        char            *docString;\r
 } CommandTable[] = {\r

-       {"askdemod",                    Cmdaskdemod,                            1, "<samples per bit> <0|1> -- Attempt to demodulate simple ASK tags"},\r
+       {"amp",                                 CmdAmp,                                         1, "Amplify peaks"},\r
+       {"askdemod",                    Cmdaskdemod,                            1, "<0|1> -- Attempt to demodulate simple ASK tags"},\r

        {"autocorr",                    CmdAutoCorr,                            1, "<window length> -- Autocorrelation over window"},\r
        {"bitsamples",          CmdBitsamples,                  0, "Get raw samples as bitstring"},\r
        {"bitstream",                   Cmdbitstream,                           1, "[clock rate] -- Convert waveform into a bitstream"},\r
        {"autocorr",                    CmdAutoCorr,                            1, "<window length> -- Autocorrelation over window"},\r
        {"bitsamples",          CmdBitsamples,                  0, "Get raw samples as bitstring"},\r
        {"bitstream",                   Cmdbitstream,                           1, "[clock rate] -- Convert waveform into a bitstream"},\r


@@ -2829,11 +2914,14 @@ static struct {
        {"indalademod",         CmdIndalademod,                 0, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},\r
        {"lcd",                                         CmdLcd,                                                 0, "<HEX command> <count> -- Send command/data to LCD"},\r
        {"lcdreset",                    CmdLcdReset,                            0, "Hardware reset LCD"},\r
        {"indalademod",         CmdIndalademod,                 0, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},\r
        {"lcd",                                         CmdLcd,                                                 0, "<HEX command> <count> -- Send command/data to LCD"},\r
        {"lcdreset",                    CmdLcdReset,                            0, "Hardware reset LCD"},\r

+       {"legicrfsim",                  CmdLegicRfSim,                                                  0, "Start the LEGIC RF tag simulator"},\r
+       {"legicrfread",                 CmdLegicRfRead,                                                 0, "Start the LEGIC RF reader"},\r

        {"load",                                        CmdLoad,                                                1, "<filename> -- Load trace (to graph window"},\r
        {"locomread",                   CmdLoCommandRead,               0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},\r
        {"loread",                              CmdLoread,                                      0, "['h'] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134)"},\r
        {"losamples",                   CmdLosamples,                           0, "[128 - 16000] -- Get raw samples for LF tag"},\r
        {"losim",                                       CmdLosim,                                               0, "Simulate LF tag"},\r
        {"load",                                        CmdLoad,                                                1, "<filename> -- Load trace (to graph window"},\r
        {"locomread",                   CmdLoCommandRead,               0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},\r
        {"loread",                              CmdLoread,                                      0, "['h'] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134)"},\r
        {"losamples",                   CmdLosamples,                           0, "[128 - 16000] -- Get raw samples for LF tag"},\r
        {"losim",                                       CmdLosim,                                               0, "Simulate LF tag"},\r

+       {"losimbidir",                                  CmdLosimBidir,                                          0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},\r

        {"ltrim",                                       CmdLtrim,                                               1, "<samples> -- Trim samples from left of trace"},\r
        {"mandemod",                    Cmdmanchesterdemod,     1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},\r
        {"manmod",                              Cmdmanchestermod,               1, "[clock rate] -- Manchester modulate a binary stream"},\r
        {"ltrim",                                       CmdLtrim,                                               1, "<samples> -- Trim samples from left of trace"},\r
        {"mandemod",                    Cmdmanchesterdemod,     1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},\r
        {"manmod",                              Cmdmanchestermod,               1, "[clock rate] -- Manchester modulate a binary stream"},\r


@@ -2845,14 +2933,15 @@ static struct {
        {"save",                                        CmdSave,                                                1, "<filename> -- Save trace (from graph window)"},\r
        {"scale",                                       CmdScale,                                               1, "<int> -- Set cursor display scale"},\r
        {"setlfdivisor",        CmdSetDivisor,                  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},\r
        {"save",                                        CmdSave,                                                1, "<filename> -- Save trace (from graph window)"},\r
        {"scale",                                       CmdScale,                                               1, "<int> -- Set cursor display scale"},\r
        {"setlfdivisor",        CmdSetDivisor,                  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},\r

+       {"setmux",              CmdSetMux,                      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},\r

        {"sri512read",          CmdSri512read,                  0, "<int> -- Read contents of a SRI512 tag"},\r
        {"tidemod",                             CmdTIDemod,                                     1, "Demodulate raw bits for TI-type LF tag"},\r
        {"tiread",                              CmdTIRead,                                      0, "Read and decode a TI 134 kHz tag"},\r
        {"tiwrite",                             CmdTIWrite,                                     0, "Write new data to a r/w TI 134 kHz tag"},\r
        {"threshold",                   CmdThreshold,                           1, "Maximize/minimize every value in the graph window depending on threshold"},\r
        {"tune",                                        CmdTune,                                                0, "Measure antenna tuning"},\r
        {"sri512read",          CmdSri512read,                  0, "<int> -- Read contents of a SRI512 tag"},\r
        {"tidemod",                             CmdTIDemod,                                     1, "Demodulate raw bits for TI-type LF tag"},\r
        {"tiread",                              CmdTIRead,                                      0, "Read and decode a TI 134 kHz tag"},\r
        {"tiwrite",                             CmdTIWrite,                                     0, "Write new data to a r/w TI 134 kHz tag"},\r
        {"threshold",                   CmdThreshold,                           1, "Maximize/minimize every value in the graph window depending on threshold"},\r
        {"tune",                                        CmdTune,                                                0, "Measure antenna tuning"},\r

-       {"version",                     CmdVersion,                             0, "Show version inforation about the connected Proxmark"},\r

        {"vchdemod",                    CmdVchdemod,                            0, "['clone'] -- Demodulate samples for VeriChip"},\r
        {"vchdemod",                    CmdVchdemod,                            0, "['clone'] -- Demodulate samples for VeriChip"},\r

+       {"version",                     CmdVersion,                             0, "Show version inforation about the connected Proxmark"},\r

        {"zerocrossings",       CmdZerocrossings,               1, "Count time between zero-crossings"},\r
 };\r
 \r
        {"zerocrossings",       CmdZerocrossings,               1, "Count time between zero-crossings"},\r
 };\r
 \r