updated help

diff --git a/linux/Makefile b/linux/Makefile
index 36c31cbe29692adfdbbb8a15d361d01c37fd6b20..8198b05384bee62d0822a2ed4f434a1165b7a5ab 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -18,6 +18,8 @@ all: proxmark3 snooper cli flasher
 proxmark3: LDFLAGS+=$(QTLDFLAGS)
 proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
 
 proxmark3: LDFLAGS+=$(QTLDFLAGS)
 proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
 

+command.o: ../winsrc/command.cpp translate.h
+

 snooper: snooper.o gui.o command.o usb.o guidummy.o
 
 cli: cli.o gui.o command.o usb.o guidummy.o
 snooper: snooper.o gui.o command.o usb.o guidummy.o
 
 cli: cli.o gui.o command.o usb.o guidummy.o

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index 1c434ebbd7d2ba317d6344e6b222285b47739e8b..02abdd4f690ac2990b72f7d26114d3c7f2cd21c4 100644 (file)
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -2376,72 +2376,74 @@ static void CmdSweepLF(char *str)
 \r
 typedef void HandlerFunction(char *cmdline);\r
 \r
 \r
 typedef void HandlerFunction(char *cmdline);\r
 \r

+/* in alphabetic order */\r

 static struct {\r
        char            *name;\r
        HandlerFunction *handler;\r
        int             offline;  // 1 if the command can be used when in offline mode\r
        char            *docString;\r
 } CommandTable[] = {\r
 static struct {\r
        char            *name;\r
        HandlerFunction *handler;\r
        int             offline;  // 1 if the command can be used when in offline mode\r
        char            *docString;\r
 } CommandTable[] = {\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
-       "em410xsim",            CmdEM410xsim,1,         "simulate EM410x tag",\r
-       "em410xread",           CmdEM410xread,1,        "extract ID from EM410x tag",\r
-       "em410xwatch",          CmdEM410xwatch,0,       "watches for EM410x tags",\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
-    "indalademod",             CmdIndalademod,0,         "demod samples for Indala",\r
-       "askdemod",                     Cmdaskdemod,1,          "Attempt to demodulate simple ASK tags",\r
-       "bitstream",            Cmdbitstream,1,         "Convert waveform into a bitstream",\r
-       "hidsimtag",            CmdHIDsimTAG,0,         "HID tag simulator",\r
-       "mandemod",                     Cmdmanchesterdemod,1,   "Try a Manchester demodulation on a binary stream",\r
-       "manmod",                       Cmdmanchestermod,1,     "Manchester modulate a binary stream",\r
-       "detectclock",          Cmddetectclockrate,1, "Detect clock rate",\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
-       "reset",                        CmdReset,0,                     "Reset the Proxmark3",\r
-       "quit",                         CmdQuit,1,                      "quit program"\r
+       "askdemod",                     Cmdaskdemod,1,          "<samples per bit> <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
+       "dec",                          CmdDec,1,               "    Decimate samples",\r
+       "detectclock",          Cmddetectclockrate,1, "    Detect clock rate",\r
+       "em410xsim",            CmdEM410xsim,1,         "<UID> -- Simulate EM410x tag",\r
+       "em410xread",           CmdEM410xread,1,        "[clock rate] -- Extract ID from EM410x tag",\r
+       "em410xwatch",          CmdEM410xwatch,0,       "    Watches for EM410x tags",\r
+       "exit",                         CmdQuit,1,                      "    Exit program",\r
+       "flexdemod",            CmdFlexdemod,1,         "    Demodulate samples for FlexPass",\r
+       "fpgaoff",                      CmdFPGAOff,0,           "    Set FPGA off",                                                     // ## FPGA Control\r
+       "hexsamples",           CmdHexsamples,0,        "<blocks> -- Dump big buffer as hex bytes",\r
+       "hi14alist",            CmdHi14alist,0,         "    List ISO 14443a history",                          // ## New list command\r
+       "hi14areader",          CmdHi14areader,0,       "    Act like an ISO14443 Type A reader",       // ## New reader command\r
+       "hi14asim",                     CmdHi14asim,0,          "<UID> -- Fake ISO 14443a tag",                                 // ## Simulate 14443a tag\r
+       "hi14asnoop",           CmdHi14asnoop,0,        "    Eavesdrop ISO 14443 Type A",                       // ## New snoop command\r
+       "hi14bdemod",           CmdHi14bdemod,1,        "    Demodulate ISO14443 Type B from tag",\r
+       "hi14list",                     CmdHi14list,0,          "    List ISO 14443 history",\r
+       "hi14read",                     CmdHi14read,0,          "    Read HF tag (ISO 14443)",\r
+       "hi14sim",                      CmdHi14sim,0,           "    Fake ISO 14443 tag",\r
+       "hi14snoop",            CmdHi14snoop,0,         "    Eavesdrop ISO 14443",\r
+       "hi15demod",            CmdHi15demod,1,         "    Demodulate ISO15693 from tag",\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
+       "hiddemod",                     CmdHiddemod,1,          "    Demodulate HID Prox Card II (not optimal)",\r
+       "hide",                         CmdHide,1,              "    Hide graph window",\r
+       "hidfskdemod",          CmdHIDdemodFSK,0,       "    Realtime HID FSK demodulator",\r
+       "hidsimtag",            CmdHIDsimTAG,0,         "<ID> -- HID tag simulator",\r
+       "higet",                        CmdHi14read_sim,0,      "<samples> -- Get samples HF, 'analog'",\r
+       "hisamples",            CmdHisamples,0,         "    Get raw samples for HF tag",\r
+       "hisampless",           CmdHisampless,0,        "<samples> -- Get signed raw samples, HF tag",\r
+       "hisamplest",           CmdHi14readt,0,         "    Get samples HF, for testing",\r
+       "hisimlisten",          CmdHisimlisten,0,       "    Get HF samples as fake tag",\r
+       "hpf",                          CmdHpf,1,               "    Remove DC offset from trace",\r
+       "indalademod",          CmdIndalademod,0,         "['224'] -- Demodulate samples for Indala",\r
+       "lcd",                          CmdLcd,0,                       "<HEX command> <count> -- Send command/data to LCD",\r
+       "lcdreset",                     CmdLcdReset,0,          "    Hardware reset LCD",\r
+       "load",                         CmdLoad,1,              "<filename> -- Load trace (to graph window",\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
+       "ltrim",                        CmdLtrim,1,             "<samples> -- Trim samples from left of trace",\r
+       "mandemod",                     Cmdmanchesterdemod,1,   "[clock rate] -- Try a Manchester demodulation on a binary stream",\r
+       "manmod",                       Cmdmanchestermod,1,     "[clock rate] -- Manchester modulate a binary stream",\r
+       "norm",                         CmdNorm,1,              "    Normalize max/min to +/-500",\r
+       "plot",                         CmdPlot,1,              "    Show graph window",\r
+       "quit",                         CmdQuit,1,                      "    Quit program",\r
+       "reset",                        CmdReset,0,                     "    Reset the Proxmark3",\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
+       "sri512read",           CmdSri512read,0,        "<int> -- Read contents of a SRI512 tag",\r
+       "sweeplf",                      CmdSweepLF,0,           "    Sweep through LF freq range and store results in buffer",\r
+       "tibits",                       CmdTibits,0,            "    Get raw bits for TI-type LF tag",\r
+       "tidemod",                      CmdTidemod,0,           "    Demodulate raw bits for TI-type LF tag",\r
+       "tiread",                       CmdTiread,0,            "    Read a TI-type 134 kHz tag",\r
+       "tune",                         CmdTune,0,              "    Measure antenna tuning",\r
+       "vchdemod",                     CmdVchdemod,0,          "['clone'] -- Demodulate samples for VeriChip",\r
+       "zerocrossings",        CmdZerocrossings,1,     "    Count time between zero-crossings",\r

 };\r
 \r
 \r
 };\r
 \r
 \r