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

Prevent MQTT spamming - don't repeat messages before IB_TIMEOUT.

Browse Source
This commit is contained in:
Roman Bazalevskiy 2020-11-04 09:10:52 +03:00
parent 18fb79d954
commit 180ffaa984
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tasmota/xsns_52_ibeacon.ino
View File

@ -127,6 +127,9 @@ struct IBEACON_UID {
char MINOR[4]; char MINOR[4];
uint8_t FLAGS; uint8_t FLAGS;
uint8_t TIME; uint8_t TIME;
#ifdef USE_IBEACON_ESP32
uint8_t REPTIME;
#endif
} ibeacons[MAX_IBEACONS]; } ibeacons[MAX_IBEACONS];
#ifdef USE_IBEACON_ESP32 #ifdef USE_IBEACON_ESP32
@ -202,7 +205,7 @@ class ESP32BLEScanCallback : public BLEAdvertisedDeviceCallbacks
DumpHex((const unsigned char*)&MAC,6,ib.MAC); DumpHex((const unsigned char*)&MAC,6,ib.MAC);
memcpy(ib.RSSI,sRSSI,4); memcpy(ib.RSSI,sRSSI,4);
if (ibeacon_add(&ib)) { if (ibeacon_add(&ib)==2) {
ibeacon_mqtt(ib.MAC,ib.RSSI,ib.UID,ib.MAJOR,ib.MINOR); ibeacon_mqtt(ib.MAC,ib.RSSI,ib.UID,ib.MAJOR,ib.MINOR);
} }
@ -215,7 +218,7 @@ class ESP32BLEScanCallback : public BLEAdvertisedDeviceCallbacks
DumpHex((const unsigned char*)&MAC,6,ib.MAC); DumpHex((const unsigned char*)&MAC,6,ib.MAC);
memcpy(ib.RSSI,sRSSI,4); memcpy(ib.RSSI,sRSSI,4);
if (ibeacon_add(&ib)) { if (ibeacon_add(&ib)==2) {
ibeacon_mqtt(ib.MAC,ib.RSSI,ib.UID,ib.MAJOR,ib.MINOR); ibeacon_mqtt(ib.MAC,ib.RSSI,ib.UID,ib.MAJOR,ib.MINOR);
} }
} }
@ -304,6 +307,7 @@ void esp32_every_second(void) {
for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) { for (uint32_t cnt=0;cnt<MAX_IBEACONS;cnt++) {
if (ibeacons[cnt].FLAGS) { if (ibeacons[cnt].FLAGS) {
ibeacons[cnt].TIME++; ibeacons[cnt].TIME++;
ibeacons[cnt].REPTIME++;
if (ibeacons[cnt].TIME>IB_TIMEOUT_TIME) { if (ibeacons[cnt].TIME>IB_TIMEOUT_TIME) {
ibeacons[cnt].FLAGS=0; ibeacons[cnt].FLAGS=0;
ibeacon_mqtt(ibeacons[cnt].MAC,"0000",ibeacons[cnt].UID,ibeacons[cnt].MAJOR,ibeacons[cnt].MINOR); ibeacon_mqtt(ibeacons[cnt].MAC,"0000",ibeacons[cnt].UID,ibeacons[cnt].MAJOR,ibeacons[cnt].MINOR);
@ -415,6 +419,12 @@ uint32_t ibeacon_add(struct IBEACON *ib) {
// exists // exists
memcpy(ibeacons[cnt].RSSI,ib->RSSI,4); memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
ibeacons[cnt].TIME=0; ibeacons[cnt].TIME=0;
#ifdef USE_IBEACON_ESP32
if (ibeacons[cnt].REPTIME >= IB_UPDATE_TIME) {
ibeacons[cnt].REPTIME = 0;
return 2;
}
#endif
return 1; return 1;
} }
} else { } else {
@ -422,6 +432,12 @@ uint32_t ibeacon_add(struct IBEACON *ib) {
// exists // exists
memcpy(ibeacons[cnt].RSSI,ib->RSSI,4); memcpy(ibeacons[cnt].RSSI,ib->RSSI,4);
ibeacons[cnt].TIME=0; ibeacons[cnt].TIME=0;
#ifdef USE_IBEACON_ESP32
if (ibeacons[cnt].REPTIME >= IB_UPDATE_TIME) {
ibeacons[cnt].REPTIME = 0;
return 2;
}
#endif
return 1; return 1;
} }
} }
@ -436,6 +452,9 @@ uint32_t ibeacon_add(struct IBEACON *ib) {
memcpy(ibeacons[cnt].MINOR,ib->MINOR,4); memcpy(ibeacons[cnt].MINOR,ib->MINOR,4);
ibeacons[cnt].FLAGS=1; ibeacons[cnt].FLAGS=1;
ibeacons[cnt].TIME=0; ibeacons[cnt].TIME=0;
#ifdef USE_IBEACON_ESP32
ibeacons[cnt].REPTIME = 0;
#endif
return 1; return 1;
} }
} }