From 063bf76996621de1057a7d4f4d7f9135041a4696 Mon Sep 17 00:00:00 2001
From: 1technophile <florian.robert@gmail.com>
Date: Tue, 23 May 2017 21:42:54 +0200
Subject: [PATCH] RF bits length settable into mqtt topic

#24
---
 ZgatewayRF.ino | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ZgatewayRF.ino b/ZgatewayRF.ino
index fd75d90..63b7876 100644
--- a/ZgatewayRF.ino
+++ b/ZgatewayRF.ino
@@ -77,6 +77,7 @@ void MQTTtoRF(char * topicOri, char * datacallback) {
   String topic = topicOri;
   int valuePRT = 0;
   int valuePLSL  = 0;
+  int valueBITS  = 0;
   int pos = topic.lastIndexOf(RFprotocolKey);       
   if (pos != -1){
     pos = pos + +strlen(RFprotocolKey);
@@ -92,8 +93,15 @@ void MQTTtoRF(char * topicOri, char * datacallback) {
     trc(F("RF Pulse Length:"));
     trc(String(valuePLSL));
   }
+  int pos3 = topic.lastIndexOf(RFbitsKey);       
+  if (pos3 != -1){
+    pos3 = pos3 + strlen(RFbitsKey);
+    valueBITS = (topic.substring(pos3,pos3 + 2)).toInt();
+    trc(F("Bits number:"));
+    trc(String(valueBITS));
+  }
   
-  if ((topic == subjectMQTTtoRF) && (valuePRT == 0) && (valuePLSL  == 0)){
+  if ((topic == subjectMQTTtoRF) && (valuePRT == 0) && (valuePLSL  == 0) && (valueBITS == 0)){
     trc(F("Sending data by RF, default parameters"));
     mySwitch.setProtocol(1,350);
     mySwitch.send(data, 24);
@@ -101,14 +109,16 @@ void MQTTtoRF(char * topicOri, char * datacallback) {
     boolean result = client.publish(subjectGTWRFtoMQTT, datacallback);
     if (result)trc(F("Ack of reception published"));
     
-  } else if ((valuePRT != 0) || (valuePLSL  != 0)){
+  } else if ((valuePRT != 0) || (valuePLSL  != 0)|| (valueBITS  != 0)){
     trc(F("Sending data by RF, MQTT parameters"));
     if (valuePRT == 0) valuePRT = 1;
     if (valuePLSL == 0) valuePLSL = 350;
+    if (valueBITS == 0) valueBITS = 24;
     trc(String(valuePRT));
     trc(String(valuePLSL));
+    trc(String(valueBITS));
     mySwitch.setProtocol(valuePRT,valuePLSL);
-    mySwitch.send(data, 24);
+    mySwitch.send(data, valueBITS);
     // Acknowledgement to the GTWRF topic 
     boolean result = client.publish(subjectGTWRFtoMQTT, datacallback);// we acknowledge the sending by publishing the value to an acknowledgement topic, for the moment even if it is a signal repetition we acknowledge also
     if (result){