Compare commits

..

No commits in common. "cefa81030b6eafe30cec72c0a1da71c07e4fad94" and "db3c19ff2e76454052b302593eedd842cdd64d48" have entirely different histories.

11 changed files with 24 additions and 42 deletions

View File

@ -46,24 +46,18 @@ jobs:
- name: Prepare binaries - name: Prepare binaries
run: | run: |
# Ensure we're in the project root
cd $GITHUB_WORKSPACE
# Create SPIFFS directory if it doesn't exist
mkdir -p .pio/build/esp32dev/spiffs
# Copy firmware to SPIFFS directory
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/spiffs/firmware.bin
# Build new SPIFFS image with firmware included
pio run -t buildfs
cd .pio/build/esp32dev cd .pio/build/esp32dev
# Create release files # Kopiere die Firmware in den SPIFFS-Build-Ordner
cp firmware.bin ./spiffs/firmware.bin
# Baue das SPIFFS-Image neu mit der eingebetteten Firmware
pio run -t buildfs
# Erstelle die Release-Dateien
cp spiffs.bin filaman_spiffs.bin cp spiffs.bin filaman_spiffs.bin
# Create full binary # Create full binary with magic byte
echo "Creating full binary..." echo "Creating full binary..."
esptool.py --chip esp32 merge_bin \ esptool.py --chip esp32 merge_bin \
--fill-flash-size 4MB \ --fill-flash-size 4MB \

View File

@ -35,24 +35,18 @@ jobs:
- name: Prepare binaries - name: Prepare binaries
run: | run: |
# Ensure we're in the project root
cd $GITHUB_WORKSPACE
# Create SPIFFS directory if it doesn't exist
mkdir -p .pio/build/esp32dev/spiffs
# Copy firmware to SPIFFS directory
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/spiffs/firmware.bin
# Build new SPIFFS image with firmware included
pio run -t buildfs
cd .pio/build/esp32dev cd .pio/build/esp32dev
# Create release files # Kopiere die Firmware in den SPIFFS-Build-Ordner
cp firmware.bin ./spiffs/firmware.bin
# Baue das SPIFFS-Image neu mit der eingebetteten Firmware
pio run -t buildfs
# Erstelle die Release-Dateien
cp spiffs.bin filaman_spiffs.bin cp spiffs.bin filaman_spiffs.bin
# Create full binary # Create full binary with magic byte
echo "Creating full binary..." echo "Creating full binary..."
esptool.py --chip esp32 merge_bin \ esptool.py --chip esp32 merge_bin \
--fill-flash-size 4MB \ --fill-flash-size 4MB \

View File

@ -1,11 +1,5 @@
# Changelog # Changelog
## [1.2.90] - 2025-02-20
### Changed
- update webpages for version v1.2.90
- update Gitea and GitHub release workflows to include SPIFFS directory creation and firmware copying
## [1.2.89] - 2025-02-20 ## [1.2.89] - 2025-02-20
### Changed ### Changed
- update webpages for version v1.2.89 - update webpages for version v1.2.89

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.90</span></h1> <h1>FilaMan<span class="version">v1.2.89</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.90</span></h1> <h1>FilaMan<span class="version">v1.2.89</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.90</span></h1> <h1>FilaMan<span class="version">v1.2.89</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.90</span></h1> <h1>FilaMan<span class="version">v1.2.89</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.90</span></h1> <h1>FilaMan<span class="version">v1.2.89</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.90</span></h1> <h1>FilaMan<span class="version">v1.2.89</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.90</span></h1> <h1>FilaMan<span class="version">v1.2.89</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.90" version = "1.2.89"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32