github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

add: marshmellow42 's fix for cotag endless loops

Browse source
This commit is contained in:
iceman1001 2018-02-28 08:08:07 +01:00
commit 8083bfec32
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
armsrc/lfsampling.c
View file

@ -344,8 +344,9 @@ void doCotagAcquisition(size_t sample_size) {
dest[0] = 0; dest[0] = 0;
uint8_t sample = 0, firsthigh = 0, firstlow = 0; uint8_t sample = 0, firsthigh = 0, firstlow = 0;
uint16_t i = 0; uint16_t i = 0;
uint16_t noise_counter = 0;
while (!BUTTON_PRESS() && !usb_poll_validate_length() && (i < bufsize) ) { while (!BUTTON_PRESS() && !usb_poll_validate_length() && (i < bufsize) && (noise_counter < (COTAG_T1 << 1)) ) {
WDT_HIT(); WDT_HIT();
if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) { if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXRDY) {
AT91C_BASE_SSC->SSC_THR = 0x43; AT91C_BASE_SSC->SSC_THR = 0x43;
@ -358,13 +359,19 @@ void doCotagAcquisition(size_t sample_size) {
// find first peak // find first peak
if ( !firsthigh ) { if ( !firsthigh ) {
if (sample < COTAG_ONE_THRESHOLD) if (sample < COTAG_ONE_THRESHOLD) {
noise_counter++;
continue; continue;
}
noise_counter = 0;
firsthigh = 1; firsthigh = 1;
} }
if ( !firstlow ){ if ( !firstlow ){
if (sample > COTAG_ZERO_THRESHOLD ) if (sample > COTAG_ZERO_THRESHOLD ) {
noise_counter++;
continue; continue;
}
noise_counter = 0;
firstlow = 1; firstlow = 1;
} }