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

refactor: update Gitea and GitHub release workflows to improve binary preparation and verification

Browse Source 
fix: correct version number in HTML files and platformio.ini to v1.2.76
enhance: streamline OTA update handling by removing unnecessary magic byte checks
This commit is contained in:
Manuel Weiser 2025-02-20 16:14:49 +01:00
parent c374069f36
commit 8a93cccfce
11 changed files with 80 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.github/workflows/providers/gitea-release.yml vendored
View File

@ -30,33 +30,51 @@ jobs:
- name: Install PlatformIO
run: |
python -m pip install --upgrade pip
pip install --upgrade platformio
pip install --upgrade platformio esptool
- name: Build Firmware
run: |
pio run -t buildfs # Build SPIFFS
pio run # Build firmware
- name: Install esptool
- name: Prepare binaries
run: |
pip install esptool
cd .pio/build/esp32dev
- name: Merge firmware and SPIFFS
run: |
# Debug: Show all generated files
echo "Files in build directory:"
ls -la
# Create OTA binary (already has correct magic byte)
cp firmware.bin filaman_ota.bin
# Create a magic byte prepended binary for the bootloader
echo -ne '\xE9' > bootloader_with_magic.bin
cat bootloader.bin >> bootloader_with_magic.bin
echo "Creating full binary with magic byte..."
esptool.py --chip esp32 merge_bin \
--fill-flash-size 4MB \
--flash_mode dio \
--flash_freq 40m \
--flash_size 4MB \
-o .pio/build/esp32dev/filaman_full.bin \
0x1000 .pio/build/esp32dev/bootloader.bin \
0x8000 .pio/build/esp32dev/partitions.bin \
0x10000 .pio/build/esp32dev/firmware.bin \
0x3D0000 .pio/build/esp32dev/spiffs.bin
-o filaman_full.bin \
0x0000 bootloader_with_magic.bin \
0x8000 partitions.bin \
0x10000 firmware.bin \
0x3D0000 spiffs.bin
# Verify magic bytes
echo "Checking magic bytes:"
echo "OTA binary first bytes:"
hexdump -C -n 16 filaman_ota.bin
echo "Full binary first bytes:"
hexdump -C -n 16 filaman_full.bin
# Verify file sizes
echo "File sizes:"
ls -lh *.bin
- name: Prepare OTA firmware
run: |
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
- name: Create Release
env:
TOKEN: ${{ secrets.GITEA_TOKEN }}

46
.github/workflows/providers/github-release.yml vendored
View File

@ -19,32 +19,50 @@ jobs:
- name: Install PlatformIO
run: |
python -m pip install --upgrade pip
pip install --upgrade platformio
pip install --upgrade platformio esptool
- name: Build Firmware
run: |
pio run -t buildfs # Build SPIFFS
pio run # Build firmware
- name: Install esptool
- name: Prepare binaries
run: |
pip install esptool
cd .pio/build/esp32dev
- name: Merge firmware and SPIFFS
run: |
# Debug: Show all generated files
echo "Files in build directory:"
ls -la
# Create OTA binary (already has correct magic byte)
cp firmware.bin filaman_ota.bin
# Create a magic byte prepended binary for the bootloader
echo -ne '\xE9' > bootloader_with_magic.bin
cat bootloader.bin >> bootloader_with_magic.bin
echo "Creating full binary with magic byte..."
esptool.py --chip esp32 merge_bin \
--fill-flash-size 4MB \
--flash_mode dio \
--flash_freq 40m \
--flash_size 4MB \
-o .pio/build/esp32dev/filaman_full.bin \
0x1000 .pio/build/esp32dev/bootloader.bin \
0x8000 .pio/build/esp32dev/partitions.bin \
0x10000 .pio/build/esp32dev/firmware.bin \
0x3D0000 .pio/build/esp32dev/spiffs.bin
- name: Prepare OTA firmware
run: |
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin
-o filaman_full.bin \
0x0000 bootloader_with_magic.bin \
0x8000 partitions.bin \
0x10000 firmware.bin \
0x3D0000 spiffs.bin
# Verify magic bytes
echo "Checking magic bytes:"
echo "OTA binary first bytes:"
hexdump -C -n 16 filaman_ota.bin
echo "Full binary first bytes:"
hexdump -C -n 16 filaman_full.bin
# Verify file sizes
echo "File sizes:"
ls -lh *.bin
- name: Get version from tag
id: get_version

2
html/header.html
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.77</span></h1>
<h1>FilaMan<span class="version">v1.2.76</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/index.html
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.77</span></h1>
<h1>FilaMan<span class="version">v1.2.76</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/rfid.html
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.77</span></h1>
<h1>FilaMan<span class="version">v1.2.76</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/spoolman.html
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.77</span></h1>
<h1>FilaMan<span class="version">v1.2.76</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/upgrade.html
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.77</span></h1>
<h1>FilaMan<span class="version">v1.2.76</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/waage.html
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.77</span></h1>
<h1>FilaMan<span class="version">v1.2.76</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
html/wifi.html
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.77</span></h1>
<h1>FilaMan<span class="version">v1.2.76</span></h1>
<h4>Filament Management Tool</h4>
</div>
</div>

2
platformio.ini
View File

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

31
src/ota.cpp
View File

@ -21,52 +21,37 @@ void stopAllTasks() {
}
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
static size_t contentLength = 0;
if (!index) {
contentLength = request->contentLength();
Serial.printf("Update Start: %s (size: %u bytes)\n", filename.c_str(), contentLength);
if (contentLength == 0) {
Serial.printf("Update Start: %s\n", filename.c_str());
if (request->contentLength() == 0) {
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
return;
}
// Stoppe alle Tasks vor dem Update
if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
stopAllTasks();
tasksAreStopped = true;
}
// Für full.bin keine Magic Byte Prüfung
bool isFullImage = (contentLength > 0x300000);
if (!isFullImage && data[0] != 0xE9) {
Serial.printf("Wrong magic byte: 0x%02X (expected 0xE9)\n", data[0]);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid firmware format\"}");
return;
}
// Bei full.bin UPDATE_SIZE_UNKNOWN verwenden
if (!Update.begin(isFullImage ? UPDATE_SIZE_UNKNOWN : contentLength)) {
// Da die full.bin jetzt das korrekte Magic Byte hat,
// können wir ein normales Update ohne spezielle Flags starten
if (!Update.begin()) {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA could not begin\"}");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
return;
}
Serial.printf("Starting %s update\n", isFullImage ? "full" : "firmware");
}
// Schreibe Update-Daten
if (Update.write(data, len) != len) {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA write failed\"}");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Write failed\"}");
return;
}
// Update abschließen
if (final) {
if (!Update.end(true)) {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"OTA end failed\"}");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
return;
}
Serial.println("Update successful, restarting...");