docs: update changelog for version 1.2.87

docs: update webpages for version v1.2.87
fix: update firmware build process and remove unused OTA environment
2025-02-20 19:52:44 +01:00 · 2025-02-20 19:52:44 +01:00 · 2025-02-20 19:52:34 +01:00 · 2025-02-20 19:09:35 +01:00 · 2025-02-20 19:09:35 +01:00 · 2025-02-20 19:09:28 +01:00
14 changed files with 85 additions and 111 deletions
--- a/.github/workflows/providers/gitea-release.yml
+++ b/.github/workflows/providers/gitea-release.yml
@ -33,21 +33,23 @@ jobs:
        pip install --upgrade platformio esptool
    
    - name: Install xxd
-      run: sudo apt-get install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
    
    - name: Build Firmware
      run: |
-        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
+        pio run -e esp32dev -t buildfs  # Build SPIFFS
+        pio run -e esp32dev            # Build firmware
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
        
    - name: Prepare binaries
      run: |
-        cd .pio/build/esp32dev_ota
+        cd .pio/build/esp32dev
        
        # Create OTA binary (already has correct magic byte)
-        cp firmware.bin filaman_ota.bin
+        cp firmware.bin filaman.bin
        
        # Create a magic byte prepended binary for the bootloader
        echo -ne '\xE9' > bootloader_with_magic.bin
@ -59,18 +61,16 @@ jobs:
          --flash_mode dio \
          --flash_freq 40m \
          --flash_size 4MB \
-          -o filaman_full.bin \
+          -o filaman.bin \
          0x0000 bootloader_with_magic.bin \
          0x8000 partitions.bin \
          0x10000 firmware.bin \
-          0x3D0000 spiffs.bin
+          0x390000 spiffs.bin
        
        # Verify magic bytes
        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
+        xxd -l 16 filaman.bin
        
        # Verify file sizes
        echo "File sizes:"
@ -102,8 +102,8 @@ jobs:
          echo "Release created with ID: $RELEASE_ID"
          
          # Upload binaries
-          cd .pio/build/esp32dev_ota
-          for file in filaman_full.bin filaman_ota.bin filaman.bin filaman_spiffs.bin; do
+          cd .pio/build/esp32dev
+          for file in filaman.bin; do
            echo "Uploading $file..."
            curl -k -s \
              -X POST \
--- a/.github/workflows/providers/github-release.yml
+++ b/.github/workflows/providers/github-release.yml
@ -22,21 +22,23 @@ jobs:
        pip install --upgrade platformio esptool
    
    - name: Install xxd
-      run: sudo apt-get install xxd
+      run: |
+        sudo apt-get update
+        sudo apt-get install xxd
    
    - name: Build Firmware
      run: |
-        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
+        pio run -e esp32dev -t buildfs  # Build SPIFFS
+        pio run -e esp32dev            # Build firmware
+        cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman.bin
+        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/filaman_spiffs.bin
        
    - name: Prepare binaries
      run: |
-        cd .pio/build/esp32dev_ota
+        cd .pio/build/esp32dev
        
        # Create OTA binary (already has correct magic byte)
-        cp firmware.bin filaman_ota.bin
+        cp firmware.bin filaman.bin
        
        # Create a magic byte prepended binary for the bootloader
        echo -ne '\xE9' > bootloader_with_magic.bin
@ -48,18 +50,16 @@ jobs:
          --flash_mode dio \
          --flash_freq 40m \
          --flash_size 4MB \
-          -o filaman_full.bin \
+          -o filaman.bin \
          0x0000 bootloader_with_magic.bin \
          0x8000 partitions.bin \
          0x10000 firmware.bin \
-          0x3D0000 spiffs.bin
+          0x390000 spiffs.bin
        
        # Verify magic bytes
        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
+        xxd -l 16 filaman.bin
        
        # Verify file sizes
        echo "File sizes:"
@ -86,7 +86,4 @@ jobs:
        gh release create "${{ github.ref_name }}" \
          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
          --notes "${{ steps.changelog.outputs.CHANGES }}" \
-          .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
+          .pio/build/esp32dev/filaman.bin
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,35 @@
 # Changelog

+## [1.2.87] - 2025-02-20
+### Changed
+- update webpages for version v1.2.87
+
+### Fixed
+- update firmware build process and remove unused OTA environment
+
+
+## [1.2.86] - 2025-02-20
+### Changed
+- update webpages for version v1.2.86
+
+### Fixed
+- update SPIFFS offset and size in release workflows and partitions.csv
+
+
+## [1.2.85] - 2025-02-20
+### Added
+- ci: streamline release workflows by removing unnecessary binary uploads and adding SPIFFS formatting
+
+### Changed
+- update webpages for version v1.2.85
+
+
+## [1.2.84] - 2025-02-20
+### Changed
+- update webpages for version v1.2.84
+- ci: update installation steps for xxd to include package list update
+
+
 ## [1.2.83] - 2025-02-20
 ### Changed
 - update webpages for version v1.2.83
