Compare commits

..

No commits in common. "c3040b3c293a863db0b97ac211ea75016ef654e0" and "e983ba6e442d9ad247ff69fa19db45612fc54c7a" have entirely different histories.

12 changed files with 13 additions and 21 deletions

View File

@ -65,7 +65,7 @@ jobs:
0x0000 bootloader_with_magic.bin \ 0x0000 bootloader_with_magic.bin \
0x8000 partitions.bin \ 0x8000 partitions.bin \
0x10000 firmware.bin \ 0x10000 firmware.bin \
0x390000 spiffs.bin 0x3D0000 spiffs.bin
# Verify magic bytes # Verify magic bytes
echo "Checking magic bytes:" echo "Checking magic bytes:"

View File

@ -54,7 +54,7 @@ jobs:
0x0000 bootloader_with_magic.bin \ 0x0000 bootloader_with_magic.bin \
0x8000 partitions.bin \ 0x8000 partitions.bin \
0x10000 firmware.bin \ 0x10000 firmware.bin \
0x390000 spiffs.bin 0x3D0000 spiffs.bin
# Verify magic bytes # Verify magic bytes
echo "Checking magic bytes:" echo "Checking magic bytes:"

View File

@ -1,13 +1,5 @@
# Changelog # 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 ## [1.2.85] - 2025-02-20
### Added ### Added
- ci: streamline release workflows by removing unnecessary binary uploads and adding SPIFFS formatting - ci: streamline release workflows by removing unnecessary binary uploads and adding SPIFFS formatting

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

View File

@ -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, 0x1C0000, app0, app, ota_0, 0x10000, 0x1E0000,
app1, app, ota_1, 0x1D0000, 0x1C0000, app1, app, ota_1, 0x1F0000, 0x1E0000,
spiffs, data, spiffs, 0x390000, 0x60000, spiffs, data, spiffs, 0x3D0000, 0x30000,
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 0x1C0000 0x1E0000
5 app1 app ota_1 0x1D0000 0x1F0000 0x1C0000 0x1E0000
6 spiffs data spiffs 0x390000 0x3D0000 0x60000 0x30000

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.86" version = "1.2.85"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32