Compare commits
4 Commits
32a6e9dcd3
...
53ceee7816
Author | SHA1 | Date | |
---|---|---|---|
53ceee7816 | |||
d48b002806 | |||
dd905b6c6e | |||
77b9eda110 |
6
.github/workflows/gitea-release.yml
vendored
6
.github/workflows/gitea-release.yml
vendored
@ -40,10 +40,8 @@ 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 minimal ESP32 image header (chip version set to max supported)
|
# Create SPIFFS binary (without header)
|
||||||
echo -ne '\xE9\x01\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
cp .pio/build/esp32dev/spiffs.bin .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 2>/dev/null
|
|
||||||
|
|
||||||
# Create full binary
|
# Create full binary
|
||||||
(cd .pio/build/esp32dev &&
|
(cd .pio/build/esp32dev &&
|
||||||
|
6
.github/workflows/github-release.yml
vendored
6
.github/workflows/github-release.yml
vendored
@ -47,10 +47,8 @@ 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 minimal ESP32 image header (chip version set to max supported)
|
# Create SPIFFS binary (without header)
|
||||||
echo -ne '\xE9\x01\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
|
cp .pio/build/esp32dev/spiffs.bin .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 2>/dev/null
|
|
||||||
|
|
||||||
# Create full binary (always)
|
# Create full binary (always)
|
||||||
(cd .pio/build/esp32dev &&
|
(cd .pio/build/esp32dev &&
|
||||||
|
@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.3.41] - 2025-02-22
|
||||||
|
### Changed
|
||||||
|
- update webpages for version v1.3.41
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- remove redundant buffer size setting in NFC initialization
|
||||||
|
- update SPIFFS binary creation and enhance NFC buffer size
|
||||||
|
|
||||||
|
|
||||||
## [1.3.40] - 2025-02-22
|
## [1.3.40] - 2025-02-22
|
||||||
### Changed
|
### Changed
|
||||||
- update webpages for version v1.3.40
|
- update webpages for version v1.3.40
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "1.3.40"
|
version = "1.3.41"
|
||||||
|
|
||||||
#test
|
#test
|
||||||
|
|
||||||
|
@ -19,6 +19,12 @@
|
|||||||
void setup() {
|
void setup() {
|
||||||
Serial.begin(115200);
|
Serial.begin(115200);
|
||||||
|
|
||||||
|
uint64_t chipid;
|
||||||
|
|
||||||
|
chipid = ESP.getEfuseMac(); //The chip ID is essentially its MAC address(length: 6 bytes).
|
||||||
|
Serial.printf("ESP32 Chip ID = %04X", (uint16_t)(chipid >> 32)); //print High 2 bytes
|
||||||
|
Serial.printf("%08X\n", (uint32_t)chipid); //print Low 4bytes.
|
||||||
|
|
||||||
// Initialize SPIFFS
|
// Initialize SPIFFS
|
||||||
initializeSPIFFS();
|
initializeSPIFFS();
|
||||||
|
|
||||||
|
@ -403,7 +403,8 @@ void setupWebserver(AsyncWebServer &server) {
|
|||||||
backupJsonConfigs();
|
backupJsonConfigs();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Update.begin(updateSize, command)) {
|
// Setze spezifische Update-Flags für SPIFFS-Updates
|
||||||
|
if (!Update.begin(updateSize, command, command == U_SPIFFS ? true : false, command == U_SPIFFS ? 0 : -1)) {
|
||||||
if (command == U_SPIFFS) {
|
if (command == U_SPIFFS) {
|
||||||
// Restore JSON config files if update fails at start
|
// Restore JSON config files if update fails at start
|
||||||
restoreJsonConfigs();
|
restoreJsonConfigs();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user