docs: update changelog for version 1.1.0

.github/workflows/release.yml

@@ -5,29 +5,75 @@ on:
     tags:
       - 'v*'
 
+permissions:
+  contents: write      # Required for creating releases
+  issues: read        # Required for reading changelog
+  pull-requests: read # Required for reading changelog
+
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write # Required for creating releases at job level
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+    
+    - name: Install PlatformIO
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade platformio
+    
+    - name: Build Firmware
+      run: |
+        pio run -t buildfs  # Build SPIFFS
+        pio run            # Build firmware
+        
+    - name: Install esptool
+      run: |
+        pip install esptool
+        
+    - name: Merge firmware and SPIFFS
+      run: |
+        esptool.py --chip esp32 merge_bin \
+          --flash_mode dio \
+          --flash_freq 40m \
+          --flash_size 4MB \
+          -o .pio/build/esp32dev/filaman.bin \
+          0x1000 .pio/build/esp32dev/bootloader.bin \
+          0x8000 .pio/build/esp32dev/partitions.bin \
+          0x10000 .pio/build/esp32dev/firmware.bin \
+          0x290000 .pio/build/esp32dev/spiffs.bin
     
     - name: Get version from tag
       id: get_version
-      run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
+      run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
       
     - name: Read CHANGELOG.md
       id: changelog
       run: |
-        CHANGELOG=$(awk "/## \[${{ steps.get_version.outputs.VERSION }}\]/{p=1;print;next} /## \[/{p=0} p" CHANGELOG.md)
-        echo "::set-output name=CHANGES::$CHANGELOG"
+        CHANGELOG=$(awk "/## \\[${{ steps.get_version.outputs.VERSION }}\\]/{p=1;print;next} /## \\[/{p=0} p" CHANGELOG.md)
+        echo "CHANGES<<EOF" >> $GITHUB_OUTPUT
+        echo "$CHANGELOG" >> $GITHUB_OUTPUT
+        echo "EOF" >> $GITHUB_OUTPUT
     
-    - name: Create Release
-      uses: actions/create-release@v1
+    - name: Install and Configure GitHub CLI
+      run: |
+        curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+        && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
+        && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+        && sudo apt update \
+        && sudo apt install gh -y
+        
+    - name: Create Release with GitHub CLI
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ steps.get_version.outputs.VERSION }}
-        body: ${{ steps.changelog.outputs.CHANGES }}
-        draft: false
-        prerelease: false
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Changed from GITHUB_TOKEN to GH_TOKEN
+      run: |
+        gh release create "${{ github.ref_name }}" \
+          --title "Release ${{ steps.get_version.outputs.VERSION }}" \
+          --notes "${{ steps.changelog.outputs.CHANGES }}" \
+          ".pio/build/esp32dev/filaman.bin#filaman.bin"

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.1.0] - 2025-02-16
+### Changed
+- clean up changelog and update script execution in platformio.ini
+- update changelog for version 1.1.0
+
+### Fixed
+- correct version number in nav bar
+
+
 ## [1.0.5] - 2025-02-16
 ### Added
 - update version to 1.0.5 and enhance changelog update process with automatic git push

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

partitions.csv

@@ -0,0 +1,5 @@
+# Name,   Type, SubType, Offset,   Size,     Flags
+nvs,      data, nvs,     0x9000,   0x5000,
+otadata,  data, ota,     0xe000,   0x2000,
+app0,     app,  ota_0,   0x10000,  0x280000,
+spiffs,   data, spiffs,  0x290000, 0x170000,

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.0.5"
+version = "1.1.0"
 
 [env:esp32dev]
 platform = espressif32
@@ -19,7 +19,8 @@ monitor_speed = 115200
 
 lib_deps =
     tzapu/WiFiManager @ ^2.0.17
-    me-no-dev/ESP Async WebServer @ ^1.2.4
+    #me-no-dev/ESP Async WebServer @ ^1.2.4
+    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
@@ -31,8 +32,12 @@ lib_deps =
     
 ; Enable SPIFFS upload
 board_build.filesystem = spiffs
-board_build.spiffs.partition = 2M
-board_build.spiffs.upload_size = 2M
+; Update partition settings
+board_build.partitions = partitions.csv
+board_upload.flash_size = 4MB
+; Remove these as they're now defined in partitions.csv
+; board_build.spiffs.partition = 2M
+; board_build.spiffs.upload_size = 2M
 
 build_flags = 
     -Os
@@ -43,9 +48,9 @@ build_flags =
     '-D VERSION="${common.version}"'
 
 extra_scripts = 
-    pre:scripts/combine_html.py
     pre:scripts/pre_build.py
+    pre:scripts/combine_html.py
     pre:scripts/pre_spiffs.py
     pre:scripts/gzip_files.py
     pre:scripts/extra_script.py
-    pre:scripts/update_changelog.py
+    #post:scripts/update_changelog.py

scripts/gzip_files.py

@@ -13,6 +13,9 @@ def copy_file(input_file, output_file):
     shutil.copy2(input_file, output_file)
 
 def should_compress(file):
+     # Skip compression for spoolman.html
+    if file == 'spoolman.html':
+        return False
     # Komprimiere nur bestimmte Dateitypen
     return file.endswith(('.js', '.png', '.css', '.html'))
 

scripts/update_changelog.py

@@ -78,19 +78,15 @@ def push_changes(version):
         subprocess.run(['git', 'push', 'origin'], check=True)
         print("Successfully pushed to origin")
         
-        # Ask for upstream push
-        response = input("Do you want to push to GitHub (upstream)? (y/n): ").lower()
-        if response == 'y':
-            subprocess.run(['git', 'push', 'upstream'], check=True)
-            print("Successfully pushed to upstream")
-            
     except subprocess.CalledProcessError as e:
         print(f"Error during git operations: {e}")
         return False
     return True
 
 def update_changelog():
+    print("Starting changelog update...")  # Add this line
     version = get_version()
+    print(f"Current version: {version}")   # Add this line
     today = datetime.now().strftime('%Y-%m-%d')
     
     script_dir = os.path.dirname(os.path.abspath(__file__))