Compile without InfluxDB support by default, removed non-supported light_ir module

code/espurna/config/general.h

@@ -19,7 +19,7 @@
 //------------------------------------------------------------------------------
 
 #ifndef TELNET_SUPPORT
-#define TELNET_SUPPORT          1               // Enable telnet support by default
+#define TELNET_SUPPORT          1               // Enable telnet support by default (3.34Kb)
 #endif
 
 #ifndef TELNET_STA
@@ -81,7 +81,7 @@
 //------------------------------------------------------------------------------
 
 #ifndef TERMINAL_SUPPORT
-#define TERMINAL_SUPPORT         1               // Enable terminal commands
+#define TERMINAL_SUPPORT         1               // Enable terminal commands (0.97Kb)
 #endif
 
 //------------------------------------------------------------------------------
@@ -286,7 +286,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef WEB_SUPPORT
-#define WEB_SUPPORT             1           // Enable web support (http, api)
+#define WEB_SUPPORT             1           // Enable web support (http, api, 121.65Kb)
 #endif
 
 #ifndef WEB_EMBEDDED
@@ -328,11 +328,11 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef MDNS_SUPPORT
-#define MDNS_SUPPORT            1           // Publish services using mDNS by default
+#define MDNS_SUPPORT            1           // Publish services using mDNS by default (1.09Kb)
 #endif
 
 #ifndef LLMNR_SUPPORT
-#define LLMNR_SUPPORT           0           // Publish device using LLMNR protocol by default - requires 2.4.0
+#define LLMNR_SUPPORT           0           // ublish device using LLMNR protocol by default (1.95Kb) - requires 2.4.0
 #endif
 
 // -----------------------------------------------------------------------------
@@ -354,7 +354,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef NOFUSS_SUPPORT
-#define NOFUSS_SUPPORT          0          // Do not enable support for NoFuss by default
+#define NOFUSS_SUPPORT          0          // Do not enable support for NoFuss by default (12.65Kb)
 #endif
 
 #define NOFUSS_ENABLED          0           // Do not perform NoFUSS updates by default
@@ -366,7 +366,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef MQTT_USE_ASYNC
-#define MQTT_USE_ASYNC          1           // Use AysncMQTTClient (1) or PubSubClient (0)
+#define MQTT_USE_ASYNC          1           // Use AysncMQTTClient (1) or PubSubClient (0, 9.83Kb less)
 #endif
 
 // MQTT OVER SSL
@@ -656,7 +656,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef I2C_SUPPORT
-#define I2C_SUPPORT             0           // I2C enabled
+#define I2C_SUPPORT             0           // I2C enabled (1.98Kb)
 #endif
 
 #define I2C_SDA_PIN             4           // SDA GPIO
@@ -669,7 +669,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef DOMOTICZ_SUPPORT
-#define DOMOTICZ_SUPPORT        1               // Build with domoticz support
+#define DOMOTICZ_SUPPORT        1               // Build with domoticz support (1.72Kb)
 #endif
 
 #define DOMOTICZ_ENABLED        0               // Disable domoticz by default
@@ -682,7 +682,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef HOMEASSISTANT_SUPPORT
-#define HOMEASSISTANT_SUPPORT   1               // Build with home assistant support
+#define HOMEASSISTANT_SUPPORT   1               // Build with home assistant support (1.64Kb)
 #endif
 
 #define HOMEASSISTANT_ENABLED   0               // Integration not enabled by default
@@ -693,7 +693,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef INFLUXDB_SUPPORT
-#define INFLUXDB_SUPPORT         1               // Enable InfluxDB support by default
+#define INFLUXDB_SUPPORT        0               // Enable InfluxDB support by default (4.38Kb)
 #endif
 
 #define INFLUXDB_PORT           8086            // Default InfluxDB port
@@ -703,7 +703,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef NTP_SUPPORT
-#define NTP_SUPPORT             1               // Build with NTP support by default
+#define NTP_SUPPORT             1               // Build with NTP support by default (6.78Kb)
 #endif
 
 #define NTP_SERVER              "pool.ntp.org"  // Default NTP server
