simongehrig/McLighting
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Merge pull request #10 from FabLab-Luenen/development

Browse Source 
changed defaults
This commit is contained in:
bpohvoodoo
2019-03-20 17:18:40 +01:00
committed by GitHub
parent 006a66bed4 e1760bdab0
commit 7c0bc690e8
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Arduino/McLighting/McLighting.ino
+9 -9
View File
@@ -30,6 +30,15 @@
#include <ArduinoJson.h> //https://github.com/bblanchon/ArduinoJson
#if defined(ENABLE_E131)
// ***************************************************************************
// Load libraries for E131 support
// ***************************************************************************
#include <ESPAsyncUDP.h> //https://github.com/me-no-dev/ESPAsyncUDP
#include <ESPAsyncE131.h> //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 <ESPAsyncUDP.h> //https://github.com/me-no-dev/ESPAsyncUDP
#include <ESPAsyncE131.h> //https://github.com/forkineye/ESPAsyncE131
ESPAsyncE131* e131 = NULL; //(END_UNIVERSE - START_UNIVERSE + 1);
#endif
#if defined(ENABLE_REMOTE)
// ***************************************************************************
// Load libraries for IR remote support
Arduino/McLighting/definitions.h
+1 -1
View File
@@ -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
Arduino/McLighting/version_info.ino
+1 -1
View File
@@ -139,5 +139,5 @@
*
* Version Bump to 2.2.3 rgbw 3colors
* PubSubClient Bug fixes
*
* Reverted Pointers for MQTT for the moment
*/