diff --git a/CHANGELOG.md b/CHANGELOG.md index eacaa37d1..c78d813db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] - - Added to `hf 14a apdu` print apdu and compose apdu (@merlokk) + - Add 'hw standalone' to jump to standalone mode from command line or script (@doegox) + - Add to 'hf 14a apdu' print apdu and compose apdu (@merlokk) - Change: buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too (@doegox) - Fix: timeout for mem wipe was too short, thanks @cjbrigato (@doegox) - Fix 'hf mf sim' - Mifare Classic simulation more flexible anti-collision check (@McEloff) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index b91853199..8895fd327 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1757,6 +1757,10 @@ static void PacketReceived(PacketCommandNG *packet) { SendStatus(); break; } + case CMD_STANDALONE: { + RunMod(); + break; + } case CMD_CAPABILITIES: { SendCapabilities(); break; diff --git a/client/cmdhw.c b/client/cmdhw.c index 7fb241667..1348f16b4 100644 --- a/client/cmdhw.c +++ b/client/cmdhw.c @@ -479,6 +479,13 @@ static int CmdSetMux(const char *Cmd) { return PM3_SUCCESS; } +static int CmdStandalone(const char *Cmd) { + (void)Cmd; // Cmd is not used so far + clearCommandBuffer(); + SendCommandNG(CMD_STANDALONE, NULL, 0); + return PM3_SUCCESS; +} + static int CmdTune(const char *Cmd) { return CmdTuneSamples(Cmd); } @@ -591,6 +598,7 @@ static command_t CommandTable[] = { {"reset", CmdReset, IfPm3Present, "Reset the Proxmark3"}, {"setlfdivisor", CmdSetDivisor, IfPm3Present, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"}, {"setmux", CmdSetMux, IfPm3Present, "Set the ADC mux to a specific value"}, + {"standalone", CmdStandalone, IfPm3Present, "Jump to the standalone mode"}, {"status", CmdStatus, IfPm3Present, "Show runtime status information about the connected Proxmark3"}, {"tune", CmdTune, IfPm3Present, "Measure antenna tuning"}, {"version", CmdVersion, IfPm3Present, "Show version information about the connected Proxmark3"}, diff --git a/include/pm3_cmd.h b/include/pm3_cmd.h index e19cbf686..284b072eb 100644 --- a/include/pm3_cmd.h +++ b/include/pm3_cmd.h @@ -236,6 +236,7 @@ typedef struct { #define CMD_CAPABILITIES 0x0112 #define CMD_QUIT_SESSION 0x0113 #define CMD_SET_DBGMODE 0x0114 +#define CMD_STANDALONE 0x0115 // RDV40, Flash memory operations #define CMD_FLASHMEM_WRITE 0x0121