fix for watchdog resets when reading sensors. custom influx client to save space. 512k esp8266 env version. esp8266 hostname fix. wifi disconnect reset.

include/config.h

 #define __ESP_ENV_CONFIG__
 
 // Sketch version
-#define ESP_ENV_VERSION "0.6.0"
+#define ESP_ENV_VERSION "0.6.1"
 
 // location of sensor, used in DB and hostname
 //#define SENSOR_LOCATION_LIVINGROOM

platformio.ini

 framework = arduino
 build_flags =
   -DSENSOR_HOSTNAME_PREFIX=\"env-\"
+  "-DNAME_OF_FEATURE=\"Environment Sensor\""
   -DENABLE_WEBSOCKETS
   -DENABLE_DEBUGLOG
   -DENABLE_BME280
   -DENABLE_CCS811
   -DENABLE_INFLUXDB_LOGGING
+  -DUSE_INFLUXDB_LIB
   -DENABLE_MQTT
 lib_deps =
     Wire
     https://github.com/rlogiacco/CircularBuffer
     https://github.com/Links2004/arduinoWebSockets
 
+[env:esp8266smallenv]
+platform = espressif8266
+board = esp01
+framework = arduino
+build_flags =
+  -DSENSOR_HOSTNAME_PREFIX=\"env-\"
+  "-DNAME_OF_FEATURE=\"Environment Sensor\""
+  -DENABLE_WEBSOCKETS
+  -DENABLE_DEBUGLOG
+  -DENABLE_BME280
+  -DENABLE_CCS811
+  -DENABLE_INFLUXDB_LOGGING
+  -DENABLE_MQTT
+lib_deps =
+    Wire
+    Adafruit Unified Sensor
+    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:esp8266smallrelais]
 platform = espressif8266
 board = esp01
 framework = arduino
 build_flags =
   -DSENSOR_HOSTNAME_PREFIX=\"relais-\"
+  "-DNAME_OF_FEATURE=\"Relais Switch\""
   -DENABLE_WEBSOCKETS
   -DENABLE_DEBUGLOG
   -DENABLE_BME280
 framework = arduino
 build_flags =
   -DSENSOR_HOSTNAME_PREFIX=\"relais-\"
+  "-DNAME_OF_FEATURE=\"Relais Switch\""
   -DENABLE_WEBSOCKETS
   -DENABLE_DEBUGLOG
   -DENABLE_BME280
   -DRELAIS_SERIAL
   -DENABLE_INFLUXDB_LOGGING
+  -DUSE_INFLUXDB_LIB
   -DENABLE_MQTT
 lib_deps =
     Wire
 monitor_speed = 115200
 build_flags =
   -DSENSOR_HOSTNAME_PREFIX=\"env-\"
+  "-DNAME_OF_FEATURE=\"Environment Sensor\""
   -DENABLE_WEBSOCKETS
   -DENABLE_DEBUGLOG
   -DENABLE_BME280
   -DENABLE_CCS811
   -DENABLE_INFLUXDB_LOGGING
+  -DUSE_INFLUXDB_LIB
   -DENABLE_MQTT
 lib_deps =
     Wire
 monitor_port = /dev/ttyUSB1
 monitor_speed = 115200
 build_flags =
-  -DSENSOR_HOSTNAME_PREFIX=\"env-\"
+  -DSENSOR_HOSTNAME_PREFIX=\"mst-\"
+  "-DNAME_OF_FEATURE=\"Moisture Sensor\""
   -DENABLE_WEBSOCKETS
   -DENABLE_DEBUGLOG
   -DMOISTURE_ADC_ESP32
   -DENABLE_BME280
   -DENABLE_CCS811
   -DENABLE_INFLUXDB_LOGGING
+  -DUSE_INFLUXDB_LIB
   -DENABLE_MQTT
 lib_deps =
     Wire
 monitor_port = /dev/ttyACM0
 monitor_speed = 115200
 build_flags =
-  -DSENSOR_HOSTNAME_PREFIX=\"env-\"
+  -DSENSOR_HOSTNAME_PREFIX=\"mst-\"
+  "-DNAME_OF_FEATURE=\"Moisture Sensor\""
   -DENABLE_BME280
   -DMOISTURE_ADC_ARDUINO
   -DENABLE_INFLUXDB_LOGGING

src/SimpleInflux.cpp

 #include "DebugLog.h"
 #include "SimpleInflux.h"
 