@@ -717,7 +717,7 @@ PROGMEM const char* const custom_reset_string[] = {
 
 // This setting defines whether Alexa support should be built into the firmware
 #ifndef ALEXA_SUPPORT
-#define ALEXA_SUPPORT           1
+#define ALEXA_SUPPORT           1               // Enable Alexa support by default (9.5Kb)
 #endif
 
 // This is default value for the alexaEnabled setting that defines whether
@@ -738,7 +738,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef IR_SUPPORT
-#define IR_SUPPORT              0               // Do not build with IR support by default
+#define IR_SUPPORT              0               // Do not build with IR support by default (10.25Kb)
 #endif
 
 #ifndef IR_PIN
@@ -765,6 +765,7 @@ PROGMEM const char* const custom_reset_string[] = {
 #define LIGHT_EFFECT_SMOOTH         4
 
 //Remote Buttons SET 1 (for the original Remote shipped with the controller)
+#if IR_SUPPORT
 #if IR_BUTTON_SET == 1
 
     #define IR_BUTTON_COUNT 24
@@ -845,3 +846,4 @@ PROGMEM const char* const custom_reset_string[] = {
     };
 
 #endif
+#endif // IR_SUPPORT

code/espurna/config/hardware.h

@@ -758,8 +758,6 @@
     #define LIGHT_PROVIDER      LIGHT_PROVIDER_DIMMER
     #define DUMMY_RELAY_COUNT   1
 
-    //#define LIGHT_PROVIDER_EXPERIMENTAL_RGB_ONLY_HSV_IR
-
     // LEDs
     #define LED1_PIN            2
     #define LED1_PIN_INVERSE    1

code/espurna/config/prototypes.h

@@ -4,7 +4,6 @@
 #include <AsyncMqttClient.h>
 #include <ArduinoJson.h>
 #include <functional>
-#include <FastLED.h>
 
 AsyncWebServer * webServer();
 

code/espurna/light.ino

@@ -7,7 +7,6 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 */
 
 #if LIGHT_PROVIDER != LIGHT_PROVIDER_NONE
-#ifndef LIGHT_PROVIDER_EXPERIMENTAL_RGB_ONLY_HSV_IR
 
 #include <Ticker.h>
 #include <ArduinoJson.h>
@@ -853,5 +852,4 @@ void lightLoop(){
 }
 
 
-#endif // LIGHT_PROVIDER_EXPERIMENTAL_RGB_ONLY_HSV_IR
 #endif // LIGHT_PROVIDER != LIGHT_PROVIDER_NONE

code/espurna/utils.ino

@@ -142,6 +142,8 @@ void heartbeat() {
     #endif
 
     // Send info to websocket clients
+    #if WEB_SUPPORT
+    #if NTP_SUPPORT
     {
         char buffer[200];
         snprintf_P(
@@ -152,6 +154,8 @@ void heartbeat() {
         );
         wsSend(buffer);
     }
+    #endif
+    #endif
 
 }
 

code/espurna/ws.ino

@@ -174,17 +174,6 @@ void _wsParse(AsyncWebSocketClient *client, uint8_t * payload, size_t length) {
                 }
             }
 
-            #ifdef LIGHT_PROVIDER_EXPERIMENTAL_RGB_ONLY_HSV_IR
-                if (action.equals("anim_mode") && root.containsKey("data")) {
-                    lightAnimMode(root["data"]);
-                    lightUpdate(true, true);
-                }
-                if (action.equals("anim_speed") && root.containsKey("data")) {
-                    lightAnimSpeed(root["data"]);
-                    lightUpdate(true, true);
-                }
-            #endif //LIGHT_PROVIDER_EXPERIMENTAL_RGB_ONLY_HSV_IR
-
         #endif //LIGHT_PROVIDER != LIGHT_PROVIDER_NONE
 
     };
@@ -442,13 +431,13 @@ void _wsStart(uint32_t client_id) {
         root["hostname"] = getSetting("hostname");
         root["network"] = getNetwork();
         root["deviceip"] = getIP();
-        root["time"] = ntpDateTime();
         root["uptime"] = getUptime();
         root["heap"] = ESP.getFreeHeap();
         root["sketch_size"] = ESP.getSketchSize();
         root["free_size"] = ESP.getFreeSketchSpace();
 
         #if NTP_SUPPORT
+            root["time"] = ntpDateTime();
             root["ntpVisible"] = 1;
             root["ntpStatus"] = ntpConnected();
             root["ntpServer1"] = getSetting("ntpServer1", NTP_SERVER);
@@ -492,10 +481,6 @@ void _wsStart(uint32_t client_id) {
                 } else {
                     root["hsv"] = lightColor(false);
                 }
-                #ifdef LIGHT_PROVIDER_EXPERIMENTAL_RGB_ONLY_HSV_IR
-                    root["anim_mode"] = lightAnimMode();
-                    root["anim_speed"] = lightAnimSpeed();
-                #endif // LIGHT_PROVIDER_EXPERIMENTAL_RGB_ONLY_HSV_IR
             }
             JsonArray& channels = root.createNestedArray("channels");
             for (unsigned char id=0; id < lightChannels(); id++) {

code/platformio.ini

@@ -31,7 +31,6 @@ lib_deps =
     https://bitbucket.org/xoseperez/debounceevent.git#2.0.1
     https://github.com/xoseperez/my92xx#3.0.0
     https://github.com/xoseperez/RemoteSwitch-arduino-library.git
-    https://github.com/FastLED/FastLED#v3.1.6
     https://github.com/markszabo/IRremoteESP8266#v2.2.0
 lib_ignore =
 #extra_scripts = post:core_version.py