Fixed error with ar/nr-collection

This commit is contained in:
martin.holst@gmail.com 2014-02-05 08:07:27 +00:00
commit 273b57a7b0

View file

@ -652,7 +652,7 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {
} }
LED_A_OFF(); LED_A_OFF();
if(MF_DBGLEVEL > 4) Dbprintf("1:%d",dataLen);
rsamples += 4; rsamples += 4;
if(MillerDecoding((data[0] & 0xF0) >> 4)) { if(MillerDecoding((data[0] & 0xF0) >> 4)) {
LED_C_ON(); LED_C_ON();
@ -670,7 +670,7 @@ void RAMFUNC SnoopIso14443a(uint8_t param) {
Demod.state = DEMOD_UNSYNCD; Demod.state = DEMOD_UNSYNCD;
LED_B_OFF(); LED_B_OFF();
} }
if(MF_DBGLEVEL > 4) Dbprintf("2");
if(ManchesterDecoding(data[0], 0)) { if(ManchesterDecoding(data[0], 0)) {
LED_B_ON(); LED_B_ON();
@ -2325,13 +2325,13 @@ void Mifare1ksim(uint8_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *
//Collect AR/NR //Collect AR/NR
if(ar_nr_collected < 2){ if(ar_nr_collected < 2){
if(ar_nr_responses[ar_nr_collected*4+2] != ar) if(ar_nr_responses[2] != ar)
{// Avoid duplicates {// Avoid duplicates... probably not necessary, ar should vary.
ar_nr_collected++;
ar_nr_responses[ar_nr_collected*4] = cuid; ar_nr_responses[ar_nr_collected*4] = cuid;
ar_nr_responses[ar_nr_collected*4+1] = nonce; ar_nr_responses[ar_nr_collected*4+1] = nonce;
ar_nr_responses[ar_nr_collected*4+2] = ar; ar_nr_responses[ar_nr_collected*4+2] = ar;
ar_nr_responses[ar_nr_collected*4+3] = nr; ar_nr_responses[ar_nr_collected*4+3] = nr;
ar_nr_collected++;
} }
} }