Refactoring build flag names

code/espurna/alexa.ino

@@ -0,0 +1,48 @@
+/*
+
+ALEXA MODULE
+
+Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
+
+*/
+
+#if ALEXA_SUPPORT
+
+#include <fauxmoESP.h>
+
+fauxmoESP alexa;
+
+// -----------------------------------------------------------------------------
+// ALEXA
+// -----------------------------------------------------------------------------
+
+void alexaConfigure() {
+    alexa.enable(getSetting("alexaEnabled", ALEXA_ENABLED).toInt() == 1);
+}
+
+void alexaSetup() {
+
+    // Backwards compatibility
+    moveSetting("fauxmoEnabled", "alexaEnabled");
+
+    alexaConfigure();
+    unsigned int relays = relayCount();
+    String hostname = getSetting("hostname");
+    if (relays == 1) {
+        alexa.addDevice(hostname.c_str());
+    } else {
+        for (unsigned int i=0; i<relays; i++) {
+            alexa.addDevice((hostname + "_" + i).c_str());
+        }
+    }
+    alexa.onMessage([relays](unsigned char device_id, const char * name, bool state) {
+        DEBUG_MSG_P(PSTR("[ALEXA] %s state: %s\n"), name, state ? "ON" : "OFF");
+        relayStatus(device_id, state);
+    });
+}
+
+void alexaLoop() {
+    alexa.handle();
+}
+
+#endif

code/espurna/analog.ino

@@ -6,7 +6,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_ANALOG
+#if ANALOG_SUPPORT
 
 // -----------------------------------------------------------------------------
 // ANALOG
