.gitignore

@@ -1,2 +1,3 @@
 .pio
 .cache
+.directory

compile_commands.json

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

include/DebugLog.h

@@ -26,21 +26,24 @@ public:
 #ifdef ENABLE_DEBUGLOG
     String getBuffer(void);
 #endif // ENABLE_DEBUGLOG
-    
+
     void write(char c);
     void print(String s);
     void print(int n);
-    
+
     void println(void);
     void println(String s);
     void println(int n);
-    
+
+    size_t printf(const char * format, ...)  __attribute__ ((format (printf, 2, 3)));
+    size_t printf(const char * format, va_list args);
+
 private:
     void sendToTargets(String s);
-    
+
 #ifdef ENABLE_DEBUGLOG
     void addToBuffer(String s);
-    
+
     CircularBuffer<char, DEBUG_LOG_HISTORY_SIZE> buffer;
 #endif // ENABLE_DEBUGLOG
 };

include/lora.h

@@ -0,0 +1,32 @@
+/*
+ * lora.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef __ESP_ENV_LORA__
+#define __ESP_ENV_LORA__
+
+#ifdef FEATURE_LORA
+
+void lora_oled_init(void);
+void lora_oled_print(String s);
+
+void lora_init(void);
+void lora_run(void);
+
+#ifdef FEATURE_SML
+void lora_sml_send(double SumWh, double T1Wh, double T2Wh,
+                   double SumW, double L1W, double L2W, double L3W);
+#endif // FEATURE_SML
+
+#endif // FEATURE_LORA
+
+#endif // __ESP_ENV_LORA__

include/smart_meter.h

@@ -0,0 +1,24 @@
+/*
+ * smart_meter.h
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifndef __ESP_ENV_SMART_METER__
+#define __ESP_ENV_SMART_METER__
+
+#ifdef FEATURE_SML
+
+void sml_init(void);
+void sml_run(void);
+
+#endif // FEATURE_SML
+
+#endif // __ESP_ENV_SMART_METER__

include/ui.h

@@ -32,6 +32,7 @@ struct ui_status {
     bool light_box;
     enum bathroom_light_states bathroom_lights;
     bool light_sink;
+    bool pc_displays;
 };
 
 extern struct ui_status ui_status;

platformio.ini

@@ -13,8 +13,8 @@ platform = platformio/espressif32@6.4.0
 board = esp32dev
 framework = arduino
 upload_protocol = esptool
-upload_port = /dev/ttyUSB1
-monitor_port = /dev/ttyUSB1
+upload_port = /dev/ttyUSB2
+monitor_port = /dev/ttyUSB2
 monitor_speed = 115200
 extra_scripts = pre:extra_script.py
 build_flags =
@@ -36,6 +36,56 @@ lib_deps =
     https://github.com/Bodmer/TFT_eSPI.git#01483a1043a4915c4e34c928fb48a87d3b38a248
     https://github.com/PaulStoffregen/XPT2046_Touchscreen.git#5d5120e93ab5d28b3f1db6d754819c354c2da019
 
+[env:loratx]
+platform = espressif32
+board = heltec_wifi_lora_32_V3
+framework = arduino
+upload_protocol = esptool
+upload_port = /dev/ttyUSB2
+monitor_port = /dev/ttyUSB2
+monitor_speed = 115200
+extra_scripts = pre:extra_script.py
+build_flags =
+  -DSENSOR_HOSTNAME_PREFIX=\"lora-\"
+  "-DNAME_OF_FEATURE=\"Lora Gatway\""
+  -DENABLE_WEBSOCKETS
+  -DENABLE_DEBUGLOG
+  -DENABLE_MQTT
+  -DNEW_ESP32_LIB
+  -DFEATURE_LORA
+  -DFEATURE_SML
+  -DFEATURE_DISABLE_WIFI
+lib_deps =
+    https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c
+    https://github.com/rlogiacco/CircularBuffer.git#f29cf01b6e8603422f3668d51036ac124f803404
+    https://github.com/Links2004/arduinoWebSockets.git#30d5e136665a52880f641ddd7245b3ba05ecd32b
+    https://github.com/ropg/heltec_esp32_lora_v3.git#9f281354507849755a597ebcce3721582f3b59b8
+    https://github.com/olliiiver/sml_parser.git#f256f6935a6c6cad1a7a7f40ea18ac7d2dd28f0a
+    https://github.com/plerup/espsoftwareserial.git#40038df467853f47dde4641769183fa46996decb
+
+[env:lorarx]
+platform = espressif32
+board = heltec_wifi_lora_32_V3
+framework = arduino
+upload_protocol = esptool
+upload_port = /dev/ttyUSB2
+monitor_port = /dev/ttyUSB2
+monitor_speed = 115200
+extra_scripts = pre:extra_script.py
+build_flags =
+  -DSENSOR_HOSTNAME_PREFIX=\"lora-\"
+  "-DNAME_OF_FEATURE=\"Lora Gatway\""
+  -DENABLE_WEBSOCKETS
+  -DENABLE_DEBUGLOG
+  -DENABLE_MQTT
+  -DNEW_ESP32_LIB
+  -DFEATURE_LORA
+lib_deps =
+    https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c
+    https://github.com/rlogiacco/CircularBuffer.git#f29cf01b6e8603422f3668d51036ac124f803404
+    https://github.com/Links2004/arduinoWebSockets.git#30d5e136665a52880f641ddd7245b3ba05ecd32b
+    https://github.com/ropg/heltec_esp32_lora_v3.git#9f281354507849755a597ebcce3721582f3b59b8
+
 [env:esp8266env]
 platform = espressif8266
 board = esp01_1m
@@ -205,3 +255,4 @@ lib_deps =
     Adafruit BME280 Library
     https://github.com/jandrassy/UnoWiFiDevEdSerial1
     https://github.com/jandrassy/arduino-library-wifilink
+

src/DebugLog.cpp

@@ -15,6 +15,7 @@
 
 #include "config.h"
 #include "servers.h"
+#include "lora.h"
 #include "DebugLog.h"
 
 DebugLog debug;
@@ -40,6 +41,10 @@ void DebugLog::addToBuffer(String s) {
 void DebugLog::sendToTargets(String s) {
     Serial.print(s);
 
+#ifdef FEATURE_LORA
+    lora_oled_print(s);
+#endif // FEATURE_LORA
+
     s = "log:" + s;
     wifi_send_websocket(s);
 }
@@ -72,3 +77,29 @@ void DebugLog::println(String s) {
 void DebugLog::println(int n) {
     println(String(n));
 }
+
+size_t DebugLog::printf(const char *format, va_list args) {
+    char line_buff[128];
+    int l = vsnprintf((char *)line_buff, sizeof(line_buff), format, args);
+
+    if (l < 0) {
+        // encoding error
+        l = snprintf((char *)line_buff, sizeof(line_buff), "%s: encoding error\r\n", __func__);
+    } else if (l >= (ssize_t)sizeof(line_buff)) {
+        // not enough space for string
+        l = snprintf((char *)line_buff, sizeof(line_buff), "%s: message too long (%d)\r\n", __func__, l);
+    }
+    if ((l > 0) && (l <= (int)sizeof(line_buff))) {
+        print(String(line_buff));
+    }
+
+    return (l < 0) ? 0 : l;
+}
+
+size_t DebugLog::printf(const char * format, ...) {
+    va_list args;
+    va_start(args, format);
+    size_t r = printf(format, args);
+    va_end(args);
+    return r;
+}

src/lora.cpp

@@ -0,0 +1,253 @@
+/*
+ * lora.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifdef FEATURE_LORA
+
+#include <Arduino.h>
+
+// Turns the 'PRG' button into the power button, long press is off
+#define HELTEC_POWER_BUTTON
+
+#include <heltec_unofficial.h>
+
+#include "config.h"
+#include "DebugLog.h"
+#include "lora.h"
+
+// define LORA_TEST_TX to periodically transmit a test message
+//#define LORA_TEST_TX
+
+#define OLED_BAT_INTERVAL (10UL * 1000UL) // in ms
+
+#ifdef FEATURE_SML
+#define LORA_LED_BRIGHTNESS 1 // in percent, 50% brightness is plenty for this LED
+#else // FEATURE_SML
+#define LORA_LED_BRIGHTNESS 25 // in percent, 50% brightness is plenty for this LED
+#endif // FEATURE_SML
+
+#ifdef LORA_TEST_TX
+// Pause between transmited packets in seconds.
+// Set to zero to only transmit a packet when pressing the user button
+// Will not exceed 1% duty cycle, even if you set a lower value.
+#define PAUSE               10
+#endif // LORA_TEST_TX
+
+// Frequency in MHz. Keep the decimal point to designate float.
+// Check your own rules and regulations to see what is legal where you are.
+#define FREQUENCY           866.3       // for Europe
+// #define FREQUENCY           905.2       // for US
+
+// LoRa bandwidth. Keep the decimal point to designate float.
+// Allowed values are 7.8, 10.4, 15.6, 20.8, 31.25, 41.7, 62.5, 125.0, 250.0 and 500.0 kHz.
+#define BANDWIDTH           250.0
+
+// Number from 5 to 12. Higher means slower but higher "processor gain",
+// meaning (in nutshell) longer range and more robust against interference.
+#define SPREADING_FACTOR    9
+
+// Transmit power in dBm. 0 dBm = 1 mW, enough for tabletop-testing. This value can be
+// set anywhere between -9 dBm (0.125 mW) to 22 dBm (158 mW). Note that the maximum ERP
+// (which is what your antenna maximally radiates) on the EU ISM band is 25 mW, and that
+// transmissting without an antenna can damage your hardware.
+// 25mW = 14dBm
+#define MAX_TX_POWER        14
+#define ANTENNA_GAIN        5
+#define TRANSMIT_POWER      (MAX_TX_POWER - ANTENNA_GAIN)
+
+#define RADIOLIB_xy(action) \
+    debug.print(#action); \
+    debug.print(" = "); \
+    debug.print(state); \
+    debug.print(" ("); \
+    debug.print(radiolib_result_string(state)); \
+    debug.println(")");
+
+#define RADIOLIB_CHECK(action) do { \
+    int state = action; \
+    if (state != RADIOLIB_ERR_NONE) { \
+        RADIOLIB_xy(action); \
+        success = false; \
+    } \
+} while (false);
+
+static unsigned long last_bat_time = 0;
+static bool use_lora = true;
+static unsigned long last_tx = 0, counter = 0, tx_time = 0, minimum_pause = 0;
+static volatile bool rx_flag = false;
+
+void lora_oled_init(void) {
+    heltec_setup();
+}
+
+void lora_oled_print(String s) {
+    display.print(s);
+}
+
+static void print_bat(void) {
+    float vbat = heltec_vbat();
+    debug.printf("Vbat: %.2fV (%d%%)\n", vbat, heltec_battery_percent(vbat));
+}
+
+static void lora_rx(void) {
+    rx_flag = true;
+}
+
+void lora_init(void) {
+    print_bat();
+
+    bool success = true;
+
+    RADIOLIB_CHECK(radio.begin());
+    if (!success) {
+        use_lora = false;
+        return;
+    }
+
+    radio.setDio1Action(lora_rx);
+
+    debug.printf("Frequency: %.2f MHz\n", FREQUENCY);
+    RADIOLIB_CHECK(radio.setFrequency(FREQUENCY));
+    if (!success) {
+        use_lora = false;
+        return;
+    }
+
+    debug.printf("Bandwidth: %.1f kHz\n", BANDWIDTH);
+    RADIOLIB_CHECK(radio.setBandwidth(BANDWIDTH));
+    if (!success) {
+        use_lora = false;
+        return;
+    }
+
+    debug.printf("Spreading Factor: %i\n", SPREADING_FACTOR);
+    RADIOLIB_CHECK(radio.setSpreadingFactor(SPREADING_FACTOR));
+    if (!success) {
+        use_lora = false;
+        return;
+    }
+
+    debug.printf("TX power: %i dBm\n", TRANSMIT_POWER);
+    RADIOLIB_CHECK(radio.setOutputPower(TRANSMIT_POWER));
+    if (!success) {
+        use_lora = false;
+        return;
+    }
+
+    // Start receiving
+    RADIOLIB_CHECK(radio.startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF));
+    if (!success) {
+        use_lora = false;
+        return;
+    }
+
+    // turn on Ve external 3.3V to power Smart Meter reader
+    heltec_ve(true);
+}
+
+static void lora_tx(String data) {
+    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;
+    }
+
+    debug.printf("TX [%s] ", String(counter).c_str());
+    radio.clearDio1Action();
+
+    heltec_led(LORA_LED_BRIGHTNESS);
+
+    bool success = true;
+    tx_time = millis();
+    RADIOLIB_CHECK(radio.transmit(data));
+    tx_time = millis() - tx_time;
+
+    heltec_led(0);
+
+    if (success) {
+        debug.printf("OK (%i ms)\n", (int)tx_time);
+    } else {
+        debug.println("fail");
+    }
+
+    // Maximum 1% duty cycle
+    minimum_pause = tx_time * 100;
+    last_tx = millis();
+
+    radio.setDio1Action(lora_rx);
+
+    success = true;
+    RADIOLIB_CHECK(radio.startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF));
+    if (!success) {
+        use_lora = false;
+    }
+}
+
+#ifdef FEATURE_SML
+void lora_sml_send(double SumWh, double T1Wh, double T2Wh,
+                   double SumW, double L1W, double L2W, double L3W) {
+
+}
+#endif // FEATURE_SML
+
+void lora_run(void) {
+    heltec_loop();
+
+#ifdef OLED_BAT_INTERVAL
+    unsigned long time = millis();
+    if ((time - last_bat_time) >= OLED_BAT_INTERVAL) {
+        last_bat_time = time;
+        print_bat();
+    }
+#endif
+
+    if (!use_lora) {
+        return;
+    }
+
+    // If a packet was received, display it and the RSSI and SNR
+    if (rx_flag) {
+        rx_flag = false;
+
+        bool success = true;
+        String data;
+        RADIOLIB_CHECK(radio.readData(data));
+        if (success) {
+            debug.printf("RX [%i]\n", data.length());
+            debug.printf("  RSSI: %.2f dBm\n", radio.getRSSI());
+            debug.printf("  SNR: %.2f dB\n", radio.getSNR());
+        }
+
+        success = true;
+        RADIOLIB_CHECK(radio.startReceive(RADIOLIB_SX126X_RX_TIMEOUT_INF));
+        if (!success) {
+            use_lora = false;
+            return;
+        }
+    }
+
+#ifdef LORA_TEST_TX
+    // Transmit a packet every PAUSE seconds or when the button is pressed
+    bool tx_legal = millis() > last_tx + minimum_pause;
+    if ((PAUSE && tx_legal && millis() - last_tx > (PAUSE * 1000)) || button.isSingleClick()) {
+        // In case of button click, tell user to wait
+        if (!tx_legal) {
+            debug.printf("Legal limit, wait %i sec.\n", (int)((minimum_pause - (millis() - last_tx)) / 1000) + 1);
+            return;
+        }
+
+        lora_tx(String(counter++).c_str());
+    }
+#endif // LORA_TEST_TX
+}
+
+#endif // FEATURE_LORA

src/main.cpp

@@ -33,6 +33,8 @@
 #include "html.h"
 #include "servers.h"
 #include "ui.h"
+#include "lora.h"
+#include "smart_meter.h"
 
 unsigned long last_led_blink_time = 0;
 
@@ -57,6 +59,10 @@ void setup() {
 
     Serial.begin(115200);
 
+#ifdef FEATURE_LORA
+    lora_oled_init();
+#endif // FEATURE_LORA
+
     debug.println(F("Initializing..."));
 
     // Blink LED for init
@@ -91,6 +97,18 @@ void setup() {
     debug.println(F("Sensors"));
     initSensors();
 
+#ifdef FEATURE_LORA
+    debug.println(F("LoRa"));
+    lora_init();
+#endif // FEATURE_LORA
+
+#ifdef FEATURE_SML
+    debug.println(F("SML"));
+    sml_init();
+#endif // FEATURE_SML
+
+#ifndef FEATURE_DISABLE_WIFI
+
     // Build hostname string
     String hostname = SENSOR_HOSTNAME_PREFIX;
     hostname += SENSOR_ID;
@@ -196,7 +214,7 @@ void setup() {
     ui_progress(UI_WIFI_CONNECTED);
 #endif // FEATURE_UI
 
-#endif
+#endif // ARCH
 
     debug.println(F("Seeding"));
     randomSeed(micros());
@@ -210,6 +228,8 @@ void setup() {
     debug.println(F("Servers"));
     initServers(hostname);
 
+#endif // FEATURE_DISABLE_WIFI
+
     debug.println(F("Ready! Starting..."));
 
 #ifdef FEATURE_UI
@@ -219,15 +239,26 @@ void setup() {
 }
 
 void loop() {
-    runServers();
     runSensors();
+
+#ifdef FEATURE_SML
+    sml_run();
+#endif // FEATURE_SML
+
+#ifndef FEATURE_DISABLE_WIFI
+    runServers();
     runMQTT();
     runInflux();
+#endif // FEATURE_DISABLE_WIFI
 
 #ifdef FEATURE_UI
     ui_run();
 #endif
 
+#ifdef FEATURE_LORA
+    lora_run();
+#endif // FEATURE_LORA
+
     // blink heartbeat LED
     unsigned long time = millis();
     if ((time - last_led_blink_time) >= LED_BLINK_INTERVAL) {

src/mqtt.cpp

@@ -178,6 +178,10 @@ static void mqttCallback(char* topic, byte* payload, unsigned int length) {
         ui_status.light_sink = state ? true : false;
         prev_status.light_sink = ui_status.light_sink;
         ui_progress(UI_UPDATE);
+    } else if (ts == "livingroom/displays/cmnd/POWER") {
+        ui_status.pc_displays = state ? true : false;
+        prev_status.pc_displays = ui_status.pc_displays;
+        ui_progress(UI_UPDATE);
     }
 #endif // FEATURE_UI
 
@@ -252,6 +256,7 @@ static void mqttReconnect() {
         mqtt.subscribe("livingroom/amp/cmnd/POWER");
         mqtt.subscribe("bathroom/force_light");
         mqtt.subscribe("livingroom/light_sink/cmnd/POWER");
+        mqtt.subscribe("livingroom/displays/cmnd/POWER");
 #endif // FEATURE_UI
     }
 }
@@ -329,6 +334,9 @@ void writeMQTT_UI(void) {
     if (curr_status.light_sink != prev_status.light_sink) {
         mqttPublish("livingroom/light_sink/cmnd/POWER", curr_status.light_sink ? "on" : "off", true);
     }
+    if (curr_status.pc_displays != prev_status.pc_displays) {
+        mqttPublish("livingroom/displays/cmnd/POWER", curr_status.pc_displays ? "on" : "off", true);
+    }
 
     prev_status = curr_status;
 }

src/smart_meter.cpp

@@ -0,0 +1,141 @@
+/*
+ * smart_meter.cpp
+ *
+ * ESP8266 / ESP32 Environmental Sensor
+ *
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <xythobuz@xythobuz.de> wrote this file.  As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and you
+ * think this stuff is worth it, you can buy me a beer in return.   Thomas Buck
+ * ----------------------------------------------------------------------------
+ */
+
+#ifdef FEATURE_SML
+
+#include <Arduino.h>
+#include <sml.h>
+#include <SoftwareSerial.h>
+
+#include "config.h"
+#include "DebugLog.h"
+#include "lora.h"
+#include "smart_meter.h"
+
+#define SML_TX 47
+#define SML_RX 48
+
+static EspSoftwareSerial::UART port1, port2;
+
+static double SumWh = NAN, T1Wh = NAN, T2Wh = NAN;
+static double SumW = NAN, L1W = NAN, L2W = NAN, L3W = NAN;
+
+static void EnergySum(void) {
+    smlOBISWh(SumWh);
+}
+
+static void EnergyT1(void) {
+    smlOBISWh(T1Wh);
+}
+
+static void EnergyT2(void) {
+    smlOBISWh(T2Wh);
+}
+
+static void PowerSum(void) {
+    smlOBISW(SumW);
+}
+
+static void PowerL1(void) {
+    smlOBISW(L1W);
+}
+
+static void PowerL2(void) {
+    smlOBISW(L2W);
+}
+
+static void PowerL3(void) {
+    smlOBISW(L3W);
+}
+
+static void init_vars(void) {
+    SumWh = NAN;
+    T1Wh = NAN;
+    T2Wh = NAN;
+    SumW = NAN;
+    L1W = NAN;
+    L2W = NAN;
+    L3W = NAN;
+}
+
+typedef struct {
+    const unsigned char OBIS[6];
+    void (*Handler)();
+} OBISHandler;
+
+static OBISHandler handlers[] = {
+    { { 1, 0,  1, 8, 0, 255 }, EnergySum }, // 1-0: 1.8.0*255 (T1 + T2) Wh
+    { { 1, 0,  1, 8, 1, 255 }, EnergyT1 },  // 1-0: 1.8.1*255 (T1) Wh
+    { { 1, 0,  1, 8, 2, 255 }, EnergyT2 },  // 1-0: 1.8.2*255 (T2) Wh
+    { { 1, 0, 16, 7, 0, 255 }, PowerSum },  // 1-0:16.7.0*255 (L1 + L2 + L3) W
+    { { 1, 0, 21, 7, 0, 255 }, PowerL1 },   // 1-0:21.7.0*255 (L1) W
+    { { 1, 0, 41, 7, 0, 255 }, PowerL2 },   // 1-0:41.7.0*255 (L2) W
+    { { 1, 0, 61, 7, 0, 255 }, PowerL3 },   // 1-0:61.7.0*255 (L3) W
+};
+
+void sml_init(void) {
+    init_vars();
+
+    port1.begin(9600, SWSERIAL_8N1, SML_RX, -1, false);
+    port2.begin(9600, SWSERIAL_8N1, SML_TX, -1, false);
+}
+
+void sml_run(void) {
+    if ((!port1.available()) && (!port2.available())) {
+        return;
+    }
+
+    unsigned char c = port1.available() ? port1.read() : port2.read();
+    sml_states_t s = smlState(c);
+
+    if (s == SML_START) {
+        init_vars();
+    } else if (s == SML_LISTEND) {
+        for (unsigned int i = 0; i < (sizeof(handlers) / sizeof(handlers[0])); i++) {
+            if (smlOBISCheck(handlers[i].OBIS)) {
+                handlers[i].Handler();
+            }
+        }
+    } else if (s == SML_FINAL) {
+        debug.println("SML Reading:");
+
+        if (!isnan(SumWh))
+            debug.printf("Sum: %14.3lf Wh\n", SumWh);
+
+        if (!isnan(T1Wh))
+            debug.printf(" T1: %14.3lf Wh\n", T1Wh);
+
+        if (!isnan(T2Wh))
+            debug.printf(" T2: %14.3lf Wh\n", T2Wh);
+
+        if (!isnan(SumW))
+            debug.printf("Sum: %14.3lf W\n", SumW);
+
+        if (!isnan(L1W))
+            debug.printf(" L1: %14.3lf W\n", L1W);
+
+        if (!isnan(L2W))
+            debug.printf(" L2: %14.3lf W\n", L2W);
+
+        if (!isnan(L3W))
+            debug.printf(" L3: %14.3lf W\n", L3W);
+
+        debug.println();
+
+#ifdef FEATURE_LORA
+        lora_sml_send(SumWh, T1Wh, T2Wh, SumW, L1W, L2W, L3W);
+#endif // FEATURE_LORA
+    }
+}
+
+#endif // FEATURE_SML

