golive for 3.3.4.

.github/scripts/createManifest.py

@@ -124,7 +124,7 @@
             if os.path.isfile(os.path.join(args.binarypath, "littlefs.bin")):
                 files_data["parts"].append({
                     "path": f"https://tobiasfaust.github.io/{args.repository}/firmware/{SubDir}/{FIRMWARENAME}/littlefs.{FileExtension}.bin",
-                    "offset": int(readOffsetFromPartitionCSV("partitions.csv", "spiffs"), 16),
+                    "offset": int(readOffsetFromPartitionCSV("partitions.csv", "webdata"), 16),
                     "filetype": "filesystem"
                 })
 

.github/scripts/createMergedFirmware.py

@@ -9,7 +9,7 @@
     -b, --BuildDir (str): The build directory containing the built firmware binaries. Required.
     -p, --PathOfPartitionsCSV (str): The path to the partitions.csv file. Default is 'partitions.csv'. Required.
 Functions:
-    readOffsetFromPartitionCSV(path: str, name: str) -> int:
+    readOffsetFromPartitionCSV(path: str, partitionLabel: str) -> int:
         Args:
         Returns:
 Example:
@@ -31,31 +31,46 @@
 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:
-        result = f'esptool.py --chip {args.ChipFamily} merge_bin \
+        bootloader_offset = bootloader_offsets[args.ChipFamily]
+
+        result = f'esptool --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 \
+            --flash-mode dout \
+            --flash-freq 80m \
+            --flash-size 4MB \
+            {bootloader_offset} {args.BuildDir}/bootloader.bin \
             0x8000 {args.BuildDir}/partitions.bin \
             {readOffsetFromPartitionCSV("partitions.csv", "app0")} {args.BuildDir}/firmware.bin'
 
         if os.path.isfile(f'{args.BuildDir}/littlefs.bin'):
-            result += f' {readOffsetFromPartitionCSV("partitions.csv", "spiffs")} {args.BuildDir}/littlefs.bin'
+            result += f' {readOffsetFromPartitionCSV("partitions.csv", "webdata")} {args.BuildDir}/littlefs.bin'
 
     elif 'ESP8266' in args.ChipFamily and os.path.isfile(f'{args.BuildDir}/littlefs.bin'):
-        result = f'esptool.py --chip {args.ChipFamily} merge_bin \
+        result = f'esptool --chip {args.ChipFamily} merge-bin \
             --output {args.BuildDir}/merged-firmware.bin \
-            --flash_mode dout \
-            --flash_freq 40m \
-            --flash_size 4MB \
+            --flash-mode dout \
+            --flash-freq 40m \
+            --flash-size 4MB \
             0x0000 {args.BuildDir}/firmware.bin \
-            {readOffsetFromPartitionCSV("partitions.csv", "spiffs")} {args.BuildDir}/littlefs.bin'
+            {readOffsetFromPartitionCSV("partitions.csv", "webdata")} {args.BuildDir}/littlefs.bin'
 
 print(f'command={result}')

.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
 
@@ -358,18 +358,18 @@ def changeURL(root: str, url: str) -> None:
                 except Exception as e:
                     logging.error(f"Fehler beim Verarbeiten der Datei {manifest_path}: {e}")
 
