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

fix: update SPIFFS binary creation and enhance NFC buffer size

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-22 11:46:17 +01:00
parent 32a6e9dcd3
commit 77b9eda110
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/gitea-release.yml vendored
View File

@ -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
View File

@ -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 &&

6
src/main.cpp
View File

@ -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();

1
src/nfc.cpp
View File

@ -431,6 +431,7 @@ void scanRfidTask(void * parameter) {
} }
void startNfc() { void startNfc() {
Wire.setBufferSize(256);
nfc.begin(); // Beginne Kommunikation mit RFID Leser nfc.begin(); // Beginne Kommunikation mit RFID Leser
delay(1000); delay(1000);
unsigned long versiondata = nfc.getFirmwareVersion(); // Lese Versionsnummer der Firmware aus unsigned long versiondata = nfc.getFirmwareVersion(); // Lese Versionsnummer der Firmware aus

3
src/website.cpp
View File

@ -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();