more cleanup.

include/config.h

@@ -58,7 +58,7 @@
 #define SENSOR_ID SENSOR_LOCATION
 #elif defined(SENSOR_LOCATION_LIVINGROOM_WORKSPACE)
 #define SENSOR_LOCATION "livingroom"
-#define SENSOR_ID "livingroom-workspace"
+#define SENSOR_ID "livingroom-ws"
 #elif defined(SENSOR_LOCATION_LIVINGROOM_TV)
 #define SENSOR_LOCATION "livingroom"
 #define SENSOR_ID "livingroom-tv"

src/html.cpp

@@ -390,8 +390,8 @@ void handlePage(WiFiClient &client, int mode, int id) {
     message += F("</body>");
 
 #ifdef ENABLE_WEBSOCKETS
-    message += F("<script type='text/javascript'>\n");
-    message += F("var socket = new WebSocket('ws://' + window.location.hostname + ':81');\n");
+    message += F("<script type='text/javascript'>");
+    message += F("var socket = new WebSocket('ws://' + window.location.hostname + ':81');");
     message += F("socket.onmessage = function(e) {");
     message += F(    "var log = document.getElementById('logbuf');");
     message += F(    "var div = document.getElementsByClassName('log')[0];");
@@ -400,10 +400,10 @@ void handlePage(WiFiClient &client, int mode, int id) {
     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");
+    message += F("};");
+    message += F("var hist = document.getElementsByClassName('log')[0];");
+    message += F("hist.scrollTop = hist.scrollHeight;");
+    message += F("</script>");
 #endif // ENABLE_WEBSOCKETS
 
     message += F("</html>");

src/influx.cpp

@@ -89,29 +89,35 @@ static boolean writeMeasurement(InfluxData &measurement) {
     return success;
 }
 
-void writeDatabase() {
-#ifndef USE_INFLUXDB_LIB
-    InfluxData measurement("");
+static void addTagsGeneric(InfluxData &measurement) {
+    measurement.addTag("location", SENSOR_LOCATION);
+    measurement.addTag("location-id", SENSOR_ID);
+
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+    measurement.addTag("device", WiFi.macAddress().c_str());
 #endif
+}
 
-#ifdef ENABLE_BME280
+static void addTagsSensor(InfluxData &measurement, String sensor, String placement) {
+    addTagsGeneric(measurement);
+    measurement.addTag("sensor", sensor);
+    measurement.addTag("placement", placement);
+}
 
-    if (found_bme1) {
-#ifndef USE_INFLUXDB_LIB
-        measurement.clear();
-        measurement.setName("environment");
-#else
-        InfluxData measurement("environment");
+#ifdef FEATURE_RELAIS
+static void addTagsRelais(InfluxData &measurement, String id, String name) {
+    addTagsGeneric(measurement);
+    measurement.addTag("id", id);
+    measurement.addTag("name", name);
+}
 #endif
 
-        measurement.addTag("location", SENSOR_LOCATION);
-        measurement.addTag("location-id", SENSOR_ID);
-        measurement.addTag("placement", "1");
-        measurement.addTag("sensor", "bme280");
+void writeDatabase() {
+#ifdef ENABLE_BME280
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-        measurement.addTag("device", WiFi.macAddress().c_str());
-#endif
+    if (found_bme1) {
+        InfluxData measurement("environment");
+        addTagsSensor(measurement, F("bme280"), F("1"));
 
         measurement.addValue("temperature", bme1_temp());
         measurement.addValue("pressure", bme1_pressure());
@@ -123,21 +129,8 @@ void writeDatabase() {
     }
 
     if (found_bme2) {
-#ifndef USE_INFLUXDB_LIB
-        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().c_str());
-#endif
+        addTagsSensor(measurement, F("bme280"), F("2"));
 
         measurement.addValue("temperature", bme2_temp());
         measurement.addValue("pressure", bme2_pressure());
@@ -151,20 +144,8 @@ void writeDatabase() {
 #endif // ENABLE_BME280
 
     if (found_sht) {
-#ifndef USE_INFLUXDB_LIB
-        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().c_str());
-#endif
+        addTagsSensor(measurement, F("sht21"), F("1"));
 
         measurement.addValue("temperature", sht_temp());
         measurement.addValue("humidity", sht_humid());
@@ -177,25 +158,12 @@ void writeDatabase() {
 #ifdef ENABLE_CCS811
 
     if (found_ccs1) {
-#ifndef USE_INFLUXDB_LIB
-        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");
+        addTagsSensor(measurement, F("ccs811"), F("1"));
 
         String err(ccs1_error_code);
         measurement.addTag("error", err);
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-        measurement.addTag("device", WiFi.macAddress().c_str());
-#endif
-
         measurement.addValue("eco2", ccs1_eco2());
         measurement.addValue("tvoc", ccs1_tvoc());
 
@@ -205,25 +173,12 @@ void writeDatabase() {
     }
 
     if (found_ccs2) {
-#ifndef USE_INFLUXDB_LIB
-        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");
+        addTagsSensor(measurement, F("ccs811"), F("2"));
 
         String err(ccs2_error_code);
         measurement.addTag("error", err);
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-        measurement.addTag("device", WiFi.macAddress().c_str());
-#endif
-
         measurement.addValue("eco2", ccs2_eco2());
         measurement.addValue("tvoc", ccs2_tvoc());
 
@@ -238,21 +193,9 @@ void writeDatabase() {
     for (int i = 0; i < moisture_count(); i++) {
         int moisture = moisture_read(i);
         if (moisture < moisture_max()) {
-#ifndef USE_INFLUXDB_LIB
-            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().c_str());
-#endif
+            InfluxData measurement("moisture");
+            addTagsSensor(measurement, sensor, sensor);
 
             measurement.addValue("value", moisture);
             measurement.addValue("maximum", moisture_max());
@@ -268,17 +211,14 @@ void writeDatabase() {
 #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().c_str());
-#endif
+        addTagsRelais(measurement, String(i), relais_name(i));
 
         measurement.addValue("state", relais_get(i));
+
+        debug.print(F("Writing relais "));
+        debug.println(i);
         writeMeasurement(measurement);
+        debug.println(F("Done!"));
     }
 #endif // FEATURE_RELAIS
 }

src/main.cpp

@@ -68,12 +68,17 @@ void setup() {
 
     config = mem_read();
 
+#ifdef FEATURE_RELAIS
     debug.println(F("Relais"));
     relais_init();
-    
+#endif // FEATURE_RELAIS
+
+#ifdef FEATURE_MOISTURE
     debug.println(F("Moisture"));
     moisture_init();
+#endif // FEATURE_MOISTURE
 
+    debug.println(F("Sensors"));
     initSensors();
 
     // Build hostname string
@@ -123,6 +128,7 @@ void setup() {
     // Connect to WiFi AP
     debug.print(F("Connecting WiFi"));
     WiFi.mode(WIFI_STA);
+    WiFi.setHostname(hostname.c_str());
     WiFi.begin(WIFI_SSID, WIFI_PASS);
     while (WiFi.status() != WL_CONNECTED) {
         delay(LED_CONNECT_BLINK_INTERVAL);

src/servers.cpp

@@ -229,8 +229,4 @@ void runServers() {
 #endif // ENABLE_WEBSOCKETS
 #endif
     }
-    
-    runSensors();
-    runMQTT();
-    runInflux();
 }