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

traces improvements, and code refactoring (RF315)

Browse Source
This commit is contained in:
Florian committed 2019-01-31 20:43:45 +01:00
1 parent a587d9dd2f
commit 238bb4740f
5 files changed
+21 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ZgatewayRF315.ino
+10 -24
View File
@@ -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"));
}
}
}