mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring mifare classic stage 2

This commit is contained in:
md5sum-as 2022-10-25 23:14:27 +03:00
parent 5db8fcd0d0
commit 3e3dfa35d3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tasmota/tasmota_xsns_sensor/xsns_40_pn532.ino
View File

@ -86,7 +86,7 @@ struct PN532 {
#ifdef USE_PN532_DATA_FUNCTION #ifdef USE_PN532_DATA_FUNCTION
uint8_t newdata[16]; uint8_t newdata[16];
uint8_t function = 0; uint8_t function = 0;
uint8_t newdata_len = 0; // uint8_t newdata_len = 0;
uint32_t pwd_auth=0x64636261; uint32_t pwd_auth=0x64636261;
uint16_t pwd_pack=0x6665; uint16_t pwd_pack=0x6665;
uint32_t pwd_auth_new; uint32_t pwd_auth_new;
@ -586,16 +586,6 @@ void PN532_ScanForTag(void) {
if (uid_len == 4) { // Lets try to read block 1 of the mifare classic card for more information if (uid_len == 4) { // Lets try to read block 1 of the mifare classic card for more information
uint8_t keyuniversal[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; uint8_t keyuniversal[6] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
if (mifareclassic_AuthenticateBlock (uid, uid_len, 1, 1, keyuniversal)) { if (mifareclassic_AuthenticateBlock (uid, uid_len, 1, 1, keyuniversal)) {
if (mifareclassic_ReadDataBlock(1, (uint8_t *)card_datas)) {
for (uint32_t i = 0;i < sizeof(card_datas);i++) {
if (!isprint(card_datas[i])) {
// do not output non-printable characters to the console
card_datas[i] = 0;
}
}
} else {
card_datas[0] = 0;
}
if (Pn532.function == 1) { // erase block 1 of card if (Pn532.function == 1) { // erase block 1 of card
memset(card_datas,0,sizeof(card_datas)); memset(card_datas,0,sizeof(card_datas));
if (mifareclassic_WriteDataBlock(1, (uint8_t *)card_datas)) { if (mifareclassic_WriteDataBlock(1, (uint8_t *)card_datas)) {
@ -610,6 +600,16 @@ void PN532_ScanForTag(void) {
AddLog(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful")); AddLog(LOG_LEVEL_INFO, PSTR("NFC: PN532 NFC - Data write successful"));
} }
} }
if (mifareclassic_ReadDataBlock(1, (uint8_t *)card_datas)) {
for (uint32_t i = 0;i < sizeof(card_datas);i++) {
if (!isprint(card_datas[i])) {
// do not output non-printable characters to the console
card_datas[i] = 0;
}
}
} else {
card_datas[0] = 0;
}
} else { } else {
sprintf_P(card_datas, PSTR("AUTHFAIL")); sprintf_P(card_datas, PSTR("AUTHFAIL"));
} }