Merge pull request #242 from steadramon/master

ESPilight support
This commit is contained in:
Florian authored and GitHub committed 2018-10-14 07:40:43 +02:00
commit c1e13c5d24
143 files changed
+18599 -1

No files matched your search

+17 -1
View File
@@ -61,7 +61,7 @@
#include <ArduinoJson.h>
// Modules config inclusion
#if defined(ZgatewayRF) || defined(ZgatewayRF2)
#if defined(ZgatewayRF) || defined(ZgatewayRF2) || defined(ZgatewayPilight)
#include "config_RF.h"
#endif
#ifdef ZgatewayRF315
@@ -360,6 +360,9 @@ void setup()
#ifdef ZgatewayRF2
setupRF2();
#endif
#ifdef ZgatewayPilight
setupPilight();
#endif
#ifdef ZgatewaySRFB
setupSRFB();
#endif
@@ -653,6 +656,13 @@ void loop()
timer_led_receive = millis();
}
#endif
#ifdef ZgatewayPilight
if(PilighttoMQTT()){
trc(F("PilighttoMQTT OK"));
digitalWrite(led_receive, LOW);
timer_led_receive = millis();
}
#endif
#ifdef ZgatewaySRFB
if(SRFBtoMQTT())
trc(F("SRFBtoMQTT OK"));
@@ -739,6 +749,9 @@ void stateMeasures(){
#ifdef ZgatewayRF2
modules = modules + ZgatewayRF2;
#endif
#ifdef ZgatewayPilight
modules = modules + ZgatewayPilight;
#endif
#ifdef ZgatewaySRFB
modules = modules + ZgatewaySRFB;
#endif
@@ -832,6 +845,9 @@ digitalWrite(led_send, LOW);
#ifdef ZgatewayRF2
MQTTtoRF2(topicOri, datacallback);
#endif
#ifdef ZgatewayPilight
MQTTtoPilight(topicOri, datacallback);
#endif
#ifdef Zgateway2G
MQTTto2G(topicOri, datacallback);
#endif