projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CHG: hardnested needs malloc.h, which on Darvin (Mac OS X) needs a path to.
[proxmark3-svn]
/
client
/
cmdmain.c
diff --git
a/client/cmdmain.c
b/client/cmdmain.c
index 58783030d24e4b8db1097654ef85d03d5db7c750..04d8ad7aeab68a6647b59e89b7a56bff35e5255c 100644
(file)
--- 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
}
msleep(10); // XXX ugh
- if (dm_seconds == 2
00) { // Two
seconds elapsed
+ if (dm_seconds == 2
50) { // 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");
}
PrintAndLog("Waiting for a response from the proxmark...");
PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
}
@@
-185,18
+185,27
@@
void UsbCommandReceived(UsbCommand *UC)
memset(s, 0x00, sizeof(s));
size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
memcpy(s, UC->d.asBytes, len);
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;
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;
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_RAW_ADC_SAMPLES_125K:
+ case CMD_DOWNLOADED_EML_BIGBUF: {
memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
break;
memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
break;
-
+ }
default: {
storeCommand(UC);
break;
default: {
storeCommand(UC);
break;
Impressum
,
Datenschutz