chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Prevent storing duplicate RF/IT signals (#717)

Browse Source 
* Check if signal is duplicate

* Fix storing duplicate RF/IR Codes

* Lint formatting

Co-authored-by: Jonathan Wells <jonathan-wells@oist.jp>
This commit is contained in:
JonandJonathan Wells authored and GitHub committed 2020-08-04 12:18:21 -05:00
1 parent 8d79bebab8
commit 15e7f5ab1a
2 files changed
+11 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main/ZgatewayRF.ino
+2 -1
View File
@@ -94,7 +94,8 @@ void RFtoMQTT() {
RFtoMQTTdiscovery(MQTTvalue); RFtoMQTTdiscovery(MQTTvalue);
# endif # endif
pub(subjectRFtoMQTT, RFdata); pub(subjectRFtoMQTT, RFdata);
Log.trace(F("Store val: %lu" CR), MQTTvalue); // Casting "receivedSignal[o].value" to (unsigned long) because ArduinoLog doesn't support uint64_t for ESP's
Log.trace(F("Store val: %u" CR), (unsigned long)MQTTvalue);
storeSignalValue(MQTTvalue); storeSignalValue(MQTTvalue);
if (repeatRFwMQTT) { if (repeatRFwMQTT) {
Log.trace(F("Pub RF for rpt" CR)); Log.trace(F("Pub RF for rpt" CR));
main/main.ino
+9 -9
View File
@@ -1366,10 +1366,12 @@ void storeSignalValue(SIGNAL_SIZE_UL_ULL MQTTvalue) {
// replace it by the new one // replace it by the new one
receivedSignal[o].value = MQTTvalue; receivedSignal[o].value = MQTTvalue;
receivedSignal[o].time = now; receivedSignal[o].time = now;
Log.trace(F("store code : %u / %u" CR), receivedSignal[o].value, receivedSignal[o].time);
// Casting "receivedSignal[o].value" to (unsigned long) because ArduinoLog doesn't support uint64_t for ESP's
Log.trace(F("store code : %u / %u" CR), (unsigned long)receivedSignal[o].value, receivedSignal[o].time);
Log.trace(F("Col: val/timestamp" CR)); Log.trace(F("Col: val/timestamp" CR));
for (int i = 0; i < struct_size; i++) { for (int i = 0; i < struct_size; i++) {
Log.trace(F("mem code : %u / %u" CR), receivedSignal[i].value, receivedSignal[i].time); Log.trace(F("mem code : %u / %u" CR), (unsigned long)receivedSignal[i].value, receivedSignal[i].time);
} }
} }
@@ -1379,7 +1381,7 @@ void storeSignalValue(SIGNAL_SIZE_UL_ULL MQTTvalue) {
int getMin() { int getMin() {
unsigned int minimum = receivedSignal[0].time; unsigned int minimum = receivedSignal[0].time;
int minindex = 0; int minindex = 0;
for (int i = 0; i < struct_size; i++) { for (int i = 1; i < struct_size; i++) {
if (receivedSignal[i].time < minimum) { if (receivedSignal[i].time < minimum) {
minimum = receivedSignal[i].time; minimum = receivedSignal[i].time;
minindex = i; minindex = i;
@@ -1410,16 +1412,14 @@ void receivingMQTT(char* topicOri, char* datacallback) {
StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer; StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer;
JsonObject& jsondata = jsonBuffer.parseObject(datacallback); JsonObject& jsondata = jsonBuffer.parseObject(datacallback);
if (strstr(topicOri, subjectMultiGTWKey) != NULL) // storing received value so as to avoid publishing this value if it has been already sent by this or another OpenMQTTGateway
{
#if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation) #if defined(ZgatewayRF) || defined(ZgatewayIR) || defined(ZgatewaySRFB) || defined(ZgatewaySRFB) || defined(ZgatewayWeatherStation)
SIGNAL_SIZE_UL_ULL data = 0; if (strstr(topicOri, subjectMultiGTWKey) != NULL) { // storing received value so as to avoid publishing this value if it has been already sent by this or another OpenMQTTGateway
data = jsondata.success() ? jsondata["value"] : STRTO_UL_ULL(datacallback, NULL, 10); SIGNAL_SIZE_UL_ULL data = jsondata.success() ? jsondata["value"] : STRTO_UL_ULL(datacallback, NULL, 10);
if (data != 0) { if (data != 0 && !isAduplicateSignal(data)) {
storeSignalValue(data); storeSignalValue(data);
} }
#endif
} }
#endif
if (jsondata.success()) { // json object ok -> json decoding if (jsondata.success()) { // json object ok -> json decoding
// log the received json // log the received json