Compare commits

...

14 Commits

5 changed files with 39 additions and 31 deletions

@ -40,9 +40,11 @@ jobs:
# Copy firmware binary # Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary with magic byte # Create SPIFFS binary with ESP32 image header
echo -ne '\xEA' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz)
cat .pio.build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x70\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Append the actual SPIFFS data
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary # Create full binary
(cd .pio/build/esp32dev && (cd .pio/build/esp32dev &&

@ -35,28 +35,6 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install xxd sudo apt-get install xxd
- name: Check for Data changes
id: check_data
run: |
git fetch --unshallow || true
CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
if echo "$CHANGED_FILES" | grep -q "^data/"; then
echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT
else
echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT
fi
- name: Check for SPIFFS changes
id: check_spiffs
run: |
git fetch --unshallow || true
CHANGED_FILES=$(git diff --name-only HEAD^..HEAD)
if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then
echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT
else
echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT
fi
- name: Build Firmware - name: Build Firmware
run: | run: |
VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2)
@ -69,8 +47,10 @@ jobs:
# Copy firmware binary # Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary with magic byte # Create SPIFFS binary with ESP32 image header
echo -ne '\xEA' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz)
echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x70\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Append the actual SPIFFS data
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Create full binary (always) # Create full binary (always)

@ -1,5 +1,31 @@
# Changelog # Changelog
## [1.3.34] - 2025-02-22
### Changed
- update webpages for version v1.3.34
- partition: update SPIFFS binary creation and offsets in workflow files
## [1.3.33] - 2025-02-22
### Changed
- update webpages for version v1.3.33
- partition: update spiffs offset and app sizes in partition files
- partition: update spiffs offset in partition files
- partition: update app sizes and offsets in partitions.csv
## [1.3.32] - 2025-02-22
### Changed
- update webpages for version v1.3.32
- workflow: update magic byte for SPIFFS binary creation
## [1.3.31] - 2025-02-22
### Changed
- update webpages for version v1.3.31
- workflow: remove unnecessary data and SPIFFS change checks from release workflows
## [1.3.30] - 2025-02-22 ## [1.3.30] - 2025-02-22
### Changed ### Changed
- update webpages for version v1.3.30 - update webpages for version v1.3.30

@ -1,6 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags # Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000, nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000, otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x180000, app0, app, ota_0, 0x10000, 0x1C0000,
app1, app, ota_1, 0x190000, 0x180000, app1, app, ota_1, 0x1D0000, 0x1C0000,
spiffs, data, spiffs, 0x310000, 0xE0000, spiffs, data, spiffs, 0x390000, 0x70000,
1 # Name Type SubType Offset Size Flags
2 nvs data nvs 0x9000 0x5000
3 otadata data ota 0xe000 0x2000
4 app0 app ota_0 0x10000 0x180000 0x1C0000
5 app1 app ota_1 0x190000 0x1D0000 0x180000 0x1C0000
6 spiffs data spiffs 0x310000 0x390000 0xE0000 0x70000

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.3.30" version = "1.3.34"
#test #test