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/smart_meter.h

@@ -19,6 +19,8 @@
 void sml_init(void);
 void sml_run(void);
 
+bool sml_data_received(void);
+
 #endif // FEATURE_SML
 
 #endif // __ESP_ENV_SMART_METER__

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

@@ -16,21 +16,28 @@
 #include <Arduino.h>
 
 // Turns the 'PRG' button into the power button, long press is off
+// this also increases deep sleep power usage!
+#ifndef FEATURE_SML
 #define HELTEC_POWER_BUTTON
+#endif // ! FEATURE_SML
 
 #include <heltec_unofficial.h>
 
 #include "config.h"
 #include "DebugLog.h"
 #include "influx.h"
+#include "smart_meter.h"
 #include "lora.h"
 
 //#define DEBUG_LORA_RX_HEXDUMP
 
 #ifdef FEATURE_SML
-#define LORA_LED_BRIGHTNESS 1 // in percent, 50% brightness is plenty for this LED
+#define LORA_LED_BRIGHTNESS 0 // in percent, 50% brightness is plenty for this LED
 #define OLED_BAT_INTERVAL (2UL * 60UL * 1000UL) // in ms
 #define FORCE_BAT_SEND_AT_OLED_INTERVAL
+#define DEEP_SLEEP_TIMEOUT_MS (1UL * 60UL * 1000UL) // gather data for 1min
+#define DEEP_SLEEP_ABORT_NO_DATA_MS (20UL * 1000UL) // if no data appears, abort after 20s
+#define DEEP_SLEEP_DURATION_S (5UL * 60UL) // then sleep for 5min
 #else // FEATURE_SML
 #define LORA_LED_BRIGHTNESS 25 // in percent, 50% brightness is plenty for this LED
 #endif // FEATURE_SML
