add temperature compensation. refactoring. dark-mode. debug-log with websockets.

include/DebugLog.h

@@ -0,0 +1,50 @@
+/*
+ * DebugLog.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef _DEBUG_LOG_H_
+#define _DEBUG_LOG_H_
+
+#include <Arduino.h>
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#include <CircularBuffer.h>
+#define DEBUG_LOG_HISTORY_SIZE 1024
+#endif
+
+class DebugLog {
+public:
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    String getBuffer(void);
+#endif
+    
+    void write(char c);
+    void print(String s);
+    void print(int n);
+    
+    void println(void);
+    void println(String s);
+    void println(int n);
+    
+private:
+    void sendToTargets(String s);
+    
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    void addToBuffer(String s);
+    
+    CircularBuffer<char, DEBUG_LOG_HISTORY_SIZE> buffer;
+#endif
+};
+
+extern DebugLog debug;
+
+#endif // _DEBUG_LOG_H_

include/config.h

@@ -15,10 +15,12 @@
 #define __ESP_ENV_CONFIG__
 
 // Sketch version
-#define ESP_ENV_VERSION "0.5.0"
+#define ESP_ENV_VERSION "0.6.0"
 
 // location of sensor, used in DB and hostname
 //#define SENSOR_LOCATION_LIVINGROOM
+//#define SENSOR_LOCATION_LIVINGROOM_WORKSPACE
+//#define SENSOR_LOCATION_LIVINGROOM_TV
 //#define SENSOR_LOCATION_BEDROOM
 //#define SENSOR_LOCATION_BATHROOM
 //#define SENSOR_LOCATION_GREENHOUSE
@@ -38,10 +40,13 @@
 #define INFLUXDB_HOST "INFLUX_IP_HERE"
 #define INFLUXDB_PORT 8086
 #define INFLUXDB_DATABASE "roomsensorsdiy"
+#define INFLUX_MAX_ERRORS_RESET 10
 
 // all given in milliseconds
 #define SERVER_HANDLE_INTERVAL 10
+#define SENSOR_HANDLE_INTERVAL (5 * 1000)
 #define DB_WRITE_INTERVAL (30 * 1000)
+#define MQTT_WRITE_INTERVAL (30 * 1000)
 #define LED_BLINK_INTERVAL (2 * 1000)
 #define LED_INIT_BLINK_INTERVAL 500
 #define LED_CONNECT_BLINK_INTERVAL 250
@@ -50,16 +55,28 @@
 
 #if defined(SENSOR_LOCATION_LIVINGROOM)
 #define SENSOR_LOCATION "livingroom"
+#define SENSOR_ID SENSOR_LOCATION
+#elif defined(SENSOR_LOCATION_LIVINGROOM_WORKSPACE)
+#define SENSOR_LOCATION "livingroom"
+#define SENSOR_ID "livingroom-workspace"
+#elif defined(SENSOR_LOCATION_LIVINGROOM_TV)
+#define SENSOR_LOCATION "livingroom"
+#define SENSOR_ID "livingroom-tv"
 #elif defined(SENSOR_LOCATION_BEDROOM)
 #define SENSOR_LOCATION "bedroom"
+#define SENSOR_ID SENSOR_LOCATION
 #elif defined(SENSOR_LOCATION_BATHROOM)
 #define SENSOR_LOCATION "bathroom"
+#define SENSOR_ID SENSOR_LOCATION
 #elif defined(SENSOR_LOCATION_GREENHOUSE)
 #define SENSOR_LOCATION "greenhouse"
+#define SENSOR_ID SENSOR_LOCATION
 #elif defined(SENSOR_LOCATION_TESTING)
 #define SENSOR_LOCATION "testing"
+#define SENSOR_ID SENSOR_LOCATION
 #else
 #define SENSOR_LOCATION "unknown"
+#define SENSOR_ID SENSOR_LOCATION
 #endif
 
 #if defined(RELAIS_SERIAL) || defined(RELAIS_GPIO)
@@ -70,4 +87,10 @@
 #define FEATURE_MOISTURE
 #endif
 
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#define BUILTIN_LED_PIN 1
+#elif defined(ARDUINO_ARCH_AVR)
+#define BUILTIN_LED_PIN 13
+#endif
+
 #endif // __ESP_ENV_CONFIG__

include/html.h

@@ -0,0 +1,28 @@
+/*
+ * html.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef __HTML_H__
+#define __HTML_H__
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+
+void handlePage(int mode = -1, int id = 0);
+void handleReset();
+
+#else
+
+void handlePage(WiFiClient &client, int mode = -1, int id = 0);
+
+#endif
+
+#endif // __HTML_H__

include/influx.h

@@ -0,0 +1,21 @@
+/*
+ * influx.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef __INFLUX_H__
+#define __INFLUX_H__
+
+void initInflux();
+void runInflux();
+void writeDatabase();
+
+#endif // __INFLUX_H__

include/memory.h

@@ -0,0 +1,34 @@
+/*
+ * memory.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef __ESP_ENV_MEMORY__
+#define __ESP_ENV_MEMORY__
+
+struct ConfigMemory {
+    double sht_temp_off;
+    double bme1_temp_off;
+    double bme2_temp_off;
+
+    ConfigMemory() {
+        sht_temp_off = 0.0;
+        bme1_temp_off = 0.0;
+        bme2_temp_off = 0.0;
+    }
+};
+
+ConfigMemory mem_read();
+void mem_write(ConfigMemory mem);
+
+extern ConfigMemory config;
+
+#endif // __ESP_ENV_MEMORY__

include/mqtt.h

@@ -0,0 +1,20 @@
+/*
+ * mqtt.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef __MQTT_H__
+#define __MQTT_H__
+
+void initMQTT();
+void runMQTT();
+
+#endif // __MQTT_H__

include/sensors.h

@@ -0,0 +1,41 @@
+/*
+ * sensors.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef __SENSORS_H__
+#define __SENSORS_H__
+
+float bme1_temp(void);
+float bme2_temp(void);
+float bme1_humid(void);
+float bme2_humid(void);
+float bme1_pressure(void);
+float bme2_pressure(void);
+float sht_temp(void);
+float sht_humid(void);
+extern bool found_bme1, found_bme2, found_sht;
+
+#ifdef ENABLE_CCS811
+float ccs1_eco2(void);
+float ccs1_tvoc(void);
+float ccs2_eco2(void);
+float ccs2_tvoc(void);
+extern bool found_ccs1, found_ccs2;
+extern bool ccs1_data_valid, ccs2_data_valid;
+extern int ccs1_error_code, ccs2_error_code;
+#endif // ENABLE_CCS811
+
+void handleCalibrate();
+void initSensors();
+void runSensors();
+
+#endif // __SENSORS_H__

include/servers.h

@@ -0,0 +1,30 @@
+/*
+ * servers.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef __SERVERS_H__
+#define __SERVERS_H__
+
+void initServers(String hostname);
+void runServers();
+
+void wifi_send_websocket(String s);
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#include "SimpleUpdater.h"
+extern UPDATE_WEB_SERVER server;
+#elif defined(ARDUINO_ARCH_AVR)
+#include <WiFiLink.h>
+extern WiFiServer server;
+#endif
+
+#endif // __SERVERS_H__

platformio.ini

@@ -24,6 +24,8 @@ lib_deps =
     Adafruit BME280 Library
     https://github.com/adafruit/Adafruit_CCS811
     https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c
+    https://github.com/rlogiacco/CircularBuffer
+    https://github.com/Links2004/arduinoWebSockets
 
 [env:esp8266relais]
 platform = espressif8266
@@ -40,6 +42,8 @@ lib_deps =
     Adafruit Unified Sensor
     Adafruit BME280 Library
     https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c
+    https://github.com/rlogiacco/CircularBuffer
+    https://github.com/Links2004/arduinoWebSockets
 
 [env:esp32env]
 platform = platformio/espressif32@3.5.0
@@ -61,6 +65,8 @@ lib_deps =
     https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino.git#66ed5d031caab6953cc79b407a4b49d33b1126dc
     https://github.com/adafruit/Adafruit_CCS811
     https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c
+    https://github.com/rlogiacco/CircularBuffer
+    https://github.com/Links2004/arduinoWebSockets
 
 [env:esp32moisture]
 platform = platformio/espressif32@3.5.0
@@ -83,6 +89,8 @@ lib_deps =
     https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino.git#66ed5d031caab6953cc79b407a4b49d33b1126dc
     https://github.com/adafruit/Adafruit_CCS811
     https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c
+    https://github.com/rlogiacco/CircularBuffer
+    https://github.com/Links2004/arduinoWebSockets
 
 [env:arduinomoisture]
 platform = atmelavr

src/DebugLog.cpp

@@ -0,0 +1,76 @@
+/*
+ * DebugLog.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#include <Arduino.h>
+
+#include "DebugLog.h"
+
+DebugLog debug;
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+
+void wifi_send_websocket(String s);
+
+String DebugLog::getBuffer(void) {
+    String r;
+    for (unsigned int i = 0; i < buffer.size(); i++) {
+        r += buffer[i];
+    }
+    return r;
+}
+
+void DebugLog::addToBuffer(String s) {
+    for (unsigned int i = 0; i < s.length(); i++) {
+        buffer.push(s[i]);
+    }
+}
+
+#endif
+
+void DebugLog::sendToTargets(String s) {
+    Serial.print(s);
+    
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    s = "log:" + s;
+    wifi_send_websocket(s);
+#endif
+}
+
+void DebugLog::write(char c) {
+    print(String(c));
+}
+
+void DebugLog::print(String s) {
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    addToBuffer(s);
+#endif
+    
+    sendToTargets(s);
+}
+
+void DebugLog::print(int n) {
+    print(String(n));
+}
+
+void DebugLog::println(void) {
+    print(String(F("\r\n")));
+}
+
+void DebugLog::println(String s) {
+    s += String(F("\r\n"));
+    print(s);
+}
+
+void DebugLog::println(int n) {
+    println(String(n));
+}

src/SimpleInflux.cpp

@@ -12,6 +12,7 @@
  */
 
 #include <Arduino.h>