-#if defined(ARDUINO_ARCH_AVR)
+#ifndef USE_INFLUXDB_LIB
 
+#if defined(ARDUINO_ARCH_AVR)
 #include <WiFiLink.h>
-
 WiFiClient client;
-
+#elif defined(ARDUINO_ARCH_ESP8266)
+#include <ESP8266WiFi.h>
+#include <ESP8266HTTPClient.h>
+#include <WiFiClient.h>
 #endif
 
 void InfluxData::addTag(const char *name, const char *value) {
 // https://docs.influxdata.com/influxdb/v1.8/guides/write_data/
 
 boolean Influxdb::write(InfluxData &data) {
-#if defined(ARDUINO_ARCH_AVR)
+    //debug.print(F("Writing "));
+    //debug.println(data.dataName());
 
-    debug.print(F("Writing "));
-    debug.println(data.dataName());
+#if defined(ARDUINO_ARCH_AVR)
 
     client.stop();
 
         debug.println(F("Error connecting"));
         return false; // failed
     }
+
+#elif defined(ARDUINO_ARCH_ESP8266)
+
+    String content = data.dataName();
+    for (int i = 0; i < data.tagCount(); i++) {
+        content += F(",");
+        content += data.tagName(i);
+        content += F("=");
+        //content += F("\"");
+        content += data.tagValue(i);
+        //content += F("\"");
+    }
+    content += F(" ");
+    for (int i = 0; i < data.valueCount(); i++) {
+        if (i > 0) {
+            content += F(",");
+        }
+        content += data.valueName(i);
+        content += F("=");
+        content += data.valueValue(i);
+    }
+    // we're leaving out the timestamp, it's optional
+
+    WiFiClient client;
+    HTTPClient http;
+
+    http.setReuse(false);
+    http.setTimeout(1500); // ms
+
+    String uri("/write?db=");
+    uri += db_name;
+
+    http.begin(client, db_host, db_port, uri, false);
+
+    //debug.print(F("Sending to Influx: "));
+    //debug.println(content);
+
+    int httpResponseCode = http.POST(content);
+    String payload = http.getString();
+
+    String compare_to(F("X-Influxdb-Error"));
+    bool result = false; // error
+
+    if ((httpResponseCode >= 200) && (httpResponseCode <= 299)
+            && (payload.indexOf(compare_to) < 0)) {
+        result = true; // success
+    } else {
+        debug.print(F("Got "));
+        debug.print(httpResponseCode);
+        debug.print(F(" response from Influx: "));
+        debug.println(payload);
+    }
+
+    http.end();
+    return result;
+
+#elif defined(ARDUINO_ARCH_ESP32)
+#error Not implemented for ESP32 yet
 #else
 
     return true; // success
 
 #endif
 }
+
+#endif

src/html.cpp

     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("<title>" ESP_PLATFORM_NAME " " NAME_OF_FEATURE "</title>");
     message += F("<style>");
     message += F(".log {\n");
     message += F(    "max-height: 300px;\n");
     message += F("}");
     message += F("</style>");
     message += F("</head><body>");
-    message += F("<h1>" ESP_PLATFORM_NAME " Environment Sensor</h1>");
+    message += F("<h1>" ESP_PLATFORM_NAME " " NAME_OF_FEATURE "</h1>");
     message += F("\n<p>\n");
     message += F("Version: ");
     message += ESP_ENV_VERSION;

