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

use PrintAndLogEx() instead of PrintAndLog()

Browse source
This commit is contained in:
Brian Pow 2018-02-21 20:05:42 +08:00
commit ee3da288e3
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/cmdmain.c
View file

@ -101,7 +101,7 @@ void storeCommand(UsbCommand *command) {
{ {
//If these two are equal, we're about to overwrite in the //If these two are equal, we're about to overwrite in the
// circular buffer. // circular buffer.
PrintAndLog("WARNING: Command buffer about to overwrite command! This needs to be fixed!"); PrintAndLogEx(FAILED, "WARNING: Command buffer about to overwrite command! This needs to be fixed!");
} }
//Store the command at the 'head' location //Store the command at the 'head' location
UsbCommand* destination = &cmdBuffer[cmd_head]; UsbCommand* destination = &cmdBuffer[cmd_head];
@ -164,8 +164,8 @@ bool WaitForResponseTimeoutW(uint32_t cmd, UsbCommand* response, size_t ms_timeo
break; break;
if (msclock() - start_time > 3000 && show_warning) { if (msclock() - start_time > 3000 && show_warning) {
PrintAndLog("Waiting for a response from the proxmark..."); PrintAndLogEx(NORMAL, "Waiting for a response from the proxmark...");
PrintAndLog("You can cancel this operation by pressing the pm3 button"); PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");
show_warning = false; show_warning = false;
} }
} }
@ -203,17 +203,17 @@ void UsbCommandReceived(UsbCommand *c) {
// test // test
if ( c->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) { if ( c->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) {
printf("\r#db# %s", s); PrintAndLogEx(NORMAL, "\r#db# %s", s);
fflush(stdout); fflush(stdout);
} }
else { else {
PrintAndLog("#db# %s", s); PrintAndLogEx(NORMAL, "#db# %s", s);
} }
return; return;
} break; } break;
case CMD_DEBUG_PRINT_INTEGERS: { case CMD_DEBUG_PRINT_INTEGERS: {
PrintAndLog("#db# %08x, %08x, %08x", c->arg[0], c->arg[1], c->arg[2]); PrintAndLogEx(NORMAL, "#db# %08x, %08x, %08x", c->arg[0], c->arg[1], c->arg[2]);
break; break;
} }
case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K:
@ -226,7 +226,7 @@ void UsbCommandReceived(UsbCommand *c) {
uint32_t len = c->arg[1]; uint32_t len = c->arg[1];
//uint32_t tracelen = c->arg[2]; //uint32_t tracelen = c->arg[2];
memcpy( sample_buf + offset, c->d.asBytes, len); memcpy( sample_buf + offset, c->d.asBytes, len);
//printf("ICE:: Download from device. chunk %" PRIu32 " | size %" PRIu32 " | tracelen:%" PRIu32 " \n", offset, len, c->arg[2]); //PrintAndLogEx(NORMAL, "ICE:: Download from device. chunk %" PRIu32 " | size %" PRIu32 " | tracelen:%" PRIu32 " \n", offset, len, c->arg[2]);
break; break;
} }
default: { default: {