From eb15898228cefec4139f8b359a3ef0a908f9147c Mon Sep 17 00:00:00 2001 From: Florian <1technophile@users.noreply.github.com> Date: Thu, 7 Jun 2018 20:17:50 +0200 Subject: [PATCH] Correct deduplicate of received RF and IR signals Regression introduced when introducing the name of the gateway into the topic --- config_IR.h | 2 +- config_RF.h | 2 +- config_RF315.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config_IR.h b/config_IR.h index e9b9eb8..8158eef 100644 --- a/config_IR.h +++ b/config_IR.h @@ -33,7 +33,7 @@ #define subjectIRtoMQTTbits Base_Topic Gateway_Name "/IRtoMQTT/bits" #define subjectIRtoMQTTRaw Base_Topic Gateway_Name "/IRtoMQTT/raw" // subject monitored to listen traffic processed by other gateways to store data and avoid ntuple -#define subjectMultiGTWIR "+/IRtoMQTT" +#define subjectMultiGTWIR "+/+/IRtoMQTT" #define IRbitsKey "IRBITS_" // bits will be defined if a subject contains IRbitsKey followed by a value of 2 digits #define IRRptKey "RPT_" // repeats will be defined if a subject contains IRRptKey followed by a value of 1 digit #define repeatIRwMQTT false // do we repeat a received signal by using mqtt diff --git a/config_RF.h b/config_RF.h index 7bda1ab..17a2c39 100644 --- a/config_RF.h +++ b/config_RF.h @@ -46,7 +46,7 @@ RF supported protocols */ #define RFpulselengthKey "PLSL_" // pulselength will be defined if a subject contains RFprotocolKey followed by a value of 3 digits // subject monitored to listen traffic processed by other gateways to store data and avoid ntuple -#define subjectMultiGTWRF "+/433toMQTT" +#define subjectMultiGTWRF "+/+/433toMQTT" //RF number of signal repetition #define RF_EMITTER_REPEAT 20 diff --git a/config_RF315.h b/config_RF315.h index dae8338..3d48b0e 100644 --- a/config_RF315.h +++ b/config_RF315.h @@ -46,7 +46,7 @@ RF supported protocols */ #define RF315pulselengthKey "PLSL_" // pulselength will be defined if a subject contains RFprotocolKey followed by a value of 3 digits // subject monitored to listen traffic processed by other gateways to store data and avoid ntuple -#define subjectMultiGTWRF315 "+/315toMQTT" +#define subjectMultiGTWRF315 "+/+/315toMQTT" //RF number of signal repetition #define RF315_EMITTER_REPEAT 20