docs: update changelog for version 1.2.81

docs: update webpages for version v1.2.81
refactor: update Gitea and GitHub release workflows to use esp32dev_ota for building and uploading firmware and SPIFFS binaries
2025-02-20 17:11:28 +01:00 · 2025-02-20 17:11:28 +01:00 · 2025-02-20 17:11:22 +01:00 · 2025-02-20 17:05:53 +01:00 · 2025-02-20 17:05:52 +01:00 · 2025-02-20 17:05:47 +01:00
12 changed files with 126 additions and 24 deletions
--- a/.github/workflows/providers/gitea-release.yml
+++ b/.github/workflows/providers/gitea-release.yml
@@ -34,12 +34,14 @@ jobs:
    
    - name: Build Firmware
      run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
+        pio run -e esp32dev_ota            # Build firmware
+        cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin
+        cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin
        
    - name: Prepare binaries
      run: |
-        cd .pio/build/esp32dev
+        cd .pio/build/esp32dev_ota
        
        # Create OTA binary (firmware only)
        cp firmware.bin filaman_ota.bin
@@ -92,8 +94,8 @@ jobs:
          echo "Release created with ID: $RELEASE_ID"
          
          # Upload binaries
-          cd .pio/build/esp32dev
-          for file in filaman_full.bin filaman_ota.bin; do
+          cd .pio/build/esp32dev_ota
+          for file in filaman_full.bin filaman_ota.bin filaman.bin filaman_spiffs.bin; do
            echo "Uploading $file..."
            curl -k -s \
              -X POST \
--- a/.github/workflows/providers/github-release.yml
+++ b/.github/workflows/providers/github-release.yml
@@ -23,12 +23,14 @@ jobs:
    
    - name: Build Firmware
      run: |
-        pio run -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
+        pio run -e esp32dev_ota            # Build firmware
+        cp .pio/build/esp32dev_ota/firmware.bin .pio/build/esp32dev_ota/filaman.bin
+        cp .pio/build/esp32dev_ota/spiffs.bin .pio/build/esp32dev_ota/filaman_spiffs.bin
        
    - name: Prepare binaries
      run: |
-        cd .pio/build/esp32dev
+        cd .pio/build/esp32dev_ota
        
        # Debug: Show all generated files
        echo "Files in build directory:"
@@ -85,5 +87,7 @@ jobs:
        gh release create "${{ github.ref_name }}" \
          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
          --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          .pio/build/esp32dev/filaman_full.bin \
-          .pio/build/esp32dev/filaman_ota.bin
+          .pio/build/esp32dev_ota/filaman_full.bin \
+          .pio/build/esp32dev_ota/filaman_ota.bin \
+          .pio/build/esp32dev_ota/filaman.bin \
+          .pio/build/esp32dev_ota/filaman_spiffs.bin
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog

+## [1.2.81] - 2025-02-20
+### Changed
+- update webpages for version v1.2.81
+- update Gitea and GitHub release workflows to use esp32dev_ota for building and uploading firmware and SPIFFS binaries
+
+
+## [1.2.80] - 2025-02-20
+### Added
+- update Gitea and GitHub release workflows to include new firmware and SPIFFS binaries; fix version display in HTML files to v1.2.78
+
+### Changed
+- update webpages for version v1.2.80
+- bump version to 1.2.79 in platformio.ini
+
+
 ## [1.2.79] - 2025-02-20
 ### Changed
 - update webpages for version v1.2.79
--- a/html/header.html
+++ b/html/header.html
@@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.79</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/index.html
+++ b/html/index.html
@@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.79</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/rfid.html
+++ b/html/rfid.html
@@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.79</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/spoolman.html
+++ b/html/spoolman.html
@@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.79</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/upgrade.html
+++ b/html/upgrade.html
@@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.79</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/waage.html
+++ b/html/waage.html
@@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.79</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/html/wifi.html
+++ b/html/wifi.html
@@ -12,7 +12,7 @@
        <div style="display: flex; align-items: center; gap: 2rem;">
            <img src="/logo.png" alt="FilaMan Logo" class="logo">
            <div class="logo-text">
-                <h1>FilaMan<span class="version">v1.2.79</span></h1>
+                <h1>FilaMan<span class="version">v1.2.81</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/platformio.ini
+++ b/platformio.ini
@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.79"
+version = "1.2.81"

 [env:esp32dev]
 platform = espressif32
@@ -78,6 +78,73 @@ extra_scripts =
 ;targets = buildfs, build

 ; Add a custom target to build both
