dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lf awid/hid/io/410x watch - now works with user side abort

Browse Source
This commit is contained in:
iceman1001
2021-02-02 17:55:54 +01:00
parent ea7d4ae496
commit 47c27d751c
5 changed files with 20 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/cmdlfawid.c
View File

@@ -129,10 +129,7 @@ static int CmdAWIDWatch(const char *Cmd) {
PrintAndLogEx(INFO, "Press pm3-button to stop reading cards");
clearCommandBuffer();
SendCommandNG(CMD_LF_AWID_WATCH, NULL, 0);
PacketResponseNG resp;
WaitForResponse(CMD_LF_AWID_WATCH, &resp);
PrintAndLogEx(INFO, "Done");
return resp.status;
return lfsim_wait_check(CMD_LF_AWID_WATCH);
}
//by marshmellow

6
client/src/cmdlfem410x.c
View File

@@ -287,13 +287,9 @@ static int CmdEM410xWatch(const char *Cmd) {
CLIParserFree(ctx);
PrintAndLogEx(SUCCESS, "Watching for EM410x cards - place tag on antenna");
PrintAndLogEx(INFO, "Press pm3-button to stop reading cards");
clearCommandBuffer();
SendCommandNG(CMD_LF_EM410X_WATCH, NULL, 0);
PacketResponseNG resp;
WaitForResponse(CMD_LF_EM410X_WATCH, &resp);
PrintAndLogEx(INFO, "Done");
return resp.status;
return lfsim_wait_check(CMD_LF_EM410X_WATCH);
}
//by marshmellow

5
client/src/cmdlfhid.c
View File

@@ -223,10 +223,7 @@ static int CmdHIDWatch(const char *Cmd) {
PrintAndLogEx(INFO, "Press pm3-button to stop reading cards");
clearCommandBuffer();
SendCommandNG(CMD_LF_HID_WATCH, NULL, 0);
PacketResponseNG resp;
WaitForResponse(CMD_LF_HID_WATCH, &resp);
PrintAndLogEx(INFO, "Done");
return resp.status;
return lfsim_wait_check(CMD_LF_HID_WATCH);
}
static int CmdHIDSim(const char *Cmd) {

5
client/src/cmdlfio.c
View File

@@ -50,10 +50,7 @@ static int CmdIOProxWatch(const char *Cmd) {
PrintAndLogEx(INFO, "Press pm3-button to stop reading cards");
clearCommandBuffer();
SendCommandNG(CMD_LF_IO_WATCH, NULL, 0);
PacketResponseNG resp;
WaitForResponse(CMD_LF_IO_WATCH, &resp);
PrintAndLogEx(INFO, "Done");
return resp.status;
return lfsim_wait_check(CMD_LF_IO_WATCH);
}
//IO-Prox demod - FSK RF/64 with preamble of 000000001