date time printing on lorarx and auto reset

compile_commands.json

@@ -1 +1 @@
-.pio/build/loratx/compile_commands.json
+.pio/build/lorarx/compile_commands.json

include/config.h

@@ -57,6 +57,12 @@
 #define LED_ERROR_BLINK_INTERVAL 100
 #define MQTT_RECONNECT_INTERVAL (5 * 1000)
 
+#define NTP_SERVER "pool.ntp.org"
+// TODO auto-detect?!
+//#warning hard-coded timezone and daylight savings offset
+#define gmtOffset_sec (60 * 60)
+#define daylightOffset_sec (60 * 60)
+
 #if defined(SENSOR_LOCATION_LIVINGROOM)
 #define SENSOR_LOCATION "livingroom"
 #define SENSOR_ID SENSOR_LOCATION

include/ui.h

@@ -14,6 +14,14 @@
 #ifndef __UI_H__
 #define __UI_H__
 
+#ifdef FEATURE_NTP
+#include <time.h>
+String time_to_date_str(struct tm timeinfo);
+String time_to_time_str(struct tm timeinfo);
+#endif // FEATURE_NTP
+
+#ifdef FEATURE_UI
+
 enum bathroom_light_states {
     BATH_LIGHT_OFF,
     BATH_LIGHT_NONE,
@@ -52,4 +60,6 @@ void ui_run(void);
 
 void ui_progress(enum ui_state state);
 
+#endif // FEATURE_UI
+
 #endif // __UI_H__

platformio.ini

@@ -28,6 +28,7 @@ build_flags =
   -DUSER_SETUP_LOADED=1
   -include include/User_Setup.h
   -DDISABLE_ALL_LIBRARY_WARNINGS
+  -DFEATURE_NTP
 lib_ldf_mode = deep
 lib_deps =
     https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c
@@ -82,6 +83,7 @@ build_flags =
   -DFEATURE_LORA
   -DENABLE_INFLUXDB_LOGGING
   -DUSE_INFLUXDB_LIB
+  -DFEATURE_NTP
 lib_deps =
     ESP8266 Influxdb
     https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c

src/influx.cpp

@@ -18,6 +18,7 @@
 #include "sensors.h"
 #include "relais.h"
 #include "moisture.h"
+#include "ui.h"
 #include "influx.h"
 
 #ifdef ENABLE_INFLUXDB_LOGGING
@@ -129,6 +130,14 @@ void writeSensorDatum(String measurement, String sensor, String placement, Strin
     debug.print(" ");
     debug.printf("%.2lf\n", value);
     writeMeasurement(ms);
+
+#ifdef FEATURE_NTP
+    struct tm timeinfo;
+    if (getLocalTime(&timeinfo)) {
+        debug.print(time_to_time_str(timeinfo) + " ");
+    }
+#endif // FEATURE_NTP
+
     debug.println(F("Done!"));
 }
 

src/lora.cpp

@@ -82,7 +82,8 @@
 
 static unsigned long last_bat_time = 0;
 static bool use_lora = true;
-static unsigned long last_tx = 0, tx_time = 0, minimum_pause = 0;
+static unsigned long last_tx = 0, last_rx = 0;
+static unsigned long tx_time = 0, minimum_pause = 0;
 static volatile bool rx_flag = false;
 
 #ifdef FEATURE_SML
@@ -334,12 +335,20 @@ void lora_run(void) {
     }
 #endif // DEEP_SLEEP_TIMEOUT_MS && DEEP_SLEEP_DURATION_S
 
+#ifndef FEATURE_SML
+    if (time >= (6UL * 60UL * 60UL * 1000UL) // running for at least 6h
+        && ((time - last_rx) >= (30UL * 1000UL))) { // and last lora rx at least 30s ago
+        heltec_deep_sleep(10); // attempt reset to avoid lorarx hanging
+    }
+#endif // ! FEATURE_SML
+
     if (!use_lora) {
         return;
     }
 
     if (rx_flag) {
         rx_flag = false;
+        last_rx = time;
 
         bool success = true;
         uint8_t data[sizeof(struct lora_sml_msg)];

src/main.cpp

@@ -224,6 +224,11 @@ void setup() {
 
 #endif // ARCH
 
+#ifdef FEATURE_NTP
+    // get time via NTP
+    configTime(gmtOffset_sec, daylightOffset_sec, NTP_SERVER);
+#endif
+
     debug.println(F("Seeding"));
     randomSeed(micros());
 

src/ui.cpp

@@ -20,7 +20,6 @@
 
 #include <Arduino.h>
 #include <WiFi.h>
-#include <time.h>
 
 #include "config.h"
 #include "DebugLog.h"
@@ -72,7 +71,6 @@
 #define FULL_BRIGHT_MS (1000 * 30)
 #define NO_BRIGHT_MS (1000 * 2)
 
-#define NTP_SERVER "pool.ntp.org"
 #define STANDBY_REDRAW_MS 500
 
 #define CALIB_1_X 42
@@ -80,11 +78,6 @@
 #define CALIB_2_X LCD_WIDTH - 1 - CALIB_1_X
 #define CALIB_2_Y LCD_HEIGHT - 1 - CALIB_1_Y
 
-// TODO auto-detect?!
-#warning hard-coded timezone and daylight savings offset
-#define gmtOffset_sec (60 * 60)
-#define daylightOffset_sec (60 * 60)
-
 #if (LCD_MIN_BRIGHTNESS <= STANDBY_BRIGHTNESS)
 #error STANDBY_BRIGHTNESS needs to be bigger than LCD_MIN_BRIGHTNESS
 #endif
@@ -259,38 +252,12 @@ static void draw_standby(void) {
     tft.drawString(ESP_PLATFORM_NAME " " NAME_OF_FEATURE " V" ESP_ENV_VERSION, LCD_WIDTH / 2, 0, 2);
     tft.drawString("by xythobuz.de", LCD_WIDTH / 2, 16, 2);
 
+    String date = "?";
+    String time = "?";
     struct tm timeinfo;
-    String date, time;
-    String weekday[7] = { "So.", "Mo.", "Di.", "Mi.", "Do.", "Fr.", "Sa." };
-    if(getLocalTime(&timeinfo)) {
-        date += weekday[timeinfo.tm_wday % 7];
-        date += " ";
-        if (timeinfo.tm_mday < 10) {
-            date += "0";
-        }
-        date += String(timeinfo.tm_mday);
-        date += ".";
-        if ((timeinfo.tm_mon + 1) < 10) {
-            date += "0";
-        }
-        date += String(timeinfo.tm_mon + 1);
-        date += ".";
-        date += String(timeinfo.tm_year + 1900);
-
-        if (timeinfo.tm_hour < 10) {
-            time += "0";
-        }
-        time += String(timeinfo.tm_hour);
-        time += ":";
-        if (timeinfo.tm_min < 10) {
-            time += "0";
-        }
-        time += String(timeinfo.tm_min);
-        time += ":";
-        if (timeinfo.tm_sec < 10) {
-            time += "0";
-        }
-        time += String(timeinfo.tm_sec);
+    if (getLocalTime(&timeinfo)) {
+        date = time_to_date_str(timeinfo);
+        time = time_to_time_str(timeinfo);
     }
 
     tft.setTextDatum(MC_DATUM); // middle center
@@ -474,9 +441,6 @@ void ui_progress(enum ui_state state) {
         } break;
 
         case UI_READY: {
-            // get time via NTP
-            configTime(gmtOffset_sec, daylightOffset_sec, NTP_SERVER);
-
             ui_page = UI_START;
             ui_draw_menu();
         } break;
@@ -648,3 +612,45 @@ void ui_run(void) {
 }
 
 #endif // FEATURE_UI
+
+#ifdef FEATURE_NTP
+
+String time_to_date_str(struct tm timeinfo) {
+    static String weekday[7] = { "So.", "Mo.", "Di.", "Mi.", "Do.", "Fr.", "Sa." };
+    String date;
+    date += weekday[timeinfo.tm_wday % 7];
+    date += " ";
+    if (timeinfo.tm_mday < 10) {
+        date += "0";
+    }
+    date += String(timeinfo.tm_mday);
+    date += ".";
+    if ((timeinfo.tm_mon + 1) < 10) {
+        date += "0";
+    }
+    date += String(timeinfo.tm_mon + 1);
+    date += ".";
+    date += String(timeinfo.tm_year + 1900);
+    return date;
+}
+
+String time_to_time_str(struct tm timeinfo) {
+    String time;
+    if (timeinfo.tm_hour < 10) {
+        time += "0";
+    }
+    time += String(timeinfo.tm_hour);
+    time += ":";
+    if (timeinfo.tm_min < 10) {
+        time += "0";
+    }
+    time += String(timeinfo.tm_min);
+    time += ":";
+    if (timeinfo.tm_sec < 10) {
+        time += "0";
+    }
+    time += String(timeinfo.tm_sec);
+    return time;
+}
+
+#endif // FEATURE_NTP