@@ -41,12 +41,12 @@ void analogLoop() {
         mqttSend(getSetting("analogTopic", ANALOG_TOPIC).c_str(), String(analog).c_str());
 
         // Send to Domoticz
-        #if ENABLE_DOMOTICZ
+        #if DOMOTICZ_SUPPORT
             domoticzSend("dczAnaIdx", 0, String(analog).c_str());
         #endif
 
         // Send to InfluxDB
-        #if ENABLE_INFLUXDB
+        #if INFLUXDB_SUPPORT
             influxDBSend(MQTT_TOPIC_ANALOG, analog);
         #endif
 

code/espurna/config/arduino.h

@@ -44,18 +44,18 @@
 // Features (values below are non-default values)
 //--------------------------------------------------------------------------------
 
-//#define ENABLE_ANALOG         1
-//#define ENABLE_DHT            1
-//#define ENABLE_DOMOTICZ       0
-//#define ENABLE_DS18B20        1
-//#define ENABLE_EMON           1
-//#define ENABLE_I2C            1
-//#define ENABLE_INFLUXDB       0
-//#define ENABLE_FAUXMO         0
-//#define ENABLE_MDNS           0
-//#define ENABLE_NOFUSS         1
-//#define ENABLE_RF             1
-//#define ENABLE_SERIAL_DEBUG   0
-//#define ENABLE_SPIFFS         1
-//#define ENABLE_TERMINAL       0
-//#define ENABLE_UDP_DEBUG      1
+//#define ALEXA_SUPPORT          0
+//#define ANALOG_SUPPORT         1
+//#define DHT_SUPPORT            1
+//#define DOMOTICZ_SUPPORT       0
+//#define DS18B20_SUPPORT        1
+//#define EMON_SUPPORT           1
+//#define I2C_SUPPORT            1
+//#define INFLUXDB_SUPPORT       0
+//#define MDNS_SUPPORT           0
+//#define NOFUSS_SUPPORT         1
+//#define RF_SUPPORT             1
+//#define DEBUG_SERIAL_SUPPORT   0
+//#define SPIFFS_SUPPORT         1
+//#define TERMINAL_SUPPORT       0
+//#define DEBUG_UDP_SUPPORT      1

code/espurna/config/general.h

@@ -9,8 +9,8 @@
 
 // Serial debug log
 
-#ifndef ENABLE_SERIAL_DEBUG
-#define ENABLE_SERIAL_DEBUG     1               // Enable serial debug log
+#ifndef DEBUG_SERIAL_SUPPORT
+#define DEBUG_SERIAL_SUPPORT     1               // Enable serial debug log
 #endif
 #ifndef DEBUG_PORT
 #define DEBUG_PORT              Serial          // Default debugging port
@@ -22,8 +22,8 @@
 // To receive the message son the destination computer use nc:
 // nc -ul 8111
 
-#ifndef ENABLE_UDP_DEBUG
-#define ENABLE_UDP_DEBUG        0               // Enable UDP debug log
+#ifndef DEBUG_UDP_SUPPORT
+#define DEBUG_UDP_SUPPORT        0               // Enable UDP debug log
 #endif
 #define DEBUG_UDP_IP            IPAddress(192, 168, 1, 100)
 #define DEBUG_UDP_PORT          8113
@@ -33,7 +33,7 @@
 // General debug options and macros
 #define DEBUG_MESSAGE_MAX_LENGTH    80
 
-#if (ENABLE_SERIAL_DEBUG==1) || (ENABLE_UDP_DEBUG==1)
+#if (DEBUG_SERIAL_SUPPORT==1) || (DEBUG_UDP_SUPPORT==1)
     #define DEBUG_MSG(...) debugSend(__VA_ARGS__)
     #define DEBUG_MSG_P(...) debugSend_P(__VA_ARGS__)
 #endif
@@ -47,8 +47,8 @@
 // TERMINAL
 //------------------------------------------------------------------------------
 
-#ifndef ENABLE_TERMINAL
-#define ENABLE_TERMINAL         1               // Enable terminal commands
+#ifndef TERMINAL_SUPPORT
+#define TERMINAL_SUPPORT         1               // Enable terminal commands
 #endif
 
 //------------------------------------------------------------------------------
@@ -226,7 +226,7 @@ PROGMEM const char* const custom_reset_string[] = {
 #define WS_TIMEOUT              1800000     // Timeout for secured websocket
 #define WEBSERVER_PORT          80          // HTTP port
 #define DNS_PORT                53          // MDNS port
-#define ENABLE_MDNS             1           // Enable MDNS by default
+#define MDNS_SUPPORT             1           // Enable MDNS by default
 #define ENABLE_API              0           // Do not enable API by default
 #define API_BUFFER_SIZE         10          // Size of the buffer for HTTP GET API responses
 
@@ -245,8 +245,8 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 // Do not add support for SPIFFS by default
-#ifndef ENABLE_SPIFFS
-#define ENABLE_SPIFFS           0
+#ifndef SPIFFS_SUPPORT
+#define SPIFFS_SUPPORT           0
 #endif
 
 // -----------------------------------------------------------------------------
@@ -329,9 +329,10 @@ PROGMEM const char* const custom_reset_string[] = {
 // I2C
 // -----------------------------------------------------------------------------
 
-#ifndef ENABLE_I2C
-#define ENABLE_I2C              0           // I2C enabled
+#ifndef I2C_SUPPORT
+#define I2C_SUPPORT              0           // I2C enabled
 #endif
+
 #define I2C_SDA_PIN             4           // SDA GPIO
 #define I2C_SCL_PIN             14          // SCL GPIO
 #define I2C_CLOCK_STRETCH_TIME  200         // BRZO clock stretch time
@@ -368,9 +369,10 @@ PROGMEM const char* const custom_reset_string[] = {
 // DOMOTICZ
 // -----------------------------------------------------------------------------
 
-#ifndef ENABLE_DOMOTICZ
-#define ENABLE_DOMOTICZ         1               // Build with domoticz support
+#ifndef DOMOTICZ_SUPPORT
+#define DOMOTICZ_SUPPORT         1               // Build with domoticz support
 #endif
+
 #define DOMOTICZ_ENABLED        1               // Enable domoticz by default
 #define DOMOTICZ_IN_TOPIC       "domoticz/in"   // Default subscription topic
 #define DOMOTICZ_OUT_TOPIC      "domoticz/out"  // Default publication topic
@@ -379,9 +381,10 @@ PROGMEM const char* const custom_reset_string[] = {
 // INFLUXDB
 // -----------------------------------------------------------------------------
 
-#ifndef ENABLE_INFLUXDB
-#define ENABLE_INFLUXDB         1               // Enable InfluxDB support by default
+#ifndef INFLUXDB_SUPPORT
+#define INFLUXDB_SUPPORT         1               // Enable InfluxDB support by default
 #endif
+
 #define INFLUXDB_PORT           8086            // Default InfluxDB port
 
 // -----------------------------------------------------------------------------
@@ -398,14 +401,14 @@ PROGMEM const char* const custom_reset_string[] = {
 // -----------------------------------------------------------------------------
 
 // This setting defines whether Alexa support should be built into the firmware
-#ifndef ENABLE_FAUXMO
-#define ENABLE_FAUXMO       1
+#ifndef ALEXA_SUPPORT
+#define ALEXA_SUPPORT           1
 #endif
 
-// This is default value for the fauxmoEnabled setting that defines whether
+// This is default value for the alexaEnabled setting that defines whether
 // this device should be discoberable and respond to Alexa commands.
-// Both ENABLE_FAUXMO and fauxmoEnabled should be 1 for Alexa support to work.
-#define FAUXMO_ENABLED          1
+// Both ALEXA_SUPPORT and alexaEnabled should be 1 for Alexa support to work.
+#define ALEXA_ENABLED           1
 
 
 // -----------------------------------------------------------------------------

code/espurna/config/hardware.h

@@ -68,7 +68,7 @@
     // Info
     #define MANUFACTURER        "TINKERMAN"
     #define DEVICE              "ESPURNA_H"
-    #define ENABLE_HLW8012      1
+    #define HLW8012_SUPPORT      1
 
     // Buttons
     #define BUTTON1_PIN         4
@@ -84,7 +84,7 @@
     #define LED1_PIN_INVERSE    0
 
     // HLW8012
-    #define ENABLE_HLW8012      1
+    #define HLW8012_SUPPORT      1
     #define HLW8012_SEL_PIN     2
     #define HLW8012_CF1_PIN     13
     #define HLW8012_CF_PIN      14
@@ -231,7 +231,7 @@
     // Info
     #define MANUFACTURER        "ITEAD_STUDIO"
     #define DEVICE              "SONOFF_POW"
-    #define ENABLE_HLW8012      1
+    #define HLW8012_SUPPORT      1
 
     // Buttons
     #define BUTTON1_PIN         0
@@ -247,7 +247,7 @@
     #define LED1_PIN_INVERSE    0
 
     // HLW8012
-    #define ENABLE_HLW8012      1
+    #define HLW8012_SUPPORT      1
     #define HLW8012_SEL_PIN     5
     #define HLW8012_CF1_PIN     13
     #define HLW8012_CF_PIN      14
@@ -260,8 +260,8 @@
     #define SERIAL_BAUDRATE     19230
     #define RELAY_PROVIDER      RELAY_PROVIDER_DUAL
     #define DUMMY_RELAY_COUNT   2
-    #define ENABLE_SERIAL_DEBUG 0
-    #define ENABLE_TERMINAL     0
+    #define DEBUG_SERIAL_SUPPORT 0
+    #define TERMINAL_SUPPORT     0
 
     // Buttons
     #define BUTTON3_RELAY       1
@@ -417,7 +417,7 @@
     #define RELAY_PROVIDER      RELAY_PROVIDER_RFBRIDGE
     #define DUMMY_RELAY_COUNT   6
     #define TRACK_RELAY_STATUS  0
-    #define ENABLE_TERMINAL     0
+    #define TERMINAL_SUPPORT     0
 
     // Buttons
     #define BUTTON1_PIN         0

code/espurna/config/sensors.h

@@ -1,7 +1,7 @@
 //--------------------------------------------------------------------------------
 // Custom RF module
 // Check http://tinkerman.cat/adding-rf-to-a-non-rf-itead-sonoff/
-// Enable support by passing ENABLE_RF=1 build flag
+// Enable support by passing RF_SUPPORT=1 build flag
 //--------------------------------------------------------------------------------
 
 #define RF_PIN                  14
@@ -10,7 +10,7 @@
 
 //--------------------------------------------------------------------------------
 // DHTXX temperature/humidity sensor
-// Enable support by passing ENABLE_DHT=1 build flag
+// Enable support by passing DHT_SUPPORT=1 build flag
 //--------------------------------------------------------------------------------
 
 #define DHT_PIN                 14
@@ -27,21 +27,21 @@
 
 //--------------------------------------------------------------------------------
 // Analog sensor
-// Enable support by passing ENABLE_ANALOG=1 build flag
+// Enable support by passing ANALOG_SUPPORT=1 build flag
 //--------------------------------------------------------------------------------
 
 #define ANALOG_PIN              0
 #define ANALOG_UPDATE_INTERVAL  60000
 #define ANALOG_TOPIC            "analog"
 
-#if ENABLE_ANALOG
+#if ANALOG_SUPPORT
     #undef ENABLE_ADC_VCC
     #define ENABLE_ADC_VCC      0
 #endif
 
 //--------------------------------------------------------------------------------
 // DS18B20 temperature sensor
-// Enable support by passing ENABLE_DS18B20=1 build flag
+// Enable support by passing DS18B20_SUPPORT=1 build flag
 //--------------------------------------------------------------------------------
 
 #define DS_PIN                  14
@@ -52,7 +52,7 @@
 // Custom current sensor
 // Check http://tinkerman.cat/your-laundry-is-done/
 // Check http://tinkerman.cat/power-monitoring-sonoff-th-adc121/
-// Enable support by passing ENABLE_EMON=1 build flag
+// Enable support by passing EMON_SUPPORT=1 build flag
 //--------------------------------------------------------------------------------
 
 #define EMON_ANALOG_PROVIDER    0
@@ -67,7 +67,7 @@
 	#define EMON_REFERENCE_VOLTAGE  1.0
     #define EMON_CURRENT_PRECISION  1
     #define EMON_CURRENT_OFFSET     0.25
-    #if ENABLE_EMON
+    #if EMON_SUPPORT
         #undef ENABLE_ADC_VCC
 		#define ENABLE_ADC_VCC      0
     #endif
@@ -92,7 +92,7 @@
 
 //--------------------------------------------------------------------------------
 // HLW8012 power sensor (Sonoff POW, Espurna H)
-// Enable support by passing ENABLE_HLW8012=1 build flag
+// Enable support by passing HLW8012_SUPPORT=1 build flag
 //--------------------------------------------------------------------------------
 
 // GPIOs defined in the hardware.h file

code/espurna/debug.ino

@@ -9,7 +9,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 #include <stdio.h>
 #include <stdarg.h>
 
-#ifdef ENABLE_UDP_DEBUG
+#ifdef DEBUG_UDP_SUPPORT
 #include <WiFiUdp.h>
 WiFiUDP udpDebug;
 #endif
@@ -23,14 +23,14 @@ void debugSend(const char * format, ...) {
     int len = ets_vsnprintf(buffer, DEBUG_MESSAGE_MAX_LENGTH, format, args);
     va_end(args);
 
-    #ifdef ENABLE_SERIAL_DEBUG
+    #ifdef DEBUG_SERIAL_SUPPORT
         DEBUG_PORT.printf(buffer);
         if (len > DEBUG_MESSAGE_MAX_LENGTH) {
             DEBUG_PORT.printf(" (...)\n");
         }
     #endif
 
-    #ifdef ENABLE_UDP_DEBUG
+    #ifdef DEBUG_UDP_SUPPORT
         udpDebug.beginPacket(DEBUG_UDP_IP, DEBUG_UDP_PORT);
         udpDebug.write(buffer);
         if (len > DEBUG_MESSAGE_MAX_LENGTH) {
@@ -54,14 +54,14 @@ void debugSend_P(PGM_P format, ...) {
     int len = ets_vsnprintf(buffer, DEBUG_MESSAGE_MAX_LENGTH, f, args);
     va_end(args);
 
-    #ifdef ENABLE_SERIAL_DEBUG
+    #ifdef DEBUG_SERIAL_SUPPORT
         DEBUG_PORT.printf(buffer);
         if (len > DEBUG_MESSAGE_MAX_LENGTH) {
             DEBUG_PORT.printf(" (...)\n");
         }
     #endif
 
-    #ifdef ENABLE_UDP_DEBUG
+    #ifdef DEBUG_UDP_SUPPORT
         udpDebug.beginPacket(DEBUG_UDP_IP, DEBUG_UDP_PORT);
         udpDebug.write(buffer);
         if (len > DEBUG_MESSAGE_MAX_LENGTH) {

code/espurna/dht.ino

@@ -6,7 +6,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_DHT
+#if DHT_SUPPORT
 
 #include <DHT.h>
 #include <Adafruit_Sensor.h>
@@ -74,7 +74,7 @@ void dhtLoop() {
             mqttSend(getSetting("dhtHumTopic", DHT_HUMIDITY_TOPIC).c_str(), humidity);
 
             // Send to Domoticz
-            #if ENABLE_DOMOTICZ
+            #if DOMOTICZ_SUPPORT
             {
                 domoticzSend("dczTmpIdx", 0, temperature);
                 int status;
@@ -93,7 +93,7 @@ void dhtLoop() {
             }
             #endif
 
-            #if ENABLE_INFLUXDB
+            #if INFLUXDB_SUPPORT
                 influxDBSend(getSetting("dhtTmpTopic", DHT_TEMPERATURE_TOPIC).c_str(), temperature);
                 influxDBSend(getSetting("dhtHumTopic", DHT_HUMIDITY_TOPIC).c_str(), humidity);
             #endif

code/espurna/domoticz.ino

@@ -6,7 +6,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_DOMOTICZ
+#if DOMOTICZ_SUPPORT
 
 #include <ArduinoJson.h>
 

code/espurna/ds18b20.ino

@@ -6,7 +6,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_DS18B20
+#if DS18B20_SUPPORT
 
 #include <OneWire.h>
 #include <DallasTemperature.h>
@@ -95,11 +95,11 @@ void dsLoop() {
             mqttSend(getSetting("dsTmpTopic", DS_TEMPERATURE_TOPIC).c_str(), _dsTemperatureStr);
 
             // Send to Domoticz
-            #if ENABLE_DOMOTICZ
+            #if DOMOTICZ_SUPPORT
                 domoticzSend("dczTmpIdx", 0, _dsTemperatureStr);
             #endif
 
-            #if ENABLE_INFLUXDB
+            #if INFLUXDB_SUPPORT
                 influxDBSend(getSetting("dsTmpTopic", DS_TEMPERATURE_TOPIC).c_str(), _dsTemperatureStr);
             #endif
 

code/espurna/emon.ino

@@ -6,7 +6,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_EMON
+#if EMON_SUPPORT
 
 #include <EmonLiteESP.h>
 #include <EEPROM.h>
@@ -188,7 +188,7 @@ void powerMonitorLoop() {
             mqttSend(getSetting("emonEnergyTopic", EMON_ENERGY_TOPIC).c_str(), String(energy_delta, 3).c_str());
 
             // Report values to Domoticz
-            #if ENABLE_DOMOTICZ
+            #if DOMOTICZ_SUPPORT
             {
                 char buffer[20];
                 snprintf_P(buffer, strlen(buffer), PSTR("%d;%s"), _emonPower, String(energy_delta, 3).c_str());
@@ -200,7 +200,7 @@ void powerMonitorLoop() {
             }
             #endif
 
-            #if ENABLE_INFLUXDB
+            #if INFLUXDB_SUPPORT
             influxDBSend(getSetting("emonPowerTopic", EMON_APOWER_TOPIC).c_str(), _emonPower);
             influxDBSend(getSetting("emonCurrTopic", EMON_CURRENT_TOPIC).c_str(), String(_emonCurrent, 3).c_str());
             influxDBSend(getSetting("emonEnergyTopic", EMON_ENERGY_TOPIC).c_str(), String(energy_delta, 3).c_str());

code/espurna/espurna.ino

@@ -75,13 +75,13 @@ void heartbeat() {
     #endif
     #if (HEARTBEAT_REPORT_UPTIME)
         mqttSend(MQTT_TOPIC_UPTIME, String(uptime_seconds).c_str());
-        #if ENABLE_INFLUXDB
+        #if INFLUXDB_SUPPORT
         influxDBSend(MQTT_TOPIC_UPTIME, String(uptime_seconds).c_str());
         #endif
     #endif
     #if (HEARTBEAT_REPORT_FREEHEAP)
         mqttSend(MQTT_TOPIC_FREEHEAP, String(free_heap).c_str());
-        #if ENABLE_INFLUXDB
+        #if INFLUXDB_SUPPORT
         influxDBSend(MQTT_TOPIC_FREEHEAP, String(free_heap).c_str());
         #endif
     #endif
@@ -121,7 +121,7 @@ void hardwareSetup() {
 
     EEPROM.begin(EEPROM_SIZE);
 
-    #if ENABLE_SERIAL_DEBUG
+    #if DEBUG_SERIAL_SUPPORT
         DEBUG_PORT.begin(SERIAL_BAUDRATE);
         if (customReset() == CUSTOM_RESET_HARDWARE) {
             DEBUG_PORT.setDebugOutput(true);
@@ -130,7 +130,7 @@ void hardwareSetup() {
         Serial.begin(SERIAL_BAUDRATE);
     #endif
 
-    #if ENABLE_SPIFFS
+    #if SPIFFS_SUPPORT
         SPIFFS.begin();
     #endif
 
@@ -176,7 +176,7 @@ void welcome() {
     DEBUG_MSG_P(PSTR("Flash size (CHIP): %8u bytes / %4d sectors\n"), ESP.getFlashChipRealSize(), sectors(ESP.getFlashChipRealSize()));
     DEBUG_MSG_P(PSTR("Firmware size:     %8u bytes / %4d sectors\n"), ESP.getSketchSize(), sectors(ESP.getSketchSize()));
     DEBUG_MSG_P(PSTR("OTA size:          %8u bytes / %4d sectors\n"), ESP.getFreeSketchSpace(), sectors(ESP.getFreeSketchSpace()));
-    #if ENABLE_SPIFFS
+    #if SPIFFS_SUPPORT
         FSInfo fs_info;
         bool fs = SPIFFS.info(fs_info);
         if (fs) {
@@ -188,7 +188,7 @@ void welcome() {
     DEBUG_MSG_P(PSTR("EEPROM size:       %8u bytes / %4d sectors\n"), settingsMaxSize(), sectors(settingsMaxSize()));
     DEBUG_MSG_P(PSTR("Empty space:       %8u bytes /    4 sectors\n"), 4 * SPI_FLASH_SEC_SIZE);
 
-    #if ENABLE_SPIFFS
+    #if SPIFFS_SUPPORT
         if (fs) {
             DEBUG_MSG_P(PSTR("\n"));
             DEBUG_MSG_P(PSTR("SPIFFS total size: %8u bytes\n"), fs_info.totalBytes);
@@ -245,37 +245,37 @@ void setup() {
         rfbSetup();
     #endif
 
-    #if ENABLE_I2C
+    #if I2C_SUPPORT
         i2cSetup();
     #endif
-    #if ENABLE_FAUXMO
-        fauxmoSetup();
+    #if ALEXA_SUPPORT
+        alexaSetup();
     #endif
-    #if ENABLE_NOFUSS
+    #if NOFUSS_SUPPORT
         nofussSetup();
     #endif
-    #if ENABLE_INFLUXDB
+    #if INFLUXDB_SUPPORT
         influxDBSetup();
     #endif
-    #if ENABLE_HLW8012
+    #if HLW8012_SUPPORT
         hlw8012Setup();
     #endif
-    #if ENABLE_DS18B20
+    #if DS18B20_SUPPORT
         dsSetup();
     #endif
-    #if ENABLE_ANALOG
+    #if ANALOG_SUPPORT
         analogSetup();
     #endif
-    #if ENABLE_DHT
+    #if DHT_SUPPORT
         dhtSetup();
     #endif
-    #if ENABLE_RF
+    #if RF_SUPPORT
         rfSetup();
     #endif
-    #if ENABLE_EMON
+    #if EMON_SUPPORT
         powerMonitorSetup();
     #endif
-    #if ENABLE_DOMOTICZ
+    #if DOMOTICZ_SUPPORT
         domoticzSetup();
     #endif
 
@@ -299,31 +299,31 @@ void loop() {
         rfbLoop();
     #endif
 
-    #if ENABLE_TERMINAL
+    #if TERMINAL_SUPPORT
         settingsLoop();
     #endif
-    #if ENABLE_FAUXMO
-        fauxmoLoop();
+    #if ALEXA_SUPPORT
+        alexaLoop();
     #endif
-    #if ENABLE_NOFUSS
+    #if NOFUSS_SUPPORT
         nofussLoop();
     #endif
-    #if ENABLE_HLW8012
+    #if HLW8012_SUPPORT
         hlw8012Loop();
     #endif
-    #if ENABLE_DS18B20
+    #if DS18B20_SUPPORT
         dsLoop();
     #endif
-    #if ENABLE_ANALOG
+    #if ANALOG_SUPPORT
         analogLoop();
     #endif
-    #if ENABLE_DHT
+    #if DHT_SUPPORT
         dhtLoop();
     #endif
-    #if ENABLE_RF
+    #if RF_SUPPORT
         rfLoop();
     #endif
-    #if ENABLE_EMON
+    #if EMON_SUPPORT
         powerMonitorLoop();
     #endif
 

code/espurna/fauxmo.ino

@@ -1,44 +0,0 @@
-/*
-
-FAUXMO MODULE
-
-Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
-
-*/
-
-#if ENABLE_FAUXMO
-
-#include <fauxmoESP.h>
-
-fauxmoESP fauxmo;
-
-// -----------------------------------------------------------------------------
-// FAUXMO
-// -----------------------------------------------------------------------------
-
-void fauxmoConfigure() {
-    fauxmo.enable(getSetting("fauxmoEnabled", FAUXMO_ENABLED).toInt() == 1);
-}
-
-void fauxmoSetup() {
-    fauxmoConfigure();
-    unsigned int relays = relayCount();
-    String hostname = getSetting("hostname");
-    if (relays == 1) {
-        fauxmo.addDevice(hostname.c_str());
-    } else {
-        for (unsigned int i=0; i<relays; i++) {
-            fauxmo.addDevice((hostname + "_" + i).c_str());
-        }
-    }
-    fauxmo.onMessage([relays](unsigned char device_id, const char * name, bool state) {
-        DEBUG_MSG_P(PSTR("[FAUXMO] %s state: %s\n"), name, state ? "ON" : "OFF");
-        relayStatus(device_id, state);
-    });
-}
-
-void fauxmoLoop() {
-    fauxmo.handle();
-}
-
-#endif

code/espurna/hlw8012.ino

@@ -7,7 +7,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_HLW8012
+#if HLW8012_SUPPORT
 
 #include <HLW8012.h>
 #include <Hash.h>
@@ -292,7 +292,7 @@ void hlw8012Loop() {
             mqttSend(getSetting("powPFactorTopic", HLW8012_PFACTOR_TOPIC).c_str(), String(factor, 2).c_str());
 
             // Report values to Domoticz
-            #if ENABLE_DOMOTICZ
+            #if DOMOTICZ_SUPPORT
             {
                 char buffer[20];
                 snprintf_P(buffer, strlen(buffer), PSTR("%d;%s"), _hlwPower, String(energy_delta, 3).c_str());
@@ -306,7 +306,7 @@ void hlw8012Loop() {
             }
             #endif
 
-            #if ENABLE_INFLUXDB
+            #if INFLUXDB_SUPPORT
             influxDBSend(getSetting("powPowerTopic", HLW8012_POWER_TOPIC).c_str(), String(_hlwPower).c_str());
             influxDBSend(getSetting("powCurrentTopic", HLW8012_CURRENT_TOPIC).c_str(), String(_hlwCurrent, 3).c_str());
             influxDBSend(getSetting("powVoltageTopic", HLW8012_VOLTAGE_TOPIC).c_str(), String(_hlwVoltage).c_str());

code/espurna/i2c.ino

@@ -6,7 +6,7 @@ Copyright (C) 2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_I2C
+#if I2C_SUPPORT
 
 #include "brzo_i2c.h"
 

code/espurna/influxdb.ino

@@ -6,7 +6,7 @@ Copyright (C) 2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_INFLUXDB
+#if INFLUXDB_SUPPORT
 
 #include "ESPAsyncTCP.h"
 #include "SyncClient.h"

code/espurna/nofuss.ino

@@ -6,7 +6,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_NOFUSS
+#if NOFUSS_SUPPORT
 
 #include "NoFUSSClient.h"
 

code/espurna/ota.ino

@@ -39,7 +39,7 @@ void otaSetup() {
     });
 
     ArduinoOTA.onError([](ota_error_t error) {
-        #if ENABLE_SERIAL_DEBUG || ENABLE_UDP_DEBUG
+        #if DEBUG_SERIAL_SUPPORT || DEBUG_UDP_SUPPORT
             DEBUG_MSG_P(PSTR("\n[OTA] Error #%u: "), error);
             if (error == OTA_AUTH_ERROR) DEBUG_MSG_P(PSTR("Auth Failed\n"));
             else if (error == OTA_BEGIN_ERROR) DEBUG_MSG_P(PSTR("Begin Failed\n"));

code/espurna/relay.ino

@@ -429,7 +429,7 @@ void relaySetupMQTT() {
 // InfluxDB
 //------------------------------------------------------------------------------
 
-#if ENABLE_INFLUXDB
+#if INFLUXDB_SUPPORT
 void relayInfluxDB(unsigned char id) {
     if (id >= _relays.size()) return;
     char buffer[10];
@@ -520,11 +520,11 @@ void relayLoop(void) {
                 relayWS();
             }
 
-            #if ENABLE_DOMOTICZ
+            #if DOMOTICZ_SUPPORT
                 domoticzSendRelay(id);
             #endif
 
-            #if ENABLE_INFLUXDB
+            #if INFLUXDB_SUPPORT
                 relayInfluxDB(id);
             #endif
 

code/espurna/rf.ino

@@ -6,7 +6,7 @@ Copyright (C) 2016-2017 by Xose Pérez <xose dot perez at gmail dot com>
 
 */
 
-#if ENABLE_RF
+#if RF_SUPPORT
 
 #include <RemoteReceiver.h>
 

code/espurna/web.ino

@@ -211,7 +211,7 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
             // Skip firmware filename
             if (key.equals("filename")) continue;
 
-            #if ENABLE_HLW8012
+            #if HLW8012_SUPPORT
 
                 if (key == "powExpectedPower") {
                     hlw8012SetExpectedActivePower(value.toInt());
@@ -237,7 +237,7 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
 
             if (key.startsWith("pow")) continue;
 
-            #if ENABLE_DOMOTICZ
+            #if DOMOTICZ_SUPPORT
 
                 if (key == "dczRelayIdx") {
                     if (dczRelayIdx >= relayCount()) continue;
@@ -347,22 +347,22 @@ void _wsParse(uint32_t client_id, uint8_t * payload, size_t length) {
             saveSettings();
             wifiConfigure();
             otaConfigure();
-            #if ENABLE_FAUXMO
-                fauxmoConfigure();
+            #if ALEXA_SUPPORT
+                alexaConfigure();
             #endif
-            #if ENABLE_INFLUXDB
+            #if INFLUXDB_SUPPORT
                 influxDBConfigure();
             #endif
-            #if ENABLE_DOMOTICZ
+            #if DOMOTICZ_SUPPORT
                 domoticzConfigure();
             #endif
             mqttConfigure();
 
-            #if ENABLE_RF
+            #if RF_SUPPORT
                 rfBuildCodes();
             #endif
 
-            #if ENABLE_EMON
+            #if EMON_SUPPORT
                 setCurrentRatio(getSetting("emonRatio").toFloat());
             #endif
 
@@ -475,7 +475,7 @@ void _wsStart(uint32_t client_id) {
 
         root["tmpUnits"] = getSetting("tmpUnits", TMP_UNITS).toInt();
 
-        #if ENABLE_DOMOTICZ
+        #if DOMOTICZ_SUPPORT
 
             root["dczVisible"] = 1;
             root["dczEnabled"] = getSetting("dczEnabled", DOMOTICZ_ENABLED).toInt() == 1;
@@ -487,26 +487,26 @@ void _wsStart(uint32_t client_id) {
                 dczRelayIdx.add(domoticzIdx(i));
             }
 
-            #if ENABLE_DHT
+            #if DHT_SUPPORT
                 root["dczTmpIdx"] = getSetting("dczTmpIdx").toInt();
                 root["dczHumIdx"] = getSetting("dczHumIdx").toInt();
             #endif
 
-            #if ENABLE_DS18B20
+            #if DS18B20_SUPPORT
                 root["dczTmpIdx"] = getSetting("dczTmpIdx").toInt();
             #endif
 
-            #if ENABLE_EMON
+            #if EMON_SUPPORT
                 root["dczPowIdx"] = getSetting("dczPowIdx").toInt();
                 root["dczEnergyIdx"] = getSetting("dczEnergyIdx").toInt();
                 root["dczCurrentIdx"] = getSetting("dczCurrentIdx").toInt();
             #endif
 
-            #if ENABLE_ANALOG
+            #if ANALOG_SUPPORT
                 root["dczAnaIdx"] = getSetting("dczAnaIdx").toInt();
             #endif
 
-            #if ENABLE_HLW8012
+            #if HLW8012_SUPPORT
                 root["dczPowIdx"] = getSetting("dczPowIdx").toInt();
                 root["dczEnergyIdx"] = getSetting("dczEnergyIdx").toInt();
                 root["dczVoltIdx"] = getSetting("dczVoltIdx").toInt();
@@ -515,7 +515,7 @@ void _wsStart(uint32_t client_id) {
 
         #endif
 
-        #if ENABLE_INFLUXDB
+        #if INFLUXDB_SUPPORT
             root["idbVisible"] = 1;
             root["idbHost"] = getSetting("idbHost");
             root["idbPort"] = getSetting("idbPort", INFLUXDB_PORT).toInt();
@@ -524,29 +524,29 @@ void _wsStart(uint32_t client_id) {
             root["idbPassword"] = getSetting("idbPassword");
         #endif
 
-        #if ENABLE_FAUXMO
-            root["fauxmoVisible"] = 1;
-            root["fauxmoEnabled"] = getSetting("fauxmoEnabled", FAUXMO_ENABLED).toInt() == 1;
+        #if ALEXA_SUPPORT
+            root["alexaVisible"] = 1;
+            root["alexaEnabled"] = getSetting("alexaEnabled", ALEXA_ENABLED).toInt() == 1;
         #endif
 
-        #if ENABLE_DS18B20
+        #if DS18B20_SUPPORT
             root["dsVisible"] = 1;
             root["dsTmp"] = getDSTemperatureStr();
         #endif
 
-        #if ENABLE_DHT
+        #if DHT_SUPPORT
             root["dhtVisible"] = 1;
             root["dhtTmp"] = getDHTTemperature();
             root["dhtHum"] = getDHTHumidity();
         #endif
 
-        #if ENABLE_RF
+        #if RF_SUPPORT
             root["rfVisible"] = 1;
             root["rfChannel"] = getSetting("rfChannel", RF_CHANNEL);
             root["rfDevice"] = getSetting("rfDevice", RF_DEVICE);
         #endif
 
-        #if ENABLE_EMON
+        #if EMON_SUPPORT
             root["emonVisible"] = 1;
             root["emonApparentPower"] = getApparentPower();
             root["emonCurrent"] = getCurrent();
@@ -554,12 +554,12 @@ void _wsStart(uint32_t client_id) {
             root["emonRatio"] = getSetting("emonRatio", EMON_CURRENT_RATIO);
         #endif
 
-        #if ENABLE_ANALOG
+        #if ANALOG_SUPPORT
             root["analogVisible"] = 1;
             root["analogValue"] = getAnalog();
         #endif
 
-        #if ENABLE_HLW8012
+        #if HLW8012_SUPPORT
             root["powVisible"] = 1;
             root["powActivePower"] = getActivePower();
             root["powApparentPower"] = getApparentPower();
@@ -973,7 +973,7 @@ void webSetup() {
     _server->on("/upgrade", HTTP_POST, _onUpgrade, _onUpgradeData);
 
     // Serve static files
-    #if ENABLE_SPIFFS
+    #if SPIFFS_SUPPORT
         _server->serveStatic("/", SPIFFS, "/")
             .setLastModified(_last_modified)
             .setFilter([](AsyncWebServerRequest *request) -> bool {

code/espurna/wifi.ino

@@ -27,7 +27,7 @@ String getNetwork() {
 }
 
 void wifiDisconnect() {
-    #if ENABLE_HLW8012
+    #if HLW8012_SUPPORT
         hlw8012Enable(false);
     #endif
     jw.disconnect();
@@ -122,7 +122,7 @@ void wifiSetup() {
     // Message callbacks
     jw.onMessage([](justwifi_messages_t code, char * parameter) {
 
-		#if ENABLE_SERIAL_DEBUG || ENABLE_UDP_DEBUG
+		#if DEBUG_SERIAL_SUPPORT || DEBUG_UDP_SUPPORT
 
 		    if (code == MESSAGE_SCANNING) {
 		        DEBUG_MSG_P(PSTR("[WIFI] Scanning\n"));
@@ -179,7 +179,7 @@ void wifiSetup() {
 		#endif
 
         // Configure mDNS
-        #if ENABLE_MDNS
+        #if MDNS_SUPPORT
     	    if (code == MESSAGE_CONNECTED || code == MESSAGE_ACCESSPOINT_CREATED) {
                 if (MDNS.begin(WiFi.getMode() == WIFI_AP ? APP_NAME : (char *) WiFi.hostname().c_str())) {
                     MDNS.addService("http", "tcp", getSetting("webPort", WEBSERVER_PORT).toInt());
@@ -196,7 +196,7 @@ void wifiSetup() {
         }
 
         // Manage POW
-        #if ENABLE_HLW8012
+        #if HLW8012_SUPPORT
             if (code == MESSAGE_CONNECTED) {
                 hlw8012Enable(true);
             }

code/html/index.html

@@ -372,9 +372,9 @@
                                     <div class="pure-u-1 pure-u-md-3-4 hint">Use gamma correction for RGB channels.<br />Will only work if "use colorpicker" above is also ON.</div>
                                 </div>
 
-                                <div class="pure-g module module-fauxmo">
-                                    <div class="pure-u-1 pure-u-sm-1-4"><label for="fauxmoEnabled">Alexa integration</label></div>
-                                    <div class="pure-u-1 pure-u-sm-1-4"><input type="checkbox" name="fauxmoEnabled" tabindex="11" /></div>
+                                <div class="pure-g module module-alexa">
+                                    <div class="pure-u-1 pure-u-sm-1-4"><label for="alexaEnabled">Alexa integration</label></div>
+                                    <div class="pure-u-1 pure-u-sm-1-4"><input type="checkbox" name="alexaEnabled" tabindex="11" /></div>
                                 </div>
 
                                 <div class="pure-g module module-ds module-dht">
@@ -525,7 +525,7 @@
                                     </div>
                                 </div>
 
-                                <div class="pure-g module module-fauxmo">
+                                <div class="pure-g">
                                     <div class="pure-u-1 pure-u-sm-1-4"><label for="mqttUseJson">Use JSON payload</label></div>
                                     <div class="pure-u-1 pure-u-sm-3-4"><input type="checkbox" name="mqttUseJson" tabindex="26" /></div>
                                     <div class="pure-u-1 pure-u-md-1-4">&nbsp;</div>