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

Ready fo test (32 bytes)

Browse Source
This commit is contained in:
md5sum-as 2022-10-27 19:23:11 +03:00
parent cc7936bd7e
commit b877c174b1
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tasmota/tasmota_xsns_sensor/xsns_40_pn532.ino
View File

@ -83,8 +83,8 @@ struct PN532 {
uint8_t command = 0; // Carry command code between functions uint8_t command = 0; // Carry command code between functions
uint8_t scantimer = 0; // Prevent multiple successful reads within 2 second window uint8_t scantimer = 0; // Prevent multiple successful reads within 2 second window
bool present = false; // Maintain detection flag bool present = false; // Maintain detection flag
#ifdef USE_PN532_DATA_FUNCTION
uint16_t atqa; uint16_t atqa;
#ifdef USE_PN532_DATA_FUNCTION
uint8_t newdata[32]; uint8_t newdata[32];
uint8_t function = 0; uint8_t function = 0;
uint32_t pwd_auth=0x64636261; uint32_t pwd_auth=0x64636261;
@ -336,15 +336,6 @@ bool PN532_SAMConfig(void) {
return (0 < PN532_readResponse(Pn532.packetbuffer, sizeof(Pn532.packetbuffer))); return (0 < PN532_readResponse(Pn532.packetbuffer, sizeof(Pn532.packetbuffer)));
} }
void PN532_inRelease(void) {
Pn532.packetbuffer[0] = PN532_COMMAND_INRELEASE;
Pn532.packetbuffer[1] = 1;
if (PN532_writeCommand(Pn532.packetbuffer, 2)) {
return;
}
PN532_readResponse(Pn532.packetbuffer, sizeof(Pn532.packetbuffer));
}
/* void PN532_inSelect(void) { /* void PN532_inSelect(void) {
Pn532.packetbuffer[0] = PN532_COMMAND_INSELECT; Pn532.packetbuffer[0] = PN532_COMMAND_INSELECT;
Pn532.packetbuffer[1] = 1; Pn532.packetbuffer[1] = 1;
@ -356,6 +347,15 @@ void PN532_inRelease(void) {
#ifdef USE_PN532_DATA_FUNCTION #ifdef USE_PN532_DATA_FUNCTION
void PN532_inRelease(void) {
Pn532.packetbuffer[0] = PN532_COMMAND_INRELEASE;
Pn532.packetbuffer[1] = 1;
if (PN532_writeCommand(Pn532.packetbuffer, 2)) {
return;
}
PN532_readResponse(Pn532.packetbuffer, sizeof(Pn532.packetbuffer));
}
uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData) { uint8_t mifareclassic_AuthenticateBlock (uint8_t *uid, uint8_t uidLen, uint32_t blockNumber, uint8_t keyNumber, uint8_t *keyData) {
uint8_t i; uint8_t i;
uint8_t _key[6]; uint8_t _key[6];
@ -679,12 +679,12 @@ void PN532_ScanForTag(void) {
ResponseAppend_P(PSTR(",\"Auth\":\"NOk\"")); ResponseAppend_P(PSTR(",\"Auth\":\"NOk\""));
} }
ResponseAppend_P(PSTR("}}")); ResponseAppend_P(PSTR("}}"));
PN532_inRelease();
#else #else
ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\"}}"), Pn532.uids); ResponseTime_P(PSTR(",\"PN532\":{\"UID\":\"%s\"}}"), Pn532.uids);
#endif // USE_PN532_DATA_FUNCTION #endif // USE_PN532_DATA_FUNCTION
MqttPublishTeleSensor(); MqttPublishTeleSensor();
PN532_inRelease();
Pn532.scantimer = 7; // Ignore tags found for two seconds Pn532.scantimer = 7; // Ignore tags found for two seconds
} }
} }
@ -706,7 +706,7 @@ bool PN532_Command(void) {
if (!strncmp_P(argument,PSTR("ERASE"),5)) { if (!strncmp_P(argument,PSTR("ERASE"),5)) {
memset(Pn532.newdata,0,sizeof(Pn532.newdata)); memset(Pn532.newdata,0,sizeof(Pn532.newdata));
Pn532.function = 1; // Block 1 of next card/tag will be reset to 0x00... Pn532.function = 1; // Block 1 of next card/tag will be reset to 0x00...
AddLog(LOG_LEVEL_INFO, PSTR("NFC: PN532 - Next scanned tag data block 1 will be erased")); AddLog(LOG_LEVEL_INFO, PSTR("NFC: PN532 - Next scanned tag data block will be erased"));
ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"ERASE\"}}")); ResponseTime_P(PSTR(",\"PN532\":{\"COMMAND\":\"ERASE\"}}"));
return serviced; return serviced;
} else } else