some cleanup

platformio.ini

@@ -8,13 +8,13 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
-[env:esp01]
-platform = espressif8266@2.3.2
-board = esp01
+[env:esp01_1m]
+platform = espressif8266
+board = esp01_1m
 framework = arduino
 lib_deps =
     Wire
-    ESP8266 Influxdb@1.3.0
-    Adafruit Unified Sensor@1.1.1
-    Adafruit BME280 Library@2.0.0
+    ESP8266 Influxdb
+    Adafruit Unified Sensor
+    Adafruit BME280 Library
 

src/config.h

@@ -0,0 +1,42 @@
+#ifndef __ESP_ENV_CONFIG__
+#define __ESP_ENV_CONFIG__
+
+// Sketch version
+const char* esp_env_version = "0.2.0";
+
+// location of sensor, used in DB and hostname
+//const char* sensor_location = "livingroom";
+//const char* sensor_location = "bedroom";
+//const char* sensor_location = "bathroom";
+//const char* sensor_location = "kitchen";
+//const char* sensor_location = "hallway";
+//const char* sensor_location = "tent";
+const char* sensor_location = "storage";
+
+#define SENSOR_HOSTNAME_PREFIX "ESP-"
+
+// WiFi AP settings
+const char* ssid = "WIFI_SSID_HERE";
+const char* password = "WIFI_PASSWORD_HERE";
+
+// InfluxDB settings
+#define INFLUXDB_HOST "INFLUX_IP_HERE"
+#define INFLUXDB_PORT 8086
+#define INFLUXDB_DATABASE "roomsensorsdiy"
+
+// all given in milliseconds
+#define SERVER_HANDLE_INTERVAL 10
+#define DB_WRITE_INTERVAL (30 * 1000)
+#define LED_BLINK_INTERVAL (2 * 1000)
+#define LED_INIT_BLINK_INTERVAL 500
+#define LED_CONNECT_BLINK_INTERVAL 250
+#define LED_ERROR_BLINK_INTERVAL 100
+
+// feature selection
+#define ENABLE_DATABASE_WRITES
+#define ENABLE_LED_HEARTBEAT_BLINK
+#define DONT_RUN_WITHOUT_SENSORS
+#define HTTP_SHOW_ESP_STATS
+
+#endif // __ESP_ENV_CONFIG__
+

src/main.cpp

@@ -1,164 +1,228 @@
 #include <Arduino.h>
 #include <Wire.h>
 #include <ESP8266WiFi.h>
-#include <InfluxDb.h>
 #include <ESP8266WebServer.h>
 #include <ESP8266mDNS.h>
+#include <ESP8266HTTPUpdateServer.h>
 #include <Adafruit_BME280.h>
 #include <SHT2x.h>
+#include "config.h"
 
-const char* sensor_location = "SENSOR_NAME_GOES_HERE";
-
-const char* ssid = "YOUR_SSID_HERE";
-const char* password = "YOUR_PASS_HERE";
-
-#define INFLUXDB_HOST "INFLUX_DB_SERVER_IP_HERE"
-#define INFLUXDB_PORT 8086
-#define INFLUXDB_DATABASE "INFLUX_DB_DATABASE_NAME_HERE"
-
-#define SENSOR_HOSTNAME_PREFIX "ESP-"
-
+#ifdef ENABLE_DATABASE_WRITES
+#include <InfluxDb.h>
 Influxdb influx(INFLUXDB_HOST, INFLUXDB_PORT);
+#endif // ENABLE_DATABASE_WRITES
+
 ESP8266WebServer server(80);
+ESP8266HTTPUpdateServer updater;
+
 TwoWire Wire2;
 SHT2x sht(HTDU21D_ADDRESS, &Wire2);
 Adafruit_BME280 bme;
+
 bool found_bme = false;
 bool found_sht = false;
 
