Compare commits

..

27 Commits

Author SHA1 Message Date
8edd50f786 docs: update changelog for version 1.2.78
Some checks failed
Release Workflow / route (push) Successful in 8s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m44s
2025-02-20 16:15:59 +01:00
b85325a747 docs: update webpages for version v1.2.78 2025-02-20 16:15:59 +01:00
e1e0352beb refactor: streamline Gitea release workflow and update version to 1.2.77 2025-02-20 16:15:48 +01:00
8a93cccfce refactor: update Gitea and GitHub release workflows to improve binary preparation and verification
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
2025-02-20 16:14:49 +01:00
c374069f36 docs: update changelog for version 1.2.77
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m33s
2025-02-20 15:53:26 +01:00
59cd7c177d refactor: optimize Gitea release workflow by simplifying build steps and improving file handling 2025-02-20 15:53:22 +01:00
45088b5838 docs: update webpages for version v1.2.77 2025-02-20 15:53:07 +01:00
1b9c79b559 docs: update changelog for version 1.2.76
Some checks failed
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Failing after 2m48s
2025-02-20 15:42:44 +01:00
37e1e861d3 docs: update webpages for version v1.2.76 2025-02-20 15:42:44 +01:00
cce39319d9 refactor: streamline Gitea release workflow and remove obsolete OTA data initialization script 2025-02-20 15:41:14 +01:00
6391054c23 feat: enhance OTA update process with improved file verification and new OTA data initialization 2025-02-20 15:07:13 +01:00
52cf46d7f8 docs: update changelog for version 1.2.75
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 2m57s
2025-02-20 14:57:17 +01:00
84b05e48ce docs: update webpages for version v1.2.75 2025-02-20 14:57:16 +01:00
5c41d864c1 refactor: simplify OTA update handling by removing unnecessary variables and improving error reporting 2025-02-20 14:56:31 +01:00
5dc3563da6 docs: update changelog for version 1.2.74
All checks were successful
Release Workflow / route (push) Successful in 7s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m17s
2025-02-20 14:46:12 +01:00
9e1b2943d6 docs: update webpages for version v1.2.74 2025-02-20 14:46:12 +01:00
7b89b04621 refactor: enhance OTA update process with improved handling of full image updates and SPIFFS data 2025-02-20 14:45:34 +01:00
e140f8e003 docs: update changelog for version 1.2.73
All checks were successful
Release Workflow / route (push) Successful in 6s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m14s
2025-02-20 14:31:44 +01:00
3d0bdde476 docs: update webpages for version v1.2.73 2025-02-20 14:31:44 +01:00
3ac7d6b4f7 refactor: improve OTA update process with enhanced size checks and progress logging 2025-02-20 14:31:10 +01:00
5f52775984 refactor: enhance OTA update process with improved size checks and debugging output 2025-02-20 14:28:11 +01:00
463eaf4b6f docs: update changelog for version 1.2.72
All checks were successful
Release Workflow / route (push) Successful in 13s
Release Workflow / verify-provider (push) Successful in 3s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Successful in 3m16s
2025-02-20 14:17:34 +01:00
4bf6b11d3a docs: update webpages for version v1.2.72 2025-02-20 14:17:34 +01:00
b0c4af7c4e refactor: simplify OTA update process by removing unnecessary buffer and adjusting offsets 2025-02-20 14:16:49 +01:00
249e896ea4 docs: update changelog for version 1.2.71
Some checks failed
Release Workflow / route (push) Successful in 6s
Release Workflow / verify-provider (push) Successful in 2s
Release Workflow / github-release (push) Has been skipped
Release Workflow / gitea-release (push) Has been cancelled
2025-02-20 14:09:21 +01:00
c74f587fff docs: update webpages for version v1.2.71 2025-02-20 14:09:21 +01:00
7a7ee72585 fix: update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary 2025-02-20 14:08:17 +01:00
14 changed files with 204 additions and 252 deletions

View File

