Release 3.3.2 (#132)

* update ElegantOTA, fix custom firmware upload

* Update modbus.cpp

* ID Daten per MQTT

* Create Solax-X3-PRO.json

* Update Solax-X3.json

* fix null-termination of string handling  (#96)

* some additional infos per mqtt with debuglevel > 4

some additional infos per mqtt with debuglevel > 4
- memory in kB
- uptime in sec
- wifi ssid

* Update mqtt.cpp

* Update mqtt.cpp

* Update modbus.cpp

* support for OpenWB 2.0 Api (#100)

* update

* remove unused buffer and improve clarity

* Update modbus.cpp

* minor fixes

* add optional WIFISSID/WIFIPASSWORD

* change ESP32-S2 board

* adjust openWB topics

* fix

* priorize requesting ID Data higher than LiveData (#76)

* update WiFi credentials in platformio.ini to use fixed values

* some fixes

* Update modbus.cpp

* Update modbus.cpp

* delete unnecessary newlines, fix serial-pins

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* use checkbox for selection instead of radiobuttons

* Revert "use checkbox for selection instead of radiobuttons"

This reverts commit 04f39f9.

* prevent watchdog timer event

* update

* Update modbus.cpp

* add TotalEnergyPV for GroWatt (#100)

* bugfix: fix esp crash for /getitems if using an huge register table (#76)

* use internal logging method

* fix register id definition (#113)

* remove unnecessary webserver in mqtt class

* remove unnecessary webserver in mqtt class

* handle out-of-range crash (#96 #113)

* correct unit from kVarh to kWh in Deye_SUN_SG04LP3.json

* add bitwise mappings

* datatype "binary" now available for json register definitions (PR #115)

* fix openwb topic (#114)

* fix array access direction for datatype binary (PR #115)

* fix: 1 item less than map size, because last item is default value

* fix: resolve CORS issue when downloading a stable release

* fix: update button elements for actions and add confirmation dialogs (Sicherheitsabfrage beim Reset #120)

* add confirmation dialog for ESP reset or Wifi-Reset (#120)

* feature: add confirmation dialog for file deletion

* Enhance WebSocket and JSON handling with new features (#126)

* Visualisierung der Settopics (#127)

* Visualisierung der Settopics (#124)

* Update modbusitemconfig.html

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.h

* Update modbus.h

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.h

* Update modbus.h

* Update modbus.h

* Update modbus.cpp

* Update modbus.cpp

* Update MyWebServer.cpp

* Update MyWebServer.h

* Update modbus.cpp

* Update modbus.h

* Update modbus.h

* Update MyWebServer.cpp

* Update MyWebServer.cpp

* Update MyWebServer.cpp

* Update MyWebServer.cpp

* Update MyWebServer.cpp

* Update modbusitemconfig.js

* Update modbusitemconfig.js

* Update MyWebServer.cpp

* Update modbus.cpp

* Update modbus.h

* Update modbus.h

* Update modbusitemconfig.html

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbusitemconfig.html

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.cpp

* Update modbus.h

* Update modbus.cpp

* Update modbus.h

* Update modbusitemconfig.html

* update

* refactor: initialize subscription fields with default values and clean up comments

* refactor: remove unnecessary headers from handleGetSetterJson response

* fix per cpplint

* fix: update WebSocket connection to use dynamic origin

* change setter handling to regfile

* refactor: update setter handling and improve JSON response structure

* fix: debugmode with Solax-X1 data, fix SetActiveStatus handling

* refactor: change Setters type to setter_t and tidy up code

* add setter info-box, remove /getregister, add setter mapping info to WebUI

* refactor: update info descriptions in Solax-X1 JSON and clean up unused server routes

---------

Co-authored-by: Lazgar <[email protected]>

* add "newUpdate available" info in WebUI header (#129)

* Update Solax-X3.json (#128)

* fix: correct update availability message in WebUI

* refactor: update subscription field to MQTT topic and enhance tooltip handling

* fix: normalize case for mapped values in modbus mapping function

* Correct bootloader offsets as not all ESP32 variants use 0x1000 (#130)

* add toggle buttons at ModbusItems WebUI to change all items at once (#96)

* add Growatt-SPH-V124 register file (thanks to @StefanNouza) (#109)

* add support for additional file types in BuildAndDeploy workflow

* add toggle functionality for Modbus items

* add titles to toggle icons for better accessibility in Modbus item configuration

---------

Co-authored-by: Lazgar <[email protected]>
Co-authored-by: Naomi Rennie-Waldock <[email protected]>

.github/scripts/createMergedFirmware.py

@@ -31,18 +31,33 @@
 args = parser.parse_args()
 result = None
 
+# Bootloader offsets vary by chip
+bootloader_offsets = {
+    "ESP32": "0x1000",
+    "ESP32-S2": "0x1000",
+    "ESP32-S3": "0x0",
+    "ESP32-C2": "0x0",
+    "ESP32-C3": "0x0",
+    "ESP32-C5": "0x2000",
+    "ESP32-C6": "0x0",
+    "ESP32-H2": "0x0",
+    "ESP32-P4": "0x2000",
+}
+
 if(not os.path.isfile(args.PathOfPartitionsCSV)):
     logging.error(f'File {args.PathOfPartitionsCSV} does not exist')
     exit(1)
 
 if args.BuildDir and os.path.isdir(args.BuildDir):
     if 'ESP32' in args.ChipFamily:
+        bootloader_offset = bootloader_offsets[args.ChipFamily]
+
         result = f'esptool.py --chip {args.ChipFamily} merge_bin \
             --output {args.BuildDir}/merged-firmware.bin \
             --flash_mode dout \
             --flash_freq 80m \
             --flash_size 4MB \
-            0x1000 {args.BuildDir}/bootloader.bin \
+            {bootloader_offset} {args.BuildDir}/bootloader.bin \
             0x8000 {args.BuildDir}/partitions.bin \
             {readOffsetFromPartitionCSV("partitions.csv", "app0")} {args.BuildDir}/firmware.bin'
 

.github/scripts/myUtils.py

@@ -288,7 +288,7 @@ def deleteVersions(root: str, keepVersions: int, json: list = None) -> None:
         # Lade die 'versions.json' Datei
         versions_file = os.path.join(root, 'versions.json')
         json = read_json_file(versions_file)
-        if versions is None:
+        if json is None:
             logging.error(f"Fehler beim Verarbeiten der Datei {versions_file}")
             return
 

.github/workflows/BuildAndDeploy.yml

@@ -17,6 +17,10 @@ on:
       - '**.yml'
       - '**.sh'
       - '**.py'
+      - '**.json'
+      - '**.js'
+      - '**.css'
+      - '**.html'
 
 jobs:
   build:

CPPLINT.cfg

@@ -0,0 +1,3 @@
+linelength=120
+root=src
+filter=-build/include_what_you_use

ChangeLog.md

@@ -1,9 +1,18 @@
+Release 3.3.2:
+  - new feature: add confirmation dialog for ESP reset
+  - migrate from old ajax communication to standard websocket communication
+  - new feature: show set topics in WebUI (thanks to @laszgar)
+  - new feature: add "newUpdate available" info in WebUI header
+  - new feature: add toggle buttons at ModbusItems WebUI to change all items at once (#96)
+  - new Inverter: add Growatt-SPH-V124 register file (thanks to @StefanNouza) (#109)
+
 Release 3.3.1:
   - new Feature: datatype "binary" now available for json register definitions (PR #115)
   - BugFix: fix null-terminationof string handling (#96)
   - new feature: support for OpenWB 2.0 Api (#100)
   - bugfix: fix esp crash for /getitems if using an huge register table (#76)
   - fix CORS Issue when download a stable release
+  - bugfix: fix register id definition (#113)
 
 Release 3.3.0:
   - new feature: WebSerial as remote serial output (#74)