Compare commits

...

3 Commits

Author SHA1 Message Date
c374069f36 docs: update changelog for version 1.2.77
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m33s
2025-02-20 15:53:26 +01:00
59cd7c177d refactor: optimize Gitea release workflow by simplifying build steps and improving file handling 2025-02-20 15:53:22 +01:00
45088b5838 docs: update webpages for version v1.2.77 2025-02-20 15:53:07 +01:00
10 changed files with 36 additions and 58 deletions

View File

@ -21,71 +21,42 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v4
with: with:
python-version: '3.x' python-version: '3.x'
- name: Install dependencies - name: Install PlatformIO
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install platformio esptool pip install --upgrade platformio
- name: Build Firmware - name: Build Firmware
run: | run: |
# Build SPIFFS first pio run -t buildfs # Build SPIFFS
platformio run -t buildfs pio run # Build firmware
# Then build firmware
platformio run - name: Install esptool
- name: Prepare Release Files
run: | run: |
cd .pio/build/esp32dev pip install esptool
# Get bootloader - name: Merge firmware and SPIFFS
BOOTLOADER_PATH=$(find ~/.platformio -name "bootloader_dio_40m.bin" | head -n 1) run: |
if [ ! -f "$BOOTLOADER_PATH" ]; then
echo "Error: bootloader not found!"
exit 1
fi
echo "Using bootloader from: $BOOTLOADER_PATH"
cp "$BOOTLOADER_PATH" bootloader.bin
# Create OTA update binary (firmware only)
cp firmware.bin filaman_ota.bin
# Create full binary
echo "Creating full binary..."
esptool.py --chip esp32 merge_bin \ esptool.py --chip esp32 merge_bin \
-o filaman_full.bin \
--flash_mode dio \ --flash_mode dio \
--flash_freq 40m \ --flash_freq 40m \
--flash_size 4MB \ --flash_size 4MB \
0x1000 bootloader.bin \ -o .pio/build/esp32dev/filaman_full.bin \
0x8000 partitions.bin \ 0x1000 .pio/build/esp32dev/bootloader.bin \
0x10000 firmware.bin \ 0x8000 .pio/build/esp32dev/partitions.bin \
0x3D0000 spiffs.bin 0x10000 .pio/build/esp32dev/firmware.bin \
0x3D0000 .pio/build/esp32dev/spiffs.bin
# Verify results
echo "File sizes:"
ls -l bootloader.bin partitions.bin firmware.bin spiffs.bin filaman_full.bin filaman_ota.bin
echo "Firmware info:"
esptool.py --chip esp32 image_info firmware.bin
echo "Full binary first 16 bytes:"
hexdump -C -n 16 filaman_full.bin
- name: Read CHANGELOG.md - name: Prepare OTA firmware
id: changelog
run: | run: |
VERSION=${GITHUB_REF_NAME#v} cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
CHANGELOG=$(awk "/## \\[$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 - name: Create Release
env: env:
TOKEN: ${{ secrets.GITEA_TOKEN }} TOKEN: ${{ secrets.GITEA_TOKEN }}
@ -112,13 +83,14 @@ jobs:
echo "Release created with ID: $RELEASE_ID" echo "Release created with ID: $RELEASE_ID"
# Upload binaries # Upload binaries
cd .pio/build/esp32dev
for file in filaman_full.bin filaman_ota.bin; do for file in filaman_full.bin filaman_ota.bin; do
echo "Uploading $file..." echo "Uploading $file..."
curl -k -s \ curl -k -s \
-X POST \ -X POST \
-H "Authorization: token ${TOKEN}" \ -H "Authorization: token ${TOKEN}" \
-H "Content-Type: application/octet-stream" \ -H "Content-Type: application/octet-stream" \
--data-binary "@.pio/build/esp32dev/$file" \ --data-binary "@$file" \
"${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file" "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
done done
else else

View File

@ -1,5 +1,11 @@
# Changelog # Changelog
## [1.2.77] - 2025-02-20
### Changed
- optimize Gitea release workflow by simplifying build steps and improving file handling
- update webpages for version v1.2.77
## [1.2.76] - 2025-02-20 ## [1.2.76] - 2025-02-20
### Added ### Added
- enhance OTA update process with improved file verification and new OTA data initialization - enhance OTA update process with improved file verification and new OTA data initialization

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version">v1.2.76</span></h1> <h1>FilaMan<span class="version">v1.2.77</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version">v1.2.76</span></h1> <h1>FilaMan<span class="version">v1.2.77</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version">v1.2.76</span></h1> <h1>FilaMan<span class="version">v1.2.77</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version">v1.2.76</span></h1> <h1>FilaMan<span class="version">v1.2.77</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version">v1.2.76</span></h1> <h1>FilaMan<span class="version">v1.2.77</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version">v1.2.76</span></h1> <h1>FilaMan<span class="version">v1.2.77</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -12,7 +12,7 @@
<div style="display: flex; align-items: center; gap: 2rem;"> <div style="display: flex; align-items: center; gap: 2rem;">
<img src="/logo.png" alt="FilaMan Logo" class="logo"> <img src="/logo.png" alt="FilaMan Logo" class="logo">
<div class="logo-text"> <div class="logo-text">
<h1>FilaMan<span class="version">v1.2.76</span></h1> <h1>FilaMan<span class="version">v1.2.77</span></h1>
<h4>Filament Management Tool</h4> <h4>Filament Management Tool</h4>
</div> </div>
</div> </div>

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.2.76" version = "1.2.77"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32