Merge branch 'dev' of https://github.com/xoseperez/espurna into CCT_Support

code/espurna/config/all.h

@@ -24,12 +24,15 @@
 #endif
 
 #include "version.h"
+#include "types.h"
 #include "arduino.h"
 #include "hardware.h"
 #include "defaults.h"
 #include "general.h"
 #include "prototypes.h"
 #include "sensors.h"
+#include "progmem.h"
+#include "dependencies.h"
 
 #ifdef USE_CORE_VERSION_H
 #include "core_version.h"

code/espurna/config/defaults.h

@@ -404,14 +404,6 @@
 #define HOSTNAME ""
 #endif
 
-// Needed for ESP8285 boards under Windows using PlatformIO (?)
-#ifndef BUTTON_PUSHBUTTON
-#define BUTTON_PUSHBUTTON   0
-#define BUTTON_SWITCH       1
-#define BUTTON_DEFAULT_HIGH 2
-#define BUTTON_SET_PULLUP   4
-#endif
-
 // Relay providers
 #ifndef RELAY_PROVIDER
 #define RELAY_PROVIDER          RELAY_PROVIDER_RELAY

code/espurna/config/dependencies.h

@@ -0,0 +1,66 @@
+#pragma once
+
+//------------------------------------------------------------------------------
+// Do not change this file unless you know what you are doing
+// Configuration settings are in the general.h file
+//------------------------------------------------------------------------------
+
+#if DEBUG_TELNET_SUPPORT
+#undef TELNET_SUPPORT
+#define TELNET_SUPPORT              1
+#endif
+
+#if not WEB_SUPPORT
+#undef DEBUG_WEB_SUPPORT
+#define DEBUG_WEB_SUPPORT           0
+#endif
+
+#if not WEB_SUPPORT
+#undef SSDP_SUPPORT
+#define SSDP_SUPPORT                0           // SSDP support requires web support
+#endif
+
+#if UART_MQTT_SUPPORT
+#define MQTT_SUPPORT                1
+#undef TERMINAL_SUPPORT
+#define TERMINAL_SUPPORT            0
+#undef DEBUG_SERIAL_SUPPORT
+#define DEBUG_SERIAL_SUPPORT        0
+#endif
+
+#if DOMOTICZ_SUPPORT
+#undef MQTT_SUPPORT
+#define MQTT_SUPPORT                1               // If Domoticz enabled enable MQTT
+#endif
+
+#if HOMEASSISTANT_SUPPORT
+#undef MQTT_SUPPORT
+#define MQTT_SUPPORT                1               // If Home Assistant enabled enable MQTT
+#endif
+
+#ifndef ASYNC_TCP_SSL_ENABLED
+#if THINGSPEAK_USE_SSL && THINGSPEAK_USE_ASYNC
+#undef THINGSPEAK_SUPPORT                       // Thingspeak in ASYNC mode requires ASYNC_TCP_SSL_ENABLED
+#endif
+#endif
+
+#if SCHEDULER_SUPPORT
+#undef NTP_SUPPORT
+#define NTP_SUPPORT                 1           // Scheduler needs NTP
+#endif
+
+// -----------------------------------------------------------------------------
+// Debug
+// -----------------------------------------------------------------------------
+
+#define DEBUG_SUPPORT           DEBUG_SERIAL_SUPPORT || DEBUG_UDP_SUPPORT || DEBUG_TELNET_SUPPORT || DEBUG_WEB_SUPPORT
+
+#if DEBUG_SUPPORT
+    #define DEBUG_MSG(...) debugSend(__VA_ARGS__)
+    #define DEBUG_MSG_P(...) debugSend_P(__VA_ARGS__)
+#endif
+
+#ifndef DEBUG_MSG
+    #define DEBUG_MSG(...)
+    #define DEBUG_MSG_P(...)
+#endif

code/espurna/config/general.h

@@ -10,36 +10,17 @@
 #define DEVICE_NAME             MANUFACTURER "_" DEVICE     // Concatenate both to get a unique device name
 
 #ifndef ADMIN_PASS
-#define ADMIN_PASS              "fibonacci" // Default password (WEB, OTA, WIFI)
+#define ADMIN_PASS              "fibonacci"     // Default password (WEB, OTA, WIFI)
 #endif
 
 #ifndef USE_PASSWORD
-#define USE_PASSWORD            1           // Insecurity caution! Disabling this will disable password querying completely.
+#define USE_PASSWORD            1               // Insecurity caution! Disabling this will disable password querying completely.
 #endif
 
 #ifndef LOOP_DELAY_TIME
-#define LOOP_DELAY_TIME         10          // Delay for this millis in the main loop [0-250]
+#define LOOP_DELAY_TIME         10              // Delay for this millis in the main loop [0-250]
 #endif
 
-
-#define ARRAYINIT(type, name, ...) \
-    type name[] = {__VA_ARGS__};
-
-//------------------------------------------------------------------------------
-// TELNET
-//------------------------------------------------------------------------------
-
-#ifndef TELNET_SUPPORT
-#define TELNET_SUPPORT          1               // Enable telnet support by default (3.34Kb)
-#endif
-
-#ifndef TELNET_STA
-#define TELNET_STA              0               // By default, disallow connections via STA interface
-#endif
-
-#define TELNET_PORT             23              // Port to listen to telnet clients
-#define TELNET_MAX_CLIENTS      1               // Max number of concurrent telnet clients
-
 //------------------------------------------------------------------------------
 // DEBUG
 //------------------------------------------------------------------------------
@@ -70,7 +51,7 @@
 #endif
 
 #ifndef SERIAL_RX_PORT
-#define SERIAL_RX_PORT          Serial			// This setting is usually defined
+#define SERIAL_RX_PORT          Serial          // This setting is usually defined
                                                 // in the hardware.h file for those
                                                 // boards that require it
 #endif
@@ -100,44 +81,30 @@
 //------------------------------------------------------------------------------
 
 #ifndef DEBUG_TELNET_SUPPORT
-#define DEBUG_TELNET_SUPPORT    TELNET_SUPPORT  // Enable telnet debug log if telnet is enabled too
-#endif
-
-#if DEBUG_TELNET_SUPPORT
-#undef TELNET_SUPPORT
-#define TELNET_SUPPORT          1
+#define DEBUG_TELNET_SUPPORT    1               // Enable telnet debug log (will only work if TELNET_SUPPORT is also 1)
 #endif
 
 //------------------------------------------------------------------------------
 
 #ifndef DEBUG_WEB_SUPPORT
-#define DEBUG_WEB_SUPPORT       WEB_SUPPORT  // Enable web debug log if web is enabled too
-#endif
-
-#if DEBUG_WEB_SUPPORT
-#undef WEB_SUPPORT
-#define WEB_SUPPORT             1           // Chicken and egg :)
-#endif
-
-#ifndef DEBUG_WEB_ENABLED
-#define DEBUG_WEB_ENABLED       1           // Enable debug output by default
+#define DEBUG_WEB_SUPPORT       1               // Enable web debug log (will only work if WEB_SUPPORT is also 1)
 #endif
 
+//------------------------------------------------------------------------------
+// TELNET
 //------------------------------------------------------------------------------
 
-// General debug options and macros
-#define DEBUG_SUPPORT           DEBUG_SERIAL_SUPPORT || DEBUG_UDP_SUPPORT || DEBUG_TELNET_SUPPORT
-
-#if DEBUG_SUPPORT
-    #define DEBUG_MSG(...) debugSend(__VA_ARGS__)
-    #define DEBUG_MSG_P(...) debugSend_P(__VA_ARGS__)
+#ifndef TELNET_SUPPORT
+#define TELNET_SUPPORT          1               // Enable telnet support by default (3.34Kb)
 #endif
 
-#ifndef DEBUG_MSG
-    #define DEBUG_MSG(...)
-    #define DEBUG_MSG_P(...)
+#ifndef TELNET_STA
+#define TELNET_STA              0               // By default, disallow connections via STA interface
 #endif
 
+#define TELNET_PORT             23              // Port to listen to telnet clients
+#define TELNET_MAX_CLIENTS      1               // Max number of concurrent telnet clients
+
 //------------------------------------------------------------------------------
 // TERMINAL
 //------------------------------------------------------------------------------
@@ -156,7 +123,9 @@
 #define SYSTEM_CHECK_ENABLED    1               // Enable crash check by default
 #endif
 
+#ifndef SYSTEM_CHECK_MAX
 #define SYSTEM_CHECK_TIME       60000           // The system is considered stable after these many millis
+#endif
 
 #ifndef SYSTEM_CHECK_MAX
 #define SYSTEM_CHECK_MAX        5               // After this many crashes on boot
@@ -183,7 +152,10 @@
 #define HEARTBEAT_ENABLED           1
 #endif
 
+#ifndef HEARTBEAT_INTERVAL
 #define HEARTBEAT_INTERVAL          300000      // Interval between heartbeat messages (in ms)
+#endif
+
 #define UPTIME_OVERFLOW             4294967295  // Uptime overflow value
 
 // Topics that will be reported in heartbeat
@@ -206,48 +178,15 @@
 //------------------------------------------------------------------------------
 // Load average
 //------------------------------------------------------------------------------
+
 #ifndef LOADAVG_INTERVAL
-#define LOADAVG_INTERVAL        30000   // Interval between calculating load average (in ms)
+#define LOADAVG_INTERVAL        30000           // Interval between calculating load average (in ms)
 #endif
 
 #ifndef LOADAVG_REPORT
-#define LOADAVG_REPORT          1       // Should we report Load average over MQTT?
+#define LOADAVG_REPORT          1               // Should we report Load average over MQTT?
 #endif
 
-//------------------------------------------------------------------------------
-// RESET
-//------------------------------------------------------------------------------
-
-#define CUSTOM_RESET_HARDWARE   1               // Reset from hardware button
-#define CUSTOM_RESET_WEB        2               // Reset from web interface
-#define CUSTOM_RESET_TERMINAL   3               // Reset from terminal
-#define CUSTOM_RESET_MQTT       4               // Reset via MQTT
-#define CUSTOM_RESET_RPC        5               // Reset via RPC (HTTP)
-#define CUSTOM_RESET_OTA        6               // Reset after successful OTA update
-#define CUSTOM_RESET_HTTP       7               // Reset via HTTP GET
-#define CUSTOM_RESET_NOFUSS     8               // Reset after successful NOFUSS update
-#define CUSTOM_RESET_UPGRADE    9               // Reset after update from web interface
-#define CUSTOM_RESET_FACTORY    10              // Factory reset from terminal
-
-#define CUSTOM_RESET_MAX        10
-
-PROGMEM const char custom_reset_hardware[] = "Hardware button";
-PROGMEM const char custom_reset_web[] = "Reboot from web interface";
-PROGMEM const char custom_reset_terminal[] = "Reboot from terminal";
-PROGMEM const char custom_reset_mqtt[] = "Reboot from MQTT";
-PROGMEM const char custom_reset_rpc[] = "Reboot from RPC";
-PROGMEM const char custom_reset_ota[] = "Reboot after successful OTA update";
-PROGMEM const char custom_reset_http[] = "Reboot from HTTP";
-PROGMEM const char custom_reset_nofuss[] = "Reboot after successful NoFUSS update";
-PROGMEM const char custom_reset_upgrade[] = "Reboot after successful web update";
-PROGMEM const char custom_reset_factory[] = "Factory reset";
-PROGMEM const char* const custom_reset_string[] = {
-    custom_reset_hardware, custom_reset_web, custom_reset_terminal,
-    custom_reset_mqtt, custom_reset_rpc, custom_reset_ota,
-    custom_reset_http, custom_reset_nofuss, custom_reset_upgrade,
-    custom_reset_factory
-};
-
 //------------------------------------------------------------------------------
 // BUTTON
 //------------------------------------------------------------------------------
