From 27fa38ec45351bcb4e3c1dc9b4b51b12de19b313 Mon Sep 17 00:00:00 2001 From: Florian <1technophile@users.noreply.github.com> Date: Thu, 17 Jan 2019 22:55:08 +0100 Subject: [PATCH] Storevalue after pub to avoid duplicates publishing in slow environment --- ZgatewayIR.ino | 2 ++ ZgatewayRF.ino | 2 ++ ZgatewayRF315.ino | 2 ++ ZgatewaySRFB.ino | 2 ++ 4 files changed, 8 insertions(+) diff --git a/ZgatewayIR.ino b/ZgatewayIR.ino index 7d64579..f338ce6 100644 --- a/ZgatewayIR.ino +++ b/ZgatewayIR.ino @@ -146,6 +146,8 @@ void IRtoMQTT(){ } else if (!isAduplicate(MQTTvalue) && MQTTvalue!=0) {// conditions to avoid duplications of RF -->MQTT trc(F("Adv data IRtoMQTT")); pub(subjectIRtoMQTT,IRdata); + trc(F("Store to avoid duplicate")); + storeValue(MQTTvalue); if (repeatIRwMQTT){ trc(F("Pub. IR for repeat")); pub(subjectMQTTtoIR,MQTTvalue); diff --git a/ZgatewayRF.ino b/ZgatewayRF.ino index 3e1f4ad..7f914b3 100644 --- a/ZgatewayRF.ino +++ b/ZgatewayRF.ino @@ -71,6 +71,8 @@ void RFtoMQTT(){ RFtoMQTTdiscovery(MQTTvalue); #endif pub(subjectRFtoMQTT,RFdata); + trc(F("Store to avoid duplicate")); + storeValue(MQTTvalue); if (repeatRFwMQTT){ trc(F("Pub RF for rpt")); pub(subjectMQTTtoRF,RFdata); diff --git a/ZgatewayRF315.ino b/ZgatewayRF315.ino index e69d6a4..195ed3d 100644 --- a/ZgatewayRF315.ino +++ b/ZgatewayRF315.ino @@ -69,6 +69,8 @@ boolean RF315toMQTT(){ if (!isAduplicate(MQTTvalue) && MQTTvalue!=0) {// conditions to avoid duplications of RF -->MQTT trc(F("Adv data RF315toMQTT")); pub(subjectRF315toMQTT,RF315data); + trc(F("Store to avoid duplicate")); + storeValue(MQTTvalue); if (repeatRF315wMQTT){ trc(F("Publish RF315 for repeat")); pub(subjectMQTTtoRF315,RF315data); diff --git a/ZgatewaySRFB.ino b/ZgatewaySRFB.ino index 92c1245..82ff8d0 100644 --- a/ZgatewaySRFB.ino +++ b/ZgatewaySRFB.ino @@ -127,6 +127,8 @@ void _rfbDecode() { if (!isAduplicate(MQTTvalue) && MQTTvalue!=0) {// conditions to avoid duplications of RF -->MQTT trc(F("Adv data SRFBtoMQTT")); pub(subjectSRFBtoMQTT,SRFBdata); + trc(F("Store to avoid duplicate")); + storeValue(MQTTvalue); if (repeatSRFBwMQTT){ trc(F("Publish SRFB for repeat")); pub(subjectMQTTtoSRFB,SRFBdata);