src/ui.cpp

@@ -154,7 +154,7 @@ static void draw_livingroom1(void) {
     // 5
     bool on = ui_status.light_corner || ui_status.light_sink || ui_status.light_workspace
             || ui_status.light_amp || ui_status.light_bench || ui_status.light_box
-            || ui_status.light_kitchen || ui_status.light_pc;
+            || ui_status.light_kitchen || ui_status.light_pc || ui_status.pc_displays;
     draw_button(on ? "All Lights Off" : "Wake Up Lights",
                 BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
                 BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
@@ -206,6 +206,13 @@ static void draw_bathroom(void) {
                 BTNS_OFF_Y + BTN_H / 2 + BTN_H + BTN_GAP,
                 ui_status.bathroom_lights == BATH_LIGHT_BIG ? TFT_GREEN : TFT_RED);
 
+    // 3
+    // TODO own page?
+    draw_button("PC Displays",
+                BTNS_OFF_X + BTN_W / 2,
+                BTNS_OFF_Y + BTN_H / 2 + (BTN_H + BTN_GAP) * 2,
+                ui_status.pc_displays ? TFT_GREEN : TFT_RED);
+
     // 4
     draw_button("Bath Lights Off",
                 BTNS_OFF_X + BTN_W / 2 + BTN_W + BTN_GAP,
@@ -585,6 +592,8 @@ void ui_run(void) {
                 INVERT_BOOL(ui_status.light_sink);
             } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_kitchen);
+            } else if (ui_page == UI_BATHROOM) {
+                INVERT_BOOL(ui_status.pc_displays);
             }
             writeMQTT_UI();
         } else if ((p.x >= BTNS_OFF_X + BTN_W + BTN_GAP) && (p.x <= BTNS_OFF_X + BTN_W + BTN_GAP + BTN_W) && (p.y >= BTNS_OFF_Y) && (p.y <= BTNS_OFF_Y + BTN_H)) {
@@ -602,7 +611,7 @@ void ui_run(void) {
             if (ui_page == UI_LIVINGROOM1) {
                 bool on = ui_status.light_corner || ui_status.light_sink || ui_status.light_workspace
                         || ui_status.light_amp || ui_status.light_bench || ui_status.light_box
-                        || ui_status.light_kitchen || ui_status.light_pc;
+                        || ui_status.light_kitchen || ui_status.light_pc || ui_status.pc_displays;
                 if (on) {
                     ui_status.light_amp = false;
                     ui_status.light_kitchen = false;
@@ -612,9 +621,11 @@ void ui_run(void) {
                     ui_status.light_corner = false;
                     ui_status.light_box = false;
                     ui_status.light_sink = false;
+                    ui_status.pc_displays = false;
                 } else {
                     ui_status.light_corner = true;
                     ui_status.light_sink = true;
+                    ui_status.pc_displays = true;
                 }
             } else if (ui_page == UI_LIVINGROOM2) {
                 INVERT_BOOL(ui_status.light_box);