docs: update changelog for version 1.2.83

.github/workflows/providers/gitea-release.yml

@@ -32,47 +32,50 @@ jobs:
         python -m pip install --upgrade pip
         pip install --upgrade platformio esptool
     
+    - name: Install xxd
+      run: sudo apt-get install xxd
+    
     - name: Build Firmware
       run: |
-        pio run -t buildfs  # Build SPIFFS
+        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        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)
+        # Create OTA binary (already has correct magic byte)
         cp firmware.bin filaman_ota.bin
         
-        # Create basic flash layout
+        # Create a magic byte prepended binary for the bootloader
-        echo "Creating initial 4MB flash image..."
+        echo -ne '\xE9' > bootloader_with_magic.bin
-        dd if=/dev/zero bs=1M count=4 of=flash_4mb.bin
+        cat bootloader.bin >> bootloader_with_magic.bin
         
-        # Create partition layout
+        echo "Creating full binary with magic byte..."
-        echo "Writing bootloader..."
+        esptool.py --chip esp32 merge_bin \
-        dd if=bootloader.bin of=flash_4mb.bin bs=1 seek=$((0x1000)) conv=notrunc
+          --fill-flash-size 4MB \
+          --flash_mode dio \
+          --flash_freq 40m \
+          --flash_size 4MB \
+          -o filaman_full.bin \
+          0x0000 bootloader_with_magic.bin \
+          0x8000 partitions.bin \
+          0x10000 firmware.bin \
+          0x3D0000 spiffs.bin
         
-        echo "Writing partitions..."
+        # Verify magic bytes
-        dd if=partitions.bin of=flash_4mb.bin bs=1 seek=$((0x8000)) conv=notrunc
+        echo "Checking magic bytes:"
+        echo "OTA binary first bytes:"
+        xxd -l 16 filaman_ota.bin
+        echo "Full binary first bytes:"
+        xxd -l 16 filaman_full.bin
         
-        echo "Writing firmware..."
+        # Verify file sizes
-        dd if=firmware.bin of=flash_4mb.bin bs=1 seek=$((0x10000)) conv=notrunc
-        
-        echo "Writing SPIFFS..."
-        dd if=spiffs.bin of=flash_4mb.bin bs=1 seek=$((0x3D0000)) conv=notrunc
-        
-        # Rename to final name
-        cp flash_4mb.bin filaman_full.bin
-        
-        # Verify file sizes and content
         echo "File sizes:"
         ls -lh *.bin
         
-        echo "Binary information:"
-        esptool.py --chip esp32 image_info filaman_ota.bin || true
-        echo "Full binary info:"
-        xxd -l 64 filaman_full.bin
-
     - name: Create Release
       env:
         TOKEN: ${{ secrets.GITEA_TOKEN }}
@@ -99,8 +102,8 @@ jobs:
           echo "Release created with ID: $RELEASE_ID"
           
           # Upload binaries
-          cd .pio/build/esp32dev
+          cd .pio/build/esp32dev_ota
-          for file in filaman_full.bin filaman_ota.bin; do
+          for file in filaman_full.bin filaman_ota.bin filaman.bin filaman_spiffs.bin; do
             echo "Uploading $file..."
             curl -k -s \
               -X POST \

.github/workflows/providers/github-release.yml

@@ -21,18 +21,19 @@ jobs:
         python -m pip install --upgrade pip
         pip install --upgrade platformio esptool
     
+    - name: Install xxd
+      run: sudo apt-get install xxd
+    
     - name: Build Firmware
       run: |
-        pio run -t buildfs  # Build SPIFFS
+        pio run -e esp32dev_ota -t buildfs  # Build SPIFFS
-        pio run            # Build firmware
+        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:"
-        ls -la
         
         # Create OTA binary (already has correct magic byte)
         cp firmware.bin filaman_ota.bin
@@ -56,9 +57,9 @@ jobs:
         # Verify magic bytes
         echo "Checking magic bytes:"
         echo "OTA binary first bytes:"
-        hexdump -C -n 16 filaman_ota.bin
+        xxd -l 16 filaman_ota.bin
         echo "Full binary first bytes:"
-        hexdump -C -n 16 filaman_full.bin
+        xxd -l 16 filaman_full.bin
         
         # Verify file sizes
         echo "File sizes:"
@@ -85,5 +86,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_ota/filaman_full.bin \
-          .pio/build/esp32dev/filaman_ota.bin
+          .pio/build/esp32dev_ota/filaman_ota.bin \
+          .pio/build/esp32dev_ota/filaman.bin \
+          .pio/build/esp32dev_ota/filaman_spiffs.bin

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [1.2.83] - 2025-02-20
+### Changed
+- update webpages for version v1.2.83
+- replace hexdump with xxd for magic byte verification in release workflows
+
+
+## [1.2.82] - 2025-02-20
+### Changed
+- update webpages for version v1.2.82
+- enhance Gitea and GitHub release workflows to include magic byte handling and improve binary verification
+
+
+## [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
+- simplify Gitea release workflow by using esptool for binary creation
+
+
 ## [1.2.78] - 2025-02-20
 ### Changed
 - update webpages for version v1.2.78

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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.83</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.83</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.83</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.83</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.83</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.83</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

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.78</span></h1>
+                <h1>FilaMan<span class="version">v1.2.83</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.2.78"
+version = "1.2.83"
 
 [env:esp32dev]
 platform = espressif32
@@ -78,6 +78,73 @@ extra_scripts =
 ;targets = buildfs, build
 
 ; Add a custom target to build both
-[platformio]
+[env:esp32dev_ota]
-default_envs = esp32dev
+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
 

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, 
+        bool success;
-        // können wir ein normales Update ohne spezielle Flags starten
+        if (isFullImage) {
-        if (!Update.begin()) {
+            // 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;