Merge branch 'master' of https://github.com/1technophile/OpenMQTTGateway
This commit is contained in:
commit
8315ba2869
2 files changed
-3
No files matched your search
@@ -51,7 +51,6 @@ void MQTTtoRF2(char * topicOri, char * datacallback) {
|
|||||||
long valueCODE = 0;
|
long valueCODE = 0;
|
||||||
int valueUNIT = -1;
|
int valueUNIT = -1;
|
||||||
int valuePERIOD = 0;
|
int valuePERIOD = 0;
|
||||||
int valueBIT = 0;
|
|
||||||
|
|
||||||
int pos = topic.lastIndexOf(RF2codeKey);
|
int pos = topic.lastIndexOf(RF2codeKey);
|
||||||
if (pos != -1){
|
if (pos != -1){
|
||||||
|
|||||||
@@ -196,7 +196,6 @@ if ((topic == subjectMQTTtoRFM69) && (valueRCV == defaultRFM69ReceiverId)){
|
|||||||
boolean result = client.publish(subjectGTWRFM69toMQTT, datacallback);
|
boolean result = client.publish(subjectGTWRFM69toMQTT, datacallback);
|
||||||
if (result)trc(F("Ack published"));
|
if (result)trc(F("Ack published"));
|
||||||
return true;
|
return true;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Serial.print("!");
|
Serial.print("!");
|
||||||
@@ -221,7 +220,6 @@ if ((topic == subjectMQTTtoRFM69) && (valueRCV == defaultRFM69ReceiverId)){
|
|||||||
boolean result = client.publish(subjectGTWRFM69toMQTT, datacallback);
|
boolean result = client.publish(subjectGTWRFM69toMQTT, datacallback);
|
||||||
if (result)trc(F("Ack published"));
|
if (result)trc(F("Ack published"));
|
||||||
return true;
|
return true;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Serial.print("!");
|
Serial.print("!");
|
||||||
|
|||||||
Reference in new issue
Block a user