diff --git a/CHANGELOG.md b/CHANGELOG.md index fe3eb97cf..f89ec5b9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file. - Backlog timing wraparound (#9995) ### Removed +- PN532 define USE_PN532_CAUSE_EVENTS replaced by generic rule trigger `on pn532#uid=` ## [9.1.0.1] - 20201116 ### Added diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 5aae48b92..e07024aeb 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -100,3 +100,4 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota ### Removed - Version compatibility check +- PN532 define USE_PN532_CAUSE_EVENTS replaced by generic rule trigger `on pn532#uid=` diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 0908fae79..d7cb9696d 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -645,7 +645,6 @@ #define MP3_VOLUME 10 // Set the startup volume on init, the range can be 0..30(max) //#define USE_AZ7798 // Add support for AZ-Instrument 7798 CO2 datalogger (+1k6 code) //#define USE_PN532_HSU // Add support for PN532 using HSU (Serial) interface (+1k8 code, 140 bytes mem) -// #define USE_PN532_CAUSE_EVENTS // Cause event execution for PN532_UID= and PN532_DATA=[if defined] (+ 30 bytes code) // #define USE_PN532_DATA_FUNCTION // Add sensor40 command support for erase, setting data block content (+1k7 code, 388 bytes mem) // #define USE_PN532_DATA_RAW // Allow DATA block to be used by non-alpha-numberic data (+ 80 bytes code, 48 bytes ram) //#define USE_RDM6300 // Add support for RDM6300 125kHz RFID Reader (+0k8) diff --git a/tasmota/xsns_40_pn532.ino b/tasmota/xsns_40_pn532.ino index 535f6cf07..fb6d31354 100644 --- a/tasmota/xsns_40_pn532.ino +++ b/tasmota/xsns_40_pn532.ino @@ -485,17 +485,6 @@ void PN532_ScanForTag(void) { #endif // USE_PN532_DATA_FUNCTION MqttPublishTeleSensor(); -#ifdef USE_PN532_CAUSE_EVENTS - // No more need as function MqttPublishTeleSensor() also triggers rules - char command[71]; -#ifdef USE_PN532_DATA_FUNCTION - sprintf(command,"backlog event PN532_UID=%s;event PN532_DATA=%s", Pn532.uids, card_datas); -#else - sprintf(command,"event PN532_UID=%s", Pn532.uids); -#endif // USE_PN532_DATA_FUNCTION - ExecuteCommand(command, SRC_RULE); -#endif // USE_PN532_CAUSE_EVENTS - Pn532.scantimer = 7; // Ignore tags found for two seconds } } @@ -548,7 +537,7 @@ bool PN532_Command(void) { #ifdef USE_WEBSERVER void PN532_Show(void) { - WSContentSend_PD(PSTR("{s}PN532 UID{m}%s {e}"), Pn532.uids); + WSContentSend_PD(PSTR("{s}PN532 UID{m}%s{e}"), Pn532.uids); } #endif // USE_WEBSERVER