From e173f368cc800d87453856ea862ad192c53f3736 Mon Sep 17 00:00:00 2001 From: 1technophile Date: Fri, 22 Sep 2017 21:13:30 +0200 Subject: [PATCH] replace hard coded pin name by rf receiver pin --- ZgatewayRF2.ino | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ZgatewayRF2.ino b/ZgatewayRF2.ino index 58fffa9..a7993d3 100644 --- a/ZgatewayRF2.ino +++ b/ZgatewayRF2.ino @@ -54,11 +54,7 @@ struct RF2rxd RF2rxd rf2rd; void setupRF2(){ - #ifdef ESP8266 - NewRemoteReceiver::init(5, 2, rf2Callback); - #else - NewRemoteReceiver::init(0, 2, rf2Callback); - #endif + NewRemoteReceiver::init(RF_RECEIVER_PIN, 2, rf2Callback); trc(F("Receiver RF2 initialized")); pinMode(RF_EMITTER_PIN, OUTPUT); digitalWrite(RF_EMITTER_PIN, LOW); @@ -66,10 +62,10 @@ void setupRF2(){ } boolean RF2toMQTT(){ -//Serial.println("entra rf2tomqtt"); - if(rf2rd.hasNewData){ - rf2rd.hasNewData=false; + if(rf2rd.hasNewData){ + + rf2rd.hasNewData=false; trc(F("Rcv. RF2")); String MQTTAddress; String MQTTperiod; @@ -87,6 +83,7 @@ boolean RF2toMQTT(){ trc(F("Adv data RF2toMQTT")); client.publish((char *)MQTTRF2string.c_str(),(char *)MQTTswitchType.c_str()); return true; + } return false; }