jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-08-04 08:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5034 from andrethomas/development

Browse Source 
PN532:Allow RAW DATA usage by define
This commit is contained in:
Theo Arends 2019-01-27 08:31:12 +01:00 committed by GitHub
commit 78878f534a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sonoff/xsns_40_pn532_i2c.ino
View File

@ -407,6 +407,9 @@ void PN532_ScanForTag(void)
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, card_data)) { if (mifareclassic_ReadDataBlock(1, card_data)) {
#ifdef USE_PN532_DATA_RAW
memcpy(&card_datas,&card_data,sizeof(card_data));
#else
for (uint8_t i = 0;i < sizeof(card_data);i++) { for (uint8_t i = 0;i < sizeof(card_data);i++) {
if ((isalpha(card_data[i])) || ((isdigit(card_data[i])))) { if ((isalpha(card_data[i])) || ((isdigit(card_data[i])))) {
card_datas[i] = char(card_data[i]); card_datas[i] = char(card_data[i]);
@ -414,6 +417,7 @@ void PN532_ScanForTag(void)
card_datas[i] = '\0'; card_datas[i] = '\0';
} }
} }
#endif // USE_PN532_DATA_RAW
} }
if (pn532_i2c_function == 1) { // erase block 1 of card if (pn532_i2c_function == 1) { // erase block 1 of card
for (uint8_t i = 0;i<16;i++) { for (uint8_t i = 0;i<16;i++) {
@ -427,6 +431,14 @@ void PN532_ScanForTag(void)
} }
} }
if (pn532_i2c_function == 2) { if (pn532_i2c_function == 2) {
#ifdef USE_PN532_DATA_RAW
if (mifareclassic_WriteDataBlock(1, card_data)) {
set_success = true;
snprintf_P(log_data, sizeof(log_data),"I2C: PN532 NFC - Data write successful");
AddLog(LOG_LEVEL_INFO);
memcpy(&card_datas,&card_data,sizeof(card_data)); // Cast block 1 to a string
}
#else
boolean IsAlphaNumeric = true; boolean 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]))) {
@ -445,6 +457,7 @@ void PN532_ScanForTag(void)
snprintf_P(log_data, sizeof(log_data),"I2C: PN532 NFC - Data must be alphanumeric"); snprintf_P(log_data, sizeof(log_data),"I2C: PN532 NFC - Data must be alphanumeric");
AddLog(LOG_LEVEL_INFO); AddLog(LOG_LEVEL_INFO);
} }
#endif // USE_PN532_DATA_RAW
} }
} else { } else {
sprintf(card_datas,"AUTHFAIL"); sprintf(card_datas,"AUTHFAIL");