src/influx.cpp

 
 #endif
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#ifdef USE_INFLUXDB_LIB
 #include <InfluxDb.h>
 #else
 #include "SimpleInflux.h"
 static unsigned long last_db_write_time = 0;
 
 void initInflux() {
-    debug.println(F("Influx"));
     influx.setDb(INFLUXDB_DATABASE);
 }
 
 #ifdef INFLUX_MAX_ERRORS_RESET
     if (error_count >= INFLUX_MAX_ERRORS_RESET) {
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+        debug.println(F("Resetting due to too many Influx errors"));
         ESP.restart();
 #else
         // TODO implement watchdog reset for AVR
 }
 
 void writeDatabase() {
-#if defined(ARDUINO_ARCH_AVR)
-    debug.println(F("Writing to InfluxDB"));
-
+#ifndef USE_INFLUXDB_LIB
     InfluxData measurement("");
 #endif
 
 #ifdef ENABLE_BME280
 
     if (found_bme1) {
-#if defined(ARDUINO_ARCH_AVR)
+#ifndef USE_INFLUXDB_LIB
         measurement.clear();
         measurement.setName("environment");
 #else
         measurement.addTag("sensor", "bme280");
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-        measurement.addTag("device", WiFi.macAddress());
+        measurement.addTag("device", WiFi.macAddress().c_str());
 #endif
 
         measurement.addValue("temperature", bme1_temp());
     }
 
     if (found_bme2) {
-#if defined(ARDUINO_ARCH_AVR)
+#ifndef USE_INFLUXDB_LIB
         measurement.clear();
         measurement.setName("environment");
 #else
         measurement.addTag("sensor", "bme280");
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-        measurement.addTag("device", WiFi.macAddress());
+        measurement.addTag("device", WiFi.macAddress().c_str());
 #endif
 
         measurement.addValue("temperature", bme2_temp());
 #endif // ENABLE_BME280
 
     if (found_sht) {
-#if defined(ARDUINO_ARCH_AVR)
+#ifndef USE_INFLUXDB_LIB
         measurement.clear();
         measurement.setName("environment");
 #else
         measurement.addTag("sensor", "sht21");
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-        measurement.addTag("device", WiFi.macAddress());
+        measurement.addTag("device", WiFi.macAddress().c_str());
 #endif
 
         measurement.addValue("temperature", sht_temp());
 #ifdef ENABLE_CCS811
 
     if (found_ccs1) {
-#if defined(ARDUINO_ARCH_AVR)
+#ifndef USE_INFLUXDB_LIB
         measurement.clear();
         measurement.setName("environment");
 #else
         measurement.addTag("error", err);
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-        measurement.addTag("device", WiFi.macAddress());
+        measurement.addTag("device", WiFi.macAddress().c_str());
 #endif
 
         measurement.addValue("eco2", ccs1_eco2());
     }
 
     if (found_ccs2) {
-#if defined(ARDUINO_ARCH_AVR)
+#ifndef USE_INFLUXDB_LIB
         measurement.clear();
         measurement.setName("environment");
 #else
         measurement.addTag("error", err);
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-        measurement.addTag("device", WiFi.macAddress());
+        measurement.addTag("device", WiFi.macAddress().c_str());
 #endif
 
         measurement.addValue("eco2", ccs2_eco2());
     for (int i = 0; i < moisture_count(); i++) {
         int moisture = moisture_read(i);
         if (moisture < moisture_max()) {
-#if defined(ARDUINO_ARCH_AVR)
+#ifndef USE_INFLUXDB_LIB
             measurement.clear();
             measurement.setName("moisture");
 #else
             measurement.addTag("sensor", sensor);
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-            measurement.addTag("device", WiFi.macAddress());
+            measurement.addTag("device", WiFi.macAddress().c_str());
 #endif
 
             measurement.addValue("value", moisture);
         measurement.addTag("name", relais_name(i));
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-        measurement.addTag("device", WiFi.macAddress());
+        measurement.addTag("device", WiFi.macAddress().c_str());
 #endif
 
         measurement.addValue("state", relais_get(i));

src/main.cpp

 
 ConfigMemory config;
 
+#if defined(ARDUINO_ARCH_ESP8266)
+
+WiFiEventHandler disconnectHandler;
+
+void onDisconnected(const WiFiEventStationModeDisconnected& event) {
+    /*
+     * simply restart in case we lose wifi connection
+     * we can't do anything useful without wifi anyway!
+     */
+    ESP.restart();
+}
+
+#endif // ARDUINO_ARCH_ESP8266
+
 void setup() {
     pinMode(BUILTIN_LED_PIN, OUTPUT);
     
     Serial.begin(115200);
 
+    debug.println(F("Initializing..."));
+
     // Blink LED for init
     for (int i = 0; i < 2; i++) {
         digitalWrite(BUILTIN_LED_PIN, LOW); // LED on
     debug.print(F("Connecting WiFi"));
     WiFi.hostname(hostname);
     WiFi.mode(WIFI_STA);
+    WiFi.hostname(hostname);
     WiFi.begin(WIFI_SSID, WIFI_PASS);
     while (WiFi.status() != WL_CONNECTED) {
         delay(LED_CONNECT_BLINK_INTERVAL);
         debug.print(F("."));
     }
     debug.println(F("\nWiFi connected!"));
+
+    disconnectHandler = WiFi.onStationModeDisconnected(onDisconnected);
+
+    // Set hostname workaround
+    WiFi.hostname(hostname);
     
 #elif defined(ARDUINO_ARCH_ESP32)
 
     WiFi.config(INADDR_NONE, INADDR_NONE, INADDR_NONE);
     WiFi.setHostname(hostname.c_str());
     
-    // Workaround for WiFi connecting only every 2nd reset
-    // https://github.com/espressif/arduino-esp32/issues/2501#issuecomment-513602522
     WiFi.onEvent([](WiFiEvent_t event, WiFiEventInfo_t info) {
-        if (info.disconnected.reason == 202) {
-            esp_sleep_enable_timer_wakeup(10);
-            esp_deep_sleep_start();
-            delay(100);
-        }
+        /*
+         * was initially: workaround for WiFi connecting only every 2nd reset
+         * https://github.com/espressif/arduino-esp32/issues/2501#issuecomment-513602522
+         *
+         * now simply reset on every disconnect reason - we can't do anything
+         * useful without wifi anyway!
+         */
+        esp_sleep_enable_timer_wakeup(10);
+        esp_deep_sleep_start();
+        delay(100);
+        ESP.restart();
     }, WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
 
     // Connect to WiFi AP
     debug.println(F("Seeding"));
     randomSeed(micros());
 
+    debug.println(F("MQTT"));
     initMQTT();
+
+    debug.println(F("Influx"));
     initInflux();
+
+    debug.println(F("Servers"));
     initServers(hostname);
+
+    debug.println(F("Ready! Starting..."));
 }
 
 void loop() {
         last_led_blink_time = time;
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
     }
-    
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-    // reset ESP every 3d to be safe
-    if (time >= (3UL * 24UL * 60UL * 60UL * 1000UL)) {
-        ESP.restart();
-    }
-#endif
 }

src/mqtt.cpp

         return;
     }
 
+    bool wrote = false;
+
     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);
+        wrote = true;
 #ifdef ENABLE_BME280
     } else 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);
+        wrote = 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);
+        wrote = true;
 #endif // ENABLE_BME280
     }
 
     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);
