github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix 'lf io watch' - now loops w correct size and crc var. 'lf awid watch' - now loops w correct size

Browse source
This commit is contained in:
iceman1001 2019-09-22 18:57:52 +02:00
commit 66ccca6457
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
armsrc/lfops.c
View file

@ -1245,6 +1245,10 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
DoAcquisition_default(-1, true); DoAcquisition_default(-1, true);
// FSK demodulator // FSK demodulator
size = BigBuf_max_traceLen();
//askdemod and manchester decode
if (size > 12800) size = 12800; //big enough to catch 2 sequences of largest format
int idx = detectAWID(dest, &size, &dummyIdx); int idx = detectAWID(dest, &size, &dummyIdx);
if (idx <= 0 || size != 96) continue; if (idx <= 0 || size != 96) continue;
@ -1306,10 +1310,10 @@ void CmdAWIDdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol)
*low = rawLo; *low = rawLo;
break; break;
} }
WDT_HIT();
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("AWID fsk demod stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
} }
@ -1366,12 +1370,12 @@ void CmdEM410xdemod(int findone, uint32_t *high, uint64_t *low, int ledcontrol)
break; break;
} }
} }
WDT_HIT();
hi = lo = size = idx = 0; hi = lo = size = idx = 0;
clk = invert = 0; clk = invert = 0;
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("EM man/ask demod stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
} }
@ -1398,7 +1402,10 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
DoAcquisition_default(-1, true); DoAcquisition_default(-1, true);
//fskdemod and get start index //fskdemod and get start index
WDT_HIT(); size = BigBuf_max_traceLen();
//askdemod and manchester decode
if (size > 12000) size = 12000; //big enough to catch 2 sequences of largest format
int idx = detectIOProx(dest, &size, &dummyIdx); int idx = detectIOProx(dest, &size, &dummyIdx);
if (idx < 0) continue; if (idx < 0) continue;
//valid tag found //valid tag found
@ -1455,10 +1462,11 @@ void CmdIOdemodFSK(int findone, uint32_t *high, uint32_t *low, int ledcontrol) {
code = code2 = 0; code = code2 = 0;
version = facilitycode = 0; version = facilitycode = 0;
number = 0; number = 0;
WDT_HIT(); calccrc = 0;
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
DbpString("Stopped"); DbpString("IOProx fsk demod stopped");
if (ledcontrol) LED_A_OFF(); if (ledcontrol) LED_A_OFF();
} }