+#include "DebugLog.h"
 #include "SimpleInflux.h"
 
 #if defined(ARDUINO_ARCH_AVR)
@@ -43,8 +44,8 @@ void InfluxData::addValue(const char *name, double value) {
 boolean Influxdb::write(InfluxData &data) {
 #if defined(ARDUINO_ARCH_AVR)
 
-    Serial.print(F("Writing "));
-    Serial.println(data.dataName());
+    debug.print(F("Writing "));
+    debug.println(data.dataName());
 
     client.stop();
 
@@ -103,7 +104,7 @@ boolean Influxdb::write(InfluxData &data) {
             if (client.available()) {
                 char c = client.read();
                 if (c != '\r') {
-                    Serial.write(c);
+                    debug.write(c);
                 }
 
                 if (compare_off == compare_to.length()) {
@@ -132,10 +133,10 @@ boolean Influxdb::write(InfluxData &data) {
         }
 
         client.stop();
-        Serial.println(contains_error ? F("Request failed") : F("Request Done"));
+        debug.println(contains_error ? F("Request failed") : F("Request Done"));
         return !contains_error;
     } else {
-        Serial.println(F("Error connecting"));
+        debug.println(F("Error connecting"));
         return false; // failed
     }
 #else

src/SimpleUpdater.cpp

@@ -11,8 +11,6 @@
  * ----------------------------------------------------------------------------
  */
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-
 #if defined(ARDUINO_ARCH_ESP8266)
 #include <ESP8266HTTPUpdateServer.h>
 #elif defined(ARDUINO_ARCH_ESP32)
@@ -25,46 +23,68 @@
 
 void SimpleUpdater::get(void) {
     String uploadPage = F(
-        "<html><head>"
-        "<script src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></script>"
-        "<title>SimpleUpdater ESP32</title>"
-        "</head><body>"
-        "<h1>SimpleUpdater</h1>"
-        "<form method='POST' action='#' enctype='multipart/form-data' id='upload_form'>"
-        "<input type='file' name='update'>"
-        "<input type='submit' value='Update'>"
-        "</form>"
-        "<div id='prg'>progress: 0%</div>"
-        "<a href=\"/\">Back to Main Page</a>"
-        "<script>"
-        "$('form').submit(function(e){"
-        "e.preventDefault();"
-        "var form = $('#upload_form')[0];"
-        "var data = new FormData(form);"
-        " $.ajax({"
-        "url: '/update',"
-        "type: 'POST',"
-        "data: data,"
-        "contentType: false,"
-        "processData:false,"
-        "xhr: function() {"
-        "var xhr = new window.XMLHttpRequest();"
-        "xhr.upload.addEventListener('progress', function(evt) {"
-        "if (evt.lengthComputable) {"
-        "var per = evt.loaded / evt.total;"
-        "$('#prg').html('progress: ' + Math.round(per*100) + '%');"
-        "}"
-        "}, false);"
-        "return xhr;"
-        "},"
-        "success:function(d, s) {"
-        "console.log('success!')" 
-        "},"
-        "error: function (a, b, c) {"
-        "}"
-        "});"
-        "});"
-        "</script>"
+        "<!DOCTYPE html>\n"
+        "<html><head>\n"
+        "<meta charset='utf-8'/>\n"
+        "<meta name='viewport' content='width=device-width, initial-scale=1'/>\n"
+        "<script src='https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js'></script>\n"
+        "<title>SimpleUpdater ESP32</title>\n"
+        "<style>\n"
+        "@media (prefers-color-scheme: dark) {\n"
+            "body {\n"
+                "background-color: black;\n"
+                "color: white;\n"
+            "}\n"
+        "}\n"
+        "</style>\n"
+        "</head><body>\n"
+
+        "<h1>SimpleUpdater</h1>\n"
+        "<p>Select the update file. If you have built this project with PlatformIO, you can find a firmware.bin in the .pio folder.</p>\n"
+        "<form method='POST' action='#' enctype='multipart/form-data' id='upload_form'>\n"
+        "<input type='file' name='update' accept='.bin'>\n"
+        "<input type='submit' value='Update'>\n"
+        "</form><br>\n"
+        "<div id='prg'>progress: 0%</div>\n"
+        "<p>After the update is finished, you will automatically be redirected to the main page.</p>\n"
+        "<a href=\"/\">Back to Main Page</a>\n"
+
+        "<script>\n"
+        "$('form').submit(function(e){\n"
+            "e.preventDefault();\n"
+            "var form = $('#upload_form')[0];\n"
+            "var data = new FormData(form);\n"
+            " $.ajax({\n"
+                "url: '/update',\n"
+                "type: 'POST',\n"
+                "data: data,\n"
+                "contentType: false,\n"
+                "processData:false,\n"
+                "xhr: function() {\n"
+                    "var xhr = new window.XMLHttpRequest();\n"
+                    "xhr.upload.addEventListener('progress', function(evt) {\n"
+                        "if (evt.lengthComputable) {\n"
+                            "var per = evt.loaded / evt.total;\n"
+                            "$('#prg').html('progress: ' + Math.round(per*100) + '%');\n"
+                        "}\n"
+                    "}, false);\n"
+                    "return xhr;\n"
+                "},\n"
+                "success: function(d, s) {\n"
+                    "$('#prg').html('progress: success! redirecting...');\n"
+                    "setTimeout(function() {\n"
+                        "window.location.href = '/';\n"
+                    "}, 3000);\n"
+                "},\n"
+                "error: function(a, b, c) {\n"
+                    "$('#prg').html('progress: finished! redirecting...');\n"
+                    "setTimeout(function() {\n"
+                        "window.location.href = '/';\n"
+                    "}, 1000);\n"
+                "}\n"
+            "});\n"
+        "});\n"
+        "</script>\n"
         "</body></html>"
     );
     
@@ -102,6 +122,8 @@ void SimpleUpdater::postUpload(void) {
 
 #endif
 
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+
 void SimpleUpdater::setup(UPDATE_WEB_SERVER *_server) {
     if (_server == NULL) {
         return;

src/html.cpp

@@ -0,0 +1,435 @@
+/*
+ * html.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#include <Arduino.h>
+
+#if defined(ARDUINO_ARCH_ESP8266)
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WebServer.h>
+#include <ESP8266mDNS.h>
+#define ESP_PLATFORM_NAME "ESP8266"
+
+#elif defined(ARDUINO_ARCH_ESP32)
+
+#include <WiFi.h>
+#include <WebServer.h>
+#include <ESPmDNS.h>
+#define ESP_PLATFORM_NAME "ESP32"
+
+#elif defined(ARDUINO_ARCH_AVR)
+
+#include <UnoWiFiDevEdSerial1.h>
+#include <WiFiLink.h>
+#define ESP_PLATFORM_NAME "Uno WiFi"
+
+#endif
+
+#include "config.h"
+#include "DebugLog.h"
+#include "sensors.h"
+#include "servers.h"
+#include "memory.h"
+#include "relais.h"
+#include "moisture.h"
+#include "html.h"
+
+#if defined(ARDUINO_ARCH_AVR)
+#define ARDUINO_SEND_PARTIAL_PAGE() do { \
+        size_t len = message.length(), off = 0; \
+        while (off < len) { \
+            if ((len - off) >= 50) { \
+                client.write(message.c_str() + off, 50); \
+                off += 50; \
+            } else { \
+                client.write(message.c_str() + off, len - off); \
+                off = len; \
+            } \
+        } \
+        message = ""; \
+    } while (false);
+#else
+#define ARDUINO_SEND_PARTIAL_PAGE() while (false) { }
+#endif
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+void handlePage(int mode, int id) {
+#else
+void handlePage(WiFiClient &client, int mode, int id) {
+#endif
+    String message;
+
+    message += F("<!DOCTYPE html>");
+    message += F("<html><head>");
+    message += F("<meta charset='utf-8'/>");
+    message += F("<meta name='viewport' content='width=device-width, initial-scale=1'/>");
+    message += F("<title>" ESP_PLATFORM_NAME " Environment Sensor</title>");
+    message += F("<style>");
+    message += F(".log {\n");
+    message += F(    "max-height: 300px;\n");
+    message += F(    "padding: 0 1.0em;\n");
+    message += F(    "max-width: 1200px;\n");
+    message += F(    "margin: auto;\n");
+    message += F(    "margin-top: 1.5em;\n");
+    message += F(    "border: 1px dashed black;\n");
+    message += F(    "font-family: monospace;\n");
+    message += F(    "overflow-y: scroll;\n");
+    message += F(    "word-break: break-all;\n");
+    message += F("}\n");
+    message += F("#logbuf {\n");
+    message += F(    "white-space: break-spaces;\n");
+    message += F("}\n");
+    message += F("@media (prefers-color-scheme: dark) {");
+    message += F(    "body {");
+    message += F(        "background-color: black;");
+    message += F(        "color: white;");
+    message += F(    "}");
+    message += F(    ".log {\n");
+    message += F(        "border-color: white;");
+    message += F(    "}");
+    message += F("}");
+    message += F("</style>");
+    message += F("</head><body>");
+    message += F("<h1>" ESP_PLATFORM_NAME " Environment Sensor</h1>");
+    message += F("\n<p>\n");
+    message += F("Version: ");
+    message += ESP_ENV_VERSION;
+    message += F("\n<br>\n");
+    message += F("Location: ");
+    message += SENSOR_LOCATION;
+    message += F("\n<br>\n");
+    message += F("ID: ");
+    message += SENSOR_ID;
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    message += F("\n<br>\n");
+    message += F("MAC: ");
+    message += WiFi.macAddress();
+#endif
+
+    message += F("\n</p>\n");
+
+    ARDUINO_SEND_PARTIAL_PAGE();
+
+#if defined(ARDUINO_ARCH_ESP8266)
+    
+    message += F("<p>");
+    message += F("Reset reason: ");
+    message += ESP.getResetReason();
+    message += F("<br>");
+    message += F("Free heap: ");
+    message += String(ESP.getFreeHeap());
+    message += F(" (");
+    message += String(ESP.getHeapFragmentation());
+    message += F("% fragmentation)");
+    message += F("<br>");
+    message += F("Free sketch space: ");
+    message += String(ESP.getFreeSketchSpace());
+    message += F("<br>");
+    message += F("Flash chip real size: ");
+    message += String(ESP.getFlashChipRealSize());
+
+    if (ESP.getFlashChipSize() != ESP.getFlashChipRealSize()) {
+        message += F("<br>");
+        message += F("WARNING: sdk chip size (");
+        message += (ESP.getFlashChipSize());
+        message += F(") does not match!");
+    }
+    
+    message += F("</p>");
+    
+#elif defined(ARDUINO_ARCH_ESP32)
+
+    message += F("<p>");
+    message += F("Free heap: ");
+    message += String(ESP.getFreeHeap() / 1024.0);
+    message += F("k<br>");
+    message += F("Free sketch space: ");
+    message += String(ESP.getFreeSketchSpace() / 1024.0);
+    message += F("k<br>");
+    message += F("Flash chip size: ");
+    message += String(ESP.getFlashChipSize() / 1024.0);
+    message += F("k</p><hr>");
+    
+#endif
+
+    message += F("\n<p>\n");
+    if (found_bme1) {
+        message += F("BME280 Low:");
+        message += F("\n<br>\n");
+        message += F("Temperature: ");
+        message += String(bme1_temp());
+        message += F("\n<br>\n");
+        message += F("Humidity: ");
+        message += String(bme1_humid());
+        message += F("\n<br>\n");
+        message += F("Pressure: ");
+        message += String(bme1_pressure());
+        message += F("\n<br>\n");
+        message += F("Offset: ");
+        message += String(config.bme1_temp_off);
+        message += F("\n<br>\n");
+        message += F("<form method=\"GET\" action=\"/calibrate\">");
+        message += F("<input type=\"text\" name=\"bme1\" placeholder=\"Real Temp.\">");
+        message += F("<input type=\"submit\" value=\"Calibrate\">");
+        message += F("</form>");
+    } else {
+        message += F("BME280 (low) not connected!");
+    }
+    message += F("\n</p><hr>\n");
+
+    message += F("\n<p>\n");
+    if (found_bme2) {
+        message += F("BME280 High:");
+        message += F("\n<br>\n");
+        message += F("Temperature: ");
+        message += String(bme2_temp());
+        message += F("\n<br>\n");
+        message += F("Humidity: ");
+        message += String(bme2_humid());
+        message += F("\n<br>\n");
+        message += F("Pressure: ");
+        message += String(bme2_pressure());
+        message += F("\n<br>\n");
+        message += F("Offset: ");
+        message += String(config.bme2_temp_off);
+        message += F("\n<br>\n");
+        message += F("<form method=\"GET\" action=\"/calibrate\">");
+        message += F("<input type=\"text\" name=\"bme2\" placeholder=\"Real Temp.\">");
+        message += F("<input type=\"submit\" value=\"Calibrate\">");
+        message += F("</form>");
+    } else {
+        message += F("BME280 (high) not connected!");
+    }
+    message += F("\n</p><hr>\n");
+
+    ARDUINO_SEND_PARTIAL_PAGE();
+
+    message += F("\n<p>\n");
+    if (found_sht) {
+        message += F("SHT21:");
+        message += F("\n<br>\n");
+        message += F("Temperature: ");
+        message += String(sht_temp());
+        message += F("\n<br>\n");
+        message += F("Humidity: ");
+        message += String(sht_humid());
+        message += F("\n<br>\n");
+        message += F("Offset: ");
+        message += String(config.sht_temp_off);
+        message += F("\n<br>\n");
+        message += F("<form method=\"GET\" action=\"/calibrate\">");
+        message += F("<input type=\"text\" name=\"sht\" placeholder=\"Real Temp.\">");
+        message += F("<input type=\"submit\" value=\"Calibrate\">");
+        message += F("</form>");
+    } else {
+        message += F("SHT21 not connected!");
+    }
+    message += F("\n</p><hr>\n");
+
+#ifdef ENABLE_CCS811
+
+    message += F("\n<p>\n");
+    if (found_ccs1) {
+        message += F("CCS811 Low:");
+        message += F("\n<br>\n");
+        message += F("eCO2: ");
+        message += String(ccs1_eco2());
+        message += F("ppm");
+        message += F("\n<br>\n");
+        message += F("TVOC: ");
+        message += String(ccs1_tvoc());
+        message += F("ppb");
+
+        if (!ccs1_data_valid) {
+            message += F("\n<br>\n");
+            message += F("Data invalid (");
+            message += String(ccs1_error_code);
+            message += F(")!");
+        }
+    } else {
+        message += F("CCS811 (Low) not connected!");
+    }
+    message += F("\n</p><hr>\n");
+
+    message += F("\n<p>\n");
+    if (found_ccs2) {
+        message += F("CCS811 High:");
+        message += F("\n<br>\n");
+        message += F("eCO2: ");
+        message += String(ccs2_eco2());
+        message += F("ppm");
+        message += F("\n<br>\n");
+        message += F("TVOC: ");
+        message += String(ccs2_tvoc());
+        message += F("ppb");
+
+        if (!ccs2_data_valid) {
+            message += F("\n<br>\n");
+            message += F("Data invalid (");
+            message += String(ccs2_error_code);
+            message += F(")!");
+        }
+    } else {
+        message += F("CCS811 (High) not connected!");
+    }
+    message += F("\n</p><hr>\n");
+
+#endif // ENABLE_CCS811
+
+    ARDUINO_SEND_PARTIAL_PAGE();
+
+#ifdef FEATURE_MOISTURE
+    for (int i = 0; i < moisture_count(); i++) {
+        int moisture = moisture_read(i);
+        if (moisture < moisture_max()) {
+            message += F("\n<p>\n");
+            message += F("Sensor ");
+            message += String(i + 1);
+            message += F(":\n<br>\n");
+            message += F("Moisture: ");
+            message += String(moisture);
+            message += F(" / ");
+            message += String(moisture_max());
+            message += F("\n</p>\n");
+        }
+    }
+    
+    if (moisture_count() <= 0) {
+        message += F("\n<p>\n");
+        message += F("No moisture sensors configured!");
+        message += F("\n</p>\n");
+    }
+
+    ARDUINO_SEND_PARTIAL_PAGE();
+#endif // FEATURE_MOISTURE
+
+#ifdef FEATURE_RELAIS
+    message += F("\n<p>\n");
+    for (int i = 0; i < relais_count(); i++) {
+        message += String(F("<a href=\"/on?id=")) + String(i) + String(F("\">Relais ")) + String(i) + String(F(" On (")) + relais_name(i) + String(F(")</a><br>\n"));
+        message += String(F("<a href=\"/off?id=")) + String(i) + String(F("\">Relais ")) + String(i) + String(F(" Off (")) + relais_name(i) + String(F(")</a><br>\n"));
+    }
+    message += String(F("<a href=\"/on?id=")) + String(relais_count()) + String(F("\">All Relais On</a><br>\n"));
+    message += String(F("<a href=\"/off?id=")) + String(relais_count()) + String(F("\">All Relais Off</a><br>\n"));
+    message += F("</p>\n");
+
+    if ((mode >= 0) && (mode <= 1)) {
+        message += F("<p>");
+        message += F("Turned Relais ");
+        message += (id < relais_count()) ? String(id) : String(F("1-4"));
+        message += (mode ? String(F(" On")) : String(F(" Off")));
+        message += F("</p>\n");
+    }
+
+    message += F("\n<p>\n");
+    for (int i = 0; i < relais_count(); i++) {
+        message += String(F("Relais ")) + String(i) + String(F(" (")) + relais_name(i) + String(F(") = ")) + (relais_get(i) ? String(F("On")) : String(F("Off"))) + String(F("<br>\n"));
+    }
+    message += F("</p>\n");
+
+    ARDUINO_SEND_PARTIAL_PAGE();
+#endif // FEATURE_RELAIS
+
+    if (mode == 42) {
+        message += F("<p>New calibration value saved!</p>\n");
+    }
+
+#if ! defined(ARDUINO_ARCH_AVR)
+    message += F("<p>");
+    message += F("Try <a href=\"/update\">/update</a> for OTA firmware updates!");
+    message += F("</p><p>");
+    message += F("Try <a href=\"/reset\">/reset</a> to reset ESP!");
+    message += F("</p>");
+#endif
+    
+    message += F("<p>");
+#ifdef ENABLE_INFLUXDB_LOGGING
+    message += F("InfluxDB: ");
+    message += INFLUXDB_DATABASE;
+    message += F(" @ ");
+    message += INFLUXDB_HOST;
+    message += F(":");
+    message += String(INFLUXDB_PORT);
+#else
+    message += F("InfluxDB logging not enabled!");
+#endif
+    message += F("</p>");
+
+    message += F("<p>Uptime: ");
+    message += String(millis() / 1000);
+    message += F(" sec.</p>");
+
+#if ! defined(ARDUINO_ARCH_AVR)
+    message += F("<hr><p>Debug Log:</p>");
+    message += F("<div class='log'><pre id='logbuf'>");
+    message += debug.getBuffer();
+    message += F("</pre></div>");
+#endif
+
+    message += F("</body>");
+
+#if ! defined(ARDUINO_ARCH_AVR)
+    message += F("<script type='text/javascript'>\n");
+    message += F("var socket = new WebSocket('ws://' + window.location.hostname + ':81');\n");
+    message += F("socket.onmessage = function(e) {");
+    message += F(    "var log = document.getElementById('logbuf');");
+    message += F(    "var div = document.getElementsByClassName('log')[0];");
+    message += F(    "log.innerHTML += e.data.substring(4);");
+    message += F(    "if (log.innerHTML.length > (1024 * 1024)) {");
+    message += F(        "log.innerHTML = log.innerHTML.substring(1024 * 1024);");
+    message += F(    "}");
+    message += F(    "div.scrollTop = div.scrollHeight;");
+    message += F("};\n");
+    message += F("var hist = document.getElementsByClassName('log')[0];\n");
+    message += F("hist.scrollTop = hist.scrollHeight;\n");
+    message += F("</script>\n");
+#endif
+
+    message += F("</html>");
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    server.send(200, "text/html", message);
+#else
+    ARDUINO_SEND_PARTIAL_PAGE();
+#endif
+}
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+void handleReset() {
+    String message;
+    message += F("<!DOCTYPE html>");
+    message += F("<html><head>");
+    message += F("<meta charset='utf-8'/>");
+    message += F("<meta name='viewport' content='width=device-width, initial-scale=1'/>");
+    message += F("<meta http-equiv='refresh' content='10; URL=/'/>");
+    message += F("<title>" ESP_PLATFORM_NAME " Environment Sensor</title>");
+    message += F("<style>");
+    message += F("@media (prefers-color-scheme: dark) {");
+    message += F(    "body {");
+    message += F(        "background-color: black;");
+    message += F(        "color: white;");
+    message += F(    "}");
+    message += F("}");
+    message += F("</style>");
+    message += F("</head><body>");
+    message += F("<p>Resetting in 2s...</p>");
+    message += F("<p>Auto redirect in 10s. Please retry manually on error.</p>");
+    message += F("<p>Go <a href=\"/\">back</a> to start.</p>");
+    message += F("</body></html>");
+    server.send(200, "text/html", message);
+
+    delay(2000);
+    ESP.restart();
+}
+#endif

src/influx.cpp

@@ -0,0 +1,290 @@
+/*
+ * influx.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#include <Arduino.h>
+
+#include "config.h"
+#include "DebugLog.h"
+#include "sensors.h"
+#include "relais.h"
+#include "moisture.h"
+#include "influx.h"
+
+#ifdef ENABLE_INFLUXDB_LOGGING
+
+#if defined(ARDUINO_ARCH_ESP8266)
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WebServer.h>
+#include <ESP8266mDNS.h>
+
+#elif defined(ARDUINO_ARCH_ESP32)
+
+#include <WiFi.h>
+#include <WebServer.h>
+#include <ESPmDNS.h>
+
+#elif defined(ARDUINO_ARCH_AVR)
+
+#include <UnoWiFiDevEdSerial1.h>
+#include <WiFiLink.h>
+
+#endif
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#include <InfluxDb.h>
+#else
+#include "SimpleInflux.h"
+#endif
+
+static Influxdb influx(INFLUXDB_HOST, INFLUXDB_PORT);
+static int error_count = 0;
+static unsigned long last_db_write_time = 0;
+
+void initInflux() {
+    debug.println(F("Influx"));
+    influx.setDb(INFLUXDB_DATABASE);
+}
+
+void runInflux() {
+    unsigned long time = millis();
+
+    if ((time - last_db_write_time) >= DB_WRITE_INTERVAL) {
+        last_db_write_time = time;
+        writeDatabase();
+    }
+
+#ifdef INFLUX_MAX_ERRORS_RESET
+    if (error_count >= INFLUX_MAX_ERRORS_RESET) {
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+        ESP.restart();
+#else
+        // TODO implement watchdog reset for AVR
+#endif
+    }
+#endif // INFLUX_MAX_ERRORS_RESET
+}
+
+static boolean writeMeasurement(InfluxData &measurement) {
+    boolean success = influx.write(measurement);
+    if (!success) {
+        error_count++;
+        for (int i = 0; i < 10; i++) {
+            digitalWrite(BUILTIN_LED_PIN, LOW); // LED on
+            delay(LED_ERROR_BLINK_INTERVAL);
+            digitalWrite(BUILTIN_LED_PIN, HIGH); // LED off
+            delay(LED_ERROR_BLINK_INTERVAL);
+        }
+    }
+    return success;
+}
+
+void writeDatabase() {
+#if defined(ARDUINO_ARCH_AVR)
+    debug.println(F("Writing to InfluxDB"));
+
+    InfluxData measurement("");
+#endif
+
+    if (found_bme1) {
+#if defined(ARDUINO_ARCH_AVR)
+        measurement.clear();
+        measurement.setName("environment");
+#else
+        InfluxData measurement("environment");
+#endif
+
+        measurement.addTag("location", SENSOR_LOCATION);
+        measurement.addTag("location-id", SENSOR_ID);
+        measurement.addTag("placement", "1");
+        measurement.addTag("sensor", "bme280");
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+        measurement.addTag("device", WiFi.macAddress());
+#endif
+
+        measurement.addValue("temperature", bme1_temp());
+        measurement.addValue("pressure", bme1_pressure());
+        measurement.addValue("humidity", bme1_humid());
+
+        debug.println(F("Writing bme1"));
+        writeMeasurement(measurement);
+        debug.println(F("Done!"));
+    }
+
+    if (found_bme2) {
+#if defined(ARDUINO_ARCH_AVR)
+        measurement.clear();
+        measurement.setName("environment");
+#else
+        InfluxData measurement("environment");
+#endif
+
+        measurement.addTag("location", SENSOR_LOCATION);
+        measurement.addTag("location-id", SENSOR_ID);
+        measurement.addTag("placement", "2");
+        measurement.addTag("sensor", "bme280");
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+        measurement.addTag("device", WiFi.macAddress());
+#endif
+
+        measurement.addValue("temperature", bme2_temp());
+        measurement.addValue("pressure", bme2_pressure());
+        measurement.addValue("humidity", bme2_humid());
+
+        debug.println(F("Writing bme2"));
+        writeMeasurement(measurement);
+        debug.println(F("Done!"));
+    }
+
+    if (found_sht) {
+#if defined(ARDUINO_ARCH_AVR)
+        measurement.clear();
+        measurement.setName("environment");
+#else
+        InfluxData measurement("environment");
+#endif
+
+        measurement.addTag("location", SENSOR_LOCATION);
+        measurement.addTag("location-id", SENSOR_ID);
+        measurement.addTag("sensor", "sht21");
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+        measurement.addTag("device", WiFi.macAddress());
+#endif
+
+        measurement.addValue("temperature", sht_temp());
+        measurement.addValue("humidity", sht_humid());
+
+        debug.println(F("Writing sht"));
+        writeMeasurement(measurement);
+        debug.println(F("Done!"));
+    }
+
+#ifdef ENABLE_CCS811
+
+    if (found_ccs1) {
+#if defined(ARDUINO_ARCH_AVR)
+        measurement.clear();
+        measurement.setName("environment");
+#else
+        InfluxData measurement("environment");
+#endif
+
+        measurement.addTag("location", SENSOR_LOCATION);
+        measurement.addTag("location-id", SENSOR_ID);
+        measurement.addTag("placement", "1");
+        measurement.addTag("sensor", "ccs811");
+
+        String err(ccs1_error_code);
+        measurement.addTag("error", err);
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+        measurement.addTag("device", WiFi.macAddress());
+#endif
+
+        measurement.addValue("eco2", ccs1_eco2());
+        measurement.addValue("tvoc", ccs1_tvoc());
+
+        debug.println(F("Writing ccs1"));
+        writeMeasurement(measurement);
+        debug.println(F("Done!"));
+    }
+
+    if (found_ccs2) {
+#if defined(ARDUINO_ARCH_AVR)
+        measurement.clear();
+        measurement.setName("environment");
+#else
+        InfluxData measurement("environment");
+#endif
+
+        measurement.addTag("location", SENSOR_LOCATION);
+        measurement.addTag("location-id", SENSOR_ID);
+        measurement.addTag("placement", "2");
+        measurement.addTag("sensor", "ccs811");
+
+        String err(ccs2_error_code);
+        measurement.addTag("error", err);
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+        measurement.addTag("device", WiFi.macAddress());
+#endif
+
+        measurement.addValue("eco2", ccs2_eco2());
+        measurement.addValue("tvoc", ccs2_tvoc());
+
+        debug.println(F("Writing ccs2"));
+        writeMeasurement(measurement);
+        debug.println(F("Done!"));
+    }
+
+#endif // ENABLE_CCS811
+
+#ifdef FEATURE_MOISTURE
+    for (int i = 0; i < moisture_count(); i++) {
+        int moisture = moisture_read(i);
+        if (moisture < moisture_max()) {
+#if defined(ARDUINO_ARCH_AVR)
+            measurement.clear();
+            measurement.setName("moisture");
+#else
+            InfluxData measurement("moisture");
+#endif
+
+            measurement.addTag("location", SENSOR_LOCATION);
+            measurement.addTag("location-id", SENSOR_ID);
+            String sensor(i + 1, DEC);
+            measurement.addTag("sensor", sensor);
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+            measurement.addTag("device", WiFi.macAddress());
+#endif
+
+            measurement.addValue("value", moisture);
+            measurement.addValue("maximum", moisture_max());
+
+            debug.print(F("Writing moisture "));
+            debug.println(i);
+            writeMeasurement(measurement);
+            debug.println(F("Done!"));
+        }
+    }
+#endif // FEATURE_MOISTURE
+
+#ifdef FEATURE_RELAIS
+    for (int i = 0; i < relais_count(); i++) {
+        InfluxData measurement("relais");
+        measurement.addTag("location", SENSOR_LOCATION);
+        measurement.addTag("location-id", SENSOR_ID);
+        measurement.addTag("id", String(i));
+        measurement.addTag("name", relais_name(i));
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+        measurement.addTag("device", WiFi.macAddress());
+#endif
+
+        measurement.addValue("state", relais_get(i));
+        writeMeasurement(measurement);
+    }
+#endif // FEATURE_RELAIS
+}
+
+#else
+
+void initInflux() { }
+void runInflux() { }
+void writeDatabase() { }
+
+#endif // ENABLE_INFLUXDB_LOGGING

src/memory.cpp

@@ -0,0 +1,130 @@
+/*
+ * memory.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#include <Arduino.h>
+#include <EEPROM.h>
+
+#include "DebugLog.h"
+#include "memory.h"
+
+ConfigMemory mem_read() {
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    EEPROM.begin(sizeof(ConfigMemory) + 1);
+#endif
+
+    ConfigMemory cm;
+    uint8_t cs = 0x42;
+    uint8_t *us = (uint8_t *)((void *)&cm);
+    for (unsigned int i = 0; i < sizeof(ConfigMemory); i++) {
+        uint8_t v = EEPROM.read(i);
+        cs ^= v;
+        us[i] = v;
+    }
+
+    uint8_t checksum = EEPROM.read(sizeof(ConfigMemory));
+
+    if (cs == checksum) {
+        return cm;
+    } else {
+        debug.print(F("Config checksum mismatch: "));
+        debug.print(cs);
+        debug.print(F(" != "));
+        debug.println(checksum);
+
+        ConfigMemory empty;
+        return empty;
+    }
+}
+
+void mem_write(ConfigMemory mem) {
+    uint8_t cs = 0x42;
+    const uint8_t *us = (const uint8_t *)((const void *)&mem);
+    for (unsigned int i = 0; i < sizeof(ConfigMemory); i++) {
+        uint8_t v = us[i];
+        EEPROM.write(i, v);
+        cs ^= v;
+    }
+
+    EEPROM.write(sizeof(ConfigMemory), cs);
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    EEPROM.commit();
+#endif
+
+    debug.print(F("Written config with checksum "));
+    debug.println(cs);
+}
+
+
+
+
+
+
+
+/*
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+30
+5
+22
+192
+0
+0
+0
+0
+0
+0
+0
+0
+205
+
+
+
+
+
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+184
+158
+19
+192
+0
+0
+0
+0
+0
+0
+0
+0
+245
+*/

src/mqtt.cpp

@@ -0,0 +1,180 @@
+/*
+ * mqtt.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#include <Arduino.h>
+
+#include "config.h"
+#include "DebugLog.h"
+#include "sensors.h"
+#include "relais.h"
+#include "influx.h"
+#include "mqtt.h"
+
+#ifdef ENABLE_MQTT
+
+#if defined(ARDUINO_ARCH_ESP8266)
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WebServer.h>
+#include <ESP8266mDNS.h>
+
+#elif defined(ARDUINO_ARCH_ESP32)
+
+#include <WiFi.h>
+#include <WebServer.h>
+#include <ESPmDNS.h>
+
+#elif defined(ARDUINO_ARCH_AVR)
+
+#include <UnoWiFiDevEdSerial1.h>
+#include <WiFiLink.h>
+
+#endif
+
+#include <PubSubClient.h>
+
+WiFiClient mqttClient;
+PubSubClient mqtt(mqttClient);
+static unsigned long last_mqtt_reconnect_time = 0;
+static unsigned long last_mqtt_write_time = 0;
+
+static void writeMQTT() {
+    if (!mqtt.connected()) {
+        return;
+    }
+
+    if (found_bme1) {
+        mqtt.publish(SENSOR_LOCATION "/temperature", String(bme1_temp()).c_str(), true);
+        mqtt.publish(SENSOR_LOCATION "/humidity", String(bme1_humid()).c_str(), true);
+        mqtt.publish(SENSOR_LOCATION "/pressure", String(bme1_pressure()).c_str(), true);
+    } else if (found_bme2) {
+        mqtt.publish(SENSOR_LOCATION "/temperature", String(bme2_temp()).c_str(), true);
+        mqtt.publish(SENSOR_LOCATION "/humidity", String(bme2_humid()).c_str(), true);
+        mqtt.publish(SENSOR_LOCATION "/pressure", String(bme2_pressure()).c_str(), true);
+    } else if (found_sht) {
+        mqtt.publish(SENSOR_LOCATION "/temperature", String(sht_temp()).c_str(), true);
+        mqtt.publish(SENSOR_LOCATION "/humidity", String(sht_humid()).c_str(), true);
+    }
+
+#ifdef ENABLE_CCS811
+    if (found_ccs1) {
+        mqtt.publish(SENSOR_LOCATION "/eco2", String(ccs1_eco2()).c_str(), true);
+        mqtt.publish(SENSOR_LOCATION "/tvoc", String(ccs1_tvoc()).c_str(), true);
+    } else if (found_ccs2) {
+        mqtt.publish(SENSOR_LOCATION "/eco2", String(ccs2_eco2()).c_str(), true);
+        mqtt.publish(SENSOR_LOCATION "/tvoc", String(ccs2_tvoc()).c_str(), true);
+    }
+#endif // ENABLE_CCS811
+}
+
+static void mqttCallback(char* topic, byte* payload, unsigned int length) {
+#ifdef FEATURE_RELAIS
+    int state = 0;
+    int id = -1;
+
+    String ts(topic), ps((char *)payload);
+
+    String our_topic(SENSOR_LOCATION);
+    our_topic += "/";
+
+    if (!ts.startsWith(our_topic)) {
+        debug.print(F("Unknown MQTT room "));
+        debug.println(ts);
+        return;
+    }
+
+    String ids = ts.substring(our_topic.length());
+    for (int i = 0; i < relais_count(); i++) {
+        if (ids == relais_name(i)) {
+            id = i;
+            break;
+        }
+    }
+
+    if (id < 0) {
+        debug.print(F("Unknown MQTT topic "));
+        debug.println(ts);
+        return;
+    }
+
+    if (ps.indexOf("on") != -1) {
+        state = 1;
+    } else if (ps.indexOf("off") != -1) {
+        state = 0;
+    } else {
+        return;
+    }
+
+    if ((id >= 0) && (id < relais_count())) {
+        debug.print(F("Turning "));
+        debug.print(state ? "on" : "off");
+        debug.print(F(" relais "));
+        debug.println(id);
+
+        relais_set(id, state);
+
+        writeDatabase();
+    }
+#endif // FEATURE_RELAIS
+}
+
+static void mqttReconnect() {
+    // Create a random client ID
+    String clientId = F("ESP-" SENSOR_ID "-");
+    clientId += String(random(0xffff), HEX);
+
+    // Attempt to connect
+#if defined(MQTT_USER) && defined(MQTT_PASS)
+    if (mqtt.connect(clientId.c_str(), MQTT_USER, MQTT_PASS)) {
+#else
+    if (mqtt.connect(clientId.c_str())) {
+#endif
+
+#ifdef FEATURE_RELAIS
+        for (int i = 0; i < relais_count(); i++) {
+            String topic(SENSOR_LOCATION);
+            topic += String("/") + relais_name(i);
+            mqtt.subscribe(topic.c_str());
+        }
+#endif // FEATURE_RELAIS
+    }
+}
+
+void initMQTT() {
+    debug.println(F("MQTT"));
+    mqtt.setServer(MQTT_HOST, MQTT_PORT);
+    mqtt.setCallback(mqttCallback);
+}
+
+void runMQTT() {
+    unsigned long time = millis();
+
+    if ((time - last_mqtt_write_time) >= MQTT_WRITE_INTERVAL) {
+        last_mqtt_write_time = time;
+        writeMQTT();
+    }
+
+    if (!mqtt.connected() && ((millis() - last_mqtt_reconnect_time) >= MQTT_RECONNECT_INTERVAL)) {
+        last_mqtt_reconnect_time = millis();
+        mqttReconnect();
+    }
+
+    mqtt.loop();
+}
+
+#else
+
+void initMQTT() { }
+void runMQTT() { }
+
+#endif // ENABLE_MQTT

src/relais.cpp

@@ -38,6 +38,16 @@ static String names[SERIAL_RELAIS_COUNT] = {
     String("light_big"),
     String("relais_2"),
     String("fan")
+#elif defined(SENSOR_LOCATION_LIVINGROOM_WORKSPACE)
+    String("light_pc"),
+    String("light_bench"),
+    String("relais_w2"),
+    String("relais_w3")
+#elif defined(SENSOR_LOCATION_LIVINGROOM_TV)
+    String("light_amp"),
+    String("light_box"),
+    String("light_kitchen"),
+    String("relais_t3")
 #else
     String("relais_0"),
     String("relais_1"),

src/sensors.cpp

@@ -0,0 +1,357 @@
+/*
+ * sensors.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#include <Arduino.h>
+
+#include <Adafruit_BME280.h>
+#include <SHT2x.h>
+
+#ifdef ENABLE_CCS811
+#include <Adafruit_CCS811.h>
+#endif // ENABLE_CCS811
+
+#include "config.h"
+#include "DebugLog.h"
+#include "memory.h"
+#include "servers.h"
+#include "html.h"
+#include "sensors.h"
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#include <Wire.h>
+#endif
+
+#define SHT_I2C_ADDRESS HTDU21D_ADDRESS
+#define BME_I2C_ADDRESS_1 0x76
+#define BME_I2C_ADDRESS_2 0x77
+#define CCS811_ADDRESS_1 0x5A
+#define CCS811_ADDRESS_2 0x5B
+
+#if defined(ARDUINO_ARCH_ESP8266)
+
+#define I2C_SDA_PIN 2
+#define I2C_SCL_PIN 0
+
+static TwoWire Wire2;
+static SHT2x sht(SHT_I2C_ADDRESS, &Wire2);
+
+#elif defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_AVR)
+
+static SHT2x sht(SHT_I2C_ADDRESS, &Wire);
+
+#endif
+
+static Adafruit_BME280 bme1, bme2;
+
+bool found_bme1 = false;
+bool found_bme2 = false;
+bool found_sht = false;
+
+#ifdef ENABLE_CCS811
+static Adafruit_CCS811 ccs1, ccs2;
+bool found_ccs1 = false;
+bool found_ccs2 = false;
+bool ccs1_data_valid = false;
+bool ccs2_data_valid = false;
+int ccs1_error_code = 0;
+int ccs2_error_code = 0;
+#endif // ENABLE_CCS811
+
+static unsigned long last_sensor_handle_time = 0;
+
+float bme1_temp(void) {
+    while (1) {
+        float a = bme1.readTemperature();
+        float b = bme1.readTemperature();
+        
+        if ((a > b) && ((a - b) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+        
+        if ((a < b) && ((b - a) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+    }
+    return 0.0;
+}
+
+float bme2_temp(void) {
+    while (1) {
+        float a = bme2.readTemperature();
+        float b = bme2.readTemperature();
+        
+        if ((a > b) && ((a - b) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+        
+        if ((a < b) && ((b - a) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+    }
+    return 0.0;
+}
+
+float bme1_humid(void) {
+    while (1) {
+        float a = bme1.readHumidity();
+        float b = bme1.readHumidity();
+        
+        if ((a > b) && ((a - b) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+        
+        if ((a < b) && ((b - a) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+    }
+    return 0.0;
+}
+
+float bme2_humid(void) {
+    while (1) {
+        float a = bme2.readHumidity();
+        float b = bme2.readHumidity();
+        
+        if ((a > b) && ((a - b) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+        
+        if ((a < b) && ((b - a) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+    }
+    return 0.0;
+}
+
+float bme1_pressure(void) {
+    while (1) {
+        float a = bme1.readPressure();
+        float b = bme1.readPressure();
+        
+        if ((a > b) && ((a - b) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+        
+        if ((a < b) && ((b - a) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+    }
+    return 0.0;
+}
+
+float bme2_pressure(void) {
+    while (1) {
+        float a = bme2.readPressure();
+        float b = bme2.readPressure();
+        
+        if ((a > b) && ((a - b) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+        
+        if ((a < b) && ((b - a) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+    }
+    return 0.0;
+}
+
+float sht_temp(void) {
+    while (1) {
+        float a = sht.GetTemperature() + config.sht_temp_off;
+        float b = sht.GetTemperature() + config.sht_temp_off;
+        
+        if ((a > b) && ((a - b) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+        
+        if ((a < b) && ((b - a) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+    }
+    return 0.0;
+}
+
+float sht_humid(void) {
+    while (1) {
+        float a = sht.GetHumidity();
+        float b = sht.GetHumidity();
+        
+        if ((a > b) && ((a - b) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+        
+        if ((a < b) && ((b - a) < 2.0)) {
+            return (a + b) / 2.0;
+        }
+    }
+    return 0.0;
+}
+
+#ifdef ENABLE_CCS811
+
+float ccs1_eco2(void) {
+    return ccs1.geteCO2();
+}
+
+float ccs1_tvoc(void) {
+    return ccs1.getTVOC();
+}
+
+float ccs2_eco2(void) {
+    return ccs2.geteCO2();
+}
+
+float ccs2_tvoc(void) {
+    return ccs2.getTVOC();
+}
+
+static void ccs_update() {
+    if (found_ccs1) {
+        if (ccs1.available()) {
+            if (found_bme1) {
+                ccs1.setEnvironmentalData(bme1_humid(), bme1_temp());
+            } else if (found_bme2) {
+                ccs1.setEnvironmentalData(bme2_humid(), bme2_temp());
+            } else if (found_sht) {
+                ccs1.setEnvironmentalData(sht_humid(), sht_temp());
+            }
+
+            ccs1_error_code = ccs1.readData();
+            ccs1_data_valid = (ccs1_error_code == 0);
+        }
+    }
+
+    if (found_ccs2) {
+        if (ccs2.available()) {
+            if (found_bme1) {
+                ccs2.setEnvironmentalData(bme1_humid(), bme1_temp());
+            } else if (found_bme2) {
+                ccs2.setEnvironmentalData(bme2_humid(), bme2_temp());
+            } else if (found_sht) {
+                ccs2.setEnvironmentalData(sht_humid(), sht_temp());
+            }
+
+            ccs2_error_code = ccs2.readData();
+            ccs2_data_valid = (ccs2_error_code == 0);
+        }
+    }
+}
+
+#endif // ENABLE_CCS811
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+void handleCalibrate() {
+    bool diff = false;
+
+    if (server.hasArg("bme1")) {
+        diff = true;
+        String off_string = server.arg("bme1");
+        double real_temp = off_string.toDouble();
+        double meas_temp = bme1_temp() - config.bme1_temp_off;
+        config.bme1_temp_off = real_temp - meas_temp;
+    }
+
+    if (server.hasArg("bme2")) {
+        diff = true;
+        String off_string = server.arg("bme2");
+        double real_temp = off_string.toDouble();
+        double meas_temp = bme2_temp() - config.bme2_temp_off;
+        config.bme2_temp_off = real_temp - meas_temp;
+    }
+
+    if (server.hasArg("sht")) {
+        diff = true;
+        String off_string = server.arg("sht");
+        double real_temp = off_string.toDouble();
+        double meas_temp = sht_temp() - config.sht_temp_off;
+        config.sht_temp_off = real_temp - meas_temp;
+    }
+
+    if (diff) {
+        if (found_bme1) {
+            bme1.setTemperatureCompensation(config.bme1_temp_off);
+        }
+
+        if (found_bme2) {
+            bme2.setTemperatureCompensation(config.bme2_temp_off);
+        }
+
+        mem_write(config);
+        handlePage(42);
+    } else {
+        handlePage();
+    }
+}
+#endif
+
+void initSensors() {
+    // Init I2C and try to connect to sensors
+#if defined(ARDUINO_ARCH_ESP8266)
+
+    debug.println(F("Wire2"));
+    Wire2.begin(I2C_SDA_PIN, I2C_SCL_PIN);
+
+    debug.println(F("BME"));
+    found_bme1 = (!bme1.begin(BME_I2C_ADDRESS_1, &Wire2)) ? false : true;
+    found_bme2 = (!bme2.begin(BME_I2C_ADDRESS_2, &Wire2)) ? false : true;
+
+#ifdef ENABLE_CCS811
+    debug.println(F("CCS"));
+    found_ccs1 = ccs1.begin(CCS811_ADDRESS_1, &Wire2);
+    found_ccs2 = ccs2.begin(CCS811_ADDRESS_2, &Wire2);
+#endif // ENABLE_CCS811
+
+#elif defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_AVR)
+
+#if defined(ARDUINO_ARCH_ESP32)
+    debug.println(F("Wire"));
+    Wire.begin();
+#endif
+
+    debug.println(F("BME"));
+    found_bme1 = (!bme1.begin(BME_I2C_ADDRESS_1, &Wire)) ? false : true;
+    found_bme2 = (!bme2.begin(BME_I2C_ADDRESS_2, &Wire)) ? false : true;
+
+#ifdef ENABLE_CCS811
+    debug.println(F("CCS"));
+    found_ccs1 = ccs1.begin(CCS811_ADDRESS_1, &Wire);
+    found_ccs2 = ccs2.begin(CCS811_ADDRESS_2, &Wire);
+#endif // ENABLE_CCS811
+
+#endif
+
+    debug.println(F("SHT"));
+    found_sht = sht.GetAlive();
+
+    // initialize temperature offsets
+    if (found_bme1) {
+        bme1.setTemperatureCompensation(config.bme1_temp_off);
+    }
+    if (found_bme2) {
+        bme2.setTemperatureCompensation(config.bme2_temp_off);
+    }
+}
+
+void runSensors() {
+    unsigned long time = millis();
+    
+    if ((time - last_sensor_handle_time) >= SENSOR_HANDLE_INTERVAL) {
+        last_sensor_handle_time = time;
+
+#ifdef ENABLE_CCS811
+        if (found_ccs1 || found_ccs2) {
+            ccs_update();
+        }
+#endif // ENABLE_CCS811
+    }
+}

src/servers.cpp

@@ -0,0 +1,230 @@
+/*
+ * servers.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#include <Arduino.h>
+
+#if defined(ARDUINO_ARCH_ESP8266)
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WebServer.h>
+#include <ESP8266mDNS.h>
+
+#elif defined(ARDUINO_ARCH_ESP32)
+
+#include <WiFi.h>
+#include <WebServer.h>
+#include <ESPmDNS.h>
+
+#endif
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+
+#include <WebSocketsServer.h>
+#include "SimpleUpdater.h"
+
+UPDATE_WEB_SERVER server(80);
+SimpleUpdater updater;
+WebSocketsServer socket(81);
+
+#elif defined(ARDUINO_ARCH_AVR)
+
+#include <UnoWiFiDevEdSerial1.h>
+#include <WiFiLink.h>
+
+WiFiServer server(80);
+
+#endif
+
+#include "config.h"
+#include "DebugLog.h"
+#include "moisture.h"
+#include "sensors.h"
+#include "relais.h"
+#include "memory.h"
+#include "influx.h"
+#include "mqtt.h"
+#include "html.h"
+
+static unsigned long last_server_handle_time = 0;
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+void wifi_send_websocket(String s) {
+    socket.broadcastTXT(s);
+}
+#endif
+
+#ifdef FEATURE_RELAIS
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+static void handleOn() {
+#else
+static void handleOn(WiFiClient &client) {
+#endif
+    String id_string = server.arg("id");
+    int id = id_string.toInt();
+
+    if ((id >= 0) && (id < relais_count())) {
+        relais_set(id, 1);
+    } else {
+        for (int i = 0; i < relais_count(); i++) {
+            relais_set(i, 1);
+        }
+    }
+
+    writeDatabase();
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    handlePage(1, id);
+#else
+    handlePage(client, 1, id);
+#endif
+}
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+static void handleOff() {
+#else
+static void handleOff(WiFiClient &client) {
+#endif
+    String id_string = server.arg("id");
+    int id = id_string.toInt();
+
+    if ((id >= 0) && (id < relais_count())) {
+        relais_set(id, 0);
+    } else {
+        for (int i = 0; i < relais_count(); i++) {
+            relais_set(i, 0);
+        }
+    }
+
+    writeDatabase();
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    handlePage(0, id);
+#else
+    handlePage(client, 0, id);
+#endif
+}
+
+#endif // FEATURE_RELAIS
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+static void handleRoot() {
+    handlePage();
+#else
+static void handleRoot(WiFiClient &client) {
+    handlePage(client);
+#endif
+}
+
+void initServers(String hostname) {
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    // Setup HTTP Server
+    debug.println(F("HTTP"));
+    MDNS.begin(hostname.c_str());
+    updater.setup(&server);
+    server.on("/", handleRoot);
+    server.on("/reset", handleReset);
+    server.on("/calibrate", handleCalibrate);
+
+#ifdef FEATURE_RELAIS
+    server.on("/on", handleOn);
+    server.on("/off", handleOff);
+#endif // FEATURE_RELAIS
+
+    MDNS.addService("http", "tcp", 80);
+
+    socket.begin();
+#endif
+
+    server.begin();
+}
+
+#if defined(ARDUINO_ARCH_AVR)
+static void http_server() {
+    // listen for incoming clients
+    WiFiClient client = server.available();
+    if (client) {
+        debug.println(F("new http client"));
+
+        // an http request ends with a blank line
+        boolean currentLineIsBlank = true;
+
+        while (client.connected()) {
+            if (client.available()) {
+                char c = client.read();
+                debug.write(c);
+
+                // if you've gotten to the end of the line (received a newline
+                // character) and the line is blank, the http request has ended,
+                // so you can send a reply
+                if ((c == '\n') && currentLineIsBlank) {
+                    // send a standard http response header
+                    client.println(F("HTTP/1.1 200 OK"));
+                    client.println(F("Content-Type: text/html"));
+                    client.println(F("Connection: close"));
+                    client.println();
+
+                    // TODO parse path and handle different pages
+                    handleRoot(client);
+
+                    break;
+                }
+
+                if (c == '\n') {
+                    // you're starting a new line
+                    currentLineIsBlank = true;
+                } else if (c != '\r') {
+                    // you've gotten a character on the current line
+                    currentLineIsBlank = false;
+                }
+            }
+        }
+
+        // give the web browser time to receive the data
+        delay(10);
+
+        // close the connection
+        client.stop();
+        debug.println(F("http client disconnected"));
+    }
+}
+#endif
+
+static void handleServers() {
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    server.handleClient();
+#else
+    http_server();
+#endif
+    
+#if defined(ARDUINO_ARCH_ESP8266)
+    MDNS.update();
+#endif
+}
+
+void runServers() {
+    unsigned long time = millis();
+
+    if ((time - last_server_handle_time) >= SERVER_HANDLE_INTERVAL) {
+        last_server_handle_time = time;
+        handleServers();
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+        socket.loop();
+#endif
+    }
+    
+    runSensors();
+    runMQTT();
+    runInflux();
+}

test/README

@@ -1,11 +0,0 @@
-
-This directory is intended for PIO Unit Testing and project tests.
-
-Unit Testing is a software testing method by which individual units of
-source code, sets of one or more MCU program modules together with associated
-control data, usage procedures, and operating procedures, are tested to
-determine whether they are fit for use. Unit testing finds problems early
-in the development cycle.
-
-More information about PIO Unit Testing:
-- https://docs.platformio.org/page/plus/unit-testing.html