diff --git a/client/src/cmdhw.c b/client/src/cmdhw.c index cf730f339..ed6aa0e2c 100644 --- a/client/src/cmdhw.c +++ b/client/src/cmdhw.c @@ -1082,7 +1082,7 @@ static int CmdTune(const char *Cmd) { PrintAndLogEx(NORMAL, ""); PrintAndLogEx(INFO, "Q factor must be measured without tag on the antenna"); - PrintAndLogEx(NORMAL, ""); + PrintAndLogEx(NORMAL, ""); return PM3_SUCCESS; } @@ -1441,7 +1441,7 @@ static command_t CommandTable[] = { {"-------------", CmdHelp, AlwaysAvailable, "----------------------- " _CYAN_("Operation") " -----------------------"}, {"detectreader", CmdDetectReader, IfPm3Present, "Detect external reader field"}, {"status", CmdStatus, IfPm3Present, "Show runtime status information about the connected Proxmark3"}, - {"tearoff", CmdTearoff, IfPm3Present, "Program a tearoff hook for the next command supporting tearoff"}, + {"tearoff", CmdTearoff, IfPm3Present, "Program a tearoff hook for the next command supporting tearoff"}, {"timeout", CmdTimeout, AlwaysAvailable, "Set the communication timeout on the client side"}, {"version", CmdVersion, AlwaysAvailable, "Show version information about the client and Proxmark3"}, {"-------------", CmdHelp, AlwaysAvailable, "----------------------- " _CYAN_("Hardware") " -----------------------"}, diff --git a/client/src/pm3line_vocabulary.h b/client/src/pm3line_vocabulary.h index 63bd38af7..df42bd4dd 100644 --- a/client/src/pm3line_vocabulary.h +++ b/client/src/pm3line_vocabulary.h @@ -119,7 +119,6 @@ const static vocabulary_t vocabulary[] = { { 0, "data samples" }, { 1, "data save" }, { 1, "data setdebugmode" }, - { 0, "data tune" }, { 1, "emv help" }, { 1, "emv list" }, { 1, "emv test" }, @@ -522,11 +521,15 @@ const static vocabulary_t vocabulary[] = { { 1, "hf xerox view" }, { 0, "hf xerox rdbl" }, { 1, "hw help" }, + { 0, "hw detectreader" }, + { 0, "hw status" }, + { 0, "hw tearoff" }, + { 1, "hw timeout" }, + { 1, "hw version" }, { 0, "hw break" }, { 0, "hw bootloader" }, { 1, "hw connect" }, { 0, "hw dbg" }, - { 0, "hw detectreader" }, { 0, "hw fpgaoff" }, { 0, "hw lcd" }, { 0, "hw lcdreset" }, @@ -537,12 +540,8 @@ const static vocabulary_t vocabulary[] = { { 0, "hw sethfthresh" }, { 0, "hw setmux" }, { 0, "hw standalone" }, - { 0, "hw status" }, - { 0, "hw tearoff" }, { 0, "hw tia" }, - { 1, "hw timeout" }, { 0, "hw tune" }, - { 1, "hw version" }, { 1, "lf help" }, { 0, "lf config" }, { 0, "lf cmdread" }, diff --git a/doc/commands.json b/doc/commands.json index f89e62ee1..e9e4a0fd0 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -778,18 +778,6 @@ ], "usage": "data timescale [-h] --sr [-u ]" }, - "data tune": { - "command": "data tune", - "description": "Measure tuning of device antenna. Results shown in graph window. This command doesn't actively tune your antennas, it's only informative by measuring voltage that the antennas will generate", - "notes": [ - "data tune" - ], - "offline": false, - "options": [ - "-h, --help This help" - ], - "usage": "data tune [-h]" - }, "data undecimate": { "command": "data undecimate", "description": "Performs un-decimation, by repeating each sample N times in the graphbuf", @@ -3611,6 +3599,18 @@ ], "usage": "hf ict list [-h1crux] [--frame] [-f ]" }, + "hf ict reader": { + "command": "hf ict reader", + "description": "Act as a reader", + "notes": [ + "hf ict reader" + ], + "offline": true, + "options": [ + "-h, --help This help" + ], + "usage": "hf ict reader [-h]" + }, "hf jooki decode": { "command": "hf jooki decode", "description": "Decode a base64-encode Jooki token in NDEF URI format", @@ -7848,6 +7848,18 @@ ], "usage": "hw bootloader [-h]" }, + "hw break": { + "command": "hw break", + "description": "send break loop package", + "notes": [ + "hw break" + ], + "offline": false, + "options": [ + "-h, --help This help" + ], + "usage": "hw break [-h]" + }, "hw connect": { "command": "hw connect", "description": "Connects to a Proxmark3 device via specified serial port. Baudrate here is only for physical UART or UART-BT, NOT for USB-CDC or blue shark add-on", @@ -7881,21 +7893,6 @@ ], "usage": "hw dbg [-h01234]" }, - "hw detectreader": { - "command": "hw detectreader", - "description": "Start to detect presences of reader field", - "notes": [ - "hw detectreader", - "hw detectreader -L" - ], - "offline": false, - "options": [ - "-h, --help This help", - "-L, --LF only detect low frequency 125/134 kHz", - "-H, --HF only detect high frequency 13.56 MHZ" - ], - "usage": "hw detectreader [-hLH]" - }, "hw fpgaoff": { "command": "hw fpgaoff", "description": "Turn of fpga and antenna field", @@ -7910,15 +7907,18 @@ }, "hw help": { "command": "hw help", - "description": "------------- ----------------------- Hardware ----------------------- help This help connect Connect Proxmark3 to serial port timeout Set the communication timeout on the client side version Show version information about the client and the connected Proxmark3, if any --------------------------------------------------------------------------------------- hw break available offline: no send break loop package", + "description": "help This help ------------- ----------------------- Operation ----------------------- timeout Set the communication timeout on the client side version Show version information about the client and Proxmark3 ------------- ----------------------- Hardware ----------------------- connect Connect to the device via serial port --------------------------------------------------------------------------------------- hw detectreader available offline: no Start to detect presences of reader field", "notes": [ - "hw break" + "hw detectreader", + "hw detectreader -L" ], "offline": true, "options": [ - "-h, --help This help" + "-h, --help This help", + "-L, --LF only detect low frequency 125/134 kHz", + "-H, --HF only detect high frequency 13.56 MHZ" ], - "usage": "hw break [-h]" + "usage": "hw detectreader [-hLH]" }, "hw lcd": { "command": "hw lcd", @@ -8109,7 +8109,7 @@ }, "hw tune": { "command": "hw tune", - "description": "Measure antenna tuning", + "description": "Measure tuning of device antenna. Results shown in graph window. This command doesn't actively tune your antennas, it's only informative by measuring voltage that the antennas will generate", "notes": [ "hw tune" ], @@ -12499,6 +12499,6 @@ "metadata": { "commands_extracted": 721, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2024-02-18T19:13:37" + "extracted_on": "2024-02-21T16:14:11" } } diff --git a/doc/commands.md b/doc/commands.md index d508c772a..0ccc98fe3 100644 --- a/doc/commands.md +++ b/doc/commands.md @@ -138,7 +138,6 @@ Check column "offline" for their availability. |`data samples `|N |`Get raw samples for graph window (GraphBuffer)` |`data save `|Y |`Save signal trace data (from graph window)` |`data setdebugmode `|Y |`Set Debugging Level on client side` -|`data tune `|N |`Measure tuning of device antenna. Results shown in graph window` ### emv @@ -805,27 +804,27 @@ Check column "offline" for their availability. |command |offline |description |------- |------- |----------- |`hw help `|Y |`This help` -|`hw break `|N |`Send break loop usb command` -|`hw bootloader `|N |`Reboot Proxmark3 into bootloader mode` -|`hw connect `|Y |`Connect Proxmark3 to serial port` -|`hw dbg `|N |`Set Proxmark3 debug level` |`hw detectreader `|N |`Detect external reader field` -|`hw fpgaoff `|N |`Set FPGA off` +|`hw status `|N |`Show runtime status information about the connected Proxmark3` +|`hw tearoff `|N |`Program a tearoff hook for the next command supporting tearoff` +|`hw timeout `|Y |`Set the communication timeout on the client side` +|`hw version `|Y |`Show version information about the client and Proxmark3` +|`hw break `|N |`Send break loop usb command` +|`hw bootloader `|N |`Reboot into bootloader mode` +|`hw connect `|Y |`Connect to the device via serial port` +|`hw dbg `|N |`Set device side debug level` +|`hw fpgaoff `|N |`Turn off FPGA on device` |`hw lcd `|N |`Send command/data to LCD` |`hw lcdreset `|N |`Hardware reset LCD` |`hw ping `|N |`Test if the Proxmark3 is responsive` -|`hw readmem `|N |`Read from processor flash` -|`hw reset `|N |`Reset the Proxmark3` +|`hw readmem `|N |`Read from MCU flash` +|`hw reset `|N |`Reset the device` |`hw setlfdivisor `|N |`Drive LF antenna at 12MHz / (divisor + 1)` |`hw sethfthresh `|N |`Set thresholds in HF/14a mode` |`hw setmux `|N |`Set the ADC mux to a specific value` -|`hw standalone `|N |`Jump to the standalone mode` -|`hw status `|N |`Show runtime status information about the connected Proxmark3` -|`hw tearoff `|N |`Program a tearoff hook for the next command supporting tearoff` +|`hw standalone `|N |`Start installed standalone mode on device` |`hw tia `|N |`Trigger a Timing Interval Acquisition to re-adjust the RealTimeCounter divider` -|`hw timeout `|Y |`Set the communication timeout on the client side` -|`hw tune `|N |`Measure antenna tuning` -|`hw version `|Y |`Show version information about the client and the connected Proxmark3, if any` +|`hw tune `|N |`Measure tuning of device antenna` ### lf