Merge branch 'dev' into softcfg

code/espurna/api.ino

@@ -8,7 +8,7 @@ Module key prefix: api
 
 */
 
-#if WEB_SUPPORT
+#if API_SUPPORT
 
 #include <ESPAsyncTCP.h>
 #include <ESPAsyncWebServer.h>
@@ -29,6 +29,7 @@ bool _apiKeyCheck(const char * key) {
 }
 
 void _apiWebSocketOnSend(JsonObject& root) {
+    root["apiVisible"] = 1;
     root["apiEnabled"] = getSetting("apiEnabled", API_ENABLED).toInt() == 1;
     root["apiKey"] = getSetting("apiKey");
     root["apiRealTime"] = apiRealTime();
@@ -222,4 +223,4 @@ void apiSetup() {
     wsOnSendRegister(_apiWebSocketOnSend);
 }
 
-#endif // WEB_SUPPORT
+#endif // API_SUPPORT

code/espurna/config/arduino.h

@@ -96,7 +96,9 @@
 //--------------------------------------------------------------------------------
 
 //#define ALEXA_SUPPORT          0
+//#define API_SUPPORT            0
 //#define BROKER_SUPPORT         0
+//#define BUTTON_SUPPORT         0
 //#define DEBUG_SERIAL_SUPPORT   0
 //#define DEBUG_TELNET_SUPPORT   0
 //#define DEBUG_UDP_SUPPORT      1
@@ -106,15 +108,18 @@
 //#define I2C_SUPPORT            1
 //#define INFLUXDB_SUPPORT       1
 //#define IR_SUPPORT             1
+//#define LED_SUPPORT            0
 //#define LLMNR_SUPPORT          1  // Only with Arduino Core 2.4.0
-//#define MDNS_SERVER_SUPPORT    0
 //#define MDNS_CLIENT_SUPPORT    1
+//#define MDNS_SERVER_SUPPORT    0
 //#define MQTT_SUPPORT           0
 //#define NETBIOS_SUPPORT        1  // Only with Arduino Core 2.4.0
 //#define NOFUSS_SUPPORT         1
 //#define NTP_SUPPORT            0
+//#define RFM69_SUPPORT          1
 //#define RF_SUPPORT             1
 //#define SCHEDULER_SUPPORT      0
+//#define SENSOR_SUPPORT         1
 //#define SPIFFS_SUPPORT         1
 //#define SSDP_SUPPORT           1
 //#define TELNET_SUPPORT         0
@@ -140,6 +145,7 @@
 //#define EMON_ADS1X15_SUPPORT   1
 //#define EMON_ANALOG_SUPPORT    1
 //#define EVENTS_SUPPORT         1
+//#define GEIGER_SUPPORT         1
 //#define GUVAS12SD_SUPPORT      1
 //#define HLW8012_SUPPORT        1
 //#define MHZ19_SUPPORT          1
@@ -151,4 +157,3 @@
 //#define SONAR_SUPPORT          1
 //#define TMP3X_SUPPORT          1
 //#define V9261F_SUPPORT         1
-//#define GEIGER_SUPPORT         1

code/espurna/config/dependencies.h

@@ -15,6 +15,11 @@
 #define DEBUG_WEB_SUPPORT           0
 #endif
 
+#if not WEB_SUPPORT
+#undef API_SUPPORT
+#define API_SUPPORT                 0           // API support requires web support
+#endif
+
 #if not WEB_SUPPORT
 #undef SSDP_SUPPORT
 #define SSDP_SUPPORT                0           // SSDP support requires web support

code/espurna/config/general.h

@@ -417,6 +417,10 @@
 // API
 // -----------------------------------------------------------------------------
 
+#ifndef API_SUPPORT
+#define API_SUPPORT                 1           // API (REST & RPC) support built in
+#endif
+
 // 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

code/espurna/config/progmem.h

@@ -31,9 +31,15 @@ PROGMEM const char espurna_modules[] =
     #if ALEXA_SUPPORT
         "ALEXA "
     #endif
+    #if API_SUPPORT
+        "API "
+    #endif
     #if BROKER_SUPPORT
         "BROKER "
     #endif
+    #if BUTTON_SUPPORT
+        "BUTTON "
+    #endif
     #if DEBUG_SERIAL_SUPPORT
         "DEBUG_SERIAL "
     #endif
@@ -61,15 +67,18 @@ PROGMEM const char espurna_modules[] =
     #if IR_SUPPORT
         "IR "
     #endif
+    #if LED_SUPPORT
+        "LED "
+    #endif
     #if LLMNR_SUPPORT
         "LLMNR "
     #endif
-    #if MDNS_SERVER_SUPPORT
-        "MDNS_SERVER "
-    #endif
     #if MDNS_CLIENT_SUPPORT
         "MDNS_CLIENT "
     #endif
+    #if MDNS_SERVER_SUPPORT
+        "MDNS_SERVER "
+    #endif
     #if MQTT_SUPPORT
         "MQTT "
     #endif
@@ -82,12 +91,12 @@ PROGMEM const char espurna_modules[] =
     #if NTP_SUPPORT
         "NTP "
     #endif
-    #if RF_SUPPORT
-        "RF "
-    #endif
     #if RFM69_SUPPORT
         "RFM69 "
     #endif
+    #if RF_SUPPORT
+        "RF "
+    #endif
     #if SCHEDULER_SUPPORT
         "SCHEDULER "
     #endif
@@ -169,9 +178,6 @@ PROGMEM const char espurna_sensors[] =
     #if GUVAS12SD_SUPPORT
         "GUVAS12SD "
     #endif
-    #if SONAR_SUPPORT
-        "SONAR "
-    #endif
     #if HLW8012_SUPPORT
         "HLW8012 "
     #endif
@@ -196,6 +202,9 @@ PROGMEM const char espurna_sensors[] =
     #if SI7021_SUPPORT
         "SI7021 "
     #endif
+    #if SONAR_SUPPORT
+        "SONAR "
+    #endif
     #if TMP3X_SUPPORT
         "TMP3X "
     #endif

code/espurna/config/sensors.h

@@ -534,7 +534,7 @@
 
 //------------------------------------------------------------------------------
 // SHT3X I2C (Wemos) temperature & humidity sensor
-// Enable support by passing SHT3X_SUPPORT=1 build flag
+// Enable support by passing SHT3X_I2C_SUPPORT=1 build flag
 //------------------------------------------------------------------------------
 
 #ifndef SHT3X_I2C_SUPPORT

code/espurna/espurna.ino

@@ -89,11 +89,13 @@ void setup() {
     #if WEB_SUPPORT
         webSetup();
         wsSetup();
-        apiSetup();
         #if DEBUG_WEB_SUPPORT
             debugWebSetup();
         #endif
     #endif
+    #if API_SUPPORT
+        apiSetup();
+    #endif
 
     // lightSetup must be called before relaySetup
     #if LIGHT_PROVIDER != LIGHT_PROVIDER_NONE

code/espurna/light.ino

@@ -284,7 +284,7 @@ void _fromHSV(const char * hsv) {
 void _fromKelvin(unsigned long kelvin) {
 
     if (!_light_has_color) return;
-	
+
     _light_mireds = constrain(round(1000000UL / kelvin), LIGHT_MIN_MIREDS, LIGHT_MAX_MIREDS);
 
     if (_light_use_cct) {
@@ -822,6 +822,10 @@ void _lightWebSocketOnAction(uint32_t client_id, const char * action, JsonObject
     }
 }
 
+#endif
+
+#if API_SUPPORT
+
 void _lightAPISetup() {
   // API entry points (protected with apikey)
   if (_light_has_color) {
@@ -892,7 +896,7 @@ void _lightAPISetup() {
   }
 }
 
-#endif // WEB_SUPPORT
+#endif // API_SUPPORT
 
 #if TERMINAL_SUPPORT
 
@@ -1087,7 +1091,6 @@ void lightSetup() {
     _lightColorRestore();
 
     #if WEB_SUPPORT
-        _lightAPISetup();
         wsOnSendRegister(_lightWebSocketOnSend);
         wsOnActionRegister(_lightWebSocketOnAction);
         wsOnAfterParseRegister([]() {
@@ -1098,6 +1101,10 @@ void lightSetup() {
         });
     #endif
 
+    #if API_SUPPORT
+        _lightAPISetup();
+    #endif
+
     #if MQTT_SUPPORT
         mqttRegister(_lightMQTTCallback);
     #endif

code/espurna/relay.ino

@@ -676,7 +676,7 @@ void relaySetupWS() {
 // REST API
 //------------------------------------------------------------------------------
 
-#if WEB_SUPPORT
+#if API_SUPPORT
 
 void relaySetupAPI() {
 
@@ -748,7 +748,7 @@ void relaySetupAPI() {
 
 }
 
-#endif // WEB_SUPPORT
+#endif // API_SUPPORT
 
 //------------------------------------------------------------------------------
 // MQTT
@@ -1017,9 +1017,11 @@ void relaySetup() {
     espurnaRegisterLoop(_relayLoop);
 
     #if WEB_SUPPORT
-        relaySetupAPI();
         relaySetupWS();
     #endif
+    #if API_SUPPORT
+        relaySetupAPI();
+    #endif
     #if MQTT_SUPPORT
         relaySetupMQTT();
     #endif

code/espurna/sensor.ino

@@ -217,6 +217,10 @@ void _sensorWebSocketStart(JsonObject& root) {
 
 }
 
+#endif // WEB_SUPPORT
+
+#if API_SUPPORT
+
 void _sensorAPISetup() {
 
     for (unsigned char magnitude_id=0; magnitude_id<_magnitudes.size(); magnitude_id++) {
@@ -236,7 +240,8 @@ void _sensorAPISetup() {
     }
 
 }
-#endif
+
+#endif // API_SUPPORT
 
 #if TERMINAL_SUPPORT
 
@@ -1062,18 +1067,19 @@ void sensorSetup() {
     // Configure stored values
     _sensorConfigure();
 
+    // Websockets
     #if WEB_SUPPORT
-
-        // Websockets
         wsOnSendRegister(_sensorWebSocketStart);
         wsOnSendRegister(_sensorWebSocketSendData);
         wsOnAfterParseRegister(_sensorConfigure);
+    #endif
 
-        // API
+    // API
+    #if API_SUPPORT
         _sensorAPISetup();
-
     #endif
 
+    // Terminal
     #if TERMINAL_SUPPORT
         _sensorInitCommands();
     #endif

code/html/index.html

@@ -550,12 +550,12 @@
                                     <div class="pure-u-1 pure-u-lg-1-4"><input type="checkbox" name="wsAuth" /></div>
                                 </div>
 
-                                <div class="pure-g">
+                                <div class="pure-g module module-api">
                                     <label class="pure-u-1 pure-u-lg-1-4">Enable HTTP API</label>
                                     <div class="pure-u-1 pure-u-lg-1-4"><input type="checkbox" name="apiEnabled" /></div>
                                 </div>
 
-                                <div class="pure-g">
+                                <div class="pure-g module module-api">
                                     <label class="pure-u-1 pure-u-lg-1-4">Real time API</label>
                                     <div class="pure-u-1 pure-u-lg-1-4"><input type="checkbox" name="apiRealTime" /></div>
                                     <div class="pure-u-0 pure-u-lg-1-2"></div>
@@ -566,7 +566,7 @@
                                     </div>
                                 </div>
 
-                                <div class="pure-g">
+                                <div class="pure-g module module-api">
                                     <label class="pure-u-1 pure-u-lg-1-4">HTTP API Key</label>
                                     <input name="apiKey" class="pure-u-3-4 pure-u-lg-1-2" type="text" tabindex="14" />
                                     <div class=" pure-u-1-4 pure-u-lg-1-4"><button class="pure-button button-apikey pure-u-23-24">Auto</button></div>