From e1760bdab032ce4a616897ca09f748857c5acc92 Mon Sep 17 00:00:00 2001 From: bpohvoodoo Date: Wed, 20 Mar 2019 17:17:00 +0100 Subject: [PATCH] changed defaults --- Arduino/McLighting/McLighting.ino | 18 +++++++++--------- Arduino/McLighting/definitions.h | 2 +- Arduino/McLighting/version_info.ino | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Arduino/McLighting/McLighting.ino b/Arduino/McLighting/McLighting.ino index 17da1de..aadf19d 100644 --- a/Arduino/McLighting/McLighting.ino +++ b/Arduino/McLighting/McLighting.ino @@ -30,6 +30,15 @@ #include //https://github.com/bblanchon/ArduinoJson +#if defined(ENABLE_E131) +// *************************************************************************** +// Load libraries for E131 support +// *************************************************************************** + #include //https://github.com/me-no-dev/ESPAsyncUDP + #include //https://github.com/forkineye/ESPAsyncE131 + ESPAsyncE131* e131 = NULL; //(END_UNIVERSE - START_UNIVERSE + 1); +#endif + // MQTT #if defined(ENABLE_MQTT) #if ENABLE_MQTT == 0 @@ -59,15 +68,6 @@ #endif #endif -#if defined(ENABLE_E131) -// *************************************************************************** -// Load libraries for E131 support -// *************************************************************************** - #include //https://github.com/me-no-dev/ESPAsyncUDP - #include //https://github.com/forkineye/ESPAsyncE131 - ESPAsyncE131* e131 = NULL; //(END_UNIVERSE - START_UNIVERSE + 1); -#endif - #if defined(ENABLE_REMOTE) // *************************************************************************** // Load libraries for IR remote support diff --git a/Arduino/McLighting/definitions.h b/Arduino/McLighting/definitions.h index 3ac3024..df3f995 100644 --- a/Arduino/McLighting/definitions.h +++ b/Arduino/McLighting/definitions.h @@ -12,7 +12,7 @@ char HOSTNAME[65] = "McLightingRGBW"; // Friedly hostname is configurable just for the start #define ENABLE_OTA 1 // If defined, enable Arduino OTA code. If set to 0 enable Arduino OTA code, if set to 1 enable ESP8266HTTPUpdateServer OTA code. -#define ENABLE_MQTT 0 // If defined use MQTT OR AMQTT, if set to 0 enable MQTT client code, see: https://github.com/toblum/McLighting/wiki/MQTT-API, if set to 1, enable Async MQTT code, see: https://github.com/marvinroger/async-mqtt-client +#define ENABLE_MQTT 1 // If defined use MQTT OR AMQTT, if set to 0 enable MQTT client code, see: https://github.com/toblum/McLighting/wiki/MQTT-API, if set to 1, enable Async MQTT code, see: https://github.com/marvinroger/async-mqtt-client //#define ENABLE_MQTT_HOSTNAME_CHIPID // Uncomment/comment to add ESPChipID to end of MQTT hostname #define ENABLE_HOMEASSISTANT // If defined, enable Homeassistant integration, ENABLE_MQTT must be active #define MQTT_HOME_ASSISTANT_SUPPORT // If defined, use AMQTT and select Tools -> IwIP Variant -> Higher Bandwidth diff --git a/Arduino/McLighting/version_info.ino b/Arduino/McLighting/version_info.ino index e8d8911..174c5db 100644 --- a/Arduino/McLighting/version_info.ino +++ b/Arduino/McLighting/version_info.ino @@ -139,5 +139,5 @@ * * Version Bump to 2.2.3 rgbw 3colors * PubSubClient Bug fixes - * + * Reverted Pointers for MQTT for the moment */