RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 02:34:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

Hide conn error when hw reset, as suggested by @iceman

Browse source
This commit is contained in:
Philippe Teuwen 2019-05-08 11:14:29 +02:00
parent 68e5b3c355
commit c190ac0955
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/cmdhw.c
View file

@ -400,6 +400,7 @@ static int CmdReset(const char *Cmd) {
(void)Cmd; // Cmd is not used so far
clearCommandBuffer();
SendCommandNG(CMD_HARDWARE_RESET, NULL, 0);
PrintAndLogEx(INFO, "Proxmark3 has been reset.");
return PM3_SUCCESS;
}

4
client/comms.c
View file

@ -330,7 +330,9 @@ __attribute__((force_align_arg_pointer))
// Signal to main thread that communications seems off.
// main thread will kill and restart this thread.
if (commfailed) {
PrintAndLogEx(WARNING, "Communicating with Proxmark3 device " _RED_("failed"));
if (conn.last_command != CMD_HARDWARE_RESET) {
PrintAndLogEx(WARNING, "Communicating with Proxmark3 device " _RED_("failed"));
}
__atomic_test_and_set(&comm_thread_dead, __ATOMIC_SEQ_CST);
break;
}

1
client/flash.c
View file

@ -444,7 +444,6 @@ void flash_free(flash_file_t *ctx) {
// just reset the unit
int flash_stop_flashing(void) {
PrintAndLogEx(SUCCESS, _BLUE_("Resetting hardware...") "Subsequent communication error is " _BLUE_("normal"));
SendCommandOLD(CMD_HARDWARE_RESET, 0, 0, 0, NULL, 0);
msleep(100);
return 0;