X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/719b2377bee69506572b54af1e210b62c296675c..6c84c900179a0ff0959046ff0d65c68ab9077c50:/client/cmdmain.c diff --git a/client/cmdmain.c b/client/cmdmain.c index 1357c436..04d8ad7a 100644 --- a/client/cmdmain.c +++ b/client/cmdmain.c @@ -152,7 +152,7 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou } msleep(10); // XXX ugh - if (dm_seconds == 200) { // Two seconds elapsed + if (dm_seconds == 250) { // 2.5 seconds elapsed PrintAndLog("Waiting for a response from the proxmark..."); PrintAndLog("Don't forget to cancel its operation first by pressing on the button"); } @@ -182,24 +182,35 @@ void UsbCommandReceived(UsbCommand *UC) // First check if we are handling a debug message case CMD_DEBUG_PRINT_STRING: { char s[USB_CMD_DATA_SIZE+1]; - memset(s, 0x00, sizeof(s)); - size_t len = MIN(UC->arg[0], USB_CMD_DATA_SIZE); + memset(s, 0x00, sizeof(s)); + size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE); memcpy(s, UC->d.asBytes, len); - PrintAndLog("#db# %s", s); + + // test + if ( UC->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) { + printf("\r#db# %s", s); + fflush(stdout); + } + else + PrintAndLog("#db# %s", s); + + return; } break; - case CMD_DEBUG_PRINT_INTEGERS: + case CMD_DEBUG_PRINT_INTEGERS: { PrintAndLog("#db# %08x, %08x, %08x", UC->arg[0], UC->arg[1], UC->arg[2]); break; - + } case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: + case CMD_DOWNLOADED_EML_BIGBUF: { memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]); break; - + } default: { storeCommand(UC); break; } } + }