From 06768b2671bdc6a5cfd6027e123efe6552d8e205 Mon Sep 17 00:00:00 2001 From: Yevhen Boichuk Date: Wed, 28 Oct 2026 21:59:13 +0200 Subject: [PATCH] feat: build with lilka-bootloader, install Retro-Go from .img - Lilka v2 is built with the boot menu and partition table from lilka-dev/lilka-bootloader (boot/): Keira app0/app1, Retro-Go apps, SPIFFS. KeiraOS_merged*.bin carries them (plus blank otadata), so the web flasher writes the new layout at 0x0 as before - FlashImageApp installs the apps of a full flash image (retro-go_lilka.img) into the partitions with the same labels; .bin/.img from the file manager and the catalog go there when the file has a partition table at 0x8000 - Applications -> Retro-Go when Retro-Go is installed - Keira updates target the other app0/app1 slot: web OTA picks it explicitly, KeiraUpdate refuses when esp_https_ota would overwrite another app - Init lwip before mounting filesystems and drop the /tmp VFS: IDF 4.4 has 8 VFS slots and WiFi aborted with ESP_ERR_NO_MEM once SPIFFS was mounted - CI: Python 3.11 (3.9 is gone from ubuntu-latest) Co-Authored-By: Claude Opus 5.5 --- .github/workflows/firmware.yml | 12 ++- README.md | 8 ++ boot/README.md | 27 +++++ boot/bootloader.py | 10 ++ boot/lilka_v2/bootloader.bin | Bin 0 -> 19968 bytes boot/lilka_v2/partitions.csv | 16 +++ platformio.ini | 6 +- src/apps/flashimage/flashimage.cpp | 151 +++++++++++++++++++++++++++ src/apps/flashimage/flashimage.h | 30 ++++++ src/apps/fmanager/fmanager.cpp | 2 +- src/apps/keiraupdate/keiraupdate.cpp | 6 ++ src/apps/launcher/launcher.cpp | 15 +++ src/apps/lilcatalog/lilcatalog.cpp | 2 +- src/keira/keira.h | 6 +- src/keira/ksystem.cpp | 31 +++++- src/keira/ksystem.h | 11 ++ src/keira/localizations/lang_en.h | 8 ++ src/keira/localizations/lang_uk.h | 8 ++ src/services/web/web.cpp | 5 +- 19 files changed, 337 insertions(+), 17 deletions(-) create mode 100644 boot/README.md create mode 100644 boot/bootloader.py create mode 100644 boot/lilka_v2/bootloader.bin create mode 100644 boot/lilka_v2/partitions.csv create mode 100644 src/apps/flashimage/flashimage.cpp create mode 100644 src/apps/flashimage/flashimage.h diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml index fd84681b..9863bbc5 100644 --- a/.github/workflows/firmware.yml +++ b/.github/workflows/firmware.yml @@ -31,9 +31,10 @@ jobs: ./.pio key: ${{ runner.os }}-keira - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: - python-version: '3.9' + # 3.9 isn't available for the current ubuntu-latest image + python-version: '3.11' - name: Install PlatformIO Core run: pip install --upgrade platformio @@ -97,12 +98,14 @@ jobs: PLATFORMIO_BUILD_FLAGS=-D$lang pio run -e v2 cp .pio/build/v2/firmware.bin out/keira_${lang}.bin cp .pio/build/v2/partitions.bin out/partitions.bin - cp .pio/build/v2/bootloader.bin out/bootloader.bin + cp boot/lilka_v2/bootloader.bin out/bootloader.bin pip install esptool + # boot_app0.bin is a blank otadata: the board starts Keira (app0) after flashing esptool.py --chip esp32s3 merge_bin \ -o out/KeiraOS_merged_${lang}.bin \ 0x0 out/bootloader.bin \ 0x8000 out/partitions.bin \ + 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin \ 0x10000 out/keira_${lang}.bin done else @@ -110,12 +113,13 @@ jobs: pio run -e v2 cp .pio/build/v2/firmware.bin out/keira.bin cp .pio/build/v2/partitions.bin out/partitions.bin - cp .pio/build/v2/bootloader.bin out/bootloader.bin + cp boot/lilka_v2/bootloader.bin out/bootloader.bin pip install esptool esptool.py --chip esp32s3 merge_bin \ -o out/KeiraOS_merged.bin \ 0x0 out/bootloader.bin \ 0x8000 out/partitions.bin \ + 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin \ 0x10000 out/keira.bin fi diff --git a/README.md b/README.md index ce9986bb..60b59223 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,14 @@ KeiraOS, операційна система для консолей [![Lilka](h ## 🛠️ Як прошити Lilka (KeiraOS) +Найпростіше прошити Лілку через [flasher.lilka.dev](https://flasher.lilka.dev/): виберіть версію, підключіть Лілку і натисніть «Прошити». + +`KeiraOS_merged*.bin` містить Keira разом із boot-меню та таблицею розділів [lilka-bootloader](https://github.com/lilka-dev/lilka-bootloader): +- затисніть **START** під час увімкнення, щоб вибрати Keira OS, Retro-Go або прошивку з SD-картки; +- Retro-Go встановлюється з самої Keira: відкрийте `retro-go_lilka.img` у файловому менеджері. + +Детальніше: [boot/README.md](boot/README.md). Нижче — прошивка вручну через ESPTool. + ### 1. Відкрити інструмент прошивки Перейдіть на сторінку [ESPTool (в браузері)](https://espressif.github.io/esptool-js/) > ⚠️ Працює лише в Google Chrome або Chromium-браузерах. diff --git a/boot/README.md b/boot/README.md new file mode 100644 index 00000000..beeffd5e --- /dev/null +++ b/boot/README.md @@ -0,0 +1,27 @@ +# Boot menu and partition table + +Keira for Lilka v2 is built with the boot menu and the partition table from +[lilka-bootloader](https://github.com/lilka-dev/lilka-bootloader) instead of the stock Arduino ones +(see `platformio.ini`). They're the same on every board, so `KeiraOS_merged*.bin` from the releases +writes all of it at `0x0`, e.g. with [flasher.lilka.dev](https://flasher.lilka.dev/). + +- `lilka_v2/bootloader.bin`: boot menu (hold START on reset): Keira OS, Retro-Go, firmware from the SD card +- `lilka_v2/partitions.csv`: Keira `app0`/`app1`, Retro-Go apps, SPIFFS + +Retro-Go is installed from Keira: open `retro-go_lilka.img` from the SD card (or the catalog) in the +file manager. + +Boards flashed with the stock layout keep it on OTA updates (only the app is updated); flash +`KeiraOS_merged*.bin` once over USB to switch. + +## Updating + +Built from lilka-bootloader `b070661`: + +```bash +make bootloader # in lilka-bootloader +cp bootloader/build-docker/bootloader/bootloader.bin /boot/lilka_v2/ +cp partitions.csv /boot/lilka_v2/ +``` + +Keep this file's commit reference in sync. diff --git a/boot/bootloader.py b/boot/bootloader.py new file mode 100644 index 00000000..eb5323ee --- /dev/null +++ b/boot/bootloader.py @@ -0,0 +1,10 @@ +# PlatformIO pre-script: build Keira with the lilka-bootloader boot menu (see boot/README.md). +# `board_build.arduino.custom_bootloader` is resolved inside the framework's variants dir, +# so pass it as an absolute path. +from os.path import join + +Import("env") + +env.BoardConfig().update( + "build.arduino.custom_bootloader", join(env.subst("$PROJECT_DIR"), "boot", "lilka_v2", "bootloader.bin") +) diff --git a/boot/lilka_v2/bootloader.bin b/boot/lilka_v2/bootloader.bin new file mode 100644 index 0000000000000000000000000000000000000000..2e7cee0995beb93247c0098a5cd4ec6c0927ad37 GIT binary patch literal 19968 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

