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
{"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
+ {"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
{"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
- {"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
{"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("# LF antenna: %.2f V @ 125.00Khz", vLf125/1000.0);\r
+ PrintToScrollback("# LF antenna: %.2f V @ 134.00Khz", vLf134/1000.0);\r
+ PrintToScrollback("# LF optimal: %.2f V @ %.2fKHz", peakv/1000.0, 12000.0/(peakf+1));\r
+ PrintToScrollback("# HF antenna: %.2f V @ 13.56Mhz", 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