+        wrote = 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);
+        wrote = true;
     }
 #endif // ENABLE_CCS811
+
+    if (wrote) {
+        debug.println(F("Updated MQTT sensor values"));
+    }
 }
 
 static void mqttCallback(char* topic, byte* payload, unsigned int length) {
 }
 
 void initMQTT() {
-    debug.println(F("MQTT"));
     mqtt.setServer(MQTT_HOST, MQTT_PORT);
     mqtt.setCallback(mqttCallback);
 }

src/sensors.cpp

 
 static unsigned long last_sensor_handle_time = 0;
 
-#ifdef ENABLE_BME280
-
-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;
+#define DEF_SENSOR_READ_FUNC(n, v)        \
+float n(void) {                           \
+    while (1) {                           \
+        float a = v;                      \
+        float b = v;                      \
+                                          \
+        if ((a > b) && ((a - b) < 2.0)) { \
+            return (a + b) / 2.0;         \
+        }                                 \
+                                          \
+        if ((a < b) && ((b - a) < 2.0)) { \
+            return (a + b) / 2.0;         \
+        }                                 \
+                                          \
+        /* to keep wdt happy */           \
+        delay(1);                         \
+    }                                     \
+    return 0.0;                           \
 }
 
+#ifdef ENABLE_BME280
+DEF_SENSOR_READ_FUNC(bme1_temp, bme1.readTemperature())
+DEF_SENSOR_READ_FUNC(bme2_temp, bme2.readTemperature())
+DEF_SENSOR_READ_FUNC(bme1_humid, bme1.readHumidity())
+DEF_SENSOR_READ_FUNC(bme2_humid, bme2.readHumidity())
+DEF_SENSOR_READ_FUNC(bme1_pressure, bme1.readPressure())
+DEF_SENSOR_READ_FUNC(bme2_pressure, bme2.readPressure())
 #endif // ENABLE_BME280
 
-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;
-}
+DEF_SENSOR_READ_FUNC(sht_temp, sht.GetTemperature() + config.sht_temp_off)
+DEF_SENSOR_READ_FUNC(sht_humid, sht.GetHumidity())
 
 #ifdef ENABLE_CCS811
 

src/servers.cpp

 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);