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

PN532: Fix regression

This commit is contained in:
andrethomas 2019-01-31 22:03:47 +02:00
parent 9825d6ffb6
commit 12361df705
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sonoff/xsns_40_pn532_i2c.ino
View File

@ -432,6 +432,7 @@ void PN532_ScanForTag(void)
} }
if (pn532_i2c_function == 2) { if (pn532_i2c_function == 2) {
#ifdef USE_PN532_DATA_RAW #ifdef USE_PN532_DATA_RAW
memcpy(&card_data,&pn532_i2c_newdata,sizeof(card_data));
if (mifareclassic_WriteDataBlock(1, card_data)) { if (mifareclassic_WriteDataBlock(1, card_data)) {
set_success = true; set_success = true;
snprintf_P(log_data, sizeof(log_data),"I2C: PN532 NFC - Data write successful"); snprintf_P(log_data, sizeof(log_data),"I2C: PN532 NFC - Data write successful");
@ -441,13 +442,14 @@ void PN532_ScanForTag(void)
#else #else
bool IsAlphaNumeric = true; bool IsAlphaNumeric = true;
for (uint8_t i = 0;i < pn532_i2c_newdata_len;i++) { for (uint8_t i = 0;i < pn532_i2c_newdata_len;i++) {
if ((!isalpha(pn532_i2c_newdata[i])) || (!isdigit(pn532_i2c_newdata[i]))) { if ((!isalpha(pn532_i2c_newdata[i])) && (!isdigit(pn532_i2c_newdata[i]))) {
IsAlphaNumeric = false; IsAlphaNumeric = false;
} }
} }
if (IsAlphaNumeric) { if (IsAlphaNumeric) {
memcpy(&card_data,&pn532_i2c_newdata,pn532_i2c_newdata_len);
card_data[pn532_i2c_newdata_len] = '\0'; // Enforce null termination
if (mifareclassic_WriteDataBlock(1, card_data)) { if (mifareclassic_WriteDataBlock(1, card_data)) {
memcpy(&card_data,&pn532_i2c_newdata,sizeof(card_data));
set_success = true; set_success = true;
snprintf_P(log_data, sizeof(log_data),"I2C: PN532 NFC - Data write successful"); snprintf_P(log_data, sizeof(log_data),"I2C: PN532 NFC - Data write successful");
AddLog(LOG_LEVEL_INFO); AddLog(LOG_LEVEL_INFO);