--- 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.83</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.83</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.83</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.83</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.83</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.83</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</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.83</span></h1>
+                <h1>FilaMan<span class="version">v1.2.87</span></h1>
                <h4>Filament Management Tool</h4>
            </div>
        </div>
--- a/partitions.csv
+++ b/partitions.csv
@ -1,6 +1,6 @@
 # Name,   Type, SubType,    Offset,   Size,     Flags
 nvs,      data, nvs,       0x9000,   0x5000,
 otadata,  data, ota,       0xe000,   0x2000,
-app0,     app,  ota_0,     0x10000,  0x1E0000,
-app1,     app,  ota_1,     0x1F0000, 0x1E0000,
-spiffs,   data, spiffs,    0x3D0000, 0x30000,
+app0,     app,  ota_0,     0x10000,  0x1C0000,
+app1,     app,  ota_1,     0x1D0000, 0x1C0000,
+spiffs,   data, spiffs,    0x390000, 0x60000,
--- a/platformio.ini
+++ b/platformio.ini
@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html

 [common]
-version = "1.2.83"
+version = "1.2.87"

 [env:esp32dev]
 platform = espressif32
@ -77,74 +77,7 @@ extra_scripts =
 ; Remove or comment out the targets line
 ;targets = buildfs, build

-; Add a custom target to build both
-[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
+default_envs = esp32dev

--- a/scripts/pre_spiffs.py
+++ b/scripts/pre_spiffs.py
@ -4,4 +4,18 @@ Import("env")
 exec(open("./scripts/pre_build.py").read())

 # Bind to SPIFFS build
-env.AddPreAction("buildfs", replace_version)
+env.AddPreAction("buildfs", replace_version)
+
+import os
+import shutil
+from SCons.Script import DefaultEnvironment
+
+env = DefaultEnvironment()
+
+# Format SPIFFS partition before uploading new files
+spiffs_dir = os.path.join(env.subst("$BUILD_DIR"), "spiffs")
+if os.path.exists(spiffs_dir):
+    shutil.rmtree(spiffs_dir)
+os.makedirs(spiffs_dir)
+
+print("SPIFFS partition formatted.")
--- a/src/ota.cpp
+++ b/src/ota.cpp
@ -22,7 +22,7 @@ void stopAllTasks() {

 void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
    if (!index) {
-        bool isFullImage = filename.endsWith("full.bin");
+        bool isFullImage = true;
        Serial.printf("Update Start: %s (type: %s)\n", filename.c_str(), isFullImage ? "full" : "OTA");
        
        if (request->contentLength() == 0) {
Author	SHA1	Message	Date
Manuel Weiser	d41f0f3e67	docs: update changelog for version 1.2.87 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 2m30s Details	2025-02-20 19:52:44 +01:00
Manuel Weiser	484058515e	docs: update webpages for version v1.2.87	2025-02-20 19:52:44 +01:00
Manuel Weiser	f552b492cf	fix: update firmware build process and remove unused OTA environment	2025-02-20 19:52:34 +01:00
Manuel Weiser	c3040b3c29	docs: update changelog for version 1.2.86 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 2m36s Details	2025-02-20 19:09:35 +01:00
Manuel Weiser	d7ba67085d	docs: update webpages for version v1.2.86	2025-02-20 19:09:35 +01:00
Manuel Weiser	48efb9e21a	fix: update SPIFFS offset and size in release workflows and partitions.csv	2025-02-20 19:09:28 +01:00
Manuel Weiser	e983ba6e44	docs: update changelog for version 1.2.85 All checks were successful Release Workflow / route (push) Successful in 7s Details Release Workflow / verify-provider (push) Successful in 2s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m48s Details	2025-02-20 18:37:57 +01:00
Manuel Weiser	37171d6eca	docs: update webpages for version v1.2.85	2025-02-20 18:37:57 +01:00
Manuel Weiser	ebb08a7a66	ci: streamline release workflows by removing unnecessary binary uploads and adding SPIFFS formatting	2025-02-20 18:37:51 +01:00
Manuel Weiser	b5330af351	docs: update changelog for version 1.2.84 All checks were successful Release Workflow / route (push) Successful in 10s Details Release Workflow / verify-provider (push) Successful in 4s Details Release Workflow / github-release (push) Has been skipped Details Release Workflow / gitea-release (push) Successful in 2m41s Details	2025-02-20 18:04:06 +01:00
Manuel Weiser	4919d34484	docs: update webpages for version v1.2.84	2025-02-20 18:04:06 +01:00
Manuel Weiser	2da641d604	ci: update installation steps for xxd to include package list update	2025-02-20 18:04:00 +01:00