github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 13:00:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

convert to MIX for simple send commands.

Browse source
This commit is contained in:
iceman1001 2019-05-07 19:03:25 +02:00
commit 0c20c1a9d1
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmddata.c
View file

@ -876,7 +876,7 @@ static int CmdBuffClear(const char *Cmd) {
if (cmdp == 'h') return usage_data_buffclear(); if (cmdp == 'h') return usage_data_buffclear();
clearCommandBuffer(); clearCommandBuffer();
SendCommandOLD(CMD_BUFF_CLEAR, 0, 0, 0, NULL, 0); SendCommandMIX(CMD_BUFF_CLEAR, 0, 0, 0, NULL, 0);
ClearGraph(true); ClearGraph(true);
return 0; return 0;
} }

13
client/cmdhw.c
View file

@ -370,7 +370,7 @@ static int CmdDetectReader(const char *Cmd) {
static int CmdFPGAOff(const char *Cmd) { static int CmdFPGAOff(const char *Cmd) {
(void)Cmd; // Cmd is not used so far (void)Cmd; // Cmd is not used so far
clearCommandBuffer(); 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; return PM3_SUCCESS;
} }
@ -399,7 +399,7 @@ static int CmdReadmem(const char *Cmd) {
static int CmdReset(const char *Cmd) { static int CmdReset(const char *Cmd) {
(void)Cmd; // Cmd is not used so far (void)Cmd; // Cmd is not used so far
clearCommandBuffer(); clearCommandBuffer();
SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0); SendCommandMIX(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -458,7 +458,7 @@ static int CmdStatus(const char *Cmd) {
(void)Cmd; // Cmd is not used so far (void)Cmd; // Cmd is not used so far
clearCommandBuffer(); clearCommandBuffer();
PacketResponseNG resp; PacketResponseNG resp;
SendCommandOLD(CMD_STATUS, 0, 0, 0, NULL, 0); SendCommandMIX(CMD_STATUS, 0, 0, 0, NULL, 0);
if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000)) if (!WaitForResponseTimeout(CMD_ACK, &resp, 2000))
PrintAndLogEx(WARNING, "Status command failed. Communication speed test timed out"); PrintAndLogEx(WARNING, "Status command failed. Communication speed test timed out");
return PM3_SUCCESS; return PM3_SUCCESS;
@ -564,9 +564,12 @@ int CmdHW(const char *Cmd) {
void pm3_version(bool verbose) { void pm3_version(bool verbose) {
if (!verbose) if (!verbose)
return; return;
PacketResponseNG resp; PacketResponseNG resp;
clearCommandBuffer(); clearCommandBuffer();
SendCommandOLD(CMD_VERSION, 0, 0, 0, NULL, 0);
SendCommandMIX(CMD_VERSION, 0, 0, 0, NULL, 0);
if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n"); PrintAndLogEx(NORMAL, "\n" _BLUE_(" [ Proxmark3 RFID instrument ]") "\n");
PrintAndLogEx(NORMAL, "\n [ CLIENT ]"); 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, " smartcard reader: %s", IfPm3Smartcard() ? _GREEN_("present") : _YELLOW_("absent"));
PrintAndLogEx(NORMAL, "\n [ PROXMARK RDV4 Extras ]"); PrintAndLogEx(NORMAL, "\n [ PROXMARK RDV4 Extras ]");
PrintAndLogEx(NORMAL, " FPC USART for BT add-on support: %s", IfPm3FpcUsartHost() ? _GREEN_("present") : _YELLOW_("absent")); PrintAndLogEx(NORMAL, " FPC USART for BT add-on support: %s", IfPm3FpcUsartHost() ? _GREEN_("present") : _YELLOW_("absent"));
if (IfPm3FpcUsartDevFromUsb()) if (IfPm3FpcUsartDevFromUsb())
PrintAndLogEx(NORMAL, " FPC USART for developer support: %s", _GREEN_("present")); PrintAndLogEx(NORMAL, " FPC USART for developer support: %s", _GREEN_("present"));
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, (char *)resp.data.asBytes); PrintAndLogEx(NORMAL, (char *)resp.data.asBytes);
lookupChipID(resp.oldarg[0], resp.oldarg[1]); lookupChipID(resp.oldarg[0], resp.oldarg[1]);

2
client/util.h
View file

@ -115,7 +115,7 @@
#ifndef DropField #ifndef DropField
#define 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 #endif