+unsigned long last_server_handle_time = 0;
+unsigned long last_db_write_time = 0;
+unsigned long last_led_blink_time = 0;
+
 void handleRoot() {
-    String message = "ESP8266 BME280 Sensor";
-    message += "\n\nLocation: ";
+    String message = F("ESP8266 Environment Sensor");
+    message += F("\n\n");
+    message += F("Version: ");
+    message += esp_env_version;
+    message += F("\n");
+    message += F("Location: ");
     message += sensor_location;
-    message += "\nMAC: ";
+    message += F("\n");
+    message += F("MAC: ");
     message += WiFi.macAddress();
 
+#ifdef HTTP_SHOW_ESP_STATS
+    message += F("\n");
+    message += F("Reset reason: ");
+    message += ESP.getResetReason();
+    message += F("\n");
+    message += F("Free heap: ");
+    message += String(ESP.getFreeHeap());
+    message += F(" (");
+    message += String(ESP.getHeapFragmentation());
+    message += F("% fragmentation)");
+    message += F("\n");
+    message += F("Free sketch space: ");
+    message += String(ESP.getFreeSketchSpace());
+    message += F("\n");
+    message += F("Flash chip real size: ");
+    message += String(ESP.getFlashChipRealSize());
+
+    if (ESP.getFlashChipSize() != ESP.getFlashChipRealSize()) {
+        message += F("\n");
+        message += F("WARNING: sdk chip size (");
+        message += (ESP.getFlashChipSize());
+        message += F(") does not match!");
+    }
+#endif // HTTP_SHOW_ESP_STATS
+
     if (found_bme) {
-        message += "\n\nBME280:";
-        message += "\nTemperature: ";
+        message += F("\n\n");
+        message += F("BME280:");
+        message += F("\n");
+        message += F("Temperature: ");
         message += String(bme.readTemperature());
-        message += "\nHumidity: ";
+        message += F("\n");
+        message += F("Humidity: ");
         message += String(bme.readHumidity());
-        message += "\nPressure: ";
+        message += F("\n");
+        message += F("Pressure: ");
         message += String(bme.readPressure());
     }
 
     if (found_sht) {
-        message += "\n\nSHT21:";
-        message += "\nTemperature: ";
+        message += F("\n\n");
+        message += F("SHT21:");
+        message += F("\n");
+        message += F("Temperature: ");
         message += String(sht.GetTemperature());
-        message += "\nHumidity: ";
+        message += F("\n");
+        message += F("Humidity: ");
         message += String(sht.GetHumidity());
     }
 
     if ((!found_bme) && (!found_sht)) {
-        message += "\n\nNo Sensor available!";
+        message += F("\n\n");
+        message += F("No Sensor available!");
     }
 
-    message += "\n";
+    message += F("\n\n");
+    message += F("Try /update for OTA firmware updates!");
+    message += F("\n");
+
     server.send(200, "text/plain", message);
 }
 
 void setup() {
     pinMode(1, OUTPUT);
-    digitalWrite(1, LOW); // LED on
-    delay(500);
-    digitalWrite(1, HIGH); // LED off
-    delay(500);
-    digitalWrite(1, LOW); // LED on
-    delay(500);
-    digitalWrite(1, HIGH); // LED off
-    delay(500);
 
+    // Blink LED for init
+    for (int i = 0; i < 2; i++) {
+        digitalWrite(1, LOW); // LED on
+        delay(LED_INIT_BLINK_INTERVAL);
+        digitalWrite(1, HIGH); // LED off
+        delay(LED_INIT_BLINK_INTERVAL);
+    }
+
+    // Init I2C and try to connect to sensors
     Wire2.begin(2, 0);
     found_bme = (!bme.begin(0x76, &Wire2)) ? false : true;
     found_sht = sht.GetAlive();
 
+#ifdef DONT_RUN_WITHOUT_SENSORS
     if ((!found_bme) && (!found_sht)) {
         // no sensor available
         while (1) {
             digitalWrite(1, !digitalRead(1));
-            delay(100);
+            delay(LED_ERROR_BLINK_INTERVAL);
         }
     }
+#endif // DONT_RUN_WITHOUT_SENSORS
 
+    // Set hostname
     String hostname = SENSOR_HOSTNAME_PREFIX;
     hostname += sensor_location;
     WiFi.hostname(hostname);
 
+    // Connect to WiFi AP
     WiFi.mode(WIFI_STA);
     WiFi.begin(ssid, password);
-
-    MDNS.begin(hostname);
-
     while (WiFi.status() != WL_CONNECTED) {
-        delay(250);
+        delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(1, !digitalRead(1));
     }
 
+#ifdef ENABLE_DATABASE_WRITES
+    // Setup InfluxDB Client
     influx.setDb(INFLUXDB_DATABASE);
+#endif // ENABLE_DATABASE_WRITES
 
+    // Setup HTTP Server
+    MDNS.begin(hostname);
+    updater.setup(&server);
     server.on("/", handleRoot);
     server.begin();
+    MDNS.addService("http", "tcp", 80);
 }
 
