Avr/MarklinController
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix crc calc

Browse Source
This commit is contained in:
uvos
2022-03-09 17:03:36 +01:00
parent da371f43b7
commit f49d052e6e
3 changed files with 21 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mfrc522.cpp
View File

@ -98,8 +98,17 @@ uint8_t Mfrc522::calculateCrc(uint8_t *data, uint8_t length, uint16_t *result)
return ERR;
write(CommandReg, IDLE);
if(serial)
{
serial->write_p(PSTR("Calculated CRC "));
serial->write((int)read(CRCResultRegL));
serial->putChar(' ');
serial->write((int)read(CRCResultRegH));
serial->putChar('\n');
}
*result = read(CRCResultRegL);
*result = read(CRCResultRegH) << 8;
*result |= read(CRCResultRegH) << 8;
return 0;
}
@ -439,7 +448,7 @@ uint8_t Mfrc522::selectTag(Uid *uid)
} // End of while ( ! uidComplete)
// Set correct uid->size
uid->size = 3 * cascadeLevel + 2;
uid->size = 3 * (cascadeLevel+1) + 1;
return 0;
}