Merge branch 'main' into improve/mqtt

src/CHANGES.md

@@ -1,34 +1,15 @@
-# Development Changes
+Changelog v0.6.9
-
+
-## 0.6.7 - 2023-04-13
+* improved MqTT
-* merge PR #883, improved store of settings and javascript, thx @tastendruecker123
+* fix WiFi hostname during boot up
-* support `.` and `,` as floating point seperator in setup #881
+* improved login: only one session at the same time is possible
-
+* fix UI: login screen for small displays; burger menu height; small modifications for import button (in setup)
-## 0.6.6 - 2023-04-12
+* improved WiFi reconnect
-* increased distance for `import` button in mobile view #879
+* optimized performance: browser caching was improved to reduce requests from ESP
-* changed `led_high_active` to `bool` #879
+* improved NRF24 communication for more stable data transmission
-
+* added / fixed MqTT subscription `ctrl/power/[IV-ID]`
-## 0.6.5 - 2023-04-11
+* improved save settings
-* fix #845 MqTT subscription for `ctrl/power/[IV-ID]` was missing
+* improved UI in setup: now `.` and `,` are allowed as floating point seperator
-* merge PR #876, check JSON settings during read for existance
+* fix zero yield day functionality
-* **NOTE:** incompatible change: renamed `led_high_active` to `act_high`, maybe setting must be changed after update
+* LEDs are now configurable to show if 1st inverter is available and if MqTT is connected
-* merge PR #861 do not send channel metric if channel is disabled
+* LED are configurable to active high or low
-
-## 0.6.4 - 2023-04-06
-* merge PR #846, improved NRF24 communication and MI, thx @beegee3 & @rejoe2
-* merge PR #859, fix burger menu height, thx @ThomasPohl
-
-## 0.6.3 - 2023-04-04
-* fix login, password length was not checked #852
-* merge PR #854 optimize browser caching, thx @tastendruecker123 #828
-* fix WiFi reconnect not working #851
-* updated issue templates #822
-
-## 0.6.2 - 2023-04-04
-* fix login from multiple clients #819
-* fix login screen on small displays
-
-## 0.6.1 - 2023-04-01
-* merge LED fix - LED1 shows MqTT state, LED configureable active high/low #839
-* only publish new inverter data #826
-* potential fix of WiFi hostname during boot up #752

src/defines.h

@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       6
-#define VERSION_PATCH       7
+#define VERSION_PATCH       9
 
 //-------------------------------------
 typedef struct {

src/hm/hmPayload.h

@@ -74,8 +74,8 @@ class HmPayload {
             DPRINTLN(DBG_DEBUG, F("zeroYieldDay"));
             record_t<> *rec = iv->getRecordStruct(RealTimeRunData_Debug);
             uint8_t pos;
-            for(uint8_t ch = 0; ch < iv->channels; ch++) {
+            for(uint8_t ch = 0; ch <= iv->channels; ch++) {
-                pos = iv->getPosByChFld(CH0, FLD_YD, rec);
+                pos = iv->getPosByChFld(ch, FLD_YD, rec);
                 iv->setValue(pos, rec, 0.0f);
             }
         }

src/platformio.ini

@@ -16,17 +16,6 @@ include_dir = .
 framework = arduino
 board_build.filesystem = littlefs
 upload_speed = 921600
-
-;build_flags =
-; ;;;;; Possible Debug options ;;;;;;
-; https://docs.platformio.org/en/latest/platforms/espressif8266.html#debug-level
-    ;-DDEBUG_ESP_PORT=Serial
-    ;-DDEBUG_ESP_CORE
-    ;-DDEBUG_ESP_WIFI
-    ;-DDEBUG_ESP_HTTP_CLIENT
-    ;-DDEBUG_ESP_HTTP_SERVER
-    ;-DDEBUG_ESP_OOM
-
 monitor_speed = 115200
 
 extra_scripts =
@@ -38,9 +27,9 @@ lib_deps =
     nrf24/RF24 @ ^1.4.5
     paulstoffregen/Time @ ^1.6.1
     https://github.com/bertmelis/espMqttClient#v1.4.2
-    bblanchon/ArduinoJson @ ^6.21.0
+    bblanchon/ArduinoJson @ ^6.21.2
     https://github.com/JChristensen/Timezone @ ^1.2.4
-    olikraus/U8g2 @ ^2.34.16
+    olikraus/U8g2 @ ^2.34.17
     zinggjm/GxEPD2 @ ^1.5.0
 
 
@@ -95,7 +84,13 @@ platform = espressif8266
 board = esp8285
 board_build.ldscript = eagle.flash.1m64.ld
 board_build.f_cpu = 80000000L
-build_flags = -DDEBUG_LEVEL=DBG_DEBUG -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_OOM -DDEBUG_ESP_PORT=Serial
+build_flags = -DDEBUG_LEVEL=DBG_DEBUG
+    -DDEBUG_ESP_CORE
+    -DDEBUG_ESP_WIFI
+    -DDEBUG_ESP_HTTP_CLIENT
+    -DDEBUG_ESP_HTTP_SERVER
+    -DDEBUG_ESP_OOM
+    -DDEBUG_ESP_PORT=Serial
 build_type = debug
 monitor_filters =
     ;default   ; Remove typical terminal control codes from input
@@ -103,7 +98,7 @@ monitor_filters =
     log2file  ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory
 
 [env:esp32-wroom32-release]
-platform = espressif32
+platform = espressif32@>=6.1.0
 board = lolin_d32
 build_flags = -D RELEASE -std=gnu++14
 build_unflags = -std=gnu++11
@@ -114,9 +109,11 @@ monitor_filters =
     esp32_exception_decoder
 
 [env:esp32-wroom32-release-prometheus]
-platform = espressif32
+platform = espressif32@>=6.1.0
 board = lolin_d32
-build_flags = -D RELEASE -std=gnu++14 -DENABLE_PROMETHEUS_EP
+build_flags = -D RELEASE
+    -std=gnu++14
+    -DENABLE_PROMETHEUS_EP
 build_unflags = -std=gnu++11
 monitor_filters =
     ;default   ; Remove typical terminal control codes from input
@@ -125,9 +122,16 @@ monitor_filters =
     esp32_exception_decoder
 
 [env:esp32-wroom32-debug]
-platform = espressif32
+platform = espressif32@>=6.1.0
 board = lolin_d32
-build_flags = -DDEBUG_LEVEL=DBG_DEBUG -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_OOM -DDEBUG_ESP_PORT=Serial -std=gnu++14
+build_flags = -DDEBUG_LEVEL=DBG_DEBUG
+    -DDEBUG_ESP_CORE
+    -DDEBUG_ESP_WIFI
+    -DDEBUG_ESP_HTTP_CLIENT
+    -DDEBUG_ESP_HTTP_SERVER
+    -DDEBUG_ESP_OOM
+    -DDEBUG_ESP_PORT=Serial
+    -std=gnu++14
 build_unflags = -std=gnu++11
 build_type = debug
 monitor_filters =
@@ -136,7 +140,7 @@ monitor_filters =
     log2file  ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory
 
 [env:opendtufusionv1-release]
-platform = espressif32
+platform = espressif32@>=6.1.0
 board = esp32-s3-devkitc-1
 upload_protocol = esp-builtin
 upload_speed = 115200