]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - winsrc/command.cpp
Added a new function to read ISO14443-B ST Microelectronics SRI512 memory tags.
[proxmark3-svn] / winsrc / command.cpp
index f947f45cfd1a470967e9ba5c35255ce0b1db85a9..9c4990a32349e2602c8908bc654018e8eed34b64 100644 (file)
@@ -75,6 +75,19 @@ static void CmdHi14read(char *str)
        c.ext1 = atoi(str);\r
        SendCommand(&c, FALSE);\r
 }\r
+
+
+/* New command to read the contents of a SRI512 tag
+ * SRI512 tags are ISO14443-B modulated memory tags,
+ * this command just dumps the contents of the memory/
+ */
+static void CmdSri512read(char *str)
+{
+       UsbCommand c;\r
+       c.cmd = CMD_READ_SRI512_TAG;\r
+       c.ext1 = atoi(str);\r
+       SendCommand(&c, FALSE);
+}
 \r
 // ## New command\r
 static void CmdHi14areader(char *str)\r
@@ -1845,69 +1858,69 @@ static void CmdSweepLF(char *str)
 }\r
 
 
-\r
 typedef void HandlerFunction(char *cmdline);\r
 \r
 static struct {\r
-       char                    *name;\r
-       HandlerFunction         *handler;\r
-       char                    *docString;\r
+       char            *name;\r
+       HandlerFunction *handler;\r
+       int             offline;  // 1 if the command can be used when in offline mode\r
+       char            *docString;
 } CommandTable[] = {\r
-       "tune",                         CmdTune,                        "measure antenna tuning",\r
-       "tiread",                       CmdTiread,                      "read a TI-type 134 kHz tag",\r
-       "tibits",                       CmdTibits,                      "get raw bits for TI-type LF tag",\r
-       "tidemod",                      CmdTidemod,                     "demod raw bits for TI-type LF tag",\r
-       "vchdemod",                     CmdVchdemod,            "demod samples for VeriChip",\r
-       "plot",                         CmdPlot,                        "show graph window",\r
-       "hide",                         CmdHide,                        "hide graph window",\r
-       "losim",                        CmdLosim,                       "simulate LF tag",\r
-       "loread",                       CmdLoread,                      "read (125/134 kHz) LF ID-only tag",\r
-       "losamples",            CmdLosamples,           "get raw samples for LF tag",\r
-       "hisamples",            CmdHisamples,           "get raw samples for HF tag",\r
-       "hisampless",           CmdHisampless,          "get signed raw samples, HF tag",\r
-       "hisamplest",           CmdHi14readt,           "get samples HF, for testing",\r
-       "higet",                        CmdHi14read_sim,        "get samples HF, 'analog'",\r
-       "bitsamples",           CmdBitsamples,          "get raw samples as bitstring",\r
-       "hexsamples",           CmdHexsamples,          "dump big buffer as hex bytes",\r
-       "hi15read",                     CmdHi15read,            "read HF tag (ISO 15693)",\r
-       "hi15reader",                   CmdHi15reader,          "act like an ISO15693 reader", // new command greg\r
-       "hi15sim",                      CmdHi15tag,             "fake an ISO15693 tag", // new command greg\r
-       "hi14read",                     CmdHi14read,            "read HF tag (ISO 14443)",\r
-       "hi14areader",          CmdHi14areader,         "act like an ISO14443 Type A reader",   // ## New reader command\r
-       "hi15demod",            CmdHi15demod,           "demod ISO15693 from tag",\r
-       "hi14bdemod",           CmdHi14bdemod,          "demod ISO14443 Type B from tag",\r
-       "autocorr",                     CmdAutoCorr,            "autocorrelation over window",\r
-       "norm",                         CmdNorm,                        "normalize max/min to +/-500",\r
-       "dec",                          CmdDec,                         "decimate",\r
-       "hpf",                          CmdHpf,                         "remove DC offset from trace",\r
-       "zerocrossings",        CmdZerocrossings,       "count time between zero-crossings",\r
-       "ltrim",                        CmdLtrim,                       "trim from left of trace",\r
-       "scale",                        CmdScale,                       "set cursor display scale",\r
-       "flexdemod",            CmdFlexdemod,           "demod samples for FlexPass",\r
-       "indalademod",          CmdIndalademod,         "demod samples for Indala",\r
-       "save",                         CmdSave,                        "save trace (from graph window)",\r
-       "load",                         CmdLoad,                        "load trace (to graph window",\r
-       "hisimlisten",          CmdHisimlisten,         "get HF samples as fake tag",\r
-       "hi14sim",                      CmdHi14sim,                     "fake ISO 14443 tag",\r
-       "hi14asim",                     CmdHi14asim,            "fake ISO 14443a tag",                                  // ## Simulate 14443a tag\r
-       "hi14snoop",            CmdHi14snoop,           "eavesdrop ISO 14443",\r
-       "hi14asnoop",           CmdHi14asnoop,          "eavesdrop ISO 14443 Type A",                   // ## New snoop command\r
-       "hi14list",                     CmdHi14list,            "list ISO 14443 history",\r
-       "hi14alist",            CmdHi14alist,           "list ISO 14443a history",                              // ## New list command\r
-       "hiddemod",                     CmdHiddemod,            "HID Prox Card II (not optimal)",\r
-       "hidfskdemod",          CmdHIDdemodFSK,         "HID FSK demodulator",\r
-       "askdemod",             Cmdaskdemod,            "Attempt to demodulate simple ASK tags",
-       "hidsimtag",            CmdHIDsimTAG,           "HID tag simulator",
-       "mandemod",             Cmdmanchesterdemod,     "Try a Manchester demodulation on a binary stream",
-       "fpgaoff",                      CmdFPGAOff,                     "set FPGA off",                                                 // ## FPGA Control\r
-       "lcdreset",                     CmdLcdReset,            "Hardware reset LCD",\r
-       "lcd",                          CmdLcd,                         "Send command/data to LCD",\r
-       "test",                         CmdTest,                        "Placeholder command for testing new code",\r
-       "setlfdivisor",         CmdSetDivisor,          "Drive LF antenna at 12Mhz/(divisor+1)",\r
-       "sweeplf",                      CmdSweepLF,                     "Sweep through LF freq range and store results in buffer",\r
-       "quit",                         CmdQuit,                        "quit program"\r
+       "tune",                 CmdTune,0,              "measure antenna tuning",\r
+       "tiread",               CmdTiread,0,            "read a TI-type 134 kHz tag",\r
+       "tibits",               CmdTibits,0,            "get raw bits for TI-type LF tag",\r
+       "tidemod",              CmdTidemod,0,           "demod raw bits for TI-type LF tag",\r
+       "vchdemod",             CmdVchdemod,0,          "demod samples for VeriChip",\r
+       "plot",                 CmdPlot,1,              "show graph window",\r
+       "hide",                 CmdHide,1,              "hide graph window",\r
+       "losim",                CmdLosim,0,             "simulate LF tag",\r
+       "loread",               CmdLoread,0,            "read (125/134 kHz) LF ID-only tag",\r
+       "losamples",            CmdLosamples,0,         "get raw samples for LF tag",\r
+       "hisamples",            CmdHisamples,0,         "get raw samples for HF tag",\r
+       "hisampless",           CmdHisampless,0,        "get signed raw samples, HF tag",\r
+       "hisamplest",           CmdHi14readt,0,         "get samples HF, for testing",\r
+       "higet",                CmdHi14read_sim,0,      "get samples HF, 'analog'",\r
+       "bitsamples",           CmdBitsamples,0,        "get raw samples as bitstring",\r
+       "hexsamples",           CmdHexsamples,0,        "dump big buffer as hex bytes",\r
+       "hi15read",             CmdHi15read,0,          "read HF tag (ISO 15693)",\r
+       "hi15reader",           CmdHi15reader,0,        "act like an ISO15693 reader", // new command greg\r
+       "hi15sim",              CmdHi15tag,0,           "fake an ISO15693 tag", // new command greg\r
+       "hi14read",             CmdHi14read,0,          "read HF tag (ISO 14443)",\r
+       "sri512read",           CmdSri512read,0,        "Read contents of a SRI512 tag",\r
+       "hi14areader",          CmdHi14areader,0,       "act like an ISO14443 Type A reader",   // ## New reader command\r
+       "hi15demod",            CmdHi15demod,1,         "demod ISO15693 from tag",\r
+       "hi14bdemod",           CmdHi14bdemod,1,        "demod ISO14443 Type B from tag",\r
+       "autocorr",             CmdAutoCorr,1,          "autocorrelation over window",\r
+       "norm",                 CmdNorm,1,              "normalize max/min to +/-500",\r
+       "dec",                  CmdDec,1,               "decimate",\r
+       "hpf",                  CmdHpf,1,               "remove DC offset from trace",\r
+       "zerocrossings",        CmdZerocrossings,1,     "count time between zero-crossings",\r
+       "ltrim",                CmdLtrim,1,             "trim from left of trace",\r
+       "scale",                CmdScale,1,             "set cursor display scale",\r
+       "flexdemod",            CmdFlexdemod,1,         "demod samples for FlexPass",\r
+       "save",                 CmdSave,1,              "save trace (from graph window)",\r
+       "load",                 CmdLoad,1,              "load trace (to graph window",\r
+       "hisimlisten",          CmdHisimlisten,0,       "get HF samples as fake tag",\r
+       "hi14sim",              CmdHi14sim,0,           "fake ISO 14443 tag",\r
+       "hi14asim",             CmdHi14asim,0,          "fake ISO 14443a tag",                                  // ## Simulate 14443a tag\r
+       "hi14snoop",            CmdHi14snoop,0,         "eavesdrop ISO 14443",\r
+       "hi14asnoop",           CmdHi14asnoop,0,        "eavesdrop ISO 14443 Type A",                   // ## New snoop command\r
+       "hi14list",             CmdHi14list,0,          "list ISO 14443 history",\r
+       "hi14alist",            CmdHi14alist,0,         "list ISO 14443a history",                              // ## New list command\r
+       "hiddemod",             CmdHiddemod,1,          "HID Prox Card II (not optimal)",\r
+       "hidfskdemod",          CmdHIDdemodFSK,0,       "HID FSK demodulator",\r
+       "askdemod",             Cmdaskdemod,1,          "Attempt to demodulate simple ASK tags",\r
+       "hidsimtag",            CmdHIDsimTAG,0,         "HID tag simulator",\r
+       "mandemod",             Cmdmanchesterdemod,1,   "Try a Manchester demodulation on a binary stream",\r
+       "fpgaoff",              CmdFPGAOff,0,           "set FPGA off",                                                 // ## FPGA Control\r
+       "lcdreset",             CmdLcdReset,0,          "Hardware reset LCD",\r
+       "lcd",                  CmdLcd,0,               "Send command/data to LCD",\r
+       "setlfdivisor",         CmdSetDivisor,0,        "Drive LF antenna at 12Mhz/(divisor+1)",\r
+       "sweeplf",              CmdSweepLF,0,           "Sweep through LF freq range and store results in buffer",\r
+       "quit",                 CmdQuit,0,              "quit program"\r
 };\r
 \r
+\r
 //-----------------------------------------------------------------------------\r
 // Entry point into our code: called whenever the user types a command and\r
 // then presses Enter, which the full command line that they typed.\r
Impressum, Datenschutz