Compare commits

..

No commits in common. "f6c92c686b52372e04aea199a267661ed3b19f3d" and "a18749a1ffa7d5530d4dc36b2ba739fcccebad12" have entirely different histories.

5 changed files with 13 additions and 24 deletions

View File

@ -40,8 +40,9 @@ jobs:
# Copy firmware binary # Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary with ESP32-WROOM specific image header # Create SPIFFS binary with ESP32 image header
echo -ne '\xE9\x01\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x01\x03\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x30\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Append the actual SPIFFS data # Append the actual SPIFFS data
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin

View File

@ -47,8 +47,9 @@ jobs:
# Copy firmware binary # Copy firmware binary
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
# Create SPIFFS binary with ESP32-WROOM specific image header # Create SPIFFS binary with ESP32 image header
echo -ne '\xE9\x01\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x01\x03\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x30\x00\x00\x03\x01\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
# Append the actual SPIFFS data # Append the actual SPIFFS data
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin

View File

@ -1,11 +1,5 @@
# Changelog # Changelog
## [1.3.37] - 2025-02-22
### Changed
- update webpages for version v1.3.37
- workflow: update ESP32-WROOM image header for SPIFFS binary creation
## [1.3.36] - 2025-02-22 ## [1.3.36] - 2025-02-22
### Changed ### Changed
- update webpages for version v1.3.36 - update webpages for version v1.3.36

View File

@ -202,16 +202,6 @@
let response = this.responseText; let response = this.responseText;
try { try {
const jsonResponse = JSON.parse(response); const jsonResponse = JSON.parse(response);
// Handle progress updates
if (jsonResponse.progress !== undefined) {
const percent = jsonResponse.progress;
progress.style.width = percent + '%';
progress.textContent = Math.round(percent) + '%';
return;
}
// Handle success/error messages
response = jsonResponse.message; response = jsonResponse.message;
if (jsonResponse.restart) { if (jsonResponse.restart) {
@ -228,9 +218,12 @@
}, 1000); }, 1000);
} }
} catch (e) { } catch (e) {
console.error('JSON parse error:', e); if (!isNaN(response)) {
status.textContent = 'Update failed: Invalid response from server'; const percent = parseInt(response);
status.classList.add('error'); progress.style.width = percent + '%';
progress.textContent = percent + '%';
return;
}
} }
status.textContent = response; status.textContent = response;

View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[common] [common]
version = "1.3.37" version = "1.3.36"
#test #test