From 4a5c0f93141ba37c16d31bc36553a0f7416b8bc4 Mon Sep 17 00:00:00 2001 From: Patrick Fallberg Date: Wed, 20 Jan 2016 22:07:45 +0100 Subject: [PATCH] Make ESP8266 sketches explicitly declare GW In order to build core tests, there cannot be any hard coded GATEWAY flags (like MY_GATEWAY_ESP8266). These needs to be set in the sketch that implements the gateway. --- libraries/MySensors/MySensor.h | 4 ---- .../MySensors/examples/GatewayESP8266/GatewayESP8266.ino | 1 - .../GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino | 1 + 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/MySensors/MySensor.h b/libraries/MySensors/MySensor.h index 90ef395..36b8bea 100644 --- a/libraries/MySensors/MySensor.h +++ b/libraries/MySensors/MySensor.h @@ -65,10 +65,6 @@ //#undef F //#define F(x) (x) #include "core/MyHwESP8266.cpp" - // Enable gateway feature - #if !defined(MY_CORE_ONLY) - #define MY_GATEWAY_ESP8266 - #endif #elif defined(ARDUINO_ARCH_AVR) #include "core/MyHwATMega328.cpp" #elif defined(ARDUINO_ARCH_SAMD) diff --git a/libraries/MySensors/examples/GatewayESP8266/GatewayESP8266.ino b/libraries/MySensors/examples/GatewayESP8266/GatewayESP8266.ino index d85bd79..803eb7d 100644 --- a/libraries/MySensors/examples/GatewayESP8266/GatewayESP8266.ino +++ b/libraries/MySensors/examples/GatewayESP8266/GatewayESP8266.ino @@ -78,7 +78,6 @@ #define MY_RADIO_NRF24 //#define MY_RADIO_RFM69 -// Gateway mode always enabled for ESP8266. But we add this anyway ;) #define MY_GATEWAY_ESP8266 #define MY_ESP8266_SSID "MySSID" diff --git a/libraries/MySensors/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino b/libraries/MySensors/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino index 4aeb228..60d052e 100644 --- a/libraries/MySensors/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino +++ b/libraries/MySensors/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino @@ -71,6 +71,7 @@ //#define MY_RADIO_RFM69 #define MY_GATEWAY_MQTT_CLIENT +#define MY_GATEWAY_ESP8266 // Set this nodes subscripe and publish topic prefix #define MY_MQTT_PUBLISH_TOPIC_PREFIX "mygateway1-out"