Added the new SRIX4K reading routine, thanks to jonor. Regression tested against...

[proxmark3-svn] / winsrc / command.cpp

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index b22586401c9ec6082f5d0a6a017be1066654d4dc..456830749c6e29ced7f6f9899bfc9dc034556961 100644 (file)
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -107,6 +107,20 @@ static void CmdSri512read(char *str)
        c.ext1 = atoi(str);\r
        SendCommand(&c, FALSE);\r
 }\r
+
+/* New command to read the contents of a SRIX4K tag
+ * SRIX4K tags are ISO14443-B modulated memory tags,
+ * this command just dumps the contents of the memory/
+ */
+static void CmdSrix4kread(char *str)
+{
+        UsbCommand c;
+        c.cmd = CMD_READ_SRIX4K_TAG;
+        c.ext1 = atoi(str);
+        SendCommand(&c, FALSE);
+}
+
+
 \r
 // ## New command\r
 static void CmdHi14areader(char *str)\r
@@ -214,6 +228,13 @@ static void CmdLegicRfSim(char *str)
        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
@@ -2841,13 +2862,13 @@ static void CmdSetMux(char *str)
 {\r
        UsbCommand c;\r
        c.cmd = CMD_SET_ADC_MUX;\r
-       if(strncasecmp(str, "lopkd", 5) == 0) {\r
+       if(strcmp(str, "lopkd") == 0) {\r
                c.ext1 = 0;\r
-       } else if(strncasecmp(str, "loraw", 5) == 0) {\r
+       } else if(strcmp(str, "loraw") == 0) {\r
                c.ext1 = 1;\r
-       } else if(strncasecmp(str, "hipkd", 5) == 0) {\r
+       } else if(strcmp(str, "hipkd") == 0) {\r
                c.ext1 = 2;\r
-       } else if(strncasecmp(str, "hiraw", 5) == 0) {\r
+       } else if(strcmp(str, "hiraw") == 0) {\r
                c.ext1 = 3;\r
        }\r
        SendCommand(&c, FALSE);\r
@@ -2908,6 +2929,7 @@ static struct {
        {"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
@@ -2927,6 +2949,7 @@ static struct {
        {"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
+       {"srix4kread",          CmdSrix4kread,                  0, "<int> -- Read contents of a SRIX4K tag"},
        {"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