Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
c3040b3c29 | |||
d7ba67085d | |||
48efb9e21a | |||
e983ba6e44 | |||
37171d6eca | |||
ebb08a7a66 | |||
b5330af351 | |||
4919d34484 | |||
2da641d604 |
10
.github/workflows/providers/gitea-release.yml
vendored
10
.github/workflows/providers/gitea-release.yml
vendored
@ -33,7 +33,9 @@ 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: |
|
||||
@ -63,12 +65,10 @@ jobs:
|
||||
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
|
||||
|
||||
@ -103,7 +103,7 @@ jobs:
|
||||
|
||||
# Upload binaries
|
||||
cd .pio/build/esp32dev_ota
|
||||
for file in filaman_full.bin filaman_ota.bin filaman.bin filaman_spiffs.bin; do
|
||||
for file in filaman_full.bin; do
|
||||
echo "Uploading $file..."
|
||||
curl -k -s \
|
||||
-X POST \
|
||||
|
13
.github/workflows/providers/github-release.yml
vendored
13
.github/workflows/providers/github-release.yml
vendored
@ -22,7 +22,9 @@ 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: |
|
||||
@ -52,12 +54,10 @@ jobs:
|
||||
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
|
||||
|
||||
@ -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_ota/filaman_full.bin
|
22
CHANGELOG.md
22
CHANGELOG.md
@ -1,5 +1,27 @@
|
||||
# Changelog
|
||||
|
||||
## [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
|
||||
|
@ -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.86</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.86</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.86</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.86</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.86</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.86</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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.86</span></h1>
|
||||
<h4>Filament Management Tool</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -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,
|
|
@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.2.83"
|
||||
version = "1.2.86"
|
||||
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
|
@ -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.")
|
Reference in New Issue
Block a user