From 238bb4740f68048a66e9926769c742dcb2a7b3d8 Mon Sep 17 00:00:00 2001 From: Florian <1technophile@users.noreply.github.com> Date: Thu, 31 Jan 2019 20:43:45 +0100 Subject: [PATCH] traces improvements, and code refactoring (RF315) --- ZgatewayIR.ino | 3 ++- ZgatewayRF.ino | 7 ++++--- ZgatewayRF2.ino | 7 +++---- ZgatewayRF315.ino | 34 ++++++++++------------------------ ZgatewaySRFB.ino | 4 ++-- 5 files changed, 21 insertions(+), 34 deletions(-) diff --git a/ZgatewayIR.ino b/ZgatewayIR.ino index 46253b1..ca1492f 100644 --- a/ZgatewayIR.ino +++ b/ZgatewayIR.ino @@ -483,7 +483,7 @@ void IRtoMQTT(){ void MQTTtoIR(char * topicOri, JsonObject& IRdata) { if (strcmp(topicOri,subjectMQTTtoIR) == 0){ - trc(F("MQTTtoIR json data analysis")); + trc(F("MQTTtoIR json")); unsigned long data = IRdata["value"]; const char * raw = IRdata["raw"]; if (data != 0||raw) { @@ -781,6 +781,7 @@ void IRtoMQTT(){ signalSent = true; } if (signalSent){ // 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 + trc(F("MQTTtoIR OK")); pub(subjectGTWIRtoMQTT, IRdata); } irrecv.enableIRIn(); // ReStart the IR receiver (if not restarted it is not able to receive data) diff --git a/ZgatewayRF.ino b/ZgatewayRF.ino index 7f914b3..6d29d2a 100644 --- a/ZgatewayRF.ino +++ b/ZgatewayRF.ino @@ -159,17 +159,18 @@ void MQTTtoRF(char * topicOri, char * datacallback) { void MQTTtoRF(char * topicOri, JsonObject& RFdata) { // json object decoding if (strcmp(topicOri,subjectMQTTtoRF) == 0){ - trc(F("MQTTtoRF json analysis")); + trc(F("MQTTtoRF json")); unsigned long data = RFdata["value"]; if (data != 0) { int valuePRT = RFdata["protocol"]|1; int valuePLSL = RFdata["delay"]|350; int valueBITS = RFdata["length"]|24; mySwitch.setProtocol(valuePRT,valuePLSL); - mySwitch.send(data, valueBITS); + mySwitch.send(data, valueBITS); + trc(F("MQTTtoRF OK")); pub(subjectGTWRFtoMQTT, RFdata);// 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 }else{ - trc(F("MQTTtoRF Fail read json")); + trc(F("MQTTtoRF Fail json")); } } } diff --git a/ZgatewayRF2.ino b/ZgatewayRF2.ino index 144cf49..4c18f3b 100644 --- a/ZgatewayRF2.ino +++ b/ZgatewayRF2.ino @@ -218,7 +218,7 @@ void rf2Callback(unsigned int period, unsigned long address, unsigned long group void MQTTtoRF2(char * topicOri, JsonObject& RF2data) { // json object decoding if (strcmp(topicOri,subjectMQTTtoRF2) == 0){ - trc(F("MQTTtoRF2 json data analysis")); + trc(F("MQTTtoRF2 json")); int boolSWITCHTYPE = RF2data["switchType"] | 99; if (boolSWITCHTYPE != 99) { trc(F("MQTTtoRF2 switch type ok")); @@ -240,9 +240,8 @@ void rf2Callback(unsigned int period, unsigned long address, unsigned long group trc(boolSWITCHTYPE); trc(valueDIM); NewRemoteReceiver::disable(); - trc(F("Creating transmitter")); NewRemoteTransmitter transmitter(valueCODE, RF_EMITTER_PIN, valuePERIOD); - trc(F("Sending data")); + trc(F("Sending")); if (valueGROUP) { if (isDimCommand) { transmitter.sendGroupDim(valueDIM); @@ -259,7 +258,7 @@ void rf2Callback(unsigned int period, unsigned long address, unsigned long group transmitter.sendUnit(valueUNIT, boolSWITCHTYPE); } } - trc(F("Data sent")); + trc(F("MQTTtoRF2 OK")); NewRemoteReceiver::enable(); // Publish state change back to MQTT diff --git a/ZgatewayRF315.ino b/ZgatewayRF315.ino index 195ed3d..c9aa4ec 100644 --- a/ZgatewayRF315.ino +++ b/ZgatewayRF315.ino @@ -139,32 +139,18 @@ boolean RF315toMQTT(){ void MQTTtoRF315(char * topicOri, JsonObject& RF315data) { // json object decoding if (strcmp(topicOri,subjectMQTTtoRF315) == 0){ - trc(F("MQTTtoRF315 json data analysis")); + trc(F("MQTTtoRF315 json")); unsigned long data = RF315data["value"]; if (data != 0) { - trc(F("MQTTtoRF315 data ok")); - int valuePRT = RF315data["protocol"]; - int valuePLSL = RF315data["delay"]; - int valueBITS = RF315data["length"]; - if ((valuePRT == 0) && (valuePLSL == 0) && (valueBITS == 0)){ - trc(F("MQTTtoRF315 dflt")); - mySwitch315.setProtocol(1,350); - mySwitch315.send(data, 24); - // Acknowledgement to the GTWRF topic - pub(subjectGTWRF315toMQTT, RF315data); - } else if ((valuePRT != 0) || (valuePLSL != 0)|| (valueBITS != 0)){ - trc(F("MQTTtoRF315 usr par.")); - if (valuePRT == 0) valuePRT = 1; - if (valuePLSL == 0) valuePLSL = 350; - if (valueBITS == 0) valueBITS = 24; - trc(valuePRT); - trc(valuePLSL); - trc(valueBITS); - mySwitch315.setProtocol(valuePRT,valuePLSL); - mySwitch315.send(data, valueBITS); - // Acknowledgement to the GTWRF topic - pub(subjectGTWRF315toMQTT, RF315data);// 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 - } + int valuePRT = RF315data["protocol"]|1; + int valuePLSL = RF315data["delay"]|350; + int valueBITS = RF315data["length"]|24; + mySwitch315.setProtocol(valuePRT,valuePLSL); + mySwitch315.send(data, valueBITS); + trc(F("MQTTtoRF315 OK")); + pub(subjectGTWRF315toMQTT, RFdata);// 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 + }else{ + trc(F("MQTTtoRF315 Fail json")); } } } diff --git a/ZgatewaySRFB.ino b/ZgatewaySRFB.ino index 82ff8d0..3419937 100644 --- a/ZgatewaySRFB.ino +++ b/ZgatewaySRFB.ino @@ -277,7 +277,7 @@ bool _rfbToChar(byte * in, char * out) { const char * raw = SRFBdata["raw"]; int valueRPT = SRFBdata["repeat"]|1; if (strcmp(topicOri,subjectMQTTtoSRFB) == 0){ - trc(F("MQTTtoSRFB json data analysis")); + trc(F("MQTTtoSRFB json")); if (raw){ // send raw in priority when defined in the json trc(F("MQTTtoSRFB raw ok")); byte message_b[RF_MESSAGE_SIZE]; @@ -320,7 +320,7 @@ bool _rfbToChar(byte * in, char * out) { memcpy(message_b + 4, hex_valueMaxiPLSL, 2); memcpy(message_b + 6, hex_data, 3); - trc(F("MQTTtoSRFB send")); + trc(F("MQTTtoSRFB OK")); _rfbSend(message_b, valueRPT); // Acknowledgement to the GTWRF topic pub(subjectGTWSRFBtoMQTT, SRFBdata);// 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