diff --git a/client/cmddata.c b/client/cmddata.c index f4e6594a9..e0fd2fa5c 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -876,7 +876,7 @@ static int CmdBuffClear(const char *Cmd) { if (cmdp == 'h') return usage_data_buffclear(); clearCommandBuffer(); - SendCommandOLD(CMD_BUFF_CLEAR, 0, 0, 0, NULL, 0); + SendCommandMIX(CMD_BUFF_CLEAR, 0, 0, 0, NULL, 0); ClearGraph(true); return 0; } diff --git a/client/cmdhw.c b/client/cmdhw.c index 27235c10a..f086b4c99 100644 --- a/client/cmdhw.c +++ b/client/cmdhw.c @@ -370,7 +370,7 @@ static int CmdDetectReader(const char *Cmd) { static int CmdFPGAOff(const char *Cmd) { (void)Cmd; // Cmd is not used so far clearCommandBuffer(); - SendCommandOLD(CMD_FPGA_MAJOR_MODE_OFF, 0, 0, 0, NULL, 0); + SendCommandMIX(CMD_FPGA_MAJOR_MODE_OFF, 0, 0, 0, NULL, 0); return PM3_SUCCESS; } @@ -399,7 +399,7 @@ static int CmdReadmem(const char *Cmd) { static int CmdReset(const char *Cmd) { (void)Cmd; // Cmd is not used so far clearCommandBuffer(); - SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0); + SendCommandMIX(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0); return PM3_SUCCESS; } @@ -458,7 +458,7 @@ static int CmdStatus(const char *Cmd) { (void)Cmd; // Cmd is not used so far clearCommandBuffer(); PacketResponseNG resp; - SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0); + SendCommandMIX(CMD_STATUS, 0, 0, 0, NULL, 0); if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) PrintAndLogEx(WARNING, "Status command failed. Communication speed test timed out"); return PM3_SUCCESS; @@ -564,9 +564,12 @@ int CmdHW(const char *Cmd) { void pm3_version(bool verbose) { if (!verbose) return; + PacketResponseNG resp; clearCommandBuffer(); - SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0); + + SendCommandMIX(CMD_VERSION, 0, 0, 0, NULL, 0); + if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n"); PrintAndLogEx(NORMAL, "\n [ CLIENT ]"); @@ -576,8 +579,10 @@ void pm3_version(bool verbose) { PrintAndLogEx(NORMAL, " smartcard reader: %s", IfPm3Smartcard() ? _GREEN_("present") : _YELLOW_("absent")); PrintAndLogEx(NORMAL, "\n [ PROXMARK RDV4 Extras ]"); PrintAndLogEx(NORMAL, " FPC USART for BT add-on support: %s", IfPm3FpcUsartHost() ? _GREEN_("present") : _YELLOW_("absent")); + if (IfPm3FpcUsartDevFromUsb()) PrintAndLogEx(NORMAL, " FPC USART for developer support: %s", _GREEN_("present")); + PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, (char *)resp.data.asBytes); lookupChipID(resp.oldarg[0], resp.oldarg[1]); diff --git a/client/util.h b/client/util.h index 0222097b7..e194bb5be 100644 --- a/client/util.h +++ b/client/util.h @@ -115,7 +115,7 @@ #ifndef DropField #define DropField() { \ - clearCommandBuffer(); SendCommandOLD(CMD_READER_ISO_14443a, 0, 0, 0, NULL, 0); \ + clearCommandBuffer(); SendCommandMIX(CMD_READER_ISO_14443a, 0, 0, 0, NULL, 0); \ } #endif