\r
UsbCommand c;\r
c.cmd = CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K;\r
- sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, &c.d.asBytes,&dummy+1);\r
+ sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, (char *) &c.d.asBytes,(char *) &dummy+1);\r
// in case they specified 'h'\r
strcpy((char *)&c.d.asBytes + strlen((char *)c.d.asBytes), dummy);\r
SendCommand(&c, FALSE);\r
SendCommand(&c, FALSE);\r
}\r
\r
+static void CmdReadmem(char *str)\r
+{\r
+ UsbCommand c;\r
+ c.cmd = CMD_READ_MEM;\r
+ c.ext1 = atoi(str);\r
+ SendCommand(&c, FALSE);\r
+}\r
+\r
static void CmdLcdReset(char *str)\r
{\r
UsbCommand c;\r
}\r
}\r
\r
-static void CmdSweepLF(char *str)\r
-{\r
- UsbCommand c;\r
- c.cmd = CMD_SWEEP_LF;\r
- SendCommand(&c, FALSE);\r
-}\r
-\r
-\r
typedef void HandlerFunction(char *cmdline);\r
\r
/* in alphabetic order */\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
- "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
- "buffclear", CmdBuffClear,0, " Clear sample buffer and graph window",\r
- "dec", CmdDec,1, " Decimate samples",\r
- "detectclock", Cmddetectclockrate,1, " Detect clock rate",\r
- "detectreader", CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)",\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
- "em4x50read", CmdEM4x50read,1, " Extract data from EM4x50 tag",\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 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
- "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
- "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
- "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
+ {"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
+ {"buffclear", CmdBuffClear,0, " Clear sample buffer and graph window"},\r
+ {"dec", CmdDec,1, " Decimate samples"},\r
+ {"detectclock", Cmddetectclockrate,1, " Detect clock rate"},\r
+ {"detectreader", CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)"},\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
+ {"em4x50read", CmdEM4x50read,1, " Extract data from EM4x50 tag"},\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 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
+ {"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
+ {"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
+ {"norm", CmdNorm,1, " Normalize max/min to +/-500"},\r
+ {"plot", CmdPlot,1, " Show graph window"},\r
+ {"quit", CmdQuit,1, " Quit program"},\r
+ {"readmem", CmdReadmem,0, " [address] -- Read memory at decimal address from flash"},\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
+ {"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
+static struct {\r
+ char *name;\r
+ char *args;\r
+ char *argshelp;\r
+ char *description;\r
+ } CommandExtendedHelp[]= {\r
+ {"detectreader","'l'|'h'","'l' specifies LF antenna scan only, 'h' specifies HF antenna scan only.","Monitor antenna for changes in voltage. Output is in three fields: CHANGED, CURRENT, PERIOD,\nwhere CHANGED is the value just changed from, CURRENT is the current value and PERIOD is the\nnumber of program loops since the last change.\n\nThe RED LED indicates LF field detected, and the GREEN LED indicates HF field detected."},\r
+ {"tune","","","Drive LF antenna at all divisor range values (19 - 255) and store the results in the output\nbuffer. Issuing 'losamples' and then 'plot' commands will display the resulting peak. 12MHz\ndivided by the peak's position plus one gives the antenna's resonant frequency. For convenience,\nthis value is also printed out by the command."},\r
+ };\r
\r
//-----------------------------------------------------------------------------\r
// Entry point into our code: called whenever the user types a command and\r
void CommandReceived(char *cmd)\r
{\r
int i;\r
+ char line[256];\r
\r
PrintToScrollback("> %s", cmd);\r
\r
- if(strcmp(cmd, "help")==0) {\r
+ if(strcmp(cmd, "help") == 0 || strncmp(cmd,"help ",strlen("help ")) == 0) {\r
+ // check if we're doing extended help\r
+ if(strlen(cmd) > strlen("help ")) {\r
+ cmd += strlen("help ");\r
+ for(i = 0; i < sizeof(CommandExtendedHelp) / sizeof(CommandExtendedHelp[0]); i++) {\r
+ if(strcmp(CommandExtendedHelp[i].name,cmd) == 0) {\r
+ PrintToScrollback("\nExtended help for '%s':\n", cmd);\r
+ PrintToScrollback("Args: %s\t- %s\n",CommandExtendedHelp[i].args,CommandExtendedHelp[i].argshelp);\r
+ PrintToScrollback(CommandExtendedHelp[i].description);\r
+ PrintToScrollback("");\r
+ return;\r
+ }\r
+ }\r
+ PrintToScrollback("No extended help available for '%s'", cmd);\r
+ return;\r
+ }\r
if (offline) PrintToScrollback("Operating in OFFLINE mode (no device connected)");\r
PrintToScrollback("\r\nAvailable commands:");\r
for(i = 0; i < sizeof(CommandTable) / sizeof(CommandTable[0]); i++) {\r
if (offline && (CommandTable[i].offline==0)) continue;\r
- char line[256];\r
memset(line, ' ', sizeof(line));\r
strcpy(line+2, CommandTable[i].name);\r
line[strlen(line)] = ' ';\r
PrintToScrollback("%s", line);\r
}\r
PrintToScrollback("");\r
- PrintToScrollback("and also: help, cls");\r
+ PrintToScrollback("'help <command>' for extended help on that command\n");\r
return;\r
}\r
\r
break;\r
\r
case CMD_MEASURED_ANTENNA_TUNING: {\r
- int zLf, zHf;\r
+ int peakv, peakf;\r
int vLf125, vLf134, vHf;\r
vLf125 = c->ext1 & 0xffff;\r
vLf134 = c->ext1 >> 16;\r
- vHf = c->ext2;\r
- zLf = c->ext3 & 0xffff;\r
- zHf = c->ext3 >> 16;\r
- PrintToScrollback("# LF antenna @ %3d mA / %5d mV [%d ohms] 125Khz",\r
- vLf125/zLf, vLf125, zLf);\r
- PrintToScrollback("# LF antenna @ %3d mA / %5d mV [%d ohms] 134Khz",\r
- vLf134/((zLf*125)/134), vLf134, (zLf*125)/134);\r
- PrintToScrollback("# HF antenna @ %3d mA / %5d mV [%d ohms] 13.56Mhz",\r
- vHf/zHf, vHf, zHf);\r
+ vHf = c->ext2 & 0xffff;;\r
+ peakf = c->ext3 & 0xffff;\r
+ peakv = c->ext3 >> 16;\r
+ PrintToScrollback("");\r
+ PrintToScrollback("");\r
+ PrintToScrollback("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/1000.0);\r
+ PrintToScrollback("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/1000.0);\r
+ PrintToScrollback("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));\r
+ PrintToScrollback("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0);\r
+ if (peakv<2000)\r
+ PrintToScrollback("# Your LF antenna is unusable."); \r
+ else if (peakv<10000)\r
+ PrintToScrollback("# Your LF antenna is marginal.");\r
+ if (vHf<2000)\r
+ PrintToScrollback("# Your HF antenna is unusable."); \r
+ else if (vHf<5000)\r
+ PrintToScrollback("# Your HF antenna is marginal.");\r
break;\r
}\r
default:\r
projects / proxmark3-svn / blobdiff