implement influx and mqtt

include/SimpleUpdater.h

@@ -1,7 +1,7 @@
 /*
  * SimpleUpdater.h
  *
- * ESP8266 / ESP32 Environmental Sensor
+ * ESP8266 / ESP32 Relais Actor
  *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):

include/config.h

@@ -1,7 +1,7 @@
 /*
  * config.h
  *
- * ESP8266 / ESP32 Environmental Sensor
+ * ESP8266 / ESP32 Relais Actor
  *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
@@ -37,6 +37,8 @@
 // MQTT settings
 #define MQTT_HOST "10.23.42.14"
 #define MQTT_PORT 1883
+#define MQTT_USER "USERNAME" // undef to disable auth
+#define MQTT_PASS "PASSWORD" // undef to disable auth
 
 // InfluxDB settings
 #define INFLUXDB_HOST "10.23.42.14"
@@ -44,9 +46,9 @@
 #define INFLUXDB_DATABASE "roomsensorsdiy"
 
 // feature selection
-//#define ENABLE_MQTT
+#define ENABLE_MQTT
 //#define ENABLE_INFLUXDB_LOGGING
-#define ENABLE_NTP
+//#define ENABLE_NTP
 
 // all given in milliseconds
 #define SERVER_HANDLE_INTERVAL 10
@@ -55,6 +57,8 @@
 #define LED_INIT_BLINK_INTERVAL 500
 #define LED_CONNECT_BLINK_INTERVAL 250
 #define LED_ERROR_BLINK_INTERVAL 100
+#define DB_WRITE_INTERVAL 0 // 0 to disable
+#define MQTT_RECONNECT_INTERVAL 5000
 
 #if defined(ARDUINO_ARCH_ESP8266)
 
@@ -69,4 +73,3 @@
 #endif
 
 #endif // __ESP_ENV_CONFIG__
-

include/relais.h

@@ -1,7 +1,7 @@
 /*
  * relais.h
  *
- * ESP8266 / ESP32 Environmental Sensor
+ * ESP8266 / ESP32 Relais Actor
  *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):

src/SimpleUpdater.cpp

@@ -1,7 +1,7 @@
 /*
  * SimpleUpdater.cpp
  *
- * ESP8266 / ESP32 Environmental Sensor
+ * ESP8266 / ESP32 Relais Actor
  *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):

src/main.cpp

@@ -1,7 +1,7 @@
 /*
  * main.cpp
  *
- * ESP8266 / ESP32 Environmental Sensor
+ * ESP8266 / ESP32 Relais Actor
  *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
@@ -50,6 +50,8 @@ Influxdb influx(INFLUXDB_HOST, INFLUXDB_PORT);
 
 #define INFLUX_MAX_ERRORS_RESET 10
 int error_count = 0;
+
+void writeDatabase();
 #endif // ENABLE_INFLUXDB_LOGGING
 
 #ifdef ENABLE_NTP
@@ -64,6 +66,7 @@ unsigned long last_server_handle_time = 0;
 unsigned long last_db_write_time = 0;
 unsigned long last_led_blink_time = 0;
 unsigned long last_timing_check_time = 0;
+unsigned long last_mqtt_reconnect_time = 0;
 
 String relais_name[RELAIS_COUNT] = {
     String(" (Small Light)"),
@@ -122,7 +125,7 @@ void handlePage(int mode = -1, int id = 0) {
 
     message += F("\n<p>\n");
     for (int i = 0; i < RELAIS_COUNT; i++) {
-        message += String(F("Relais ")) + String(i) + String(F(" = ")) + (relais_state[i] ? String(F("On")) : String(F("Off"))) + String(F("<br>\n"));
+        message += String(F("Relais ")) + String(i) + relais_name[i] + String(F(" = ")) + (relais_state[i] ? String(F("On")) : String(F("Off"))) + String(F("<br>\n"));
     }
     message += F("</p>\n");
 
@@ -235,6 +238,10 @@ void handleOn() {
     // only reset to default after 15min
     last_timing_check_time = millis();
 
+#ifdef ENABLE_INFLUXDB_LOGGING
+    writeDatabase();
+#endif // ENABLE_INFLUXDB_LOGGING
+
     handlePage(1, id);
 }
 
@@ -255,6 +262,10 @@ void handleOff() {
     // only reset to default after 15min
     last_timing_check_time = millis();
 
+#ifdef ENABLE_INFLUXDB_LOGGING
+    writeDatabase();
+#endif // ENABLE_INFLUXDB_LOGGING
+
     handlePage(0, id);
 }
 
@@ -267,54 +278,61 @@ void mqttCallback(char* topic, byte* payload, unsigned int length) {
     int state = 0;
     int id = 0;
 
-    // TODO check topic matches
-
-    if (((char)payload[0] == 't')
-            && ((char)payload[1] == 'u')
-            && ((char)payload[2] == 'r')
-            && ((char)payload[3] == 'n')
-            && ((char)payload[4] == ' ')
-            && ((char)payload[5] == 'o')) {
-        if (((char)payload[6] == 'n')
-            && ((char)payload[7] == ' ')) {
-            // turn on
-            state = 1;
-            id = payload[8];
-        } else if (((char)payload[6] == 'f')
-                && ((char)payload[7] == 'f')
-                && ((char)payload[8] == ' ')) {
-            // turn off
-            state = 0;
-            id = payload[9];
-        } else {
-            return;
-        }
+    String ts(topic), ps((char *)payload);
+
+    String our_topic(SENSOR_LOCATION);
+    our_topic += "/";
+
+    if (!ts.startsWith(our_topic)) {
+        return;
+    }
+
+    String ids = ts.substring(our_topic.length());
+    id = ids.toInt();
+    if ((id < 0) || (id >= RELAIS_COUNT)) {
+        return;
+    }
+
+    if (ps.indexOf("on") != -1) {
+        state = 1;
+    } else if (ps.indexOf("off") != -1) {
+        state = 0;
     } else {
         return;
     }
 
-    relais_set(id - 1, state);
-    relais_state[id - 1] = state ? true : false;
+    if ((id >= 0) && (id < RELAIS_COUNT)) {
+        relais_set(id, state);
+        relais_state[id] = state ? true : false;
+
+#ifdef ENABLE_INFLUXDB_LOGGING
+        writeDatabase();
+#endif // ENABLE_INFLUXDB_LOGGING
+    }
 }
 
 void mqttReconnect() {
-    // Loop until we're reconnected
-    //while (!mqtt.connected()) {
-        // Create a random client ID
-        String clientId = "ESP8266Client-";
-        clientId += String(random(0xffff), HEX);
-
-        // Attempt to connect
-        if (mqtt.connect(clientId.c_str())) {
-            // Once connected, publish an announcement...
-            //mqtt.publish("outTopic", "hello world");
-            // ... and resubscribe
-            mqtt.subscribe(SENSOR_LOCATION);
-        } else {
-            // Wait 5 seconds before retrying
-            delay(5000);
+    // Create a random client ID
+    String clientId = "ESP8266-Relais-";
+    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
+        // Once connected, publish an announcement...
+        mqtt.publish(SENSOR_LOCATION, "hello world");
+
+        // ... and resubscribe
+        mqtt.subscribe(SENSOR_LOCATION);
+        for (int i = 0; i < RELAIS_COUNT; i++) {
+            String topic(SENSOR_LOCATION);
+            topic += String("/") + String(i);
+            mqtt.subscribe(topic.c_str());
         }
-    //}
+    }
 }
 #endif // ENABLE_MQTT
 
@@ -448,59 +466,14 @@ static boolean writeMeasurement(InfluxData &measurement) {
 }
 
 void writeDatabase() {
-    if (found_bme1) {
-        InfluxData measurement("environment");
-        measurement.addTag("location", SENSOR_LOCATION);
-        measurement.addTag("placement", "1");
-        measurement.addTag("device", WiFi.macAddress());
-        measurement.addTag("sensor", "bme280");
-
-        measurement.addValue("temperature", bme1_temp());
-        measurement.addValue("pressure", bme1_pressure());
-        measurement.addValue("humidity", bme1_humid());
-
-        writeMeasurement(measurement);
-    }
-    if (found_bme2) {
-        InfluxData measurement("environment");
-        measurement.addTag("location", SENSOR_LOCATION);
-        measurement.addTag("placement", "2");
-        measurement.addTag("device", WiFi.macAddress());
-        measurement.addTag("sensor", "bme280");
-
-        measurement.addValue("temperature", bme2_temp());
-        measurement.addValue("pressure", bme2_pressure());
-        measurement.addValue("humidity", bme2_humid());
-
-        writeMeasurement(measurement);
-    }
-
-    if (found_sht) {
-        InfluxData measurement("environment");
+    for (int i = 0; i < RELAIS_COUNT; i++) {
+        InfluxData measurement("relais");
         measurement.addTag("location", SENSOR_LOCATION);
         measurement.addTag("device", WiFi.macAddress());
-        measurement.addTag("sensor", "sht21");
-
-        measurement.addValue("temperature", sht_temp());
-        measurement.addValue("humidity", sht_humid());
-
+        measurement.addTag("id", String(i));
+        measurement.addValue("state", relais_state[i] ? 1 : 0);
         writeMeasurement(measurement);
     }
-    
-    for (int i = 0; i < moisture_count(); i++) {
-        int moisture = moisture_read(i);
-        if (moisture < moisture_max()) {
-            InfluxData measurement("moisture");
-            measurement.addTag("location", SENSOR_LOCATION);
-            measurement.addTag("device", WiFi.macAddress());
-            measurement.addTag("sensor", String(i + 1));
-
-            measurement.addValue("value", moisture);
-            measurement.addValue("maximum", moisture_max());
-
-            writeMeasurement(measurement);
-        }
-    }
 }
 #endif // ENABLE_INFLUXDB_LOGGING
 
@@ -522,17 +495,21 @@ void loop() {
 #endif // ENABLE_NTP
 
 #ifdef ENABLE_MQTT
-    if (!mqtt.connected()) {
+    if (!mqtt.connected() && ((millis() - last_mqtt_reconnect_time) >= MQTT_RECONNECT_INTERVAL)) {
+        last_mqtt_reconnect_time = millis();
         mqttReconnect();
     }
+
     mqtt.loop();
 #endif // ENABLE_MQTT
 
 #ifdef ENABLE_INFLUXDB_LOGGING
+#if DB_WRITE_INTERVAL > 0
     if ((millis() - last_db_write_time) >= DB_WRITE_INTERVAL) {
         last_db_write_time = millis();
         writeDatabase();
     }
+#endif // DB_WRITE_INTERVAL > 0
     
 #ifdef INFLUX_MAX_ERRORS_RESET
     if (error_count >= INFLUX_MAX_ERRORS_RESET) {
@@ -546,10 +523,4 @@ void loop() {
         last_led_blink_time = millis();
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
     }
-    
-    // reset ESP every 48h to be safe
-    if (millis() >= (48 * 60 * 60 * 1000)) {
-        ESP.restart();
-    }
 }
-

src/relais.cpp

@@ -1,7 +1,7 @@
 /*
  * relais.cpp
  *
- * ESP8266 / ESP32 Environmental Sensor
+ * ESP8266 / ESP32 Relais Actor
  *
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):