Compare commits
17 Commits
Author | SHA1 | Date | |
---|---|---|---|
f6c92c686b | |||
b8db01529b | |||
55db6d76ab | |||
a18749a1ff | |||
1811fd9159 | |||
b550760427 | |||
c5033acadc | |||
7de4189c83 | |||
f43f2a15b2 | |||
858192c6cb | |||
e2bd39922d | |||
c86cc7173e | |||
16362e66a3 | |||
48d9ba8f71 | |||
e2bea5a0c3 | |||
3e11f65188 | |||
df59c42c8a |
7
.github/workflows/gitea-release.yml
vendored
7
.github/workflows/gitea-release.yml
vendored
@ -40,8 +40,9 @@ jobs:
|
||||
# Copy firmware binary
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||
|
||||
# Create SPIFFS binary with magic byte
|
||||
echo -ne '\xE9' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
# Create SPIFFS binary with ESP32-WROOM specific 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
|
||||
# Append the actual SPIFFS data
|
||||
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
|
||||
# Create full binary
|
||||
@ -55,7 +56,7 @@ jobs:
|
||||
0x1000 bootloader.bin \
|
||||
0x8000 partitions.bin \
|
||||
0x10000 firmware.bin \
|
||||
0x390000 spiffs.bin)
|
||||
0x3D0000 spiffs.bin)
|
||||
|
||||
# Verify file sizes
|
||||
echo "File sizes:"
|
||||
|
7
.github/workflows/github-release.yml
vendored
7
.github/workflows/github-release.yml
vendored
@ -47,8 +47,9 @@ jobs:
|
||||
# Copy firmware binary
|
||||
cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin
|
||||
|
||||
# Create SPIFFS binary with magic byte
|
||||
echo -ne '\xE9' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
# Create SPIFFS binary with ESP32-WROOM specific 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
|
||||
# Append the actual SPIFFS data
|
||||
cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
||||
|
||||
# Create full binary (always)
|
||||
@ -62,7 +63,7 @@ jobs:
|
||||
0x1000 bootloader.bin \
|
||||
0x8000 partitions.bin \
|
||||
0x10000 firmware.bin \
|
||||
0x390000 spiffs.bin)
|
||||
0x3D0000 spiffs.bin)
|
||||
|
||||
# Verify file sizes
|
||||
echo "File sizes:"
|
||||
|
32
CHANGELOG.md
32
CHANGELOG.md
@ -1,5 +1,37 @@
|
||||
# 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
|
||||
### Changed
|
||||
- update webpages for version v1.3.36
|
||||
- partition: update SPIFFS binary header and offsets in workflow files
|
||||
|
||||
|
||||
## [1.3.35] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.35
|
||||
- partition: update SPIFFS binary header and offsets in workflow files
|
||||
|
||||
|
||||
## [1.3.34] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.34
|
||||
- partition: update SPIFFS binary creation and offsets in workflow files
|
||||
|
||||
|
||||
## [1.3.33] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.33
|
||||
- partition: update spiffs offset and app sizes in partition files
|
||||
- partition: update spiffs offset in partition files
|
||||
- partition: update app sizes and offsets in partitions.csv
|
||||
|
||||
|
||||
## [1.3.32] - 2025-02-22
|
||||
### Changed
|
||||
- update webpages for version v1.3.32
|
||||
|
@ -202,6 +202,16 @@
|
||||
let response = this.responseText;
|
||||
try {
|
||||
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;
|
||||
|
||||
if (jsonResponse.restart) {
|
||||
@ -218,12 +228,9 @@
|
||||
}, 1000);
|
||||
}
|
||||
} catch (e) {
|
||||
if (!isNaN(response)) {
|
||||
const percent = parseInt(response);
|
||||
progress.style.width = percent + '%';
|
||||
progress.textContent = percent + '%';
|
||||
return;
|
||||
}
|
||||
console.error('JSON parse error:', e);
|
||||
status.textContent = 'Update failed: Invalid response from server';
|
||||
status.classList.add('error');
|
||||
}
|
||||
|
||||
status.textContent = response;
|
||||
|
@ -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, 0x180000,
|
||||
app1, app, ota_1, 0x190000, 0x180000,
|
||||
spiffs, data, spiffs, 0x310000, 0xE0000,
|
||||
app0, app, ota_0, 0x10000, 0x1E0000,
|
||||
app1, app, ota_1, 0x1F0000, 0x1E0000,
|
||||
spiffs, data, spiffs, 0x3D0000, 0x30000,
|
|
@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.3.32"
|
||||
version = "1.3.37"
|
||||
|
||||
#test
|
||||
|
||||
|
Reference in New Issue
Block a user