-[platformio]
-default_envs = esp32dev
+[env:esp32dev_ota]
+platform = espressif32
+board = esp32dev
+framework = arduino
+monitor_speed = 115200
+
+lib_deps =
+    tzapu/WiFiManager @ ^2.0.17
+    https://github.com/me-no-dev/ESPAsyncWebServer.git#master
+    me-no-dev/AsyncTCP @ ^1.1.1
+    bogde/HX711 @ ^0.7.5
+    adafruit/Adafruit SSD1306 @ ^2.5.13
+    adafruit/Adafruit GFX Library @ ^1.11.11
+    adafruit/Adafruit PN532 @ ^1.3.3
+    bblanchon/ArduinoJson @ ^7.3.0
+    knolleary/PubSubClient @ ^2.8
+    digitaldragon/SSLClient @ ^1.3.2
+    
+; Enable SPIFFS upload
+board_build.filesystem = spiffs
+; Update partition settings
+board_build.partitions = partitions.csv
+board_upload.flash_size = 4MB
+board_build.flash_mode = dio
+board_upload.flash_freq = "40m"
+
+build_flags = 
+    -Os
+    -ffunction-sections
+    -fdata-sections
+    -DNDEBUG
+    -mtext-section-literals
+    '-D VERSION="${common.version}"'
+    -DASYNCWEBSERVER_REGEX
+    -DCORE_DEBUG_LEVEL=1
+    -DCONFIG_ARDUHAL_LOG_COLORS=1
+    -DOTA_DEBUG=1
+    -DARDUINO_RUNNING_CORE=1
+    -DARDUINO_EVENT_RUNNING_CORE=1
+    -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1
+    -DCONFIG_ESP32_PANIC_PRINT_REBOOT
+    -DCONFIG_ARDUINO_OTA_READSIZE=1024
+    -DCONFIG_ASYNC_TCP_RUNNING_CORE=1
+    -DCONFIG_ASYNC_TCP_USE_WDT=0
+    -DCONFIG_LWIP_TCP_MSS=1460
+    -DOTA_PARTITION_SUBTYPE=0x10
+    -DPARTITION_TABLE_OFFSET=0x8000
+    -DPARTITION_TABLE_SIZE=0x1000
+    -DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1
+    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1
+    -DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1
+    -DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000
+    -DCONFIG_PARTITION_TABLE_OFFSET=0x8000
+    -DCONFIG_PARTITION_TABLE_MD5=y
+    -DBOOT_APP_PARTITION_OTA_0=1
+    
+extra_scripts = 
+    scripts/extra_script.py
+    pre:scripts/pre_build.py     ; wird zuerst ausgeführt
+    pre:scripts/pre_spiffs.py    ; wird als zweites ausgeführt
+    pre:scripts/combine_html.py  ; wird als drittes ausgeführt
+    scripts/gzip_files.py
+
+; Remove or comment out the targets line
+;targets = buildfs, build
+
+; Add a custom target to build both
+[platformio]
+default_envs = esp32dev, esp32dev_ota

--- a/src/ota.cpp
+++ b/src/ota.cpp
@@ -22,7 +22,9 @@ void stopAllTasks() {

 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
    if (!index) {
-        Serial.printf("Update Start: %s\n", filename.c_str());
+        bool isFullImage = filename.endsWith("full.bin");
+        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isFullImage ? "full" : "OTA");
+        
        if (request->contentLength() == 0) {
            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
            return;
@@ -33,9 +35,21 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
            tasksAreStopped = true;
        }

-        // Da die full.bin jetzt das korrekte Magic Byte hat, 
-        // können wir ein normales Update ohne spezielle Flags starten
-        if (!Update.begin()) {
+        bool success;
+        if (isFullImage) {
+            // Full image update ohne Magic Byte Check, aber mit U_FLASH
+            success = Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH);
+        } else {
+            // Normales OTA update mit Magic Byte Check
+            if (data[0] != 0xE9) {
+                Serial.printf("Wrong magic byte: 0x%02X (expected 0xE9)\n", data[0]);
+                request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid firmware format\"}");
+                return;
+            }
+            success = Update.begin(request->contentLength());
+        }
+
+        if (!success) {
            Update.printError(Serial);
            request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
            return;
Author	SHA1	Message	Date
Manuel Weiser	62d9596d08	docs: update changelog for version 1.2.81 All checks were successful Release Workflow / route (push) Successful in 8s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m42s Details	2025-02-20 17:11:28 +01:00
Manuel Weiser	e27e95d291	docs: update webpages for version v1.2.81	2025-02-20 17:11:28 +01:00
Manuel Weiser	b7651ad50d	refactor: update Gitea and GitHub release workflows to use esp32dev_ota for building and uploading firmware and SPIFFS binaries	2025-02-20 17:11:22 +01:00
Manuel Weiser	f1937e2977	docs: update changelog for version 1.2.80 All checks were successful Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 3s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 3m37s Details	2025-02-20 17:05:53 +01:00
Manuel Weiser	ad5ddf713c	docs: update webpages for version v1.2.80	2025-02-20 17:05:52 +01:00
Manuel Weiser	ccb494f843	bump version to 1.2.79 in platformio.ini	2025-02-20 17:05:47 +01:00
Manuel Weiser	17307d8f03	refactor: update Gitea and GitHub release workflows to include new firmware and SPIFFS binaries; fix version display in HTML files to v1.2.78	2025-02-20 17:04:56 +01:00