jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-19 00:36:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16968 from md5sum-as/operate_16_bytes

Browse Source 
xsns_40_pn532.ino Saving the PN532 password and PACK in Settings
This commit is contained in:
Theo Arends 2022-10-31 17:53:12 +01:00 committed by GitHub
commit 42f9090b71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tasmota/tasmota_xsns_sensor/xsns_40_pn532.ino
View File

@ -85,8 +85,8 @@ 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;
uint32_t pwd_auth=0x64636261; uint32_t pwd_auth;
uint16_t pwd_pack=0x6665; uint16_t pwd_pack;
uint32_t pwd_auth_new; uint32_t pwd_auth_new;
uint16_t pwd_pack_new; uint16_t pwd_pack_new;
#endif // USE_PN532_DATA_FUNCTION #endif // USE_PN532_DATA_FUNCTION
@ -106,6 +106,10 @@ void PN532_Init(void) {
PN532_SAMConfig(); PN532_SAMConfig();
AddLog(LOG_LEVEL_INFO,"NFC: PN532 NFC Reader detected v%u.%u",(ver>>16) & 0xFF, (ver>>8) & 0xFF); AddLog(LOG_LEVEL_INFO,"NFC: PN532 NFC Reader detected v%u.%u",(ver>>16) & 0xFF, (ver>>8) & 0xFF);
Pn532.present = true; Pn532.present = true;
#ifdef USE_PN532_DATA_FUNCTION
Pn532.pwd_auth=Settings->pn532_password;
Pn532.pwd_pack=Settings->pn532_pack;
#endif
} }
} }
} }
@ -708,6 +712,9 @@ bool PN532_Command(void) {
if (ArgC() > 2) { if (ArgC() > 2) {
Pn532.pwd_pack=strtoul(ArgV(argument,3),nullptr,0); Pn532.pwd_pack=strtoul(ArgV(argument,3),nullptr,0);
} }
Settings->pn532_password=Pn532.pwd_auth;
Settings->pn532_pack=Pn532.pwd_pack;
serviced = true; serviced = true;
} }
if (!strcmp_P(argument,PSTR("SET_PWD"))) { if (!strcmp_P(argument,PSTR("SET_PWD"))) {