cz|E1C z6V~>7L`Q&rlsJ%Z|C&14AX=xyuXzIeL5eDXs#oG|yJ~fR1S@Yo_V%c+3NqkovI4Fq z@XaxgzQd-)3vW|%v#?}XsJCRMVjFN{DMGvFBvV5Ul+lQ;4ngu!!Lk_ zBrt!>yXtk2f~ty5swKY`i0R9`}q< z&jj?NmZ!`OEI$j6t4LQx_q(r$fF%vAjfB~oGZ)SLm50Ow{ZQd$Fqu5g47y0x3p~)oFcoCctFl2 zadIw-FDlIzgPh`Ieo5(h@ga|x$FD2p^GnUsc|oF8w|%VPFYz5Be$UDvSMX8fB?Xr@ zlD(FYY}1ckoh-(0xVexGCISDE%CD0?HE} zqbSRzK5ctnK;+nQ|L@4$ndDyR=Fd>)>xVDt|m!tqgS) z|6_j&JXB^l75-rw{5B{ymFEw2R5n?}la9)h9nf9gs8%^Qk|X2mro|<4kyH~|ho_{8 zPEp(+7EvuiFF9C!g^S}NJ??J!vTy}h*IY`*=o??cVOnpd%)B@}CR|sM9y5IzRu53g z)OKPtK8;^-9OziY9tlgKxAs0sI7ka5E2*?tF5wQR{M!py7hR?6l-vSD-~bUbUgH#d zW2U{Af#2V_xbcn3&hMpVGRVXw0)<}ycIVU#EmLwE*C`P%!&RT^hU;XUJSi-~1hVj? zu(4LL*KBR$44llIT)Iq#(c$MOIGoLmjN=I?gKhd7k}Dy$#g3}>S0@X5`nYA+umz9d z#s)@sn-D^~SSW;_$2MeOn3oNYz96F+GY$xUxrLB>)V-yzX-glGnJX)suz%5(spvMB z*9R{&$M8~8RXxyGe41v_XD@RmFFZi|VG(ta$y8P!C6(!P%oovq$y8RY>1$+xfp;Oi zJp*{lsy<;=U%6aZO)Jk#SlGNtC-%lZoutj8g0r^^{wbA9yCfhu8xWk^iZ%%!Q#|B$ z2jt#sNuxqL98C##_ZeMOZiC$DQYR$$8FgxY*imlS&SS&%N&lHduK-DbPKoPl#?vL; z@j?@C+vjRAqEDmgmBY4T+L&ZzmAeBa2nLk~ghO$iLmvrZ!>_;@W2&$-UF=;}={k>-W# zv>}0VVG}P;v^;;y=`~X>@{#g#?GLx;QY3lfV`IXjEzjI?HoOf2({$npw8FHB;OE&b zVcu7zdJ`TjGHytD(>^@+r!U|7 zIsUI(hM(|X-Ex0LDQlILI&9r)cMnaCSoP@sdifTxqo*6PaN7Oz)@VAguL^J6D&7}h zVb + +// Layout of a full ESP32 flash image: partition table entries at 0x8000 +static constexpr uint32_t IMAGE_PARTITION_TABLE_OFFSET = 0x8000; +static constexpr uint16_t IMAGE_PARTITION_MAGIC = 0x50AA; +static constexpr size_t IMAGE_PARTITION_MAX_ENTRIES = 95; +static constexpr uint8_t IMAGE_PARTITION_TYPE_APP = 0x00; +static constexpr size_t FLASH_SECTOR_SIZE = 4096; + +struct __attribute__((packed)) ImagePartitionEntry { + uint16_t magic; + uint8_t type; + uint8_t subtype; + uint32_t offset; + uint32_t size; + char label[16]; + uint32_t flags; +}; + +static_assert(sizeof(ImagePartitionEntry) == 32, "partition table entry is 32 bytes"); + +FlashImageApp::FlashImageApp(const String& path) : App("FlashImage"), path(path) { + setktStackSize(8192); +} + +bool FlashImageApp::isFlashImage(const String& path) { + FILE* file = fopen(path.c_str(), "rb"); + if (!file) return false; + Defer closeFile([file]() { fclose(file); }); + + ImagePartitionEntry entry; + return fseek(file, IMAGE_PARTITION_TABLE_OFFSET, SEEK_SET) == 0 && fread(&entry, sizeof(entry), 1, file) == 1 && + entry.magic == IMAGE_PARTITION_MAGIC; +} + +bool FlashImageApp::collectParts(FILE* file, std::vector& parts) { + if (fseek(file, 0, SEEK_END) != 0) return false; + uint32_t fileSize = ftell(file); + if (fseek(file, IMAGE_PARTITION_TABLE_OFFSET, SEEK_SET) != 0) return false; + + std::vector entries; + ImagePartitionEntry entry; + while (entries.size() < IMAGE_PARTITION_MAX_ENTRIES && fread(&entry, sizeof(entry), 1, file) == 1 && + entry.magic == IMAGE_PARTITION_MAGIC) { + entries.push_back(entry); + } + + const esp_partition_t* running = esp_ota_get_running_partition(); + for (const auto& e : entries) { + if (e.type != IMAGE_PARTITION_TYPE_APP || e.offset >= fileSize) continue; + char label[sizeof(e.label) + 1] = {0}; + memcpy(label, e.label, sizeof(e.label)); + + // Only apps that have a home in Keira's partition table, and never Keira itself + const esp_partition_t* target = + esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_ANY, label); + if (!target || target == running) continue; + + uint32_t size = std::min(e.size, fileSize - e.offset); + if (size > target->size) { + error = StringFormat(K_S_FLASHIMAGE_TOO_BIG_FMT, label); + return false; + } + parts.push_back({target, e.offset, size}); + } + if (parts.empty()) { + error = K_S_FLASHIMAGE_NO_PARTS; + return false; + } + return true; +} + +bool FlashImageApp::writePart(FILE* file, const ImagePart& part, uint32_t& written, uint32_t total) { + uint32_t eraseSize = (part.size + FLASH_SECTOR_SIZE - 1) / FLASH_SECTOR_SIZE * FLASH_SECTOR_SIZE; + esp_err_t err = esp_partition_erase_range(part.target, 0, eraseSize); + if (err != ESP_OK || fseek(file, part.offset, SEEK_SET) != 0) { + error = StringFormat(K_S_FLASHIMAGE_WRITE_ERROR_FMT, part.target->label, esp_err_to_name(err)); + return false; + } + + uint8_t* buf = static_cast(calloc(1, FLASH_SECTOR_SIZE)); + if (!buf) { + error = StringFormat(K_S_FLASHIMAGE_WRITE_ERROR_FMT, part.target->label, esp_err_to_name(ESP_ERR_NO_MEM)); + return false; + } + Defer freeBuf([buf]() { free(buf); }); + + lilka::ProgressDialog dialog(K_S_FLASHIMAGE_TITLE, part.target->label); + for (uint32_t off = 0; off < part.size; off += FLASH_SECTOR_SIZE) { + size_t chunk = std::min(FLASH_SECTOR_SIZE, part.size - off); + if (fread(buf, 1, chunk, file) != chunk) { + error = StringFormat(K_S_FLASHIMAGE_WRITE_ERROR_FMT, part.target->label, "read"); + return false; + } + err = esp_partition_write(part.target, off, buf, chunk); + if (err != ESP_OK) { + error = StringFormat(K_S_FLASHIMAGE_WRITE_ERROR_FMT, part.target->label, esp_err_to_name(err)); + return false; + } + written += chunk; + dialog.setProgress(static_cast(written) * 100 / total); + dialog.draw(canvas); + queueDraw(); + } + return true; +} + +void FlashImageApp::run() { + FILE* file = fopen(path.c_str(), "rb"); + if (!file) { + alert(K_S_ERROR, StringFormat(K_S_FLASHIMAGE_WRITE_ERROR_FMT, path.c_str(), strerror(errno))); + return; + } + Defer closeFile([file]() { fclose(file); }); + + std::vector parts; + if (!collectParts(file, parts)) { + alert(K_S_ERROR, error); + return; + } + + String labels; + uint32_t total = 0; + for (const auto& part : parts) { + labels += (labels.isEmpty() ? "" : ", ") + String(part.target->label); + total += part.size; + } + String about = + StringFormat(K_S_FLASHIMAGE_CONFIRM_FMT, labels.c_str(), lilka::fileutils.getHumanFriendlySize(total).c_str()); + if (!confirm(K_S_FLASHIMAGE_TITLE, about)) return; + + uint32_t written = 0; + for (const auto& part : parts) { + if (!writePart(file, part, written, total)) { + alert(K_S_ERROR, error); + return; + } + } + + // Image's first app is its entry point (e.g. Retro-Go's launcher) + const esp_partition_t* entry = parts.front().target; + if (confirm(K_S_FLASHIMAGE_TITLE, StringFormat(K_S_FLASHIMAGE_DONE_FMT, entry->label))) { + KeiraSystem::bootPartition(entry); + } +} diff --git a/src/apps/flashimage/flashimage.h b/src/apps/flashimage/flashimage.h new file mode 100644 index 00000000..9973c876 --- /dev/null +++ b/src/apps/flashimage/flashimage.h @@ -0,0 +1,30 @@ +#pragma once +#include "keira/app.h" + +#include +#include + +// Installs the apps of a full flash image (e.g. retro-go_*_lilka.img) into the partitions with the +// same labels. The image's bootloader and partition table are ignored, Keira itself is never touched. +class FlashImageApp : public App { +public: + explicit FlashImageApp(const String& path); + + // True when the file looks like a full flash image (partition table at 0x8000) + static bool isFlashImage(const String& path); + + void run() override; + +private: + struct ImagePart { + const esp_partition_t* target; + uint32_t offset; // in the image file + uint32_t size; + }; + + bool collectParts(FILE* file, std::vector& parts); + bool writePart(FILE* file, const ImagePart& part, uint32_t& written, uint32_t total); + + String path; + String error; +}; diff --git a/src/apps/fmanager/fmanager.cpp b/src/apps/fmanager/fmanager.cpp index ecb62d98..6881a917 100644 --- a/src/apps/fmanager/fmanager.cpp +++ b/src/apps/fmanager/fmanager.cpp @@ -305,7 +305,7 @@ FMEntry FileManagerApp::pathToEntry(const String& path) { newEntry.type = FT_NES_ROM; newEntry.icon = FT_NES_ICON; newEntry.color = FT_NES_ROM_COLOR; - } else if (lowerCasedPath.endsWith(".bin")) { + } else if (lowerCasedPath.endsWith(".bin") || lowerCasedPath.endsWith(".img")) { newEntry.type = FT_BIN; newEntry.icon = FT_BIN_ICON; newEntry.color = FT_BIN_COLOR; diff --git a/src/apps/keiraupdate/keiraupdate.cpp b/src/apps/keiraupdate/keiraupdate.cpp index 50637a6e..4f8396a0 100644 --- a/src/apps/keiraupdate/keiraupdate.cpp +++ b/src/apps/keiraupdate/keiraupdate.cpp @@ -182,6 +182,12 @@ void KeiraUpdateApp::install(const FirmwareVersion& fw) { httpConfig.buffer_size_tx = KEIRA_UPDATE_TX_BUFFER; httpConfig.keep_alive_enable = true; + // esp_https_ota always writes the next OTA partition, which isn't Keira's when other apps share the flash + if (esp_ota_get_next_update_partition(NULL) != KeiraSystem::getUpdatePartition()) { + alert(K_S_ERROR, K_S_KEIRA_UPDATE_SLOT_ERROR); + return; + } + esp_https_ota_config_t otaConfig = {}; otaConfig.http_config = &httpConfig; diff --git a/src/apps/launcher/launcher.cpp b/src/apps/launcher/launcher.cpp index 60b1faf6..45d547f5 100644 --- a/src/apps/launcher/launcher.cpp +++ b/src/apps/launcher/launcher.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "keira/utils/mem.h" #include "keira/keira.h" #include "launcher.h" @@ -68,6 +69,9 @@ #include "keira/ksystem.h" #include "keira/utils/string.h" +// Partition label of Retro-Go's launcher (see boot/lilka_v2/partitions.csv) +static constexpr const char* RETRO_GO_PARTITION = "launcher"; + // Home screen wallpaper, Lua script takes priority over images, first existing image is used static const char* const WALLPAPER_LUA_PATH = "/sd/wallpaper.lua"; static const char* const WALLPAPER_PATHS[] = @@ -146,6 +150,17 @@ void LauncherApp::run() { appsItems.insert(appsItems.begin(), ITEM::APP(lastOTA.c_str(), [this]() { this->runApp(); })); } + // Retro-Go installed next to Keira (see FlashImageApp) has its launcher in its own partition. + // The app description check skips empty partitions and leftovers of an older layout. + const esp_partition_t* retroGo = + esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_ANY, RETRO_GO_PARTITION); + esp_app_desc_t retroGoDesc; + if (retroGo && esp_ota_get_partition_description(retroGo, &retroGoDesc) == ESP_OK) { + appsItems.insert(appsItems.begin(), ITEM::APP(K_S_LAUNCHER_RETRO_GO, [retroGo]() { + KeiraSystem::bootPartition(retroGo); + })); + } + item_t root_item = ITEM::SUBMENU( K_S_LAUNCHER_MAIN_MENU, { diff --git a/src/apps/lilcatalog/lilcatalog.cpp b/src/apps/lilcatalog/lilcatalog.cpp index 2b543200..f42b4fb8 100644 --- a/src/apps/lilcatalog/lilcatalog.cpp +++ b/src/apps/lilcatalog/lilcatalog.cpp @@ -897,7 +897,7 @@ ExecutionType LilCatalogApp::detectTypeByExtension(const String& location) { String loc = location; loc.toLowerCase(); if (loc.endsWith(".lua")) return EXEC_TYPE_LUA; - if (loc.endsWith(".bin")) return EXEC_TYPE_BINARY; + if (loc.endsWith(".bin") || loc.endsWith(".img")) return EXEC_TYPE_BINARY; if (loc.endsWith(".so")) return EXEC_TYPE_DYNAPP; if (loc.endsWith(".zip") || loc.endsWith(".tar") || loc.endsWith(".gz")) return EXEC_TYPE_ARCHIVE; return EXEC_TYPE_UNKNOWN; diff --git a/src/keira/keira.h b/src/keira/keira.h index 4b9c10f1..d13dbfc4 100644 --- a/src/keira/keira.h +++ b/src/keira/keira.h @@ -30,6 +30,7 @@ #include "apps/nes/nesapp.h" #include "apps/dynapp/dynapp.h" #include "apps/multiboot/multiboot.h" +#include "apps/flashimage/flashimage.h" #include "apps/imageviewer/imageviewer.h" /////////////////////////////////////////////////////////////////////////////////////////////////////// // FILETYPE HANDLERS: //////////////////////////////////////////////////////////////////////////////// @@ -39,8 +40,9 @@ #define K_FT_SOUND_HANDLER(X) ksystem.apps.spawn(new MadPlayerApp(X)) #define K_FT_LT_HANDLER(X) ksystem.apps.spawn(new LilTrackerApp(X)) #define K_FT_SO_HANDLER(X) ksystem.apps.spawn(new DynApp(X)) -#define K_FT_BIN_HANDLER(X) ksystem.apps.spawn(new MultiBootApp(X)) -#define K_FT_IMAGE_HANDLER(X) ksystem.apps.spawn(new ImageViewerApp(X)) +#define K_FT_BIN_HANDLER(X) \ + ksystem.apps.spawn(FlashImageApp::isFlashImage(X) ? static_cast(new FlashImageApp(X)) : new MultiBootApp(X)) +#define K_FT_IMAGE_HANDLER(X) ksystem.apps.spawn(new ImageViewerApp(X)) /////////////////////////////////////////////////////////////////////////////////////////////////////// // GUIDELINE: Use Keira global filetype handlers(K_FT_) if possible diff --git a/src/keira/ksystem.cpp b/src/keira/ksystem.cpp index f3e27673..ab150385 100644 --- a/src/keira/ksystem.cpp +++ b/src/keira/ksystem.cpp @@ -3,6 +3,7 @@ // Boot: #include #include +#include // Services: #ifdef KEIRA_WATCHDOG @@ -36,9 +37,6 @@ // Utils: #include "keira/utils/string.h" -// VFS -#include "keira/vfs/spiram/spiram.h" - ////////////////////////////////////////////////////////////////////////////// // GUIDELINE: external libraries to use <> in includes ////////////////////////////////////////////////////////////////////////////// @@ -176,9 +174,25 @@ void KeiraSystem::verifyOTA() { } } +const esp_partition_t* KeiraSystem::getUpdatePartition() { + const esp_partition_t* running = esp_ota_get_running_partition(); + const char* other = strcmp(running->label, "app0") == 0 ? "app1" : "app0"; + return esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_ANY, other); +} + +void KeiraSystem::bootPartition(const esp_partition_t* partition) { + esp_err_t err = esp_ota_set_boot_partition(partition); + if (err != ESP_OK) { + lilka::serial.err("Failed to set boot partition %s: %s", partition->label, esp_err_to_name(err)); + return; + } + esp_restart(); +} + void KeiraSystem::registerFileSystems() { - // TODO:To be registered as a system unit - this->vfs.push_back(new SPIRamVFS(LILKA_TMP_ROOT)); + // SPIRamVFS (/tmp) isn't registered: ESP-IDF 4.4 has only 8 VFS slots (VFS_MAX_COUNT), + // console + stdio + SD + SPIFFS + RootVFS + lwip sockets already take all of them. + // TODO: register it again once a slot is free (e.g. by serving /tmp from RootVFS) // Prepare RootVFS. Better to register it last this->rootVFS = new RootVFS(""); @@ -211,6 +225,13 @@ void KeiraSystem::showStartupScreen() { // Prepare system to launch void KeiraSystem::setup() { + // Init the network stack before any filesystem gets mounted: lwip sockets take one of the 8 + // VFS slots, and WiFi aborts on start if the filesystems have used them all up + esp_err_t err = esp_netif_init(); + if (err != ESP_OK) { + lilka::serial.err("esp_netif_init failed: %s", esp_err_to_name(err)); + } + // Init Hardware lilka::begin(); diff --git a/src/keira/ksystem.h b/src/keira/ksystem.h index 805b61ac..6dc48ce7 100644 --- a/src/keira/ksystem.h +++ b/src/keira/ksystem.h @@ -13,6 +13,7 @@ #include "keira/appmanager.h" // Libraries #include +#include //#include // VFS(Virtual File Systems): @@ -44,6 +45,16 @@ class KeiraSystem { return version; } + //======================================================================== + // Boot partitions + //======================================================================== + // Slot to update Keira into: the other one of app0/app1. Don't rely on + // esp_ota_get_next_update_partition(): with other apps sharing the flash + // (e.g. Retro-Go next to Keira) the next OTA partition may belong to them. + static const esp_partition_t* getUpdatePartition(); + // Restart into another app installed in its own OTA partition + static void bootPartition(const esp_partition_t* partition); + //======================================================================== // Arduino-like entry points //======================================================================== diff --git a/src/keira/localizations/lang_en.h b/src/keira/localizations/lang_en.h index 21812d10..94194170 100644 --- a/src/keira/localizations/lang_en.h +++ b/src/keira/localizations/lang_en.h @@ -81,6 +81,7 @@ #define K_S_LAUNCHER_LILCATALOG "LilCatalogue" #define K_S_LAUNCHER_LILTRACKER "LilTracker" #define K_S_LAUNCHER_LETRIS "Letris" +#define K_S_LAUNCHER_RETRO_GO "Retro-Go" #define K_S_LAUNCHER_TAMAGOTCHI "Tamagotchi" #define K_S_LAUNCHER_WEATHER "Weather" #define K_S_LAUNCHER_PASTEBIN "Pastebin" @@ -236,6 +237,12 @@ #define K_S_FMANAGER_MULTIBOOT_STARTING "Starting..." #define K_S_FMANAGER_MULTIBOOT_ERROR_FMT "Stage: %d\nCode: %d" +#define K_S_FLASHIMAGE_TITLE "Install apps" +#define K_S_FLASHIMAGE_CONFIRM_FMT "Install from image:\n%s\n\nSize: %s" +#define K_S_FLASHIMAGE_DONE_FMT "Installed. Start %s now?" +#define K_S_FLASHIMAGE_NO_PARTS "The image has no apps for this partition table" +#define K_S_FLASHIMAGE_TOO_BIG_FMT "%s doesn't fit its partition" +#define K_S_FLASHIMAGE_WRITE_ERROR_FMT "%s: %s" #define K_S_FMANAGER_SORTING "Sorting..." #define K_S_FMANAGER_ALMOST_DONE "Almost ready..." #define K_S_FMANAGER_THIS_OP_WOULD_DELETE_FILE "This operation would delete file\n" @@ -594,6 +601,7 @@ #define K_S_KEIRA_UPDATE_CONFIRM_FMT "Install v%s?\n\nCurrent: v%s\nLanguage: %s\nSize: %s\nDate: %s\n\nSTART - continue\nB - exit" #define K_S_KEIRA_UPDATE_DOWNLOADING_FMT "Installing v%s...\n\nB - cancel" #define K_S_KEIRA_UPDATE_ERROR_FMT "Update failed\n\n%s" +#define K_S_KEIRA_UPDATE_SLOT_ERROR "Update would overwrite another app.\nUpdate via web interface or USB" #define K_S_KEIRA_UPDATE_SUCCESS "Update installed!\n\nSystem will reboot." /////////////////////////////////////////////////////////////////////////////////////////////////////// // clang-format on diff --git a/src/keira/localizations/lang_uk.h b/src/keira/localizations/lang_uk.h index 85a81cbb..26100445 100644 --- a/src/keira/localizations/lang_uk.h +++ b/src/keira/localizations/lang_uk.h @@ -80,6 +80,7 @@ #define K_S_LAUNCHER_LILCATALOG "ЛілКаталог" #define K_S_LAUNCHER_LILTRACKER "ЛілТрекер" #define K_S_LAUNCHER_LETRIS "Летріс" +#define K_S_LAUNCHER_RETRO_GO "Retro-Go" #define K_S_LAUNCHER_TAMAGOTCHI "Тамагочі" #define K_S_LAUNCHER_WEATHER "Погода" #define K_S_LAUNCHER_PASTEBIN "Pastebin" @@ -228,6 +229,12 @@ #define K_S_FMANAGER_MULTIBOOT_STARTING "Починаємо..." #define K_S_FMANAGER_MULTIBOOT_ERROR_FMT "Етап: %d\nКод: %d" +#define K_S_FLASHIMAGE_TITLE "Встановлення застосунків" +#define K_S_FLASHIMAGE_CONFIRM_FMT "Встановити з образу:\n%s\n\nРозмір: %s" +#define K_S_FLASHIMAGE_DONE_FMT "Встановлено. Запустити %s?" +#define K_S_FLASHIMAGE_NO_PARTS "В образі немає застосунків для цієї таблиці розділів" +#define K_S_FLASHIMAGE_TOO_BIG_FMT "%s не вміщається у свій розділ" +#define K_S_FLASHIMAGE_WRITE_ERROR_FMT "%s: %s" #define K_S_FMANAGER_SORTING "Сортування..." #define K_S_FMANAGER_ALMOST_DONE "Майже готово..." #define K_S_FMANAGER_THIS_OP_WOULD_DELETE_FILE "Ця операція видалить файл\n" @@ -586,6 +593,7 @@ #define K_S_KEIRA_UPDATE_CONFIRM_FMT "Встановити v%s?\n\nПоточна: v%s\nМова: %s\nРозмір: %s\nДата: %s\n\nSTART - продовжити\nB - скасувати" #define K_S_KEIRA_UPDATE_DOWNLOADING_FMT "Встановлення v%s...\n\nB - скасувати" #define K_S_KEIRA_UPDATE_ERROR_FMT "Помилка оновлення\n\n%s" +#define K_S_KEIRA_UPDATE_SLOT_ERROR "Оновлення перезапише інший застосунок.\nОновіть через веб-інтерфейс або USB" #define K_S_KEIRA_UPDATE_SUCCESS "Оновлення встановлено!\n\nСистему буде перезавантажено." /////////////////////////////////////////////////////////////////////////////////////////////////////// // clang-format on diff --git a/src/services/web/web.cpp b/src/services/web/web.cpp index bb733e17..427fbf74 100644 --- a/src/services/web/web.cpp +++ b/src/services/web/web.cpp @@ -1015,9 +1015,8 @@ static esp_err_t upload_handler(httpd_req_t* req) { int contentLength = getContentLength(req); lilka::serial.log("FW upload binary size %d", contentLength); - auto current_partition = esp_ota_get_running_partition(); - auto ota_partition = esp_ota_get_next_update_partition(current_partition); - esp_err_t err = esp_ota_begin(ota_partition, contentLength, &ota_handle); + auto ota_partition = KeiraSystem::getUpdatePartition(); + esp_err_t err = ota_partition ? esp_ota_begin(ota_partition, contentLength, &ota_handle) : ESP_ERR_NOT_FOUND; if (err == ESP_OK) { char* buf = static_cast(malloc(WEB_BUFFER_FLASH_OP));