small changes while debugging wifi issues

include/config.h

@@ -15,24 +15,24 @@
 #define __ESP_ENV_CONFIG__
 
 // Sketch version
-const char* esp_relais_version = "0.1.0";
+#define ESP_RELAIS_VERSION "0.1.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";
-//const char* sensor_location = "greenhouse";
-//const char* sensor_location = "test";
+//#define SENSOR_LOCATION "livingroom"
+//#define SENSOR_LOCATION "bedroom"
+//#define SENSOR_LOCATION "bathroom"
+//#define SENSOR_LOCATION "kitchen"
+//#define SENSOR_LOCATION "hallway"
+//#define SENSOR_LOCATION "tent"
+//#define SENSOR_LOCATION "storage"
+//#define SENSOR_LOCATION "greenhouse"
+#define SENSOR_LOCATION "test"
 
 #define SENSOR_HOSTNAME_PREFIX "relais-"
 
 // WiFi AP settings
-const char* ssid = "INSERT_SSID_HERE";
-const char* password = "INSERT_PASSPHRASE_HERE";
+#define WIFI_SSID "INSERT_SSID_HERE"
+#define WIFI_PASS "INSERT_PASSPHRASE_HERE"
 
 // MQTT settings
 #define MQTT_HOST "10.23.42.14"

src/main.cpp

@@ -83,12 +83,12 @@ void handleAutoTimingCheck(void) {
         // small light from 20:00 to 10:00
         relais_state[0] = true;
         relais_state[1] = false;
-        auto_set_state = F("Small Light at Night (") + timeClient.getFormattedTime() + F(")");
+        auto_set_state = String(F("Small Light at Night (")) + String(timeClient.getFormattedTime()) + String(F(")"));
     } else {
         // big light from 10:00 to 20:00
         relais_state[0] = false;
         relais_state[1] = true;
-        auto_set_state = F("Big Light while Daylight (") + timeClient.getFormattedTime() + F(")");
+        auto_set_state = String(F("Big Light while Daylight (")) + String(timeClient.getFormattedTime()) + String(F(")"));
     }
 
     for (int i = 0; i < RELAIS_COUNT; i++) {
@@ -128,7 +128,7 @@ void handlePage(int mode = -1, int id = 0) {
 
 #ifdef ENABLE_NTP
     message += F("<p>Time from NTP: ");
-    message += timeClient.getFormattedTime();
+    message += String(timeClient.getFormattedTime());
     message += F("</p>\n");
 
     message += F("<p>Auto-State: ");
@@ -141,12 +141,14 @@ void handlePage(int mode = -1, int id = 0) {
     message += F("min</p>\n");
 #endif // ENABLE_NTP
 
+    message += F("<p><a href=\"/\">Refresh Page</a></p>\n");
+
     message += F("\n<p>\n");
     message += F("Version: ");
-    message += esp_relais_version;
+    message += ESP_RELAIS_VERSION;
     message += F("\n<br>\n");
     message += F("Location: ");
-    message += sensor_location;
+    message += SENSOR_LOCATION;
     message += F("\n<br>\n");
     message += F("MAC: ");
     message += WiFi.macAddress();
@@ -307,7 +309,7 @@ void mqttReconnect() {
             // Once connected, publish an announcement...
             //mqtt.publish("outTopic", "hello world");
             // ... and resubscribe
-            mqtt.subscribe(sensor_location);
+            mqtt.subscribe(SENSOR_LOCATION);
         } else {
             // Wait 5 seconds before retrying
             delay(5000);
@@ -338,21 +340,26 @@ void setup() {
 
     // Build hostname string
     String hostname = SENSOR_HOSTNAME_PREFIX;
-    hostname += sensor_location;
+    hostname += SENSOR_LOCATION;
 
 #if defined(ARDUINO_ARCH_ESP8266)
 
     // Connect to WiFi AP
-    Serial.print("Connecting to WiFi");
+    Serial.print("Connecting to WiFi ");
     WiFi.hostname(hostname);
     WiFi.mode(WIFI_STA);
-    WiFi.begin(ssid, password);
+    WiFi.begin(WIFI_SSID, WIFI_PASS);
     while (WiFi.status() != WL_CONNECTED) {
-        Serial.print(".");
+        Serial.print(WiFi.status());
+        Serial.print(" ");
+
         delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
     }
     Serial.println();
+
+    Serial.print("Got local IP ");
+    Serial.println(WiFi.localIP().toString());
     
 #elif defined(ARDUINO_ARCH_ESP32)
 
@@ -371,12 +378,15 @@ void setup() {
     }, WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
 
     // Connect to WiFi AP
+    Serial.print("Connecting to WiFi");
     WiFi.mode(WIFI_STA);
-    WiFi.begin(ssid, password);
+    WiFi.begin(WIFI_SSID, WIFI_PASS);
     while (WiFi.status() != WL_CONNECTED) {
+        Serial.print(".");
         delay(LED_CONNECT_BLINK_INTERVAL);
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
     }
+    Serial.println();
     
     // Set hostname workaround
     WiFi.setHostname(hostname.c_str());
@@ -440,7 +450,7 @@ static boolean writeMeasurement(InfluxData &measurement) {
 void writeDatabase() {
     if (found_bme1) {
         InfluxData measurement("environment");
-        measurement.addTag("location", sensor_location);
+        measurement.addTag("location", SENSOR_LOCATION);
         measurement.addTag("placement", "1");
         measurement.addTag("device", WiFi.macAddress());
         measurement.addTag("sensor", "bme280");
@@ -453,7 +463,7 @@ void writeDatabase() {
     }
     if (found_bme2) {
         InfluxData measurement("environment");
-        measurement.addTag("location", sensor_location);
+        measurement.addTag("location", SENSOR_LOCATION);
         measurement.addTag("placement", "2");
         measurement.addTag("device", WiFi.macAddress());
         measurement.addTag("sensor", "bme280");
@@ -467,7 +477,7 @@ void writeDatabase() {
 
     if (found_sht) {
         InfluxData measurement("environment");
-        measurement.addTag("location", sensor_location);
+        measurement.addTag("location", SENSOR_LOCATION);
         measurement.addTag("device", WiFi.macAddress());
         measurement.addTag("sensor", "sht21");
 
@@ -481,7 +491,7 @@ void writeDatabase() {
         int moisture = moisture_read(i);
         if (moisture < moisture_max()) {
             InfluxData measurement("moisture");
-            measurement.addTag("location", sensor_location);
+            measurement.addTag("location", SENSOR_LOCATION);
             measurement.addTag("device", WiFi.macAddress());
             measurement.addTag("sensor", String(i + 1));
 
@@ -537,8 +547,8 @@ void loop() {
         digitalWrite(BUILTIN_LED_PIN, !digitalRead(BUILTIN_LED_PIN));
     }
     
-    // reset ESP every 6h to be safe
-    if (millis() >= (6 * 60 * 60 * 1000)) {
+    // reset ESP every 48h to be safe
+    if (millis() >= (48 * 60 * 60 * 1000)) {
         ESP.restart();
     }
 }

src/relais.cpp

@@ -12,6 +12,7 @@
  */
 
 #include <Arduino.h>
+#include "config.h"
 #include "relais.h"
 
 #if defined(ARDUINO_ARCH_ESP8266)