Merge esp-flasher: on-device ESP flashing, bundled firmware, one-step install (v0.5.0)

Author: tarikbc

.github/workflows/release.yml

@@ -41,11 +41,22 @@ jobs:
         with:
           python-version: "3.12"
 
-      - name: Build Flipper app (fap)
+      - name: Build Flipper app (fap, with bundled portal + firmware)
         run: |
           pip install --upgrade ufbt
           ufbt update --index-url=https://up.momentum-fw.dev/firmware/directory.json --channel=release --hw-target=f7
-          cd flipper/flytrap && ufbt
+          tools/build-fap.sh   # populates assets/ from the ESP build above, then ufbt
+
+      # Ready-to-flash bundle for the on-device flasher: drop the "flytrap" folder
+      # into /ext/apps_data/flytrap/firmware/ on the SD (or deploy-to-flipper.py).
+      - name: Assemble firmware bundle
+        run: |
+          mkdir -p bundle/flytrap
+          cp esp32/flytrap-fw/flash.txt esp32/flytrap-fw/boot_app0.bin bundle/flytrap/
+          cp esp32/flytrap-fw/build/flytrap-fw.ino.bootloader.bin \
+             esp32/flytrap-fw/build/flytrap-fw.ino.partitions.bin \
+             esp32/flytrap-fw/build/flytrap-fw.ino.bin bundle/flytrap/
+          (cd bundle && zip -r ../flytrap-firmware-bundle.zip flytrap)
 
       - name: Publish release
         env:
@@ -58,6 +69,7 @@ jobs:
             --title "Flytrap $TAG" \
             --generate-notes \
             flipper/flytrap/dist/flytrap.fap \
+            flytrap-firmware-bundle.zip \
             esp32/flytrap-fw/build/flytrap-fw.ino.bin \
             esp32/flytrap-fw/build/flytrap-fw.ino.bootloader.bin \
             esp32/flytrap-fw/build/flytrap-fw.ino.partitions.bin

.gitignore

@@ -13,6 +13,8 @@ build/
 *.o
 *.a
 esp32/**/build/
+# ...but the firmware-bundle boot_app0 is a shipped asset, not a build artifact
+!esp32/flytrap-fw/boot_app0.bin
 
 # Python tooling (deploy/flash scripts)
 venv/
@@ -29,3 +31,6 @@ __pycache__/
 # vendored ESP build deps (fetched by tooling)
 esp32/libs/
 .gstack/
+
+# generated fap-bundled assets (portal + firmware), see tools/build-fap.sh
+flipper/flytrap/assets/

CHANGELOG.md

@@ -2,6 +2,38 @@
 
 All notable changes to Flytrap are documented here.
 