@@ -75,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
@@ -133,7 +141,6 @@ static void lora_rx(void) {
 static bool lora_tx(enum lora_sml_type type, double value) {
     bool tx_legal = millis() > (last_tx + minimum_pause);
     if (!tx_legal) {
-        //debug.printf("Legal limit, wait %i sec.\n", (int)((minimum_pause - (millis() - last_tx)) / 1000) + 1);
         return false;
     }
 
@@ -145,13 +152,14 @@ static bool lora_tx(enum lora_sml_type type, double value) {
     uint8_t *data = (uint8_t *)&msg;
     const size_t len = sizeof(struct lora_sml_msg);
 
+    debug.printf("TX [%d] (%lu) ", data[0], len);
+
 #ifdef LORA_XOR_KEY
     for (size_t i = 0; i < len; i++) {
         data[i] ^= LORA_XOR_KEY[i];
     }
 #endif
 
-    debug.printf("TX [%d] (%lu) ", data[0], len);
     radio.clearDio1Action();
 
     heltec_led(LORA_LED_BRIGHTNESS);
@@ -177,11 +185,13 @@ static bool lora_tx(enum lora_sml_type type, double value) {
 
     radio.setDio1Action(lora_rx);
 
+#ifndef FEATURE_SML
     success = true;
     RADIOLIB_CHECK(radio.startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF));
     if (!success) {
         use_lora = false;
     }
+#endif // ! FEATURE_SML
 
     return r;
 }
@@ -283,12 +293,14 @@ void lora_init(void) {
         return;
     }
 
+#ifndef FEATURE_SML
     // Start receiving
     RADIOLIB_CHECK(radio.startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF));
     if (!success) {
         use_lora = false;
         return;
     }
+#endif // ! FEATURE_SML
 
 #ifdef FEATURE_SML
     // turn on Ve external 3.3V to power Smart Meter reader
@@ -302,8 +314,9 @@ void lora_init(void) {
 void lora_run(void) {
     heltec_loop();
 
-#ifdef OLED_BAT_INTERVAL
     unsigned long time = millis();
+
+#ifdef OLED_BAT_INTERVAL
     if (((time - last_bat_time) >= OLED_BAT_INTERVAL) || (last_bat_time == 0)) {
         last_bat_time = time;
         print_bat();
@@ -312,15 +325,30 @@ void lora_run(void) {
         lora_sml_send(LORA_SML_BAT_V, lora_get_mangled_bat(), 0);
 #endif // FORCE_BAT_SEND_AT_OLED_INTERVAL
     }
-#endif
+#endif // OLED_BAT_INTERVAL
+
+#if defined(DEEP_SLEEP_TIMEOUT_MS) && defined(DEEP_SLEEP_DURATION_S)
+    bool got_sml = sml_data_received();
+    if ((got_sml && (time >= DEEP_SLEEP_TIMEOUT_MS))
+            || ((!got_sml) && (time >= DEEP_SLEEP_ABORT_NO_DATA_MS))) {
+        heltec_deep_sleep(DEEP_SLEEP_DURATION_S);
+    }
+#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 a packet was received, display it and the RSSI and SNR
     if (rx_flag) {
         rx_flag = false;
+        last_rx = time;
 
         bool success = true;
         uint8_t data[sizeof(struct lora_sml_msg)];
@@ -413,12 +441,14 @@ void lora_run(void) {
             }
         }
 
+#ifndef FEATURE_SML
         success = true;
         RADIOLIB_CHECK(radio.startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF));
         if (!success) {
             use_lora = false;
             return;
         }
+#endif // ! FEATURE_SML
     }
 
 #ifdef FEATURE_SML

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/smart_meter.cpp

@@ -33,6 +33,10 @@ static unsigned long counter = 0;
 static double SumWh = NAN, T1Wh = NAN, T2Wh = NAN;
 static double SumW = NAN, L1W = NAN, L2W = NAN, L3W = NAN;
 
+bool sml_data_received(void) {
+    return counter > 0;
+}
+
 static void EnergySum(void) {
     smlOBISWh(SumWh);
 }
@@ -115,27 +119,19 @@ void sml_run(void) {
 
         if (!isnan(SumWh)) {
             debug.printf("Sum: %14.3lf Wh\n", SumWh);
-#ifdef FEATURE_LORA
-            lora_sml_send(LORA_SML_SUM_WH, SumWh, counter);
-#endif // FEATURE_LORA
         }
 
         if (!isnan(T1Wh)) {
             debug.printf(" T1: %14.3lf Wh\n", T1Wh);
-#ifdef FEATURE_LORA
-            lora_sml_send(LORA_SML_T1_WH, T1Wh, counter);
-#endif // FEATURE_LORA
         }
 
         if (!isnan(T2Wh)) {
             debug.printf(" T2: %14.3lf Wh\n", T2Wh);
-#ifdef FEATURE_LORA
-            lora_sml_send(LORA_SML_T2_WH, T2Wh, counter);
-#endif // FEATURE_LORA
         }
 
         if (!isnan(SumW)) {
             debug.printf("Sum: %14.3lf W\n", SumW);
+
 #ifdef FEATURE_LORA
             lora_sml_send(LORA_SML_SUM_W, SumW, counter);
 #endif // FEATURE_LORA
@@ -150,6 +146,7 @@ void sml_run(void) {
 
         if (!isnan(L2W)) {
             debug.printf(" L2: %14.3lf W\n", L2W);
+
 #ifdef FEATURE_LORA
             lora_sml_send(LORA_SML_L2_W, L2W, counter);
 #endif // FEATURE_LORA
@@ -157,16 +154,46 @@ void sml_run(void) {
 
         if (!isnan(L3W)) {
             debug.printf(" L3: %14.3lf W\n", L3W);
+
 #ifdef FEATURE_LORA
             lora_sml_send(LORA_SML_L3_W, L3W, counter);
 #endif // FEATURE_LORA
         }
 
+        debug.println();
+
 #ifdef FEATURE_LORA
+        // the power readings (Watt) are just sent as is, if available.
+        // the energy readings are consolidated if possible, to avoid
+        // unneccessary data transmission
+        if ((!isnan(SumWh)) && (!isnan(T1Wh))
+                && (fabs(SumWh - T1Wh) < 0.1)
+                && ((isnan(T2Wh)) || (fabs(T2Wh) < 0.1))) {
+            // (SumWh == T1Wh) && ((T2Wh == 0) || (T2Wh == NAN))
+            // just send T1Wh
+            lora_sml_send(LORA_SML_T1_WH, T1Wh, counter);
+        } else if ((!isnan(SumWh)) && (!isnan(T2Wh))
+                && (fabs(SumWh - T2Wh) < 0.1)
+                && ((isnan(T1Wh)) || (fabs(T1Wh) < 0.1))) {
+            // (SumWh == T2Wh) && ((T1Wh == 0) || (T1Wh == NAN))
+            // just send T2Wh
+            lora_sml_send(LORA_SML_T2_WH, T2Wh, counter);
+        } else {
+            // just do normal sending if available
+            if (!isnan(SumWh)) {
+                lora_sml_send(LORA_SML_SUM_WH, SumWh, counter);
+            }
+            if (!isnan(T1Wh)) {
+                lora_sml_send(LORA_SML_T1_WH, T1Wh, counter);
+            }
+            if (!isnan(T2Wh)) {
+                lora_sml_send(LORA_SML_T2_WH, T2Wh, counter);
+            }
+        }
+
+        // update own battery state with each sml readout
         lora_sml_send(LORA_SML_BAT_V, lora_get_mangled_bat(), counter);
 #endif // FEATURE_LORA
-
-        debug.println();
     }
 }
 

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