-#define SERVER_HANDLE_INTERVAL 10 // in ms
-#define DB_WRITE_INTERVAL (30 * 1000) // in ms
-#define LED_BLINK_INTERVAL (2 * 1000) // in ms
+void handleServers() {
+    server.handleClient();
+    MDNS.update();
+}
 
-unsigned long last_server_handle_time = 0;
-unsigned long last_db_write_time = 0;
-unsigned long last_led_blink_time = 0;
+#ifdef ENABLE_DATABASE_WRITES
+void writeDatabase() {
+    if (found_bme) {
+        InfluxData measurement("environment");
+        measurement.addTag("location", sensor_location);
+        measurement.addTag("device", WiFi.macAddress());
+        measurement.addTag("sensor", "bme280");
+
+        measurement.addValue("temperature", bme.readTemperature());
+        measurement.addValue("pressure", bme.readPressure());
+        measurement.addValue("humidity", bme.readHumidity());
+
+        boolean success = influx.write(measurement);
+        if (!success) {
+            for (int i = 0; i < 10; i++) {
+                digitalWrite(1, LOW); // LED on
+                delay(LED_ERROR_BLINK_INTERVAL);
+                digitalWrite(1, HIGH); // LED off
+                delay(LED_ERROR_BLINK_INTERVAL);
+            }
+        }
+    }
+
+    if (found_sht) {
+        InfluxData measurement("environment");
+        measurement.addTag("location", sensor_location);
+        measurement.addTag("device", WiFi.macAddress());
+        measurement.addTag("sensor", "sht21");
+
+        measurement.addValue("temperature", sht.GetTemperature());
+        measurement.addValue("humidity", sht.GetHumidity());
+
+        boolean success = influx.write(measurement);
+        if (!success) {
+            for (int i = 0; i < 10; i++) {
+                digitalWrite(1, LOW); // LED on
+                delay(LED_ERROR_BLINK_INTERVAL);
+                digitalWrite(1, HIGH); // LED off
+                delay(LED_ERROR_BLINK_INTERVAL);
+            }
+        }
+    }
+}
+#endif // ENABLE_DATABASE_WRITES
 
 void loop() {
     unsigned long time = millis();
 
     if ((time - last_server_handle_time) >= SERVER_HANDLE_INTERVAL) {
         last_server_handle_time = time;
-
-        server.handleClient();
-        MDNS.update();
+        handleServers();
     }
 
+#ifdef ENABLE_DATABASE_WRITES
     if ((time - last_db_write_time) >= DB_WRITE_INTERVAL) {
         last_db_write_time = time;
-
-        if (found_bme) {
-            InfluxData measurement("environment");
-            measurement.addTag("location", sensor_location);
-            measurement.addTag("device", WiFi.macAddress());
-            measurement.addTag("sensor", "bme280");
-
-            measurement.addValue("temperature", bme.readTemperature());
-            measurement.addValue("pressure", bme.readPressure());
-            measurement.addValue("humidity", bme.readHumidity());
-
-            boolean success = influx.write(measurement);
-            if (!success) {
-                digitalWrite(1, !digitalRead(1));
-            }
-        }
-
-        if (found_sht) {
-            InfluxData measurement("environment");
-            measurement.addTag("location", sensor_location);
-            measurement.addTag("device", WiFi.macAddress());
-            measurement.addTag("sensor", "sht21");
-
-            measurement.addValue("temperature", sht.GetTemperature());
-            measurement.addValue("humidity", sht.GetHumidity());
-
-            boolean success = influx.write(measurement);
-            if (!success) {
-                digitalWrite(1, !digitalRead(1));
-            }
-        }
+        writeDatabase();
     }
+#endif // ENABLE_DATABASE_WRITES
 
+#ifdef ENABLE_LED_HEARTBEAT_BLINK
     if ((time - last_led_blink_time) >= LED_BLINK_INTERVAL) {
         last_led_blink_time = time;
-
         digitalWrite(1, !digitalRead(1));
     }
+#endif // ENABLE_LED_HEARTBEAT_BLINK
 }