-def readOffsetFromPartitionCSV(path: str, name: str) -> int:
+def readOffsetFromPartitionCSV(path: str, partitionLabel: str) -> int:
     """
-    Reads a CSV file and calculates the offset for a given name.
+    Reads a CSV file and calculates the offset for a given partition label.
     This function reads the specified CSV file with a delimiter of ','.
     It fills in the Offset column if it is empty by adding the previous offset
     and the value from the Size column of the previous row. It returns the calculated
-    offset from the row where the value in the first column matches the given name as a hexadecimal number.
+    offset from the row where the value in the first column matches the given partition label as a hexadecimal number.
     If the file does not exist or cannot be read, it returns None.
 
     <b>Args:</b>
         path (str): The path to the CSV file.
-        name (str): The name to search for in the first column.
+        partitionLabel (str): The partition label to search for in the first column.
 
     <b>Returns:</b>
         int: The calculated offset as a hexadecimal number, or None if the file cannot be read.
@@ -379,7 +379,7 @@ def readOffsetFromPartitionCSV(path: str, name: str) -> int:
         with open(path, 'r') as file:
             lines = file.readlines()
             headers = lines[0].strip().split(',')
-            name_index = 0
+            partition_label_index = 0
             offset_index = 3
             size_index = 4
 
@@ -391,7 +391,7 @@ def readOffsetFromPartitionCSV(path: str, name: str) -> int:
                     columns[offset_index] = str(previous_offset + previous_size)
                 previous_size = int(columns[size_index], 0)
                 previous_offset = int(columns[offset_index], 0)
-                if columns[name_index] == name:
+                if columns[partition_label_index] == partitionLabel:
                     return hex(previous_offset)
     except (FileNotFoundError, IndexError, ValueError):
         return None

.github/workflows/BuildAndDeploy.yml

@@ -17,6 +17,10 @@ on:
       - '**.yml'
       - '**.sh'
       - '**.py'
+      - '**.json'
+      - '**.js'
+      - '**.css'
+      - '**.html'
 
 jobs:
   build:
@@ -46,9 +50,6 @@ jobs:
           - firmware: firmware_ESP32-C3
             architecture: ESP32-C3
             subvariant: standard
-          - firmware: firmware_ESP32-WebSerial
-            architecture: ESP32
-            subvariant: webSerial 
 
     steps:
       - name: checkout repository
@@ -250,7 +251,7 @@ jobs:
                   continue
                 fi
                 echo "Uploading $file"
-                gh release upload -R tobiasfaust/${{ env.GITHUB_REPOSITORY }} ${{ steps.set_env_var.outputs.tagname }} "$file" --clobber
+                gh release upload -R ${{env.GITHUB_OWNER}}/${{ env.GITHUB_REPOSITORY }} ${{ steps.set_env_var.outputs.tagname }} "$file" --clobber
               fi
             done
           done
@@ -263,18 +264,18 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           mkdir -p manifests
-          tagNames=$(gh release ls -R tobiasfaust/${{ env.GITHUB_REPOSITORY }} --json tagName)
+          tagNames=$(gh release ls -R ${{env.GITHUB_OWNER}}/${{ env.GITHUB_REPOSITORY }} --json tagName)
 
           for tag in $(echo "$tagNames" | jq -r '.[].tagName'); do
-            for asset in $(gh release view $tag -R tobiasfaust/${{ env.GITHUB_REPOSITORY }} --json assets --jq '.assets[].name' | grep -E 'manifestAll|filesAll'); do
-              echo "Downloading file: gh release download $tag -R tobiasfaust/${{ env.GITHUB_REPOSITORY }} --pattern '$asset' --dir 'manifests/${tag}/'"
+            for asset in $(gh release view $tag -R ${{env.GITHUB_OWNER}}/${{ env.GITHUB_REPOSITORY }} --json assets --jq '.assets[].name' | grep -E 'manifestAll|filesAll'); do
+              echo "Downloading file: gh release download $tag -R ${{env.GITHUB_OWNER}}/${{ env.GITHUB_REPOSITORY }} --pattern '$asset' --dir 'manifests/${tag}/'"
               gh release download $tag \
-                -R tobiasfaust/${{ env.GITHUB_REPOSITORY }} \
+                -R ${{env.GITHUB_OWNER}}/${{ env.GITHUB_REPOSITORY }} \
                 --pattern "$asset" \
                 --dir "manifests/${tag}/" || true
             done
             mkdir -p manifests/${tag}/
-            gh release view $tag -R tobiasfaust/${{ env.GITHUB_REPOSITORY }} --json assets > "manifests/${tag}/assets.json"
+            gh release view $tag -R ${{env.GITHUB_OWNER}}/${{ env.GITHUB_REPOSITORY }} --json assets > "manifests/${tag}/assets.json"
           done 
           python app/.github/scripts/createReleaseVersions.py \
             --ManifestDir manifests \

.gitignore

@@ -1,3 +1,5 @@
 .pio/
 .vscode/
 .git/
+data/web/handlefiles*
+data/web/webserial*

CPPLINT.cfg

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

ChangeLog.md

@@ -1,9 +1,35 @@
+Release 3.4.0:
+    +++++++ This version is not OTA compatible with older versions +++++++
+    +++++++ Please do a fresh installation by web-installer +++++++
+  - add python.env file with HTML_DIR variable
+  - splitting LittleFS partitions: Separating system files (web UI, static assets) and user configuration/data (settings, user uploads) into distinct partitions (sysFS/configFS) improves reliability, allows safe firmware updates without overwriting user data, and enables easier backup/restore of user settings independently from system files.
+  - feature: add new webserial log monitor page for all variants
+  - fix broken ethernet connection handling by adding global gpio handling
+
+Release 3.3.4:
+  - Change default pins for ESP32-C3 (#149), thanks to @NHellFire
+  - remove deprecated backup functionality  from Elegant-OTA
+
+Release 3.3.3:
+  - improve logging functionality methods
+  - fixing some bugs
+  - updated Solax-X3 json (thanks to @Lazgar)
+
+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)