@ -4,15 +4,12 @@ on:
workflow_call: workflow_call:
inputs: inputs:
gitea_ref_name: gitea_ref_name:
description: 'Gitea ref name'
required: true required: true
type: string type: string
gitea_server_url: gitea_server_url:
description: 'Gitea server URL'
required: true required: true
type: string type: string
gitea_repository: gitea_repository:
description: 'Gitea repository'
required: true required: true
type: string type: string
secrets: secrets:
@ -23,109 +20,94 @@ jobs:
create-release: create-release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Repository - uses: actions/checkout@v4
uses: actions/checkout@v4
- name: Set up Python
- name: Install System Dependencies uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: Install PlatformIO
run: | run: |
sudo apt-get update python -m pip install --upgrade pip
sudo apt-get install -y python3 python3-venv build-essential curl git pip install --upgrade platformio esptool
- name: Set up Python Virtual Environment
run: |
python3 -m venv venv
source venv/bin/activate
pip install --upgrade pip
pip install platformio esptool
echo "Verifying installations:"
platformio --version
python3 --version
esptool.py version
- name: Build Firmware - name: Build Firmware
run: | run: |
source venv/bin/activate pio run -t buildfs # Build SPIFFS
echo "Building SPIFFS..." pio run # Build firmware
platformio run -t buildfs
echo "Building firmware..." - name: Prepare binaries
platformio run
- name: Create Release Files
run: | run: |
source venv/bin/activate cd .pio/build/esp32dev
echo "Creating release files..."
esptool.py --chip esp32 merge_bin \
--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
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin # Create OTA binary (firmware only)
cp firmware.bin filaman_ota.bin
- name: Read CHANGELOG.md
id: changelog # Create basic flash layout
run: | echo "Creating initial 4MB flash image..."
VERSION=$(echo "${{ inputs.gitea_ref_name }}" | sed 's/^v//') dd if=/dev/zero bs=1M count=4 of=flash_4mb.bin
CHANGELOG=$(awk "/## \\[$VERSION\\]/{p=1;print;next} /## \\[/ {p=0} p" CHANGELOG.md)
echo "CHANGES<<EOF" >> $GITHUB_OUTPUT # Create partition layout
echo "$CHANGELOG" >> $GITHUB_OUTPUT echo "Writing bootloader..."
echo "EOF" >> $GITHUB_OUTPUT dd if=bootloader.bin of=flash_4mb.bin bs=1 seek=$((0x1000)) conv=notrunc
echo "CHANGELOG CONTENT:"
echo "$CHANGELOG" echo "Writing partitions..."
if [ -z "$CHANGELOG" ]; then dd if=partitions.bin of=flash_4mb.bin bs=1 seek=$((0x8000)) conv=notrunc
echo "No changelog found for version $VERSION"
exit 1 echo "Writing firmware..."
fi dd if=firmware.bin of=flash_4mb.bin bs=1 seek=$((0x10000)) conv=notrunc
echo "Writing SPIFFS..."
dd if=spiffs.bin of=flash_4mb.bin bs=1 seek=$((0x3D0000)) conv=notrunc
# Rename to final name
cp flash_4mb.bin filaman_full.bin
# Verify file sizes and content
echo "File sizes:"
ls -lh *.bin
echo "Binary information:"
esptool.py --chip esp32 image_info filaman_ota.bin || true
echo "Full binary info:"
xxd -l 64 filaman_full.bin
- name: Create Release - name: Create Release
env: env:
TOKEN: ${{ secrets.GITEA_TOKEN }} TOKEN: ${{ secrets.GITEA_TOKEN }}
GITEA_REF_NAME: ${{ inputs.gitea_ref_name }}
GITEA_SERVER_URL: ${{ inputs.gitea_server_url }}
GITEA_REPOSITORY: ${{ inputs.gitea_repository }}
CHANGELOG: ${{ steps.changelog.outputs.CHANGES }}
run: | run: |
echo "Debug environment:" TAG="${{ inputs.gitea_ref_name }}"
echo "GITEA_REF_NAME: ${GITEA_REF_NAME}" API_URL="${{ inputs.gitea_server_url }}/api/v1"
echo "GITEA_SERVER_URL: ${GITEA_SERVER_URL}" REPO="${{ inputs.gitea_repository }}"
echo "GITEA_REPOSITORY: ${GITEA_REPOSITORY}"
echo "CHANGELOG: ${CHANGELOG}"
TAG="${GITEA_REF_NAME}"
API_URL="${GITEA_SERVER_URL}/api/v1"
REPO="${GITEA_REPOSITORY}"
echo "Creating release for ${TAG} on ${REPO}..."
# Create release # Create release
RESPONSE=$(curl -k -s \ RESPONSE=$(curl -k -s \
-X POST \ -X POST \
-H "Authorization: token ${TOKEN}" \ -H "Authorization: token ${TOKEN}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d "{\"tag_name\":\"${TAG}\",\"name\":\"Release ${TAG}\",\"body\":\"${CHANGELOG}\"}" \ -d "{
\"tag_name\":\"${TAG}\",
\"name\":\"Release ${TAG}\",
\"body\":\"${{ steps.changelog.outputs.CHANGES }}\"
}" \
"${API_URL}/repos/${REPO}/releases") "${API_URL}/repos/${REPO}/releases")
RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1) RELEASE_ID=$(echo "$RESPONSE" | grep -o '"id":[0-9]*' | cut -d':' -f2 | head -n1)
UPLOAD_URL=$(echo "$RESPONSE" | grep -o '"upload_url":"[^"]*' | cut -d':' -f2- | tr -d '"')
if [ -n "$RELEASE_ID" ]; then if [ -n "$RELEASE_ID" ]; then
echo "Release created with ID: $RELEASE_ID" echo "Release created with ID: $RELEASE_ID"
# Upload files # Upload binaries
for file in "filaman_full.bin" "filaman_ota.bin"; do cd .pio/build/esp32dev
for file in filaman_full.bin filaman_ota.bin; do
echo "Uploading $file..." echo "Uploading $file..."
curl -k -s \ curl -k -s \
-X POST \ -X POST \
-H "Authorization: token ${TOKEN}" \ -H "Authorization: token ${TOKEN}" \
-H "Content-Type: application/octet-stream" \ -H "Content-Type: application/octet-stream" \
--data-binary "@.pio/build/esp32dev/$file" \ --data-binary "@$file" \
"${UPLOAD_URL}?name=$file" "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=$file"
done done
else else
echo "Failed to create release. Response:" echo "Failed to create release. Response:"

View File

@ -19,32 +19,50 @@ jobs:
- name: Install PlatformIO - name: Install PlatformIO
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install --upgrade platformio pip install --upgrade platformio esptool
- name: Build Firmware - name: Build Firmware
run: | run: |
pio run -t buildfs # Build SPIFFS pio run -t buildfs # Build SPIFFS
pio run # Build firmware pio run # Build firmware
- name: Install esptool - name: Prepare binaries
run: | run: |
pip install esptool cd .pio/build/esp32dev
- name: Merge firmware and SPIFFS # Debug: Show all generated files
run: | 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 \ esptool.py --chip esp32 merge_bin \
--fill-flash-size 4MB \
--flash_mode dio \ --flash_mode dio \
--flash_freq 40m \ --flash_freq 40m \
--flash_size 4MB \ --flash_size 4MB \
-o .pio/build/esp32dev/filaman_full.bin \ -o filaman_full.bin \
0x1000 .pio/build/esp32dev/bootloader.bin \ 0x0000 bootloader_with_magic.bin \
0x8000 .pio/build/esp32dev/partitions.bin \ 0x8000 partitions.bin \
0x10000 .pio/build/esp32dev/firmware.bin \ 0x10000 firmware.bin \
0x3D0000 .pio/build/esp32dev/spiffs.bin 0x3D0000 spiffs.bin
- name: Prepare OTA firmware # Verify magic bytes
run: | echo "Checking magic bytes:"
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/filaman_ota.bin 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 - name: Get version from tag
id: get_version id: get_version

View File

@ -1,5 +1,64 @@
# Changelog # Changelog
## [1.2.78] - 2025-02-20
### Changed
- update webpages for version v1.2.78
- streamline Gitea release workflow and update version to 1.2.77
### Fixed
- update Gitea and GitHub release workflows to improve binary preparation and verification 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
## [1.2.77] - 2025-02-20
### Changed
- optimize Gitea release workflow by simplifying build steps and improving file handling
- update webpages for version v1.2.77
## [1.2.76] - 2025-02-20
### Added
- enhance OTA update process with improved file verification and new OTA data initialization
### Changed
- update webpages for version v1.2.76
- streamline Gitea release workflow and remove obsolete OTA data initialization script
## [1.2.75] - 2025-02-20
### Changed
- update webpages for version v1.2.75
- simplify OTA update handling by removing unnecessary variables and improving error reporting
## [1.2.74] - 2025-02-20
### Changed
- update webpages for version v1.2.74
- enhance OTA update process with improved handling of full image updates and SPIFFS data
## [1.2.73] - 2025-02-20
### Changed
- update webpages for version v1.2.73
- improve OTA update process with enhanced size checks and progress logging
### Fixed
- enhance OTA update process with improved size checks and debugging output
## [1.2.72] - 2025-02-20
### Changed
- update webpages for version v1.2.72
- simplify OTA update process by removing unnecessary buffer and adjusting offsets
## [1.2.71] - 2025-02-20
### Added
- update version number to v1.2.65 in HTML files and platformio.ini; add script to create full binary
### Changed
- update webpages for version v1.2.71
## [1.2.70] - 2025-02-20 ## [1.2.70] - 2025-02-20
### Added ### Added
- add logging to stopAllTasks for better debugging - add logging to stopAllTasks for better debugging

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

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.70" version = "1.2.78"
[env:esp32dev] [env:esp32dev]
platform = espressif32 platform = espressif32
@ -59,6 +59,13 @@ build_flags =
-DOTA_PARTITION_SUBTYPE=0x10 -DOTA_PARTITION_SUBTYPE=0x10
-DPARTITION_TABLE_OFFSET=0x8000 -DPARTITION_TABLE_OFFSET=0x8000
-DPARTITION_TABLE_SIZE=0x1000 -DPARTITION_TABLE_SIZE=0x1000
-DCONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=1
-DCONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=1
-DCONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=1
-DCONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0x1000
-DCONFIG_PARTITION_TABLE_OFFSET=0x8000
-DCONFIG_PARTITION_TABLE_MD5=y
-DBOOT_APP_PARTITION_OTA_0=1
extra_scripts = extra_scripts =
scripts/extra_script.py scripts/extra_script.py

View File

@ -7,177 +7,57 @@
#include "scale.h" #include "scale.h"
#include "nfc.h" #include "nfc.h"
// Magic byte patterns für verschiedene Image-Typen static bool tasksAreStopped = false;
const uint8_t FIRMWARE_MAGIC = 0xE9;
const uint8_t ESP_MAGIC = 0xE9;
void stopAllTasks() { void stopAllTasks() {
// Stop all tasks Serial.println("Stopping RFID Reader");
Serial.println("Stopping all tasks"); if (RfidReaderTask) vTaskSuspend(RfidReaderTask);
vTaskSuspend(RfidReaderTask); Serial.println("Stopping Bambu");
vTaskSuspend(BambuMqttTask); if (BambuMqttTask) vTaskSuspend(BambuMqttTask);
vTaskSuspend(ScaleTask); Serial.println("Stopping Scale");
if (ScaleTask) vTaskSuspend(ScaleTask);
vTaskDelay(100 / portTICK_PERIOD_MS); vTaskDelay(100 / portTICK_PERIOD_MS);
Serial.println("All tasks stopped"); Serial.println("All tasks stopped");
} }
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) { void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final) {
static size_t contentLength = 0;
static bool isFullImage = false;
static uint32_t currentOffset = 0;
static uint8_t *spiffsBuffer = nullptr;
static size_t spiffsSize = 0;
static const uint32_t SPIFFS_START = 0x310000; // SPIFFS start in full.bin
stopAllTasks();
Serial.println("Start Main Upgrad Function");
if (!index) { if (!index) {
// Reset static variables Serial.printf("Update Start: %s\n", filename.c_str());
if (spiffsBuffer) { if (request->contentLength() == 0) {
free(spiffsBuffer);
spiffsBuffer = nullptr;
}
contentLength = request->contentLength();
Serial.printf("Update size: %u bytes\n", contentLength);
if (contentLength == 0) {
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}"); request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid file size\"}");
return; return;
} }
if (data[0] == ESP_MAGIC) { if (!tasksAreStopped && (RfidReaderTask || BambuMqttTask || ScaleTask)) {
isFullImage = (contentLength > 0x3D0000); stopAllTasks();
tasksAreStopped = true;
// Korrektur: Bei full.bin die gesamte Größe verwenden }
if (!Update.begin(contentLength, U_FLASH)) {
Serial.printf("Not enough space: %u required\n", contentLength); // Da die full.bin jetzt das korrekte Magic Byte hat,
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); // können wir ein normales Update ohne spezielle Flags starten
return; if (!Update.begin()) {
} Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update start failed\"}");
Serial.println(isFullImage ? "Full image update started" : "Firmware update started");
if (isFullImage) {
spiffsSize = 0x0F0000; // 960KB SPIFFS size
spiffsBuffer = (uint8_t*)malloc(spiffsSize);
if (!spiffsBuffer) {
Serial.println("Failed to allocate SPIFFS buffer");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Memory allocation failed\"}");
return;
}
memset(spiffsBuffer, 0xFF, spiffsSize); // Initialize buffer with 0xFF
}
} else {
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Invalid image format\"}");
return; return;
} }
currentOffset = 0;
} }
if (isFullImage) { if (Update.write(data, len) != len) {
// Zuerst vollständiges Firmware-Update durchführen Update.printError(Serial);
if (Update.write(data, len) != len) { request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Write failed\"}");
String errorMsg = Update.errorString(); return;
if (errorMsg != "No Error") {
Update.printError(Serial);
if (spiffsBuffer) free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing firmware: " + errorMsg + "\"}");
return;
}
}
// SPIFFS-Daten separat sammeln
if (currentOffset >= SPIFFS_START) {
uint32_t spiffsOffset = currentOffset - SPIFFS_START;
if (spiffsOffset < spiffsSize) {
size_t copyLen = min(len, spiffsSize - spiffsOffset);
memcpy(spiffsBuffer + spiffsOffset, data, copyLen);
Serial.printf("Collecting SPIFFS data at offset %u, length %u\n", spiffsOffset, copyLen);
}
}
} else {
// Normal firmware update
if (Update.write(data, len) != len) {
String errorMsg = Update.errorString();
if (errorMsg != "No Error") {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update: " + errorMsg + "\"}");
return;
}
}
} }
currentOffset += len;
if (final) { if (final) {
if (Update.end(true)) { if (!Update.end(true)) {
Serial.println("Firmware update complete"); Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed\"}");
if (isFullImage && spiffsBuffer) { return;
Serial.println("Starting SPIFFS update");
// Unmount SPIFFS first
if (SPIFFS.begin()) {
SPIFFS.end();
}
// Update SPIFFS
if (!Update.begin(spiffsSize, U_SPIFFS)) {
Serial.println("Could not begin SPIFFS update");
free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS update initialization failed\"}");
return;
}
if (Update.write(spiffsBuffer, spiffsSize) != spiffsSize) {
Serial.println("SPIFFS Write Failed");
Update.printError(Serial);
free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS write failed\"}");
return;
}
if (!Update.end(true)) {
Serial.println("SPIFFS End Failed");
Update.printError(Serial);
free(spiffsBuffer);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS finish failed\"}");
return;
}
free(spiffsBuffer);
spiffsBuffer = nullptr;
Serial.println("SPIFFS update complete");
// Verify SPIFFS
if (!SPIFFS.begin(true)) {
Serial.println("SPIFFS mount after update failed");
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"SPIFFS verification failed\"}");
return;
}
SPIFFS.end();
}
request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
delay(1000);
ESP.restart();
} else {
if (spiffsBuffer) {
free(spiffsBuffer);
spiffsBuffer = nullptr;
}
String errorMsg = Update.errorString();
if (errorMsg != "No Error") {
Update.printError(Serial);
request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Update failed: " + errorMsg + "\"}");
} else {
request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
delay(1000);
ESP.restart();
}
} }
Serial.println("Update successful, restarting...");
request->send(200, "application/json", "{\"status\":\"success\",\"message\":\"Update successful! Device will restart...\",\"restart\":true}");
delay(500);
ESP.restart();
} }
} }

View File

@ -3,6 +3,12 @@
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
// Update size unknown constant, falls nicht bereits definiert
#ifndef UPDATE_SIZE_UNKNOWN
#define UPDATE_SIZE_UNKNOWN 0xFFFFFFFF
#endif
void stopAllTasks();
void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final); void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t index, uint8_t *data, size_t len, bool final);
#endif #endif

View File

@ -12,7 +12,7 @@ bool wm_nonblocking = false;
void initWiFi() { void initWiFi() {
WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP WiFi.mode(WIFI_STA); // explicitly set mode, esp defaults to STA+AP
esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm //esp_wifi_set_max_tx_power(72); // Setze maximale Sendeleistung auf 20dBm
if(wm_nonblocking) wm.setConfigPortalBlocking(false); if(wm_nonblocking) wm.setConfigPortalBlocking(false);
wm.setConfigPortalTimeout(320); // Portal nach 5min schließen wm.setConfigPortalTimeout(320); // Portal nach 5min schließen