From c989169ff46581785e10132db04d980264713571 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Wed, 18 Dec 2024 22:20:40 +0100 Subject: [PATCH] Fix workflow and auto updater webui filenames --- .forgejo/workflows/push.yaml | 2 +- src/lib/config.cpp | 13 +++++++++++++ src/lib/config.hpp | 2 +- src/lib/ota.cpp | 3 +-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/push.yaml b/.forgejo/workflows/push.yaml index 02458ae..b95439c 100644 --- a/.forgejo/workflows/push.yaml +++ b/.forgejo/workflows/push.yaml @@ -142,7 +142,7 @@ jobs: shell: bash run: | fs_file=$(find .pio/build/${{ matrix.chip.name }}_${{ matrix.epd_variant }} -name "littlefs*.bin") - shasum -a 256 "$fs_file" | awk '{print $1}' > "${fs_file}.sha256" + shasum -a 256 "$fs_file" | awk '{print $1}' > "${{ matrix.chip.name }}_${{ matrix.epd_variant }}/${fs_file}.sha256" - name: Copy all artifacts to output folder run: cp .pio/build/${{ matrix.chip.name }}_${{ matrix.epd_variant }}/*.bin .pio/boot_app0.bin ${{ matrix.chip.name }}_${{ matrix.epd_variant }} diff --git a/src/lib/config.cpp b/src/lib/config.cpp index e9912a9..1dac009 100644 --- a/src/lib/config.cpp +++ b/src/lib/config.cpp @@ -799,6 +799,19 @@ const char* getFirmwareFilename() { } } +const char* getWebUiFilename() { + if (HW_REV == "REV_B_EPD_2_13") { + return "littlefs_8MB.bin"; + } else if (HW_REV == "REV_A_EPD_2_13") { + return "littlefs_4MB.bin"; + } else if (HW_REV == "REV_A_EPD_2_9") { + return "littlefs_4MB.bin"; + } else { + return "littlefs_4MB.bin"; + } +} + + // void loadIcons() { // size_t ocean_logo_size = 886; diff --git a/src/lib/config.hpp b/src/lib/config.hpp index 53abe17..51aef87 100644 --- a/src/lib/config.hpp +++ b/src/lib/config.hpp @@ -84,5 +84,5 @@ void addScreenMapping(int value, const char* name); int findScreenIndexByValue(int value); String replaceAmbiguousChars(String input); const char* getFirmwareFilename(); - +const char* getWebUiFilename(); // void loadIcons(); \ No newline at end of file diff --git a/src/lib/ota.cpp b/src/lib/ota.cpp index 1800f76..05c45e1 100644 --- a/src/lib/ota.cpp +++ b/src/lib/ota.cpp @@ -171,14 +171,13 @@ int downloadUpdateHandler(char updateType) break; case UPDATE_WEBUI: { - latestRelease = getLatestRelease("littlefs.bin"); + latestRelease = getLatestRelease(getWebUiFilename()); // updateWebUi(latestRelease.fileUrl, U_SPIFFS); // return 0; } break; } - // First, download the expected SHA256 String expectedSHA256 = downloadSHA256(latestRelease.checksumUrl); if (expectedSHA256.isEmpty())