@@ -268,52 +207,10 @@ PROGMEM const char* const custom_reset_string[] = {
 #define BUTTON_LNGLNGCLICK_DELAY    10000       // Time in ms holding the button down to get a long-long click
 #endif
 
-#define BUTTON_EVENT_NONE           0
-#define BUTTON_EVENT_PRESSED        1
-#define BUTTON_EVENT_RELEASED       2
-#define BUTTON_EVENT_CLICK          2
-#define BUTTON_EVENT_DBLCLICK       3
-#define BUTTON_EVENT_LNGCLICK       4
-#define BUTTON_EVENT_LNGLNGCLICK    5
-
-#define BUTTON_MODE_NONE            0
-#define BUTTON_MODE_TOGGLE          1
-#define BUTTON_MODE_ON              2
-#define BUTTON_MODE_OFF             3
-#define BUTTON_MODE_AP              4
-#define BUTTON_MODE_RESET           5
-#define BUTTON_MODE_PULSE           6
-#define BUTTON_MODE_FACTORY         7
-
 //------------------------------------------------------------------------------
 // RELAY
 //------------------------------------------------------------------------------
 
-#define RELAY_BOOT_OFF              0
-#define RELAY_BOOT_ON               1
-#define RELAY_BOOT_SAME             2
-#define RELAY_BOOT_TOGGLE           3
-
-#define RELAY_TYPE_NORMAL           0
-#define RELAY_TYPE_INVERSE          1
-#define RELAY_TYPE_LATCHED          2
-#define RELAY_TYPE_LATCHED_INVERSE  3
-
-#define RELAY_SYNC_ANY              0
-#define RELAY_SYNC_NONE_OR_ONE      1
-#define RELAY_SYNC_ONE              2
-#define RELAY_SYNC_SAME             3
-
-#define RELAY_PULSE_NONE            0
-#define RELAY_PULSE_OFF             1
-#define RELAY_PULSE_ON              2
-
-#define RELAY_PROVIDER_RELAY        0
-#define RELAY_PROVIDER_DUAL         1
-#define RELAY_PROVIDER_LIGHT        2
-#define RELAY_PROVIDER_RFBRIDGE     3
-#define RELAY_PROVIDER_STM          4
-
 // Default boot mode: 0 means OFF, 1 ON and 2 whatever was before
 #ifndef RELAY_BOOT_MODE
 #define RELAY_BOOT_MODE             RELAY_BOOT_OFF
@@ -354,102 +251,87 @@ PROGMEM const char* const custom_reset_string[] = {
 #define RELAY_SAVE_DELAY            1000
 #endif
 
-//------------------------------------------------------------------------------
-// LED
-//------------------------------------------------------------------------------
-
-#define LED_MODE_MQTT               0       // LED will be managed from MQTT (OFF by default)
-#define LED_MODE_WIFI               1       // LED will blink according to the WIFI status
-#define LED_MODE_FOLLOW             2       // LED will follow state of linked relay (check RELAY#_LED)
-#define LED_MODE_FOLLOW_INVERSE     3       // LED will follow the opposite state of linked relay (check RELAY#_LED)
-#define LED_MODE_FINDME             4       // LED will be ON if all relays are OFF
-#define LED_MODE_FINDME_WIFI        5       // A mixture between WIFI and FINDME
-#define LED_MODE_ON                 6       // LED always ON
-#define LED_MODE_OFF                7       // LED always OFF
-#define LED_MODE_RELAY              8       // If any relay is ON, LED will be ON, otherwise OFF
-#define LED_MODE_RELAY_WIFI         9       // A mixture between WIFI and RELAY, the reverse of MIXED
-
 // -----------------------------------------------------------------------------
 // WIFI
 // -----------------------------------------------------------------------------
 
 #ifndef WIFI_CONNECT_TIMEOUT
-#define WIFI_CONNECT_TIMEOUT    60000               // Connecting timeout for WIFI in ms
+#define WIFI_CONNECT_TIMEOUT        60000               // Connecting timeout for WIFI in ms
 #endif
 
 #ifndef WIFI_RECONNECT_INTERVAL
-#define WIFI_RECONNECT_INTERVAL 180000              // If could not connect to WIFI, retry after this time in ms
+#define WIFI_RECONNECT_INTERVAL     180000              // If could not connect to WIFI, retry after this time in ms
 #endif
 
-#define WIFI_MAX_NETWORKS       5                   // Max number of WIFI connection configurations
+#define WIFI_MAX_NETWORKS           5                   // Max number of WIFI connection configurations
 
 #ifndef WIFI_AP_MODE
-#define WIFI_AP_MODE            AP_MODE_ALONE
+#define WIFI_AP_MODE                AP_MODE_ALONE
 #endif
 
 #ifndef WIFI_SLEEP_MODE
-#define WIFI_SLEEP_MODE         WIFI_NONE_SLEEP     // WIFI_NONE_SLEEP, WIFI_LIGHT_SLEEP or WIFI_MODEM_SLEEP
+#define WIFI_SLEEP_MODE             WIFI_NONE_SLEEP     // WIFI_NONE_SLEEP, WIFI_LIGHT_SLEEP or WIFI_MODEM_SLEEP
 #endif
 
 #ifndef WIFI_SCAN_NETWORKS
-#define WIFI_SCAN_NETWORKS      1                   // Perform a network scan before connecting
+#define WIFI_SCAN_NETWORKS          1                   // Perform a network scan before connecting
 #endif
 
 // Optional hardcoded configuration (up to 2 networks)
 #ifndef WIFI1_SSID
-#define WIFI1_SSID              ""
+#define WIFI1_SSID                  ""
 #endif
 
 #ifndef WIFI1_PASS
-#define WIFI1_PASS              ""
+#define WIFI1_PASS                  ""
 #endif
 
 #ifndef WIFI1_IP
-#define WIFI1_IP                ""
+#define WIFI1_IP                    ""
 #endif
 
 #ifndef WIFI1_GW
-#define WIFI1_GW                ""
+#define WIFI1_GW                    ""
 #endif
 
 #ifndef WIFI1_MASK
-#define WIFI1_MASK              ""
+#define WIFI1_MASK                  ""
 #endif
 
 #ifndef WIFI1_DNS
-#define WIFI1_DNS               ""
+#define WIFI1_DNS                   ""
 #endif
 
 #ifndef WIFI2_SSID
-#define WIFI2_SSID              ""
+#define WIFI2_SSID                  ""
 #endif
 
 #ifndef WIFI2_PASS
-#define WIFI2_PASS              ""
+#define WIFI2_PASS                  ""
 #endif
 
 #ifndef WIFI2_IP
-#define WIFI2_IP                ""
+#define WIFI2_IP                    ""
 #endif
 
 #ifndef WIFI2_GW
-#define WIFI2_GW                ""
+#define WIFI2_GW                    ""
 #endif
 
 #ifndef WIFI2_MASK
-#define WIFI2_MASK              ""
+#define WIFI2_MASK                  ""
 #endif
 
 #ifndef WIFI2_DNS
-#define WIFI2_DNS               ""
+#define WIFI2_DNS                   ""
 #endif
 
 #ifndef WIFI_RSSI_1M
-#define WIFI_RSSI_1M            -30         // Calibrate it with your router reading the RSSI at 1m
+#define WIFI_RSSI_1M                -30         // Calibrate it with your router reading the RSSI at 1m
 #endif
 
 #ifndef WIFI_PROPAGATION_CONST
-#define WIFI_PROPAGATION_CONST  4           // This is typically something between 2.7 to 4.3 (free space is 2)
+#define WIFI_PROPAGATION_CONST      4           // This is typically something between 2.7 to 4.3 (free space is 2)
 #endif
 
 // -----------------------------------------------------------------------------
@@ -457,32 +339,29 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef WEB_SUPPORT
-#define WEB_SUPPORT             1           // Enable web support (http, api, 121.65Kb)
+#define WEB_SUPPORT                 1           // Enable web support (http, api, 121.65Kb)
 #endif
 
 #ifndef WEB_EMBEDDED
-#define WEB_EMBEDDED            1           // Build the firmware with the web interface embedded in
+#define WEB_EMBEDDED                1           // Build the firmware with the web interface embedded in
 #endif
 
 // This is not working at the moment!!
 // Requires ASYNC_TCP_SSL_ENABLED to 1 and ESP8266 Arduino Core 2.4.0
 #ifndef WEB_SSL_ENABLED
-#define WEB_SSL_ENABLED         0           // Use HTTPS web interface
+#define WEB_SSL_ENABLED             0           // Use HTTPS web interface
 #endif
 
-#define WEB_MODE_NORMAL         0
-#define WEB_MODE_PASSWORD       1
-
 #ifndef WEB_USERNAME
-#define WEB_USERNAME            "admin"     // HTTP username
+#define WEB_USERNAME                "admin"     // HTTP username
 #endif
 
 #ifndef WEB_FORCE_PASS_CHANGE
-#define WEB_FORCE_PASS_CHANGE   1           // Force the user to change the password if default one
+#define WEB_FORCE_PASS_CHANGE       1           // Force the user to change the password if default one
 #endif
 
 #ifndef WEB_PORT
-#define WEB_PORT                80          // HTTP port
+#define WEB_PORT                    80          // HTTP port
 #endif
 
 // -----------------------------------------------------------------------------
@@ -491,19 +370,19 @@ PROGMEM const char* const custom_reset_string[] = {
 
 // This will only be enabled if WEB_SUPPORT is 1 (this is the default value)
 #ifndef WS_AUTHENTICATION
-#define WS_AUTHENTICATION       1           // WS authentication ON by default (see #507)
+#define WS_AUTHENTICATION           1           // WS authentication ON by default (see #507)
 #endif
 
 #ifndef WS_BUFFER_SIZE
-#define WS_BUFFER_SIZE          5           // Max number of secured websocket connections
+#define WS_BUFFER_SIZE              5           // Max number of secured websocket connections
 #endif
 
 #ifndef WS_TIMEOUT
-#define WS_TIMEOUT              1800000     // Timeout for secured websocket
+#define WS_TIMEOUT                  1800000     // Timeout for secured websocket
 #endif
 
 #ifndef WS_UPDATE_INTERVAL
-#define WS_UPDATE_INTERVAL      30000       // Update clients every 30 seconds
+#define WS_UPDATE_INTERVAL          30000       // Update clients every 30 seconds
 #endif
 
 // -----------------------------------------------------------------------------
@@ -512,67 +391,55 @@ PROGMEM const char* const custom_reset_string[] = {
 
 // This will only be enabled if WEB_SUPPORT is 1 (this is the default value)
 #ifndef API_ENABLED
-#define API_ENABLED             0           // Do not enable API by default
+#define API_ENABLED                 0           // Do not enable API by default
 #endif
 
 #ifndef API_BUFFER_SIZE
-#define API_BUFFER_SIZE         15          // Size of the buffer for HTTP GET API responses
+#define API_BUFFER_SIZE             15          // Size of the buffer for HTTP GET API responses
 #endif
 
 #ifndef API_REAL_TIME_VALUES
-#define API_REAL_TIME_VALUES    0           // Show filtered/median values by default (0 => median, 1 => real time)
+#define API_REAL_TIME_VALUES        0           // Show filtered/median values by default (0 => median, 1 => real time)
 #endif
 
 
-// -----------------------------------------------------------------------------
-// UI
-// -----------------------------------------------------------------------------
-
-#define UI_TAG_INPUT            0
-#define UI_TAG_CHECKBOX         1
-#define UI_TAG_SELECT           2
-
 // -----------------------------------------------------------------------------
 // MDNS / LLMNR / NETBIOS / SSDP
 // -----------------------------------------------------------------------------
 
 #ifndef MDNS_SERVER_SUPPORT
-#define MDNS_SERVER_SUPPORT     1           // Publish services using mDNS by default (1.48Kb)
+#define MDNS_SERVER_SUPPORT         1           // Publish services using mDNS by default (1.48Kb)
 #endif
 
 #ifndef MDNS_CLIENT_SUPPORT
-#define MDNS_CLIENT_SUPPORT     0           // Resolve mDNS names (3.44Kb)
+#define MDNS_CLIENT_SUPPORT         0           // Resolve mDNS names (3.44Kb)
 #endif
 
 #ifndef LLMNR_SUPPORT
-#define LLMNR_SUPPORT           0           // Publish device using LLMNR protocol by default (1.95Kb) - requires 2.4.0
+#define LLMNR_SUPPORT               0           // Publish device using LLMNR protocol by default (1.95Kb) - requires 2.4.0
 #endif
 
 #ifndef NETBIOS_SUPPORT
-#define NETBIOS_SUPPORT         0           // Publish device using NetBIOS protocol by default (1.26Kb) - requires 2.4.0
+#define NETBIOS_SUPPORT             0           // Publish device using NetBIOS protocol by default (1.26Kb) - requires 2.4.0
 #endif
 
 #ifndef SSDP_SUPPORT
-#define SSDP_SUPPORT            0           // Publish device using SSDP protocol by default (4.59Kb)
-                                            // Not compatible with ALEXA_SUPPORT at the moment
+#define SSDP_SUPPORT                0           // Publish device using SSDP protocol by default (4.59Kb)
+                                                // Not compatible with ALEXA_SUPPORT at the moment
 #endif
 
 #ifndef SSDP_DEVICE_TYPE
-#define SSDP_DEVICE_TYPE        "upnp:rootdevice"
-//#define SSDP_DEVICE_TYPE        "urn:schemas-upnp-org:device:BinaryLight:1"
+#define SSDP_DEVICE_TYPE            "upnp:rootdevice"
+//#define SSDP_DEVICE_TYPE            "urn:schemas-upnp-org:device:BinaryLight:1"
 #endif
 
-#if WEB_SUPPORT == 0
-#undef SSDP_SUPPORT
-#define SSDP_SUPPORT            0           // SSDP support requires web support
-#endif
 
 // -----------------------------------------------------------------------------
 // SPIFFS
 // -----------------------------------------------------------------------------
 
 #ifndef SPIFFS_SUPPORT
-#define SPIFFS_SUPPORT          0           // Do not add support for SPIFFS by default
+#define SPIFFS_SUPPORT              0           // Do not add support for SPIFFS by default
 #endif
 
 // -----------------------------------------------------------------------------
@@ -580,29 +447,29 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef OTA_PORT
-#define OTA_PORT                8266        // OTA port
+#define OTA_PORT                    8266        // OTA port
 #endif
 
-#define OTA_GITHUB_FP           "D7:9F:07:61:10:B3:92:93:E3:49:AC:89:84:5B:03:80:C1:9E:2F:8B"
+#define OTA_GITHUB_FP               "D7:9F:07:61:10:B3:92:93:E3:49:AC:89:84:5B:03:80:C1:9E:2F:8B"
 
 // -----------------------------------------------------------------------------
 // NOFUSS
 // -----------------------------------------------------------------------------
 
 #ifndef NOFUSS_SUPPORT
-#define NOFUSS_SUPPORT          0          // Do not enable support for NoFuss by default (12.65Kb)
+#define NOFUSS_SUPPORT              0          // Do not enable support for NoFuss by default (12.65Kb)
 #endif
 
 #ifndef NOFUSS_ENABLED
-#define NOFUSS_ENABLED          0           // Do not perform NoFUSS updates by default
+#define NOFUSS_ENABLED              0           // Do not perform NoFUSS updates by default
 #endif
 
 #ifndef NOFUSS_SERVER
-#define NOFUSS_SERVER           ""          // Default NoFuss Server
+#define NOFUSS_SERVER               ""          // Default NoFuss Server
 #endif
 
 #ifndef NOFUSS_INTERVAL
-#define NOFUSS_INTERVAL         3600000     // Check for updates every hour
+#define NOFUSS_INTERVAL             3600000     // Check for updates every hour
 #endif
 
 // -----------------------------------------------------------------------------
@@ -610,50 +477,42 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef UART_MQTT_SUPPORT
-#define UART_MQTT_SUPPORT       0           // No support by default
+#define UART_MQTT_SUPPORT           0           // No support by default
 #endif
 
 #ifndef UART_MQTT_USE_SOFT
-#define UART_MQTT_USE_SOFT      0           // Use SoftwareSerial
+#define UART_MQTT_USE_SOFT          0           // Use SoftwareSerial
 #endif
 
 #ifndef UART_MQTT_HW_PORT
-#define UART_MQTT_HW_PORT       Serial      // Hardware serial port (if UART_MQTT_USE_SOFT == 0)
+#define UART_MQTT_HW_PORT           Serial      // Hardware serial port (if UART_MQTT_USE_SOFT == 0)
 #endif
 
 #ifndef UART_MQTT_RX_PIN
-#define UART_MQTT_RX_PIN        4           // RX PIN (if UART_MQTT_USE_SOFT == 1)
+#define UART_MQTT_RX_PIN            4           // RX PIN (if UART_MQTT_USE_SOFT == 1)
 #endif
 
 #ifndef UART_MQTT_TX_PIN
-#define UART_MQTT_TX_PIN        5           // TX PIN (if UART_MQTT_USE_SOFT == 1)
+#define UART_MQTT_TX_PIN            5           // TX PIN (if UART_MQTT_USE_SOFT == 1)
 #endif
 
 #ifndef UART_MQTT_BAUDRATE
-#define UART_MQTT_BAUDRATE      115200      // Serial speed
+#define UART_MQTT_BAUDRATE          115200      // Serial speed
 #endif
 
-#define UART_MQTT_BUFFER_SIZE   100         // UART buffer size
-
-#if UART_MQTT_SUPPORT
-#define MQTT_SUPPORT            1
-#undef TERMINAL_SUPPORT
-#define TERMINAL_SUPPORT        0
-#undef DEBUG_SERIAL_SUPPORT
-#define DEBUG_SERIAL_SUPPORT    0
-#endif
+#define UART_MQTT_BUFFER_SIZE       100         // UART buffer size
 
 // -----------------------------------------------------------------------------
 // MQTT
 // -----------------------------------------------------------------------------
 
 #ifndef MQTT_SUPPORT
-#define MQTT_SUPPORT            1           // MQTT support (22.38Kb async, 12.48Kb sync)
+#define MQTT_SUPPORT                1           // MQTT support (22.38Kb async, 12.48Kb sync)
 #endif
 
 
 #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)
 #endif
 
 // MQTT OVER SSL
@@ -763,78 +622,78 @@ PROGMEM const char* const custom_reset_string[] = {
 #ifndef MQTT_ENQUEUE_IP
 #define MQTT_ENQUEUE_IP             1
 #endif
+
 #ifndef MQTT_ENQUEUE_MAC
 #define MQTT_ENQUEUE_MAC            1
 #endif
+
 #ifndef MQTT_ENQUEUE_HOSTNAME
 #define MQTT_ENQUEUE_HOSTNAME       1
 #endif
+
 #ifndef MQTT_ENQUEUE_DATETIME
 #define MQTT_ENQUEUE_DATETIME       1
 #endif
+
 #ifndef MQTT_ENQUEUE_MESSAGE_ID
 #define MQTT_ENQUEUE_MESSAGE_ID     1
 #endif
 
 // These particles will be concatenated to the MQTT_TOPIC base to form the actual topic
-#define MQTT_TOPIC_JSON         "data"
-#define MQTT_TOPIC_ACTION       "action"
-#define MQTT_TOPIC_RELAY        "relay"
-#define MQTT_TOPIC_LED          "led"
-#define MQTT_TOPIC_BUTTON       "button"
-#define MQTT_TOPIC_IP           "ip"
-#define MQTT_TOPIC_VERSION      "version"
-#define MQTT_TOPIC_UPTIME       "uptime"
-#define MQTT_TOPIC_DATETIME     "datetime"
-#define MQTT_TOPIC_FREEHEAP     "freeheap"
-#define MQTT_TOPIC_VCC          "vcc"
-#define MQTT_TOPIC_STATUS       "status"
-#define MQTT_TOPIC_MAC          "mac"
-#define MQTT_TOPIC_RSSI         "rssi"
-#define MQTT_TOPIC_MESSAGE_ID   "id"
-#define MQTT_TOPIC_APP          "app"
-#define MQTT_TOPIC_INTERVAL     "interval"
-#define MQTT_TOPIC_HOSTNAME     "host"
-#define MQTT_TOPIC_TIME         "time"
-#define MQTT_TOPIC_RFOUT        "rfout"
-#define MQTT_TOPIC_RFIN         "rfin"
-#define MQTT_TOPIC_RFLEARN      "rflearn"
-#define MQTT_TOPIC_RFRAW        "rfraw"
-#define MQTT_TOPIC_UARTIN       "uartin"
-#define MQTT_TOPIC_UARTOUT      "uartout"
-#define MQTT_TOPIC_LOADAVG      "loadavg"
-#define MQTT_TOPIC_BOARD        "board"
+#define MQTT_TOPIC_JSON             "data"
+#define MQTT_TOPIC_ACTION           "action"
+#define MQTT_TOPIC_RELAY            "relay"
+#define MQTT_TOPIC_LED              "led"
+#define MQTT_TOPIC_BUTTON           "button"
+#define MQTT_TOPIC_IP               "ip"
+#define MQTT_TOPIC_VERSION          "version"
+#define MQTT_TOPIC_UPTIME           "uptime"
+#define MQTT_TOPIC_DATETIME         "datetime"
+#define MQTT_TOPIC_FREEHEAP         "freeheap"
+#define MQTT_TOPIC_VCC              "vcc"
+#define MQTT_TOPIC_STATUS           "status"
+#define MQTT_TOPIC_MAC              "mac"
+#define MQTT_TOPIC_RSSI             "rssi"
+#define MQTT_TOPIC_MESSAGE_ID       "id"
+#define MQTT_TOPIC_APP              "app"
+#define MQTT_TOPIC_INTERVAL         "interval"
+#define MQTT_TOPIC_HOSTNAME         "host"
+#define MQTT_TOPIC_TIME             "time"
+#define MQTT_TOPIC_RFOUT            "rfout"
+#define MQTT_TOPIC_RFIN             "rfin"
+#define MQTT_TOPIC_RFLEARN          "rflearn"
+#define MQTT_TOPIC_RFRAW            "rfraw"
+#define MQTT_TOPIC_UARTIN           "uartin"
+#define MQTT_TOPIC_UARTOUT          "uartout"
+#define MQTT_TOPIC_LOADAVG          "loadavg"
+#define MQTT_TOPIC_BOARD            "board"
 
 // Light module
-#define MQTT_TOPIC_CHANNEL      "channel"
-#define MQTT_TOPIC_COLOR_RGB    "rgb"
-#define MQTT_TOPIC_COLOR_HSV    "hsv"
-#define MQTT_TOPIC_ANIM_MODE    "anim_mode"
-#define MQTT_TOPIC_ANIM_SPEED   "anim_speed"
-#define MQTT_TOPIC_BRIGHTNESS   "brightness"
-#define MQTT_TOPIC_MIRED        "mired"
-#define MQTT_TOPIC_KELVIN       "kelvin"
+#define MQTT_TOPIC_CHANNEL          "channel"
+#define MQTT_TOPIC_COLOR_RGB        "rgb"
+#define MQTT_TOPIC_COLOR_HSV        "hsv"
+#define MQTT_TOPIC_ANIM_MODE        "anim_mode"
+#define MQTT_TOPIC_ANIM_SPEED       "anim_speed"
+#define MQTT_TOPIC_BRIGHTNESS       "brightness"
+#define MQTT_TOPIC_MIRED            "mired"
+#define MQTT_TOPIC_KELVIN           "kelvin"
 
-#define MQTT_STATUS_ONLINE      "1"         // Value for the device ON message
-#define MQTT_STATUS_OFFLINE     "0"         // Value for the device OFF message (will)
+#define MQTT_STATUS_ONLINE          "1"         // Value for the device ON message
+#define MQTT_STATUS_OFFLINE         "0"         // Value for the device OFF message (will)
 
-#define MQTT_ACTION_RESET       "reboot"    // RESET MQTT topic particle
+#define MQTT_ACTION_RESET           "reboot"    // RESET MQTT topic particle
 
-// Internal MQTT events (do not change)
-#define MQTT_CONNECT_EVENT      0
-#define MQTT_DISCONNECT_EVENT   1
-#define MQTT_MESSAGE_EVENT      2
-
-#define MQTT_MESSAGE_ID_SHIFT   1000        // Store MQTT message id into EEPROM every these many
+#define MQTT_MESSAGE_ID_SHIFT       1000        // Store MQTT message id into EEPROM every these many
 
 // Custom get and set postfixes
 // Use something like "/status" or "/set", with leading slash
 // Since 1.9.0 the default value is "" for getter and "/set" for setter
 #ifndef MQTT_GETTER
-#define MQTT_GETTER             ""
+#define MQTT_GETTER                 ""
 #endif
+
 #ifndef MQTT_SETTER
-#define MQTT_SETTER             "/set"
+#define MQTT_SETTER                 "/set"
 #endif
 
 // -----------------------------------------------------------------------------
@@ -859,11 +718,6 @@ PROGMEM const char* const custom_reset_string[] = {
 // LIGHT
 // -----------------------------------------------------------------------------
 
-// Available light providers (do not change)
-#define LIGHT_PROVIDER_NONE     0
-#define LIGHT_PROVIDER_MY92XX   1 // works with MY9291 and MY9231
-#define LIGHT_PROVIDER_DIMMER   2
-
 // LIGHT_PROVIDER_DIMMER can have from 1 to 5 different channels.
 // They have to be defined for each device in the hardware.h file.
 // If 3 or more channels first 3 will be considered RGB.
@@ -970,11 +824,6 @@ PROGMEM const char* const custom_reset_string[] = {
 #define DOMOTICZ_SUPPORT        MQTT_SUPPORT    // Build with domoticz (if MQTT) support (1.72Kb)
 #endif
 
-#if DOMOTICZ_SUPPORT
-#undef MQTT_SUPPORT
-#define MQTT_SUPPORT            1               // If Domoticz enabled enable MQTT
-#endif
-
 #define DOMOTICZ_ENABLED        0               // Disable domoticz by default
 #define DOMOTICZ_IN_TOPIC       "domoticz/in"   // Default subscription topic
 #define DOMOTICZ_OUT_TOPIC      "domoticz/out"  // Default publication topic
@@ -987,11 +836,6 @@ PROGMEM const char* const custom_reset_string[] = {
 #define HOMEASSISTANT_SUPPORT   MQTT_SUPPORT    // Build with home assistant support (if MQTT, 1.64Kb)
 #endif
 
-#if HOMEASSISTANT_SUPPORT
-#undef MQTT_SUPPORT
-#define MQTT_SUPPORT            1               // If Home Assistant enabled enable MQTT
-#endif
-
 #define HOMEASSISTANT_ENABLED   0               // Integration not enabled by default
 #define HOMEASSISTANT_PREFIX    "homeassistant" // Default MQTT prefix
 
@@ -1033,92 +877,88 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef THINGSPEAK_SUPPORT
-#define THINGSPEAK_SUPPORT      1               // Enable Thingspeak support by default (2.56Kb)
+#define THINGSPEAK_SUPPORT          1               // Enable Thingspeak support by default (2.56Kb)
 #endif
 
-#define THINGSPEAK_ENABLED      0               // Thingspeak disabled by default
-#define THINGSPEAK_APIKEY       ""              // Default API KEY
+#ifndef THINGSPEAK_ENABLED
+#define THINGSPEAK_ENABLED          0               // Thingspeak disabled by default
+#endif
 
-#define THINGSPEAK_USE_ASYNC    1               // Use AsyncClient instead of WiFiClientSecure
+#ifndef THINGSPEAK_APIKEY
+#define THINGSPEAK_APIKEY           ""              // Default API KEY
+#endif
+
+#define THINGSPEAK_USE_ASYNC        1               // Use AsyncClient instead of WiFiClientSecure
 
 // THINGSPEAK OVER SSL
 // Using THINGSPEAK over SSL works well but generates problems with the web interface,
 // so you should compile it with WEB_SUPPORT to 0.
 // When THINGSPEAK_USE_ASYNC is 1, requires ASYNC_TCP_SSL_ENABLED to 1 and ESP8266 Arduino Core 2.4.0.
-#define THINGSPEAK_USE_SSL      0               // Use secure connection
-#define THINGSPEAK_FINGERPRINT  "78 60 18 44 81 35 BF DF 77 84 D4 0A 22 0D 9B 4E 6C DC 57 2C"
+#define THINGSPEAK_USE_SSL          0               // Use secure connection
+
+#define THINGSPEAK_FINGERPRINT      "78 60 18 44 81 35 BF DF 77 84 D4 0A 22 0D 9B 4E 6C DC 57 2C"
 
-#define THINGSPEAK_HOST         "api.thingspeak.com"
+#define THINGSPEAK_HOST             "api.thingspeak.com"
 #if THINGSPEAK_USE_SSL
-#define THINGSPEAK_PORT         443
+#define THINGSPEAK_PORT             443
 #else
-#define THINGSPEAK_PORT         80
+#define THINGSPEAK_PORT             80
 #endif
-#define THINGSPEAK_URL          "/update"
-#define THINGSPEAK_MIN_INTERVAL 15000           // Minimum interval between POSTs (in millis)
 
-#ifndef ASYNC_TCP_SSL_ENABLED
-#if THINGSPEAK_USE_SSL && THINGSPEAK_USE_ASYNC
-#undef THINGSPEAK_SUPPORT                       // Thingspeak in ASYNC mode requires ASYNC_TCP_SSL_ENABLED
-#endif
-#endif
+#define THINGSPEAK_URL              "/update"
+
+#define THINGSPEAK_MIN_INTERVAL     15000           // Minimum interval between POSTs (in millis)
 
 // -----------------------------------------------------------------------------
 // SCHEDULER
 // -----------------------------------------------------------------------------
 
-#define SCHEDULER_TYPE_SWITCH       1
-#define SCHEDULER_TYPE_DIM          2
-
 #ifndef SCHEDULER_SUPPORT
 #define SCHEDULER_SUPPORT           1           // Enable scheduler (1.77Kb)
 #endif
 
-#if SCHEDULER_SUPPORT
-#undef NTP_SUPPORT
-#define NTP_SUPPORT                 1           // Scheduler needs NTP
-#endif
-
+#ifndef SCHEDULER_MAX_SCHEDULES
 #define SCHEDULER_MAX_SCHEDULES     10          // Max schedules alowed
+#endif
 
 // -----------------------------------------------------------------------------
 // NTP
 // -----------------------------------------------------------------------------
 
 #ifndef NTP_SUPPORT
-#define NTP_SUPPORT             1               // Build with NTP support by default (6.78Kb)
+#define NTP_SUPPORT                 1               // Build with NTP support by default (6.78Kb)
 #endif
 
 #ifndef NTP_SERVER
-#define NTP_SERVER              "pool.ntp.org"  // Default NTP server
+#define NTP_SERVER                  "pool.ntp.org"  // Default NTP server
 #endif
 
 #ifndef NTP_TIMEOUT
-#define NTP_TIMEOUT             2000            // Set NTP request timeout to 2 seconds (issue #452)
+#define NTP_TIMEOUT                 1000            // Set NTP request timeout to 2 seconds (issue #452)
 #endif
 
 #ifndef NTP_TIME_OFFSET
-#define NTP_TIME_OFFSET         60              // Default timezone offset (GMT+1)
+#define NTP_TIME_OFFSET             60              // Default timezone offset (GMT+1)
 #endif
 
 #ifndef NTP_DAY_LIGHT
-#define NTP_DAY_LIGHT           true            // Enable daylight time saving by default
+#define NTP_DAY_LIGHT               1               // Enable daylight time saving by default
 #endif
 
 #ifndef NTP_SYNC_INTERVAL
-#define NTP_SYNC_INTERVAL       60              // NTP initial check every minute
+#define NTP_SYNC_INTERVAL           60              // NTP initial check every minute
 #endif
 
 #ifndef NTP_UPDATE_INTERVAL
-#define NTP_UPDATE_INTERVAL     1800            // NTP check every 30 minutes
+#define NTP_UPDATE_INTERVAL         1800            // NTP check every 30 minutes
 #endif
 
 #ifndef NTP_START_DELAY
-#define NTP_START_DELAY         1000            // Delay NTP start 1 second
+#define NTP_START_DELAY             1000            // Delay NTP start 1 second
 #endif
 
 #ifndef NTP_DST_REGION
-#define NTP_DST_REGION          0               // 0 for Europe, 1 for USA (defined in NtpClientLib)
+#define NTP_DST_REGION              0               // 0 for Europe, 1 for USA (defined in NtpClientLib)
 #endif
 
 // -----------------------------------------------------------------------------
@@ -1127,13 +967,15 @@ 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               // Enable Alexa support by default (10.84Kb)
+#define ALEXA_SUPPORT               1               // Enable Alexa support by default (10.84Kb)
 #endif
 
 // This is default value for the alexaEnabled setting that defines whether
 // this device should be discoberable and respond to Alexa commands.
 // Both ALEXA_SUPPORT and alexaEnabled should be 1 for Alexa support to work.
-#define ALEXA_ENABLED           1
+#ifndef ALEXA_ENABLED
+#define ALEXA_ENABLED               1
+#endif
 
 // -----------------------------------------------------------------------------
 // RFBRIDGE
@@ -1141,20 +983,20 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef RF_SEND_TIMES
-#define RF_SEND_TIMES           4               // How many times to send the message
+#define RF_SEND_TIMES               4               // How many times to send the message
 #endif
 
 #ifndef RF_SEND_DELAY
-#define RF_SEND_DELAY           500             // Interval between sendings in ms
+#define RF_SEND_DELAY               500             // Interval between sendings in ms
 #endif
 
 #ifndef RF_RECEIVE_DELAY
-#define RF_RECEIVE_DELAY        500             // Interval between recieving in ms (avoid debouncing)
+#define RF_RECEIVE_DELAY            500             // Interval between recieving in ms (avoid debouncing)
 #endif
 
 
 #ifndef RF_RAW_SUPPORT
-#define RF_RAW_SUPPORT          0               // RF raw codes require a specific firmware for the EFM8BB1
+#define RF_RAW_SUPPORT              0               // RF raw codes require a specific firmware for the EFM8BB1
                                                 // https://github.com/rhx/RF-Bridge-EFM8BB1
 #endif
 
@@ -1164,32 +1006,18 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 #ifndef IR_SUPPORT
-#define IR_SUPPORT              0               // Do not build with IR support by default (10.25Kb)
+#define IR_SUPPORT                  0               // Do not build with IR support by default (10.25Kb)
 #endif
 
 #ifndef IR_PIN
-#define IR_PIN                  4               // IR LED
+#define IR_PIN                      4               // IR LED
 #endif
 
 // 24 Buttons Set of the IR Remote
 #ifndef IR_BUTTON_SET
-#define IR_BUTTON_SET           1               // IR button set to use (see below)
+#define IR_BUTTON_SET               1               // IR button set to use (see below)
 #endif
 
-// IR Button modes
-#define IR_BUTTON_MODE_NONE         0
-#define IR_BUTTON_MODE_RGB          1
-#define IR_BUTTON_MODE_HSV          2
-#define IR_BUTTON_MODE_BRIGHTER     3
-#define IR_BUTTON_MODE_STATE        4
-#define IR_BUTTON_MODE_EFFECT       5
-
-#define LIGHT_EFFECT_SOLID          0
-#define LIGHT_EFFECT_FLASH          1
-#define LIGHT_EFFECT_STROBE         2
-#define LIGHT_EFFECT_FADE           3
-#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
@@ -1311,7 +1139,7 @@ PROGMEM const char* const custom_reset_string[] = {
 // Custom RF module
 // Check http://tinkerman.cat/adding-rf-to-a-non-rf-itead-sonoff/
 // Enable support by passing RF_SUPPORT=1 build flag
-// This module is not compatible with RFBRIDGE
+// This module is not compatible with RFBRIDGE or SONOFF RF
 //--------------------------------------------------------------------------------
 
 #ifndef RF_SUPPORT

code/espurna/config/progmem.h

@@ -0,0 +1,104 @@
+//--------------------------------------------------------------------------------
+// PROGMEM definitions
+//--------------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------------
+// Reset reasons
+//--------------------------------------------------------------------------------
+
+PROGMEM const char custom_reset_hardware[] = "Hardware button";
+PROGMEM const char custom_reset_web[] = "Reboot from web interface";
+PROGMEM const char custom_reset_terminal[] = "Reboot from terminal";
+PROGMEM const char custom_reset_mqtt[] = "Reboot from MQTT";
+PROGMEM const char custom_reset_rpc[] = "Reboot from RPC";
+PROGMEM const char custom_reset_ota[] = "Reboot after successful OTA update";
+PROGMEM const char custom_reset_http[] = "Reboot from HTTP";
+PROGMEM const char custom_reset_nofuss[] = "Reboot after successful NoFUSS update";
+PROGMEM const char custom_reset_upgrade[] = "Reboot after successful web update";
+PROGMEM const char custom_reset_factory[] = "Factory reset";
+PROGMEM const char* const custom_reset_string[] = {
+    custom_reset_hardware, custom_reset_web, custom_reset_terminal,
+    custom_reset_mqtt, custom_reset_rpc, custom_reset_ota,
+    custom_reset_http, custom_reset_nofuss, custom_reset_upgrade,
+    custom_reset_factory
+};
+
+//--------------------------------------------------------------------------------
+// Sensors
+//--------------------------------------------------------------------------------
+
+#if SENSOR_SUPPORT
+
+PROGMEM const unsigned char magnitude_decimals[] = {
+    0,
+    1, 0, 2,
+    3, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0,
+    0, 0, 0,
+    0, 0, 3, 3
+};
+
+PROGMEM const char magnitude_unknown_topic[] = "unknown";
+PROGMEM const char magnitude_temperature_topic[] =  "temperature";
+PROGMEM const char magnitude_humidity_topic[] = "humidity";
+PROGMEM const char magnitude_pressure_topic[] = "pressure";
+PROGMEM const char magnitude_current_topic[] = "current";
+PROGMEM const char magnitude_voltage_topic[] = "voltage";
+PROGMEM const char magnitude_active_power_topic[] = "power";
+PROGMEM const char magnitude_apparent_power_topic[] = "apparent";
+PROGMEM const char magnitude_reactive_power_topic[] = "reactive";
+PROGMEM const char magnitude_power_factor_topic[] = "factor";
+PROGMEM const char magnitude_energy_topic[] = "energy";
+PROGMEM const char magnitude_energy_delta_topic[] = "energy_delta";
+PROGMEM const char magnitude_analog_topic[] = "analog";
+PROGMEM const char magnitude_digital_topic[] = "digital";
+PROGMEM const char magnitude_events_topic[] = "events";
+PROGMEM const char magnitude_pm1dot0_topic[] = "pm1dot0";
+PROGMEM const char magnitude_pm2dot5_topic[] = "pm2dot5";
+PROGMEM const char magnitude_pm10_topic[] = "pm10";
+PROGMEM const char magnitude_co2_topic[] = "co2";
+PROGMEM const char magnitude_lux_topic[] = "lux";
+PROGMEM const char magnitude_uv_topic[] = "uv";
+PROGMEM const char magnitude_distance_topic[] = "distance";
+
+PROGMEM const char* const magnitude_topics[] = {
+    magnitude_unknown_topic, magnitude_temperature_topic, magnitude_humidity_topic,
+    magnitude_pressure_topic, magnitude_current_topic, magnitude_voltage_topic,
+    magnitude_active_power_topic, magnitude_apparent_power_topic, magnitude_reactive_power_topic,
+    magnitude_power_factor_topic, magnitude_energy_topic, magnitude_energy_delta_topic,
+    magnitude_analog_topic, magnitude_digital_topic, magnitude_events_topic,
+    magnitude_pm1dot0_topic, magnitude_pm2dot5_topic, magnitude_pm10_topic,
+    magnitude_co2_topic, magnitude_lux_topic, magnitude_uv_topic,
+    magnitude_distance_topic
+};
+
+PROGMEM const char magnitude_empty[] = "";
+PROGMEM const char magnitude_celsius[] =  "C";
+PROGMEM const char magnitude_fahrenheit[] =  "F";
+PROGMEM const char magnitude_percentage[] = "%";
+PROGMEM const char magnitude_hectopascals[] = "hPa";
+PROGMEM const char magnitude_amperes[] = "A";
+PROGMEM const char magnitude_volts[] = "V";
+PROGMEM const char magnitude_watts[] = "W";
+PROGMEM const char magnitude_kw[] = "kW";
+PROGMEM const char magnitude_joules[] = "J";
+PROGMEM const char magnitude_kwh[] = "kWh";
+PROGMEM const char magnitude_ugm3[] = "µg/m3";
+PROGMEM const char magnitude_ppm[] = "ppm";
+PROGMEM const char magnitude_lux[] = "lux";
+PROGMEM const char magnitude_uv[] = "uv";
+PROGMEM const char magnitude_distance[] = "m";
+
+PROGMEM const char* const magnitude_units[] = {
+    magnitude_empty, magnitude_celsius, magnitude_percentage,
+    magnitude_hectopascals, magnitude_amperes, magnitude_volts,
+    magnitude_watts, magnitude_watts, magnitude_watts,
+    magnitude_percentage, magnitude_joules, magnitude_joules,
+    magnitude_empty, magnitude_empty, magnitude_empty,
+    magnitude_ugm3, magnitude_ugm3, magnitude_ugm3,
+    magnitude_ppm, magnitude_lux, magnitude_uv,
+    magnitude_distance
+
+};
+
+#endif

code/espurna/config/prototypes.h

@@ -116,3 +116,6 @@ template<typename T> void domoticzSend(const char * key, T nvalue, const char *
 // -----------------------------------------------------------------------------
 char * ltrim(char * s);
 void nice_delay(unsigned long ms);
+
+#define ARRAYINIT(type, name, ...) \
+    type name[] = {__VA_ARGS__};

code/espurna/config/sensors.h

@@ -36,40 +36,9 @@
 #define HUMIDITY_MIN_CHANGE                 0               // Minimum humidity change to report
 #endif
 
-// American Society of Heating, Refrigerating and Air-Conditioning Engineers suggests a range of 45% - 55% humidity to manage health effects and illnesses.
-// Comfortable: 30% - 60%
-// Recommended: 45% - 55%
-// High       : 55% - 80%
-#define HUMIDITY_NORMAL                     0               // > %30
-#define HUMIDITY_COMFORTABLE                1               // > %45
-#define HUMIDITY_DRY                        2               // < %30
-#define HUMIDITY_WET                        3               // > %70
-
-// United States Environmental Protection Agency - UV Index Scale
-// One UV Index unit is equivalent to 25 milliWatts per square meter.
-#define UV_INDEX_LOW                        0               // 0 to 2 means low danger from the sun's UV rays for the average person.
-#define UV_INDEX_MODERATE                   1               // 3 to 5 means moderate risk of harm from unprotected sun exposure.
-#define UV_INDEX_HIGH                       2               // 6 to 7 means high risk of harm from unprotected sun exposure. Protection against skin and eye damage is needed.
-#define UV_INDEX_VERY_HIGH                  3               // 8 to 10 means very high risk of harm from unprotected sun exposure.
-                                                            // Take extra precautions because unprotected skin and eyes will be damaged and can burn quickly.
-#define UV_INDEX_EXTREME                    4               // 11 or more means extreme risk of harm from unprotected sun exposure.
-                                                            // Take all precautions because unprotected skin and eyes can burn in minutes.
-
 #define SENSOR_PUBLISH_ADDRESSES            0               // Publish sensor addresses
 #define SENSOR_ADDRESS_TOPIC                "address"       // Topic to publish sensor addresses
 
-//------------------------------------------------------------------------------
-// UNITS
-//------------------------------------------------------------------------------
-
-#define POWER_WATTS             0
-#define POWER_KILOWATTS         1
-
-#define ENERGY_JOULES           0
-#define ENERGY_KWH              1
-
-#define TMP_CELSIUS             0
-#define TMP_FAHRENHEIT          1
 
 #ifndef SENSOR_TEMPERATURE_UNITS
 #define SENSOR_TEMPERATURE_UNITS            TMP_CELSIUS     // Temperature units (TMP_CELSIUS | TMP_FAHRENHEIT)
@@ -83,63 +52,6 @@
 #define SENSOR_POWER_UNITS                  POWER_WATTS     // Power units (POWER_WATTS | POWER_KILOWATTS)
 #endif
 
-//--------------------------------------------------------------------------------
-// Sensor ID
-// These should remain over time, do not modify them, only add new ones at the end
-//--------------------------------------------------------------------------------
-
-#define SENSOR_DHTXX_ID                     0x01
-#define SENSOR_DALLAS_ID                    0x02
-#define SENSOR_EMON_ANALOG_ID               0x03
-#define SENSOR_EMON_ADC121_ID               0x04
-#define SENSOR_EMON_ADS1X15_ID              0x05
-#define SENSOR_HLW8012_ID                   0x06
-#define SENSOR_V9261F_ID                    0x07
-#define SENSOR_ECH1560_ID                   0x08
-#define SENSOR_ANALOG_ID                    0x09
-#define SENSOR_DIGITAL_ID                   0x10
-#define SENSOR_EVENTS_ID                    0x11
-#define SENSOR_PMSX003_ID                   0x12
-#define SENSOR_BMX280_ID                    0x13
-#define SENSOR_MHZ19_ID                     0x14
-#define SENSOR_SI7021_ID                    0x15
-#define SENSOR_SHT3X_I2C_ID                 0x16
-#define SENSOR_BH1750_ID                    0x17
-#define SENSOR_PZEM004T_ID                  0x18
-#define SENSOR_AM2320_ID                    0x19
-#define SENSOR_GUVAS12SD_ID                 0x20
-#define SENSOR_CSE7766_ID                   0x21
-#define SENSOR_TMP3X_ID                     0x22
-#define SENSOR_HCSR04_ID                    0x23
-
-//--------------------------------------------------------------------------------
-// Magnitudes
-//--------------------------------------------------------------------------------
-
-#define MAGNITUDE_NONE                      0
-#define MAGNITUDE_TEMPERATURE               1
-#define MAGNITUDE_HUMIDITY                  2
-#define MAGNITUDE_PRESSURE                  3
-#define MAGNITUDE_CURRENT                   4
-#define MAGNITUDE_VOLTAGE                   5
-#define MAGNITUDE_POWER_ACTIVE              6
-#define MAGNITUDE_POWER_APPARENT            7
-#define MAGNITUDE_POWER_REACTIVE            8
-#define MAGNITUDE_POWER_FACTOR              9
-#define MAGNITUDE_ENERGY                    10
-#define MAGNITUDE_ENERGY_DELTA              11
-#define MAGNITUDE_ANALOG                    12
-#define MAGNITUDE_DIGITAL                   13
-#define MAGNITUDE_EVENTS                    14
-#define MAGNITUDE_PM1dot0                   15
-#define MAGNITUDE_PM2dot5                   16
-#define MAGNITUDE_PM10                      17
-#define MAGNITUDE_CO2                       18
-#define MAGNITUDE_LUX                       19
-#define MAGNITUDE_UV                        20
-#define MAGNITUDE_DISTANCE                  21
-
-#define MAGNITUDE_MAX                       22
 
 // =============================================================================
 // Specific data for each sensor
@@ -154,11 +66,6 @@
 #define ANALOG_SUPPORT                  0
 #endif
 
-#if ANALOG_SUPPORT
-#undef ADC_VCC_ENABLED
-#define ADC_VCC_ENABLED                 0
-#endif
-
 //------------------------------------------------------------------------------
 // BH1750
 // Enable support by passing BH1750_SUPPORT=1 build flag
@@ -175,11 +82,6 @@
 
 #define BH1750_MODE                     BH1750_CONTINUOUS_HIGH_RES_MODE
 
-#if BH1750_SUPPORT
-#undef I2C_SUPPORT
-#define I2C_SUPPORT                     1
-#endif
-
 //------------------------------------------------------------------------------
 // BME280/BMP280
 // Enable support by passing BMX280_SUPPORT=1 build flag
@@ -202,11 +104,6 @@
 #define BMX280_HUMIDITY                 1       // Oversampling for humidity (set to 0 to disable magnitude, only for BME280)
 #define BMX280_PRESSURE                 1       // Oversampling for pressure (set to 0 to disable magnitude)
 
-#if BMX280_SUPPORT
-#undef I2C_SUPPORT
-#define I2C_SUPPORT                     1
-#endif
-
 //------------------------------------------------------------------------------
 // Dallas OneWire temperature sensors
 // Enable support by passing DALLAS_SUPPORT=1 build flag
@@ -331,11 +228,6 @@
 
 #define EMON_ADC121_I2C_ADDRESS         0x00    // 0x00 means auto
 
-#if EMON_ADC121_SUPPORT
-#undef I2C_SUPPORT
-#define I2C_SUPPORT                     1
-#endif
-
 //------------------------------------------------------------------------------
 // Energy Monitor based on ADS1X15
 // Enable support by passing EMON_ADS1X15_SUPPORT=1 build flag
@@ -350,11 +242,6 @@
 #define EMON_ADS1X15_GAIN               ADS1X15_REG_CONFIG_PGA_4_096V
 #define EMON_ADS1X15_MASK               0x0F    // A0=1 A1=2 A2=4 A3=8
 
-#if EMON_ADS1X15_SUPPORT
-#undef I2C_SUPPORT
-#define I2C_SUPPORT                     1
-#endif
-
 //------------------------------------------------------------------------------
 // Energy Monitor based on interval analog GPIO
 // Enable support by passing EMON_ANALOG_SUPPORT=1 build flag
@@ -364,11 +251,6 @@
 #define EMON_ANALOG_SUPPORT             0       // Do not build support by default
 #endif
 
-#if EMON_ANALOG_SUPPORT
-#undef ADC_VCC_ENABLED
-#define ADC_VCC_ENABLED                 0
-#endif
-
 //------------------------------------------------------------------------------
 // Counter sensor
 // Enable support by passing EVENTS_SUPPORT=1 build flag
@@ -497,7 +379,6 @@
 #define PZEM004T_HW_PORT                Serial1 // Hardware serial port (if PZEM004T_USE_SOFT == 0)
 #endif
 
-
 //------------------------------------------------------------------------------
 // SHT3X I2C (Wemos) temperature & humidity sensor
 // Enable support by passing SHT3X_SUPPORT=1 build flag
@@ -511,11 +392,6 @@
 #define SHT3X_I2C_ADDRESS               0x00    // 0x00 means auto
 #endif
 
-#if SHT3X_I2C_SUPPORT
-#undef I2C_SUPPORT
-#define I2C_SUPPORT                     1
-#endif
-
 //------------------------------------------------------------------------------
 // SI7021 temperature & humidity sensor
 // Enable support by passing SI7021_SUPPORT=1 build flag
@@ -529,11 +405,6 @@
 #define SI7021_ADDRESS                  0x00    // 0x00 means auto
 #endif
 
-#if SI7021_SUPPORT
-#undef I2C_SUPPORT
-#define I2C_SUPPORT                     1
-#endif
-
 //------------------------------------------------------------------------------
 // TMP3X analog temperature sensor
 // Enable support by passing TMP3X_SUPPORT=1 build flag
@@ -547,11 +418,6 @@
 #define TMP3X_TYPE                      TMP3X_TMP35
 #endif
 
-#if TMP3X_SUPPORT
-#undef ADC_VCC_ENABLED
-#define ADC_VCC_ENABLED                 0
-#endif
-
 //------------------------------------------------------------------------------
 // V9261F based power sensor
 // Enable support by passing SI7021_SUPPORT=1 build flag
@@ -591,11 +457,6 @@
 #define AM2320_ADDRESS                  0x00    // 0x00 means auto
 #endif
 
-#if AM2320_SUPPORT
-#undef I2C_SUPPORT
-#define I2C_SUPPORT                     1
-#endif
-
 //------------------------------------------------------------------------------
 // GUVAS12SD UV Sensor (analog)
 // Enable support by passing GUVAS12SD_SUPPORT=1 build flag
@@ -610,7 +471,7 @@
 #endif
 
 // =============================================================================
-// Sensor helpers configuration
+// Sensor helpers configuration - can't move to dependencies.h
 // =============================================================================
 
 #ifndef SENSOR_SUPPORT
@@ -628,6 +489,15 @@
 #endif
 #endif
 
+// -----------------------------------------------------------------------------
+// ADC
+// -----------------------------------------------------------------------------
+
+// Default ADC mode is to monitor internal power supply
+#ifndef ADC_MODE_VALUE
+#define ADC_MODE_VALUE                  ADC_VCC
+#endif
+
 // -----------------------------------------------------------------------------
 // I2C
 // -----------------------------------------------------------------------------
@@ -651,98 +521,12 @@
 #define I2C_CLEAR_BUS                   0       // Clear I2C bus on boot
 #define I2C_PERFORM_SCAN                1       // Perform a bus scan on boot
 
-//--------------------------------------------------------------------------------
-// Internal power monitor
-// Enable support by passing ADC_VCC_ENABLED=1 build flag
-// Do not enable this if using the analog GPIO for any other thing
-//--------------------------------------------------------------------------------
-
-#ifndef ADC_VCC_ENABLED
-#define ADC_VCC_ENABLED                 1
-#endif
-
-#if ADC_VCC_ENABLED
-    ADC_MODE(ADC_VCC);
-#endif
-
 //--------------------------------------------------------------------------------
 // Class loading
 //--------------------------------------------------------------------------------
 
 #if SENSOR_SUPPORT
 
-PROGMEM const unsigned char magnitude_decimals[] = {
-    0,
-    1, 0, 2,
-    3, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0,
-    0, 0, 0,
-    0, 0,
-    2, 3
-};
-
-PROGMEM const char magnitude_unknown_topic[] = "unknown";
-PROGMEM const char magnitude_temperature_topic[] =  "temperature";
-PROGMEM const char magnitude_humidity_topic[] = "humidity";
-PROGMEM const char magnitude_pressure_topic[] = "pressure";
-PROGMEM const char magnitude_current_topic[] = "current";
-PROGMEM const char magnitude_voltage_topic[] = "voltage";
-PROGMEM const char magnitude_active_power_topic[] = "power";
-PROGMEM const char magnitude_apparent_power_topic[] = "apparent";
-PROGMEM const char magnitude_reactive_power_topic[] = "reactive";
-PROGMEM const char magnitude_power_factor_topic[] = "factor";
-PROGMEM const char magnitude_energy_topic[] = "energy";
-PROGMEM const char magnitude_energy_delta_topic[] = "energy_delta";
-PROGMEM const char magnitude_analog_topic[] = "analog";
-PROGMEM const char magnitude_digital_topic[] = "digital";
-PROGMEM const char magnitude_events_topic[] = "events";
-PROGMEM const char magnitude_pm1dot0_topic[] = "pm1dot0";
-PROGMEM const char magnitude_pm2dot5_topic[] = "pm2dot5";
-PROGMEM const char magnitude_pm10_topic[] = "pm10";
-PROGMEM const char magnitude_co2_topic[] = "co2";
-PROGMEM const char magnitude_lux_topic[] = "lux";
-PROGMEM const char magnitude_uv_topic[] = "uv";
-PROGMEM const char magnitude_distance_topic[] = "distance";
-
-PROGMEM const char* const magnitude_topics[] = {
-    magnitude_unknown_topic, magnitude_temperature_topic, magnitude_humidity_topic,
-    magnitude_pressure_topic, magnitude_current_topic, magnitude_voltage_topic,
-    magnitude_active_power_topic, magnitude_apparent_power_topic, magnitude_reactive_power_topic,
-    magnitude_power_factor_topic, magnitude_energy_topic, magnitude_energy_delta_topic,
-    magnitude_analog_topic, magnitude_digital_topic, magnitude_events_topic,
-    magnitude_pm1dot0_topic, magnitude_pm2dot5_topic, magnitude_pm10_topic,
-    magnitude_co2_topic, magnitude_lux_topic, magnitude_uv_topic,
-    magnitude_distance_topic
-};
-
-PROGMEM const char magnitude_empty[] = "";
-PROGMEM const char magnitude_celsius[] =  "C";
-PROGMEM const char magnitude_fahrenheit[] =  "F";
-PROGMEM const char magnitude_percentage[] = "%";
-PROGMEM const char magnitude_hectopascals[] = "hPa";
-PROGMEM const char magnitude_amperes[] = "A";
-PROGMEM const char magnitude_volts[] = "V";
-PROGMEM const char magnitude_watts[] = "W";
-PROGMEM const char magnitude_kw[] = "kW";
-PROGMEM const char magnitude_joules[] = "J";
-PROGMEM const char magnitude_kwh[] = "kWh";
-PROGMEM const char magnitude_ugm3[] = "µg/m3";
-PROGMEM const char magnitude_ppm[] = "ppm";
-PROGMEM const char magnitude_lux[] = "lux";
-PROGMEM const char magnitude_uv[] = "uv";
-PROGMEM const char magnitude_distance[] = "m";
-
-PROGMEM const char* const magnitude_units[] = {
-    magnitude_empty, magnitude_celsius, magnitude_percentage,
-    magnitude_hectopascals, magnitude_amperes, magnitude_volts,
-    magnitude_watts, magnitude_watts, magnitude_watts,
-    magnitude_percentage, magnitude_joules, magnitude_joules,
-    magnitude_empty, magnitude_empty, magnitude_empty,
-    magnitude_ugm3, magnitude_ugm3, magnitude_ugm3,
-    magnitude_ppm, magnitude_lux, magnitude_uv,
-    magnitude_distance
-};
-
 #include "../sensors/BaseSensor.h"
 
 #if AM2320_SUPPORT

code/espurna/config/types.h

@@ -0,0 +1,244 @@
+//------------------------------------------------------------------------------
+// Type definitions
+// Do not touch this definitions
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+// BUTTONS
+//------------------------------------------------------------------------------
+
+#define BUTTON_EVENT_NONE           0
+#define BUTTON_EVENT_PRESSED        1
+#define BUTTON_EVENT_RELEASED       2
+#define BUTTON_EVENT_CLICK          2
+#define BUTTON_EVENT_DBLCLICK       3
+#define BUTTON_EVENT_LNGCLICK       4
+#define BUTTON_EVENT_LNGLNGCLICK    5
+
+#define BUTTON_MODE_NONE            0
+#define BUTTON_MODE_TOGGLE          1
+#define BUTTON_MODE_ON              2
+#define BUTTON_MODE_OFF             3
+#define BUTTON_MODE_AP              4
+#define BUTTON_MODE_RESET           5
+#define BUTTON_MODE_PULSE           6
+#define BUTTON_MODE_FACTORY         7
+
+// Needed for ESP8285 boards under Windows using PlatformIO (?)
+#ifndef BUTTON_PUSHBUTTON
+#define BUTTON_PUSHBUTTON           0
+#define BUTTON_SWITCH               1
+#define BUTTON_DEFAULT_HIGH         2
+#define BUTTON_SET_PULLUP           4
+#endif
+
+//------------------------------------------------------------------------------
+// RELAY
+//------------------------------------------------------------------------------
+
+#define RELAY_BOOT_OFF              0
+#define RELAY_BOOT_ON               1
+#define RELAY_BOOT_SAME             2
+#define RELAY_BOOT_TOGGLE           3
+
+#define RELAY_TYPE_NORMAL           0
+#define RELAY_TYPE_INVERSE          1
+#define RELAY_TYPE_LATCHED          2
+#define RELAY_TYPE_LATCHED_INVERSE  3
+
+#define RELAY_SYNC_ANY              0
+#define RELAY_SYNC_NONE_OR_ONE      1
+#define RELAY_SYNC_ONE              2
+#define RELAY_SYNC_SAME             3
+
+#define RELAY_PULSE_NONE            0
+#define RELAY_PULSE_OFF             1
+#define RELAY_PULSE_ON              2
+
+#define RELAY_PROVIDER_RELAY        0
+#define RELAY_PROVIDER_DUAL         1
+#define RELAY_PROVIDER_LIGHT        2
+#define RELAY_PROVIDER_RFBRIDGE     3
+#define RELAY_PROVIDER_STM          4
+
+//------------------------------------------------------------------------------
+// MQTT
+//------------------------------------------------------------------------------
+
+// Internal MQTT events
+#define MQTT_CONNECT_EVENT          0
+#define MQTT_DISCONNECT_EVENT       1
+#define MQTT_MESSAGE_EVENT          2
+
+//------------------------------------------------------------------------------
+// LED
+//------------------------------------------------------------------------------
+
+#define LED_MODE_MQTT               0       // LED will be managed from MQTT (OFF by default)
+#define LED_MODE_WIFI               1       // LED will blink according to the WIFI status
+#define LED_MODE_FOLLOW             2       // LED will follow state of linked relay (check RELAY#_LED)
+#define LED_MODE_FOLLOW_INVERSE     3       // LED will follow the opposite state of linked relay (check RELAY#_LED)
+#define LED_MODE_FINDME             4       // LED will be ON if all relays are OFF
+#define LED_MODE_FINDME_WIFI        5       // A mixture between WIFI and FINDME
+#define LED_MODE_ON                 6       // LED always ON
+#define LED_MODE_OFF                7       // LED always OFF
+#define LED_MODE_RELAY              8       // If any relay is ON, LED will be ON, otherwise OFF
+#define LED_MODE_RELAY_WIFI         9       // A mixture between WIFI and RELAY, the reverse of MIXED
+
+// -----------------------------------------------------------------------------
+// UI
+// -----------------------------------------------------------------------------
+
+#define UI_TAG_INPUT                0
+#define UI_TAG_CHECKBOX             1
+#define UI_TAG_SELECT               2
+
+#define WEB_MODE_NORMAL             0
+#define WEB_MODE_PASSWORD           1
+
+// -----------------------------------------------------------------------------
+// LIGHT
+// -----------------------------------------------------------------------------
+
+// Available light providers
+#define LIGHT_PROVIDER_NONE         0
+#define LIGHT_PROVIDER_MY92XX       1       // works with MY9291 and MY9231
+#define LIGHT_PROVIDER_DIMMER       2
+
+// -----------------------------------------------------------------------------
+// SCHEDULER
+// -----------------------------------------------------------------------------
+
+#define SCHEDULER_TYPE_SWITCH       1
+#define SCHEDULER_TYPE_DIM          2
+
+// -----------------------------------------------------------------------------
+// IR
+// -----------------------------------------------------------------------------
+
+// IR Button modes
+#define IR_BUTTON_MODE_NONE         0
+#define IR_BUTTON_MODE_RGB          1
+#define IR_BUTTON_MODE_HSV          2
+#define IR_BUTTON_MODE_BRIGHTER     3
+#define IR_BUTTON_MODE_STATE        4
+#define IR_BUTTON_MODE_EFFECT       5
+
+#define LIGHT_EFFECT_SOLID          0
+#define LIGHT_EFFECT_FLASH          1
+#define LIGHT_EFFECT_STROBE         2
+#define LIGHT_EFFECT_FADE           3
+#define LIGHT_EFFECT_SMOOTH         4
+
+//------------------------------------------------------------------------------
+// RESET
+//------------------------------------------------------------------------------
+
+#define CUSTOM_RESET_HARDWARE       1       // Reset from hardware button
+#define CUSTOM_RESET_WEB            2       // Reset from web interface
+#define CUSTOM_RESET_TERMINAL       3       // Reset from terminal
+#define CUSTOM_RESET_MQTT           4       // Reset via MQTT
+#define CUSTOM_RESET_RPC            5       // Reset via RPC (HTTP)
+#define CUSTOM_RESET_OTA            6       // Reset after successful OTA update
+#define CUSTOM_RESET_HTTP           7       // Reset via HTTP GET
+#define CUSTOM_RESET_NOFUSS         8       // Reset after successful NOFUSS update
+#define CUSTOM_RESET_UPGRADE        9       // Reset after update from web interface
+#define CUSTOM_RESET_FACTORY        10      // Factory reset from terminal
+
+#define CUSTOM_RESET_MAX            10
+
+//------------------------------------------------------------------------------
+// ENVIRONMENTAL
+//------------------------------------------------------------------------------
+
+// American Society of Heating, Refrigerating and Air-Conditioning Engineers suggests a range of 45% - 55% humidity to manage health effects and illnesses.
+// Comfortable: 30% - 60%
+// Recommended: 45% - 55%
+// High       : 55% - 80%
+
+#define HUMIDITY_NORMAL             0       // > %30
+#define HUMIDITY_COMFORTABLE        1       // > %45
+#define HUMIDITY_DRY                2       // < %30
+#define HUMIDITY_WET                3       // > %70
+
+// United States Environmental Protection Agency - UV Index Scale
+// One UV Index unit is equivalent to 25 milliWatts per square meter.
+#define UV_INDEX_LOW                0       // 0 to 2 means low danger from the sun's UV rays for the average person.
+#define UV_INDEX_MODERATE           1       // 3 to 5 means moderate risk of harm from unprotected sun exposure.
+#define UV_INDEX_HIGH               2       // 6 to 7 means high risk of harm from unprotected sun exposure. Protection against skin and eye damage is needed.
+#define UV_INDEX_VERY_HIGH          3       // 8 to 10 means very high risk of harm from unprotected sun exposure.
+                                            // Take extra precautions because unprotected skin and eyes will be damaged and can burn quickly.
+#define UV_INDEX_EXTREME            4       // 11 or more means extreme risk of harm from unprotected sun exposure.
+                                            // Take all precautions because unprotected skin and eyes can burn in minutes.
+
+//------------------------------------------------------------------------------
+// UNITS
+//------------------------------------------------------------------------------
+
+#define POWER_WATTS                 0
+#define POWER_KILOWATTS             1
+
+#define ENERGY_JOULES               0
+#define ENERGY_KWH                  1
+
+#define TMP_CELSIUS                 0
+#define TMP_FAHRENHEIT              1
+#define TMP_KELVIN                  2
+
+//--------------------------------------------------------------------------------
+// Sensor ID
+// These should remain over time, do not modify them, only add new ones at the end
+//--------------------------------------------------------------------------------
+
+#define SENSOR_DHTXX_ID             0x01
+#define SENSOR_DALLAS_ID            0x02
+#define SENSOR_EMON_ANALOG_ID       0x03
+#define SENSOR_EMON_ADC121_ID       0x04
+#define SENSOR_EMON_ADS1X15_ID      0x05
+#define SENSOR_HLW8012_ID           0x06
+#define SENSOR_V9261F_ID            0x07
+#define SENSOR_ECH1560_ID           0x08
+#define SENSOR_ANALOG_ID            0x09
+#define SENSOR_DIGITAL_ID           0x10
+#define SENSOR_EVENTS_ID            0x11
+#define SENSOR_PMSX003_ID           0x12
+#define SENSOR_BMX280_ID            0x13
+#define SENSOR_MHZ19_ID             0x14
+#define SENSOR_SI7021_ID            0x15
+#define SENSOR_SHT3X_I2C_ID         0x16
+#define SENSOR_BH1750_ID            0x17
+#define SENSOR_PZEM004T_ID          0x18
+#define SENSOR_AM2320_ID            0x19
+#define SENSOR_GUVAS12SD_ID         0x20
+#define SENSOR_CSE7766_ID           0x21
+#define SENSOR_TMP3X_ID             0x22
+#define SENSOR_HCSR04_ID            0x23
+
+//--------------------------------------------------------------------------------
+// Magnitudes
+//--------------------------------------------------------------------------------
+
+#define MAGNITUDE_NONE              0
+#define MAGNITUDE_TEMPERATURE       1
+#define MAGNITUDE_HUMIDITY          2
+#define MAGNITUDE_PRESSURE          3
+#define MAGNITUDE_CURRENT           4
+#define MAGNITUDE_VOLTAGE           5
+#define MAGNITUDE_POWER_ACTIVE      6
+#define MAGNITUDE_POWER_APPARENT    7
+#define MAGNITUDE_POWER_REACTIVE    8
+#define MAGNITUDE_POWER_FACTOR      9
+#define MAGNITUDE_ENERGY            10
+#define MAGNITUDE_ENERGY_DELTA      11
+#define MAGNITUDE_ANALOG            12
+#define MAGNITUDE_DIGITAL           13
+#define MAGNITUDE_EVENTS            14
+#define MAGNITUDE_PM1dot0           15
+#define MAGNITUDE_PM2dot5           16
+#define MAGNITUDE_PM10              17
+#define MAGNITUDE_CO2               18
+#define MAGNITUDE_LUX               19
+#define MAGNITUDE_UV                20
+#define MAGNITUDE_DISTANCE          21
+
+#define MAGNITUDE_MAX               22

code/espurna/sensors/AM2320Sensor.h

@@ -7,6 +7,9 @@
 
 #pragma once
 
+#undef I2C_SUPPORT
+#define I2C_SUPPORT 1 // Explicitly request I2C support.
+
 #include "Arduino.h"
 #include "I2CSensor.h"
 

code/espurna/sensors/AnalogSensor.h

@@ -7,6 +7,10 @@
 
 #pragma once
 
+// Set ADC to TOUT pin
+#undef ADC_MODE_VALUE
+#define ADC_MODE_VALUE ADC_TOUT
+
 #include "Arduino.h"
 #include "BaseSensor.h"
 

code/espurna/sensors/BH1750Sensor.h

@@ -7,6 +7,9 @@
 
 #pragma once
 
+#undef I2C_SUPPORT
+#define I2C_SUPPORT 1 // Explicitly request I2C support.
+
 #include "Arduino.h"
 #include "I2CSensor.h"
 

code/espurna/sensors/BMX280Sensor.h

@@ -7,6 +7,9 @@
 
 #pragma once
 
+#undef I2C_SUPPORT
+#define I2C_SUPPORT 1 // Explicitly request I2C support.
+
 #include "Arduino.h"
 #include "I2CSensor.h"
 

code/espurna/sensors/EmonAnalogSensor.h

@@ -7,6 +7,10 @@
 
 #pragma once
 
+// Set ADC to TOUT pin
+#undef ADC_MODE_VALUE
+#define ADC_MODE_VALUE ADC_TOUT
+
 #include "Arduino.h"
 #include "EmonSensor.h"
 

code/espurna/sensors/EmonSensor.h

@@ -7,6 +7,10 @@
 
 #pragma once
 
+#undef I2C_SUPPORT
+#define I2C_SUPPORT 1 // Explicitly request I2C support.
+
+
 #include "Arduino.h"
 #include "I2CSensor.h"
 

code/espurna/sensors/GUVAS12SDSensor.h

@@ -8,6 +8,10 @@
 
 #pragma once
 
+// Set ADC to TOUT pin
+#undef ADC_MODE_VALUE
+#define ADC_MODE_VALUE ADC_TOUT
+
 #include "Arduino.h"
 #include "BaseSensor.h"
 

code/espurna/sensors/SHT3XI2CSensor.h

@@ -7,6 +7,10 @@
 
 #pragma once
 
+#undef I2C_SUPPORT
+#define I2C_SUPPORT 1 // Explicitly request I2C support.
+
+
 #include "Arduino.h"
 #include "I2CSensor.h"
 

code/espurna/sensors/SI7021Sensor.h

@@ -7,6 +7,11 @@
 
 #pragma once
 
+#undef I2C_SUPPORT
+#define I2C_SUPPORT 1 // Explicitly request I2C support.
+
+
+
 #include "Arduino.h"
 #include "I2CSensor.h"
 

code/espurna/sensors/TMP3XSensor.h

@@ -7,6 +7,10 @@
 
 #pragma once
 
+// Set ADC to TOUT pin
+#undef ADC_MODE_VALUE
+#define ADC_MODE_VALUE ADC_TOUT
+
 #include "Arduino.h"
 #include "BaseSensor.h"
 

code/espurna/utils.ino

@@ -123,7 +123,7 @@ void heartbeat() {
     if (serial) {
         DEBUG_MSG_P(PSTR("[MAIN] Uptime: %lu seconds\n"), uptime_seconds);
         DEBUG_MSG_P(PSTR("[MAIN] Free heap: %lu bytes\n"), free_heap);
-        #if ADC_VCC_ENABLED
+        #if ADC_MODE_VALUE == ADC_VCC
             DEBUG_MSG_P(PSTR("[MAIN] Power: %lu mV\n"), ESP.getVcc());
         #endif
         #if NTP_SUPPORT
@@ -177,7 +177,7 @@ void heartbeat() {
                 lightMQTT();
             #endif
             #if (HEARTBEAT_REPORT_VCC)
-            #if ADC_VCC_ENABLED
+            #if ADC_MODE_VALUE == ADC_VCC
                 mqttSend(MQTT_TOPIC_VCC, String(ESP.getVcc()).c_str());
             #endif
             #endif
@@ -422,7 +422,7 @@ void info() {
 
     DEBUG_MSG_P(PSTR("[INIT] Settings size: %u bytes\n"), settingsSize());
     DEBUG_MSG_P(PSTR("[INIT] Free heap: %u bytes\n"), getFreeHeap());
-    #if ADC_VCC_ENABLED
+    #if ADC_MODE_VALUE == ADC_VCC
         DEBUG_MSG_P(PSTR("[INIT] Power: %u mV\n"), ESP.getVcc());
     #endif
 
@@ -525,3 +525,8 @@ void nice_delay(unsigned long ms) {
     unsigned long start = millis();
     while (millis() - start < ms) delay(1);
 }
+
+// This method is called by the SDK to know where to connect the ADC
+int __get_adc_mode() {
+    return (int) (ADC_MODE_VALUE);
+}

code/espurna/ws.ino

@@ -235,7 +235,9 @@ void _wsUpdate(JsonObject& root) {
     root["uptime"] = getUptime();
     root["rssi"] = WiFi.RSSI();
     root["loadaverage"] = systemLoadAverage();
-    root["vcc"] = ESP.getVcc();
+    #if ADC_MODE_VALUE == ADC_VCC
+        root["vcc"] = ESP.getVcc();
+    #endif
     #if NTP_SUPPORT
         if (ntpSynced()) root["now"] = now();
     #endif