3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases128 Wiki Activity

Compare commits

..

8 Commits
v1.2.56 ... v1.2.59

Author SHA1 Message Date
Manuel Weiser
8f8322e629 docs: update changelog for version 1.2.59 2025-02-20 01:08:56 +01:00
Manuel Weiser
1e386c49af docs: update webpages for version 1.2.59 2025-02-20 01:08:56 +01:00
Manuel Weiser
3070d75d07 feat: update version to 1.2.59 and enhance OTA upload handling 2025-02-20 01:08:48 +01:00
Manuel Weiser
34ee9badea docs: update changelog for version 1.2.58 2025-02-20 00:50:53 +01:00
Manuel Weiser
6594af9540 feat: update version to 1.2.58 in HTML files and platformio configuration 2025-02-20 00:50:48 +01:00
Manuel Weiser
c21bd2d4ec docs: update changelog for version 1.2.57 2025-02-20 00:33:35 +01:00
Manuel Weiser
e5f895b560 feat: update version to 1.2.57 in platformio configuration 2025-02-20 00:33:31 +01:00
Manuel Weiser
bb0f50ce1d fix: update spiffs offset and sizes in firmware and partitions configuration 2025-02-20 00:33:16 +01:00
12 changed files with 40 additions and 15 deletions

2
.github/workflows/providers/github-release.yml vendored

@@ -40,7 +40,7 @@ jobs:
0x1000 .pio/build/esp32dev/bootloader.bin \
0x8000 .pio/build/esp32dev/partitions.bin \
0x10000 .pio/build/esp32dev/firmware.bin \
0x290000 .pio/build/esp32dev/spiffs.bin
0x3D0000 .pio/build/esp32dev/spiffs.bin
- name: Prepare OTA firmware
run: |

21
CHANGELOG.md

@@ -1,5 +1,26 @@
# Changelog
## [1.2.59] - 2025-02-20
### Added
- update version to 1.2.59 and enhance OTA upload handling
### Changed
- update webpages for version 1.2.59
## [1.2.58] - 2025-02-20
### Added
- update version to 1.2.58 in HTML files and platformio configuration
## [1.2.57] - 2025-02-20
### Added
- update version to 1.2.57 in platformio configuration
### Fixed
- update spiffs offset and sizes in firmware and partitions configuration
## [1.2.56] - 2025-02-19
### Added
- update version to 1.2.56 and adjust firmware and partition settings

2
html/header.html

@@ -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.59</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/index.html

@@ -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.59</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/rfid.html

@@ -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.59</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/spoolman.html

@@ -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.59</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/upgrade.html

@@ -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.59</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/waage.html

@@ -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.59</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/wifi.html

@@ -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.59</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

6
partitions.csv

@@ -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

2
platformio.ini

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

8
src/ota.cpp

@@ -16,15 +16,19 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind
return;
}
if (!Update.begin(contentLength)) {
// Determine if this is a full image (firmware + SPIFFS) or just firmware
bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000
if (!Update.begin(contentLength, isFullImage ? U_FLASH : U_SPIFFS)) {
Serial.printf("Not enough space: %u required\n", contentLength);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}");
return;
}
Serial.println("Update started");
Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
}
// Write chunk to flash
if (Update.write(data, len) != len) {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}");