+## [0.5.0] — 2026-07-17
+
+Flash the ESP firmware from the Flipper — no computer.
+
+### Flipper app
+- **Flash Firmware** — a new menu item flashes the ESP over the GPIO UART using a
+  vendored [esp-serial-flasher](https://github.com/espressif/esp-serial-flasher)
+  (Apache-2.0) + a small `furi_hal_serial` port. Pick a firmware bundle from the SD
+  (a `flash.txt` manifest of `<offset> <file>`); it **auto-detects** the board in
+  download mode (hold BOOT, tap RESET) via the stub loader, streams each image with
+  MD5 verify, and reboots the board. Progress + result on-device.
+- **Start Portal self-heals** — if the board isn't running Flytrap firmware (no
+  beacon), Start now offers **Install firmware**, runs the flasher, and on
+  **Continue** returns to the start flow, re-detects the flashed board, and brings
+  the portal up. No computer, no separate step.
+- Only the **ESP32-S2** stub is compiled in (the full multi-chip stub table would
+  balloon the fap's RAM footprint and OOM the app).
+- **One-step install** — the portal and firmware bundle are bundled in the fap
+  (`fap_file_assets`, extracted to `apps_assets` on launch), so a fresh user just
+  installs the `.fap`; the defaults point at the bundled assets.
+
+### Fixed
+- **OOM starting the portal.** `furi_string_replace_all` on the ~38 KB portal built
+  a second full copy (~2x heap); replaced with an in-place `furi_string_replace_str`
+  loop. (Surfaced once the flasher library reduced free heap.)
+
+### Tooling / CI
+- `tools/deploy-to-flipper.py` also uploads a firmware bundle to
+  `/ext/apps_data/flytrap/firmware/flytrap/` (built images + `boot_app0.bin` +
+  `flash.txt`).
+- The release workflow attaches a ready-to-flash `flytrap-firmware-bundle.zip`.
+
 ## [0.4.1] — 2026-07-17
 
 Fixes for the portal-start flow, all found on hardware.

README.md

@@ -46,6 +46,9 @@ If that's not your use case, this isn't the project for you.
   everything also logged to `capture_<N>.txt` on the SD card.
 - **Live clients** list → detail (MAC, IP, joined time). Joins and leaves update the
   count in real time, so a device that disconnects drops off instead of lingering.
+- **Flash the ESP from the Flipper** — no computer. **Flash Firmware** picks a
+  firmware bundle off the SD, auto-detects the board in download mode, and writes it
+  over the GPIO UART (vendored [esp-serial-flasher](https://github.com/espressif/esp-serial-flasher)).
 - **Capture alerts** (haptic / beep / LED) with a **Settings** screen to toggle them.
 - A **Console** view (from the menu during a session) showing the raw serial protocol live.
 - Lightweight enough to run reliably on the SD-less ESP32-S2 dev board.

esp32/flytrap-fw/boot_app0.bin

@@ -0,0 +1,7 @@
+# Flytrap ESP32-S2 firmware  —  <flash offset>  <file>
+# Read by the on-device flasher (Flytrap -> Flash Firmware) and by
+# tools/deploy-to-flipper.py, which uploads this next to the built images.
+0x1000  flytrap-fw.ino.bootloader.bin
+0x8000  flytrap-fw.ino.partitions.bin
+0xe000  boot_app0.bin
+0x10000 flytrap-fw.ino.bin

esp32/flytrap-fw/flash.txt

@@ -5,9 +5,42 @@ App(
     entry_point="flytrap_app",
     requires=["gui"],
     stack_size=8 * 1024,
+    fap_private_libs=[
+        # espressif/esp-serial-flasher @ 3c424d2 (Apache-2.0), UART interface only.
+        # We provide the loader_port_* port in helpers/flytrap_esp_port.c.
+        Lib(
+            name="esp-serial-flasher",
+            fap_include_paths=["include"],
+            sources=[
+                "src/esp_loader.c",
+                "src/esp_targets.c",
+                "src/md5_hash.c",
+                "src/protocol_serial.c",
+                "src/protocol_uart.c",
+                "src/slip.c",
+                "src/esp_stubs.c",
+            ],
+            cincludes=["lib/esp-serial-flasher/private_include"],
+            cdefines=[
+                "SERIAL_FLASHER_INTERFACE_UART=1",
+                "MD5_ENABLED=1",
+                "SERIAL_FLASHER_WRITE_BLOCK_RETRIES=10",
+            ],
+            cflags=["-Wno-sign-compare"],
+        ),
+    ],
+    # App sources that include the flasher headers need these too.
+    cdefines=[
+        "SERIAL_FLASHER_INTERFACE_UART=1",
+        "MD5_ENABLED=1",
+        "SERIAL_FLASHER_WRITE_BLOCK_RETRIES=10",
+    ],
     fap_icon="icons/flytrap_10px.png",
     fap_category="GPIO",
+    # Bundled portal + ESP firmware; extracted to /ext/apps_assets/flytrap/ on
+    # launch so a fresh install works with no SD setup. Populated by build-fap.sh.
+    fap_file_assets="assets",
     fap_author="Tarik Caramanico",
-    fap_version="0.4.1",
+    fap_version="0.5.0",
     fap_description="Captive portal (evil portal) for the ESP32-S2 WiFi dev board. Authorized use only.",
 )

flipper/flytrap/application.fam

@@ -23,6 +23,7 @@ static bool flytrap_custom_event_callback(void* context, uint32_t event) {
 
 static bool flytrap_back_event_callback(void* context) {
     FlytrapApp* app = context;
+    if(app->flashing) return true; // swallow Back: a flash can't be safely aborted mid-write
     return scene_manager_handle_back_event(app->scene_manager);
 }
 
@@ -103,11 +104,17 @@ static FlytrapApp* flytrap_app_alloc(void) {
     app->legacy_user = furi_string_alloc();
     app->session_raw = furi_string_alloc();
     app->logfile_buf = furi_string_alloc();
+    app->flash_manifest = furi_string_alloc();
 
     app->sound_on = true; // defaults; overridden by config if present
     app->vibro_on = true;
     flytrap_storage_ensure_dirs();
     flytrap_storage_load_config(app);
+    // Fresh install with no saved selection: default to the bundled portal so
+    // Start Portal works out of the box (custom portals still go in apps_data).
+    if(furi_string_empty(app->portal_path)) {
+        furi_string_set(app->portal_path, FLYTRAP_ASSET_PORTAL);
+    }
 
     app->uart = flytrap_uart_init(115200, flytrap_uart_notify, app);
 
@@ -149,6 +156,7 @@ static void flytrap_app_free(FlytrapApp* app) {
     furi_string_free(app->legacy_user);
     furi_string_free(app->session_raw);
     furi_string_free(app->logfile_buf);
+    furi_string_free(app->flash_manifest);
 
     furi_record_close(RECORD_NOTIFICATION);
     furi_record_close(RECORD_DIALOGS);

flipper/flytrap/flytrap.c

@@ -24,4 +24,11 @@ typedef enum {
     // never freezes on a blank frame: detect the board, then send the portal.
     FlytrapEventDetectBoard = 110,
     FlytrapEventBeginSend = 111,
+    // Flash Firmware: start (after the prompt paints), progress, done.
+    FlytrapEventFlashStart = 112,
+    FlytrapEventFlashProgress = 113,
+    FlytrapEventFlashDone = 114,
+    // From the "no board" prompt: install firmware, then continue where headed.
+    FlytrapEventInstallFirmware = 115,
+    FlytrapEventFlashContinue = 116,
 } FlytrapCustomEvent;

flipper/flytrap/flytrap_custom_event.h

@@ -30,6 +30,11 @@
 
 #define FLYTRAP_DATA_DIR EXT_PATH("apps_data/flytrap")
 #define FLYTRAP_PORTALS_DIR FLYTRAP_DATA_DIR "/portals"
+#define FLYTRAP_FIRMWARE_DIR FLYTRAP_DATA_DIR "/firmware"
+// Assets bundled in the fap, extracted here on launch (fap_file_assets).
+#define FLYTRAP_ASSETS_DIR EXT_PATH("apps_assets/flytrap")
+#define FLYTRAP_ASSET_PORTAL FLYTRAP_ASSETS_DIR "/portals/social.html"
+#define FLYTRAP_DEFAULT_FW FLYTRAP_ASSETS_DIR "/firmware/flytrap/flash.txt"
 #define FLYTRAP_CONFIG_PATH FLYTRAP_DATA_DIR "/config.txt"
 #define FLYTRAP_LOGS_DIR FLYTRAP_DATA_DIR "/logs"
 #define FLYTRAP_SSID_TOKEN "{{SSID}}" // replaced with the configured SSID in portals
@@ -101,6 +106,18 @@ typedef struct FlytrapApp {
 
     FlytrapTextViewMode textview_mode;
 
+    // Flash Firmware (ESP-serial-flasher). The worker runs off the GUI thread and
+    // posts progress/done events; `flashing` blocks Back while it can't be aborted.
+    FuriThread* flash_thread;
+    FuriString* flash_manifest; // selected flash.txt path
+    volatile bool flashing; // true once connected (blocks Back mid-write)
+    volatile bool flash_cancel; // set on exit to stop the download-mode poll
+    volatile uint8_t flash_img, flash_cnt, flash_pct;
+    char flash_stage[40];
+    char flash_msg[80];
+    bool flash_ok;
+    uint8_t flash_phase; // 0=prompt, 1=flashing, 2=done
+
     // Board liveness: the ESP beacons "PING" ~every 2s; if we hear nothing for
     // FLYTRAP_LINK_TIMEOUT_MS the board is likely unplugged and we flag the link.
     uint32_t last_rx_tick;