Compare commits

..

No commits in common. "499a08aa75dbf416cd1c8a1f2c12ea1e39b9f4f5" and "2af23e8084b6c19314c933a766613d1ae0211ba1" have entirely different histories.

11 changed files with 13 additions and 20 deletions

View File

@ -64,13 +64,14 @@ jobs:
0x1000 .pio/build/esp32dev/bootloader.bin \
0x8000 .pio/build/esp32dev/partitions.bin \
0x10000 .pio/build/esp32dev/firmware.bin \
0x3D0000 .pio/build/esp32dev/spiffs.bin
0x290000 .pio/build/esp32dev/spiffs.bin
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
- name: Read CHANGELOG.md
id: changelog
run: |
# Remove 'v' prefix from version if present
VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//')
CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md)
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT

View File

@ -1,13 +1,5 @@
# Changelog
## [1.2.56] - 2025-02-19
### Added
- update version to 1.2.56 and adjust firmware and partition settings
### Changed
- remove redundant comment from Gitea release workflow
## [1.2.55] - 2025-02-19
### Added
- update version to 1.2.55 and adjust Gitea release workflow to remove 'v' prefix from version

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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, 0x140000,
app1, app, ota_1, 0x150000, 0x140000,
spiffs, data, spiffs, 0x290000, 0x170000,
app0, app, ota_0, 0x10000, 0x1E0000,
app1, app, ota_1, 0x1F0000, 0x1E0000,
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 0x140000 0x1E0000
5 app1 app ota_1 0x150000 0x1F0000 0x140000 0x1E0000
6 spiffs data spiffs 0x290000 0x3D0000 0x170000 0x30000

View File

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