Send ESP-NOW accel only on deadzone change and harden BLE+WiFi OTA coex.

Quiet pods no longer spam 100 Hz samples; mute wifi logs and throttle BLE notifies during slave distribution so the wifi task stack does not panic. Co-authored-by: Cursor <cursoragent@cursor.com>
Send large BLE host frames across multiple notifies.
2026-11-02 00:55:50 +01:00 · 2026-11-01 23:53:40 +01:00 · 2026-11-01 23:43:33 +01:00 · 2026-11-01 22:57:31 +01:00 · 2026-11-01 22:51:17 +01:00 · 2026-11-01 22:35:47 +01:00
93 changed files with 8904 additions and 1175 deletions
@@ -79,8 +79,9 @@ sequenceDiagram

 | Feld | Quelle | Bedeutung |
 |------|--------|-----------|
-| `master` | `DIP_MASTER` (GPIO 4): Low = Master | Steuert UART + Registry-Nutzung |
-| `network` | IO-Expander, Bits 5–8 (nibble reversed) | 1–8 → WiFi/ESP-NOW-Kanal |
+| `master` | `DIP_MASTER` (GPIO 4): Low = Master | Steuert Host-Transport + Registry |
+| `network` | IO-Expander 8er-DIP-Bank, High-Nibble PCB-reversed; DIP1–7 one-hot | 1–7 → WiFi/ESP-NOW-Kanal |
+| `host_ble` | Expander DIP8 (nach Reverse+Invert) | `false`=UART, `true`=BLE (Boot only) |
 | `running_partition` | `esp_ota_get_running_partition()` | Aktives OTA-Label (`ota_0` / `ota_1`) |

 **Dateien:** `main/app_config.h`, `main/powerpod.c`, `main/powerpod.h` (Pins).
@@ -96,17 +97,21 @@ sequenceDiagram
 ├─────────────────────────────────────────────────────────────┤
 │  Dispatch: cmd_handler.c (Queue + vCmdDispatcherTask)       │
 ├─────────────────────────────────────────────────────────────┤
-│  Transport UART: uart.c (Framing)  │  ESP-NOW: esp_now_comm │
+│  Host transport: uart.c / ble_host.c (Framing via host_transport) │
+│  ESP-NOW: esp_now_comm                                              │
 ├─────────────────────────────────────────────────────────────┤
 │  Protokoll: uart_messages.proto    │  esp_now_messages.proto │
 │  Codec: nanopb (proto/*.pb.c)      │  esp_now_proto.c        │
 ├─────────────────────────────────────────────────────────────┤
 │  Domäne: client_registry, bosch456, led_ring, ota_*, board  │
 ├─────────────────────────────────────────────────────────────┤
-│  ESP-IDF: UART, WiFi, ESP-NOW, I2C, ADC, OTA, NVS, FreeRTOS │
+│  ESP-IDF: UART, NimBLE, WiFi, ESP-NOW, I2C, ADC, OTA, NVS   │
 └─────────────────────────────────────────────────────────────┘
 ```

+**Host UART vs BLE:** Nur einer aktiv (DIP8). Gleiches Framing (`0xAA`…`0xCC`) und dieselbe `cmd_queue`. BLE: NUS-ähnliche GATT-Char, Write=RX, Notify=TX; Frames größer als ATT MTU-3 werden in aufeinanderfolgende Notifies gestückelt (Host-Parser reassembliert). `gotool serve` verbindet UART oder BLE über Dashboard/REST/WS (`managedHost`); **OTA** über UART oder BLE (ATT MTU ≥ ~219, preferred 517). Bei BLE-Host und aktivem Accel-Stream pusht `ble_stream` periodisch `BLE_STREAM_TICK` (10–16 ms, Default 10; pausiert während OTA) mit `esp_timestamp_us` (Live-Pfad bevorzugt Tick statt CACHE_STATUS-Poll).
+
+
 ---

 ## 4. Datenfluss: Commands (Befehle)
@@ -220,12 +225,12 @@ Unabhängig von Protobuf — reines Bytestream-Framing:
 | Feld | Wert |
 |------|------|
 | Start | `0xAA` |
-| Länge | 1 Byte (1–252) |
+| Länge | 2 Bytes little-endian (1–1024) |
 | Payload | `length` Bytes |
 | Prüfsumme | XOR aller Payload-Bytes |
 | Stopp | `0xCC` |

-**Parameter:** `main/uart.h` — `UART_NUM_1`, `921600` Baud, TX GPIO **2**, RX GPIO **3**, `MAX_PAYLOAD_SIZE` 248.
+**Parameter:** `main/uart.h` — `UART_NUM_1`, `921600` Baud, TX GPIO **2**, RX GPIO **3**, `MAX_PAYLOAD_SIZE` 1024.

 ### 5.2 Nutzlast (Anwendung)

@@ -310,7 +315,7 @@ Alle Master-Sends laufen über `send_message()` / `send_message_ex()`:

 | Nachricht | Task / Trigger | Master-Ziel |
 |-----------|----------------|-------------|
-| `ESPNOW_ACCEL_SAMPLE` | `slave_accel_stream_task` 16 ms | `client_registry_update_accel()` |
+| `ESPNOW_ACCEL_SAMPLE` | `accel_stream_task` poll 10 ms + deadzone (nur bei Änderung), 1 ms slots via Discover `master_time_us` | `client_registry_update_accel()` |
 | `ESPNOW_TAP_EVENT` | BMA456-IRQ → `on_bma456_tap` | `client_registry_update_tap()` |
 | `ESPNOW_BATTERY_REPORT` | Heartbeat + nach Join | `client_registry_update_battery()` |
 | `ESPNOW_SLAVE_INFO` / `HEARTBEAT` | `slave_tx_task` / Heartbeat-Task | `client_registry_heartbeat()` |
@@ -320,7 +325,7 @@ Alle Master-Sends laufen über `send_message()` / `send_message_ex()`:

 ### 6.5 OTA über ESP-NOW

-Nach erfolgreichem UART-OTA auf dem Master (oder `OTA_START_ESPNOW`): `ota_espnow.c` liest gestagte Partition, sendet `OTA_START` / `PAYLOAD` (≤200 B, `send_message_ex` mit ACK-Semaphore) / `OTA_END` an alle **available** Slaves.
+Nach erfolgreichem UART-OTA auf dem Master (oder `OTA_START_ESPNOW`): `ota_espnow.c` liest gestagte Partition, sendet `OTA_START` / `PAYLOAD` (≤200 B, `send_message_ex` mit ACK-Semaphore) / `OTA_END` an alle **available** Slaves. Anschließend Reboot; Bootloader führt neues Image als `PENDING_VERIFY`, `ota_confirm` bestätigt nach stabilem Boot.

 Gemeinsamer Flash-Puffer: `ota_uart.c` (4 KiB Blockgröße).

@@ -343,7 +348,7 @@ flowchart TB
 |-------|-------------------|-------------------|
 | Presence, Version | HEARTBEAT / SLAVE_INFO | `CLIENT_INFO` |
 | Accel-Stream-Samples | `ESPNOW_ACCEL_SAMPLE` | `CACHE_STATUS` |
-| Tap-Events (16 ms Cache) | `ESPNOW_TAP_EVENT` | `CACHE_STATUS` |
+| Tap-Events (10 ms Cache) | `ESPNOW_TAP_EVENT` | `CACHE_STATUS` |
 | Batterie | `ESPNOW_BATTERY_REPORT` + Master-ADC | `BATTERY_STATUS` |
 | Konfig-Flags | Handler + ESP-NOW | `CLIENT_INFO`, diverse GET |

@@ -361,7 +366,7 @@ flowchart TB
 | `espnow_mon` | Master | 1 s Timeout + Master-Battery |
 | `espnow_stx` | Slave | Queue: SLAVE_INFO, Battery nach Join |
 | `espnow_hb` | Slave | 1 s Heartbeat + 30 s Battery |
-| `espnow_accel` | Slave | 16 ms Accel wenn Stream an |
+| `espnow_accel` | Slave | Accel poll 10 ms / TX bei Deadzone-Änderung, ID-Slot 1 ms wenn Stream an |
 | `bma456_poll` | Beide | 10 Hz (`bosch456.c`) |
 | `vTaskLedRing` | Beide | LED-Ring-Befehle |

@@ -386,6 +391,7 @@ flowchart TB
 | LED | `main/led_ring.c` | 95 LEDs, Digit-Maps |
 | OTA UART | `main/ota_uart.c`, `cmd/cmd_ota.c` | A/B-Partition Upload |
 | OTA ESP-NOW | `main/ota_espnow.c` | Verteilung an Slaves |
+| OTA Confirm | `main/ota_confirm.c` | Nach ~8 s `mark_app_valid` (Rollback) |
 | Einstellungen NVS | `main/pod_settings.c` | Accel-Deadzone persistent |
 | Board | `main/board_input.c` | Taster, LiPo-ADC |
 | Protobuf Schemas | `main/proto/*.proto` | Vertrag UART / ESP-NOW |
@@ -47,14 +47,15 @@ Zielbild für den Host: Befehle an den Master senden; der Master steuert Slaves
 |--------|------|----------------|
 | DIP Master/Slave | 4 | `powerpod.h` — Low = Master |
 | I2C SCL / SDA | 5 / 6 | IO-Expander `0x20`, BMA456 `0x18` |
-| UART1 TX / RX | **2 / 3** | `uart.h` (Adapter: ESP-TX → Host-RX) |
+| Expander DIP-Bank (8) | PCF/TCA @ `0x20` | DIP1–7 = Netzwerk 1–7 (one-hot); **DIP8 ON = BLE host**, OFF = UART. High-Nibble auf PCB vertauscht → `reverse_high_nibble_lut`. Wechsel nur nach Reboot. |
+| UART1 TX / RX | **2 / 3** | `uart.h` (Adapter: ESP-TX → Host-RX); nur wenn DIP8 = UART |
 | LED-Ring (WS2812) | 7 | `led_ring.c` |
 | BMA456 Interrupt | 10 | `bosch456.c` |
 | Taster | 12 | `board_input.c` |
 | LiPo ADC 1 | 1 | `board_input.c` |
 | LiPo ADC 2 | 11 | `board_input.c` |

-**UART (Host-Protokoll):** `UART_NUM_1`, **921600** Baud, 8N1, kein Flow-Control.
+**Host-Protokoll (UART oder BLE):** Gleiches Framing (`0xAA`…`0xCC`) + nanopb. **UART:** `UART_NUM_1`, **921600** Baud, 8N1. **BLE:** Gerät `Powerpod`, NUS-UUIDs `6e400001`/`6e400002` (Write=RX, Notify=TX). goTool CLI: `-port …` oder `-ble` / `-ble-name Powerpod`. **`gotool serve`** startet ohne Pflicht-Gerät; Dashboard/REST/WS verbinden UART oder BLE dynamisch (`-port`/`-ble` nur optionale Vorbelegung). **OTA** über UART oder BLE (DIP8); BLE braucht ATT MTU ≥ ~219 für 200-B-Chunks. Bei BLE + Accel-Stream: periodische `BLE_STREAM_TICK`-Notifies (`period_ms` 10–16; während OTA pausiert).

 **ESP-IDF-Log (Debug):** `esp_log_*` geht auf **UART0** (Standard-Konsole, typisch USB am Dev-Board, **115200** Baud, `CONFIG_ESP_CONSOLE_UART_NUM=0`). Das ist **getrennt** vom Host-UART1 — goTool liest keine `esp_log`-Ausgabe. Ohne angeschlossenes Debug-Kabel werden aktivierte Logs trotzdem formatiert und an UART0 gesendet (CPU-Overhead bleibt); nur `ESP_LOG_NONE` / Level-Filter vermeiden die Arbeit.

@@ -94,20 +95,20 @@ idf.py -p /dev/ttyUSB0 flash monitor
 2. `board_input_init_adc_only()` — LiPo-ADC
 3. Bei `POWERPOD_BATTERY_UV_ENABLE`: `battery_uv_evaluate_boot()` → ggf. Energiesparmodus (nur LED + ADC, **kein** weiterer Init)
 4. DIP → `app_config.master`
-5. I2C + IO-Expander → `app_config.network` (1–8)
+5. I2C + IO-Expander → `app_config.network` (1–7) + `app_config.host_ble` (DIP8)
 6. `init_bma456()` — optional, bei Fehler weiter ohne Sensor
 7. `pod_settings_apply_accel_deadzone()` wenn Sensor da
 8. OTA-Partition → `app_config.running_partition`
 9. `board_input_start_lipo_monitor()` + `board_input_init_button()`
 10. `esp_now_comm_init(&app_config)` — **normaler Pfad** (Master + Slave)
 11. `led_ring_init()`
-12. **Nur Master:** `cmd_queue` → `init_cmdHandler` → `init_uart` → alle `cmd_*_register()`
+12. **Nur Master:** `cmd_queue` → `init_cmdHandler` → `init_uart` **oder** `init_ble_host` → alle `cmd_*_register()`

 ### 4.2 Master vs. Slave

 | Funktion | Master | Slave |
 |----------|--------|-------|
-| UART Command-Handler | Ja | Nein |
+| Host Command-Handler (UART oder BLE) | Ja | Nein |
 | ESP-NOW Discover senden | Ja (Broadcast) | Nein |
 | ESP-NOW auf Discover reagieren | Nein | Ja |
 | `client_registry` für Fremdknoten | Ja | Nein (nur eigener Join-State) |
@@ -123,10 +124,10 @@ idf.py -p /dev/ttyUSB0 flash monitor
 | Byte | Inhalt |
 |------|--------|
 | 0 | `0xAA` Start |
-| 1 | Länge N (1–252) |
-| 2…N+1 | Payload |
-| N+2 | XOR-Checksum über Payload |
-| N+3 | `0xCC` Stopp |
+| 1–2 | Länge N little-endian (1–1024) |
+| 3…N+2 | Payload |
+| N+3 | XOR-Checksum über Payload |
+| N+4 | `0xCC` Stopp |

 Implementierung: `uart.c` — `parse_uart_byte()`, `uart_send_framed()`.

@@ -176,7 +177,7 @@ UART_CMD_REQ(&uart_msg, alox_UartMessage_accel_deadzone_request_tag, accel_deadz
 | `ESPNOW_HEARTBEAT` | S→M | `heartbeat` | Keepalive 1 s |
 | `ESPNOW_SET_ACCEL_DEADZONE` | M→S | `accel_deadzone` | Deadzone LSB |
 | `ESPNOW_SET_TAP_CONFIG` | M→S | `tap_config` | Multitap-Parameter + NVS |
-| `ESPNOW_SET_ACCEL_STREAM` | M→S | `accel_stream` | Stream ~16 ms |
+| `ESPNOW_SET_ACCEL_STREAM` | M→S | `accel_stream` | Stream poll ~10 ms, TX on deadzone change |
 | `ESPNOW_ACCEL_SAMPLE` | S→M | `accel_sample` | x/y/z Roh-LSB |
 | `ESPNOW_SET_TAP_NOTIFY` | M→S | `tap_notify` | Tap-Arten filtern |
 | `ESPNOW_TAP_EVENT` | S→M | `tap_event` | kind 1/2/3 |
@@ -198,7 +199,7 @@ UART_CMD_REQ(&uart_msg, alox_UartMessage_accel_deadzone_request_tag, accel_deadz
 | Heartbeat | 1000 ms |
 | Client-Timeout (Master) | 3 × Heartbeat = 3 s → `available=false` |
 | Master-Verlust (Slave) | 5 s ohne Discover |
-| Accel-Stream | 16 ms |
+| Accel-Stream | Poll 10 ms; TX nur bei Deadzone-Änderung (best-effort) |
 | Batterie-Report | 30 s (+ einmal 150 ms nach Join) |
 | Echo-Ping Timeout (Master) | 500 ms (`ESPNOW_ECHO_PING_TIMEOUT_MS`) |

@@ -225,7 +226,7 @@ Nur auf dem **Master** registriert (`powerpod.c`). IDs aus `MessageType` in `uar
 | 6 | ACCEL_DEADZONE | `cmd_accel_deadzone.c` | Get/Set Deadzone lokal + ESP-NOW |
 | 7 | ESPNOW_UNICAST_TEST | `cmd_espnow_unicast_test.c` | Link-Test zu Slave |
 | 8 | LED_RING | `cmd_led_ring.c` | Ring lokal / ESP-NOW |
-| 16 | OTA_START | `cmd_ota.c` | UART-OTA beginnen |
+| 16 | OTA_START | `cmd_ota.c` | Host-OTA beginnen (UART oder BLE) |
 | 17 | OTA_PAYLOAD | `cmd_ota.c` | Chunk ≤200 B |
 | 18 | OTA_END | `cmd_ota.c` | Abschluss + ESP-NOW-Verteilung |
 | 19 | OTA_STATUS | `cmd_ota.c` | Gerät → Host Status |
@@ -233,10 +234,11 @@ Nur auf dem **Master** registriert (`powerpod.c`). IDs aus `MessageType` in `uar
 | 21 | OTA_SLAVE_PROGRESS | `cmd_ota_slave_progress.c` | Fortschritt pro Slave |
 | 22 | FIND_ME | `cmd_espnow_find_me.c` | LED Locate |
 | 23 | RESTART | `cmd_restart.c` | Master oder Slave reboot |
-| 25 | ACCEL_STREAM | `cmd_accel_stream.c` | ESP-NOW Accel-Stream an/aus |
+| 25 | ACCEL_STREAM | `cmd_accel_stream.c` | ESP-NOW Accel-Stream an/aus (+ `period_ms` für BLE-Push) |
 | 26 | BATTERY_STATUS | `cmd_battery.c` | Cache LiPo Master + Slaves |
 | 27 | TAP_NOTIFY | `cmd_tap_notify.c` | Tap-Weiterleitung konfigurieren |
 | 29 | CACHE_STATUS | `cmd_cache_status.c` | Accel + Tap Cache (ein Round-Trip) |
+| 33 | BLE_STREAM_TICK | `ble_stream.c` | Master→Host Notify (nur BLE): Snapshot + `esp_timestamp_us` |
 | 30 | ESPNOW_ECHO_PING | `cmd_espnow_echo_ping.c` | Timestamp-Echo über ESP-NOW (Latenztest) |
 | 31 | SET_LOG_LEVEL | `cmd_set_log_level.c` | ESP-IDF-Log-Level global (`"*"`) lesen/setzen |
 | 32 | TAP_CONFIG | `cmd_tap_config.c` | BMA456 Multitap-Parameter + NVS |
@@ -258,8 +260,9 @@ Nur auf dem **Master** registriert (`powerpod.c`). IDs aus `MessageType` in `uar

 ### 7.4 ACCEL_STREAM (25)

+- Optional `period_ms` (10–16): BLE-Host-Push-Intervall für `BLE_STREAM_TICK` (UART ignoriert; Default 10).
 - Master setzt `client_registry_set_accel_stream` und sendet `ESPNOW_SET_ACCEL_STREAM`.
- Slave-Task `slave_accel_stream_task` sendet `ESPNOW_ACCEL_SAMPLE` alle 16 ms.
+- Slave-Task `accel_stream_task` pollt alle 10 ms; sendet `ESPNOW_ACCEL_SAMPLE` nur wenn eine Achse die Accel-Deadzone seit dem letzten gesendeten Sample überschreitet (best-effort / `send_best_effort`; Baseline-Reset beim Stream-Enable).

 ### 7.5 TAP_NOTIFY (27)

@@ -355,9 +358,9 @@ go run . -port /dev/ttyUSB0 log-level -set -level 3

 ## 8. OTA

-### 8.1 UART-OTA (nur Master)
+### 8.1 Host-OTA (nur Master, UART oder BLE)

-Implementierung: `ota_uart.c`, Steuerung `cmd/cmd_ota.c`.
+Implementierung: `ota_uart.c`, Steuerung `cmd/cmd_ota.c`. Gleiches Protokoll über DIP8-Host (UART oder BLE NUS).

 | Phase | Host → Master | Master → Host |
 |-------|---------------|---------------|
@@ -367,17 +370,20 @@ Implementierung: `ota_uart.c`, Steuerung `cmd/cmd_ota.c`.

 - Inaktive Partition: `esp_ota_get_next_update_partition()`.
 - LED-Ring zeigt Fortschritt (blau Schreiben, grün Verteilung).
+- BLE: ATT MTU ≥ ~219 (preferred 517); große Antworten werden über mehrere Notifies gestückelt; `BLE_STREAM_TICK` pausiert während `ota_session_busy()`.
+- **BLE+ESP-NOW Coex:** Tag `wifi` auf `ESP_LOG_NONE` (WiFi-Task-Stack + Error-Logs → Overflow/Panic); während ESP-NOW-Dist `OTA_STATUS` DISTRIBUTING max. ~4/s und kürzere BLE-Notify-Retries.
+- **App-Rollback** (`CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE`): neues Image bootet als `PENDING_VERIFY`. `ota_confirm` markiert nach ~8 s stabilem Lauf `mark_app_valid`; Crash/Reset davor → Bootloader rollt auf die vorherige App zurück. Während `PENDING_VERIFY` ist ein neues `OTA_START` blockiert.

 ### 8.2 ESP-NOW-OTA (Master → Slaves)

-`ota_espnow.c` — gleiche Status-Codes wie UART.
+`ota_espnow.c` — gleiche Status-Codes wie Host-OTA.

 1. `ESPNOW_OTA_START` + `total_size` → Slave `ota_espnow_slave_on_start`
 2. `ESPNOW_OTA_PAYLOAD` bis 200 B → 4 KiB Buffer auf Slave
-3. `ESPNOW_OTA_END` → Boot-Partition setzen
+3. `ESPNOW_OTA_END` → Boot-Partition setzen + automatischer Reboot
 4. Slave antwortet `ESPNOW_OTA_STATUS` (mit `send_message_ex` + Semaphore auf Master)

-Nach Erfolg: **alle Knoten neu starten**.
+Während Distribution: keine Client-Timeouts in der Registry (Heartbeats werden im recv_cb verworfen). Nach Erfolg: Master und Slaves starten automatisch neu (Rollback-Confirm siehe 8.1).

 ### 8.3 OTA_SLAVE_PROGRESS (21)

@@ -424,16 +430,18 @@ Spannungen in Millivolt in Registry und `BATTERY_STATUS`-UART.

 ### Software-UV-Schutz (`battery_uv.c`)

-Aktivierbar mit `POWERPOD_BATTERY_UV_ENABLE` in `powerpod.h` (CMake-Override möglich).
+Aktivierbar mit `POWERPOD_BATTERY_UV_ENABLE` in `powerpod.h` (CMake-Override möglich). Runtime zusätzlich NVS `uv_en` (Default **aus**) — UART `BATTERY_UV` / Dashboard / ESP-NOW `ESPNOW_SET_BATTERY_UV`.

 | Zustand | ADC-Schwelle | Logik |
 |---------|--------------|-------|
-| UV | &lt; 2300 mV | Ein gültiger Kanal reicht |
-| Geladen | ≥ 3000 mV | Alle gültigen Kanäle |
+| Extern / kein Pack | &lt; 100 mV | Alle gültigen Kanäle → normaler Boot |
+| UV | 100…2299 mV | Ein gültiger Kanal reicht |
+| Geladen | ≥ 3000 mV | Alle nicht-absent gültigen Kanäle |

- NVS-Key `uv_latch` in `pod_settings.c`
- Boot: ADC früh, bei UV nur LED + ADC-Poll (kein ESP-NOW/WiFi/UART/I2C/Button)
- Runtime: `battery_uv_poll()` im LiPo-Monitor (2 Samples Debounce)
+- NVS-Keys `uv_latch`, `uv_en` in `pod_settings.c`
+- Boot: ADC früh, bei UV nur LED + ADC-Poll (kein ESP-NOW/WiFi/UART/I2C/Button); übersprungen wenn `uv_en=0`
+- Runtime: `battery_uv_poll()` im LiPo-Monitor (2 Samples Debounce), gated by `uv_en`
+- UART `BATTERY_UV`: `client_id` / `all_clients`; Disable cleart Latch
 - LED-Anzeige: Mode `6` battery-low (`led_ring_show_battery_low`)

 ---
@@ -447,6 +455,7 @@ Aktivierbar mit `POWERPOD_BATTERY_UV_ENABLE` in `powerpod.h` (CMake-Override mö
 | `accel_dz` | Accel-Deadzone LSB |
 | `tap_cfg` | BMA456 Multitap-Config (Blob) |
 | `uv_latch` | Software-UV-Zustand (`1` = Energiesparmodus) |
+| `uv_en` | Runtime-Enable UV-Schutz (`0`/`1`, fehlend = aus) |

 Gespeichert bei lokalem Set (UART `client_id=0`, ESP-NOW auf Slave). Geladen nach `init_bma456()`.

@@ -287,7 +287,7 @@ Entspricht `main/README.md`:

 | Byte | Inhalt |
 |------|--------|
-| Frame | `0xAA`, Länge, Payload, XOR-Checksum, `0xCC` |
+| Frame | `0xAA`, Länge (uint16 LE), Payload, XOR-Checksum, `0xCC` |
 | Payload[0] | `MessageType` (z.B. `22` = FIND_ME) |
 | Payload[1…] | Nanopb-`UartMessage` |

@@ -27,7 +27,7 @@ go run . -port /dev/ttyUSB0 clients
 | `deadzone` | `0x06` | Get/set accelerometer deadzone LSB (`-set`, `-value`, `-client`, `-all`) |
 | `tap-config` | `0x20` | Get/set BMA456 tap detection params (`-set`, `-client`, `-all`, `-sens`, `-max-gest`, `-shock`, `-quiet`, `-wait`, `-axis`, `-single`, `-double`, `-triple`) |
 | `tap-notify` | `0x1b` | Get/set which tap kinds (single/double/triple) notify via ESP-NOW (`-set`, `-client`, `-all`, `-single`, `-double`, `-triple`) |
-| `cache-status` | `0x1d` | Subscribed accel + tap cache (`CACHE_STATUS`); one UART round-trip for 16 ms polling |
+| `cache-status` | `0x1d` | Subscribed accel + tap cache (`CACHE_STATUS`); one UART round-trip for ~8 ms polling |
 | `unicast-test` | `0x07` | Sends ESP-NOW unicast test to one slave (`-client`, `-seq`) |
 | `echo-ping` | `0x1e` | ESP-NOW echo round-trip to one slave (`-client`); prints `rtt_ms` (host UART chain) and `esp_rtt_us` (master ESP-NOW, raw µs) |
 | `test` | — | Run an automated scenario (JSON configs under `testdata/`) |
@@ -38,6 +38,8 @@ go run . -port /dev/ttyUSB0 clients
 | `find-me` | 22 | Locate pod (`-client 0` master, `>0` slave via ESP-NOW) |
 | `restart` | 23 | Reboot master or slave (`-client 0` / `>0`) |
 | `log-level` | `0x1f` | Get/set master ESP-IDF log level for tag `"*"` (`-set`, `-level` 0–5); output on UART0 debug, not host UART |
+| `battery-uv` | `0x24` | Get/set software LiPo UV protection (`-set -enable`/`-enable=false`, `-client`, `-all`) |
+| `input-send-mode` | `0x23` | Get/set slave accel/tap ESP-NOW TX path (`-set -mode 0..3`, `-all` or `-client N`): best_effort/fast/wait/reliable |

 `clients` requires slaves to have responded to master discover broadcasts first.

@@ -61,31 +63,33 @@ See [`testdata/README.md`](testdata/README.md) for the JSON schema.

 ### Web dashboard

-Polls the master over UART and pushes state to the browser via WebSocket (Alpine.js + Bootstrap 5).
+Starts without a required host link. Connect UART or BLE from the UI (or pre-connect with `-port` / `-ble`). State is pushed to the browser via WebSocket (Alpine.js + Bootstrap 5). OTA works over UART or BLE (BLE needs ATT MTU ≥ 219).

 ```bash
+go run . serve
 go run . -port /dev/ttyUSB0 serve
-go run . -port /dev/ttyUSB0 serve -addr :8080 -interval 2s
-go run . -port /dev/ttyUSB0 serve -api-addr :8081 -accel-interval 16ms
+go run . -ble serve
+go run . serve -addr :8080 -interval 2s
+go run . serve -api-addr :8081 -accel-interval 16ms
 make gotool-serve PORT=/dev/ttyUSB0
 ```

-Open [http://localhost:8080](http://localhost:8080) — shows master firmware info and the ESP-NOW client table from `CLIENT_INFO`.
+Open [http://localhost:8080](http://localhost:8080) — Host-Verbindung panel (UART ports / BLE scan), master firmware info, ESP-NOW client table.

 **Tap (dashboard):** two independent controls per slave:

 | Column | Meaning |
 |--------|---------|
 | Tap-Notify (S/D/T) | Which tap kinds the **slave** sends to the master over ESP-NOW (UART `TAP_NOTIFY`) — does **not** poll UART |
-| Tap (An/Aus) | Host **receive**: poll master tap cache (~16 ms) and show last tap for **≥2 s** |
+| Tap (An/Aus) | Host **receive**: poll master tap cache (~8 ms) and show last tap for **≥2 s** |

 Enable notify first, then turn receive on to see events. Same split as the external WebSocket API (`set_tap_notify` vs `set_tap_stream`).

-If the UART device is unplugged or the port disappears, `serve` keeps running and retries on each poll interval; the UI shows **UART off** until the port is available again.
+If the host disconnects, `serve` keeps running; the badge shows **off** until you reconnect from the UI or via REST/WS.

 ### HTTP / WebSocket API

-`serve` also listens on **`:8081`** for external programs (`-api-addr`, empty to disable). Same UART as the dashboard.
+`serve` also listens on **`:8081`** for external programs (`-api-addr`, empty to disable). Same `managedHost` as the dashboard (UART or BLE).

 | Doc | Content |
 |-----|---------|
@@ -108,6 +112,7 @@ go run . -port /dev/ttyUSB0 cache-status

 ```bash
 go run . -port /dev/ttyUSB0 ota build/powerpod.bin
+go run . -ble ota build/powerpod.bin
 ```

 Waits for **ready** after start (~30 s erase), sends 200-byte `OTA_PAYLOAD` frames, reads **block_ack** every 4 KiB, then `OTA_END`. The master then distributes to all available slaves (no extra host traffic); **success** is reported only when that finishes. Allow several minutes for large images. Reboot master and slaves to boot the new firmware.
@@ -0,0 +1,140 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"powerpod/gotool/pb"
+)
+
+type batteryUvAPIRequest struct {
+	Write      bool   `json:"write"`
+	Enabled    bool   `json:"enabled"`
+	ClientID   uint32 `json:"client_id"`
+	AllClients bool   `json:"all_clients"`
+	// SlavesOnly: with all_clients, push to ESP-NOW slaves only (master NVS unchanged).
+	SlavesOnly bool `json:"slaves_only"`
+}
+
+type batteryUvAPIResponse struct {
+	ClientID      uint32 `json:"client_id"`
+	Success       bool   `json:"success"`
+	Enabled       bool   `json:"enabled"`
+	Latched       bool   `json:"latched"`
+	SlavesUpdated uint32 `json:"slaves_updated"`
+	Error         string `json:"error,omitempty"`
+}
+
+func mountBatteryUvAPI(mux *http.ServeMux, link *managedSerial) {
+	mux.HandleFunc("/api/battery-uv", func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case http.MethodGet:
+			serveBatteryUvGet(w, r, link)
+		case http.MethodPost:
+			serveBatteryUvPost(w, r, link)
+		default:
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+		}
+	})
+}
+
+func serveBatteryUvGet(w http.ResponseWriter, r *http.Request, link *managedSerial) {
+	clientID, err := parseUintQuery(r, "client_id", 0)
+	if err != nil {
+		writeJSON(w, http.StatusBadRequest, batteryUvAPIResponse{Error: err.Error()})
+		return
+	}
+	resp, err := link.BatteryUv(&pb.BatteryUvRequest{
+		Write:    false,
+		ClientId: clientID,
+	})
+	if err != nil {
+		writeJSON(w, http.StatusServiceUnavailable, batteryUvAPIResponse{
+			ClientID: clientID,
+			Error:    err.Error(),
+		})
+		return
+	}
+	writeJSON(w, http.StatusOK, batteryUvAPIResponse{
+		ClientID:      resp.GetClientId(),
+		Success:       resp.GetSuccess(),
+		Enabled:       resp.GetEnabled(),
+		Latched:       resp.GetLatched(),
+		SlavesUpdated: resp.GetSlavesUpdated(),
+	})
+}
+
+func serveBatteryUvPost(w http.ResponseWriter, r *http.Request, link *managedSerial) {
+	var body batteryUvAPIRequest
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeJSON(w, http.StatusBadRequest, batteryUvAPIResponse{Error: "invalid JSON"})
+		return
+	}
+	if body.AllClients && body.SlavesOnly {
+		updated, err := applyBatteryUvToSlaves(link, body.Enabled)
+		if err != nil {
+			writeJSON(w, http.StatusServiceUnavailable, batteryUvAPIResponse{
+				Enabled: body.Enabled,
+				Error:   err.Error(),
+			})
+			return
+		}
+		writeJSON(w, http.StatusOK, batteryUvAPIResponse{
+			Success:       updated > 0,
+			Enabled:       body.Enabled,
+			SlavesUpdated: updated,
+		})
+		return
+	}
+
+	resp, err := link.BatteryUv(&pb.BatteryUvRequest{
+		Write:      true,
+		Enabled:    body.Enabled,
+		ClientId:   body.ClientID,
+		AllClients: body.AllClients,
+	})
+	if err != nil {
+		writeJSON(w, http.StatusServiceUnavailable, batteryUvAPIResponse{
+			ClientID: body.ClientID,
+			Enabled:  body.Enabled,
+			Error:    err.Error(),
+		})
+		return
+	}
+	writeJSON(w, http.StatusOK, batteryUvAPIResponse{
+		ClientID:      resp.GetClientId(),
+		Success:       resp.GetSuccess(),
+		Enabled:       resp.GetEnabled(),
+		Latched:       resp.GetLatched(),
+		SlavesUpdated: resp.GetSlavesUpdated(),
+	})
+}
+
+func applyBatteryUvToSlaves(link *managedSerial, enabled bool) (uint32, error) {
+	clients, err := link.listClients()
+	if err != nil {
+		return 0, err
+	}
+	var updated uint32
+	for _, c := range clients {
+		resp, err := link.BatteryUv(&pb.BatteryUvRequest{
+			Write:    true,
+			Enabled:  enabled,
+			ClientId: c.GetId(),
+		})
+		if err != nil {
+			continue
+		}
+		if resp.GetSuccess() {
+			updated++
+		}
+	}
+	if len(clients) == 0 {
+		return 0, fmt.Errorf("no slaves registered")
+	}
+	if updated == 0 {
+		return 0, fmt.Errorf("UV protection not applied to any slave")
+	}
+	return updated, nil
+}
@@ -0,0 +1,129 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"io"
+	"net/http"
+	"time"
+)
+
+type bleRttAPIRequest struct {
+	Count   *int     `json:"count"`
+	Warmup  *int     `json:"warmup"`
+	SettleS *float64 `json:"settle_s"`
+}
+
+type bleStreamAPIRequest struct {
+	ClientID *uint32  `json:"client_id"`
+	PeriodMs *uint32  `json:"period_ms"`
+	Count    *int     `json:"count"`
+	TolMs    *float64 `json:"tol_ms"`
+	TimeoutS *float64 `json:"timeout_s"`
+}
+
+func mountBleTestAPI(mux *http.ServeMux, link *managedHost) {
+	mux.HandleFunc("/api/ble-rtt", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+		serveBleRtt(w, r, link)
+	})
+	mux.HandleFunc("/api/ble-stream", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+		serveBleStreamTest(w, r, link)
+	})
+}
+
+func requireBLEHost(w http.ResponseWriter, link *managedHost) bool {
+	if link.Transport() != hostTransportBLE || !link.IsConnected() {
+		writeJSON(w, http.StatusBadRequest, bleRttResult{
+			Error: "BLE host required (connect via BLE, DIP8=1)",
+		})
+		return false
+	}
+	return true
+}
+
+func serveBleRtt(w http.ResponseWriter, r *http.Request, link *managedHost) {
+	if !requireBLEHost(w, link) {
+		return
+	}
+	var body bleRttAPIRequest
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil && !errors.Is(err, io.EOF) {
+		writeJSON(w, http.StatusBadRequest, bleRttResult{Error: "invalid JSON"})
+		return
+	}
+	count, warmup := 50, 5
+	settle := 0.0
+	if body.Count != nil {
+		count = *body.Count
+	}
+	if body.Warmup != nil {
+		warmup = *body.Warmup
+	}
+	if body.SettleS != nil {
+		settle = *body.SettleS
+	}
+
+	if !link.beginPausePoll() {
+		writeJSON(w, http.StatusConflict, bleRttResult{Error: "host busy"})
+		return
+	}
+	defer link.endPausePoll()
+
+	out := measureBleRtt(link, count, warmup, time.Duration(settle*float64(time.Second)))
+	status := http.StatusOK
+	if !out.Success {
+		status = http.StatusBadRequest
+	}
+	writeJSON(w, status, out)
+}
+
+func serveBleStreamTest(w http.ResponseWriter, r *http.Request, link *managedHost) {
+	if !requireBLEHost(w, link) {
+		return
+	}
+	var body bleStreamAPIRequest
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil && !errors.Is(err, io.EOF) {
+		writeJSON(w, http.StatusBadRequest, bleStreamResult{Error: "invalid JSON"})
+		return
+	}
+	count := 50
+	periodMs := uint32(10)
+	tolMs := 2.0
+	timeoutS := 15.0
+	var clientID uint32
+	if body.Count != nil {
+		count = *body.Count
+	}
+	if body.PeriodMs != nil {
+		periodMs = *body.PeriodMs
+	}
+	if body.TolMs != nil {
+		tolMs = *body.TolMs
+	}
+	if body.TimeoutS != nil {
+		timeoutS = *body.TimeoutS
+	}
+	if body.ClientID != nil {
+		clientID = *body.ClientID
+	}
+
+	if !link.beginPausePoll() {
+		writeJSON(w, http.StatusConflict, bleStreamResult{Error: "host busy"})
+		return
+	}
+	defer link.endPausePoll()
+
+	out := measureBleStream(link, clientID, periodMs, count, tolMs, timeoutS)
+	status := http.StatusOK
+	if !out.Success {
+		status = http.StatusBadRequest
+	}
+	writeJSON(w, status, out)
+}
@@ -0,0 +1,140 @@
+package main
+
+import (
+	"encoding/json"
+	"net/http"
+	"time"
+)
+
+type hostAPIResponse struct {
+	Transport string `json:"transport"`
+	Endpoint  string `json:"endpoint"`
+	Connected bool   `json:"connected"`
+	BleName   string `json:"ble_name,omitempty"`
+	Error     string `json:"error,omitempty"`
+}
+
+type hostConnectRequest struct {
+	Transport string `json:"transport"` // uart|ble
+	Port      string `json:"port,omitempty"`
+	Address   string `json:"address,omitempty"`
+	Name      string `json:"name,omitempty"`
+	Baud      int    `json:"baud,omitempty"`
+}
+
+type bleScanRequest struct {
+	TimeoutS   float64 `json:"timeout_s"`
+	NameFilter string  `json:"name_filter"`
+}
+
+type bleScanResponse struct {
+	Devices []bleScanDevice `json:"devices"`
+	Error   string          `json:"error,omitempty"`
+}
+
+type serialPortsResponse struct {
+	Ports []string `json:"ports"`
+	Error string   `json:"error,omitempty"`
+}
+
+func mountHostAPI(mux *http.ServeMux, link *managedHost) {
+	mux.HandleFunc("/api/host", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodGet {
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+		st := link.HostStatus()
+		writeJSON(w, http.StatusOK, hostAPIResponse{
+			Transport: st["transport"].(string),
+			Endpoint:  st["endpoint"].(string),
+			Connected: st["connected"].(bool),
+			BleName:   st["ble_name"].(string),
+		})
+	})
+
+	mux.HandleFunc("/api/host/connect", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+		var body hostConnectRequest
+		if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+			writeJSON(w, http.StatusBadRequest, hostAPIResponse{Error: "invalid JSON"})
+			return
+		}
+		var err error
+		switch body.Transport {
+		case hostTransportUART:
+			err = link.ConnectUART(body.Port, body.Baud)
+		case hostTransportBLE:
+			err = link.ConnectBLE(body.Address, body.Name)
+		default:
+			writeJSON(w, http.StatusBadRequest, hostAPIResponse{Error: "transport must be uart or ble"})
+			return
+		}
+		st := link.HostStatus()
+		resp := hostAPIResponse{
+			Transport: st["transport"].(string),
+			Endpoint:  st["endpoint"].(string),
+			Connected: st["connected"].(bool),
+			BleName:   st["ble_name"].(string),
+		}
+		if err != nil {
+			resp.Error = err.Error()
+			resp.Connected = false
+			writeJSON(w, http.StatusBadRequest, resp)
+			return
+		}
+		writeJSON(w, http.StatusOK, resp)
+	})
+
+	mux.HandleFunc("/api/host/disconnect", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+		_ = link.Disconnect()
+		st := link.HostStatus()
+		writeJSON(w, http.StatusOK, hostAPIResponse{
+			Transport: st["transport"].(string),
+			Endpoint:  st["endpoint"].(string),
+			Connected: false,
+		})
+	})
+
+	mux.HandleFunc("/api/serial/ports", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodGet {
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+		ports, err := listSerialPorts()
+		if err != nil {
+			writeJSON(w, http.StatusOK, serialPortsResponse{Ports: []string{}, Error: err.Error()})
+			return
+		}
+		writeJSON(w, http.StatusOK, serialPortsResponse{Ports: ports})
+	})
+
+	mux.HandleFunc("/api/ble/scan", func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+		var body bleScanRequest
+		_ = json.NewDecoder(r.Body).Decode(&body)
+		timeout := time.Duration(body.TimeoutS * float64(time.Second))
+		if timeout <= 0 {
+			timeout = 5 * time.Second
+		}
+		// Disconnect active BLE before scan (BlueZ adapter contention).
+		if link.Transport() == hostTransportBLE {
+			_ = link.Disconnect()
+		}
+		devs, err := scanBLEDevices(timeout, body.NameFilter)
+		if err != nil {
+			writeJSON(w, http.StatusOK, bleScanResponse{Devices: []bleScanDevice{}, Error: err.Error()})
+			return
+		}
+		writeJSON(w, http.StatusOK, bleScanResponse{Devices: devs})
+	})
+}
@@ -0,0 +1,100 @@
+package main
+
+import (
+	"encoding/json"
+	"net/http"
+
+	pb "powerpod/gotool/pb"
+)
+
+type inputSendModeAPIResponse struct {
+	Success       bool   `json:"success"`
+	Mode          uint32 `json:"mode"`
+	ModeName      string `json:"mode_name"`
+	ClientID      uint32 `json:"client_id,omitempty"`
+	SlavesUpdated uint32 `json:"slaves_updated,omitempty"`
+	Error         string `json:"error,omitempty"`
+}
+
+func inputSendModeName(mode pb.InputSendMode) string {
+	switch mode {
+	case pb.InputSendMode_INPUT_SEND_BEST_EFFORT:
+		return "best_effort"
+	case pb.InputSendMode_INPUT_SEND_FAST:
+		return "fast"
+	case pb.InputSendMode_INPUT_SEND_WAIT:
+		return "wait"
+	case pb.InputSendMode_INPUT_SEND_RELIABLE:
+		return "reliable"
+	default:
+		return "unknown"
+	}
+}
+
+func mountInputSendModeAPI(mux *http.ServeMux, link *managedSerial) {
+	mux.HandleFunc("/api/input-send-mode", func(w http.ResponseWriter, r *http.Request) {
+		switch r.Method {
+		case http.MethodGet:
+			serveInputSendModeGet(w, link)
+		case http.MethodPut, http.MethodPost:
+			serveInputSendModePut(w, r, link)
+		default:
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+		}
+	})
+}
+
+func serveInputSendModeGet(w http.ResponseWriter, link *managedSerial) {
+	resp, err := link.InputSendMode(&pb.InputSendModeRequest{Write: false})
+	if err != nil {
+		writeJSON(w, http.StatusBadGateway, inputSendModeAPIResponse{Error: err.Error()})
+		return
+	}
+	writeJSON(w, http.StatusOK, inputSendModeAPIResponse{
+		Success:  resp.GetSuccess(),
+		Mode:     uint32(resp.GetMode()),
+		ModeName: inputSendModeName(resp.GetMode()),
+	})
+}
+
+func serveInputSendModePut(w http.ResponseWriter, r *http.Request, link *managedSerial) {
+	var body struct {
+		Mode       uint32 `json:"mode"`
+		ClientID   uint32 `json:"client_id"`
+		AllClients bool   `json:"all_clients"`
+	}
+	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+		writeJSON(w, http.StatusBadRequest, inputSendModeAPIResponse{Error: "invalid JSON"})
+		return
+	}
+	if body.Mode > uint32(pb.InputSendMode_INPUT_SEND_RELIABLE) {
+		writeJSON(w, http.StatusBadRequest, inputSendModeAPIResponse{Error: "mode must be 0..3"})
+		return
+	}
+	if !body.AllClients && body.ClientID == 0 {
+		// Dashboard default: apply to every registered slave.
+		body.AllClients = true
+	}
+
+	resp, err := link.InputSendMode(&pb.InputSendModeRequest{
+		Write:      true,
+		Mode:       pb.InputSendMode(body.Mode),
+		ClientId:   body.ClientID,
+		AllClients: body.AllClients,
+	})
+	if err != nil {
+		writeJSON(w, http.StatusBadGateway, inputSendModeAPIResponse{Error: err.Error()})
+		return
+	}
+	status := http.StatusOK
+	if !resp.GetSuccess() {
+		status = http.StatusBadRequest
+	}
+	writeJSON(w, status, inputSendModeAPIResponse{
+		Success:       resp.GetSuccess(),
+		Mode:          uint32(resp.GetMode()),
+		ModeName:      inputSendModeName(resp.GetMode()),
+		ClientID:      resp.GetClientId(),
+		SlavesUpdated: resp.GetSlavesUpdated(),
+	})
+}
@@ -64,6 +64,11 @@ type findMeAPIResponse struct {
 	Error    string `json:"error,omitempty"`
 }

+type resetIdMapAPIResponse struct {
+	Success bool   `json:"success"`
+	Error   string `json:"error,omitempty"`
+}
+
 type restartAPIRequest struct {
 	ClientID uint32 `json:"client_id"`
 }
@@ -93,10 +98,14 @@ type otaAPIResponse struct {
 }

 func mountServeAPI(mux *http.ServeMux, link *managedSerial, hub *wsHub, streamCtl *accelStreamCtl, tapCtl *tapNotifyCtl) {
+	mountHostAPI(mux, link)
+	mountBleTestAPI(mux, link)
 	mountLiveStreamAPI(mux, hub)
 	mountAccelStreamAPI(mux, link, hub, streamCtl)
+	mountInputSendModeAPI(mux, link)
 	mountTapAPI(mux, link, hub, tapCtl)
 	mountTapConfigAPI(mux, link)
+	mountBatteryUvAPI(mux, link)
 	mountLedRingAPI(mux, link)
 	mountBatteryAPI(mux, link)
 	mux.HandleFunc("/api/deadzone", func(w http.ResponseWriter, r *http.Request) {
@@ -137,6 +146,9 @@ func mountServeAPI(mux *http.ServeMux, link *managedSerial, hub *wsHub, streamCt
 		}
 		serveRestart(w, r, link)
 	})
+	mux.HandleFunc("POST /api/clients/reset-id-map", func(w http.ResponseWriter, r *http.Request) {
+		serveResetClientIdMap(w, r, link)
+	})
 	mux.HandleFunc("/api/log-level", func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case http.MethodGet:
@@ -157,6 +169,10 @@ func mountServeAPI(mux *http.ServeMux, link *managedSerial, hub *wsHub, streamCt
 }

 func serveOTAUpload(w http.ResponseWriter, r *http.Request, link *managedSerial, hub *wsHub) {
+	if !link.IsConnected() {
+		writeJSON(w, http.StatusBadRequest, otaAPIResponse{Error: "host not connected"})
+		return
+	}
 	if err := r.ParseMultipartForm(otaMaxFirmwareSize); err != nil {
 		writeJSON(w, http.StatusBadRequest, otaAPIResponse{Error: "invalid form"})
 		return
@@ -355,6 +371,23 @@ func serveRestart(w http.ResponseWriter, r *http.Request, link *managedSerial) {
 	writeJSON(w, http.StatusOK, restartAPIResponse{Success: true, ClientID: body.ClientID})
 }

+func serveResetClientIdMap(w http.ResponseWriter, r *http.Request, link *managedSerial) {
+	if !link.IsConnected() {
+		writeJSON(w, http.StatusServiceUnavailable, resetIdMapAPIResponse{Error: "host not connected"})
+		return
+	}
+	resp, err := link.resetClientIdMap()
+	if err != nil {
+		writeJSON(w, http.StatusServiceUnavailable, resetIdMapAPIResponse{Error: err.Error()})
+		return
+	}
+	if !resp.GetSuccess() {
+		writeJSON(w, http.StatusOK, resetIdMapAPIResponse{Success: false, Error: "rejected by device"})
+		return
+	}
+	writeJSON(w, http.StatusOK, resetIdMapAPIResponse{Success: true})
+}
+
 func serveFindMe(w http.ResponseWriter, r *http.Request, link *managedSerial) {
 	var body findMeAPIRequest
 	if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"log"
 	"net/http"
 	"sync"
@@ -15,7 +16,7 @@ import (
 )

 const (
-	defaultAccelStreamInterval = 16 * time.Millisecond
+	defaultAccelStreamInterval = 10 * time.Millisecond
 	defaultPreFetchMs          = 2
 	minAPIStreamInterval       = 1 * time.Millisecond
 	maxAPIStreamInterval       = 10 * time.Second
@@ -39,6 +40,9 @@ type InputClientSample struct {
 type InputStreamMessage struct {
 	Type            string   `json:"type"` // "hello" | "input"
 	Serial          string   `json:"serial_port,omitempty"`
+	Transport       string   `json:"transport,omitempty"`
+	Endpoint        string   `json:"endpoint,omitempty"`
+	Connected       *bool    `json:"connected,omitempty"`
 	IntervalMs      int      `json:"interval_ms,omitempty"`
 	PreFetchMs      int      `json:"pre_fetch_ms,omitempty"`
 	TapDisplayMinMs int      `json:"tap_display_min_ms,omitempty"`
@@ -51,6 +55,33 @@ type InputStreamMessage struct {
 	Error   string              `json:"error,omitempty"`
 }

+// HostStatusMessage is the reply to get_host / host_connect / host_disconnect.
+type HostStatusMessage struct {
+	Type      string `json:"type"` // "host_status"
+	Transport string `json:"transport"`
+	Endpoint  string `json:"endpoint"`
+	Connected bool   `json:"connected"`
+	BleName   string `json:"ble_name,omitempty"`
+	Success   bool   `json:"success"`
+	Error     string `json:"error,omitempty"`
+}
+
+// SerialPortsMessage is the reply to list_serial_ports.
+type SerialPortsMessage struct {
+	Type    string   `json:"type"` // "serial_ports"
+	Ports   []string `json:"ports"`
+	Success bool     `json:"success"`
+	Error   string   `json:"error,omitempty"`
+}
+
+// BleScanResultMessage is the reply to ble_scan.
+type BleScanResultMessage struct {
+	Type    string          `json:"type"` // "ble_scan_result"
+	Devices []bleScanDevice `json:"devices"`
+	Success bool            `json:"success"`
+	Error   string          `json:"error,omitempty"`
+}
+
 // StreamStatusMessage is the reply to set_stream / get_stream (this connection).
 type StreamStatusMessage struct {
 	Type          string `json:"type"` // "stream_status"
@@ -116,12 +147,23 @@ type accelWSCommand struct {
 	DoubleTap  *bool  `json:"double_tap"`
 	Triple     *bool  `json:"triple"`
 	AllClients bool   `json:"all_clients"`
+	// Host connect / BLE scan
+	Transport  string  `json:"transport"`
+	Port       string  `json:"port"`
+	Address    string  `json:"address"`
+	Name       string  `json:"name"`
+	Baud       int     `json:"baud"`
+	TimeoutS   float64 `json:"timeout_s"`
+	NameFilter string  `json:"name_filter"`
 }

 type APIInfoResponse struct {
 	Name              string `json:"name"`
 	Version           string `json:"version"`
 	SerialPort        string `json:"serial_port"`
+	Transport         string `json:"transport"`
+	Endpoint          string `json:"endpoint"`
+	Connected         bool   `json:"connected"`
 	WebSocket         string `json:"websocket"`
 	DefaultIntervalMs int    `json:"default_interval_ms"`
 	DefaultPreFetchMs int    `json:"default_pre_fetch_ms"`
@@ -139,12 +181,31 @@ type cachedTapEvent struct {

 type wsSubscriber struct {
 	conn          *websocket.Conn
+	writeMu       sync.Mutex // gorilla: one writer per connection
 	receiveInput  bool
 	interval      time.Duration
 	preFetch      time.Duration
 	lastInputSent time.Time
 }

+func (sub *wsSubscriber) writeBytes(data []byte) error {
+	if sub == nil {
+		return fmt.Errorf("nil subscriber")
+	}
+	sub.writeMu.Lock()
+	defer sub.writeMu.Unlock()
+	_ = sub.conn.SetWriteDeadline(time.Now().Add(2 * time.Second))
+	return sub.conn.WriteMessage(websocket.TextMessage, data)
+}
+
+func (sub *wsSubscriber) writeJSON(v any) {
+	data, err := json.Marshal(v)
+	if err != nil {
+		return
+	}
+	_ = sub.writeBytes(data)
+}
+
 type pendingInputCache struct {
 	cache   *pb.CacheStatusResponse
 	readAt  time.Time
@@ -196,7 +257,7 @@ func clampPreFetch(d time.Duration) time.Duration {
 	return d
 }

-func (h *accelStreamHub) register(conn *websocket.Conn, portName string) *wsSubscriber {
+func (h *accelStreamHub) register(conn *websocket.Conn, link *managedSerial) *wsSubscriber {
 	sub := &wsSubscriber{
 		conn:         conn,
 		receiveInput: false,
@@ -207,14 +268,20 @@ func (h *accelStreamHub) register(conn *websocket.Conn, portName string) *wsSubs
 	h.clients[conn] = sub
 	h.mu.Unlock()

+	st := link.HostStatus()
+	connected := st["connected"].(bool)
 	hello := InputStreamMessage{
 		Type:            "hello",
-		Serial:          portName,
+		Serial:          st["endpoint"].(string),
+		Transport:       st["transport"].(string),
+		Endpoint:        st["endpoint"].(string),
+		Connected:       &connected,
 		IntervalMs:      int(h.defaultInterval / time.Millisecond),
 		PreFetchMs:      int(h.defaultPreFetch / time.Millisecond),
 		TapDisplayMinMs: apiTapDisplayMinMs,
 		Note:            "set_tap_notify configures slave S/D/T only; set_stream enables input polling/push on this connection",
 		Commands: []string{
+			"get_host", "list_serial_ports", "ble_scan", "host_connect", "host_disconnect",
 			"list_clients",
 			"set_stream", "get_stream",
 			"set_input_stream", "get_input_stream",
@@ -222,9 +289,7 @@ func (h *accelStreamHub) register(conn *websocket.Conn, portName string) *wsSubs
 			"set_led_ring", "get_battery",
 		},
 	}
-	if data, err := json.Marshal(hello); err == nil {
-		_ = conn.WriteMessage(websocket.TextMessage, data)
-	}
+	sub.writeJSON(hello)
 	return sub
 }

@@ -420,7 +485,11 @@ func (h *accelStreamHub) deliverInput(msg InputStreamMessage) {

 	now := time.Now()
 	h.mu.Lock()
-	defer h.mu.Unlock()
+	type pending struct {
+		conn *websocket.Conn
+		sub  *wsSubscriber
+	}
+	var out []pending
 	for conn, sub := range h.clients {
 		if !sub.receiveInput {
 			continue
@@ -429,13 +498,26 @@ func (h *accelStreamHub) deliverInput(msg InputStreamMessage) {
 			continue
 		}
 		sub.lastInputSent = now
-		if err := conn.WriteMessage(websocket.TextMessage, data); err != nil {
-			delete(h.clients, conn)
-			_ = conn.Close()
+		out = append(out, pending{conn: conn, sub: sub})
+	}
+	h.mu.Unlock()
+
+	for _, p := range out {
+		if err := p.sub.writeBytes(data); err != nil {
+			h.mu.Lock()
+			delete(h.clients, p.conn)
+			h.mu.Unlock()
+			_ = p.conn.Close()
 		}
 	}
 }

+func (h *accelStreamHub) clientsFromCache(cache *pb.CacheStatusResponse) []InputClientSample {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+	return h.inputClientsFromCacheLocked(cache, time.Now())
+}
+
 func runInputStreamer(link *managedSerial, hub *accelStreamHub, dash *wsHub, ctl *accelStreamCtl, tapCtl *tapNotifyCtl, stop <-chan struct{}) {
 	ticker := time.NewTicker(minAPIStreamInterval)
 	defer ticker.Stop()
@@ -449,11 +531,31 @@ func runInputStreamer(link *managedSerial, hub *accelStreamHub, dash *wsHub, ctl
 		case <-hub.configChanged:
 			pending = nil
 		case now := <-ticker.C:
-			if !hub.anyWantsInput() || !inputPollingActive(dash, ctl, tapCtl) {
+			if !hub.anyWantsInput() || !inputPollingActive(dash, ctl, tapCtl) || link.PollPaused() {
 				pending = nil
 				continue
 			}

+			// Prefer BLE_STREAM_TICK when on BLE (firmware push).
+			if link.Transport() == hostTransportBLE {
+				payload, err := link.NextStreamTick(20 * time.Millisecond)
+				if err == nil {
+					cache, cerr := cacheStatusFromBLEStreamPayload(payload)
+					if cerr == nil {
+						hub.ingestTapFromCache(cache)
+						hub.deliverInput(InputStreamMessage{
+							Type:    "input",
+							T:       time.Now().UnixNano(),
+							Success: true,
+							Clients: hub.clientsFromCache(cache),
+						})
+						pending = nil
+						continue
+					}
+				}
+				// Fall through to CACHE_STATUS poll if no tick yet.
+			}
+
 			needRead, needDeliver, waitPreFetch := hub.streamTiming(now)

 			if needRead && pending == nil {
@@ -487,14 +589,11 @@ func runInputStreamer(link *managedSerial, hub *accelStreamHub, dash *wsHub, ctl
 			}

 			if pending.cache != nil && now.Sub(pending.readAt) >= waitPreFetch {
-				hub.mu.RLock()
-				clients := hub.inputClientsFromCacheLocked(pending.cache, now)
-				hub.mu.RUnlock()
 				hub.deliverInput(InputStreamMessage{
 					Type:    "input",
 					T:       ts,
 					Success: true,
-					Clients: clients,
+					Clients: hub.clientsFromCache(pending.cache),
 				})
 				pending = nil
 			}
@@ -512,46 +611,29 @@ func inputPollingActive(dash *wsHub, ctl *accelStreamCtl, tapCtl *tapNotifyCtl)
 	return dash != nil && dash.anyAccelStreamEnabled()
 }

-func writeStreamStatus(conn *websocket.Conn, msg StreamStatusMessage) {
-	data, err := json.Marshal(msg)
-	if err != nil {
-		return
-	}
-	_ = conn.WriteMessage(websocket.TextMessage, data)
+func writeStreamStatus(sub *wsSubscriber, msg StreamStatusMessage) {
+	sub.writeJSON(msg)
 }

-func writeBatteryStatus(conn *websocket.Conn, out batteryAPIResponse) {
+func writeBatteryStatus(sub *wsSubscriber, out batteryAPIResponse) {
 	out.Type = "battery_status"
-	data, err := json.Marshal(out)
-	if err != nil {
-		return
-	}
-	_ = conn.WriteMessage(websocket.TextMessage, data)
+	sub.writeJSON(out)
 }

-func writeLedRingStatus(conn *websocket.Conn, out ledRingAPIResponse) {
+func writeLedRingStatus(sub *wsSubscriber, out ledRingAPIResponse) {
 	out.Type = "led_ring_status"
-	data, err := json.Marshal(out)
-	if err != nil {
-		return
-	}
-	_ = conn.WriteMessage(websocket.TextMessage, data)
+	sub.writeJSON(out)
 }

-func writeInputStreamStatus(conn *websocket.Conn, out accelStreamAPIResponse) {
-	msg := InputStreamStatusMessage{
+func writeInputStreamStatus(sub *wsSubscriber, out accelStreamAPIResponse) {
+	sub.writeJSON(InputStreamStatusMessage{
 		Type:          "input_stream_status",
 		ClientID:      out.ClientID,
 		Enabled:       out.Enabled,
 		Success:       out.Success,
 		SlavesUpdated: out.SlavesUpdated,
 		Error:         out.Error,
-	}
-	data, err := json.Marshal(msg)
-	if err != nil {
-		return
-	}
-	_ = conn.WriteMessage(websocket.TextMessage, data)
+	})
 }

 func clientInfoToAPI(c *pb.ClientInfo) APIClientInfo {
@@ -570,16 +652,12 @@ func clientInfoToAPI(c *pb.ClientInfo) APIClientInfo {
 	}
 }

-func writeClientList(conn *websocket.Conn, msg ClientListMessage) {
-	data, err := json.Marshal(msg)
-	if err != nil {
-		return
-	}
-	_ = conn.WriteMessage(websocket.TextMessage, data)
+func writeClientList(sub *wsSubscriber, msg ClientListMessage) {
+	sub.writeJSON(msg)
 }

-func writeTapNotifyStatus(conn *websocket.Conn, out tapNotifyAPIResponse) {
-	msg := TapNotifyStatusMessage{
+func writeTapNotifyStatus(sub *wsSubscriber, out tapNotifyAPIResponse) {
+	sub.writeJSON(TapNotifyStatusMessage{
 		Type:          "tap_notify_status",
 		ClientID:      out.ClientID,
 		Single:        out.Single,
@@ -588,12 +666,7 @@ func writeTapNotifyStatus(conn *websocket.Conn, out tapNotifyAPIResponse) {
 		Success:       out.Success,
 		SlavesUpdated: out.SlavesUpdated,
 		Error:         out.Error,
-	}
-	data, err := json.Marshal(msg)
-	if err != nil {
-		return
-	}
-	_ = conn.WriteMessage(websocket.TextMessage, data)
+	})
 }

 func applyTapNotifyClientWS(link *managedSerial, dash *wsHub, tapCtl *tapNotifyCtl, clientID uint32, single, doubleTap, triple bool) tapNotifyAPIResponse {
@@ -626,18 +699,70 @@ func applyTapNotifyClientWS(link *managedSerial, dash *wsHub, tapCtl *tapNotifyC
 	return out
 }

-func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte, link *managedSerial, dash *wsHub, ctl *accelStreamCtl, tapCtl *tapNotifyCtl, hub *accelStreamHub) {
+func handleAccelWSCommand(sub *wsSubscriber, data []byte, link *managedSerial, dash *wsHub, ctl *accelStreamCtl, tapCtl *tapNotifyCtl, hub *accelStreamHub) {
 	var cmd accelWSCommand
 	if err := json.Unmarshal(data, &cmd); err != nil {
-		writeStreamStatus(conn, StreamStatusMessage{Type: "stream_status", Error: "invalid JSON"})
+		writeStreamStatus(sub, StreamStatusMessage{Type: "stream_status", Error: "invalid JSON"})
 		return
 	}

 	switch cmd.Type {
+	case "get_host":
+		writeHostStatus(sub, hostStatusFromLink(link, true, ""))
+
+	case "list_serial_ports":
+		ports, err := listSerialPorts()
+		msg := SerialPortsMessage{Type: "serial_ports", Ports: ports, Success: err == nil}
+		if err != nil {
+			msg.Error = err.Error()
+			msg.Ports = []string{}
+		}
+		writeWSJSON(sub, msg)
+
+	case "ble_scan":
+		timeout := time.Duration(cmd.TimeoutS * float64(time.Second))
+		if timeout <= 0 {
+			timeout = 5 * time.Second
+		}
+		if link.Transport() == hostTransportBLE {
+			_ = link.Disconnect()
+		}
+		devs, err := scanBLEDevices(timeout, cmd.NameFilter)
+		msg := BleScanResultMessage{Type: "ble_scan_result", Devices: devs, Success: err == nil}
+		if err != nil {
+			msg.Error = err.Error()
+			msg.Devices = []bleScanDevice{}
+		}
+		writeWSJSON(sub, msg)
+
+	case "host_connect":
+		var err error
+		switch cmd.Transport {
+		case hostTransportUART:
+			err = link.ConnectUART(cmd.Port, cmd.Baud)
+		case hostTransportBLE:
+			err = link.ConnectBLE(cmd.Address, cmd.Name)
+		default:
+			writeHostStatus(sub, HostStatusMessage{
+				Type:  "host_status",
+				Error: "transport must be uart or ble",
+			})
+			return
+		}
+		if err != nil {
+			writeHostStatus(sub, hostStatusFromLink(link, false, err.Error()))
+			return
+		}
+		writeHostStatus(sub, hostStatusFromLink(link, true, ""))
+
+	case "host_disconnect":
+		_ = link.Disconnect()
+		writeHostStatus(sub, hostStatusFromLink(link, true, ""))
+
 	case "list_clients":
 		clients, err := link.listClientsPoll()
 		if err != nil {
-			writeClientList(conn, ClientListMessage{
+			writeClientList(sub, ClientListMessage{
 				Type:  "client_list",
 				Error: err.Error(),
 			})
@@ -647,7 +772,7 @@ func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte,
 		for _, c := range clients {
 			out = append(out, clientInfoToAPI(c))
 		}
-		writeClientList(conn, ClientListMessage{
+		writeClientList(sub, ClientListMessage{
 			Type:    "client_list",
 			Success: true,
 			Clients: out,
@@ -655,34 +780,34 @@ func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte,

 	case "set_stream":
 		if cmd.Enable == nil {
-			writeStreamStatus(conn, StreamStatusMessage{
+			writeStreamStatus(sub, StreamStatusMessage{
 				Type:  "stream_status",
 				Error: "enable required",
 			})
 			return
 		}
-		writeStreamStatus(conn, hub.setStream(sub, *cmd.Enable, cmd.IntervalMs, cmd.PreFetch))
+		writeStreamStatus(sub, hub.setStream(sub, *cmd.Enable, cmd.IntervalMs, cmd.PreFetch))

 	case "get_stream":
-		writeStreamStatus(conn, hub.getStream(sub))
+		writeStreamStatus(sub, hub.getStream(sub))

 	case "set_input_stream":
 		if cmd.ClientID == 0 {
-			writeInputStreamStatus(conn, accelStreamAPIResponse{Error: "client_id required"})
+			writeInputStreamStatus(sub, accelStreamAPIResponse{Error: "client_id required"})
 			return
 		}
 		if cmd.Enable == nil {
-			writeInputStreamStatus(conn, accelStreamAPIResponse{
+			writeInputStreamStatus(sub, accelStreamAPIResponse{
 				ClientID: cmd.ClientID,
 				Error:    "enable required",
 			})
 			return
 		}
-		writeInputStreamStatus(conn, applyAccelStreamClient(link, dash, ctl, cmd.ClientID, *cmd.Enable))
+		writeInputStreamStatus(sub, applyAccelStreamClient(link, dash, ctl, cmd.ClientID, *cmd.Enable))

 	case "get_input_stream":
 		if cmd.ClientID == 0 {
-			writeInputStreamStatus(conn, accelStreamAPIResponse{Error: "client_id required"})
+			writeInputStreamStatus(sub, accelStreamAPIResponse{Error: "client_id required"})
 			return
 		}
 		resp, err := link.AccelStreamPoll(&pb.AccelStreamRequest{
@@ -690,7 +815,7 @@ func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte,
 			ClientId: cmd.ClientID,
 		})
 		if err != nil {
-			writeInputStreamStatus(conn, accelStreamAPIResponse{
+			writeInputStreamStatus(sub, accelStreamAPIResponse{
 				ClientID: cmd.ClientID,
 				Error:    err.Error(),
 			})
@@ -699,7 +824,7 @@ func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte,
 		if ctl != nil {
 			ctl.Set(cmd.ClientID, resp.GetEnabled())
 		}
-		writeInputStreamStatus(conn, accelStreamAPIResponse{
+		writeInputStreamStatus(sub, accelStreamAPIResponse{
 			Enabled:  resp.GetEnabled(),
 			ClientID: resp.GetClientId(),
 			Success:  resp.GetSuccess(),
@@ -708,15 +833,15 @@ func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte,
 	case "set_tap_notify":
 		if cmd.AllClients {
 			if cmd.Single == nil || cmd.DoubleTap == nil || cmd.Triple == nil {
-				writeTapNotifyStatus(conn, tapNotifyAPIResponse{Error: "single, double_tap, triple required"})
+				writeTapNotifyStatus(sub, tapNotifyAPIResponse{Error: "single, double_tap, triple required"})
 				return
 			}
 			updated, err := applyTapNotifyAll(link, dash, tapCtl, *cmd.Single, *cmd.DoubleTap, *cmd.Triple)
 			if err != nil {
-				writeTapNotifyStatus(conn, tapNotifyAPIResponse{Error: err.Error()})
+				writeTapNotifyStatus(sub, tapNotifyAPIResponse{Error: err.Error()})
 				return
 			}
-			writeTapNotifyStatus(conn, tapNotifyAPIResponse{
+			writeTapNotifyStatus(sub, tapNotifyAPIResponse{
 				Success:       updated > 0,
 				SlavesUpdated: updated,
 				Single:        *cmd.Single,
@@ -726,21 +851,21 @@ func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte,
 			return
 		}
 		if cmd.ClientID == 0 {
-			writeTapNotifyStatus(conn, tapNotifyAPIResponse{Error: "client_id required"})
+			writeTapNotifyStatus(sub, tapNotifyAPIResponse{Error: "client_id required"})
 			return
 		}
 		if cmd.Single == nil || cmd.DoubleTap == nil || cmd.Triple == nil {
-			writeTapNotifyStatus(conn, tapNotifyAPIResponse{
+			writeTapNotifyStatus(sub, tapNotifyAPIResponse{
 				ClientID: cmd.ClientID,
 				Error:    "single, double_tap, triple required",
 			})
 			return
 		}
-		writeTapNotifyStatus(conn, applyTapNotifyClientWS(link, dash, tapCtl, cmd.ClientID, *cmd.Single, *cmd.DoubleTap, *cmd.Triple))
+		writeTapNotifyStatus(sub, applyTapNotifyClientWS(link, dash, tapCtl, cmd.ClientID, *cmd.Single, *cmd.DoubleTap, *cmd.Triple))

 	case "get_tap_notify":
 		if cmd.ClientID == 0 {
-			writeTapNotifyStatus(conn, tapNotifyAPIResponse{Error: "client_id required"})
+			writeTapNotifyStatus(sub, tapNotifyAPIResponse{Error: "client_id required"})
 			return
 		}
 		resp, err := link.TapNotifyPoll(&pb.TapNotifyRequest{
@@ -748,7 +873,7 @@ func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte,
 			ClientId: cmd.ClientID,
 		})
 		if err != nil {
-			writeTapNotifyStatus(conn, tapNotifyAPIResponse{
+			writeTapNotifyStatus(sub, tapNotifyAPIResponse{
 				ClientID: cmd.ClientID,
 				Error:    err.Error(),
 			})
@@ -757,7 +882,7 @@ func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte,
 		if tapCtl != nil {
 			tapCtl.Set(cmd.ClientID, resp.GetSingle(), resp.GetDoubleTap(), resp.GetTriple())
 		}
-		writeTapNotifyStatus(conn, tapNotifyAPIResponse{
+		writeTapNotifyStatus(sub, tapNotifyAPIResponse{
 			ClientID:  cmd.ClientID,
 			Success:   resp.GetSuccess(),
 			Single:    resp.GetSingle(),
@@ -768,36 +893,57 @@ func handleAccelWSCommand(conn *websocket.Conn, sub *wsSubscriber, data []byte,
 	case "set_led_ring":
 		var body ledRingAPIRequest
 		if err := json.Unmarshal(data, &body); err != nil {
-			writeLedRingStatus(conn, ledRingAPIResponse{Error: "invalid JSON"})
+			writeLedRingStatus(sub, ledRingAPIResponse{Error: "invalid JSON"})
 			return
 		}
 		if body.Mode == "" {
-			writeLedRingStatus(conn, ledRingAPIResponse{Error: "mode required"})
+			writeLedRingStatus(sub, ledRingAPIResponse{Error: "mode required"})
 			return
 		}
-		writeLedRingStatus(conn, applyLedRing(link, body))
+		writeLedRingStatus(sub, applyLedRing(link, body))

 	case "get_battery":
 		var body batteryAPIRequest
 		if err := json.Unmarshal(data, &body); err != nil {
-			writeBatteryStatus(conn, batteryAPIResponse{Error: "invalid JSON"})
+			writeBatteryStatus(sub, batteryAPIResponse{Error: "invalid JSON"})
 			return
 		}
 		if !body.AllClients && body.ClientID == 0 {
 			body.AllClients = true
 		}
-		writeBatteryStatus(conn, applyBatteryStatus(link, body))
+		writeBatteryStatus(sub, applyBatteryStatus(link, body))

 	default:
-		writeStreamStatus(conn, StreamStatusMessage{
+		writeStreamStatus(sub, StreamStatusMessage{
 			Type: "stream_status",
-			Error: "unknown type (list_clients, set_stream, get_stream, set_input_stream, get_input_stream, set_tap_notify, get_tap_notify, set_led_ring, get_battery)",
+			Error: "unknown type (get_host, list_serial_ports, ble_scan, host_connect, host_disconnect, list_clients, set_stream, get_stream, set_input_stream, get_input_stream, set_tap_notify, get_tap_notify, set_led_ring, get_battery)",
 		})
 	}
 }

-func serveExternalWS(conn *websocket.Conn, link *managedSerial, dash *wsHub, ctl *accelStreamCtl, tapCtl *tapNotifyCtl, portName string, hub *accelStreamHub) {
-	sub := hub.register(conn, portName)
+func hostStatusFromLink(link *managedSerial, success bool, errMsg string) HostStatusMessage {
+	st := link.HostStatus()
+	return HostStatusMessage{
+		Type:      "host_status",
+		Transport: st["transport"].(string),
+		Endpoint:  st["endpoint"].(string),
+		Connected: st["connected"].(bool),
+		BleName:   st["ble_name"].(string),
+		Success:   success && errMsg == "",
+		Error:     errMsg,
+	}
+}
+
+func writeHostStatus(sub *wsSubscriber, msg HostStatusMessage) {
+	sub.writeJSON(msg)
+}
+
+func writeWSJSON(sub *wsSubscriber, msg any) {
+	sub.writeJSON(msg)
+}
+
+func serveExternalWS(conn *websocket.Conn, link *managedSerial, dash *wsHub, ctl *accelStreamCtl, tapCtl *tapNotifyCtl, hub *accelStreamHub) {
+	sub := hub.register(conn, link)
 	defer hub.unregister(conn)
 	defer conn.Close()

@@ -806,11 +952,12 @@ func serveExternalWS(conn *websocket.Conn, link *managedSerial, dash *wsHub, ctl
 		if err != nil {
 			return
 		}
-		handleAccelWSCommand(conn, sub, data, link, dash, ctl, tapCtl, hub)
+		handleAccelWSCommand(sub, data, link, dash, ctl, tapCtl, hub)
 	}
 }

 func mountExternalAPI(mux *http.ServeMux, portName string, defaultInterval time.Duration, hub *accelStreamHub, link *managedSerial, dash *wsHub, ctl *accelStreamCtl, tapCtl *tapNotifyCtl) {
+	_ = portName
 	defMs := int(defaultInterval / time.Millisecond)
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path != "/" && r.URL.Path != "/api/v1" && r.URL.Path != "/api/v1/" {
@@ -821,17 +968,21 @@ func mountExternalAPI(mux *http.ServeMux, portName string, defaultInterval time.
 			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
 			return
 		}
+		st := link.HostStatus()
 		writeJSON(w, http.StatusOK, APIInfoResponse{
 			Name:              "powerpod-external-api",
 			Version:           "1",
-			SerialPort:        portName,
+			SerialPort:        st["endpoint"].(string),
+			Transport:         st["transport"].(string),
+			Endpoint:          st["endpoint"].(string),
+			Connected:         st["connected"].(bool),
 			WebSocket:         "/ws",
 			DefaultIntervalMs: defMs,
 			DefaultPreFetchMs: defaultPreFetchMs,
 			MinIntervalMs:     int(minAPIStreamInterval / time.Millisecond),
 			MaxIntervalMs:     int(maxAPIStreamInterval / time.Millisecond),
 			TapDisplayMinMs:   apiTapDisplayMinMs,
-			Description:       "WebSocket: set_input_stream + set_stream for input (accel + tap); set_tap_notify configures slave tap kinds",
+			Description:       "WebSocket: host_connect/ble_scan + set_input_stream + set_stream for input (accel + tap)",
 		})
 	})

@@ -841,7 +992,7 @@ func mountExternalAPI(mux *http.ServeMux, portName string, defaultInterval time.
 			log.Printf("api websocket upgrade: %v", err)
 			return
 		}
-		serveExternalWS(conn, link, dash, ctl, tapCtl, portName, hub)
+		serveExternalWS(conn, link, dash, ctl, tapCtl, hub)
 	})
 }

@@ -84,13 +84,7 @@ func NewBench(cfg Config) (*Bench, error) {
 			return nil, fmt.Errorf("config %q slave %q: %w", cfg.ID, s.ID, err)
 		}
 		s.MAC = mac
-		if s.ClientID == nil {
-			parts := strings.Split(mac, ":")
-			var last byte
-			fmt.Sscanf(parts[5], "%02x", &last)
-			id := uint(last)
-			s.ClientID = &id
-		}
+		/* client_id is master-assigned (sequential); omit until known from `gotool clients`. */
 		b.slaveByID[s.ID] = s
 	}
 	return b, nil
@@ -112,6 +106,9 @@ func (b *Bench) ResolveClientID(slaveID string) (uint32, error) {
 	if err != nil {
 		return 0, err
 	}
+	if s.ClientID == nil {
+		return 0, fmt.Errorf("slave %q: client_id required (master-assigned; set in config after join)", slaveID)
+	}
 	return uint32(*s.ClientID), nil
 }

@@ -2,7 +2,7 @@ package autotest

 import "testing"

-func TestNewBenchClientIDFromMAC(t *testing.T) {
+func TestNewBenchNoDefaultClientIDFromMAC(t *testing.T) {
 	cfg := Config{
 		ID:        "t",
 		Network:   1,
@@ -20,8 +20,39 @@ func TestNewBenchClientIDFromMAC(t *testing.T) {
 		t.Fatal(err)
 	}
 	s, _ := b.Slave("pod")
-	if *s.ClientID != 16 {
-		t.Fatalf("client_id=%d want 16", *s.ClientID)
+	if s.ClientID != nil {
+		t.Fatalf("client_id should be unset, got %d", *s.ClientID)
+	}
+	if _, err := b.ResolveClientID("pod"); err == nil {
+		t.Fatal("ResolveClientID should fail without client_id")
+	}
+}
+
+func TestNewBenchExplicitClientID(t *testing.T) {
+	id := uint(3)
+	cfg := Config{
+		ID:        "t",
+		Network:   1,
+		MasterMAC: "aa:bb:cc:dd:ee:ff",
+		UART: UARTConfig{
+			Master: "/dev/ttyUSB0",
+		},
+		Slaves: []SlaveNode{{
+			ID:       "pod",
+			MAC:      "50:78:7d:18:01:10",
+			ClientID: &id,
+		}},
+	}
+	b, err := NewBench(cfg)
+	if err != nil {
+		t.Fatal(err)
+	}
+	got, err := b.ResolveClientID("pod")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got != 3 {
+		t.Fatalf("client_id=%d want 3", got)
 	}
 }

@@ -195,7 +195,7 @@ func checkClients(bench *Bench, step Step, client MasterClient) error {
 		if found == nil {
 			return fmt.Errorf("slave %q mac %s not in client list", name, want.MAC)
 		}
-		if uint32(*want.ClientID) != found.GetId() {
+		if want.ClientID != nil && uint32(*want.ClientID) != found.GetId() {
 			return fmt.Errorf("slave %q id=%d want client_id=%d", name, found.GetId(), *want.ClientID)
 		}
 		if e.Available != nil && found.GetAvailable() != *e.Available {
@@ -0,0 +1,367 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"sync"
+	"time"
+
+	"tinygo.org/x/bluetooth"
+
+	pb "powerpod/gotool/pb"
+	uartframe "powerpod/gotool/uart"
+)
+
+const (
+	bleServiceUUID = "6e400001-b5a3-f393-e0a9-e50e24dcca9e"
+	bleCharUUID    = "6e400002-b5a3-f393-e0a9-e50e24dcca9e"
+	bleDefaultName = "Powerpod"
+)
+
+type bleLink struct {
+	device   bluetooth.Device
+	char     bluetooth.DeviceCharacteristic
+	mu       sync.Mutex
+	parserMu sync.Mutex
+	parser   *uartframe.Parser
+	respCh   chan []byte
+	streamCh chan []byte
+	quiet    bool
+	attMTU   int // negotiated ATT MTU (0 if unknown)
+}
+
+func openBLE(name string, settle time.Duration) (*bleLink, error) {
+	if name == "" {
+		name = bleDefaultName
+	}
+	adapter := bluetooth.DefaultAdapter
+	if err := adapter.Enable(); err != nil {
+		return nil, fmt.Errorf("enable bluetooth adapter: %w (check BlueZ / permissions)", err)
+	}
+
+	log.Printf("BLE scanning for %q…", name)
+	var foundAddr bluetooth.Address
+	var found bool
+	go func() {
+		time.Sleep(15 * time.Second)
+		_ = adapter.StopScan()
+	}()
+	err := adapter.Scan(func(a *bluetooth.Adapter, result bluetooth.ScanResult) {
+		if result.LocalName() != name {
+			return
+		}
+		foundAddr = result.Address
+		found = true
+		_ = a.StopScan()
+	})
+	if err != nil {
+		return nil, fmt.Errorf("scan: %w", err)
+	}
+	if !found {
+		return nil, fmt.Errorf("device %q not found (check DIP8=BLE and advertising)", name)
+	}
+	return connectBLEDevice(foundAddr, settle)
+}
+
+func openBLEAddress(addrStr string, settle time.Duration) (*bleLink, error) {
+	adapter := bluetooth.DefaultAdapter
+	if err := adapter.Enable(); err != nil {
+		return nil, fmt.Errorf("enable bluetooth adapter: %w (check BlueZ / permissions)", err)
+	}
+	if mac, err := bluetooth.ParseMAC(addrStr); err == nil {
+		var addr bluetooth.Address
+		addr.Set(mac.String())
+		return connectBLEDevice(addr, settle)
+	}
+	// Fallback: scan until address string matches
+	log.Printf("BLE resolving address %s via scan…", addrStr)
+	var foundAddr bluetooth.Address
+	var found bool
+	go func() {
+		time.Sleep(15 * time.Second)
+		_ = adapter.StopScan()
+	}()
+	err := adapter.Scan(func(a *bluetooth.Adapter, result bluetooth.ScanResult) {
+		if result.Address.String() != addrStr {
+			return
+		}
+		foundAddr = result.Address
+		found = true
+		_ = a.StopScan()
+	})
+	if err != nil {
+		return nil, fmt.Errorf("scan for address: %w", err)
+	}
+	if !found {
+		return nil, fmt.Errorf("BLE address %s not found", addrStr)
+	}
+	return connectBLEDevice(foundAddr, settle)
+}
+
+func connectBLEDevice(addr bluetooth.Address, settle time.Duration) (*bleLink, error) {
+	svcUUID, err := bluetooth.ParseUUID(bleServiceUUID)
+	if err != nil {
+		return nil, err
+	}
+	chrUUID, err := bluetooth.ParseUUID(bleCharUUID)
+	if err != nil {
+		return nil, err
+	}
+
+	adapter := bluetooth.DefaultAdapter
+	log.Printf("BLE connecting to %s…", addr.String())
+	device, err := adapter.Connect(addr, bluetooth.ConnectionParams{})
+	if err != nil {
+		return nil, fmt.Errorf("connect: %w", err)
+	}
+
+	services, err := device.DiscoverServices([]bluetooth.UUID{svcUUID})
+	if err != nil || len(services) == 0 {
+		_ = device.Disconnect()
+		return nil, fmt.Errorf("discover service: %v", err)
+	}
+	chars, err := services[0].DiscoverCharacteristics([]bluetooth.UUID{chrUUID})
+	if err != nil || len(chars) == 0 {
+		_ = device.Disconnect()
+		return nil, fmt.Errorf("discover characteristic: %v", err)
+	}
+	char := chars[0]
+
+	attMTU := 0
+	if mtu, err := char.GetMTU(); err == nil {
+		attMTU = int(mtu)
+		log.Printf("BLE ATT MTU=%d", attMTU)
+		if attMTU < otaMinATTMTU {
+			log.Printf("warning: MTU %d < %d — OTA (200 B chunks) and large stream ticks may fail",
+				attMTU, otaMinATTMTU)
+		}
+	}
+
+	link := &bleLink{
+		device:   device,
+		char:     char,
+		parser:   uartframe.NewParser(),
+		respCh:   make(chan []byte, 8),
+		streamCh: make(chan []byte, 64),
+		attMTU:   attMTU,
+	}
+
+	if err := char.EnableNotifications(func(buf []byte) {
+		link.onNotify(buf)
+	}); err != nil {
+		_ = device.Disconnect()
+		return nil, fmt.Errorf("enable notifications: %w (CCCD required before commands)", err)
+	}
+
+	if settle <= 0 {
+		settle = time.Second
+	}
+	log.Printf("BLE connected; settling %v…", settle)
+	time.Sleep(settle)
+
+	return link, nil
+}
+
+func (b *bleLink) onNotify(buf []byte) {
+	b.parserMu.Lock()
+	defer b.parserMu.Unlock()
+	for _, by := range buf {
+		payload, ok, err := b.parser.Feed(by)
+		if err != nil || !ok {
+			continue
+		}
+		if len(payload) == 0 {
+			continue
+		}
+		if payload[0] == byte(pb.MessageType_BLE_STREAM_TICK) {
+			select {
+			case b.streamCh <- payload:
+			default:
+			}
+			continue
+		}
+		select {
+		case b.respCh <- payload:
+		default:
+			// Prefer dropping the oldest queued frame so a late/stale reply
+			// does not block the matching response for the in-flight command.
+			select {
+			case <-b.respCh:
+			default:
+			}
+			select {
+			case b.respCh <- payload:
+			default:
+				log.Printf("BLE: response channel full, dropping frame type=0x%02x", payload[0])
+			}
+		}
+	}
+}
+
+func (b *bleLink) resetParser() {
+	b.parserMu.Lock()
+	b.parser = uartframe.NewParser()
+	b.parserMu.Unlock()
+}
+
+func (b *bleLink) Close() error {
+	return b.device.Disconnect()
+}
+
+func (b *bleLink) exchange(cmdID byte, cmdName string) ([]byte, error) {
+	return b.exchangePayload([]byte{cmdID}, cmdName)
+}
+
+func (b *bleLink) exchangePayload(payload []byte, cmdName string) ([]byte, error) {
+	return b.exchangePayloadTimeout(payload, cmdName, readTimeout)
+}
+
+func (b *bleLink) exchangePayloadTimeout(payload []byte, cmdName string, timeout time.Duration) ([]byte, error) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+
+	if len(payload) == 0 {
+		return nil, fmt.Errorf("empty payload")
+	}
+	expect := payload[0]
+	if timeout <= 0 {
+		timeout = readTimeout
+	}
+
+	frame, err := uartframe.EncodeFrame(payload)
+	if err != nil {
+		return nil, fmt.Errorf("encode frame: %w", err)
+	}
+	if !b.quiet {
+		log.Printf("BLE sending %s (%d bytes)", cmdName, len(frame))
+	}
+
+	for {
+		select {
+		case <-b.respCh:
+		default:
+			goto sent
+		}
+	}
+sent:
+	if _, err := b.char.WriteWithoutResponse(frame); err != nil {
+		return nil, fmt.Errorf("BLE write: %w (check DIP8=BLE)", err)
+	}
+
+	deadline := time.Now().Add(timeout)
+	for {
+		remain := time.Until(deadline)
+		if remain <= 0 {
+			// Drop a half-parsed frame (e.g. aborted multi-notify) so the next
+			// exchange does not treat a new 0xAA as payload data.
+			b.resetParser()
+			return nil, fmt.Errorf("BLE read timeout for %s (check DIP8=BLE / -ble)", cmdName)
+		}
+		timer := time.NewTimer(remain)
+		select {
+		case resp := <-b.respCh:
+			timer.Stop()
+			if len(resp) == 0 {
+				continue
+			}
+			if resp[0] != expect {
+				// Stale reply (e.g. late BATTERY_STATUS after a short timeout).
+				if !b.quiet {
+					log.Printf("BLE: discard type=0x%02x while waiting for 0x%02x (%s)", resp[0], expect, cmdName)
+				}
+				continue
+			}
+			if !b.quiet {
+				log.Printf("BLE response (%d bytes)", len(resp))
+			}
+			return resp, nil
+		case <-timer.C:
+			b.resetParser()
+			return nil, fmt.Errorf("BLE read timeout for %s (check DIP8=BLE / -ble)", cmdName)
+		}
+	}
+}
+
+func (b *bleLink) NextStreamTick(timeout time.Duration) ([]byte, error) {
+	if timeout <= 0 {
+		timeout = 5 * time.Second
+	}
+	timer := time.NewTimer(timeout)
+	defer timer.Stop()
+	select {
+	case p := <-b.streamCh:
+		return p, nil
+	case <-timer.C:
+		return nil, fmt.Errorf("BLE stream tick timeout")
+	}
+}
+
+// ensureOTAMTU rejects OTA when the negotiated ATT MTU cannot carry 200 B chunks.
+func (b *bleLink) ensureOTAMTU() error {
+	mtu := b.attMTU
+	if mtu <= 0 {
+		if v, err := b.char.GetMTU(); err == nil {
+			mtu = int(v)
+			b.attMTU = mtu
+		}
+	}
+	if mtu < otaMinATTMTU {
+		return fmt.Errorf("BLE ATT MTU %d < %d required for OTA (negotiate larger MTU)", mtu, otaMinATTMTU)
+	}
+	maxWrite := mtu - 3
+	if maxWrite < 216 {
+		return fmt.Errorf("BLE max write %d < 216 needed for 200 B OTA frames", maxWrite)
+	}
+	return nil
+}
+
+func (b *bleLink) writeMsg(msg *pb.UartMessage) error {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	frame, err := encodeUartMessage(msg)
+	if err != nil {
+		return err
+	}
+	if b.attMTU > 0 && len(frame) > b.attMTU-3 {
+		return fmt.Errorf("OTA frame %d exceeds BLE max write %d (MTU=%d)",
+			len(frame), b.attMTU-3, b.attMTU)
+	}
+	if _, err := b.char.WriteWithoutResponse(frame); err != nil {
+		return fmt.Errorf("BLE write: %w", err)
+	}
+	return nil
+}
+
+func (b *bleLink) readFrame(timeout time.Duration) ([]byte, error) {
+	if timeout <= 0 {
+		timeout = readTimeout
+	}
+	timer := time.NewTimer(timeout)
+	defer timer.Stop()
+	select {
+	case p := <-b.respCh:
+		return p, nil
+	case <-timer.C:
+		return nil, fmt.Errorf("BLE read timeout")
+	}
+}
+
+func (b *bleLink) flushInput() {
+	for {
+		select {
+		case <-b.respCh:
+		default:
+			goto streams
+		}
+	}
+streams:
+	for {
+		select {
+		case <-b.streamCh:
+		default:
+			return
+		}
+	}
+}
+
+func (b *bleLink) chunkPace() time.Duration { return otaHostChunkPaceBLE }
@@ -0,0 +1,224 @@
+package main
+
+import (
+	"fmt"
+	"math"
+	"sort"
+	"time"
+
+	pb "powerpod/gotool/pb"
+
+	"google.golang.org/protobuf/proto"
+)
+
+type latencyStats struct {
+	N      int     `json:"n"`
+	MinMs  float64 `json:"min_ms"`
+	MedMs  float64 `json:"median_ms"`
+	MeanMs float64 `json:"mean_ms"`
+	MaxMs  float64 `json:"max_ms"`
+}
+
+type bleRttResult struct {
+	Success bool         `json:"success"`
+	Count   int          `json:"count"`
+	Warmup  int          `json:"warmup"`
+	Stats   latencyStats `json:"stats"`
+	Error   string       `json:"error,omitempty"`
+}
+
+type bleStreamResult struct {
+	Success     bool         `json:"success"`
+	Received    int          `json:"received"`
+	Requested   int          `json:"requested"`
+	PeriodMs    uint32       `json:"period_ms"`
+	TolMs       float64      `json:"tol_ms"`
+	OutsideTol  int          `json:"outside_tol"`
+	WindowOK    bool         `json:"window_ok"`
+	DTEsp       latencyStats `json:"dt_esp_ms"`
+	DRPc        latencyStats `json:"dr_pc_ms"`
+	ExtraVsFirst latencyStats `json:"extra_vs_first_ms"`
+	Error       string       `json:"error,omitempty"`
+}
+
+func measureBleRtt(h hostConn, count, warmup int, settle time.Duration) bleRttResult {
+	out := bleRttResult{Count: count, Warmup: warmup}
+	if count < 1 {
+		out.Error = "count must be >= 1"
+		return out
+	}
+	if warmup < 0 {
+		out.Error = "warmup must be >= 0"
+		return out
+	}
+	if settle > 0 {
+		time.Sleep(settle)
+	}
+
+	samples := make([]float64, 0, count)
+	total := warmup + count
+	for i := 0; i < total; i++ {
+		t0 := time.Now()
+		if _, err := hostGetVersion(h); err != nil {
+			out.Error = fmt.Sprintf("VERSION round-trip %d: %v", i, err)
+			return out
+		}
+		ms := float64(time.Since(t0).Microseconds()) / 1000.0
+		if i >= warmup {
+			samples = append(samples, ms)
+		}
+	}
+	out.Stats = makeLatencyStats(samples)
+	out.Success = true
+	return out
+}
+
+func measureBleStream(h hostConn, clientID, periodMs uint32, count int, tolMs, timeoutSec float64) bleStreamResult {
+	out := bleStreamResult{
+		Requested: count,
+		PeriodMs:  periodMs,
+		TolMs:     tolMs,
+	}
+	if periodMs < 10 || periodMs > 16 {
+		out.Error = "period_ms must be 10..16"
+		return out
+	}
+	if count < 2 {
+		out.Error = "count must be >= 2"
+		return out
+	}
+	sc, ok := h.(hostStreamConn)
+	if !ok {
+		out.Error = "BLE stream ticks require BLE host"
+		return out
+	}
+
+	req := &pb.AccelStreamRequest{
+		Write:    true,
+		Enable:   true,
+		PeriodMs: periodMs,
+	}
+	if clientID == 0 {
+		req.AllClients = true
+	} else {
+		req.ClientId = clientID
+	}
+	resp, err := hostAccelStream(h, req)
+	if err != nil {
+		out.Error = err.Error()
+		return out
+	}
+	if !resp.GetSuccess() {
+		out.Error = "accel stream enable failed"
+		return out
+	}
+
+	type sample struct {
+		espUs uint64
+		pcT  float64
+	}
+	samples := make([]sample, 0, count)
+	deadline := time.Now().Add(time.Duration(timeoutSec * float64(time.Second)))
+	if timeoutSec <= 0 {
+		deadline = time.Now().Add(15 * time.Second)
+	}
+
+	for len(samples) < count {
+		remain := time.Until(deadline)
+		if remain <= 0 {
+			break
+		}
+		payload, err := sc.NextStreamTick(remain)
+		if err != nil {
+			break
+		}
+		pcT := time.Now().UnixMicro()
+		var msg pb.UartMessage
+		if err := proto.Unmarshal(payload[1:], &msg); err != nil {
+			continue
+		}
+		tick := msg.GetBleStreamTick()
+		if tick == nil {
+			continue
+		}
+		samples = append(samples, sample{espUs: tick.GetEspTimestampUs(), pcT: float64(pcT)})
+	}
+
+	off := &pb.AccelStreamRequest{Write: true, Enable: false, AllClients: req.AllClients, ClientId: req.ClientId}
+	_, _ = hostAccelStream(h, off)
+
+	out.Received = len(samples)
+	if len(samples) < 2 {
+		out.Error = fmt.Sprintf("need >=2 ticks, got %d (stream running / DIP8=BLE?)", len(samples))
+		return out
+	}
+
+	var dT, dR, extra []float64
+	esp0 := samples[0].espUs
+	pc0 := samples[0].pcT
+	for i := 1; i < len(samples); i++ {
+		dT = append(dT, float64(samples[i].espUs-samples[i-1].espUs)/1000.0)
+		dR = append(dR, (samples[i].pcT-samples[i-1].pcT)/1000.0)
+		relEsp := float64(samples[i].espUs-esp0) / 1000.0
+		relPc := (samples[i].pcT - pc0) / 1000.0
+		extra = append(extra, relPc-relEsp)
+	}
+
+	period := float64(periodMs)
+	outCount := 0
+	for _, dt := range dT {
+		if math.Abs(dt-period) > tolMs {
+			outCount++
+		}
+	}
+	out.OutsideTol = outCount
+	out.WindowOK = outCount*2 <= len(dT)
+	out.DTEsp = makeLatencyStats(dT)
+	out.DRPc = makeLatencyStats(dR)
+	out.ExtraVsFirst = makeLatencyStats(extra)
+	out.Success = true
+	return out
+}
+
+func makeLatencyStats(v []float64) latencyStats {
+	if len(v) == 0 {
+		return latencyStats{}
+	}
+	s := append([]float64(nil), v...)
+	sort.Float64s(s)
+	return latencyStats{
+		N:      len(s),
+		MinMs:  s[0],
+		MedMs:  percentile(s, 0.5),
+		MeanMs: mean(s),
+		MaxMs:  s[len(s)-1],
+	}
+}
+
+func mean(v []float64) float64 {
+	if len(v) == 0 {
+		return math.NaN()
+	}
+	var s float64
+	for _, x := range v {
+		s += x
+	}
+	return s / float64(len(v))
+}
+
+func percentile(sorted []float64, p float64) float64 {
+	if len(sorted) == 0 {
+		return math.NaN()
+	}
+	if len(sorted) == 1 {
+		return sorted[0]
+	}
+	idx := p * float64(len(sorted)-1)
+	lo := int(idx)
+	hi := lo + 1
+	if hi >= len(sorted) {
+		return sorted[lo]
+	}
+	frac := idx - float64(lo)
+	return sorted[lo]*(1-frac) + sorted[hi]*frac
+}
@@ -1,6 +1,12 @@
 package main

-import "powerpod/gotool/pb"
+import (
+	"fmt"
+
+	"powerpod/gotool/pb"
+
+	"google.golang.org/protobuf/proto"
+)

 // accelSamplesFromCacheStatus maps combined CACHE_STATUS entries to AccelSample
 // (for dashboard / WebSocket accel push).
@@ -47,3 +53,31 @@ func tapEventsFromCacheStatus(r *pb.CacheStatusResponse) []*pb.TapEvent {
 	}
 	return out
 }
+
+// cacheStatusFromBLEStreamPayload parses a framed BLE_STREAM_TICK payload
+// (type byte + protobuf UartMessage) into a CacheStatusResponse-shaped view.
+func cacheStatusFromBLEStreamPayload(payload []byte) (*pb.CacheStatusResponse, error) {
+	tick, err := parseBleStreamTickPayload(payload)
+	if err != nil {
+		return nil, err
+	}
+	return &pb.CacheStatusResponse{Clients: tick.GetClients()}, nil
+}
+
+func parseBleStreamTickPayload(payload []byte) (*pb.BleStreamTick, error) {
+	if len(payload) < 2 {
+		return nil, fmt.Errorf("BLE stream tick too short")
+	}
+	if payload[0] != byte(pb.MessageType_BLE_STREAM_TICK) {
+		return nil, fmt.Errorf("unexpected BLE tick type 0x%02x", payload[0])
+	}
+	var msg pb.UartMessage
+	if err := proto.Unmarshal(payload[1:], &msg); err != nil {
+		return nil, err
+	}
+	tick := msg.GetBleStreamTick()
+	if tick == nil {
+		return nil, fmt.Errorf("missing ble_stream_tick")
+	}
+	return tick, nil
+}
@@ -64,16 +64,14 @@ func decodeBatteryStatusPayload(payload []byte) (*pb.BatteryStatusResponse, erro
 }

 func (m *managedSerial) BatteryStatus(req *pb.BatteryStatusRequest) (*pb.BatteryStatusResponse, error) {
-	var resp *pb.BatteryStatusResponse
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.batteryStatus(req)
-		return e
-	})
-	return resp, err
+	return m.batteryStatusExchange(false, req)
 }

 func (m *managedSerial) BatteryStatusPoll(req *pb.BatteryStatusRequest) (*pb.BatteryStatusResponse, error) {
+	return m.batteryStatusExchange(true, req)
+}
+
+func (m *managedSerial) batteryStatusExchange(poll bool, req *pb.BatteryStatusRequest) (*pb.BatteryStatusResponse, error) {
 	msg := &pb.UartMessage{
 		Type: pb.MessageType_BATTERY_STATUS,
 		Payload: &pb.UartMessage_BatteryStatusRequest{
@@ -85,23 +83,18 @@ func (m *managedSerial) BatteryStatusPoll(req *pb.BatteryStatusRequest) (*pb.Bat
 		return nil, fmt.Errorf("encode: %w", err)
 	}
 	payload := append([]byte{byte(pb.MessageType_BATTERY_STATUS)}, body...)
-	respPayload, err := m.batteryStatusPayloadPoll(payload)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadMode(true, payload, "BATTERY_STATUS", batteryReadTimeout)
+	} else {
+		respPayload, err = m.exchangePayloadMode(false, payload, "BATTERY_STATUS", batteryReadTimeout)
+	}
 	if err != nil {
 		return nil, err
 	}
 	return decodeBatteryStatusPayload(respPayload)
 }

-func (m *managedSerial) batteryStatusPayloadPoll(payload []byte) ([]byte, error) {
-	var resp []byte
-	err := m.withPortPoll(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.exchangePayloadForBattery(payload, "BATTERY_STATUS")
-		return e
-	})
-	return resp, err
-}
-
 func (s *serialPort) batteryStatus(req *pb.BatteryStatusRequest) (*pb.BatteryStatusResponse, error) {
 	msg := &pb.UartMessage{
 		Type: pb.MessageType_BATTERY_STATUS,
@@ -122,11 +115,11 @@ func (s *serialPort) batteryStatus(req *pb.BatteryStatusRequest) (*pb.BatterySta
 }

 func (m *managedSerial) AccelStream(req *pb.AccelStreamRequest) (*pb.AccelStreamResponse, error) {
-	return m.accelStreamVia(m.withPort, req)
+	return m.accelStreamExchange(false, req)
 }

 func (m *managedSerial) AccelStreamPoll(req *pb.AccelStreamRequest) (*pb.AccelStreamResponse, error) {
-	return m.accelStreamVia(m.withPortPoll, req)
+	return m.accelStreamExchange(true, req)
 }

 // SetAccelStream enables or disables the ESP-NOW accel stream for one slave (master UART).
@@ -154,24 +147,41 @@ func (m *managedSerial) GetAccelStream(clientID uint32) (bool, error) {
 }

 func (m *managedSerial) TapNotify(req *pb.TapNotifyRequest) (*pb.TapNotifyResponse, error) {
-	return m.tapNotifyVia(m.withPort, req)
+	return m.tapNotifyExchange(false, req)
 }

 func (m *managedSerial) TapNotifyPoll(req *pb.TapNotifyRequest) (*pb.TapNotifyResponse, error) {
-	return m.tapNotifyVia(m.withPortPoll, req)
+	return m.tapNotifyExchange(true, req)
 }

-func (m *managedSerial) tapNotifyVia(
-	portFn func(func(*serialPort) error) error,
-	req *pb.TapNotifyRequest,
-) (*pb.TapNotifyResponse, error) {
-	var resp *pb.TapNotifyResponse
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.TapNotify(req)
-		return e
-	})
-	return resp, err
+func (m *managedSerial) tapNotifyExchange(poll bool, req *pb.TapNotifyRequest) (*pb.TapNotifyResponse, error) {
+	msg := &pb.UartMessage{
+		Type:    pb.MessageType_TAP_NOTIFY,
+		Payload: &pb.UartMessage_TapNotifyRequest{TapNotifyRequest: req},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_TAP_NOTIFY)}, body...)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadPoll(payload, "TAP_NOTIFY")
+	} else {
+		respPayload, err = m.exchangePayload(payload, "TAP_NOTIFY")
+	}
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetTapNotifyResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing tap_notify_response")
+	}
+	return r, nil
 }

 func (m *managedSerial) readCacheStatusPoll() (*pb.CacheStatusResponse, error) {
@@ -204,69 +214,176 @@ func decodeCacheStatusPayload(payload []byte) (*pb.CacheStatusResponse, error) {
 	return r, nil
 }

-func (m *managedSerial) accelStreamVia(
-	portFn func(func(*serialPort) error) error,
-	req *pb.AccelStreamRequest,
-) (*pb.AccelStreamResponse, error) {
-	var resp *pb.AccelStreamResponse
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.AccelStream(req)
-		return e
-	})
-	return resp, err
+func (m *managedSerial) accelStreamExchange(poll bool, req *pb.AccelStreamRequest) (*pb.AccelStreamResponse, error) {
+	msg := &pb.UartMessage{
+		Type:    pb.MessageType_ACCEL_STREAM,
+		Payload: &pb.UartMessage_AccelStreamRequest{AccelStreamRequest: req},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_ACCEL_STREAM)}, body...)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadPoll(payload, "ACCEL_STREAM")
+	} else {
+		respPayload, err = m.exchangePayload(payload, "ACCEL_STREAM")
+	}
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetAccelStreamResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing accel_stream_response")
+	}
+	return r, nil
 }

 func (m *managedSerial) AccelDeadzone(req *pb.AccelDeadzoneRequest) (*pb.AccelDeadzoneResponse, error) {
-	return m.accelDeadzoneVia(m.withPort, req)
+	return m.accelDeadzoneExchange(false, req)
 }

 func (m *managedSerial) AccelDeadzonePoll(req *pb.AccelDeadzoneRequest) (*pb.AccelDeadzoneResponse, error) {
-	return m.accelDeadzoneVia(m.withPortPoll, req)
+	return m.accelDeadzoneExchange(true, req)
 }

 func (m *managedSerial) TapConfig(req *pb.TapConfigRequest) (*pb.TapConfigResponse, error) {
-	return m.tapConfigVia(m.withPort, req)
+	return m.tapConfigExchange(false, req)
 }

 func (m *managedSerial) TapConfigPoll(req *pb.TapConfigRequest) (*pb.TapConfigResponse, error) {
-	return m.tapConfigVia(m.withPortPoll, req)
+	return m.tapConfigExchange(true, req)
 }

-func (m *managedSerial) tapConfigVia(
-	portFn func(func(*serialPort) error) error,
-	req *pb.TapConfigRequest,
-) (*pb.TapConfigResponse, error) {
-	var resp *pb.TapConfigResponse
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.TapConfig(req)
-		return e
-	})
-	return resp, err
+func (m *managedSerial) tapConfigExchange(poll bool, req *pb.TapConfigRequest) (*pb.TapConfigResponse, error) {
+	msg := &pb.UartMessage{
+		Type:    pb.MessageType_TAP_CONFIG,
+		Payload: &pb.UartMessage_TapConfigRequest{TapConfigRequest: req},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_TAP_CONFIG)}, body...)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadPoll(payload, "TAP_CONFIG")
+	} else {
+		respPayload, err = m.exchangePayload(payload, "TAP_CONFIG")
+	}
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetTapConfigResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing tap_config_response")
+	}
+	return r, nil
 }

-func (m *managedSerial) accelDeadzoneVia(
-	portFn func(func(*serialPort) error) error,
-	req *pb.AccelDeadzoneRequest,
-) (*pb.AccelDeadzoneResponse, error) {
-	var resp *pb.AccelDeadzoneResponse
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.AccelDeadzone(req)
-		return e
-	})
-	return resp, err
+func (m *managedSerial) BatteryUv(req *pb.BatteryUvRequest) (*pb.BatteryUvResponse, error) {
+	return m.batteryUvExchange(false, req)
+}
+
+func (m *managedSerial) BatteryUvPoll(req *pb.BatteryUvRequest) (*pb.BatteryUvResponse, error) {
+	return m.batteryUvExchange(true, req)
+}
+
+func (m *managedSerial) batteryUvExchange(poll bool, req *pb.BatteryUvRequest) (*pb.BatteryUvResponse, error) {
+	msg := &pb.UartMessage{
+		Type:    pb.MessageType_BATTERY_UV,
+		Payload: &pb.UartMessage_BatteryUvRequest{BatteryUvRequest: req},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_BATTERY_UV)}, body...)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadPoll(payload, "BATTERY_UV")
+	} else {
+		respPayload, err = m.exchangePayload(payload, "BATTERY_UV")
+	}
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetBatteryUvResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing battery_uv_response")
+	}
+	return r, nil
+}
+
+func (m *managedSerial) accelDeadzoneExchange(poll bool, req *pb.AccelDeadzoneRequest) (*pb.AccelDeadzoneResponse, error) {
+	msg := &pb.UartMessage{
+		Type:    pb.MessageType_ACCEL_DEADZONE,
+		Payload: &pb.UartMessage_AccelDeadzoneRequest{AccelDeadzoneRequest: req},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_ACCEL_DEADZONE)}, body...)
+	var respPayload []byte
+	if poll {
+		respPayload, err = m.exchangePayloadPoll(payload, "ACCEL_DEADZONE")
+	} else {
+		respPayload, err = m.exchangePayload(payload, "ACCEL_DEADZONE")
+	}
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetAccelDeadzoneResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing accel_deadzone_response")
+	}
+	return r, nil
 }

 func (m *managedSerial) EspnowUnicastTest(clientID, seq uint32) (*pb.EspNowUnicastTestResponse, error) {
-	var resp *pb.EspNowUnicastTestResponse
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.EspnowUnicastTest(clientID, seq)
-		return e
-	})
-	return resp, err
+	req := &pb.EspNowUnicastTestRequest{ClientId: clientID, Seq: seq}
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_ESPNOW_UNICAST_TEST,
+		Payload: &pb.UartMessage_EspnowUnicastTestRequest{
+			EspnowUnicastTestRequest: req,
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_ESPNOW_UNICAST_TEST)}, body...)
+	respPayload, err := m.exchangePayload(payload, "ESPNOW_UNICAST_TEST")
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetEspnowUnicastTestResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing espnow_unicast_test_response")
+	}
+	return r, nil
 }

 func decodeVersionPayload(payload []byte) (*pb.VersionResponse, error) {
@@ -431,6 +548,33 @@ func (s *serialPort) tapConfig(req *pb.TapConfigRequest) (*pb.TapConfigResponse,
 	return r, nil
 }

+func (s *serialPort) batteryUv(req *pb.BatteryUvRequest) (*pb.BatteryUvResponse, error) {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_BATTERY_UV,
+		Payload: &pb.UartMessage_BatteryUvRequest{
+			BatteryUvRequest: req,
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_BATTERY_UV)}, body...)
+	respPayload, err := s.exchangePayload(payload, "BATTERY_UV")
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetBatteryUvResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing battery_uv_response")
+	}
+	return r, nil
+}
+
 func (s *serialPort) espnowUnicastTest(clientID, seq uint32) (*pb.EspNowUnicastTestResponse, error) {
 	req := &pb.EspNowUnicastTestRequest{ClientId: clientID, Seq: seq}
 	msg := &pb.UartMessage{
@@ -520,26 +664,19 @@ func (s *serialPort) echoPing(clientID uint32) (*EchoPingResult, error) {
 }

 func (m *managedSerial) FindMe(clientID uint32) error {
-	return m.withPort(func(sp *serialPort) error {
-		return runFindMeClient(sp, clientID)
-	})
+	return hostFindMe(m, clientID)
 }

 func (m *managedSerial) SetLogLevel(write bool, level uint32) (*pb.SetLogLevelResponse, error) {
-	var resp *pb.SetLogLevelResponse
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		resp, e = runSetLogLevelClient(sp, write, level)
-		return e
-	})
-	return resp, err
+	return hostSetLogLevel(m, write, level)
+}
+
+func (m *managedSerial) InputSendMode(req *pb.InputSendModeRequest) (*pb.InputSendModeResponse, error) {
+	return hostInputSendMode(m, req)
 }

 func (m *managedSerial) Restart(clientID uint32) error {
-	err := m.withPort(func(sp *serialPort) error {
-		return runRestartClient(sp, clientID)
-	})
-	if err != nil {
+	if err := hostRestart(m, clientID); err != nil {
 		return err
 	}
 	if clientID == 0 {
@@ -609,6 +746,10 @@ func (s *serialPort) TapConfig(req *pb.TapConfigRequest) (*pb.TapConfigResponse,
 	return s.tapConfig(req)
 }

+func (s *serialPort) BatteryUv(req *pb.BatteryUvRequest) (*pb.BatteryUvResponse, error) {
+	return s.batteryUv(req)
+}
+
 func (s *serialPort) EspnowUnicastTest(clientID, seq uint32) (*pb.EspNowUnicastTestResponse, error) {
 	return s.espnowUnicastTest(clientID, seq)
 }
@@ -618,13 +759,7 @@ func (s *serialPort) EchoPing(clientID uint32) (*EchoPingResult, error) {
 }

 func (m *managedSerial) EchoPing(clientID uint32) (*EchoPingResult, error) {
-	var result *EchoPingResult
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		result, e = sp.echoPing(clientID)
-		return e
-	})
-	return result, err
+	return hostEchoPing(m, clientID)
 }

 func (s *serialPort) LedRing(req *pb.LedRingProgressRequest) (*pb.LedRingProgressResponse, error) {
@@ -632,13 +767,7 @@ func (s *serialPort) LedRing(req *pb.LedRingProgressRequest) (*pb.LedRingProgres
 }

 func (m *managedSerial) LedRing(req *pb.LedRingProgressRequest) (*pb.LedRingProgressResponse, error) {
-	var resp *pb.LedRingProgressResponse
-	err := m.withPort(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.LedRing(req)
-		return e
-	})
-	return resp, err
+	return hostLedRing(m, req)
 }

 func (s *serialPort) FindMe(clientID uint32) (*pb.EspNowFindMeResponse, error) {
@@ -0,0 +1,44 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+
+	pb "powerpod/gotool/pb"
+)
+
+func runAccelStreamCmd(h hostConn, args []string) error {
+	fs := flag.NewFlagSet("accel-stream", flag.ExitOnError)
+	clientID := fs.Uint("client", 0, "slave client id (0 with -all)")
+	all := fs.Bool("all", false, "all registered clients")
+	enable := fs.Bool("enable", true, "enable stream")
+	disable := fs.Bool("disable", false, "disable stream")
+	period := fs.Uint("period", 0, "BLE push period_ms 10–16 (0=leave/default)")
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+	on := *enable
+	if *disable {
+		on = false
+	}
+	if !*all && *clientID == 0 {
+		return fmt.Errorf("need -client ID or -all")
+	}
+	req := &pb.AccelStreamRequest{
+		Write:    true,
+		Enable:   on,
+		PeriodMs: uint32(*period),
+	}
+	if *all {
+		req.AllClients = true
+	} else {
+		req.ClientId = uint32(*clientID)
+	}
+	r, err := hostAccelStream(h, req)
+	if err != nil {
+		return err
+	}
+	fmt.Printf("accel-stream: success=%v enabled=%v client_id=%d slaves_updated=%d\n",
+		r.GetSuccess(), r.GetEnabled(), r.GetClientId(), r.GetSlavesUpdated())
+	return nil
+}
@@ -0,0 +1,34 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+
+	"powerpod/gotool/pb"
+)
+
+func runBatteryUv(sp *serialPort, args []string) error {
+	fs := flag.NewFlagSet("battery-uv", flag.ExitOnError)
+	write := fs.Bool("set", false, "write UV protection enable (default: read)")
+	enabled := fs.Bool("enable", false, "enable software UV protection")
+	clientID := fs.Uint("client", 0, "client id (0=local master)")
+	all := fs.Bool("all", false, "apply to master + all registered slaves")
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+
+	r, err := sp.batteryUv(&pb.BatteryUvRequest{
+		Write:      *write,
+		Enabled:    *enabled,
+		ClientId:   uint32(*clientID),
+		AllClients: *all,
+	})
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("client_id=%d success=%v enabled=%v latched=%v slaves_updated=%d\n",
+		r.GetClientId(), r.GetSuccess(), r.GetEnabled(), r.GetLatched(),
+		r.GetSlavesUpdated())
+	return nil
+}
@@ -0,0 +1,26 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"time"
+)
+
+func runBleRtt(h hostConn, args []string) error {
+	fs := flag.NewFlagSet("ble-rtt", flag.ExitOnError)
+	count := fs.Int("count", 50, "number of measured VERSION round-trips")
+	settle := fs.Float64("settle", 0, "extra settle seconds before measurement (0 = already settled on connect)")
+	warmup := fs.Int("warmup", 5, "discarded warm-up round-trips")
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+
+	out := measureBleRtt(h, *count, *warmup, time.Duration(*settle*float64(time.Second)))
+	if !out.Success {
+		return fmt.Errorf("%s", out.Error)
+	}
+	fmt.Printf("ble-rtt (VERSION): n=%d warmup=%d\n", out.Stats.N, out.Warmup)
+	fmt.Printf("  min=%.3f  median=%.3f  mean=%.3f  max=%.3f  ms\n",
+		out.Stats.MinMs, out.Stats.MedMs, out.Stats.MeanMs, out.Stats.MaxMs)
+	return nil
+}
@@ -0,0 +1,40 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+)
+
+func runBleStream(h hostConn, args []string) error {
+	fs := flag.NewFlagSet("ble-stream", flag.ExitOnError)
+	clientID := fs.Uint("client", 0, "slave client id (0 = all_clients)")
+	periodMs := fs.Uint("period", 10, "BLE push period_ms (10–16)")
+	count := fs.Int("count", 50, "number of BleStreamTick samples")
+	tolMs := fs.Float64("tol", 2.0, "tolerance ms around period for window_ok")
+	duration := fs.Float64("timeout", 15.0, "max seconds waiting for ticks")
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+
+	fmt.Printf("accel stream on; period_ms=%d; collecting %d ticks…\n", *periodMs, *count)
+	out := measureBleStream(h, uint32(*clientID), uint32(*periodMs), *count, *tolMs, *duration)
+	if !out.Success {
+		return fmt.Errorf("%s", out.Error)
+	}
+	fmt.Printf("received=%d/%d period_ms=%d tol=±%.1f ms\n", out.Received, out.Requested, out.PeriodMs, out.TolMs)
+	printStat("dT ESP inter-depart", out.DTEsp)
+	printStat("dR PC  inter-arrive", out.DRPc)
+	printStat("extra vs first", out.ExtraVsFirst)
+	fmt.Printf("outside_tol=%d/%d  window_ok=%s\n", out.OutsideTol, out.DTEsp.N,
+		map[bool]string{true: "yes", false: "no"}[out.WindowOK])
+	return nil
+}
+
+func printStat(name string, s latencyStats) {
+	if s.N == 0 {
+		fmt.Printf("%s: (none)\n", name)
+		return
+	}
+	fmt.Printf("%s: n=%d  min=%.3f  median=%.3f  mean=%.3f  max=%.3f  ms\n",
+		name, s.N, s.MinMs, s.MedMs, s.MeanMs, s.MaxMs)
+}
@@ -0,0 +1,55 @@
+package main
+
+import (
+	"fmt"
+
+	"google.golang.org/protobuf/proto"
+	"powerpod/gotool/pb"
+)
+
+func runClientsResetIds(sp *serialPort) error {
+	resp, err := sp.resetClientIdMap()
+	if err != nil {
+		return err
+	}
+	if !resp.GetSuccess() {
+		return fmt.Errorf("client id map reset rejected")
+	}
+	fmt.Println("client id map cleared (master map + live registry; online slaves notified)")
+	return nil
+}
+
+func decodeClientIdMapResetPayload(payload []byte) (*pb.ClientIdMapResetResponse, error) {
+	if len(payload) < 2 {
+		return nil, fmt.Errorf("short client id map reset response")
+	}
+	if payload[0] != byte(pb.MessageType_CLIENT_ID_MAP_RESET) {
+		return nil, fmt.Errorf("unexpected command id 0x%02x (want 0x%02x)",
+			payload[0], byte(pb.MessageType_CLIENT_ID_MAP_RESET))
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(payload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetClientIdMapResetResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing client_id_map_reset_response")
+	}
+	return r, nil
+}
+
+func (s *serialPort) resetClientIdMap() (*pb.ClientIdMapResetResponse, error) {
+	payload, err := s.exchange(byte(pb.MessageType_CLIENT_ID_MAP_RESET), "CLIENT_ID_MAP_RESET")
+	if err != nil {
+		return nil, err
+	}
+	return decodeClientIdMapResetPayload(payload)
+}
+
+func (m *managedSerial) resetClientIdMap() (*pb.ClientIdMapResetResponse, error) {
+	payload, err := m.exchange(byte(pb.MessageType_CLIENT_ID_MAP_RESET), "CLIENT_ID_MAP_RESET")
+	if err != nil {
+		return nil, err
+	}
+	return decodeClientIdMapResetPayload(payload)
+}
@@ -0,0 +1,42 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+
+	pb "powerpod/gotool/pb"
+)
+
+func runInputSendModeCmd(h hostConn, args []string) error {
+	fs := flag.NewFlagSet("input-send-mode", flag.ExitOnError)
+	write := fs.Bool("set", false, "write mode to slave(s)")
+	mode := fs.Uint("mode", 0, "0=best_effort 1=fast 2=wait 3=reliable")
+	clientID := fs.Uint("client", 0, "slave client_id (required unless -all)")
+	all := fs.Bool("all", false, "apply to every registered slave")
+	_ = fs.Parse(args)
+
+	req := &pb.InputSendModeRequest{
+		Write:      *write,
+		Mode:       pb.InputSendMode(*mode),
+		ClientId:   uint32(*clientID),
+		AllClients: *all,
+	}
+	if *write && !*all && *clientID == 0 {
+		return fmt.Errorf("need -client N or -all when using -set")
+	}
+	if *write && *mode > uint(pb.InputSendMode_INPUT_SEND_RELIABLE) {
+		return fmt.Errorf("mode must be 0..3")
+	}
+
+	r, err := hostInputSendMode(h, req)
+	if err != nil {
+		return err
+	}
+	fmt.Printf("input-send-mode: success=%v mode=%d (%s) client_id=%d slaves_updated=%d\n",
+		r.GetSuccess(), r.GetMode(), inputSendModeName(r.GetMode()), r.GetClientId(),
+		r.GetSlavesUpdated())
+	if *write && !r.GetSuccess() {
+		return fmt.Errorf("input-send-mode rejected")
+	}
+	return nil
+}
@@ -5,7 +5,7 @@ import (
 	"os"
 )

-func runOTA(sp *serialPort, args []string) error {
+func runOTA(t otaTransport, args []string) error {
 	if len(args) < 1 {
 		return fmt.Errorf("usage: ota <firmware.bin>")
 	}
@@ -14,9 +14,17 @@ func runOTA(sp *serialPort, args []string) error {
 		return err
 	}

-	sp.mu.Lock()
-	defer sp.mu.Unlock()
-	return runOTAOnPortUnlocked(sp, data, func(p OTAProgress) {
+	switch x := t.(type) {
+	case *serialPort:
+		x.mu.Lock()
+		defer x.mu.Unlock()
+	case *bleLink:
+		if err := x.ensureOTAMTU(); err != nil {
+			return err
+		}
+	}
+
+	return runOTAUnlocked(t, data, func(p OTAProgress) {
 		switch p.Phase {
 		case "preparing", "ready":
 			fmt.Println(p.Message)
@@ -5,14 +5,19 @@ import (
 	"fmt"
 )

-func runOtaProgress(sp *serialPort, args []string) error {
+func runOtaProgress(t otaTransport, args []string) error {
 	fs := flag.NewFlagSet("ota-progress", flag.ExitOnError)
 	clientID := fs.Uint("client", 0, "slave client id (0 = all in session)")
 	if err := fs.Parse(args); err != nil {
 		return err
 	}

-	r, err := QueryOtaSlaveProgress(sp, uint32(*clientID))
+	if sp, ok := t.(*serialPort); ok {
+		sp.mu.Lock()
+		defer sp.mu.Unlock()
+	}
+
+	r, err := QueryOtaSlaveProgress(t, uint32(*clientID))
 	if err != nil {
 		return err
 	}
@@ -20,21 +20,48 @@ var wsUpgrader = websocket.Upgrader{
 	CheckOrigin: func(r *http.Request) bool { return true },
 }

-func runServe(portName string, baud int, args []string) error {
+type serveOpts struct {
+	portName string
+	baud     int
+	useBLE   bool
+	bleName  string
+	settle   time.Duration
+}
+
+func runServe(opts serveOpts, args []string) error {
 	serveFlags := flag.NewFlagSet("serve", flag.ExitOnError)
 	addr := serveFlags.String("addr", ":8080", "dashboard HTTP listen address")
 	apiAddr := serveFlags.String("api-addr", ":8081", "external API HTTP listen address (empty to disable)")
 	accelInterval := serveFlags.Duration("accel-interval", defaultAccelStreamInterval, "accel WebSocket sample period on API server")
-	interval := serveFlags.Duration("interval", 2*time.Second, "UART poll interval")
+	interval := serveFlags.Duration("interval", 2*time.Second, "host poll interval")
 	if err := serveFlags.Parse(args); err != nil {
 		return err
 	}
-	if portName == "" {
-		return fmt.Errorf("serve requires -port (master UART)")
+	if opts.useBLE && opts.portName != "" {
+		return fmt.Errorf("use either -port or -ble, not both")
 	}

-	link := newManagedSerial(portName, baud)
+	link := newManagedHost(opts.baud)
 	link.quiet = true
+	link.settle = opts.settle
+	if opts.settle <= 0 {
+		link.settle = time.Second
+	}
+
+	switch {
+	case opts.portName != "":
+		if err := link.ConnectUART(opts.portName, opts.baud); err != nil {
+			log.Printf("initial UART connect failed (UI can retry): %v", err)
+		}
+	case opts.useBLE:
+		name := opts.bleName
+		if name == "" {
+			name = bleDefaultName
+		}
+		if err := link.ConnectBLE("", name); err != nil {
+			log.Printf("initial BLE connect failed (UI can scan/retry): %v", err)
+		}
+	}

 	hub := newWSHub()
 	streamCtl := newAccelStreamCtl()
@@ -48,16 +75,17 @@ func runServe(portName string, baud int, args []string) error {
 		shutdownHTTPServer(dashSrv)
 		shutdownAPIServer(apiSrv)
 		if err := link.Close(); err != nil {
-			log.Printf("UART close: %v", err)
+			log.Printf("host close: %v", err)
 		}
 	})

-	go runPoller(link, portName, hub, streamCtl, tapCtl, *interval, stop)
+	go runPoller(link, link.Endpoint(), hub, streamCtl, tapCtl, *interval, stop)
 	go runBatteryPoller(link, hub, 5*time.Second, stop)
 	go runCacheStatusDashboardPoller(link, hub, *accelInterval, stop)
+	go runBLEStreamDashboardPoller(link, hub, streamCtl, stop)

 	if *apiAddr != "" {
-		apiSrv = runAPIServer(portName, link, *apiAddr, *accelInterval, hub, streamCtl, tapCtl, stop)
+		apiSrv = runAPIServer(link.Endpoint(), link, *apiAddr, *accelInterval, hub, streamCtl, tapCtl, stop)
 	}

 	mux := http.NewServeMux()
@@ -85,10 +113,12 @@ func runServe(portName string, baud int, args []string) error {
 	}
 	mux.Handle("/", http.FileServer(http.FS(ui)))

-	log.Printf("dashboard http://localhost%s  (UART %s @ %d baud, poll %s, live-stream %s, auto-reconnect)",
-		*addr, portName, baud, interval.String(), accelInterval.String())
+	log.Printf("dashboard http://localhost%s  (transport=%s endpoint=%q poll %s, live-stream %s)",
+		*addr, link.Transport(), link.Endpoint(), interval.String(), accelInterval.String())
 	if *apiAddr == "" {
 		log.Printf("external API disabled (-api-addr \"\")")
+	} else {
+		log.Printf("external API http://localhost%s  ws://localhost%s/ws", *apiAddr, *apiAddr)
 	}

 	dashSrv = &http.Server{Addr: *addr, Handler: mux}
@@ -20,6 +20,8 @@ type MasterView struct {
 	RunningPartition string          `json:"running_partition,omitempty"`
 	Deadzone         uint32          `json:"deadzone,omitempty"`
 	TapConfig        *TapConfigView  `json:"tap_config,omitempty"`
+	UvProtection     *bool           `json:"uv_protection,omitempty"`
+	UvLatched        bool            `json:"uv_latched,omitempty"`
 	Lipo1            lipoReadingJSON `json:"lipo1"`
 	Lipo2            lipoReadingJSON `json:"lipo2"`
 	BatteryAgeMs     uint32          `json:"battery_age_ms,omitempty"`
@@ -58,6 +60,7 @@ type ClientView struct {
 	TapNotifySingle bool            `json:"tap_notify_single"`
 	TapNotifyDouble bool            `json:"tap_notify_double"`
 	TapNotifyTriple bool            `json:"tap_notify_triple"`
+	UvProtection    bool            `json:"uv_protection"`
 	LastTap         string          `json:"last_tap,omitempty"`
 	LastTapAt       int64           `json:"last_tap_at,omitempty"`
 	Lipo1           lipoReadingJSON `json:"lipo1"`
@@ -66,22 +69,91 @@ type ClientView struct {
 }

 type DashboardState struct {
-	UpdatedAt     string `json:"updated_at"`
-	SerialPort    string `json:"serial_port"`
+	UpdatedAt string `json:"updated_at"`
+	SerialPort string `json:"serial_port"`
+	/** Alias of host_endpoint for older UI. */
+	HostEndpoint  string `json:"host_endpoint"`
+	HostTransport string `json:"host_transport"`
+	HostConnected bool   `json:"host_connected"`
 	UARTConnected bool   `json:"uart_connected"`
 	SerialOK      bool   `json:"serial_ok"`
 	SerialError   string `json:"serial_error,omitempty"`
-	/** Host: fast CACHE_STATUS poll (~16 ms) for accel + tap. */
+	/** Host: fast CACHE_STATUS poll (~8 ms) for accel + tap. */
 	LiveStream bool         `json:"live_stream"`
-	Master     MasterView   `json:"master"`
-	Clients    []ClientView `json:"clients"`
+	/** BLE live path: inter-tick stats from BleStreamTick.esp_timestamp_us. */
+	BleTick  *BleTickView `json:"ble_tick,omitempty"`
+	Master   MasterView   `json:"master"`
+	Clients  []ClientView `json:"clients"`
+}
+
+// BleTickView is median/mean inter-departure of BLE_STREAM_TICK (ESP timer).
+type BleTickView struct {
+	PeriodMs uint32  `json:"period_ms"`
+	MedianMs float64 `json:"median_ms"`
+	MeanMs   float64 `json:"mean_ms"`
+	MinMs    float64 `json:"min_ms"`
+	MaxMs    float64 `json:"max_ms"`
+	Samples  int     `json:"samples"`
+	LastEspUs uint64 `json:"last_esp_us,omitempty"`
+}
+
+const bleTickDeltaCap = 64
+
+type bleTickTracker struct {
+	lastEspUs uint64
+	haveLast  bool
+	periodMs  uint32
+	deltas    [bleTickDeltaCap]float64
+	next      int
+	count     int
+}
+
+func (t *bleTickTracker) reset() {
+	*t = bleTickTracker{}
+}
+
+func (t *bleTickTracker) add(espUs uint64, periodMs uint32) BleTickView {
+	if periodMs != 0 {
+		t.periodMs = periodMs
+	}
+	if t.haveLast && espUs > t.lastEspUs {
+		dt := float64(espUs-t.lastEspUs) / 1000.0
+		t.deltas[t.next] = dt
+		t.next = (t.next + 1) % bleTickDeltaCap
+		if t.count < bleTickDeltaCap {
+			t.count++
+		}
+	}
+	t.lastEspUs = espUs
+	t.haveLast = true
+
+	samples := make([]float64, 0, t.count)
+	if t.count < bleTickDeltaCap {
+		samples = append(samples, t.deltas[:t.count]...)
+	} else {
+		samples = append(samples, t.deltas[t.next:]...)
+		samples = append(samples, t.deltas[:t.next]...)
+	}
+	st := makeLatencyStats(samples)
+	return BleTickView{
+		PeriodMs:  t.periodMs,
+		MedianMs:  st.MedMs,
+		MeanMs:    st.MeanMs,
+		MinMs:     st.MinMs,
+		MaxMs:     st.MaxMs,
+		Samples:   st.N,
+		LastEspUs: espUs,
+	}
 }

 type wsHub struct {
 	mu         sync.RWMutex
+	writeMu    sync.Mutex // gorilla websocket: one writer at a time
 	clients    map[*websocket.Conn]struct{}
 	state      DashboardState
 	liveStream bool
+	bleTicks   bleTickTracker
+	lastPush   time.Time // throttle BLE tick WS pushes
 }

 func newWSHub() *wsHub {
@@ -92,6 +164,10 @@ func (h *wsHub) setState(st DashboardState) {
 	h.mu.Lock()
 	prev := h.state
 	st.LiveStream = prev.LiveStream
+	if st.BleTick == nil && prev.BleTick != nil && st.LiveStream {
+		cp := *prev.BleTick
+		st.BleTick = &cp
+	}
 	st.Clients = preserveClientAccel(st.Clients, prev.Clients, st.LiveStream)
 	st.Clients = preserveClientBattery(st.Clients, prev.Clients)
 	st.Clients = preserveClientTap(st.Clients, prev.Clients)
@@ -136,15 +212,25 @@ func (h *wsHub) unregister(c *websocket.Conn) {
 	h.mu.Unlock()
 }

-// writeJSON sends to one client; removes it on error or panic (closed connection).
+// dropClient removes the client and closes the socket so the browser reconnects.
+func (h *wsHub) dropClient(c *websocket.Conn) {
+	h.unregister(c)
+	_ = c.Close()
+}
+
+// writeJSON sends to one client; removes+closes it on error or panic.
 func (h *wsHub) writeJSON(c *websocket.Conn, data []byte) {
 	defer func() {
 		if recover() != nil {
-			h.unregister(c)
+			h.dropClient(c)
 		}
 	}()
-	if err := c.WriteMessage(websocket.TextMessage, data); err != nil {
-		h.unregister(c)
+	h.writeMu.Lock()
+	_ = c.SetWriteDeadline(time.Now().Add(2 * time.Second))
+	err := c.WriteMessage(websocket.TextMessage, data)
+	h.writeMu.Unlock()
+	if err != nil {
+		h.dropClient(c)
 	}
 }

@@ -406,13 +492,15 @@ func (h *wsHub) snapshotClients() []ClientView {
 	return out
 }

-// patchLiveStream toggles host CACHE_STATUS polling (~16 ms).
+// patchLiveStream toggles host CACHE_STATUS polling (~8 ms).
 func (h *wsHub) patchLiveStream(enabled bool) {
 	h.mu.Lock()
 	h.liveStream = enabled
 	st := h.state
 	st.LiveStream = enabled
 	if !enabled {
+		h.bleTicks.reset()
+		st.BleTick = nil
 		for i := range st.Clients {
 			st.Clients[i].AccelValid = false
 			st.Clients[i].AccelX = 0
@@ -497,6 +585,49 @@ func (h *wsHub) mergeAccel(samples []*pb.AccelSample) {
 	}
 }

+// mergeBleStreamTick applies accel/tap from a BLE tick and updates inter-tick stats.
+// State is updated every tick; WebSocket push is throttled (~50 Hz) so concurrent
+// writers (poller/battery) cannot flood or race the gorilla conn.
+func (h *wsHub) mergeBleStreamTick(tick *pb.BleStreamTick) {
+	if tick == nil || !h.liveStreamEnabled() {
+		return
+	}
+	cache := &pb.CacheStatusResponse{Clients: tick.GetClients()}
+	const minPushGap = 20 * time.Millisecond
+
+	h.mu.Lock()
+	view := h.bleTicks.add(tick.GetEspTimestampUs(), tick.GetPeriodMs())
+	st := h.state
+	st.Clients = applyAccelSamples(st.Clients, accelSamplesFromCacheStatus(cache))
+	st.Clients = applyTapEvents(st.Clients, tapEventsFromCacheStatus(cache))
+	st.BleTick = &view
+	st.UpdatedAt = time.Now().Format(time.RFC3339)
+	h.state = st
+	push := time.Since(h.lastPush) >= minPushGap
+	if push {
+		h.lastPush = time.Now()
+	}
+	var conns []*websocket.Conn
+	if push {
+		conns = make([]*websocket.Conn, 0, len(h.clients))
+		for c := range h.clients {
+			conns = append(conns, c)
+		}
+	}
+	h.mu.Unlock()
+
+	if !push {
+		return
+	}
+	data, err := json.Marshal(st)
+	if err != nil {
+		return
+	}
+	for _, c := range conns {
+		h.writeJSON(c, data)
+	}
+}
+
 func (h *wsHub) mergeTap(events []*pb.TapEvent) {
 	if len(events) == 0 || !h.liveStreamEnabled() {
 		return
@@ -530,20 +661,35 @@ func (h *wsHub) broadcastRaw(v any) {
 }

 func pollDashboard(link *managedSerial, portName string, last *DashboardState, streamCtl *accelStreamCtl, tapCtl *tapNotifyCtl) DashboardState {
+	ep := link.Endpoint()
+	if ep == "" {
+		ep = portName
+	}
+	tr := link.Transport()
 	st := DashboardState{
-		UpdatedAt:  time.Now().Format(time.RFC3339),
-		SerialPort: portName,
-		Clients:    []ClientView{},
+		UpdatedAt:     time.Now().Format(time.RFC3339),
+		SerialPort:    ep,
+		HostEndpoint:  ep,
+		HostTransport: tr,
+		Clients:       []ClientView{},
+	}
+	if !link.IsConnected() && tr == hostTransportNone {
+		st.SerialError = "not connected — use UART or BLE connect"
+		return st
 	}

 	ver, err := link.getVersionPoll()
 	if errors.Is(err, errUARTBusy) {
-		return pausedPollState(portName, last)
+		return pausedPollState(ep, last)
 	}
 	if err != nil {
-		return disconnectedState(portName, err)
+		return disconnectedState(ep, err)
 	}
 	st.UARTConnected = true
+	st.HostConnected = true
+	st.HostTransport = link.Transport()
+	st.HostEndpoint = link.Endpoint()
+	st.SerialPort = st.HostEndpoint
 	st.SerialOK = true
 	st.Master = MasterView{
 		Version:          ver.GetVersion(),
@@ -557,6 +703,11 @@ func pollDashboard(link *managedSerial, portName string, last *DashboardState, s
 	if tc, err := readTapConfigPoll(link, 0); err == nil {
 		st.Master.TapConfig = tc
 	}
+	if uv, err := readBatteryUvPoll(link, 0); err == nil {
+		en := uv.GetEnabled()
+		st.Master.UvProtection = &en
+		st.Master.UvLatched = uv.GetLatched()
+	}

 	clients, err := link.listClientsPoll()
 	if err != nil {
@@ -565,7 +716,8 @@ func pollDashboard(link *managedSerial, portName string, last *DashboardState, s
 		}
 		st.SerialOK = false
 		st.SerialError = err.Error()
-		st.UARTConnected = link.IsConnected()
+		st.HostConnected = link.IsConnected()
+		st.UARTConnected = st.HostConnected
 		return st
 	}

@@ -582,6 +734,7 @@ func pollDashboard(link *managedSerial, portName string, last *DashboardState, s
 			TapNotifySingle: c.GetTapNotifySingle(),
 			TapNotifyDouble: c.GetTapNotifyDouble(),
 			TapNotifyTriple: c.GetTapNotifyTriple(),
+			UvProtection:    c.GetUvProtectionEnabled(),
 		}
 		st.Clients = append(st.Clients, cv)
 	}
@@ -653,7 +806,7 @@ func runBatteryPoller(link *managedSerial, hub *wsHub, interval time.Duration, s
 		case <-stop:
 			return
 		case <-ticker.C:
-			if !link.IsConnected() {
+			if !link.IsConnected() || link.PollPaused() {
 				continue
 			}
 			bat, err := link.BatteryStatusPoll(&pb.BatteryStatusRequest{AllClients: true})
@@ -674,7 +827,11 @@ func runCacheStatusDashboardPoller(link *managedSerial, hub *wsHub, interval tim
 		case <-stop:
 			return
 		case <-ticker.C:
-			if !hub.liveStreamEnabled() {
+			if !hub.liveStreamEnabled() || link.PollPaused() {
+				continue
+			}
+			// BLE live path prefers BLE_STREAM_TICK pushes.
+			if link.Transport() == hostTransportBLE {
 				continue
 			}
 			cache, err := link.readCacheStatusPoll()
@@ -687,6 +844,35 @@ func runCacheStatusDashboardPoller(link *managedSerial, hub *wsHub, interval tim
 	}
 }

+// runBLEStreamDashboardPoller feeds live accel/tap from BLE_STREAM_TICK when live_stream is on.
+func runBLEStreamDashboardPoller(link *managedSerial, hub *wsHub, streamCtl *accelStreamCtl, stop <-chan struct{}) {
+	_ = streamCtl
+	for {
+		select {
+		case <-stop:
+			return
+		default:
+		}
+		if link.Transport() != hostTransportBLE || !hub.liveStreamEnabled() || link.PollPaused() {
+			select {
+			case <-stop:
+				return
+			case <-time.After(50 * time.Millisecond):
+			}
+			continue
+		}
+		payload, err := link.NextStreamTick(200 * time.Millisecond)
+		if err != nil {
+			continue
+		}
+		tick, err := parseBleStreamTickPayload(payload)
+		if err != nil {
+			continue
+		}
+		hub.mergeBleStreamTick(tick)
+	}
+}
+
 func (h *wsHub) clientCount() int {
 	h.mu.RLock()
 	n := len(h.clients)
@@ -695,11 +881,14 @@ func (h *wsHub) clientCount() int {
 }

 func pausedPollState(portName string, last *DashboardState) DashboardState {
-	if last != nil && last.UARTConnected {
+	if last != nil && (last.HostConnected || last.UARTConnected) {
 		st := *last
 		st.UpdatedAt = time.Now().Format(time.RFC3339)
 		st.SerialPort = portName
+		st.HostEndpoint = portName
 		st.SerialOK = true
+		st.HostConnected = true
+		st.UARTConnected = true
 		st.SerialError = "Live-Polling pausiert (OTA läuft)"
 		return st
 	}
@@ -748,6 +937,20 @@ func tapConfigViewFromPB(r *pb.TapConfigResponse) *TapConfigView {
 	}
 }

+func readBatteryUvPoll(link *managedSerial, clientID uint32) (*pb.BatteryUvResponse, error) {
+	r, err := link.BatteryUvPoll(&pb.BatteryUvRequest{
+		Write:    false,
+		ClientId: clientID,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if !r.GetSuccess() {
+		return nil, fmt.Errorf("battery uv read failed for client %d", clientID)
+	}
+	return r, nil
+}
+
 func readTapConfigPoll(link *managedSerial, clientID uint32) (*TapConfigView, error) {
 	r, err := link.TapConfigPoll(&pb.TapConfigRequest{
 		Write:    false,
@@ -774,20 +977,20 @@ func runPoller(link *managedSerial, portName string, hub *wsHub, streamCtl *acce
 	ticker := time.NewTicker(interval)
 	defer ticker.Stop()

-	uartUp := false
+	hostUp := false
 	var lastGood DashboardState
 	publish := func() {
 		st := pollDashboard(link, portName, &lastGood, streamCtl, tapCtl)
 		hub.setState(st)
-		if st.UARTConnected && st.SerialOK {
+		if st.HostConnected && st.SerialOK {
 			hub.mu.RLock()
 			lastGood = hub.state
 			hub.mu.RUnlock()
 		}
-		if st.UARTConnected && !uartUp {
-			log.Printf("UART %s connected", portName)
+		if st.HostConnected && !hostUp {
+			log.Printf("host %s connected (%s)", st.HostEndpoint, st.HostTransport)
 		}
-		uartUp = st.UARTConnected
+		hostUp = st.HostConnected
 	}

 	publish()
@@ -1,6 +1,6 @@
 # REST API

-`go run . -port /dev/ttyUSB0 serve` starts two HTTP servers on the same UART link:
+`go run . serve` (optional `-port` / `-ble`) starts two HTTP servers on the same `managedHost` (UART or BLE):

 | Base URL | Flag | Used by |
 |----------|------|---------|
@@ -27,6 +27,9 @@ GET /api/v1/
  "name": "powerpod-external-api",
  "version": "1",
  "serial_port": "/dev/ttyUSB0",
+  "transport": "uart",
+  "endpoint": "/dev/ttyUSB0",
+  "connected": true,
  "websocket": "/ws",
  "default_interval_ms": 16,
  "min_interval_ms": 1,
@@ -110,7 +113,48 @@ WebSocket: `set_led_ring` with the same fields plus `"type":"set_led_ring"` →

 Used by the web UI; safe for scripts that drive the same features.

-### Live stream (host `CACHE_STATUS` poll ~16 ms)
+### Host link (UART / BLE)
+
+```http
+GET /api/host
+→ {"transport":"none|uart|ble","endpoint":"…","connected":false,"ble_name":""}
+
+GET /api/serial/ports
+→ {"ports":["/dev/ttyUSB0",…]}
+
+POST /api/host/connect
+Content-Type: application/json
+{"transport":"uart","port":"/dev/ttyUSB0"}
+{"transport":"ble","address":"AA:BB:…","name":"Powerpod"}
+
+POST /api/host/disconnect
+
+POST /api/ble/scan
+{"timeout_s":5,"name_filter":"Powerpod"}
+→ {"devices":[{"address":"…","name":"Powerpod","rssi":-55}]}
+```
+
+`name_filter` is optional substring match (case-insensitive); omit to list all LE advertisements. Active BLE is disconnected before scan (BlueZ adapter).
+
+Dashboard WebSocket state includes `host_connected`, `host_transport`, `host_endpoint` (aliases `uart_connected` / `serial_port` kept).
+
+**OTA** (`POST /api/ota`) returns **400** unless a host (UART or BLE) is connected.
+
+### BLE latency tests (BLE host only)
+
+```http
+POST /api/ble-rtt
+{"count":50,"warmup":5,"settle_s":0}
+→ {"success":true,"count":50,"warmup":5,"stats":{"n":50,"min_ms":…,"median_ms":…,"mean_ms":…,"max_ms":…}}
+
+POST /api/ble-stream
+{"count":50,"period_ms":8,"tol_ms":2,"timeout_s":15,"client_id":0}
+→ {"success":true,"received":50,"requested":50,"window_ok":true,"dt_esp_ms":{…},"dr_pc_ms":{…},…}
+```
+
+Pauses dashboard/API polling while running. Requires active BLE host (`DIP8=1`).
+
+### Live stream (host `CACHE_STATUS` poll ~8 ms; BLE uses `BLE_STREAM_TICK`)

 ```http
 GET /api/live-stream
@@ -356,14 +400,70 @@ go run . -port /dev/ttyUSB0 log-level -set -level 3

 Dashboard: Master card → dropdown **ESP Log-Level** with **Lesen** / **Setzen**.

-### OTA (master UART upload)
+### Battery UV protection
+
+Runtime enable for software LiPo under-voltage protection (NVS `uv_en` per pod). Disable also clears `uv_latch`. `all_clients` applies to master + every registered slave; `slaves_only` with `all_clients` skips the master.
+
+```http
+GET /api/battery-uv?client_id=0
+POST /api/battery-uv
+Content-Type: application/json
+{"write": true, "enabled": false, "client_id": 0}
+{"write": true, "enabled": false, "all_clients": true}
+{"write": true, "enabled": false, "all_clients": true, "slaves_only": true}
+```
+
+```json
+{"success": true, "client_id": 0, "enabled": false, "latched": false, "slaves_updated": 0}
+```
+
+```bash
+go run . -port /dev/ttyUSB0 battery-uv
+go run . -port /dev/ttyUSB0 battery-uv -set -enable=false -client 0
+go run . -port /dev/ttyUSB0 battery-uv -set -enable=false -all
+```
+
+Dashboard: Master **UV-Schutz** checkbox + **Alle an/aus**; per-slave **UV** column.
+
+### Input send mode (slave accel/tap ESP-NOW TX path)
+
+Debug A/B for how slaves transmit `ACCEL_SAMPLE` / `TAP_EVENT`. Default on slaves is `best_effort` (0). Master remembers the last mode for GET; write pushes via ESP-NOW.
+
+```http
+GET /api/input-send-mode
+PUT /api/input-send-mode
+Content-Type: application/json
+{"mode": 2, "all_clients": true}
+```
+
+| `mode` | Path |
+|--------|------|
+| 0 | `best_effort` (fire-and-forget, quiet) |
+| 1 | `fast` (fire-and-forget, logs failures) |
+| 2 | `wait` (send-done + retries) |
+| 3 | `reliable` (OTA-style retries; can stall high-rate accel) |
+
+```json
+{"success": true, "mode": 2, "mode_name": "wait", "slaves_updated": 2}
+```
+
+**CLI:**
+
+```bash
+go run . -port /dev/ttyUSB0 input-send-mode
+go run . -port /dev/ttyUSB0 input-send-mode -set -mode 2 -all
+```
+
+Dashboard: ESP-NOW Slaves toolbar → **Input-Send** dropdown + **Setzen** / **Lesen**.
+
+### OTA (master host upload, UART or BLE)

 ```http
 POST /api/ota
 Content-Type: multipart/form-data
 ```

-Form field **`firmware`**: binary image, max **2 MiB**.
+Form field **`firmware`**: binary image, max **2 MiB**. Requires connected host (`transport` uart or ble). BLE needs ATT MTU ≥ 219 for 200 B chunks.

 ```json
 {"success": true, "bytes_written": 123456, "target_slot": 1}
@@ -371,7 +471,12 @@ Form field **`firmware`**: binary image, max **2 MiB**.

 Firmware distributes to slaves over ESP-NOW after `OTA_END`. Progress also appears on dashboard WebSocket as `ota_progress` messages.

-CLI equivalent: `go run . -port /dev/ttyUSB0 ota build/powerpod.bin`
+CLI equivalent:
+
+```bash
+go run . -port /dev/ttyUSB0 ota build/powerpod.bin
+go run . -ble ota build/powerpod.bin
+```

 ### LED ring and battery

@@ -406,5 +511,7 @@ Same as external API:
 | Unicast test | `POST /api/unicast-test` |
 | Echo ping | `POST /api/echo-ping` (per-slave latency; UI shows Host ms + ESP ms) |
 | Master log level | `GET` / `POST /api/log-level` or CLI `log-level` |
+| UV protection | `GET` / `POST /api/battery-uv` or CLI `battery-uv` |
+| Input-Send mode | `GET` / `PUT /api/input-send-mode` or CLI `input-send-mode` |
 | Tap notify S/D/T | `PUT /api/clients/{id}/tap-notify` |
 | Tap receive (UI) | Live stream + tap notify; see WebSocket doc for external API |
@@ -2,15 +2,16 @@

 External API: `ws://localhost:8081/ws` (default `-api-addr`, disable with empty string).

-Start with `go run . -port /dev/ttyUSB0 serve`.
+Start with `go run . serve` (optional `-port` / `-ble` to pre-connect). Host can be opened later via `host_connect` / dashboard REST.

 ---

 ## Connection flow

-1. Connect → server sends `hello` (push off; defaults and command list).
-2. Send JSON commands → one reply per message (`*_status` or `client_list`).
-3. After `set_stream` with `enable: true`, server may push `input` messages without a prior command.
+1. Connect → server sends `hello` (host status, push off; defaults and command list).
+2. Optionally `ble_scan` / `list_serial_ports` then `host_connect` if not already linked.
+3. Send JSON commands → one reply per message (`*_status`, `client_list`, `ble_scan_result`, …).
+4. After `set_stream` with `enable: true`, server may push `input` messages without a prior command.

 Commands and pushes share one socket — always branch on `type`.

@@ -27,7 +28,9 @@ On disconnect, `set_stream` state for that socket is dropped. Firmware settings
 | This connection    | `set_stream`                         | Whether you receive push JSON on this socket                       |


-UART polling runs only when at least one connection has `receive_input: true` **and** at least one slave streams input or has tap notify enabled. `set_tap_notify` alone does not enable push — you still need `set_stream`.
+Host polling / BLE ticks run only when at least one connection has `receive_input: true` **and** at least one slave streams input or has tap notify enabled. `set_tap_notify` alone does not enable push — you still need `set_stream`.
+
+On **BLE**, live `input` prefers firmware `BLE_STREAM_TICK` pushes; otherwise falls back to `CACHE_STATUS` like UART.

 ### Push timing (per connection)

@@ -38,7 +41,7 @@ UART polling runs only when at least one connection has `receive_input: true` **
 | `pre_fetch`   | `set_stream`, `stream_status`          | Ms before each push when the host starts the UART cache read |


-Global UART poll interval = minimum `interval_ms` among all connections with push enabled.
+Global host poll interval = minimum `interval_ms` among all connections with push enabled.

 Typical sequence:

@@ -115,10 +118,14 @@ One JSON object per message; field `type` selects the command.
 {
  "type": "hello",
  "serial_port": "/dev/ttyUSB0",
+  "transport": "uart",
+  "endpoint": "/dev/ttyUSB0",
+  "connected": true,
  "interval_ms": 16,
  "pre_fetch_ms": 2,
  "tap_display_min_ms": 2000,
  "commands": [
+    "get_host", "list_serial_ports", "ble_scan", "host_connect", "host_disconnect",
    "list_clients",
    "set_stream", "get_stream",
    "set_input_stream", "get_input_stream",
@@ -128,6 +135,23 @@ One JSON object per message; field `type` selects the command.
 }
 ```

+### Host link
+
+| Client `type` | Reply `type` | Notes |
+|---------------|--------------|--------|
+| `get_host` | `host_status` | `transport`, `endpoint`, `connected` |
+| `list_serial_ports` | `serial_ports` | `{ports:[…]}` |
+| `ble_scan` | `ble_scan_result` | optional `timeout_s`, `name_filter`; disconnects active BLE first |
+| `host_connect` | `host_status` | `transport:"uart","port"` or `transport:"ble","address","name?"` |
+| `host_disconnect` | `host_status` | |
+
+```json
+{"type":"host_connect","transport":"ble","address":"AA:BB:CC:DD:EE:FF","name":"Powerpod"}
+{"type":"host_status","transport":"ble","endpoint":"AA:BB:…","connected":true,"success":true}
+```
+
+If the host is not connected, other commands that need the master return their usual error in the status reply.
+
 ### `list_clients`

 Request: `{"type":"list_clients"}`
@@ -6,9 +6,19 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	go.bug.st/serial v1.6.4
 	google.golang.org/protobuf v1.36.11
+	tinygo.org/x/bluetooth v0.13.0
 )

 require (
 	github.com/creack/goselect v0.1.2 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/saltosystems/winrt-go v0.0.0-20240509164145-4f7860a3bd2b // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/soypat/cyw43439 v0.0.0-20250505012923-830110c8f4af // indirect
+	github.com/soypat/seqs v0.0.0-20250124201400-0d65bc7c1710 // indirect
+	github.com/tinygo-org/cbgo v0.0.4 // indirect
+	github.com/tinygo-org/pio v0.2.0 // indirect
+	golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect
 	golang.org/x/sys v0.19.0 // indirect
 )
@@ -1,20 +1,51 @@
 github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
 github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/saltosystems/winrt-go v0.0.0-20240509164145-4f7860a3bd2b h1:du3zG5fd8snsFN6RBoLA7fpaYV9ZQIsyH9snlk2Zvik=
+github.com/saltosystems/winrt-go v0.0.0-20240509164145-4f7860a3bd2b/go.mod h1:CIltaIm7qaANUIvzr0Vmz71lmQMAIbGJ7cvgzX7FMfA=
+github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/soypat/cyw43439 v0.0.0-20250505012923-830110c8f4af h1:ZfFq94aH/BCSWWKd9RPUgdHOdgGKCnfl2VdvU9UksTA=
+github.com/soypat/cyw43439 v0.0.0-20250505012923-830110c8f4af/go.mod h1:MUaGO5m6X7xrkHrPDmnaxCEcuCCFN/0ZFh9oie+exbU=
+github.com/soypat/seqs v0.0.0-20250124201400-0d65bc7c1710 h1:Y9fBuiR/urFY/m76+SAZTxk2xAOS2n85f+H1CugajeA=
+github.com/soypat/seqs v0.0.0-20250124201400-0d65bc7c1710/go.mod h1:oCVCNGCHMKoBj97Zp9znLbQ1nHxpkmOY9X+UAGzOxc8=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/tinygo-org/cbgo v0.0.4 h1:3D76CRYbH03Rudi8sEgs/YO0x3JIMdyq8jlQtk/44fU=
+github.com/tinygo-org/cbgo v0.0.4/go.mod h1:7+HgWIHd4nbAz0ESjGlJ1/v9LDU1Ox8MGzP9mah/fLk=
+github.com/tinygo-org/pio v0.2.0 h1:vo3xa6xDZ2rVtxrks/KcTZHF3qq4lyWOntvEvl2pOhU=
+github.com/tinygo-org/pio v0.2.0/go.mod h1:LU7Dw00NJ+N86QkeTGjMLNkYcEYMor6wTDpTCu0EaH8=
 go.bug.st/serial v1.6.4 h1:7FmqNPgVp3pu2Jz5PoPtbZ9jJO5gnEnZIvnI1lzve8A=
 go.bug.st/serial v1.6.4/go.mod h1:nofMJxTeNVny/m6+KaafC6vJGj3miwQZ6vW4BZUGJPI=
+golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d h1:0olWaB5pg3+oychR51GUVCEsGkeCU/2JxjBgIo4f3M0=
+golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+tinygo.org/x/bluetooth v0.13.0 h1:3pkTMcfqv71HoAxG4DBTm2n+1bm6Nqqz8eoHjSW9+5g=
+tinygo.org/x/bluetooth v0.13.0/go.mod h1:YnyJRVX09i+wkFeHpXut0b+qHq+T2WwKBRRiF/scANA=
@@ -0,0 +1,266 @@
+package main
+
+import (
+	"fmt"
+	"time"
+
+	"google.golang.org/protobuf/proto"
+	pb "powerpod/gotool/pb"
+)
+
+// hostConn is the UART or BLE host transport used by CLI commands.
+type hostConn interface {
+	exchangePayload(payload []byte, cmdName string) ([]byte, error)
+	exchange(cmdID byte, cmdName string) ([]byte, error)
+	Close() error
+}
+
+// optional stream source (BLE only)
+type hostStreamConn interface {
+	hostConn
+	// NextStreamTick waits for a BLE_STREAM_TICK payload (type byte + protobuf).
+	NextStreamTick(timeout time.Duration) ([]byte, error)
+}
+
+func hostGetVersion(h hostConn) (*pb.VersionResponse, error) {
+	payload, err := h.exchange(byte(pb.MessageType_VERSION), "VERSION")
+	if err != nil {
+		return nil, err
+	}
+	return decodeVersionPayload(payload)
+}
+
+func hostListClients(h hostConn) ([]*pb.ClientInfo, error) {
+	payload, err := h.exchange(byte(pb.MessageType_CLIENT_INFO), "CLIENT_INFO")
+	if err != nil {
+		return nil, err
+	}
+	return decodeClientsPayload(payload)
+}
+
+func hostReadCacheStatus(h hostConn) (*pb.CacheStatusResponse, error) {
+	payload, err := h.exchange(byte(pb.MessageType_CACHE_STATUS), "CACHE_STATUS")
+	if err != nil {
+		return nil, err
+	}
+	return decodeCacheStatusPayload(payload)
+}
+
+func hostAccelStream(h hostConn, req *pb.AccelStreamRequest) (*pb.AccelStreamResponse, error) {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_ACCEL_STREAM,
+		Payload: &pb.UartMessage_AccelStreamRequest{
+			AccelStreamRequest: req,
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_ACCEL_STREAM)}, body...)
+	respPayload, err := h.exchangePayload(payload, "ACCEL_STREAM")
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetAccelStreamResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing accel_stream_response")
+	}
+	return r, nil
+}
+
+func hostFindMe(h hostConn, clientID uint32) error {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_FIND_ME,
+		Payload: &pb.UartMessage_EspnowFindMeRequest{
+			EspnowFindMeRequest: &pb.EspNowFindMeRequest{ClientId: clientID},
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_FIND_ME)}, body...)
+	respPayload, err := h.exchangePayload(payload, "FIND_ME")
+	if err != nil {
+		return err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetEspnowFindMeResponse()
+	if r == nil {
+		return fmt.Errorf("missing espnow_find_me_response")
+	}
+	if !r.GetSuccess() {
+		return fmt.Errorf("find-me rejected (client_id=%d)", r.GetClientId())
+	}
+	return nil
+}
+
+func hostRestart(h hostConn, clientID uint32) error {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_RESTART,
+		Payload: &pb.UartMessage_RestartRequest{
+			RestartRequest: &pb.RestartRequest{ClientId: clientID},
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_RESTART)}, body...)
+	respPayload, err := h.exchangePayload(payload, "RESTART")
+	if err != nil {
+		return err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetRestartResponse()
+	if r == nil {
+		return fmt.Errorf("missing restart_response")
+	}
+	if !r.GetSuccess() {
+		return fmt.Errorf("restart rejected (client_id=%d)", r.GetClientId())
+	}
+	return nil
+}
+
+func hostSetLogLevel(h hostConn, write bool, level uint32) (*pb.SetLogLevelResponse, error) {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_SET_LOG_LEVEL,
+		Payload: &pb.UartMessage_SetLogLevelRequest{
+			SetLogLevelRequest: &pb.SetLogLevelRequest{Write: write, Level: level},
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_SET_LOG_LEVEL)}, body...)
+	respPayload, err := h.exchangePayload(payload, "SET_LOG_LEVEL")
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetSetLogLevelResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing set_log_level_response")
+	}
+	return r, nil
+}
+
+func hostInputSendMode(h hostConn, req *pb.InputSendModeRequest) (*pb.InputSendModeResponse, error) {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_INPUT_SEND_MODE,
+		Payload: &pb.UartMessage_InputSendModeRequest{
+			InputSendModeRequest: req,
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_INPUT_SEND_MODE)}, body...)
+	respPayload, err := h.exchangePayload(payload, "INPUT_SEND_MODE")
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetInputSendModeResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing input_send_mode_response")
+	}
+	return r, nil
+}
+
+func hostLedRing(h hostConn, req *pb.LedRingProgressRequest) (*pb.LedRingProgressResponse, error) {
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_LED_RING,
+		Payload: &pb.UartMessage_LedRingProgressRequest{
+			LedRingProgressRequest: req,
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_LED_RING)}, body...)
+	respPayload, err := h.exchangePayload(payload, "LED_RING")
+	if err != nil {
+		return nil, err
+	}
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetLedRingProgressResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing led_ring_progress_response")
+	}
+	return r, nil
+}
+
+func hostEchoPing(h hostConn, clientID uint32) (*EchoPingResult, error) {
+	t0 := time.Now()
+	timestampUs := uint64(t0.UnixMicro())
+	req := &pb.EspNowEchoPingRequest{
+		ClientId:    clientID,
+		TimestampUs: timestampUs,
+	}
+	msg := &pb.UartMessage{
+		Type: pb.MessageType_ESPNOW_ECHO_PING,
+		Payload: &pb.UartMessage_EspnowEchoPingRequest{
+			EspnowEchoPingRequest: req,
+		},
+	}
+	body, err := proto.Marshal(msg)
+	if err != nil {
+		return nil, fmt.Errorf("encode: %w", err)
+	}
+	payload := append([]byte{byte(pb.MessageType_ESPNOW_ECHO_PING)}, body...)
+	respPayload, err := h.exchangePayload(payload, "ESPNOW_ECHO_PING")
+	if err != nil {
+		return nil, err
+	}
+	rttMs := float64(time.Since(t0).Microseconds()) / 1000.0
+
+	var respMsg pb.UartMessage
+	if err := proto.Unmarshal(respPayload[1:], &respMsg); err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+	r := respMsg.GetEspnowEchoPingResponse()
+	if r == nil {
+		return nil, fmt.Errorf("missing espnow_echo_ping_response")
+	}
+	if !r.GetSuccess() {
+		return &EchoPingResult{
+			Success:  false,
+			ClientID: r.GetClientId(),
+			RttMs:    rttMs,
+		}, nil
+	}
+	if r.GetTimestampUs() != timestampUs {
+		return nil, fmt.Errorf("timestamp mismatch: sent %d got %d", timestampUs, r.GetTimestampUs())
+	}
+	return &EchoPingResult{
+		Success:     true,
+		ClientID:    r.GetClientId(),
+		TimestampUs: r.GetTimestampUs(),
+		RttMs:       rttMs,
+		EspRttUs:    r.GetEspRttUs(),
+	}, nil
+}
@@ -0,0 +1,491 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"strings"
+	"sync"
+	"time"
+
+	"go.bug.st/serial"
+	"tinygo.org/x/bluetooth"
+)
+
+const (
+	hostTransportNone = "none"
+	hostTransportUART = "uart"
+	hostTransportBLE  = "ble"
+)
+
+// errHostBusy is returned when the link is held for OTA.
+var errHostBusy = errUARTBusy
+
+// managedHost is a reconnecting UART or BLE host link for serve/CLI.
+type managedHost struct {
+	quiet  bool
+	baud   int
+	settle time.Duration
+
+	mu        sync.Mutex
+	transport string // none|uart|ble
+	endpoint  string // port path or BLE address string
+	bleName   string // last connected BLE local name (optional)
+	sp        *serialPort
+	ble       *bleLink
+	otaActive bool
+	pausePoll bool   // true while BLE latency tests run (pollers yield)
+	uartPort  string // remembered UART port for reconnect
+}
+
+func newManagedHost(baud int) *managedHost {
+	if baud <= 0 {
+		baud = defaultBaud
+	}
+	return &managedHost{
+		baud:      baud,
+		transport: hostTransportNone,
+		settle:    time.Second,
+	}
+}
+
+// newManagedSerial keeps the old constructor name for call sites during migrate.
+func newManagedSerial(portName string, baud int) *managedHost {
+	m := newManagedHost(baud)
+	if portName != "" {
+		m.uartPort = portName
+		m.endpoint = portName
+		m.transport = hostTransportUART
+	}
+	return m
+}
+
+func (m *managedHost) Transport() string {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.transport == "" {
+		return hostTransportNone
+	}
+	return m.transport
+}
+
+func (m *managedHost) Endpoint() string {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	return m.endpoint
+}
+
+func (m *managedHost) Close() error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	return m.disconnectLocked()
+}
+
+func (m *managedHost) IsConnected() bool {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	switch m.transport {
+	case hostTransportUART:
+		return m.sp != nil
+	case hostTransportBLE:
+		return m.ble != nil
+	default:
+		return false
+	}
+}
+
+func (m *managedHost) disconnectLocked() error {
+	var err error
+	if m.sp != nil {
+		err = m.sp.port.Close()
+		m.sp = nil
+	}
+	if m.ble != nil {
+		e := m.ble.Close()
+		if err == nil {
+			err = e
+		}
+		m.ble = nil
+	}
+	m.transport = hostTransportNone
+	return err
+}
+
+func (m *managedHost) Disconnect() error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	ep := m.endpoint
+	err := m.disconnectLocked()
+	if !m.quiet && ep != "" {
+		log.Printf("host disconnected (%s)", ep)
+	}
+	return err
+}
+
+func (m *managedHost) ConnectUART(port string, baud int) error {
+	if port == "" {
+		return fmt.Errorf("UART port required")
+	}
+	if baud <= 0 {
+		baud = m.baud
+	}
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.otaActive {
+		return errHostBusy
+	}
+	_ = m.disconnectLocked()
+	m.baud = baud
+	m.uartPort = port
+	m.endpoint = port
+	m.transport = hostTransportUART
+	if err := m.openUARTLocked(); err != nil {
+		m.transport = hostTransportNone
+		m.endpoint = ""
+		return err
+	}
+	return nil
+}
+
+func (m *managedHost) ConnectBLE(address string, name string) error {
+	if address == "" && name == "" {
+		return fmt.Errorf("BLE address or name required")
+	}
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.otaActive {
+		return errHostBusy
+	}
+	_ = m.disconnectLocked()
+
+	var link *bleLink
+	var err error
+	settle := m.settle
+	m.mu.Unlock()
+	if address != "" {
+		link, err = openBLEAddress(address, settle)
+	} else {
+		link, err = openBLE(name, settle)
+	}
+	m.mu.Lock()
+	if err != nil {
+		return err
+	}
+	link.quiet = m.quiet
+	m.ble = link
+	m.transport = hostTransportBLE
+	if address != "" {
+		m.endpoint = address
+	} else {
+		m.endpoint = name
+	}
+	m.bleName = name
+	if !m.quiet {
+		log.Printf("BLE host connected (%s)", m.endpoint)
+	}
+	return nil
+}
+
+func (m *managedHost) openUARTLocked() error {
+	sp, err := openSerial(m.uartPort, m.baud)
+	if err != nil {
+		return err
+	}
+	sp.quiet = m.quiet
+	m.sp = sp
+	if !m.quiet {
+		log.Printf("UART %s connected (%d baud)", m.uartPort, m.baud)
+	}
+	return nil
+}
+
+func (m *managedHost) openLocked() error {
+	return m.openUARTLocked()
+}
+
+func (m *managedHost) closeLocked() error {
+	return m.disconnectLocked()
+}
+
+func (m *managedHost) invalidateLocked(reason error) {
+	if m.sp == nil && m.ble == nil {
+		return
+	}
+	if !m.quiet {
+		log.Printf("host %s disconnected: %v", m.endpoint, reason)
+	}
+	_ = m.disconnectLocked()
+	// remember transport intent for UART reconnect
+	if m.uartPort != "" && m.transport == hostTransportNone {
+		// after invalidate, leave as none; poller will try Connect again via open
+		m.transport = hostTransportUART
+		m.endpoint = m.uartPort
+	}
+}
+
+func (m *managedHost) withPort(fn func(*serialPort) error) error {
+	return m.withPortLocked(false, fn)
+}
+
+func (m *managedHost) withPortPoll(fn func(*serialPort) error) error {
+	return m.withPortLocked(true, fn)
+}
+
+func (m *managedHost) withPortLocked(poll bool, fn func(*serialPort) error) error {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.otaActive {
+		return errHostBusy
+	}
+	if m.transport == hostTransportBLE {
+		return fmt.Errorf("operation requires UART host (DIP8=0)")
+	}
+	if m.transport != hostTransportUART && m.uartPort == "" {
+		return fmt.Errorf("not connected")
+	}
+	if m.transport == hostTransportNone && m.uartPort != "" {
+		m.transport = hostTransportUART
+		m.endpoint = m.uartPort
+	}
+	if m.sp == nil {
+		if err := m.openUARTLocked(); err != nil {
+			return fmt.Errorf("%s: %w", m.uartPort, err)
+		}
+	}
+	err := fn(m.sp)
+	if err != nil {
+		m.invalidateLocked(err)
+	}
+	return err
+}
+
+func (m *managedHost) recoverAfterMasterRestart() {
+	const bootWait = 6 * time.Second
+	m.mu.Lock()
+	tr := m.transport
+	m.disconnectLocked()
+	if tr == hostTransportUART {
+		m.transport = hostTransportUART
+		m.endpoint = m.uartPort
+	}
+	m.mu.Unlock()
+
+	log.Printf("host: master restart — waiting %s for boot", bootWait)
+	time.Sleep(bootWait)
+
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.transport == hostTransportUART {
+		if err := m.openUARTLocked(); err != nil {
+			log.Printf("UART reconnect after master restart: %v", err)
+			return
+		}
+		m.sp.flushInput()
+		log.Printf("UART %s ready after master restart", m.uartPort)
+	}
+}
+
+func (m *managedHost) exchangePayload(payload []byte, cmdName string) ([]byte, error) {
+	return m.exchangePayloadMode(false, payload, cmdName, readTimeout)
+}
+
+func (m *managedHost) exchangePayloadPoll(payload []byte, cmdName string) ([]byte, error) {
+	return m.exchangePayloadMode(true, payload, cmdName, readTimeout)
+}
+
+func (m *managedHost) beginPausePoll() bool {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.otaActive || m.pausePoll {
+		return false
+	}
+	m.pausePoll = true
+	return true
+}
+
+func (m *managedHost) endPausePoll() {
+	m.mu.Lock()
+	m.pausePoll = false
+	m.mu.Unlock()
+}
+
+func (m *managedHost) PollPaused() bool {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	return m.pausePoll || m.otaActive
+}
+
+func (m *managedHost) exchangePayloadMode(poll bool, payload []byte, cmdName string, timeout time.Duration) ([]byte, error) {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	if m.otaActive || (poll && m.pausePoll) {
+		return nil, errHostBusy
+	}
+	switch m.transport {
+	case hostTransportBLE:
+		if m.ble == nil {
+			return nil, fmt.Errorf("BLE not connected")
+		}
+		resp, err := m.ble.exchangePayloadTimeout(payload, cmdName, timeout)
+		if err != nil {
+			m.invalidateLocked(err)
+		}
+		return resp, err
+	case hostTransportUART, hostTransportNone:
+		if m.uartPort == "" && m.sp == nil {
+			return nil, fmt.Errorf("not connected")
+		}
+		if m.transport == hostTransportNone {
+			m.transport = hostTransportUART
+			m.endpoint = m.uartPort
+		}
+		if m.sp == nil {
+			if err := m.openUARTLocked(); err != nil {
+				return nil, fmt.Errorf("%s: %w", m.uartPort, err)
+			}
+		}
+		resp, err := m.sp.exchangePayloadLocked(payload, cmdName, timeout)
+		if err != nil {
+			m.invalidateLocked(err)
+		}
+		return resp, err
+	default:
+		return nil, fmt.Errorf("not connected")
+	}
+}
+
+func (m *managedHost) exchange(cmdID byte, cmdName string) ([]byte, error) {
+	return m.exchangePayload([]byte{cmdID}, cmdName)
+}
+
+func (m *managedHost) exchangePoll(cmdID byte, cmdName string) ([]byte, error) {
+	return m.exchangePayloadPoll([]byte{cmdID}, cmdName)
+}
+
+func (m *managedHost) exchangePayloadVia(
+	portFn func(func(*serialPort) error) error,
+	payload []byte, cmdName string,
+) ([]byte, error) {
+	// Prefer transport-aware path (works for BLE too).
+	_ = portFn
+	return m.exchangePayload(payload, cmdName)
+}
+
+func (m *managedHost) exchangeVia(
+	portFn func(func(*serialPort) error) error,
+	cmdID byte, cmdName string,
+) ([]byte, error) {
+	_ = portFn
+	return m.exchange(cmdID, cmdName)
+}
+
+func (m *managedHost) NextStreamTick(timeout time.Duration) ([]byte, error) {
+	m.mu.Lock()
+	ble := m.ble
+	tr := m.transport
+	m.mu.Unlock()
+	if tr != hostTransportBLE || ble == nil {
+		return nil, fmt.Errorf("BLE stream ticks require BLE host")
+	}
+	return ble.NextStreamTick(timeout)
+}
+
+func (m *managedHost) HostStatus() map[string]any {
+	m.mu.Lock()
+	defer m.mu.Unlock()
+	connected := false
+	switch m.transport {
+	case hostTransportUART:
+		connected = m.sp != nil
+	case hostTransportBLE:
+		connected = m.ble != nil
+	}
+	return map[string]any{
+		"transport": m.transportOrNone(),
+		"endpoint":  m.endpoint,
+		"connected": connected,
+		"ble_name":  m.bleName,
+	}
+}
+
+func (m *managedHost) transportOrNone() string {
+	if m.transport == "" {
+		return hostTransportNone
+	}
+	return m.transport
+}
+
+func listSerialPorts() ([]string, error) {
+	ports, err := serial.GetPortsList()
+	if err != nil {
+		return nil, err
+	}
+	if ports == nil {
+		return []string{}, nil
+	}
+	return ports, nil
+}
+
+type bleScanDevice struct {
+	Address string `json:"address"`
+	Name    string `json:"name"`
+	RSSI    int    `json:"rssi"`
+}
+
+func scanBLEDevices(timeout time.Duration, nameFilter string) ([]bleScanDevice, error) {
+	if timeout <= 0 {
+		timeout = 5 * time.Second
+	}
+	adapter := bluetooth.DefaultAdapter
+	if err := adapter.Enable(); err != nil {
+		return nil, fmt.Errorf("enable bluetooth: %w", err)
+	}
+
+	seen := map[string]bleScanDevice{}
+	var mu sync.Mutex
+	go func() {
+		time.Sleep(timeout)
+		_ = adapter.StopScan()
+	}()
+	filter := strings.TrimSpace(nameFilter)
+	_ = adapter.Scan(func(a *bluetooth.Adapter, result bluetooth.ScanResult) {
+		name := result.LocalName()
+		if filter != "" && !strings.Contains(strings.ToLower(name), strings.ToLower(filter)) {
+			return
+		}
+		addr := result.Address.String()
+		mu.Lock()
+		seen[addr] = bleScanDevice{
+			Address: addr,
+			Name:    name,
+			RSSI:    int(result.RSSI),
+		}
+		mu.Unlock()
+	})
+	// StopScan ends Scan; ignore error and return whatever was found.
+	mu.Lock()
+	defer mu.Unlock()
+	out := make([]bleScanDevice, 0, len(seen))
+	for _, d := range seen {
+		out = append(out, d)
+	}
+	return out, nil
+}
+
+func disconnectedState(portName string, err error) DashboardState {
+	msg := "host disconnected"
+	if err != nil {
+		msg = err.Error()
+	}
+	return DashboardState{
+		UpdatedAt:     time.Now().Format(time.RFC3339),
+		SerialPort:    portName,
+		HostEndpoint:  portName,
+		UARTConnected: false,
+		HostConnected: false,
+		HostTransport: hostTransportNone,
+		SerialOK:      false,
+		SerialError:   msg,
+		Master:        MasterView{OK: false, Error: msg},
+		Clients:       []ClientView{},
+	}
+}
@@ -5,36 +5,47 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"time"
 )

 const defaultBaud = 921600

 func usage() {
-	fmt.Fprintf(os.Stderr, "usage: gotool [-port /dev/ttyUSB0] <command>\n")
+	fmt.Fprintf(os.Stderr, "usage: gotool [-port /dev/ttyUSB0 | -ble] <command>\n")
+	fmt.Fprintf(os.Stderr, "  DIP8 on master: 0=UART (-port), 1=BLE (-ble); reboot after DIP change\n")
 	fmt.Fprintf(os.Stderr, "  test uses uart.master from bench config when -port is omitted\n\n")
 	fmt.Fprintf(os.Stderr, "commands:\n")
 	fmt.Fprintf(os.Stderr, "  version   firmware version and git hash\n")
-	fmt.Fprintf(os.Stderr, "  clients   registered ESP-NOW slaves on the master\n")
+	fmt.Fprintf(os.Stderr, "  clients          registered ESP-NOW slaves on the master\n")
+	fmt.Fprintf(os.Stderr, "  clients-reset-ids clear master id map + live registry (notifies online slaves)\n")
 	fmt.Fprintf(os.Stderr, "  deadzone      get/set accelerometer deadzone (LSB)\n")
 	fmt.Fprintf(os.Stderr, "  tap-config    get/set BMA456 tap detection parameters\n")
 	fmt.Fprintf(os.Stderr, "  tap-notify    get/set which tap kinds notify via ESP-NOW\n")
-	fmt.Fprintf(os.Stderr, "  cache-status  subscribed accel + tap cache (one UART round-trip)\n")
+	fmt.Fprintf(os.Stderr, "  cache-status  subscribed accel + tap cache (one round-trip)\n")
+	fmt.Fprintf(os.Stderr, "  accel-stream  enable/disable ESP-NOW accel stream (+ BLE period)\n")
 	fmt.Fprintf(os.Stderr, "  unicast-test  send ESP-NOW unicast test to one slave\n")
 	fmt.Fprintf(os.Stderr, "  echo-ping     ESP-NOW timestamp echo round-trip to one slave\n")
+	fmt.Fprintf(os.Stderr, "  ble-rtt       Host↔Master RTT via VERSION (N samples)\n")
+	fmt.Fprintf(os.Stderr, "  ble-stream    enable stream + measure BleStreamTick window\n")
 	fmt.Fprintf(os.Stderr, "  test          run automated scenario (see testdata/)\n")
-	fmt.Fprintf(os.Stderr, "  serve         web dashboard (Bootstrap + WebSocket)\n")
-	fmt.Fprintf(os.Stderr, "  ota           UART OTA upload (A/B partitions)\n")
+	fmt.Fprintf(os.Stderr, "  serve         web dashboard (optional -port / -ble; connect from UI)\n")
+	fmt.Fprintf(os.Stderr, "  ota           host OTA upload (A/B partitions; UART or BLE)\n")
 	fmt.Fprintf(os.Stderr, "  ota-progress  query per-slave ESP-NOW OTA progress on master\n")
 	fmt.Fprintf(os.Stderr, "  led-ring      set LED ring progress bar (0–100%%, rgb, intensity)\n")
 	fmt.Fprintf(os.Stderr, "  find-me       blink LED ring red/green/blue (3× each, full brightness)\n")
 	fmt.Fprintf(os.Stderr, "  restart       reboot master or slave (ESP-NOW)\n")
-	fmt.Fprintf(os.Stderr, "  log-level     get/set master ESP-IDF log level (global)\n\n")
+	fmt.Fprintf(os.Stderr, "  log-level     get/set master ESP-IDF log level (global)\n")
+	fmt.Fprintf(os.Stderr, "  battery-uv    get/set software LiPo UV protection (per pod / all)\n")
+	fmt.Fprintf(os.Stderr, "  input-send-mode  get/set slave accel/tap ESP-NOW send path\n\n")
 	flag.PrintDefaults()
 }

 func main() {
-	portName := flag.String("port", "", "serial port (e.g. /dev/ttyUSB0)")
+	portName := flag.String("port", "", "serial port (e.g. /dev/ttyUSB0); XOR with -ble")
 	baud := flag.Int("baud", defaultBaud, "UART baud rate")
+	useBLE := flag.Bool("ble", false, "use BLE host transport (DIP8=1); XOR with -port")
+	bleName := flag.String("ble-name", bleDefaultName, "BLE advertised name")
+	bleSettle := flag.Float64("ble-settle", 1.0, "seconds to settle after BLE connect")
 	flag.Parse()

 	if flag.NArg() < 1 {
@@ -47,56 +58,152 @@ func main() {
 	var runErr error
 	switch cmd {
 	case "test", "autotest":
+		if *useBLE {
+			runErr = fmt.Errorf("autotest requires -port (UART)")
+			break
+		}
 		runErr = runTest(*portName, *baud, flag.Args()[1:])
 	case "serve", "web", "dashboard":
-		if *portName == "" {
-			fmt.Fprintf(os.Stderr, "command %q requires -port\n\n", cmd)
+		if *useBLE && *portName != "" {
+			fmt.Fprintf(os.Stderr, "use either -port or -ble, not both\n")
+			os.Exit(2)
+		}
+		runErr = runServe(serveOpts{
+			portName: *portName,
+			baud:     *baud,
+			useBLE:   *useBLE,
+			bleName:  *bleName,
+			settle:   time.Duration(*bleSettle * float64(time.Second)),
+		}, flag.Args()[1:])
+	case "version", "clients", "client-info", "clients-reset-ids", "clients_reset_ids", "deadzone", "accel-deadzone", "tap-config", "tap_config", "tap-notify", "tap_notify", "cache-status", "cache_status", "accel-stream", "accel_stream", "unicast-test", "unicast_test", "echo-ping", "echo_ping", "ble-rtt", "ble_rtt", "ble-stream", "ble_stream", "led-ring", "led_ring", "find-me", "find_me", "restart", "log-level", "log_level", "input-send-mode", "input_send_mode", "ota", "ota-progress", "ota_progress":
+		if *useBLE && *portName != "" {
+			fmt.Fprintf(os.Stderr, "use either -port or -ble, not both\n")
+			os.Exit(2)
+		}
+		if !*useBLE && *portName == "" {
+			fmt.Fprintf(os.Stderr, "command %q requires -port or -ble\n\n", cmd)
 			usage()
 			os.Exit(2)
 		}
-		runErr = runServe(*portName, *baud, flag.Args()[1:])
-	case "version", "clients", "client-info", "deadzone", "accel-deadzone", "tap-config", "tap_config", "tap-notify", "tap_notify", "cache-status", "cache_status", "unicast-test", "unicast_test", "echo-ping", "echo_ping", "led-ring", "led_ring", "find-me", "find_me", "restart", "log-level", "log_level", "ota", "ota-progress", "ota_progress":
-		if *portName == "" {
-			fmt.Fprintf(os.Stderr, "command %q requires -port\n\n", cmd)
-			usage()
-			os.Exit(2)
+		var h hostConn
+		if *useBLE {
+			bl, err := openBLE(*bleName, time.Duration(*bleSettle*float64(time.Second)))
+			if err != nil {
+				log.Fatalf("open BLE: %v", err)
+			}
+			h = bl
+		} else {
+			sp, err := openSerial(*portName, *baud)
+			if err != nil {
+				log.Fatalf("open serial: %v", err)
+			}
+			h = sp
 		}
-		sp, err := openSerial(*portName, *baud)
-		if err != nil {
-			log.Fatalf("open serial: %v", err)
-		}
-		registerShutdown(func() { _ = sp.Close() })
+		registerShutdown(func() { _ = h.Close() })
 		enableShutdownOnInterrupt()
-		defer sp.Close()
+		defer h.Close()
+
 		switch cmd {
 		case "version":
-			runErr = runVersion(sp)
+			runErr = runVersionHost(h)
 		case "clients", "client-info":
-			runErr = runClients(sp)
+			runErr = runClientsHost(h)
+		case "clients-reset-ids", "clients_reset_ids":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
+			runErr = runClientsResetIds(sp)
+		case "cache-status", "cache_status":
+			runErr = runCacheStatusHost(h)
+		case "accel-stream", "accel_stream":
+			runErr = runAccelStreamCmd(h, flag.Args()[1:])
+		case "echo-ping", "echo_ping":
+			runErr = runEchoPingHost(h, flag.Args()[1:])
+		case "ble-rtt", "ble_rtt":
+			runErr = runBleRtt(h, flag.Args()[1:])
+		case "ble-stream", "ble_stream":
+			runErr = runBleStream(h, flag.Args()[1:])
 		case "deadzone", "accel-deadzone":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
 			runErr = runDeadzone(sp, flag.Args()[1:])
 		case "tap-config", "tap_config":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
 			runErr = runTapConfig(sp, flag.Args()[1:])
+		case "battery-uv", "battery_uv":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
+			runErr = runBatteryUv(sp, flag.Args()[1:])
 		case "tap-notify", "tap_notify":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
 			runErr = runTapNotify(sp, flag.Args()[1:])
-		case "cache-status", "cache_status":
-			runErr = runCacheStatus(sp)
 		case "unicast-test", "unicast_test":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
 			runErr = runUnicastTest(sp, flag.Args()[1:])
-		case "echo-ping", "echo_ping":
-			runErr = runEchoPing(sp, flag.Args()[1:])
 		case "led-ring", "led_ring":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
 			runErr = runLedRing(sp, flag.Args()[1:])
 		case "find-me", "find_me":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
 			runErr = runFindMe(sp, flag.Args()[1:])
 		case "restart":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
 			runErr = runRestart(sp, flag.Args()[1:])
 		case "log-level", "log_level":
+			sp, ok := h.(*serialPort)
+			if !ok {
+				runErr = fmt.Errorf("%s over BLE not wired yet; use -port", cmd)
+				break
+			}
 			runErr = runLogLevel(sp, flag.Args()[1:])
+		case "input-send-mode", "input_send_mode":
+			runErr = runInputSendModeCmd(h, flag.Args()[1:])
 		case "ota":
-			runErr = runOTA(sp, flag.Args()[1:])
+			t, ok := h.(otaTransport)
+			if !ok {
+				runErr = fmt.Errorf("ota: unsupported host transport")
+				break
+			}
+			runErr = runOTA(t, flag.Args()[1:])
 		case "ota-progress", "ota_progress":
-			runErr = runOtaProgress(sp, flag.Args()[1:])
+			t, ok := h.(otaTransport)
+			if !ok {
+				runErr = fmt.Errorf("ota-progress: unsupported host transport")
+				break
+			}
+			runErr = runOtaProgress(t, flag.Args()[1:])
 		}
 	default:
 		fmt.Fprintf(os.Stderr, "unknown command %q\n\n", cmd)
@@ -108,3 +215,76 @@ func main() {
 		log.Fatal(runErr)
 	}
 }
+
+func runVersionHost(h hostConn) error {
+	ver, err := hostGetVersion(h)
+	if err != nil {
+		return err
+	}
+	fmt.Printf("version:  %d\n", ver.GetVersion())
+	fmt.Printf("git_hash: %s\n", ver.GetGitHash())
+	return nil
+}
+
+func runClientsHost(h hostConn) error {
+	clients, err := hostListClients(h)
+	if err != nil {
+		return err
+	}
+	if len(clients) == 0 {
+		fmt.Println("no clients registered")
+		return nil
+	}
+	fmt.Printf("clients (%d):\n", len(clients))
+	for i, c := range clients {
+		fmt.Printf("  [%d] id=%d ver=%d available=%v used=%v\n",
+			i, c.GetId(), c.GetVersion(), c.GetAvailable(), c.GetUsed())
+	}
+	return nil
+}
+
+func runCacheStatusHost(h hostConn) error {
+	r, err := hostReadCacheStatus(h)
+	if err != nil {
+		return err
+	}
+	clients := r.GetClients()
+	if len(clients) == 0 {
+		fmt.Println("(no slaves with accel stream or tap notify enabled)")
+		return nil
+	}
+	for _, c := range clients {
+		id := c.GetClientId()
+		if a := c.GetAccel(); a != nil {
+			if !a.GetValid() {
+				fmt.Printf("client %d accel: no sample yet\n", id)
+			} else {
+				fmt.Printf("client %d accel: x=%d y=%d z=%d (age %d ms)\n",
+					id, a.GetX(), a.GetY(), a.GetZ(), a.GetAgeMs())
+			}
+		}
+		if t := c.GetTap(); t != nil {
+			fmt.Printf("client %d tap: %s (age %d ms)\n",
+				id, tapKindLabel(t.GetKind()), t.GetAgeMs())
+		}
+	}
+	return nil
+}
+
+func runEchoPingHost(h hostConn, args []string) error {
+	fs := flag.NewFlagSet("echo-ping", flag.ExitOnError)
+	clientID := fs.Uint("client", 0, "slave client id from `clients`")
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+	if *clientID == 0 {
+		return fmt.Errorf("client id required (see `gotool clients`)")
+	}
+	r, err := hostEchoPing(h, uint32(*clientID))
+	if err != nil {
+		return err
+	}
+	fmt.Printf("echo ping: success=%v client_id=%d rtt_ms=%.3f (host↔master↔slave) esp_rtt_us=%d (ESP-NOW only)\n",
+		r.Success, r.ClientID, r.RttMs, r.EspRttUs)
+	return nil
+}
@@ -6,14 +6,14 @@ import (

 	"google.golang.org/protobuf/proto"

-	uartframe "powerpod/gotool/uart"
 	"powerpod/gotool/pb"
+	uartframe "powerpod/gotool/uart"
 )

 const (
-	otaHostChunkSize     = 200
-	otaFlashBlockSize    = 4096
-	otaPrepareTimeout    = 120 * time.Second
+	otaHostChunkSize       = 200
+	otaFlashBlockSize      = 4096
+	otaPrepareTimeout      = 120 * time.Second
 	otaDefaultTimeout      = 15 * time.Second
 	otaStatusPollTimeout   = 3 * time.Second
 	otaDistReadTimeout     = 400 * time.Millisecond
@@ -21,8 +21,12 @@ const (
 	otaDistQueryTimeout    = 2 * time.Second
 	otaDistEmitMinInterval = 150 * time.Millisecond
 	// Pace host chunks so the master UART RX ring is not overrun (~20 frames/block).
-	otaHostChunkPace = 3 * time.Millisecond
-	otaBlockMaxRetries = 3
+	otaHostChunkPaceUART = 5 * time.Millisecond
+	// Slightly slower for BLE WriteWithoutResponse flow control.
+	otaHostChunkPaceBLE = 6 * time.Millisecond
+	otaBlockMaxRetries  = 3
+	// 200 B OTA_PAYLOAD → ~216 B framed; needs ATT MTU >= 219.
+	otaMinATTMTU = 219
 )

 const (
@@ -37,6 +41,14 @@ const (
 	otaDistTimeout    = 45 * time.Minute
 )

+// otaTransport is the host IO used by the OTA protocol (UART or BLE).
+type otaTransport interface {
+	writeMsg(msg *pb.UartMessage) error
+	readFrame(timeout time.Duration) ([]byte, error)
+	flushInput()
+	chunkPace() time.Duration
+}
+
 // OtaSlaveDetail is per-slave ESP-NOW OTA state from OTA_SLAVE_PROGRESS.
 type OtaSlaveDetail struct {
 	BytesWritten uint32 `json:"bytes_written"`
@@ -47,20 +59,20 @@ type OtaSlaveDetail struct {

 // OTAProgress is pushed to the dashboard during web uploads.
 type OTAProgress struct {
-	Type          string                     `json:"type"` // always "ota_progress"
-	Phase         string                     `json:"phase"`
-	Step          string                     `json:"step,omitempty"` // master, slaves
-	Percent       int                        `json:"percent"`
-	MasterPercent int                        `json:"master_percent,omitempty"`
-	MasterDone    bool                       `json:"master_done,omitempty"`
-	Message       string                     `json:"message"`
-	MasterMessage string                     `json:"master_message,omitempty"`
-	Bytes         uint32                     `json:"bytes_written,omitempty"`
-	Slot          uint32                     `json:"target_slot,omitempty"`
-	Slaves        uint32                     `json:"slaves,omitempty"`
-	ImageSize     uint32                     `json:"image_size,omitempty"`
-	SlaveProgress map[uint32]uint32          `json:"slave_progress,omitempty"` // client_id -> bytes
-	SlaveDetails  map[uint32]OtaSlaveDetail  `json:"slave_details,omitempty"`
+	Type          string                    `json:"type"` // always "ota_progress"
+	Phase         string                    `json:"phase"`
+	Step          string                    `json:"step,omitempty"` // master, slaves
+	Percent       int                       `json:"percent"`
+	MasterPercent int                       `json:"master_percent,omitempty"`
+	MasterDone    bool                      `json:"master_done,omitempty"`
+	Message       string                    `json:"message"`
+	MasterMessage string                    `json:"master_message,omitempty"`
+	Bytes         uint32                    `json:"bytes_written,omitempty"`
+	Slot          uint32                    `json:"target_slot,omitempty"`
+	Slaves        uint32                    `json:"slaves,omitempty"`
+	ImageSize     uint32                    `json:"image_size,omitempty"`
+	SlaveProgress map[uint32]uint32         `json:"slave_progress,omitempty"` // client_id -> bytes
+	SlaveDetails  map[uint32]OtaSlaveDetail `json:"slave_details,omitempty"`
 }

 type otaProgressFn func(OTAProgress)
@@ -80,27 +92,52 @@ func runOTAUpload(m *managedSerial, firmware []byte, onProgress otaProgressFn) e
 			Percent: 0, Message: msg, MasterMessage: msg,
 		})
 	}
-	push("preparing", "UART wird vorbereitet…")
+	push("preparing", "Host wird für OTA vorbereitet…")

-	// Block until the UART is free, then hold m.mu for the entire upload so
-	// dashboard/API polling cannot interleave on the serial port.
+	// Hold m.mu for the entire upload so dashboard/API polling cannot interleave.
 	m.mu.Lock()
 	if m.otaActive {
 		m.mu.Unlock()
 		return errOTAInProgress
 	}
 	m.otaActive = true
-	if m.sp == nil {
-		if err := m.openLocked(); err != nil {
+
+	var t otaTransport
+	switch m.transport {
+	case hostTransportBLE:
+		if m.ble == nil {
+			m.otaActive = false
+			m.mu.Unlock()
+			err := fmt.Errorf("BLE not connected")
+			push("error", err.Error())
+			return err
+		}
+		if err := m.ble.ensureOTAMTU(); err != nil {
 			m.otaActive = false
 			m.mu.Unlock()
 			push("error", err.Error())
 			return err
 		}
+		t = m.ble
+	case hostTransportUART, hostTransportNone:
+		if m.sp == nil {
+			if err := m.openLocked(); err != nil {
+				m.otaActive = false
+				m.mu.Unlock()
+				push("error", err.Error())
+				return err
+			}
+		}
+		t = m.sp
+	default:
+		m.otaActive = false
+		m.mu.Unlock()
+		err := fmt.Errorf("not connected")
+		push("error", err.Error())
+		return err
 	}
-	sp := m.sp

-	err := runOTAOnPortUnlocked(sp, firmware, onProgress)
+	err := runOTAUnlocked(t, firmware, onProgress)
 	if err != nil {
 		m.invalidateLocked(err)
 	}
@@ -109,7 +146,7 @@ func runOTAUpload(m *managedSerial, firmware []byte, onProgress otaProgressFn) e
 	return err
 }

-func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgressFn) error {
+func runOTAUnlocked(t otaTransport, firmware []byte, onProgress otaProgressFn) error {
 	if len(firmware) == 0 {
 		return fmt.Errorf("empty firmware")
 	}
@@ -151,16 +188,11 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 		onProgress(p)
 	}

-	if err := sp.port.SetReadTimeout(readTimeout); err != nil {
-		notify("error", "", 0, err.Error())
-		return err
-	}
-
 	notify("preparing", otaStepMaster, 0, fmt.Sprintf("Master: OTA start (%d bytes)…", imageSize))

-	flushSerialInput(sp)
+	t.flushInput()

-	if err := writeUartMessage(sp, &pb.UartMessage{
+	if err := t.writeMsg(&pb.UartMessage{
 		Type: pb.MessageType_OTA_START,
 		Payload: &pb.UartMessage_OtaStart{
 			OtaStart: &pb.OtaStartPayload{TotalSize: uint32(imageSize)},
@@ -170,13 +202,7 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 		return err
 	}

-	if err := sp.port.SetReadTimeout(otaPrepareTimeout); err != nil {
-		notify("error", "", 0, err.Error())
-		return err
-	}
-	defer func() { _ = sp.port.SetReadTimeout(readTimeout) }()
-
-	ready, err := waitOtaStatus(sp, otaStReady, otaPrepareTimeout, func(msg string) {
+	ready, err := waitOtaStatus(t, otaStReady, otaPrepareTimeout, func(msg string) {
 		notify("preparing", otaStepMaster, 2, msg)
 	})
 	if err != nil {
@@ -185,11 +211,7 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 	}
 	notify("ready", otaStepMaster, 5, fmt.Sprintf("Master: Slot %d bereit", ready.GetTargetSlot()))

-	if err := sp.port.SetReadTimeout(otaDefaultTimeout); err != nil {
-		notify("error", "", 0, err.Error())
-		return err
-	}
-
+	pace := t.chunkPace()
 	var seq uint32
 	for offset := 0; offset < imageSize; {
 		blockStart := offset
@@ -208,7 +230,7 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 				}
 				chunk := firmware[offset : offset+n]

-				if err := writeUartMessage(sp, &pb.UartMessage{
+				if err := t.writeMsg(&pb.UartMessage{
 					Type: pb.MessageType_OTA_PAYLOAD,
 					Payload: &pb.UartMessage_OtaPayload{
 						OtaPayload: &pb.OtaPayload{Seq: seq, Data: chunk},
@@ -216,7 +238,7 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 				}); err != nil {
 					return false, err
 				}
-				time.Sleep(otaHostChunkPace)
+				time.Sleep(pace)
 				seq++
 				offset += n
 				bytesInBlock += n
@@ -252,7 +274,7 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 					return err
 				}
 			}
-			st, ackErr = waitOtaStatus(sp, otaStBlockAck, otaDefaultTimeout, nil)
+			st, ackErr = waitOtaStatus(t, otaStBlockAck, otaDefaultTimeout, nil)
 			if ackErr == nil {
 				break
 			}
@@ -272,10 +294,10 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 	}

 	masterPct = 100
-	masterMsg = "Master: UART-Upload abgeschlossen"
+	masterMsg = "Master: Upload abgeschlossen"
 	notify("uploading", otaStepMaster, 100, masterMsg)

-	if err := writeUartMessage(sp, &pb.UartMessage{
+	if err := t.writeMsg(&pb.UartMessage{
 		Type: pb.MessageType_OTA_END,
 		Payload: &pb.UartMessage_OtaEnd{
 			OtaEnd: &pb.OtaEndPayload{},
@@ -314,7 +336,8 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 			}
 		}
 		if slaveCount == 0 {
-			return "Keine verfügbaren Slaves — Verteilung übersprungen", 0, 0
+			// Do not claim "skipped" mid-flight — details often arrive after the first query.
+			return "ESP-NOW: warte auf Slave-Fortschritt…", 0, 0
 		}
 		return fmt.Sprintf("ESP-NOW: %d / %d bytes (%d Slaves)",
 			aggBytes, imageSize, slaveCount), aggBytes, slaveCount
@@ -334,7 +357,7 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 			return
 		}
 		lastQuery = time.Now()
-		prog, err := queryOtaSlaveProgressLocked(sp, 0, onDistStatus, otaDistQueryTimeout)
+		prog, err := queryOtaSlaveProgress(t, 0, onDistStatus, otaDistQueryTimeout)
 		if err != nil {
 			if len(slaveDetails) > 0 {
 				emitSlaveThrottled(true)
@@ -356,17 +379,17 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres

 	lastQuery = time.Time{} // first query immediately when distribution starts
 	querySlaveProgress()
-	st, err := waitOtaComplete(sp, otaDistTimeout, pushSlaveDist, onWaitTick, otaDistReadTimeout)
+	st, err := waitOtaComplete(t, otaDistTimeout, pushSlaveDist, onWaitTick, otaDistReadTimeout)
 	if err != nil {
 		notify("error", "", 0, err.Error())
 		return err
 	}

-	if prog, err := queryOtaSlaveProgressLocked(sp, 0, nil, otaDistQueryTimeout); err == nil {
+	if prog, err := queryOtaSlaveProgress(t, 0, nil, otaDistQueryTimeout); err == nil {
 		mergeSlaveProgressResponse(prog, slaveBytes, slaveDetails)
 	}
 	notify("done", "", 100,
-		fmt.Sprintf("Fertig — %d bytes, Boot-Slot %d. Master und Slaves neu starten.",
+		fmt.Sprintf("Fertig — %d bytes, Boot-Slot %d. Geräte starten neu auf die neue Firmware.",
 			st.GetBytesWritten(), st.GetTargetSlot()),
 		OTAProgress{
 			Bytes: st.GetBytesWritten(), Slot: st.GetTargetSlot(),
@@ -378,13 +401,11 @@ func runOTAOnPortUnlocked(sp *serialPort, firmware []byte, onProgress otaProgres
 }

 // QueryOtaSlaveProgress queries the master for per-slave ESP-NOW OTA progress.
-func QueryOtaSlaveProgress(sp *serialPort, clientID uint32) (*pb.OtaSlaveProgressResponse, error) {
-	sp.mu.Lock()
-	defer sp.mu.Unlock()
-	return queryOtaSlaveProgressLocked(sp, clientID, nil, otaDefaultTimeout)
+func QueryOtaSlaveProgress(t otaTransport, clientID uint32) (*pb.OtaSlaveProgressResponse, error) {
+	return queryOtaSlaveProgress(t, clientID, nil, otaDefaultTimeout)
 }

-func queryOtaSlaveProgressLocked(sp *serialPort, clientID uint32,
+func queryOtaSlaveProgress(t otaTransport, clientID uint32,
 	onStatus func(*pb.OtaStatusPayload), queryTimeout time.Duration) (*pb.OtaSlaveProgressResponse, error) {
 	req := &pb.UartMessage{
 		Type: pb.MessageType_OTA_SLAVE_PROGRESS,
@@ -394,14 +415,14 @@ func queryOtaSlaveProgressLocked(sp *serialPort, clientID uint32,
 			},
 		},
 	}
-	if err := writeUartMessage(sp, req); err != nil {
+	if err := t.writeMsg(req); err != nil {
 		return nil, err
 	}
 	if queryTimeout <= 0 {
 		queryTimeout = otaDefaultTimeout
 	}
 	deadline := time.Now().Add(queryTimeout)
-	msg, err := readUartMessageUntil(sp, deadline, pb.MessageType_OTA_SLAVE_PROGRESS, onStatus, otaDistReadTimeout)
+	msg, err := readUartMessageUntil(t, deadline, pb.MessageType_OTA_SLAVE_PROGRESS, onStatus, otaDistReadTimeout)
 	if err != nil {
 		return nil, err
 	}
@@ -434,7 +455,7 @@ func applyDistributingOtaStatus(st *pb.OtaStatusPayload, imageSize int,
 	details[id] = d
 }

-func readUartMessageUntil(sp *serialPort, deadline time.Time, want pb.MessageType,
+func readUartMessageUntil(t otaTransport, deadline time.Time, want pb.MessageType,
 	onStatus func(*pb.OtaStatusPayload), readChunk time.Duration) (*pb.UartMessage, error) {
 	if readChunk <= 0 {
 		readChunk = otaStatusPollTimeout
@@ -447,10 +468,7 @@ func readUartMessageUntil(sp *serialPort, deadline time.Time, want pb.MessageTyp
 		if wait > readChunk {
 			wait = readChunk
 		}
-		if err := sp.port.SetReadTimeout(wait); err != nil {
-			return nil, err
-		}
-		payload, err := uartframe.ReadFrame(sp.port, nil, wait)
+		payload, err := t.readFrame(wait)
 		if err != nil {
 			return nil, err
 		}
@@ -505,7 +523,7 @@ func copySlaveMap(m map[uint32]uint32) map[uint32]uint32 {
 	return out
 }

-func waitOtaComplete(sp *serialPort, timeout time.Duration,
+func waitOtaComplete(t otaTransport, timeout time.Duration,
 	onDistributing func(*pb.OtaStatusPayload), onInterval func(),
 	readTimeout time.Duration) (*pb.OtaStatusPayload, error) {
 	if readTimeout <= 0 {
@@ -520,10 +538,7 @@ func waitOtaComplete(sp *serialPort, timeout time.Duration,
 		if readWait > readTimeout {
 			readWait = readTimeout
 		}
-		if err := sp.port.SetReadTimeout(readWait); err != nil {
-			return nil, err
-		}
-		st, err := readOtaStatus(sp)
+		st, err := readOtaStatus(t, readWait)
 		if err != nil {
 			if onInterval != nil {
 				onInterval()
@@ -548,16 +563,7 @@ func waitOtaComplete(sp *serialPort, timeout time.Duration,
 	}
 }

-func writeUartMessage(sp *serialPort, msg *pb.UartMessage) error {
-	frame, err := encodeUartMessage(msg)
-	if err != nil {
-		return err
-	}
-	_, err = sp.port.Write(frame)
-	return err
-}
-
-func waitOtaStatus(sp *serialPort, want uint32, timeout time.Duration, onPreparing func(string)) (*pb.OtaStatusPayload, error) {
+func waitOtaStatus(t otaTransport, want uint32, timeout time.Duration, onPreparing func(string)) (*pb.OtaStatusPayload, error) {
 	deadline := time.Now().Add(timeout)
 	for {
 		if time.Now().After(deadline) {
@@ -567,10 +573,7 @@ func waitOtaStatus(sp *serialPort, want uint32, timeout time.Duration, onPrepari
 		if readWait > otaStatusPollTimeout {
 			readWait = otaStatusPollTimeout
 		}
-		if err := sp.port.SetReadTimeout(readWait); err != nil {
-			return nil, err
-		}
-		payload, err := uartframe.ReadFrame(sp.port, nil, readWait)
+		payload, err := t.readFrame(readWait)
 		if err != nil {
 			continue
 		}
@@ -595,8 +598,8 @@ func waitOtaStatus(sp *serialPort, want uint32, timeout time.Duration, onPrepari
 	}
 }

-func readOtaStatus(sp *serialPort) (*pb.OtaStatusPayload, error) {
-	payload, err := uartframe.ReadFrame(sp.port, nil, readTimeout)
+func readOtaStatus(t otaTransport, timeout time.Duration) (*pb.OtaStatusPayload, error) {
+	payload, err := t.readFrame(timeout)
 	if err != nil {
 		return nil, fmt.Errorf("read response: %w", err)
 	}
@@ -623,8 +626,37 @@ func encodeUartMessage(msg *pb.UartMessage) ([]byte, error) {
 	return uartframe.EncodeFrame(payload)
 }

-// flushSerialInput drops stale RX bytes (not full frames — avoids ReadFrame blocking).
-func flushSerialInput(sp *serialPort) {
+func decodeUartPayload(payload []byte) (*pb.UartMessage, error) {
+	if len(payload) == 0 {
+		return nil, fmt.Errorf("empty response")
+	}
+	var msg pb.UartMessage
+	if err := proto.Unmarshal(payload[1:], &msg); err != nil {
+		return nil, err
+	}
+	msg.Type = pb.MessageType(payload[0])
+	return &msg, nil
+}
+
+// --- UART otaTransport ---
+
+func (sp *serialPort) writeMsg(msg *pb.UartMessage) error {
+	frame, err := encodeUartMessage(msg)
+	if err != nil {
+		return err
+	}
+	_, err = sp.port.Write(frame)
+	return err
+}
+
+func (sp *serialPort) readFrame(timeout time.Duration) ([]byte, error) {
+	if err := sp.port.SetReadTimeout(timeout); err != nil {
+		return nil, err
+	}
+	return uartframe.ReadFrame(sp.port, nil, timeout)
+}
+
+func (sp *serialPort) flushInput() {
 	if sp == nil {
 		return
 	}
@@ -639,14 +671,4 @@ func flushSerialInput(sp *serialPort) {
 	}
 }

-func decodeUartPayload(payload []byte) (*pb.UartMessage, error) {
-	if len(payload) == 0 {
-		return nil, fmt.Errorf("empty response")
-	}
-	var msg pb.UartMessage
-	if err := proto.Unmarshal(payload[1:], &msg); err != nil {
-		return nil, err
-	}
-	msg.Type = pb.MessageType(payload[0])
-	return &msg, nil
-}
+func (sp *serialPort) chunkPace() time.Duration { return otaHostChunkPaceUART }
@@ -1,12 +1,6 @@
 package main

-import (
-	"errors"
-	"fmt"
-	"log"
-	"sync"
-	"time"
-)
+import "errors"

 // errUARTBusy is returned when the port is held for OTA (poller should not treat as unplug).
 var errUARTBusy = errors.New("uart busy (OTA in progress)")
@@ -14,171 +8,5 @@ var errUARTBusy = errors.New("uart busy (OTA in progress)")
 // errOTAInProgress is returned when a second OTA upload is attempted while one is running.
 var errOTAInProgress = errors.New("OTA upload already in progress")

-// managedSerial keeps the UART open and reconnects after I/O failures or unplug.
-type managedSerial struct {
-	portName string
-	baud     int
-	quiet    bool
-
-	mu        sync.Mutex
-	sp        *serialPort
-	otaActive bool // UART held for firmware upload; poll/API must not interleave
-}
-
-func newManagedSerial(portName string, baud int) *managedSerial {
-	return &managedSerial{
-		portName: portName,
-		baud:     baud,
-	}
-}
-
-func (m *managedSerial) Close() error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	return m.closeLocked()
-}
-
-func (m *managedSerial) IsConnected() bool {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	return m.sp != nil
-}
-
-func (m *managedSerial) openLocked() error {
-	sp, err := openSerial(m.portName, m.baud)
-	if err != nil {
-		return err
-	}
-	sp.quiet = m.quiet
-	m.sp = sp
-	if !m.quiet {
-		log.Printf("UART %s connected (%d baud)", m.portName, m.baud)
-	}
-	return nil
-}
-
-func (m *managedSerial) closeLocked() error {
-	if m.sp == nil {
-		return nil
-	}
-	err := m.sp.port.Close()
-	m.sp = nil
-	return err
-}
-
-func (m *managedSerial) invalidateLocked(reason error) {
-	if m.sp == nil {
-		return
-	}
-	if !m.quiet {
-		log.Printf("UART %s disconnected: %v", m.portName, reason)
-	}
-	_ = m.closeLocked()
-}
-
-func (m *managedSerial) withPort(fn func(*serialPort) error) error {
-	return m.withPortLocked(false, fn)
-}
-
-// withPortPoll is like withPort but returns errUARTBusy during OTA (no TryLock race).
-func (m *managedSerial) withPortPoll(fn func(*serialPort) error) error {
-	return m.withPortLocked(true, fn)
-}
-
-func (m *managedSerial) withPortLocked(poll bool, fn func(*serialPort) error) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	if m.otaActive {
-		return errUARTBusy
-	}
-
-	if m.sp == nil {
-		if err := m.openLocked(); err != nil {
-			return fmt.Errorf("%s: %w", m.portName, err)
-		}
-	}
-
-	err := fn(m.sp)
-	if err != nil {
-		m.invalidateLocked(err)
-	}
-	return err
-}
-
-func (m *managedSerial) recoverAfterMasterRestart() {
-	const bootWait = 6 * time.Second
-
-	m.mu.Lock()
-	m.closeLocked()
-	m.mu.Unlock()
-
-	log.Printf("UART: master restart — waiting %s for boot", bootWait)
-	time.Sleep(bootWait)
-
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	if err := m.openLocked(); err != nil {
-		log.Printf("UART reconnect after master restart: %v", err)
-		return
-	}
-	flushSerialInput(m.sp)
-	log.Printf("UART %s ready after master restart", m.portName)
-}
-
-func (m *managedSerial) exchangePayload(payload []byte, cmdName string) ([]byte, error) {
-	return m.exchangePayloadVia(m.withPort, payload, cmdName)
-}
-
-func (m *managedSerial) exchangePayloadPoll(payload []byte, cmdName string) ([]byte, error) {
-	return m.exchangePayloadVia(m.withPortPoll, payload, cmdName)
-}
-
-func (m *managedSerial) exchangePayloadVia(
-	portFn func(func(*serialPort) error) error,
-	payload []byte, cmdName string,
-) ([]byte, error) {
-	var resp []byte
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.exchangePayloadLocked(payload, cmdName, readTimeout)
-		return e
-	})
-	return resp, err
-}
-
-func (m *managedSerial) exchange(cmdID byte, cmdName string) ([]byte, error) {
-	return m.exchangeVia(m.withPort, cmdID, cmdName)
-}
-
-func (m *managedSerial) exchangePoll(cmdID byte, cmdName string) ([]byte, error) {
-	return m.exchangeVia(m.withPortPoll, cmdID, cmdName)
-}
-
-func (m *managedSerial) exchangeVia(
-	portFn func(func(*serialPort) error) error,
-	cmdID byte, cmdName string,
-) ([]byte, error) {
-	var resp []byte
-	err := portFn(func(sp *serialPort) error {
-		var e error
-		resp, e = sp.exchangeLocked(cmdID, cmdName)
-		return e
-	})
-	return resp, err
-}
-
-func disconnectedState(portName string, err error) DashboardState {
-	msg := "UART disconnected"
-	if err != nil {
-		msg = err.Error()
-	}
-	return DashboardState{
-		UpdatedAt:     time.Now().Format(time.RFC3339),
-		SerialPort:    portName,
-		UARTConnected: false,
-		SerialOK:      false,
-		SerialError:   msg,
-		Master:        MasterView{OK: false, Error: msg},
-		Clients:       []ClientView{},
-	}
-}
+// managedSerial is an alias for managedHost (UART-first history).
+type managedSerial = managedHost
@@ -12,7 +12,7 @@
    {
      "id": "pod-1",
      "mac": "50:78:7d:18:01:10",
-      "client_id": 16,
+      "client_id": 1,
      "console": "/dev/ttyACM1"
    }
  ]
@@ -10,8 +10,10 @@ import (
 const (
 	StartMarker = 0xAA
 	StopMarker  = 0xCC
-	// Must match main/uart.h MAX_PAYLOAD_SIZE (MAX_BUF_SIZE - 4).
-	MaxPayload = 248
+	// Must match main/uart.h MAX_PAYLOAD_SIZE.
+	MaxPayload = 1024
+	// AA | len_lo | len_hi | payload | xor | CC
+	FrameOverhead = 5
 )

 var (
@@ -19,14 +21,15 @@ var (
 	ErrTimeout      = errors.New("read timeout")
 )

-// EncodeFrame builds a framed packet: 0xAA len payload xor(payload) 0xCC.
+// EncodeFrame builds a framed packet: 0xAA len_lo len_hi payload xor(payload) 0xCC.
 func EncodeFrame(payload []byte) ([]byte, error) {
 	if len(payload) == 0 || len(payload) > MaxPayload {
 		return nil, fmt.Errorf("payload length %d out of range 1..%d", len(payload), MaxPayload)
 	}

-	frame := make([]byte, 0, 4+len(payload))
-	frame = append(frame, StartMarker, byte(len(payload)))
+	n := len(payload)
+	frame := make([]byte, 0, FrameOverhead+n)
+	frame = append(frame, StartMarker, byte(n&0xff), byte((n>>8)&0xff))
 	var checksum byte
 	for _, b := range payload {
 		frame = append(frame, b)
@@ -39,6 +42,7 @@ func EncodeFrame(payload []byte) ([]byte, error) {
 type Parser struct {
 	state    int
 	len      int
+	lenLo    byte
 	payload  []byte
 	index    int
 	checksum byte
@@ -46,7 +50,8 @@ type Parser struct {

 const (
 	stateStart = iota
-	stateLen
+	stateLenLo
+	stateLenHi
 	stateData
 	stateChecksum
 	stateStop
@@ -63,14 +68,19 @@ func (p *Parser) Feed(b byte) (payload []byte, ok bool, err error) {
 		if b == StartMarker {
 			p.index = 0
 			p.checksum = 0
-			p.state = stateLen
+			p.state = stateLenLo
 		}
-	case stateLen:
-		if b == 0 || b > MaxPayload {
+	case stateLenLo:
+		p.lenLo = b
+		p.state = stateLenHi
+	case stateLenHi:
+		n := int(p.lenLo) | (int(b) << 8)
+		if n == 0 || n > MaxPayload {
 			p.state = stateStart
 		} else {
-			p.len = int(b)
+			p.len = n
 			p.payload = make([]byte, p.len)
+			p.index = 0
 			p.state = stateData
 		}
 	case stateData:
@@ -102,7 +112,7 @@ func (p *Parser) Feed(b byte) (payload []byte, ok bool, err error) {
 // maxWait bounds total wait time; zero means no limit (serial read timeouts retry forever).
 func ReadFrame(r io.Reader, buf []byte, maxWait time.Duration) ([]byte, error) {
 	if buf == nil {
-		buf = make([]byte, 256)
+		buf = make([]byte, 1024)
 	}
 	parser := NewParser()

@@ -12,6 +12,9 @@ idf_component_register(
  "powerpod.c"
  "led_ring.c"
  "uart.c"
+  "host_transport.c"
+  "ble_host.c"
+  "ble_stream.c"
  "uart_proto.c"
  "uart_cmd.c"
  "cmd/cmd_handler.c"
@@ -19,6 +22,7 @@ idf_component_register(
  "cmd/cmd_client_info.c"
  "cmd/cmd_accel_deadzone.c"
  "cmd/cmd_accel_stream.c"
+  "cmd/cmd_input_send_mode.c"
  "cmd/cmd_tap_notify.c"
  "cmd/cmd_tap_config.c"
  "cmd/cmd_cache_status.c"
@@ -26,15 +30,18 @@ idf_component_register(
  "cmd/cmd_espnow_echo_ping.c"
  "cmd/cmd_espnow_find_me.c"
  "cmd/cmd_restart.c"
+  "cmd/cmd_client_id_map_reset.c"
  "pod_reboot.c"
  "cmd/cmd_led_ring.c"
  "cmd/cmd_battery.c"
+  "cmd/cmd_battery_uv.c"
  "cmd/cmd_set_log_level.c"
  "cmd/cmd_ota.c"
  "cmd/cmd_ota_slave_progress.c"
  "ota_uart.c"
  "ota_espnow.c"
  "ota_session.c"
+  "ota_confirm.c"
  "client_registry.c"
  "esp_now_comm.c"
  "esp_now_core.c"
@@ -59,6 +66,7 @@ idf_component_register(
  esp_netif
  esp_event
  nvs_flash
+  bt
  PRIV_REQUIRES
  esp_driver_gpio
  esp_driver_uart
@@ -116,15 +116,17 @@ Schema: `proto/esp_now_messages.proto`. Encode/decode: `esp_now_proto.c`. The ES

 | `EspNowMessageType` | Direction | `oneof` payload |
 |---------------------|-----------|-----------------|
-| `ESPNOW_DISCOVER` | Master → broadcast `FF:FF:FF:FF:FF:FF` | `EspNowDiscover` (`network`) |
+| `ESPNOW_DISCOVER` | Master → broadcast `FF:FF:FF:FF:FF:FF` | `EspNowDiscover` (`network`, `master_time_us` for accel TX slot sync) |
 | `ESPNOW_SLAVE_INFO` | Slave → master | `EspNowSlavePresence` |
 | `ESPNOW_HEARTBEAT` | Slave → master | `EspNowSlavePresence` (same fields) |
 | `ESPNOW_SET_ACCEL_DEADZONE` | Master → slave | `EspNowAccelDeadzone` (`deadzone` LSB) |
 | `ESPNOW_SET_TAP_CONFIG` | Master → slave | `EspNowTapConfig` (multitap sens/timing/axis + enable S/D/T) |
+| `ESPNOW_SET_BATTERY_UV` | Master → slave | `EspNowBatteryUv` (runtime UV enable + clear latch when off) |
 | `ESPNOW_UNICAST_TEST` | Master → slave | `EspNowUnicastTest` (`seq`) |
 | `ESPNOW_FIND_ME` | Master → slave | `EspNowFindMe` (`client_id` filter) — LED locate sequence |
 | `ESPNOW_RESTART` | Master → slave | `EspNowRestart` (`client_id` filter) — reboot slave |
-| `ESPNOW_ACCEL_SAMPLE` | Slave → master | `EspNowAccelSample` (`slave_id`, `x`, `y`, `z` raw LSB) — ~every 16 ms |
+| `ESPNOW_ACCEL_SAMPLE` | Slave → master | `EspNowAccelSample` (`slave_id`, `x`, `y`, `z` raw LSB) — ~every 10 ms in 1 ms slots `offset_ms=(id-1)%8` via Discover sync; TX path via `INPUT_SEND_MODE` |
+| `ESPNOW_SET_INPUT_SEND_MODE` | Master → slave | `EspNowInputSendMode` (`mode` 0..3 = best_effort/fast/wait/reliable) |
 | `ESPNOW_SET_TAP_NOTIFY` | Master → slave | `EspNowTapNotify` (`client_id`, `single`, `double_tap`, `triple`) — which tap kinds to forward |
 | `ESPNOW_TAP_EVENT` | Slave → master | `EspNowTapEvent` (`client_id`, `kind`) — on BMA456 tap interrupt if notify enabled |
 | `ESPNOW_BATTERY_REPORT` | Slave → master | `EspNowBatteryReport` (`client_id`, `lipo1/2` mV) — ~every 30 s; cached in `client_registry` |
@@ -164,7 +166,7 @@ Hardware: **UART1**, **921600** baud, **TX = GPIO3**, **RX = GPIO2** (adapter TX
 | Field | Value |
 |-------|--------|
 | Start | `0xAA` |
-| Length | 1 byte, payload size 1–252 |
+| Length | 2 bytes little-endian, payload size 1–1024 |
 | Payload | `length` bytes |
 | Checksum | XOR of all payload bytes |
 | Stop | `0xCC` |
@@ -176,7 +178,7 @@ Hardware: **UART1**, **921600** baud, **TX = GPIO3**, **RX = GPIO2** (adapter TX
 | 0 | Command ID (`MessageType` / `msg_id`) |
 | 1… | Arguments (handler receives bytes after ID only) |

-Example VERSION request: single-byte payload `03` → frame `AA 01 03 03 CC`.
+Example VERSION request: single-byte payload `03` → frame `AA 01 00 03 03 CC`.

 Logging:

@@ -233,11 +235,13 @@ Host and master speak nanopb-encoded `UartMessage` inside UART frames (byte 0 =
 | 22 | `FIND_ME` | Implemented (`cmd/cmd_espnow_find_me.c`) — `client_id=0` local ring, `>0` ESP-NOW to slave |
 | 23 | `RESTART` | Implemented (`cmd/cmd_restart.c`) — `client_id=0` reboot master, `>0` ESP-NOW reboot slave |
 | 25 | `ACCEL_STREAM` | Implemented — enable/disable slave ESP-NOW accel stream to master |
+| 35 | `INPUT_SEND_MODE` | Implemented — get/set slave accel/tap ESP-NOW send path (best_effort/fast/wait/reliable) |
 | 27 | `TAP_NOTIFY` | Implemented (`cmd/cmd_tap_notify.c`) — get/set which tap kinds notify via ESP-NOW |
 | 29 | `CACHE_STATUS` | Implemented (`cmd/cmd_cache_status.c`) — subscribed accel + tap cache (one UART round-trip) |
 | 30 | `ESPNOW_ECHO_PING` | Implemented (`cmd/cmd_espnow_echo_ping.c`) — ESP-NOW timestamp echo (latency test) |
 | 31 | `SET_LOG_LEVEL` | Implemented (`cmd/cmd_set_log_level.c`) — get/set global `esp_log_level_set("*", …)` on master |
 | 32 | `TAP_CONFIG` | Implemented (`cmd/cmd_tap_config.c`) — get/set BMA456H multitap params (+ NVS) |
+| 36 | `BATTERY_UV` | Implemented (`cmd/cmd_battery_uv.c`) — get/set software UV enable (+ NVS / ESP-NOW) |

 Regenerate C code:

@@ -376,7 +380,7 @@ go run . -port /dev/ttyUSB0 tap-notify -client 16

 ### CACHE_STATUS command

-Read **cached** accel and/or tap data on the **master** in one UART round-trip. Slaves send `ESPNOW_ACCEL_SAMPLE` every **16 ms** when streaming; tap events arrive via `ESPNOW_TAP_EVENT` and are held up to **16 ms** (`CLIENT_REGISTRY_TAP_MAX_AGE_MS`). Pending taps are **consumed** on read (like the former `TAP_SNAPSHOT`).
+Read **cached** accel and/or tap data on the **master** in one UART round-trip. Slaves send `ESPNOW_ACCEL_SAMPLE` every **8 ms** (best-effort) when streaming; tap events arrive via `ESPNOW_TAP_EVENT` and are held up to **8 ms** (`CLIENT_REGISTRY_TAP_MAX_AGE_MS`). Pending taps are **consumed** on read (like the former `TAP_SNAPSHOT`).

 **Request:** framed `1d` (`0x1d`) only — no body (`CacheStatusRequest` empty).

@@ -390,7 +394,7 @@ Read **cached** accel and/or tap data on the **master** in one UART round-trip.

 Unsubscribed submessages are omitted on the wire (proto3 defaults). The master walks `client_registry` once per request (`cmd/cmd_cache_status.c`).

-Host tools poll this at **16 ms** when live-stream / WebSocket receive is enabled. Tap events stay visible for **2 s** in the UI/API after first sight.
+Host tools poll this at **~8 ms** when live-stream / WebSocket receive is enabled. Tap events stay visible for **2 s** in the UI/API after first sight.

 ```bash
 go run . -port /dev/ttyUSB0 cache-status
@@ -471,14 +475,17 @@ Read **cached** LiPo ADC values on the **master** (master local + one entry per

 ### Software UV protection (LiPo)

-When `POWERPOD_BATTERY_UV_ENABLE` is `1` (default in `powerpod.h`, disable via CMake), the firmware monitors ADC pin voltages on GPIO 1 and 11:
+When `POWERPOD_BATTERY_UV_ENABLE` is `1` (default in `powerpod.h`, disable via CMake), the firmware can monitor ADC pin voltages on GPIO 1 and 11. Runtime enable is NVS `uv_en` per pod (missing key → **disabled**); UART `BATTERY_UV` / dashboard toggles it on master and slaves.

 | Condition | ADC threshold | Action |
 |-----------|---------------|--------|
-| Under-voltage | any valid channel &lt; **2300 mV** (3.0 V pack) | NVS latch `uv_latch`, restart into energy-save mode |
-| Charged | all valid channels ≥ **3000 mV** (4.0 V pack) | Clear latch, restart into normal boot |
+| External / absent | every valid channel &lt; **100 mV** | Normal boot (no UV); clears latch if set |
+| Under-voltage | any valid channel in **100…2299 mV** | NVS latch `uv_latch`, restart into energy-save mode |
+| Charged | every non-absent valid channel ≥ **3000 mV** | Clear latch, restart into normal boot |

-**Energy-save boot:** LED mode `6` (first 4 LEDs red ~10 % for 5 s), then no WiFi/ESP-NOW, UART, I2C, BMA456, or button — only LiPo ADC polling every 30 s until charged.
+**Energy-save boot:** LED mode `6` (first 4 LEDs red ~10 % for 5 s), then no WiFi/ESP-NOW, UART, I2C, BMA456, or button — only LiPo ADC polling every 30 s until charged. Disabling UV while latched clears the latch (requires a reachable host — not while already in energy-save).
+
+**UART:** `BATTERY_UV` (`0x24`) — `client_id=0` master, `>0` one slave, `all_clients` master + all slaves. Disabling also clears `uv_latch`.

 **Test LED pattern from host:** `led-ring -mode battery-low` (works even when UV feature is disabled).

@@ -534,7 +541,7 @@ Fields per client: `id`, `mac`, `version`, `available`, `used`, `last_ping`, `la
 | `client_registry_heartbeat(mac, id, version, …)` | Same as upsert for heartbeats; reactivates inactive clients |
 | `client_registry_check_timeouts(timeout_ms)` | Mark stale clients inactive (master monitor task) |
 | `client_registry_count()` / `client_registry_at(i)` | Iterate for UART encoding |
-| `client_registry_set_tap_notify()` / `client_registry_take_tap()` | Tap notify flags + short-lived tap cache (16 ms) |
+| `client_registry_set_tap_notify()` / `client_registry_take_tap()` | Tap notify flags + short-lived tap cache (8 ms) |

 Slaves register when the master receives `SLAVE_INFO` on the matching network; `HEARTBEAT` keeps them marked available. The registry **MAC is always the ESP-NOW source address** (`recv_info.src_addr`), not the optional `mac` bytes in the protobuf (used only on the wire for debugging).

@@ -612,6 +619,7 @@ Target: ESP32-S3. Close serial monitor on the UART adapter port before running `
 | `pod_settings.c/h` | NVS persistence (accel deadzone, tap config, UV latch) |
 | `led_ring.c/h` | LED ring (digit display, progress bar) |
 | `cmd/cmd_led_ring.c` | UART `LED_RING` progress command |
+| `cmd/cmd_battery_uv.c` | UART `BATTERY_UV` — software UV enable + NVS / ESP-NOW |
 | `cmd/cmd_set_log_level.c` | UART `SET_LOG_LEVEL` — runtime ESP-IDF log level |
 | `proto/uart_messages.proto` | UART protocol schema |
 | `proto/esp_now_messages.proto` | ESP-NOW protocol schema |
@@ -9,6 +9,8 @@
 typedef struct {
  bool master;
  uint8_t network;
+  /** false = UART host, true = BLE host (DIP8; mutual exclusive, boot-only). */
+  bool host_ble;
  char running_partition[APP_RUNNING_PARTITION_LABEL_MAX];
 } app_config_t;

@@ -19,15 +19,55 @@ static uint8_t s_charge_streak;

 bool battery_uv_is_latched(void) { return pod_settings_is_uv_latched(); }

+static bool channel_is_absent(uint32_t mv) {
+  return mv < BATTERY_UV_ABSENT_ADC_MV;
+}
+
+static bool channel_is_under(uint32_t mv) {
+  return !channel_is_absent(mv) && mv < BATTERY_UV_ADC_MV;
+}
+
+static void log_lipo_reading(const char *ctx, const board_lipo_reading_t *reading) {
+  if (reading == NULL) {
+    return;
+  }
+  ESP_LOGI(TAG,
+           "%s LIPO1 %s %lu mV  LIPO2 %s %lu mV", ctx,
+           reading->lipo1_valid ? "ok" : "n/a",
+           (unsigned long)reading->lipo1_mv, reading->lipo2_valid ? "ok" : "n/a",
+           (unsigned long)reading->lipo2_mv);
+}
+
+bool battery_uv_reading_is_external(const board_lipo_reading_t *reading) {
+  if (reading == NULL) {
+    return false;
+  }
+
+  bool any_valid = false;
+  if (reading->lipo1_valid) {
+    any_valid = true;
+    if (!channel_is_absent(reading->lipo1_mv)) {
+      return false;
+    }
+  }
+  if (reading->lipo2_valid) {
+    any_valid = true;
+    if (!channel_is_absent(reading->lipo2_mv)) {
+      return false;
+    }
+  }
+  return any_valid;
+}
+
 bool battery_uv_reading_is_under(const board_lipo_reading_t *reading) {
  if (reading == NULL) {
    return false;
  }

-  if (reading->lipo1_valid && reading->lipo1_mv < BATTERY_UV_ADC_MV) {
+  if (reading->lipo1_valid && channel_is_under(reading->lipo1_mv)) {
    return true;
  }
-  if (reading->lipo2_valid && reading->lipo2_mv < BATTERY_UV_ADC_MV) {
+  if (reading->lipo2_valid && channel_is_under(reading->lipo2_mv)) {
    return true;
  }
  return false;
@@ -38,25 +78,39 @@ bool battery_uv_reading_is_charged(const board_lipo_reading_t *reading) {
    return false;
  }

-  bool any_valid = false;
-  if (reading->lipo1_valid) {
-    any_valid = true;
+  bool any_pack = false;
+  if (reading->lipo1_valid && !channel_is_absent(reading->lipo1_mv)) {
+    any_pack = true;
    if (reading->lipo1_mv < BATTERY_CHARGE_ADC_MV) {
      return false;
    }
  }
-  if (reading->lipo2_valid) {
-    any_valid = true;
+  if (reading->lipo2_valid && !channel_is_absent(reading->lipo2_mv)) {
+    any_pack = true;
    if (reading->lipo2_mv < BATTERY_CHARGE_ADC_MV) {
      return false;
    }
  }
-  return any_valid;
+  return any_pack;
 }

 bool battery_uv_evaluate_boot(void) {
+  if (!pod_settings_is_uv_enabled()) {
+    ESP_LOGI(TAG, "UV protection disabled — normal boot");
+    return false;
+  }
+
  board_lipo_reading_t reading;
  board_input_read_lipo(&reading);
+  log_lipo_reading("boot check", &reading);
+
+  if (battery_uv_reading_is_external(&reading)) {
+    ESP_LOGI(TAG, "near-zero LiPo sense — external supply, normal boot");
+    if (pod_settings_is_uv_latched()) {
+      pod_settings_clear_uv_latched();
+    }
+    return false;
+  }

  if (pod_settings_is_uv_latched() && battery_uv_reading_is_charged(&reading)) {
    ESP_LOGI(TAG, "charged — clearing UV latch");
@@ -78,12 +132,19 @@ bool battery_uv_evaluate_boot(void) {
 }

 void battery_uv_poll(const board_lipo_reading_t *reading) {
-  if (reading == NULL || pod_settings_is_uv_latched()) {
+  if (reading == NULL || !pod_settings_is_uv_enabled() ||
+      pod_settings_is_uv_latched()) {
+    return;
+  }
+
+  if (battery_uv_reading_is_external(reading)) {
+    s_uv_streak = 0;
    return;
  }

  if (battery_uv_reading_is_under(reading)) {
    s_uv_streak++;
+    log_lipo_reading("under-voltage", reading);
    ESP_LOGW(TAG, "under-voltage sample %u/%u", (unsigned)s_uv_streak,
             (unsigned)UV_DEBOUNCE_SAMPLES);
    if (s_uv_streak >= UV_DEBOUNCE_SAMPLES) {
@@ -109,8 +170,13 @@ void battery_uv_run_mode(void) {
  while (1) {
    board_lipo_reading_t reading;
    board_input_read_lipo(&reading);
+    log_lipo_reading("energy-save", &reading);

-    if (battery_uv_reading_is_charged(&reading)) {
+    if (battery_uv_reading_is_external(&reading)) {
+      ESP_LOGI(TAG, "external supply — clearing UV latch and restarting");
+      pod_settings_clear_uv_latched();
+      pod_schedule_restart();
+    } else if (battery_uv_reading_is_charged(&reading)) {
      s_charge_streak++;
      ESP_LOGI(TAG, "charge sample %u/%u", (unsigned)s_charge_streak,
               (unsigned)UV_DEBOUNCE_SAMPLES);
@@ -11,10 +11,17 @@
 #define BATTERY_UV_ADC_MV 2300u
 /** ADC pin voltage (mV) at which charging is detected (4.0 V pack, rounded). */
 #define BATTERY_CHARGE_ADC_MV 3000u
+/**
+ * ADC readings below this are treated as no pack / external supply (not UV).
+ * Noise floor / open sense divider → near 0 mV.
+ */
+#define BATTERY_UV_ABSENT_ADC_MV 100u

 bool battery_uv_is_latched(void);
 bool battery_uv_reading_is_under(const board_lipo_reading_t *reading);
 bool battery_uv_reading_is_charged(const board_lipo_reading_t *reading);
+/** true when every valid channel is near 0 (externally powered / no LiPo). */
+bool battery_uv_reading_is_external(const board_lipo_reading_t *reading);

 /** true → enter UV energy-save path (does not return). */
 bool battery_uv_evaluate_boot(void);
@@ -38,6 +45,11 @@ static inline bool battery_uv_reading_is_charged(const board_lipo_reading_t *rea
  return false;
 }

+static inline bool battery_uv_reading_is_external(const board_lipo_reading_t *reading) {
+  (void)reading;
+  return false;
+}
+
 static inline bool battery_uv_evaluate_boot(void) { return false; }

 static inline void battery_uv_poll(const board_lipo_reading_t *reading) {
@@ -0,0 +1,496 @@
+#include "ble_host.h"
+#include "esp_log.h"
+#include "esp_timer.h"
+#include "host_transport.h"
+#include "nvs_flash.h"
+#include "ota_espnow.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/semphr.h"
+#include "freertos/task.h"
+
+#include "nimble/nimble_port.h"
+#include "nimble/nimble_port_freertos.h"
+#include "host/ble_att.h"
+#include "host/ble_hs.h"
+#include "host/util/util.h"
+#include "services/gap/ble_svc_gap.h"
+#include "services/gatt/ble_svc_gatt.h"
+
+#include <string.h>
+
+static const char *TAG = "[BLE_HOST]";
+static const char *DEVICE_NAME = "Powerpod";
+
+#define BLE_CONN_ITVL_MIN_UNITS 6 /* 7.5 ms */
+#define BLE_CONN_ITVL_MAX_UNITS 6
+#define BLE_CONN_TUNE_MAX_TRIES 6
+/** Prefer large ATT MTU so CLIENT_INFO / BATTERY fit in fewer notify chunks. */
+#define BLE_PREFERRED_ATT_MTU 517
+#define BLE_NOTIFY_CHUNK_RETRIES 24
+/** During ESP-NOW OTA dist, fail notify sooner so WiFi/ESP-NOW keeps airtime. */
+#define BLE_NOTIFY_CHUNK_RETRIES_OTA_DIST 4
+#define BLE_NOTIFY_CHUNK_RETRY_MS 5
+/** Pace multi-chunk notifies so the central parser sees contiguous frame bytes. */
+#define BLE_NOTIFY_CHUNK_GAP_MS 8
+#define BLE_NOTIFY_CHUNK_GAP_OTA_DIST_MS 2
+
+/*
+ * Nordic UART style:
+ *   Service:        6e400001-b5a3-f393-e0a9-e50e24dcca9e
+ *   Characteristic: 6e400002-b5a3-f393-e0a9-e50e24dcca9e
+ * Write = host→ESP (framed), Notify = ESP→host (framed).
+ */
+static const ble_uuid128_t ble_svc_uuid =
+    BLE_UUID128_INIT(0x9e, 0xca, 0xdc, 0x24, 0x0e, 0xe5, 0xa9, 0xe0, 0x93, 0xf3,
+                     0xa3, 0xb5, 0x01, 0x00, 0x40, 0x6e);
+static const ble_uuid128_t ble_chr_uuid =
+    BLE_UUID128_INIT(0x9e, 0xca, 0xdc, 0x24, 0x0e, 0xe5, 0xa9, 0xe0, 0x93, 0xf3,
+                     0xa3, 0xb5, 0x02, 0x00, 0x40, 0x6e);
+
+static uint8_t own_addr_type;
+static uint16_t conn_handle = BLE_HS_CONN_HANDLE_NONE;
+static uint16_t ble_chr_val_handle;
+static bool notify_enabled;
+static uint16_t att_mtu = 23;
+static esp_timer_handle_t conn_tune_timer;
+static uint8_t conn_tune_tries;
+static SemaphoreHandle_t s_tx_mu;
+
+static int ble_gap_event(struct ble_gap_event *event, void *arg);
+static void ble_request_fast_conn_params(uint16_t handle);
+static void ble_optimize_link(uint16_t handle);
+
+bool ble_host_ready(void) {
+  return notify_enabled && conn_handle != BLE_HS_CONN_HANDLE_NONE;
+}
+
+uint16_t ble_host_att_mtu(void) { return att_mtu; }
+
+uint16_t ble_host_max_payload(void) {
+  if (att_mtu < 4) {
+    return 20;
+  }
+  return (uint16_t)(att_mtu - 3);
+}
+
+/**
+ * One ATT notification (≤ MTU-3). Retries on transient NimBLE buffer pressure.
+ */
+static esp_err_t ble_notify_chunk(const uint8_t *data, uint16_t len) {
+  const int max_retries = ota_espnow_distribution_active()
+                              ? BLE_NOTIFY_CHUNK_RETRIES_OTA_DIST
+                              : BLE_NOTIFY_CHUNK_RETRIES;
+  for (int attempt = 0; attempt < max_retries; attempt++) {
+    struct os_mbuf *om = ble_hs_mbuf_from_flat(data, len);
+    if (om == NULL) {
+      vTaskDelay(pdMS_TO_TICKS(BLE_NOTIFY_CHUNK_RETRY_MS));
+      continue;
+    }
+
+    int rc = ble_gatts_notify_custom(conn_handle, ble_chr_val_handle, om);
+    if (rc == 0) {
+      return ESP_OK;
+    }
+    /* Ownership stays with us on failure. */
+    os_mbuf_free_chain(om);
+    if (!ble_host_ready()) {
+      return ESP_ERR_INVALID_STATE;
+    }
+    ESP_LOGD(TAG, "notify chunk rc=%d attempt=%d len=%u", rc, attempt,
+             (unsigned)len);
+    vTaskDelay(pdMS_TO_TICKS(BLE_NOTIFY_CHUNK_RETRY_MS));
+  }
+  ESP_LOGW(TAG, "notify chunk gave up after retries len=%u", (unsigned)len);
+  return ESP_ERR_NO_MEM;
+}
+
+/**
+ * Send a full host frame. If larger than ATT MTU-3, split across consecutive
+ * notifies; goTool feeds every notify into the same byte parser, so the frame
+ * reassembles without a protocol change. Mutex keeps stream ticks from
+ * interleaving mid-frame.
+ */
+static esp_err_t ble_host_tx(const uint8_t *frame, size_t frame_len) {
+  if (!ble_host_ready()) {
+    return ESP_ERR_INVALID_STATE;
+  }
+  if (frame == NULL || frame_len == 0) {
+    return ESP_ERR_INVALID_ARG;
+  }
+
+  uint16_t max_chunk = ble_host_max_payload();
+  if (max_chunk == 0) {
+    return ESP_ERR_INVALID_SIZE;
+  }
+
+  if (s_tx_mu == NULL ||
+      xSemaphoreTake(s_tx_mu, pdMS_TO_TICKS(2000)) != pdTRUE) {
+    return ESP_ERR_TIMEOUT;
+  }
+
+  esp_err_t result = ESP_OK;
+  size_t off = 0;
+  while (off < frame_len) {
+    if (!ble_host_ready()) {
+      result = ESP_ERR_INVALID_STATE;
+      break;
+    }
+    size_t remain = frame_len - off;
+    uint16_t n =
+        (uint16_t)(remain > max_chunk ? max_chunk : remain);
+    result = ble_notify_chunk(&frame[off], n);
+    if (result != ESP_OK) {
+      ESP_LOGW(TAG, "TX abort at %u/%u (chunk %u, mtu_pay %u)",
+               (unsigned)off, (unsigned)frame_len, (unsigned)n,
+               (unsigned)max_chunk);
+      break;
+    }
+    off += n;
+    if (off < frame_len) {
+      const uint32_t gap_ms = ota_espnow_distribution_active()
+                                 ? BLE_NOTIFY_CHUNK_GAP_OTA_DIST_MS
+                                 : BLE_NOTIFY_CHUNK_GAP_MS;
+      vTaskDelay(pdMS_TO_TICKS(gap_ms));
+    }
+  }
+
+  xSemaphoreGive(s_tx_mu);
+  return result;
+}
+
+static void ble_conn_tune_timer_cb(void *arg) {
+  struct ble_gap_conn_desc desc;
+
+  (void)arg;
+  if (conn_handle == BLE_HS_CONN_HANDLE_NONE) {
+    return;
+  }
+  if (ble_gap_conn_find(conn_handle, &desc) != 0) {
+    return;
+  }
+  if (desc.conn_itvl <= BLE_CONN_ITVL_MAX_UNITS) {
+    ESP_LOGI(TAG, "conn already at interval_us=%lu",
+             (unsigned long)desc.conn_itvl * 1250UL);
+    return;
+  }
+  if (conn_tune_tries >= BLE_CONN_TUNE_MAX_TRIES) {
+    ESP_LOGW(TAG, "central kept interval_us=%lu (ESP requested 7500)",
+             (unsigned long)desc.conn_itvl * 1250UL);
+    return;
+  }
+
+  conn_tune_tries++;
+  ESP_LOGI(TAG, "retry fast conn params (%u/%u); current interval_us=%lu",
+           conn_tune_tries, BLE_CONN_TUNE_MAX_TRIES,
+           (unsigned long)desc.conn_itvl * 1250UL);
+  ble_request_fast_conn_params(conn_handle);
+  esp_timer_start_once(conn_tune_timer, 750 * 1000);
+}
+
+static void ble_schedule_conn_tune(void) {
+  conn_tune_tries = 0;
+  esp_timer_stop(conn_tune_timer);
+  esp_timer_start_once(conn_tune_timer, 300 * 1000);
+}
+
+static void ble_request_fast_conn_params(uint16_t handle) {
+  struct ble_gap_upd_params params = {
+      .itvl_min = BLE_CONN_ITVL_MIN_UNITS,
+      .itvl_max = BLE_CONN_ITVL_MAX_UNITS,
+      .latency = 0,
+      .supervision_timeout = 400,
+      .min_ce_len = 0,
+      .max_ce_len = 24,
+  };
+  int rc = ble_gap_update_params(handle, &params);
+  if (rc != 0) {
+    ESP_LOGW(TAG, "conn param update request failed: %d", rc);
+  } else {
+    ESP_LOGI(TAG, "requested conn interval 7.5 ms");
+  }
+}
+
+static void ble_optimize_link(uint16_t handle) {
+  int rc;
+
+  /*
+   * Do NOT request 2M PHY here. With ESP-NOW/WiFi coexistence the controller
+   * can assert in llc_phy_upd (e.g. "BLE assert llc_phy_upd.c …") and the
+   * host link dies — no further responses. Stay on default 1M.
+   */
+  ble_request_fast_conn_params(handle);
+
+  rc = ble_gap_set_data_len(handle, 251, 2120);
+  if (rc != 0) {
+    ESP_LOGW(TAG, "data len request failed: %d", rc);
+  }
+
+  ble_schedule_conn_tune();
+}
+
+static void ble_advertise(void) {
+  struct ble_gap_adv_params adv_params;
+  struct ble_hs_adv_fields fields;
+  int rc;
+
+  memset(&fields, 0, sizeof(fields));
+  fields.flags = BLE_HS_ADV_F_DISC_GEN | BLE_HS_ADV_F_BREDR_UNSUP;
+  fields.tx_pwr_lvl_is_present = 1;
+  fields.tx_pwr_lvl = BLE_HS_ADV_TX_PWR_LVL_AUTO;
+  fields.name = (uint8_t *)DEVICE_NAME;
+  fields.name_len = strlen(DEVICE_NAME);
+  fields.name_is_complete = 1;
+
+  rc = ble_gap_adv_set_fields(&fields);
+  if (rc != 0) {
+    ESP_LOGE(TAG, "adv set fields failed: %d", rc);
+    return;
+  }
+
+  memset(&adv_params, 0, sizeof(adv_params));
+  adv_params.conn_mode = BLE_GAP_CONN_MODE_UND;
+  adv_params.disc_mode = BLE_GAP_DISC_MODE_GEN;
+  adv_params.itvl_min = 0x20;
+  adv_params.itvl_max = 0x30;
+
+  rc = ble_gap_adv_start(own_addr_type, NULL, BLE_HS_FOREVER, &adv_params,
+                         ble_gap_event, NULL);
+  if (rc != 0) {
+    ESP_LOGE(TAG, "adv start failed: %d", rc);
+    return;
+  }
+
+  ESP_LOGI(TAG, "advertising as \"%s\"", DEVICE_NAME);
+}
+
+static int ble_chr_access(uint16_t conn_handle_arg, uint16_t attr_handle,
+                          struct ble_gatt_access_ctxt *ctxt, void *arg) {
+  (void)conn_handle_arg;
+  (void)attr_handle;
+  (void)arg;
+
+  switch (ctxt->op) {
+  case BLE_GATT_ACCESS_OP_READ_CHR:
+    return 0;
+
+  case BLE_GATT_ACCESS_OP_WRITE_CHR: {
+    uint16_t om_len = OS_MBUF_PKTLEN(ctxt->om);
+    uint8_t buf[512];
+    uint16_t copied = 0;
+    int rc;
+
+    if (om_len == 0 || om_len > sizeof(buf)) {
+      return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
+    }
+
+    rc = ble_hs_mbuf_to_flat(ctxt->om, buf, sizeof(buf), &copied);
+    if (rc != 0) {
+      return BLE_ATT_ERR_UNLIKELY;
+    }
+
+    host_rx_bytes(buf, copied);
+    return 0;
+  }
+
+  default:
+    return BLE_ATT_ERR_UNLIKELY;
+  }
+}
+
+static const struct ble_gatt_svc_def gatt_svcs[] = {
+    {
+        .type = BLE_GATT_SVC_TYPE_PRIMARY,
+        .uuid = &ble_svc_uuid.u,
+        .characteristics =
+            (struct ble_gatt_chr_def[]){
+                {
+                    .uuid = &ble_chr_uuid.u,
+                    .access_cb = ble_chr_access,
+                    .val_handle = &ble_chr_val_handle,
+                    .flags = BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_WRITE |
+                             BLE_GATT_CHR_F_WRITE_NO_RSP | BLE_GATT_CHR_F_NOTIFY,
+                },
+                {0},
+            },
+    },
+    {0},
+};
+
+static int gatt_svr_init(void) {
+  int rc;
+
+  ble_svc_gap_init();
+  ble_svc_gatt_init();
+
+  rc = ble_gatts_count_cfg(gatt_svcs);
+  if (rc != 0) {
+    return rc;
+  }
+
+  return ble_gatts_add_svcs(gatt_svcs);
+}
+
+static int ble_gap_event(struct ble_gap_event *event, void *arg) {
+  (void)arg;
+
+  switch (event->type) {
+  case BLE_GAP_EVENT_CONNECT:
+    ESP_LOGI(TAG, "connection %s; status=%d handle=%d",
+             event->connect.status == 0 ? "established" : "failed",
+             event->connect.status, event->connect.conn_handle);
+    if (event->connect.status != 0) {
+      ble_advertise();
+    } else {
+      conn_handle = event->connect.conn_handle;
+      ble_optimize_link(conn_handle);
+    }
+    return 0;
+
+  case BLE_GAP_EVENT_DISCONNECT:
+    ESP_LOGI(TAG, "disconnect; reason=%d", event->disconnect.reason);
+    esp_timer_stop(conn_tune_timer);
+    conn_tune_tries = 0;
+    conn_handle = BLE_HS_CONN_HANDLE_NONE;
+    notify_enabled = false;
+    att_mtu = 23;
+    ble_advertise();
+    return 0;
+
+  case BLE_GAP_EVENT_CONN_UPDATE: {
+    struct ble_gap_conn_desc desc;
+    if (ble_gap_conn_find(event->conn_update.conn_handle, &desc) == 0) {
+      ESP_LOGI(TAG, "conn updated; status=%d interval_us=%lu latency=%u",
+               event->conn_update.status,
+               (unsigned long)desc.conn_itvl * 1250UL, desc.conn_latency);
+      if (event->conn_update.status == 0 &&
+          desc.conn_itvl > BLE_CONN_ITVL_MAX_UNITS &&
+          conn_tune_tries < BLE_CONN_TUNE_MAX_TRIES) {
+        esp_timer_stop(conn_tune_timer);
+        esp_timer_start_once(conn_tune_timer, 500 * 1000);
+      }
+    }
+    return 0;
+  }
+
+  case BLE_GAP_EVENT_PHY_UPDATE_COMPLETE:
+    ESP_LOGI(TAG, "phy update; status=%d tx=%u rx=%u",
+             event->phy_updated.status, event->phy_updated.tx_phy,
+             event->phy_updated.rx_phy);
+    return 0;
+
+  case BLE_GAP_EVENT_ADV_COMPLETE:
+    ESP_LOGI(TAG, "advertise complete; reason=%d", event->adv_complete.reason);
+    ble_advertise();
+    return 0;
+
+  case BLE_GAP_EVENT_SUBSCRIBE:
+    if (event->subscribe.attr_handle == ble_chr_val_handle) {
+      notify_enabled = event->subscribe.cur_notify;
+      ESP_LOGI(TAG, "notify %s", notify_enabled ? "enabled" : "disabled");
+      if (notify_enabled && conn_handle != BLE_HS_CONN_HANDLE_NONE) {
+        ble_request_fast_conn_params(conn_handle);
+      }
+    }
+    return 0;
+
+  case BLE_GAP_EVENT_MTU:
+    att_mtu = event->mtu.value;
+    ESP_LOGI(TAG, "mtu update; handle=%d mtu=%d", event->mtu.conn_handle,
+             event->mtu.value);
+    return 0;
+
+  default:
+    return 0;
+  }
+}
+
+static void ble_on_sync(void) {
+  int rc;
+
+  rc = ble_hs_id_infer_auto(0, &own_addr_type);
+  if (rc != 0) {
+    ESP_LOGE(TAG, "ble_hs_id_infer_auto failed: %d", rc);
+    return;
+  }
+
+  uint8_t addr_val[6] = {0};
+  ble_hs_id_copy_addr(own_addr_type, addr_val, NULL);
+  ESP_LOGI(TAG, "device address: %02x:%02x:%02x:%02x:%02x:%02x", addr_val[5],
+           addr_val[4], addr_val[3], addr_val[2], addr_val[1], addr_val[0]);
+
+  ble_advertise();
+}
+
+static void ble_on_reset(int reason) {
+  ESP_LOGE(TAG, "nimble reset; reason=%d", reason);
+}
+
+static void ble_host_task(void *param) {
+  (void)param;
+  ESP_LOGI(TAG, "nimble host task started");
+  nimble_port_run();
+  nimble_port_freertos_deinit();
+}
+
+esp_err_t init_ble_host(QueueHandle_t cmd_queue) {
+  esp_err_t ret;
+
+  host_transport_set_cmd_queue(cmd_queue);
+  host_transport_set_tx(ble_host_tx);
+
+  s_tx_mu = xSemaphoreCreateMutex();
+  if (s_tx_mu == NULL) {
+    ESP_LOGE(TAG, "failed to create TX mutex");
+    return ESP_ERR_NO_MEM;
+  }
+
+  /* NVS may already be init via pod_settings; ignore ALREADY_INIT. */
+  ret = nvs_flash_init();
+  if (ret == ESP_ERR_NVS_NO_FREE_PAGES ||
+      ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
+    ESP_ERROR_CHECK(nvs_flash_erase());
+    ret = nvs_flash_init();
+  }
+  if (ret != ESP_OK && ret != ESP_ERR_INVALID_STATE) {
+    ESP_LOGE(TAG, "nvs_flash_init failed: %s", esp_err_to_name(ret));
+    return ret;
+  }
+
+  const esp_timer_create_args_t tune_args = {
+      .callback = &ble_conn_tune_timer_cb,
+      .name = "ble_conn_tune",
+  };
+  ESP_ERROR_CHECK(esp_timer_create(&tune_args, &conn_tune_timer));
+
+  ret = nimble_port_init();
+  if (ret != ESP_OK) {
+    ESP_LOGE(TAG, "nimble_port_init failed: %s", esp_err_to_name(ret));
+    return ret;
+  }
+
+  ble_hs_cfg.sync_cb = ble_on_sync;
+  ble_hs_cfg.reset_cb = ble_on_reset;
+
+  int rc = gatt_svr_init();
+  if (rc != 0) {
+    ESP_LOGE(TAG, "gatt_svr_init failed: %d", rc);
+    return ESP_FAIL;
+  }
+
+  rc = ble_svc_gap_device_name_set(DEVICE_NAME);
+  if (rc != 0) {
+    ESP_LOGE(TAG, "device name set failed: %d", rc);
+    return ESP_FAIL;
+  }
+
+  rc = ble_att_set_preferred_mtu(BLE_PREFERRED_ATT_MTU);
+  if (rc != 0) {
+    ESP_LOGW(TAG, "preferred MTU set failed: %d", rc);
+  } else {
+    ESP_LOGI(TAG, "preferred ATT MTU %u", (unsigned)BLE_PREFERRED_ATT_MTU);
+  }
+
+  nimble_port_freertos_init(ble_host_task);
+  ESP_LOGI(TAG, "BLE host transport started");
+  return ESP_OK;
+}
@@ -0,0 +1,22 @@
+#ifndef BLE_HOST_H
+#define BLE_HOST_H
+
+#include "esp_err.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/queue.h"
+#include <stddef.h>
+#include <stdint.h>
+
+/** Start NimBLE host transport (Master only). Uses same framing as UART. */
+esp_err_t init_ble_host(QueueHandle_t cmd_queue);
+
+/** True when a central is connected and CCCD notify is enabled. */
+bool ble_host_ready(void);
+
+/** Negotiated ATT MTU (default 23 until exchange). */
+uint16_t ble_host_att_mtu(void);
+
+/** Max bytes per ATT notify/write (ATT MTU - 3). Frames may span multiple notifies. */
+uint16_t ble_host_max_payload(void);
+
+#endif
@@ -0,0 +1,196 @@
+#include "ble_stream.h"
+#include "app_config.h"
+#include "ble_host.h"
+#include "client_registry.h"
+#include "esp_log.h"
+#include "esp_timer.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "ota_session.h"
+#include "uart_cmd.h"
+#include "uart_messages.pb.h"
+#include "uart_proto.h"
+#include <string.h>
+
+static const char *TAG = "[BLE_STREAM]";
+
+/* Min matches FreeRTOS tick (HZ=100 → 10 ms); 8 ms would delay 0 ticks. */
+#define BLE_STREAM_PERIOD_MIN_MS 10u
+#define BLE_STREAM_PERIOD_MAX_MS 16u
+#define BLE_STREAM_PERIOD_DEFAULT_MS 10u
+
+static uint32_t s_period_ms = BLE_STREAM_PERIOD_DEFAULT_MS;
+static TaskHandle_t s_task;
+static volatile bool s_running;
+
+static bool tap_notify_any(const client_info_t *client) {
+  return client != NULL &&
+         (client->tap_notify_single || client->tap_notify_double ||
+          client->tap_notify_triple);
+}
+
+static alox_TapKind tap_kind_from_registry(uint32_t kind) {
+  switch (kind) {
+  case 1:
+    return alox_TapKind_TAP_SINGLE;
+  case 2:
+    return alox_TapKind_TAP_DOUBLE;
+  case 3:
+    return alox_TapKind_TAP_TRIPLE;
+  default:
+    return alox_TapKind_TAP_NONE;
+  }
+}
+
+static void fill_clients(alox_BleStreamTick *tick) {
+  tick->clients_count = 0;
+  size_t count = client_registry_count();
+  for (size_t i = 0; i < count; i++) {
+    const client_info_t *client = client_registry_at(i);
+    if (client == NULL) {
+      continue;
+    }
+    const bool want_accel = client->accel_stream_enabled;
+    const bool want_tap = tap_notify_any(client);
+    if (!want_accel && !want_tap) {
+      continue;
+    }
+    if (tick->clients_count >=
+        sizeof(tick->clients) / sizeof(tick->clients[0])) {
+      break;
+    }
+
+    alox_CacheClientStatus *entry = &tick->clients[tick->clients_count++];
+    entry->client_id = client->id;
+    entry->has_accel = false;
+    entry->has_tap = false;
+
+    if (want_accel) {
+      entry->has_accel = true;
+      entry->accel.valid = client->accel_valid;
+      if (client->accel_valid) {
+        entry->accel.x = client->accel_x;
+        entry->accel.y = client->accel_y;
+        entry->accel.z = client->accel_z;
+        entry->accel.age_ms =
+            client_registry_ms_since(client->accel_updated_at);
+      }
+    }
+
+    if (want_tap) {
+      uint32_t kind = 0;
+      uint32_t age_ms = 0;
+      if (client_registry_take_tap(client->id, &kind, &age_ms)) {
+        entry->has_tap = true;
+        entry->tap.kind = tap_kind_from_registry(kind);
+        entry->tap.age_ms = age_ms;
+      }
+    }
+  }
+}
+
+static bool any_accel_stream(void) {
+  size_t count = client_registry_count();
+  for (size_t i = 0; i < count; i++) {
+    const client_info_t *client = client_registry_at(i);
+    if (client != NULL && client->accel_stream_enabled) {
+      return true;
+    }
+  }
+  return false;
+}
+
+static esp_err_t send_tick_truncated(alox_UartMessage *msg) {
+  /*
+   * ble_host_tx splits frames larger than ATT MTU-3 across notifies. Only
+   * shrink the tick if it cannot encode into MAX_PAYLOAD_SIZE.
+   */
+  while (true) {
+    esp_err_t err = uart_send_uart_message(msg);
+    if (err == ESP_OK) {
+      return ESP_OK;
+    }
+    if (msg->payload.ble_stream_tick.clients_count == 0) {
+      ESP_LOGW(TAG, "tick too large even with 0 clients: %s",
+               esp_err_to_name(err));
+      return err;
+    }
+    msg->payload.ble_stream_tick.clients_count--;
+    ESP_LOGW(TAG, "truncating tick clients to %u for encode buffer",
+             (unsigned)msg->payload.ble_stream_tick.clients_count);
+  }
+}
+
+static void ble_stream_task(void *param) {
+  (void)param;
+  ESP_LOGI(TAG, "BLE stream task started period_ms=%lu",
+           (unsigned long)s_period_ms);
+
+  while (s_running) {
+    uint32_t period = s_period_ms;
+    if (period < BLE_STREAM_PERIOD_MIN_MS) {
+      period = BLE_STREAM_PERIOD_MIN_MS;
+    }
+    if (period > BLE_STREAM_PERIOD_MAX_MS) {
+      period = BLE_STREAM_PERIOD_MAX_MS;
+    }
+
+    /* Pause ticks during host OTA / ESP-NOW distribute so ATT bandwidth
+     * stays available for OTA_STATUS notifies. */
+    if (ble_host_ready() && any_accel_stream() && !ota_session_busy()) {
+      alox_UartMessage msg = alox_UartMessage_init_zero;
+      uart_cmd_init_response(&msg, alox_MessageType_BLE_STREAM_TICK,
+                             alox_UartMessage_ble_stream_tick_tag);
+      msg.payload.ble_stream_tick.esp_timestamp_us =
+          (uint64_t)esp_timer_get_time();
+      msg.payload.ble_stream_tick.period_ms = period;
+      fill_clients(&msg.payload.ble_stream_tick);
+
+      esp_err_t err = send_tick_truncated(&msg);
+      if (err != ESP_OK) {
+        ESP_LOGW(TAG, "tick send failed: %s", esp_err_to_name(err));
+      }
+    }
+
+    TickType_t delay_ticks = pdMS_TO_TICKS(period);
+    if (delay_ticks < 1) {
+      delay_ticks = 1;
+    }
+    vTaskDelay(delay_ticks);
+  }
+
+  s_task = NULL;
+  vTaskDelete(NULL);
+}
+
+void ble_stream_set_period_ms(uint32_t period_ms) {
+  if (period_ms == 0) {
+    period_ms = BLE_STREAM_PERIOD_DEFAULT_MS;
+  }
+  if (period_ms < BLE_STREAM_PERIOD_MIN_MS) {
+    period_ms = BLE_STREAM_PERIOD_MIN_MS;
+  }
+  if (period_ms > BLE_STREAM_PERIOD_MAX_MS) {
+    period_ms = BLE_STREAM_PERIOD_MAX_MS;
+  }
+  s_period_ms = period_ms;
+}
+
+uint32_t ble_stream_period_ms(void) { return s_period_ms; }
+
+void ble_stream_update(void) {
+  const app_config_t *cfg = app_config_get();
+  bool want = cfg != NULL && cfg->host_ble && any_accel_stream();
+
+  if (want && !s_running) {
+    s_running = true;
+    if (xTaskCreate(ble_stream_task, "ble_stream", 8192, NULL, 5, &s_task) !=
+        pdPASS) {
+      s_running = false;
+      s_task = NULL;
+      ESP_LOGE(TAG, "failed to create ble_stream task");
+    }
+  } else if (!want && s_running) {
+    s_running = false;
+  }
+}
@@ -0,0 +1,18 @@
+#ifndef BLE_STREAM_H
+#define BLE_STREAM_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+/** Clamp and store BLE push period (10–16 ms; min = FreeRTOS tick). */
+void ble_stream_set_period_ms(uint32_t period_ms);
+
+uint32_t ble_stream_period_ms(void);
+
+/**
+ * Re-evaluate whether the BLE push task should run (host_ble + any accel
+ * stream enabled). Safe to call from accel-stream handlers.
+ */
+void ble_stream_update(void);
+
+#endif
@@ -2,7 +2,7 @@
 * BMA456H integration for Powerpod (ESP-IDF I2C master + Bosch SensorAPI).
 *
 * Polls accelerometer at 10 Hz; tap events arrive on BMA456_INT_GPIO.
- * Accel logging is filtered in software (deadzone); slaves stream samples via ESP-NOW.
+ * Accel log + ESP-NOW stream share a software deadzone filter (emit on change).
 */

 #include "bosch456.h"
@@ -33,6 +33,10 @@ static int16_t s_last_x;
 static int16_t s_last_y;
 static int16_t s_last_z;
 static bool s_have_last_sample;
+static int16_t s_stream_last_x;
+static int16_t s_stream_last_y;
+static int16_t s_stream_last_z;
+static bool s_stream_have_last;

 static volatile bool s_int_pending;
 static SemaphoreHandle_t s_accel_mutex;
@@ -119,6 +123,7 @@ bool bma456_is_ready(void) { return s_bma456_ready; }
 void bma456_set_accel_deadzone(uint32_t deadzone_lsb) {
  s_accel_deadzone = deadzone_lsb;
  s_have_last_sample = false;
+  s_stream_have_last = false;
  if (s_bma456_ready) {
    ESP_LOGI(TAG, "accel deadzone %lu LSB", (unsigned long)deadzone_lsb);
  }
@@ -126,6 +131,23 @@ void bma456_set_accel_deadzone(uint32_t deadzone_lsb) {

 uint32_t bma456_get_accel_deadzone(void) { return s_accel_deadzone; }

+void bma456_accel_stream_reset_baseline(void) { s_stream_have_last = false; }
+
+bool bma456_accel_stream_take_if_changed(int16_t x, int16_t y, int16_t z) {
+  if (s_stream_have_last) {
+    if (axis_delta(x, s_stream_last_x) <= (int16_t)s_accel_deadzone &&
+        axis_delta(y, s_stream_last_y) <= (int16_t)s_accel_deadzone &&
+        axis_delta(z, s_stream_last_z) <= (int16_t)s_accel_deadzone) {
+      return false;
+    }
+  }
+  s_stream_last_x = x;
+  s_stream_last_y = y;
+  s_stream_last_z = z;
+  s_stream_have_last = true;
+  return true;
+}
+
 bool bma456_tap_config_valid(const bma456_tap_config_t *cfg) {
  if (cfg == NULL) {
    return false;
@@ -19,7 +19,7 @@
 /** Sensor interrupt line → ESP32 GPIO (active high, rising edge). */
 #define BMA456_INT_GPIO 10

-/** Software filter: log accel only when |axis - last| > deadzone (raw LSB). */
+/** Software filter: emit accel only when |axis - last| > deadzone (raw LSB). */
 #define BMA456_DEFAULT_ACCEL_DEADZONE 100u

 /**
@@ -81,6 +81,16 @@ bool bma456_is_ready(void);
 void bma456_set_accel_deadzone(uint32_t deadzone_lsb);
 uint32_t bma456_get_accel_deadzone(void);

+/**
+ * ESP-NOW stream filter: true if sample exceeds deadzone vs last streamed
+ * sample (or no baseline yet). On true, commits (x,y,z) as stream baseline.
+ * Independent of the log filter baseline.
+ */
+bool bma456_accel_stream_take_if_changed(int16_t x, int16_t y, int16_t z);
+
+/** Force next stream take to accept (call when accel stream is enabled). */
+void bma456_accel_stream_reset_baseline(void);
+
 /** Log accel when any axis moved more than deadzone since last reported sample. */
 void bma456_report_accel_if_changed(int16_t x, int16_t y, int16_t z);

@@ -1,4 +1,5 @@
 #include "client_registry.h"
+#include "pod_settings.h"
 #include "esp_log.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/idf_additions.h"
@@ -13,12 +14,68 @@ typedef struct {
 } client_slot_t;

 static client_slot_t s_clients[CLIENT_REGISTRY_MAX];
+static pod_id_map_t s_id_map;

 static struct {
  board_lipo_reading_t reading;
  uint32_t updated_at;
 } s_master_battery;

+static bool id_in_use(uint32_t id, const uint8_t *except_mac) {
+  for (uint8_t i = 0; i < s_id_map.count; i++) {
+    if (s_id_map.entries[i].id != id) {
+      continue;
+    }
+    if (except_mac != NULL &&
+        memcmp(s_id_map.entries[i].mac, except_mac, CLIENT_MAC_LEN) == 0) {
+      continue;
+    }
+    return true;
+  }
+  return false;
+}
+
+static int find_map_index(const uint8_t mac[CLIENT_MAC_LEN]) {
+  for (uint8_t i = 0; i < s_id_map.count; i++) {
+    if (memcmp(s_id_map.entries[i].mac, mac, CLIENT_MAC_LEN) == 0) {
+      return (int)i;
+    }
+  }
+  return -1;
+}
+
+static esp_err_t persist_id_map(void) {
+  return pod_settings_save_id_map(&s_id_map);
+}
+
+static uint32_t alloc_next_free_id(void) {
+  if (s_id_map.count >= POD_ID_MAP_MAX) {
+    return 0;
+  }
+  uint8_t start = s_id_map.next_id;
+  if (start < POD_CLIENT_ID_MIN) {
+    start = (uint8_t)POD_CLIENT_ID_MIN;
+  }
+  for (uint32_t n = 0; n < POD_CLIENT_ID_MAX; n++) {
+    uint32_t id = (uint32_t)start + n;
+    if (id > POD_CLIENT_ID_MAX) {
+      id = id - POD_CLIENT_ID_MAX;
+    }
+    if (id < POD_CLIENT_ID_MIN) {
+      continue;
+    }
+    if (!id_in_use(id, NULL)) {
+      uint32_t next = id + 1;
+      if (next > POD_CLIENT_ID_MAX) {
+        next = POD_CLIENT_ID_MIN;
+      }
+      s_id_map.next_id = (uint8_t)next;
+      return id;
+    }
+  }
+  return 0;
+}
+
 uint32_t client_registry_now_ms(void) {
  return (uint32_t)(xTaskGetTickCount() * portTICK_PERIOD_MS);
 }
@@ -86,6 +143,7 @@ static client_slot_t *alloc_slot(const uint8_t mac[CLIENT_MAC_LEN],
        static const bma456_tap_config_t k_tap_default = BMA456_TAP_CONFIG_DEFAULT;
        slot->info.tap_config = k_tap_default;
      }
+      slot->info.uv_protection_enabled = false;
      if (out_is_new != NULL) {
        *out_is_new = true;
      }
@@ -95,7 +153,84 @@ static client_slot_t *alloc_slot(const uint8_t mac[CLIENT_MAC_LEN],
  return NULL;
 }

-void client_registry_init(void) { memset(s_clients, 0, sizeof(s_clients)); }
+void client_registry_init(void) {
+  memset(s_clients, 0, sizeof(s_clients));
+  memset(&s_id_map, 0, sizeof(s_id_map));
+  s_id_map.next_id = (uint8_t)POD_CLIENT_ID_MIN;
+  (void)pod_settings_load_id_map(&s_id_map);
+  if (s_id_map.next_id < POD_CLIENT_ID_MIN) {
+    s_id_map.next_id = (uint8_t)POD_CLIENT_ID_MIN;
+  }
+}
+
+esp_err_t client_registry_assign_id(const uint8_t mac[CLIENT_MAC_LEN],
+                                    uint32_t preferred_id, uint32_t *out_id) {
+  if (mac == NULL || out_id == NULL) {
+    return ESP_ERR_INVALID_ARG;
+  }
+
+  int idx = find_map_index(mac);
+  if (idx >= 0) {
+    *out_id = s_id_map.entries[idx].id;
+    return ESP_OK;
+  }
+
+  uint32_t id = 0;
+  if (preferred_id >= POD_CLIENT_ID_MIN && preferred_id <= POD_CLIENT_ID_MAX &&
+      !id_in_use(preferred_id, mac)) {
+    id = preferred_id;
+  } else {
+    id = alloc_next_free_id();
+  }
+  if (id == 0) {
+    return ESP_ERR_NO_MEM;
+  }
+
+  if (s_id_map.count >= POD_ID_MAP_MAX) {
+    return ESP_ERR_NO_MEM;
+  }
+
+  memcpy(s_id_map.entries[s_id_map.count].mac, mac, CLIENT_MAC_LEN);
+  s_id_map.entries[s_id_map.count].id = (uint8_t)id;
+  s_id_map.count++;
+  if (id >= s_id_map.next_id) {
+    uint32_t next = id + 1;
+    if (next > POD_CLIENT_ID_MAX) {
+      next = POD_CLIENT_ID_MIN;
+    }
+    s_id_map.next_id = (uint8_t)next;
+  }
+
+  esp_err_t err = persist_id_map();
+  if (err != ESP_OK) {
+    ESP_LOGW(TAG, "persist id_map failed after assign id=%lu: %s",
+             (unsigned long)id, esp_err_to_name(err));
+  }
+  *out_id = id;
+  return ESP_OK;
+}
+
+void client_registry_clear_id_map(void) {
+  memset(s_clients, 0, sizeof(s_clients));
+  memset(&s_id_map, 0, sizeof(s_id_map));
+  s_id_map.next_id = (uint8_t)POD_CLIENT_ID_MIN;
+  esp_err_t err = pod_settings_clear_id_map();
+  if (err != ESP_OK) {
+    ESP_LOGW(TAG, "clear id_map NVS failed: %s", esp_err_to_name(err));
+  }
+  ESP_LOGI(TAG, "cleared id map and live registry");
+}
+
+void client_registry_mark_assign_sent(const uint8_t mac[CLIENT_MAC_LEN]) {
+  if (mac == NULL) {
+    return;
+  }
+  client_slot_t *slot = find_slot(mac);
+  if (slot == NULL) {
+    return;
+  }
+  slot->info.last_assign_sent_at = now_ms();
+}

 const client_info_t *
 client_registry_find_by_mac(const uint8_t mac[CLIENT_MAC_LEN]) {
@@ -171,18 +306,19 @@ void client_registry_check_timeouts(uint32_t timeout_ms) {
  uint32_t now = now_ms();

  for (size_t i = 0; i < CLIENT_REGISTRY_MAX; i++) {
-    if (!s_clients[i].active || !s_clients[i].info.available) {
+    if (!s_clients[i].active) {
      continue;
    }

    uint32_t elapsed = now - s_clients[i].info.last_success_ping_at;
    if (elapsed > timeout_ms) {
-      s_clients[i].info.available = false;
      char mac_str[18];
      mac_to_str(s_clients[i].info.mac, mac_str, sizeof(mac_str));
-      ESP_LOGW(TAG, "client inactive id=%lu mac=%s (no heartbeat for %lu ms)",
+      ESP_LOGW(TAG, "client dropped id=%lu mac=%s (no heartbeat for %lu ms)",
               (unsigned long)s_clients[i].info.id, mac_str,
               (unsigned long)elapsed);
+      s_clients[i].active = false;
+      memset(&s_clients[i].info, 0, sizeof(s_clients[i].info));
    }
  }
 }
@@ -300,6 +436,41 @@ size_t client_registry_set_tap_config_all(const bma456_tap_config_t *cfg) {
  return n;
 }

+esp_err_t client_registry_set_uv_protection(uint32_t client_id, bool enabled) {
+  for (size_t i = 0; i < CLIENT_REGISTRY_MAX; i++) {
+    if (s_clients[i].active && s_clients[i].info.id == client_id) {
+      s_clients[i].info.uv_protection_enabled = enabled;
+      return ESP_OK;
+    }
+  }
+  return ESP_ERR_NOT_FOUND;
+}
+
+esp_err_t client_registry_get_uv_protection(uint32_t client_id,
+                                            bool *enabled_out) {
+  if (enabled_out == NULL) {
+    return ESP_ERR_INVALID_ARG;
+  }
+  const client_info_t *info = client_registry_find_by_id(client_id);
+  if (info == NULL) {
+    return ESP_ERR_NOT_FOUND;
+  }
+  *enabled_out = info->uv_protection_enabled;
+  return ESP_OK;
+}
+
+size_t client_registry_set_uv_protection_all(bool enabled) {
+  size_t n = 0;
+  for (size_t i = 0; i < CLIENT_REGISTRY_MAX; i++) {
+    if (!s_clients[i].active) {
+      continue;
+    }
+    s_clients[i].info.uv_protection_enabled = enabled;
+    n++;
+  }
+  return n;
+}
+
 static void clear_client_accel(client_slot_t *slot) {
  if (slot == NULL) {
    return;
@@ -552,24 +723,15 @@ esp_err_t client_registry_update_battery(const uint8_t mac[CLIENT_MAC_LEN],

  client_slot_t *slot = find_slot(mac);
  if (slot == NULL) {
-    bool is_new = false;
-    esp_err_t err = client_registry_upsert(mac, slave_id, 0, true, false, &is_new);
-    if (err != ESP_OK) {
-      return err;
-    }
-    slot = find_slot(mac);
-    if (slot == NULL) {
-      return ESP_ERR_NOT_FOUND;
-    }
-    ESP_LOGI(TAG, "battery auto-registered id=%lu (report before heartbeat)",
-             (unsigned long)slave_id);
+    /* Ids are assigned on presence only; ignore early battery reports. */
+    return ESP_ERR_NOT_FOUND;
  }

-  if (slot->info.id != slave_id) {
-    ESP_LOGW(TAG, "battery id %lu → %lu for mac %02x:…:%02x",
+  if (slave_id != 0 && slot->info.id != slave_id) {
+    ESP_LOGW(TAG, "battery id mismatch slot=%lu report=%lu mac %02x:…:%02x",
             (unsigned long)slot->info.id, (unsigned long)slave_id, mac[0],
             mac[5]);
-    slot->info.id = slave_id;
+    return ESP_ERR_INVALID_STATE;
  }

  slot->info.lipo1_valid = lipo1_valid;
@@ -47,14 +47,35 @@ typedef struct {
  uint32_t lipo1_mv;
  uint32_t lipo2_mv;
  uint32_t battery_updated_at;
+  /** Master cache: software UV protection enabled on slave (default false). */
+  bool uv_protection_enabled;
+  /** Master: last ESPNOW_ASSIGN_ID send time (rate-limit resends). */
+  uint32_t last_assign_sent_at;
 } client_info_t;

 #define CLIENT_REGISTRY_DEFAULT_ACCEL_DEADZONE 100u
 /** Tap events older than this are discarded (matches accel stream interval). */
-#define CLIENT_REGISTRY_TAP_MAX_AGE_MS 16u
+#define CLIENT_REGISTRY_TAP_MAX_AGE_MS 10u

 void client_registry_init(void);

+/**
+ * Assign a stable logical id for mac (1…255). Honors preferred if free or
+ * already owned by mac; otherwise allocates the next free id. Persists the
+ * master id map to NVS.
+ */
+esp_err_t client_registry_assign_id(const uint8_t mac[CLIENT_MAC_LEN],
+                                    uint32_t preferred_id, uint32_t *out_id);
+
+/**
+ * Clear NVS id map, RAM map, and all live registry slots. Does not notify
+ * slaves (caller sends CLEAR_ID_BINDING).
+ */
+void client_registry_clear_id_map(void);
+
+/** Record that ASSIGN_ID was sent to this MAC (for resend rate limiting). */
+void client_registry_mark_assign_sent(const uint8_t mac[CLIENT_MAC_LEN]);
+
 /** Milliseconds since boot (same clock as stored ping timestamps). */
 uint32_t client_registry_now_ms(void);

@@ -75,7 +96,10 @@ esp_err_t client_registry_heartbeat(const uint8_t mac[CLIENT_MAC_LEN],
                                    uint32_t id, uint32_t version, bool used,
                                    bool *out_is_new, bool *out_reactivated);

-/** Mark clients inactive when last_success_ping_at is older than timeout_ms. */
+/**
+ * Drop live registry slots whose last_success_ping_at is older than
+ * timeout_ms (NVS id map unchanged). Offline clients disappear from CLIENT_INFO.
+ */
 void client_registry_check_timeouts(uint32_t timeout_ms);

 size_t client_registry_count(void);
@@ -97,6 +121,11 @@ esp_err_t client_registry_get_tap_config(uint32_t client_id,
                                         bma456_tap_config_t *cfg_out);
 size_t client_registry_set_tap_config_all(const bma456_tap_config_t *cfg);

+esp_err_t client_registry_set_uv_protection(uint32_t client_id, bool enabled);
+esp_err_t client_registry_get_uv_protection(uint32_t client_id,
+                                            bool *enabled_out);
+size_t client_registry_set_uv_protection_all(bool enabled);
+
 /** Store latest accel sample from a slave (matched by sender MAC). */
 esp_err_t client_registry_update_accel(const uint8_t mac[CLIENT_MAC_LEN],
                                       uint32_t slave_id, int16_t x, int16_t y,
@@ -1,5 +1,6 @@
 #include "client_registry.h"
 #include "cmd_accel_stream.h"
+#include "ble_stream.h"
 #include "esp_log.h"
 #include "esp_now_comm.h"
 #include "uart_cmd.h"
@@ -50,6 +51,10 @@ static void handle_accel_stream(const uint8_t *data, size_t len) {
  }

  if (req.write) {
+    if (req.period_ms != 0) {
+      ble_stream_set_period_ms(req.period_ms);
+    }
+
    if (req.all_clients) {
      size_t n = client_registry_set_accel_stream_all(req.enable);
      uint32_t sent = 0;
@@ -65,8 +70,10 @@ static void handle_accel_stream(const uint8_t *data, size_t len) {
        }
      }

-      ESP_LOGI(TAG, "accel stream %s for %u/%u slaves",
-               req.enable ? "on" : "off", (unsigned)sent, (unsigned)n);
+      ESP_LOGI(TAG, "accel stream %s for %u/%u slaves period_ms=%lu",
+               req.enable ? "on" : "off", (unsigned)sent, (unsigned)n,
+               (unsigned long)ble_stream_period_ms());
+      ble_stream_update();
      reply(req.enable, 0, sent > 0, sent);
      return;
    }
@@ -85,6 +92,7 @@ static void handle_accel_stream(const uint8_t *data, size_t len) {
    }

    esp_err_t err = push_stream_to_slave(client, req.enable);
+    ble_stream_update();
    reply(req.enable, req.client_id, err == ESP_OK, err == ESP_OK ? 1u : 0u);
    return;
  }
@@ -0,0 +1,118 @@
+#include "cmd_battery_uv.h"
+#include "client_registry.h"
+#include "esp_log.h"
+#include "esp_now_comm.h"
+#include "pod_settings.h"
+#include "uart_cmd.h"
+
+static const char *TAG = "[BATTERY_UV_CMD]";
+
+static void reply(uint32_t client_id, bool success, bool enabled, bool latched,
+                  uint32_t slaves_updated) {
+  alox_UartMessage response;
+  uart_cmd_init_response(&response, alox_MessageType_BATTERY_UV,
+                         alox_UartMessage_battery_uv_response_tag);
+  response.payload.battery_uv_response.client_id = client_id;
+  response.payload.battery_uv_response.success = success;
+  response.payload.battery_uv_response.enabled = enabled;
+  response.payload.battery_uv_response.latched = latched;
+  response.payload.battery_uv_response.slaves_updated = slaves_updated;
+  uart_cmd_send(&response, TAG);
+}
+
+static esp_err_t apply_local_uv(bool enabled) {
+  esp_err_t err = pod_settings_set_uv_enabled(enabled);
+  if (err != ESP_OK) {
+    return err;
+  }
+  if (!enabled) {
+    (void)pod_settings_clear_uv_latched();
+  }
+  return ESP_OK;
+}
+
+static esp_err_t push_uv_to_slave(const client_info_t *client, bool enabled) {
+  if (client == NULL) {
+    return ESP_ERR_INVALID_ARG;
+  }
+  esp_err_t err = client_registry_set_uv_protection(client->id, enabled);
+  if (err != ESP_OK) {
+    return err;
+  }
+  return esp_now_comm_send_battery_uv(client->mac, client->id, enabled);
+}
+
+static void handle_battery_uv(const uint8_t *data, size_t len) {
+  alox_UartMessage uart_msg;
+  alox_BatteryUvRequest req = alox_BatteryUvRequest_init_zero;
+
+  if (uart_cmd_decode(data, len, &uart_msg) != ESP_OK) {
+    ESP_LOGW(TAG, "decode failed");
+    reply(0, false, pod_settings_is_uv_enabled(), pod_settings_is_uv_latched(),
+          0);
+    return;
+  }
+
+  const alox_BatteryUvRequest *req_ptr = UART_CMD_REQ(
+      &uart_msg, alox_UartMessage_battery_uv_request_tag, battery_uv_request);
+  if (req_ptr != NULL) {
+    req = *req_ptr;
+  }
+
+  if (req.write) {
+    if (req.all_clients) {
+      (void)client_registry_set_uv_protection_all(req.enabled);
+      uint32_t sent = 0;
+      for (size_t i = 0; i < client_registry_count(); i++) {
+        const client_info_t *client = client_registry_at(i);
+        if (client == NULL) {
+          continue;
+        }
+        if (esp_now_comm_send_battery_uv(client->mac, client->id,
+                                         req.enabled) == ESP_OK) {
+          sent++;
+        }
+      }
+
+      bool local_ok = apply_local_uv(req.enabled) == ESP_OK;
+      ESP_LOGI(TAG, "UV protection %s local=%d slaves=%u",
+               req.enabled ? "on" : "off", local_ok, (unsigned)sent);
+      reply(0, local_ok || sent > 0, req.enabled,
+            pod_settings_is_uv_latched(), sent);
+      return;
+    }
+
+    if (req.client_id == 0) {
+      esp_err_t err = apply_local_uv(req.enabled);
+      reply(0, err == ESP_OK, pod_settings_is_uv_enabled(),
+            pod_settings_is_uv_latched(), 0);
+      return;
+    }
+
+    const client_info_t *client = client_registry_find_by_id(req.client_id);
+    if (client == NULL) {
+      ESP_LOGW(TAG, "client id %lu not found", (unsigned long)req.client_id);
+      reply(req.client_id, false, req.enabled, false, 0);
+      return;
+    }
+
+    esp_err_t err = push_uv_to_slave(client, req.enabled);
+    reply(req.client_id, err == ESP_OK, req.enabled, false,
+          err == ESP_OK ? 1 : 0);
+    return;
+  }
+
+  if (req.all_clients || req.client_id == 0) {
+    reply(0, true, pod_settings_is_uv_enabled(), pod_settings_is_uv_latched(),
+          0);
+    return;
+  }
+
+  bool enabled = true;
+  esp_err_t err = client_registry_get_uv_protection(req.client_id, &enabled);
+  reply(req.client_id, err == ESP_OK, enabled, false, 0);
+}
+
+void cmd_battery_uv_register(void) {
+  uart_cmd_register(alox_MessageType_BATTERY_UV, handle_battery_uv);
+}
@@ -0,0 +1,6 @@
+#ifndef CMD_BATTERY_UV_H
+#define CMD_BATTERY_UV_H
+
+void cmd_battery_uv_register(void);
+
+#endif
@@ -0,0 +1,35 @@
+#include "cmd_client_id_map_reset.h"
+#include "esp_log.h"
+#include "esp_now_comm.h"
+#include "esp_now_core.h"
+#include "uart_cmd.h"
+
+static const char *TAG = "[ID_MAP_RESET]";
+
+static void reply(bool success) {
+  alox_UartMessage response;
+  uart_cmd_init_response(&response, alox_MessageType_CLIENT_ID_MAP_RESET,
+                         alox_UartMessage_client_id_map_reset_response_tag);
+  response.payload.client_id_map_reset_response.success = success;
+  uart_cmd_send(&response, TAG);
+}
+
+static void handle_client_id_map_reset(const uint8_t *data, size_t len) {
+  (void)data;
+  (void)len;
+
+  esp_err_t err;
+  if (esp_now_core_is_master()) {
+    ESP_LOGI(TAG, "reset master id map + notify online slaves");
+    err = esp_now_comm_reset_client_id_map();
+  } else {
+    ESP_LOGI(TAG, "clear local slave id binding");
+    err = esp_now_comm_clear_local_id_binding();
+  }
+  reply(err == ESP_OK);
+}
+
+void cmd_client_id_map_reset_register(void) {
+  uart_cmd_register(alox_MessageType_CLIENT_ID_MAP_RESET,
+                    handle_client_id_map_reset);
+}
@@ -0,0 +1,3 @@
+#pragma once
+
+void cmd_client_id_map_reset_register(void);
@@ -31,6 +31,7 @@ static bool encode_clients_list(pb_ostream_t *stream, const pb_field_t *field,
    proto.tap_notify_single = client->tap_notify_single;
    proto.tap_notify_double = client->tap_notify_double;
    proto.tap_notify_triple = client->tap_notify_triple;
+    proto.uv_protection_enabled = client->uv_protection_enabled;
    proto.mac.funcs.encode = uart_cmd_encode_bytes;
    proto.mac.arg = &mac;

@@ -63,6 +63,10 @@ static const char *message_type_name(uint16_t id) {
    return "SET_LOG_LEVEL";
  case alox_MessageType_TAP_CONFIG:
    return "TAP_CONFIG";
+  case alox_MessageType_CLIENT_ID_MAP_RESET:
+    return "CLIENT_ID_MAP_RESET";
+  case alox_MessageType_INPUT_SEND_MODE:
+    return "INPUT_SEND_MODE";
  default:
    return "UNKNOWN";
  }
@@ -111,8 +115,13 @@ void vCmdDispatcherTask(void *param) {
      bool handled = false;
      for (int i = 0; i < handler_count; i++) {
        if (handlers[i].msg_id == msg.msg_id) {
-          ESP_LOGI(TAG, "trigger command %s (0x%02x)", message_type_name(msg.msg_id),
-                   (unsigned)msg.msg_id);
+          if (msg.msg_id == (uint16_t)alox_MessageType_OTA_PAYLOAD) {
+            ESP_LOGD(TAG, "trigger command %s (0x%02x)",
+                     message_type_name(msg.msg_id), (unsigned)msg.msg_id);
+          } else {
+            ESP_LOGI(TAG, "trigger command %s (0x%02x)",
+                     message_type_name(msg.msg_id), (unsigned)msg.msg_id);
+          }
          handlers[i].callback(msg.payload, msg.len);
          handled = true;
          break;
@@ -0,0 +1,109 @@
+#include "cmd_input_send_mode.h"
+#include "client_registry.h"
+#include "esp_log.h"
+#include "esp_now_comm.h"
+#include "uart_cmd.h"
+
+static const char *TAG = "[INPUT_SEND]";
+
+/** Last mode pushed from host (GET returns this; slaves may lag until re-push). */
+static alox_InputSendMode s_mode = alox_InputSendMode_INPUT_SEND_BEST_EFFORT;
+
+static bool valid_mode(alox_InputSendMode mode) {
+  return mode <= alox_InputSendMode_INPUT_SEND_RELIABLE;
+}
+
+static void reply(bool success, alox_InputSendMode mode, uint32_t client_id,
+                  uint32_t slaves_updated) {
+  alox_UartMessage response;
+  uart_cmd_init_response(&response, alox_MessageType_INPUT_SEND_MODE,
+                         alox_UartMessage_input_send_mode_response_tag);
+  response.payload.input_send_mode_response.success = success;
+  response.payload.input_send_mode_response.mode = mode;
+  response.payload.input_send_mode_response.client_id = client_id;
+  response.payload.input_send_mode_response.slaves_updated = slaves_updated;
+  uart_cmd_send(&response, TAG);
+}
+
+static esp_err_t push_mode_to_slave(const client_info_t *client,
+                                    alox_InputSendMode mode) {
+  if (client == NULL) {
+    return ESP_ERR_INVALID_ARG;
+  }
+  return esp_now_comm_send_input_send_mode(client->mac, client->id,
+                                           (uint32_t)mode);
+}
+
+static void handle_input_send_mode(const uint8_t *data, size_t len) {
+  alox_UartMessage uart_msg;
+  alox_InputSendModeRequest req = alox_InputSendModeRequest_init_zero;
+
+  if (len > 0) {
+    if (uart_cmd_decode(data, len, &uart_msg) != ESP_OK) {
+      ESP_LOGW(TAG, "decode failed");
+      reply(false, s_mode, 0, 0);
+      return;
+    }
+    const alox_InputSendModeRequest *req_ptr =
+        UART_CMD_REQ(&uart_msg, alox_UartMessage_input_send_mode_request_tag,
+                     input_send_mode_request);
+    if (req_ptr == NULL) {
+      ESP_LOGW(TAG, "missing input_send_mode_request");
+      reply(false, s_mode, 0, 0);
+      return;
+    }
+    req = *req_ptr;
+  }
+
+  if (req.write) {
+    if (!valid_mode(req.mode)) {
+      ESP_LOGW(TAG, "invalid mode %lu", (unsigned long)req.mode);
+      reply(false, s_mode, req.client_id, 0);
+      return;
+    }
+
+    if (req.all_clients) {
+      uint32_t sent = 0;
+      for (size_t i = 0; i < client_registry_count(); i++) {
+        const client_info_t *client = client_registry_at(i);
+        if (client == NULL) {
+          continue;
+        }
+        if (push_mode_to_slave(client, req.mode) == ESP_OK) {
+          sent++;
+        }
+      }
+      s_mode = req.mode;
+      ESP_LOGI(TAG, "input send mode %lu for %u slaves",
+               (unsigned long)req.mode, (unsigned)sent);
+      reply(sent > 0 || client_registry_count() == 0, req.mode, 0, sent);
+      return;
+    }
+
+    if (req.client_id == 0) {
+      ESP_LOGW(TAG, "client_id required (or all_clients)");
+      reply(false, req.mode, 0, 0);
+      return;
+    }
+
+    const client_info_t *client = client_registry_find_by_id(req.client_id);
+    if (client == NULL) {
+      ESP_LOGW(TAG, "client id %lu not found", (unsigned long)req.client_id);
+      reply(false, req.mode, req.client_id, 0);
+      return;
+    }
+
+    esp_err_t err = push_mode_to_slave(client, req.mode);
+    if (err == ESP_OK) {
+      s_mode = req.mode;
+    }
+    reply(err == ESP_OK, req.mode, req.client_id, err == ESP_OK ? 1u : 0u);
+    return;
+  }
+
+  reply(true, s_mode, 0, 0);
+}
+
+void cmd_input_send_mode_register(void) {
+  uart_cmd_register(alox_MessageType_INPUT_SEND_MODE, handle_input_send_mode);
+}
@@ -0,0 +1,6 @@
+#ifndef CMD_INPUT_SEND_MODE_H
+#define CMD_INPUT_SEND_MODE_H
+
+void cmd_input_send_mode_register(void);
+
+#endif
@@ -2,10 +2,13 @@
 #include "led_ring.h"
 #include "ota_espnow.h"
 #include "ota_uart.h"
+#include "pod_reboot.h"
 #include "uart_cmd.h"
 #include "esp_log.h"
+#include "esp_timer.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/idf_additions.h"
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

@@ -13,6 +16,8 @@ static const char *TAG = "[OTA_CMD]";

 #define OTA_PREPARE_STACK 8192
 #define OTA_PREPARE_PRIO 5
+/* Block buffer is static .bss; stack is for nested EspNowMessage + encode buf +
+ * esp_now_send path. 4 KiB overflowed; 8 KiB matches the pre-crash budget. */
 #define OTA_DIST_STACK 8192
 #define OTA_DIST_PRIO 5

@@ -29,6 +34,14 @@ typedef struct {
  uint32_t written;
  int slot;
 } ota_dist_job_t;
+
+/** Cap host DISTRIBUTING pushes (BLE notifies compete with ESP-NOW OTA TX). */
+#define OTA_DIST_NOTIFY_MIN_US (250 * 1000ull)
+
+static int64_t s_last_dist_agg_us;
+static int64_t s_last_dist_slave_us;
+static uint32_t s_last_dist_agg_bytes = UINT32_MAX;
+
 static void send_ota_status(ota_uart_status_t status, uint32_t err_code) {
  alox_UartMessage response;
  uart_cmd_init_response(&response, alox_MessageType_OTA_STATUS,
@@ -61,15 +74,33 @@ static void send_ota_distributing(uint32_t kind, uint32_t bytes_done,

 static void ota_dist_aggregate(uint32_t bytes_done, uint32_t total_bytes,
                               uint8_t slave_count) {
-  (void)slave_count;
  led_ring_show_ota_progress(bytes_done, total_bytes, OTA_LED_ESPNOW_TX_R,
                             OTA_LED_ESPNOW_TX_G, OTA_LED_ESPNOW_TX_B);
+
+  const int64_t now = esp_timer_get_time();
+  const bool first = (s_last_dist_agg_bytes == UINT32_MAX);
+  const bool boundary =
+      (bytes_done == 0) || (total_bytes > 0 && bytes_done >= total_bytes);
+  const bool paced =
+      (now - s_last_dist_agg_us) >= (int64_t)OTA_DIST_NOTIFY_MIN_US;
+  if (!first && !boundary && !paced) {
+    return;
+  }
+  s_last_dist_agg_us = now;
+  s_last_dist_agg_bytes = bytes_done;
  send_ota_distributing(OTA_DIST_AGGREGATE, bytes_done, (uint32_t)slave_count);
 }

 static void ota_dist_per_slave(uint32_t slave_id, uint32_t bytes_done,
                             uint32_t total_bytes) {
  (void)total_bytes;
+  /* Host also polls OTA_SLAVE_PROGRESS; keep per-slave pushes rare on BLE. */
+  const int64_t now = esp_timer_get_time();
+  if ((now - s_last_dist_slave_us) < (int64_t)OTA_DIST_NOTIFY_MIN_US &&
+      bytes_done > 0) {
+    return;
+  }
+  s_last_dist_slave_us = now;
  send_ota_distributing(OTA_DIST_PER_SLAVE, bytes_done, slave_id);
 }

@@ -177,8 +208,10 @@ static void handle_ota_payload(const uint8_t *data, size_t len) {

  ota_feed_result_t r = ota_uart_feed_chunk(req_ptr->seq, req_ptr->data.bytes,
                                            req_ptr->data.size);
+  /* Gap: keep session; host block-retries from the last ACK boundary. */
  if (r == OTA_FEED_SEQ_GAP) {
-    send_ota_failed(16);
+    ESP_LOGW(TAG, "OTA_PAYLOAD seq gap (got %lu) — waiting for host retry",
+             (unsigned long)req_ptr->seq);
    return;
  }
  if (r == OTA_FEED_SEQ_DUP) {
@@ -220,6 +253,9 @@ static void ota_distribute_task(void *param) {

  led_ring_show_ota_progress(0, image_size, OTA_LED_ESPNOW_TX_R, OTA_LED_ESPNOW_TX_G,
                             OTA_LED_ESPNOW_TX_B);
+  s_last_dist_agg_us = 0;
+  s_last_dist_slave_us = 0;
+  s_last_dist_agg_bytes = UINT32_MAX;
  send_ota_distributing(OTA_DIST_AGGREGATE, 0, 0);

  esp_err_t err = ota_espnow_distribute(part, image_size, &s_dist_progress);
@@ -255,6 +291,8 @@ static void ota_distribute_task(void *param) {

  led_ring_ota_success();
  free(job);
+  /* Host already got SUCCESS; reboot onto the staged image. */
+  pod_schedule_restart();
  vTaskDelete(NULL);
 }

@@ -308,6 +346,10 @@ static void ota_start_espnow_task(void *param) {
    return;
  }

+  s_last_dist_agg_us = 0;
+  s_last_dist_slave_us = 0;
+  s_last_dist_agg_bytes = UINT32_MAX;
+
  esp_err_t err = ota_espnow_distribute(part, image_size, &s_dist_progress);
  if (err != ESP_OK) {
    send_ota_failed(42);
@@ -330,6 +372,7 @@ static void ota_start_espnow_task(void *param) {
  response.payload.ota_status.error = 0;
  uart_cmd_send(&response, TAG);
  led_ring_ota_success();
+  pod_schedule_restart();
  vTaskDelete(NULL);
 }

@@ -13,6 +13,10 @@ esp_err_t esp_now_comm_init(const app_config_t *config);
 esp_err_t esp_now_comm_send_accel_stream(const uint8_t mac[CLIENT_MAC_LEN],
                                         uint32_t client_id, bool enable);

+/** Master: set accel/tap ESP-NOW send path on one slave (InputSendMode). */
+esp_err_t esp_now_comm_send_input_send_mode(const uint8_t mac[CLIENT_MAC_LEN],
+                                            uint32_t client_id, uint32_t mode);
+
 /** Master: configure tap notify flags on one slave. */
 esp_err_t esp_now_comm_send_tap_notify(const uint8_t mac[CLIENT_MAC_LEN],
                                       uint32_t client_id, bool single,
@@ -27,6 +31,10 @@ esp_err_t esp_now_comm_send_tap_config(const uint8_t mac[CLIENT_MAC_LEN],
                                       uint32_t client_id,
                                       const bma456_tap_config_t *cfg);

+/** Master: unicast software UV protection enable to one slave. */
+esp_err_t esp_now_comm_send_battery_uv(const uint8_t mac[CLIENT_MAC_LEN],
+                                       uint32_t client_id, bool enabled);
+
 /** Master: send minimal unicast test payload to verify master→slave path. */
 esp_err_t esp_now_comm_send_unicast_test(const uint8_t mac[CLIENT_MAC_LEN],
                                         uint32_t seq);
@@ -55,6 +63,22 @@ esp_err_t esp_now_comm_send_led_ring(const uint8_t mac[CLIENT_MAC_LEN],
 esp_err_t esp_now_comm_send_restart(const uint8_t mac[CLIENT_MAC_LEN],
                                    uint32_t client_id);

+/** Master: tell slave its assigned logical client id. */
+esp_err_t esp_now_comm_send_assign_id(const uint8_t mac[CLIENT_MAC_LEN],
+                                      uint32_t assigned_id);
+
+/** Master: tell slave to forget persisted master/id binding. */
+esp_err_t esp_now_comm_send_clear_id_binding(const uint8_t mac[CLIENT_MAC_LEN]);
+
+/**
+ * Master: clear NVS id map + live registry and unicast CLEAR_ID_BINDING to
+ * every currently registered live slave (snapshot before clear).
+ */
+esp_err_t esp_now_comm_reset_client_id_map(void);
+
+/** Slave: clear local NVS master/id binding (UART reset on slave). */
+esp_err_t esp_now_comm_clear_local_id_binding(void);
+
 /** Master → slave OTA (unicast). */
 esp_err_t esp_now_comm_send_ota_start(const uint8_t mac[CLIENT_MAC_LEN],
                                      uint32_t total_size);
@@ -204,10 +204,11 @@ esp_err_t esp_now_core_send_reliable(const uint8_t *dest_mac,
                                ESPNOW_SEND_RETRY_DELAY_MS, true);
 }

-esp_err_t esp_now_core_send_fast(const uint8_t *dest_mac,
-                                 const alox_EspNowMessage *msg) {
+static esp_err_t send_fast_internal(const uint8_t *dest_mac,
+                                    const alox_EspNowMessage *msg,
+                                    bool quiet) {
  if (s_send_lock == NULL ||
-      xSemaphoreTake(s_send_lock, pdMS_TO_TICKS(5000)) != pdTRUE) {
+      xSemaphoreTake(s_send_lock, pdMS_TO_TICKS(5)) != pdTRUE) {
    return ESP_ERR_TIMEOUT;
  }

@@ -216,14 +217,18 @@ esp_err_t esp_now_core_send_fast(const uint8_t *dest_mac,

  esp_err_t err = esp_now_proto_encode(msg, buf, sizeof(buf), &len);
  if (err != ESP_OK) {
-    ESP_LOGW(TAG, "encode failed");
+    if (!quiet) {
+      ESP_LOGW(TAG, "encode failed");
+    }
    xSemaphoreGive(s_send_lock);
    return err;
  }

  if (len > ESP_NOW_MAX_DATA_LEN) {
-    ESP_LOGW(TAG, "encoded len %u > ESP-NOW max %u", (unsigned)len,
-             (unsigned)ESP_NOW_MAX_DATA_LEN);
+    if (!quiet) {
+      ESP_LOGW(TAG, "encoded len %u > ESP-NOW max %u", (unsigned)len,
+               (unsigned)ESP_NOW_MAX_DATA_LEN);
+    }
    xSemaphoreGive(s_send_lock);
    return ESP_ERR_INVALID_SIZE;
  }
@@ -234,7 +239,7 @@ esp_err_t esp_now_core_send_fast(const uint8_t *dest_mac,
  }

  err = esp_now_send(dest_mac, buf, len);
-  if (err != ESP_OK) {
+  if (err != ESP_OK && !quiet) {
    ESP_LOGW(TAG, "send type=%u failed: %s", (unsigned)msg->type,
             esp_err_to_name(err));
  }
@@ -242,6 +247,16 @@ esp_err_t esp_now_core_send_fast(const uint8_t *dest_mac,
  return err;
 }

+esp_err_t esp_now_core_send_fast(const uint8_t *dest_mac,
+                                 const alox_EspNowMessage *msg) {
+  return send_fast_internal(dest_mac, msg, false);
+}
+
+esp_err_t esp_now_core_send_best_effort(const uint8_t *dest_mac,
+                                        const alox_EspNowMessage *msg) {
+  return send_fast_internal(dest_mac, msg, true);
+}
+
 esp_err_t esp_now_core_send(const uint8_t *dest_mac,
                            const alox_EspNowMessage *msg) {
  return esp_now_core_send_wait(dest_mac, msg);
@@ -265,6 +280,14 @@ esp_err_t esp_now_core_init_radio(uint8_t channel) {
  ESP_ERROR_CHECK(esp_wifi_set_ps(WIFI_PS_NONE));
  ESP_ERROR_CHECK(esp_wifi_set_channel(channel, WIFI_SECOND_CHAN_NONE));

+  /* WiFi task stack is tiny; ERROR logs from pp/coex (e.g. under BLE+ESP-NOW
+   * OTA) call esp_log_write on that stack and can overflow → panic reboot.
+   * Mute after esp_wifi_init (which resets the wifi tag to default level). */
+  esp_log_level_set("wifi", ESP_LOG_NONE);
+  esp_log_level_set("wifi_init", ESP_LOG_WARN);
+  esp_log_level_set("coex", ESP_LOG_WARN);
+  esp_log_level_set("NimBLE", ESP_LOG_WARN);
+
  ESP_ERROR_CHECK(esp_read_mac(s_own_mac, ESP_MAC_WIFI_STA));
  s_wifi_channel = channel;
  return ESP_OK;
@@ -26,6 +26,12 @@ esp_err_t esp_now_core_send(const uint8_t *dest_mac,
 /** Like send but does not wait for esp_now send-done (lower latency). */
 esp_err_t esp_now_core_send_fast(const uint8_t *dest_mac,
                                 const alox_EspNowMessage *msg);
+/**
+ * Fire-and-forget without failure logs — for high-rate gaming input
+ * (accel/tap) where drops are expected under load.
+ */
+esp_err_t esp_now_core_send_best_effort(const uint8_t *dest_mac,
+                                        const alox_EspNowMessage *msg);
 esp_err_t esp_now_core_send_wait(const uint8_t *dest_mac,
                                 const alox_EspNowMessage *msg);
 /** OTA payloads: wait for send-done with extra NO_MEM backoff (queue drain). */
@@ -22,6 +22,8 @@ static const uint8_t ESPNOW_BCAST[ESP_NOW_ETH_ALEN] = {0xff, 0xff, 0xff,
 #define ESPNOW_CLIENT_TIMEOUT_MS                                               \
  (ESPNOW_HEARTBEAT_INTERVAL_MS * ESPNOW_HEARTBEAT_MISS_COUNT)
 #define ESPNOW_BATTERY_INTERVAL_MS 30000
+/** Min gap between ASSIGN_ID resends when slave has not yet echoed the id. */
+#define ESPNOW_ASSIGN_RESEND_MS 2000u

 static const char *TAG = "[ESPNOW_M]";

@@ -35,6 +37,16 @@ static esp_err_t send_accel_stream(const uint8_t *dest_mac, uint32_t client_id,
  return esp_now_core_send(dest_mac, &msg);
 }

+static esp_err_t send_input_send_mode(const uint8_t *dest_mac,
+                                      uint32_t client_id, uint32_t mode) {
+  alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
+  msg.type = alox_EspNowMessageType_ESPNOW_SET_INPUT_SEND_MODE;
+  msg.which_payload = alox_EspNowMessage_input_send_mode_tag;
+  msg.payload.input_send_mode.client_id = client_id;
+  msg.payload.input_send_mode.mode = mode;
+  return esp_now_core_send(dest_mac, &msg);
+}
+
 static esp_err_t send_accel_deadzone(const uint8_t *dest_mac, uint32_t client_id,
                                     uint32_t deadzone) {
  alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
@@ -63,6 +75,16 @@ static esp_err_t send_tap_config(const uint8_t *dest_mac, uint32_t client_id,
  return esp_now_core_send(dest_mac, &msg);
 }

+static esp_err_t send_battery_uv(const uint8_t *dest_mac, uint32_t client_id,
+                                 bool enabled) {
+  alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
+  msg.type = alox_EspNowMessageType_ESPNOW_SET_BATTERY_UV;
+  msg.which_payload = alox_EspNowMessage_battery_uv_tag;
+  msg.payload.battery_uv.client_id = client_id;
+  msg.payload.battery_uv.enabled = enabled;
+  return esp_now_core_send(dest_mac, &msg);
+}
+
 static esp_err_t send_unicast_test(const uint8_t *dest_mac, uint32_t seq) {
  alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
  msg.type = alox_EspNowMessageType_ESPNOW_UNICAST_TEST;
@@ -168,6 +190,22 @@ static esp_err_t send_restart(const uint8_t *dest_mac, uint32_t client_id) {
  return esp_now_core_send(dest_mac, &msg);
 }

+static esp_err_t send_assign_id(const uint8_t *dest_mac, uint32_t assigned_id) {
+  alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
+  msg.type = alox_EspNowMessageType_ESPNOW_ASSIGN_ID;
+  msg.which_payload = alox_EspNowMessage_assign_id_tag;
+  msg.payload.assign_id.assigned_id = assigned_id;
+  /* Fast path: avoid 8× NO_MEM retries blocking the shared send lock. */
+  return esp_now_core_send_fast(dest_mac, &msg);
+}
+
+static esp_err_t send_clear_id_binding(const uint8_t *dest_mac) {
+  alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
+  msg.type = alox_EspNowMessageType_ESPNOW_CLEAR_ID_BINDING;
+  msg.which_payload = alox_EspNowMessage_clear_id_binding_tag;
+  return esp_now_core_send_fast(dest_mac, &msg);
+}
+
 static esp_err_t send_tap_notify(const uint8_t *dest_mac, uint32_t client_id,
                                 bool single, bool double_tap, bool triple) {
  alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
@@ -251,6 +289,70 @@ esp_err_t esp_now_comm_send_restart(const uint8_t mac[CLIENT_MAC_LEN],
  return err;
 }

+esp_err_t esp_now_comm_send_assign_id(const uint8_t mac[CLIENT_MAC_LEN],
+                                      uint32_t assigned_id) {
+  if (mac == NULL || !esp_now_core_is_master()) {
+    return ESP_ERR_INVALID_STATE;
+  }
+  char mac_str[18];
+  esp_now_core_mac_to_str(mac, mac_str, sizeof(mac_str));
+  esp_err_t err = send_assign_id(mac, assigned_id);
+  if (err == ESP_OK) {
+    ESP_LOGI(TAG, "unicast ASSIGN_ID %lu to %s", (unsigned long)assigned_id,
+             mac_str);
+  } else {
+    ESP_LOGW(TAG, "unicast ASSIGN_ID to %s failed: %s", mac_str,
+             esp_err_to_name(err));
+  }
+  return err;
+}
+
+esp_err_t esp_now_comm_send_clear_id_binding(const uint8_t mac[CLIENT_MAC_LEN]) {
+  if (mac == NULL || !esp_now_core_is_master()) {
+    return ESP_ERR_INVALID_STATE;
+  }
+  char mac_str[18];
+  esp_now_core_mac_to_str(mac, mac_str, sizeof(mac_str));
+  esp_err_t err = send_clear_id_binding(mac);
+  if (err == ESP_OK) {
+    ESP_LOGI(TAG, "unicast CLEAR_ID_BINDING to %s", mac_str);
+  } else {
+    ESP_LOGW(TAG, "unicast CLEAR_ID_BINDING to %s failed: %s", mac_str,
+             esp_err_to_name(err));
+  }
+  return err;
+}
+
+esp_err_t esp_now_comm_reset_client_id_map(void) {
+  if (!esp_now_core_is_master()) {
+    return ESP_ERR_INVALID_STATE;
+  }
+
+  uint8_t macs[CLIENT_REGISTRY_MAX][CLIENT_MAC_LEN];
+  size_t n = client_registry_count();
+  if (n > CLIENT_REGISTRY_MAX) {
+    n = CLIENT_REGISTRY_MAX;
+  }
+  size_t copied = 0;
+  for (size_t i = 0; i < n; i++) {
+    const client_info_t *c = client_registry_at(i);
+    if (c == NULL) {
+      continue;
+    }
+    memcpy(macs[copied], c->mac, CLIENT_MAC_LEN);
+    copied++;
+  }
+
+  client_registry_clear_id_map();
+
+  for (size_t i = 0; i < copied; i++) {
+    (void)esp_now_comm_send_clear_id_binding(macs[i]);
+  }
+  ESP_LOGI(TAG, "client id map reset; notified %u slave(s)", (unsigned)copied);
+  return ESP_OK;
+}
+
+
 esp_err_t esp_now_comm_send_find_me(const uint8_t mac[CLIENT_MAC_LEN],
                                    uint32_t client_id) {
  if (mac == NULL || !esp_now_core_is_master()) {
@@ -364,6 +466,24 @@ esp_err_t esp_now_comm_send_accel_stream(const uint8_t mac[CLIENT_MAC_LEN],
  return err;
 }

+esp_err_t esp_now_comm_send_input_send_mode(const uint8_t mac[CLIENT_MAC_LEN],
+                                            uint32_t client_id, uint32_t mode) {
+  if (mac == NULL || !esp_now_core_is_master()) {
+    return ESP_ERR_INVALID_STATE;
+  }
+  char mac_str[18];
+  esp_now_core_mac_to_str(mac, mac_str, sizeof(mac_str));
+  esp_err_t err = send_input_send_mode(mac, client_id, mode);
+  if (err == ESP_OK) {
+    ESP_LOGI(TAG, "unicast SET_INPUT_SEND_MODE to %s: mode=%lu client_id=%lu",
+             mac_str, (unsigned long)mode, (unsigned long)client_id);
+  } else {
+    ESP_LOGW(TAG, "unicast SET_INPUT_SEND_MODE to %s failed: %s", mac_str,
+             esp_err_to_name(err));
+  }
+  return err;
+}
+
 esp_err_t esp_now_comm_send_tap_notify(const uint8_t mac[CLIENT_MAC_LEN],
                                       uint32_t client_id, bool single,
                                       bool double_tap, bool triple) {
@@ -427,6 +547,24 @@ esp_err_t esp_now_comm_send_tap_config(const uint8_t mac[CLIENT_MAC_LEN],
  return err;
 }

+esp_err_t esp_now_comm_send_battery_uv(const uint8_t mac[CLIENT_MAC_LEN],
+                                       uint32_t client_id, bool enabled) {
+  if (mac == NULL || !esp_now_core_is_master()) {
+    return ESP_ERR_INVALID_STATE;
+  }
+  char mac_str[18];
+  esp_now_core_mac_to_str(mac, mac_str, sizeof(mac_str));
+  esp_err_t err = send_battery_uv(mac, client_id, enabled);
+  if (err == ESP_OK) {
+    ESP_LOGI(TAG, "unicast SET_BATTERY_UV to %s: enabled=%d client_id=%lu",
+             mac_str, enabled, (unsigned long)client_id);
+  } else {
+    ESP_LOGW(TAG, "unicast SET_BATTERY_UV to %s failed: %s", mac_str,
+             esp_err_to_name(err));
+  }
+  return err;
+}
+
 static void handle_accel_sample(const uint8_t mac[CLIENT_MAC_LEN],
                                const alox_EspNowAccelSample *sample) {
  if (sample == NULL) {
@@ -435,11 +573,13 @@ static void handle_accel_sample(const uint8_t mac[CLIENT_MAC_LEN],
  esp_err_t err = client_registry_update_accel(
      mac, sample->slave_id, (int16_t)sample->x, (int16_t)sample->y,
      (int16_t)sample->z);
-  if (err == ESP_ERR_NOT_FOUND) {
+  if (err == ESP_ERR_NOT_FOUND || err == ESP_ERR_INVALID_STATE) {
+    // Unknown MAC, or stream already off (in-flight samples after disable).
    return;
  }
  if (err != ESP_OK) {
-    ESP_LOGW(TAG, "accel sample id mismatch from %02x:…:%02x", mac[0], mac[5]);
+    ESP_LOGW(TAG, "accel sample id mismatch from %02x:…:%02x (slave_id=%lu)",
+             mac[0], mac[5], (unsigned long)sample->slave_id);
  }
 }

@@ -493,25 +633,53 @@ static void handle_client_presence(const alox_EspNowSlavePresence *presence,

  esp_now_core_ensure_peer(mac);

+  uint32_t assigned_id = 0;
+  esp_err_t err =
+      client_registry_assign_id(mac, presence->slave_id, &assigned_id);
+  if (err != ESP_OK) {
+    ESP_LOGW(TAG, "id assign failed: %s", esp_err_to_name(err));
+    return;
+  }
+
  bool is_new = false;
  bool reactivated = false;
-  esp_err_t err = client_registry_heartbeat(
-      mac, presence->slave_id, presence->version, presence->used, &is_new,
-      &reactivated);
+  err = client_registry_heartbeat(mac, assigned_id, presence->version,
+                                  presence->used, &is_new, &reactivated);
  if (err != ESP_OK) {
    ESP_LOGW(TAG, "client registry full");
    return;
  }

+  /*
+   * Send ASSIGN when new/rejoined, or when slave has not echoed the id yet.
+   * Rate-limit mismatch resends so failed assigns do not flood ESP-NOW buffers
+   * (ESP_ERR_ESPNOW_NO_MEM) and block other unicast traffic.
+   */
+  const bool needs_assign =
+      is_new || reactivated || presence->slave_id != assigned_id;
+  if (needs_assign) {
+    const client_info_t *client = client_registry_find_by_mac(mac);
+    const bool due =
+        is_new || reactivated || client == NULL ||
+        client->last_assign_sent_at == 0 ||
+        client_registry_ms_since(client->last_assign_sent_at) >=
+            ESPNOW_ASSIGN_RESEND_MS;
+    if (due) {
+      if (esp_now_comm_send_assign_id(mac, assigned_id) == ESP_OK) {
+        client_registry_mark_assign_sent(mac);
+      }
+    }
+  }
+
  char mac_str[18];
  esp_now_core_mac_to_str(mac, mac_str, sizeof(mac_str));
  if (is_new) {
-    ESP_LOGI(TAG, "client registered id=%lu mac=%s ver=%lu",
-             (unsigned long)presence->slave_id, mac_str,
-             (unsigned long)presence->version);
+    ESP_LOGI(TAG, "client registered id=%lu (preferred=%lu) mac=%s ver=%lu",
+             (unsigned long)assigned_id, (unsigned long)presence->slave_id,
+             mac_str, (unsigned long)presence->version);
  } else if (reactivated) {
    ESP_LOGI(TAG, "client reconnected id=%lu mac=%s",
-             (unsigned long)presence->slave_id, mac_str);
+             (unsigned long)assigned_id, mac_str);
  }
 }

@@ -590,6 +758,7 @@ static void discover_task(void *param) {

  while (1) {
    msg.payload.discover.master_ota_pending = ota_session_busy();
+    msg.payload.discover.master_time_us = (uint64_t)esp_timer_get_time();
    if (!ota_espnow_distribution_active()) {
      esp_now_core_send_fast(ESPNOW_BCAST, &msg);
    }
@@ -611,7 +780,11 @@ static void monitor_task(void *param) {

  while (1) {
    vTaskDelay(pdMS_TO_TICKS(ESPNOW_HEARTBEAT_INTERVAL_MS));
-    client_registry_check_timeouts(ESPNOW_CLIENT_TIMEOUT_MS);
+    /* During ESP-NOW OTA dist the recv_cb drops heartbeats; do not wipe
+     * targets from the registry while they are still being updated. */
+    if (!ota_espnow_distribution_active()) {
+      client_registry_check_timeouts(ESPNOW_CLIENT_TIMEOUT_MS);
+    }

    uint32_t t = esp_now_core_now_ms();
    if (t - last_local_battery_ms >= ESPNOW_BATTERY_INTERVAL_MS) {
@@ -11,8 +11,10 @@
 #include "pod_reboot.h"
 #include "pod_settings.h"
 #include "esp_log.h"
+#include "esp_timer.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/idf_additions.h"
+#include "freertos/semphr.h"
 #include <string.h>

 #ifndef POWERPOD_FW_VERSION
@@ -23,7 +25,17 @@
 #define SLAVE_MASTER_LOST_MS (ESPNOW_HEARTBEAT_INTERVAL_MS * 5)
 /** While master or slave OTA is in progress (discover may be sparse). */
 #define SLAVE_MASTER_OTA_GRACE_MS 300000u
-#define ESPNOW_ACCEL_INTERVAL_MS 16
+/**
+ * Accel stream poll cadence (10 ms frame). TX only when sample exceeds the
+ * BMA456 deadzone vs last sent sample. TX path is selectable (INPUT_SEND_MODE).
+ * With master Discover.master_time_us, slaves phase into 1 ms slots:
+ * offset_ms = (assigned_id - 1) % 8. Slot wait uses esp_timer (FreeRTOS tick
+ * is 10 ms — too coarse for intra-frame offsets).
+ */
+#define ESPNOW_ACCEL_INTERVAL_MS 10
+#define ESPNOW_ACCEL_INTERVAL_US (ESPNOW_ACCEL_INTERVAL_MS * 1000ull)
+#define ESPNOW_ACCEL_SLOT_COUNT 8u
+#define ESPNOW_ACCEL_SLOT_US 1000ull
 #define ESPNOW_BATTERY_INTERVAL_MS 30000
 #define SLAVE_BATTERY_AFTER_JOIN_MS 150

@@ -35,8 +47,21 @@ static bool s_accel_stream_enabled;
 static bool s_tap_notify_single;
 static bool s_tap_notify_double;
 static bool s_tap_notify_triple;
+/** Accel/tap TX path; default matches historical best-effort gaming input. */
+static uint32_t s_input_send_mode =
+    (uint32_t)alox_InputSendMode_INPUT_SEND_BEST_EFFORT;
 static uint8_t s_master_mac[ESP_NOW_ETH_ALEN];
 static uint32_t s_last_discover_ms;
+/** Logical id assigned by current/last master (0 = unbound). */
+static uint32_t s_assigned_id;
+/** Master MAC from NVS binding (may differ from current s_master_mac). */
+static uint8_t s_bound_master_mac[ESP_NOW_ETH_ALEN];
+static bool s_has_binding;
+/** estimated_master_us = esp_timer_get_time() + s_master_offset_us */
+static int64_t s_master_offset_us;
+static bool s_master_time_synced;
+static SemaphoreHandle_t s_accel_slot_sem;
+static esp_timer_handle_t s_accel_slot_timer;

 typedef enum {
  SLAVE_TX_SLAVE_INFO = 1,
@@ -45,15 +70,94 @@ typedef enum {

 static QueueHandle_t s_tx_queue;

+static void queue_tx(slave_tx_op_t op);
+static uint32_t accel_slot_offset_us(void);
+
 static bool from_joined_master(const uint8_t *master_mac) {
  return s_joined && esp_now_core_mac_equal(master_mac, s_master_mac);
 }

+static uint32_t my_client_id(void) { return s_assigned_id; }
+
+/** True when command targets this slave (0 = broadcast / any). */
+static bool client_id_matches(uint32_t client_id) {
+  if (client_id == 0) {
+    return true;
+  }
+  return s_assigned_id != 0 && client_id == s_assigned_id;
+}
+
+static uint32_t preferred_id_for_master(void) {
+  if (!s_has_binding || s_assigned_id == 0) {
+    return 0;
+  }
+  if (!s_joined || !esp_now_core_mac_equal(s_master_mac, s_bound_master_mac)) {
+    return 0;
+  }
+  return s_assigned_id;
+}
+
+static void load_id_binding(void) {
+  uint8_t mac[ESP_NOW_ETH_ALEN];
+  uint32_t id = 0;
+  s_has_binding = pod_settings_load_id_binding(mac, &id);
+  if (s_has_binding) {
+    memcpy(s_bound_master_mac, mac, ESP_NOW_ETH_ALEN);
+    s_assigned_id = id;
+    ESP_LOGI(TAG, "loaded id binding id=%lu master=%02x:…:%02x",
+             (unsigned long)id, mac[0], mac[5]);
+  } else {
+    memset(s_bound_master_mac, 0, sizeof(s_bound_master_mac));
+    s_assigned_id = 0;
+  }
+}
+
+static void apply_assigned_id(uint32_t assigned_id) {
+  if (assigned_id < POD_CLIENT_ID_MIN || assigned_id > POD_CLIENT_ID_MAX) {
+    ESP_LOGW(TAG, "ignore invalid assigned_id=%lu", (unsigned long)assigned_id);
+    return;
+  }
+  const bool same =
+      s_has_binding && s_assigned_id == assigned_id &&
+      esp_now_core_mac_equal(s_bound_master_mac, s_master_mac);
+  s_assigned_id = assigned_id;
+  memcpy(s_bound_master_mac, s_master_mac, ESP_NOW_ETH_ALEN);
+  s_has_binding = true;
+  if (same) {
+    return;
+  }
+  if (pod_settings_save_id_binding(s_master_mac, assigned_id) != ESP_OK) {
+    ESP_LOGW(TAG, "assigned id=%lu but NVS save failed",
+             (unsigned long)assigned_id);
+  } else {
+    ESP_LOGI(TAG, "assigned id=%lu (persisted, accel slot %lu us)",
+             (unsigned long)assigned_id,
+             (unsigned long)accel_slot_offset_us());
+  }
+  queue_tx(SLAVE_TX_BATTERY);
+}
+
+static void clear_id_binding_local(void) {
+  s_assigned_id = 0;
+  s_has_binding = false;
+  memset(s_bound_master_mac, 0, sizeof(s_bound_master_mac));
+  (void)pod_settings_clear_id_binding();
+  ESP_LOGI(TAG, "cleared local id binding");
+}
+
+esp_err_t esp_now_comm_clear_local_id_binding(void) {
+  if (esp_now_core_is_master()) {
+    return ESP_OK;
+  }
+  clear_id_binding_local();
+  return ESP_OK;
+}
+
 static void fill_presence(alox_EspNowSlavePresence *presence) {
  const uint8_t *own = esp_now_core_own_mac();
  presence->network = esp_now_core_network();
  presence->version = POWERPOD_FW_VERSION;
-  presence->slave_id = own[5];
+  presence->slave_id = preferred_id_for_master();
  presence->available = true;
  presence->used = false;
  esp_now_proto_setup_presence_encode(presence, own);
@@ -75,6 +179,21 @@ static void send_presence(const uint8_t *dest_mac, alox_EspNowMessageType type)
  esp_now_core_send(dest_mac, &msg);
 }

+static esp_err_t send_input_message(const uint8_t *dest_mac,
+                                    const alox_EspNowMessage *msg) {
+  switch (s_input_send_mode) {
+  case (uint32_t)alox_InputSendMode_INPUT_SEND_FAST:
+    return esp_now_core_send_fast(dest_mac, msg);
+  case (uint32_t)alox_InputSendMode_INPUT_SEND_WAIT:
+    return esp_now_core_send_wait(dest_mac, msg);
+  case (uint32_t)alox_InputSendMode_INPUT_SEND_RELIABLE:
+    return esp_now_core_send_reliable(dest_mac, msg);
+  case (uint32_t)alox_InputSendMode_INPUT_SEND_BEST_EFFORT:
+  default:
+    return esp_now_core_send_best_effort(dest_mac, msg);
+  }
+}
+
 static esp_err_t send_accel_sample(const uint8_t *dest_mac, uint32_t slave_id,
                                   int16_t x, int16_t y, int16_t z) {
  alox_EspNowMessage msg = alox_EspNowMessage_init_zero;
@@ -84,7 +203,7 @@ static esp_err_t send_accel_sample(const uint8_t *dest_mac, uint32_t slave_id,
  msg.payload.accel_sample.x = x;
  msg.payload.accel_sample.y = y;
  msg.payload.accel_sample.z = z;
-  return esp_now_core_send(dest_mac, &msg);
+  return send_input_message(dest_mac, &msg);
 }

 static esp_err_t send_tap_event(const uint8_t *dest_mac, uint32_t slave_id,
@@ -94,7 +213,7 @@ static esp_err_t send_tap_event(const uint8_t *dest_mac, uint32_t slave_id,
  msg.which_payload = alox_EspNowMessage_tap_event_tag;
  msg.payload.tap_event.slave_id = slave_id;
  msg.payload.tap_event.kind = kind;
-  return esp_now_core_send(dest_mac, &msg);
+  return send_input_message(dest_mac, &msg);
 }

 static esp_err_t send_battery_report(const uint8_t *dest_mac,
@@ -122,6 +241,8 @@ static void reset_join(void) {
  s_joined = false;
  s_master_ota_grace = false;
  s_accel_stream_enabled = false;
+  s_master_time_synced = false;
+  s_master_offset_us = 0;
  memset(s_master_mac, 0, sizeof(s_master_mac));
  s_last_discover_ms = 0;
  if (s_tx_queue != NULL) {
@@ -129,6 +250,66 @@ static void reset_join(void) {
  }
 }

+static void apply_master_time_sync(uint64_t master_time_us) {
+  if (master_time_us == 0) {
+    return;
+  }
+  s_master_offset_us = (int64_t)master_time_us - esp_timer_get_time();
+  s_master_time_synced = true;
+}
+
+static uint32_t accel_slot_offset_us(void) {
+  if (s_assigned_id == 0) {
+    return 0;
+  }
+  return (uint32_t)(((s_assigned_id - 1u) % ESPNOW_ACCEL_SLOT_COUNT) *
+                    ESPNOW_ACCEL_SLOT_US);
+}
+
+static void accel_slot_timer_cb(void *arg) {
+  (void)arg;
+  if (s_accel_slot_sem != NULL) {
+    xSemaphoreGive(s_accel_slot_sem);
+  }
+}
+
+/** Sleep until this slave's 1 ms slot in the shared 10 ms master frame. */
+static void wait_next_accel_slot(void) {
+  if (!s_master_time_synced || s_accel_slot_sem == NULL ||
+      s_accel_slot_timer == NULL) {
+    const TickType_t period_ticks = pdMS_TO_TICKS(ESPNOW_ACCEL_INTERVAL_MS);
+    vTaskDelay(period_ticks > 0 ? period_ticks : 1);
+    return;
+  }
+
+  const int64_t period_us = (int64_t)ESPNOW_ACCEL_INTERVAL_US;
+  const int64_t slot_us = (int64_t)accel_slot_offset_us();
+  const int64_t master_now = esp_timer_get_time() + s_master_offset_us;
+  int64_t phase = master_now % period_us;
+  if (phase < 0) {
+    phase += period_us;
+  }
+  int64_t wait_us = slot_us - phase;
+  if (wait_us < 200) {
+    /* Too close / already past — take the next frame. */
+    wait_us += period_us;
+  }
+
+  (void)xSemaphoreTake(s_accel_slot_sem, 0);
+  (void)esp_timer_stop(s_accel_slot_timer);
+  esp_err_t err = esp_timer_start_once(s_accel_slot_timer, (uint64_t)wait_us);
+  if (err != ESP_OK) {
+    vTaskDelay(pdMS_TO_TICKS(ESPNOW_ACCEL_INTERVAL_MS) > 0
+                   ? pdMS_TO_TICKS(ESPNOW_ACCEL_INTERVAL_MS)
+                   : 1);
+    return;
+  }
+  if (xSemaphoreTake(s_accel_slot_sem,
+                     pdMS_TO_TICKS(ESPNOW_ACCEL_INTERVAL_MS * 3)) != pdTRUE) {
+    (void)esp_timer_stop(s_accel_slot_timer);
+  }
+}
+
 static void queue_tx(slave_tx_op_t op) {
  if (s_tx_queue == NULL) {
    return;
@@ -139,7 +320,7 @@ static void queue_tx(slave_tx_op_t op) {
 }

 static void send_battery_to_master(void) {
-  if (!s_joined) {
+  if (!s_joined || s_assigned_id == 0) {
    return;
  }

@@ -147,7 +328,7 @@ static void send_battery_to_master(void) {
  board_input_read_lipo(&reading);

  alox_EspNowBatteryReport report = alox_EspNowBatteryReport_init_zero;
-  report.client_id = esp_now_core_own_mac()[5];
+  report.client_id = s_assigned_id;
  report.lipo1_valid = reading.lipo1_valid;
  report.lipo2_valid = reading.lipo2_valid;
  report.lipo1_mv = reading.lipo1_mv;
@@ -261,10 +442,7 @@ static void handle_echo_ping(const uint8_t *master_mac,

 static void handle_restart(const uint8_t *master_mac,
                           const alox_EspNowRestart *req) {
-  const uint8_t *own = esp_now_core_own_mac();
-  uint32_t my_id = own[5];
-
-  if (req->client_id != 0 && req->client_id != my_id) {
+  if (!client_id_matches(req->client_id)) {
    return;
  }
  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
@@ -273,14 +451,14 @@ static void handle_restart(const uint8_t *master_mac,

  char mac_str[18];
  esp_now_core_mac_to_str(master_mac, mac_str, sizeof(mac_str));
-  ESP_LOGI(TAG, "RESTART from master %s (id=%lu)", mac_str, (unsigned long)my_id);
+  ESP_LOGI(TAG, "RESTART from master %s (id=%lu)", mac_str,
+           (unsigned long)my_client_id());
  pod_schedule_restart();
 }

 static void handle_battery_query(const uint8_t *master_mac,
                                 const alox_EspNowBatteryQuery *query) {
-  uint32_t my_id = esp_now_core_own_mac()[5];
-  if (query->client_id != 0 && query->client_id != my_id) {
+  if (!client_id_matches(query->client_id)) {
    return;
  }
  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
@@ -291,8 +469,7 @@ static void handle_battery_query(const uint8_t *master_mac,

 static void handle_led_ring(const uint8_t *master_mac,
                            const alox_EspNowLedRing *msg) {
-  uint32_t my_id = esp_now_core_own_mac()[5];
-  if (msg->client_id != 0 && msg->client_id != my_id) {
+  if (!client_id_matches(msg->client_id)) {
    return;
  }
  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
@@ -313,13 +490,12 @@ static void handle_led_ring(const uint8_t *master_mac,
  char mac_str[18];
  esp_now_core_mac_to_str(master_mac, mac_str, sizeof(mac_str));
  ESP_LOGI(TAG, "LED_RING mode %lu from master %s (id=%lu)",
-           (unsigned long)req.mode, mac_str, (unsigned long)my_id);
+           (unsigned long)req.mode, mac_str, (unsigned long)my_client_id());
  cmd_led_ring_apply(&req);
 }

 static void handle_find_me(const uint8_t *master_mac, const alox_EspNowFindMe *req) {
-  uint32_t my_id = esp_now_core_own_mac()[5];
-  if (req->client_id != 0 && req->client_id != my_id) {
+  if (!client_id_matches(req->client_id)) {
    return;
  }
  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
@@ -327,30 +503,69 @@ static void handle_find_me(const uint8_t *master_mac, const alox_EspNowFindMe *r
  }
  char mac_str[18];
  esp_now_core_mac_to_str(master_mac, mac_str, sizeof(mac_str));
-  ESP_LOGI(TAG, "FIND_ME from master %s (id=%lu)", mac_str, (unsigned long)my_id);
+  ESP_LOGI(TAG, "FIND_ME from master %s (id=%lu)", mac_str,
+           (unsigned long)my_client_id());
  led_ring_find_me();
 }

 static void handle_accel_stream(const uint8_t *master_mac,
                                const alox_EspNowAccelStream *cfg) {
-  uint32_t my_id = esp_now_core_own_mac()[5];
-  if (cfg->client_id != 0 && cfg->client_id != my_id) {
+  if (!client_id_matches(cfg->client_id)) {
    return;
  }
  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
    return;
  }
  s_accel_stream_enabled = cfg->enable;
+  if (cfg->enable) {
+    bma456_accel_stream_reset_baseline();
+  }
  char mac_str[18];
  esp_now_core_mac_to_str(master_mac, mac_str, sizeof(mac_str));
  ESP_LOGI(TAG, "accel stream %s from master %s (id=%lu)",
-           cfg->enable ? "on" : "off", mac_str, (unsigned long)my_id);
+           cfg->enable ? "on" : "off", mac_str, (unsigned long)my_client_id());
+}
+
+static const char *input_send_mode_name(uint32_t mode) {
+  switch (mode) {
+  case (uint32_t)alox_InputSendMode_INPUT_SEND_BEST_EFFORT:
+    return "best_effort";
+  case (uint32_t)alox_InputSendMode_INPUT_SEND_FAST:
+    return "fast";
+  case (uint32_t)alox_InputSendMode_INPUT_SEND_WAIT:
+    return "wait";
+  case (uint32_t)alox_InputSendMode_INPUT_SEND_RELIABLE:
+    return "reliable";
+  default:
+    return "unknown";
+  }
+}
+
+static void handle_input_send_mode(const uint8_t *master_mac,
+                                   const alox_EspNowInputSendMode *cfg) {
+  if (!client_id_matches(cfg->client_id)) {
+    return;
+  }
+  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
+    return;
+  }
+  if (cfg->mode > (uint32_t)alox_InputSendMode_INPUT_SEND_RELIABLE) {
+    ESP_LOGW(TAG, "input send mode %lu invalid (id=%lu)",
+             (unsigned long)cfg->mode, (unsigned long)my_client_id());
+    return;
+  }
+  s_input_send_mode = cfg->mode;
+  char mac_str[18];
+  esp_now_core_mac_to_str(master_mac, mac_str, sizeof(mac_str));
+  ESP_LOGI(TAG, "input send mode %s (%lu) from master %s (id=%lu)",
+           input_send_mode_name(s_input_send_mode),
+           (unsigned long)s_input_send_mode, mac_str,
+           (unsigned long)my_client_id());
 }

 static void handle_tap_notify(const uint8_t *master_mac,
                              const alox_EspNowTapNotify *cfg) {
-  uint32_t my_id = esp_now_core_own_mac()[5];
-  if (cfg->client_id != 0 && cfg->client_id != my_id) {
+  if (!client_id_matches(cfg->client_id)) {
    return;
  }
  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
@@ -364,13 +579,12 @@ static void handle_tap_notify(const uint8_t *master_mac,
  ESP_LOGI(TAG,
           "tap notify single=%d double=%d triple=%d from master %s (id=%lu)",
           cfg->single, cfg->double_tap, cfg->triple, mac_str,
-           (unsigned long)my_id);
+           (unsigned long)my_client_id());
 }

 static void handle_accel_deadzone(const uint8_t *master_mac,
                                  const alox_EspNowAccelDeadzone *cfg) {
-  uint32_t my_id = esp_now_core_own_mac()[5];
-  if (cfg->client_id != 0 && cfg->client_id != my_id) {
+  if (!client_id_matches(cfg->client_id)) {
    return;
  }
  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
@@ -380,7 +594,7 @@ static void handle_accel_deadzone(const uint8_t *master_mac,
  esp_now_core_mac_to_str(master_mac, mac_str, sizeof(mac_str));
  ESP_LOGI(TAG,
           "accel deadzone from master %s: %lu LSB id=%lu (sensor %s)", mac_str,
-           (unsigned long)cfg->deadzone, (unsigned long)my_id,
+           (unsigned long)cfg->deadzone, (unsigned long)my_client_id(),
           bma456_is_ready() ? "ok" : "not installed");
  bma456_set_accel_deadzone(cfg->deadzone);
  if (pod_settings_save_accel_deadzone(cfg->deadzone) != ESP_OK) {
@@ -391,8 +605,7 @@ static void handle_accel_deadzone(const uint8_t *master_mac,

 static void handle_tap_config(const uint8_t *master_mac,
                              const alox_EspNowTapConfig *msg) {
-  uint32_t my_id = esp_now_core_own_mac()[5];
-  if (msg->client_id != 0 && msg->client_id != my_id) {
+  if (!client_id_matches(msg->client_id)) {
    return;
  }
  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
@@ -415,7 +628,7 @@ static void handle_tap_config(const uint8_t *master_mac,
  esp_now_core_mac_to_str(master_mac, mac_str, sizeof(mac_str));
  ESP_LOGI(TAG,
           "tap config from master %s: sens=%u id=%lu (sensor %s)", mac_str,
-           (unsigned)cfg.tap_sens_thres, (unsigned long)my_id,
+           (unsigned)cfg.tap_sens_thres, (unsigned long)my_client_id(),
           bma456_is_ready() ? "ok" : "not installed");

  if (!bma456_tap_config_valid(&cfg)) {
@@ -431,6 +644,45 @@ static void handle_tap_config(const uint8_t *master_mac,
  }
 }

+static void handle_battery_uv(const uint8_t *master_mac,
+                              const alox_EspNowBatteryUv *msg) {
+  if (!client_id_matches(msg->client_id)) {
+    return;
+  }
+  if (s_joined && !esp_now_core_mac_equal(master_mac, s_master_mac)) {
+    return;
+  }
+
+  char mac_str[18];
+  esp_now_core_mac_to_str(master_mac, mac_str, sizeof(mac_str));
+  ESP_LOGI(TAG, "UV protection %s from master %s (id=%lu)",
+           msg->enabled ? "enabled" : "disabled", mac_str,
+           (unsigned long)my_client_id());
+
+  if (pod_settings_set_uv_enabled(msg->enabled) != ESP_OK) {
+    ESP_LOGW(TAG, "UV enable save failed");
+    return;
+  }
+  if (!msg->enabled) {
+    (void)pod_settings_clear_uv_latched();
+  }
+}
+
+static void handle_assign_id(const uint8_t *master_mac,
+                             const alox_EspNowAssignId *msg) {
+  if (!from_joined_master(master_mac)) {
+    return;
+  }
+  apply_assigned_id(msg->assigned_id);
+}
+
+static void handle_clear_id_binding(const uint8_t *master_mac) {
+  if (!from_joined_master(master_mac)) {
+    return;
+  }
+  clear_id_binding_local();
+}
+
 static void handle_discover(const uint8_t *sender_mac,
                            const alox_EspNowDiscover *discover) {
  if (discover->network != esp_now_core_network()) {
@@ -444,6 +696,7 @@ static void handle_discover(const uint8_t *sender_mac,
      return;
    }
    s_master_ota_grace = discover->master_ota_pending;
+    apply_master_time_sync(discover->master_time_us);
    if ((now - s_last_discover_ms) <= slave_master_lost_ms()) {
      touch_master_presence(now);
      return;
@@ -459,16 +712,19 @@ static void handle_discover(const uint8_t *sender_mac,
  memcpy(s_master_mac, sender_mac, ESP_NOW_ETH_ALEN);
  s_joined = true;
  s_master_ota_grace = discover->master_ota_pending;
+  apply_master_time_sync(discover->master_time_us);
  touch_master_presence(now);
  esp_now_core_ensure_peer(sender_mac);

  char mac_str[18];
  esp_now_core_mac_to_str(sender_mac, mac_str, sizeof(mac_str));
-  ESP_LOGI(TAG, "joined network %u, master %s", (unsigned)discover->network,
-           mac_str);
+  ESP_LOGI(TAG, "joined network %u, master %s (preferred_id=%lu)",
+           (unsigned)discover->network, mac_str,
+           (unsigned long)preferred_id_for_master());

+  led_ring_connected_anim();
  queue_tx(SLAVE_TX_SLAVE_INFO);
-  queue_tx(SLAVE_TX_BATTERY);
+  /* Battery after ASSIGN_ID so reports carry the definitive client_id. */
 }

 static void check_master_timeout(void) {
@@ -489,14 +745,17 @@ static void check_master_timeout(void) {

 static void accel_stream_task(void *param) {
  (void)param;
-  const uint8_t *own = esp_now_core_own_mac();

-  ESP_LOGI(TAG, "accel stream task (interval %u ms)",
-           (unsigned)ESPNOW_ACCEL_INTERVAL_MS);
+  ESP_LOGI(TAG,
+           "accel stream task (poll %u ms, deadzone TX, %u×%llu us slots, "
+           "mode selectable)",
+           (unsigned)ESPNOW_ACCEL_INTERVAL_MS, (unsigned)ESPNOW_ACCEL_SLOT_COUNT,
+           (unsigned long long)ESPNOW_ACCEL_SLOT_US);

  while (1) {
-    vTaskDelay(pdMS_TO_TICKS(ESPNOW_ACCEL_INTERVAL_MS));
-    if (!s_joined || !s_accel_stream_enabled || !bma456_is_ready()) {
+    wait_next_accel_slot();
+    if (!s_joined || s_assigned_id == 0 || !s_accel_stream_enabled ||
+        !bma456_is_ready()) {
      continue;
    }
    int16_t x = 0;
@@ -505,13 +764,16 @@ static void accel_stream_task(void *param) {
    if (bma456_read_accel(&x, &y, &z) != ESP_OK) {
      continue;
    }
-    (void)send_accel_sample(s_master_mac, own[5], x, y, z);
+    if (!bma456_accel_stream_take_if_changed(x, y, z)) {
+      continue;
+    }
+    (void)send_accel_sample(s_master_mac, s_assigned_id, x, y, z);
  }
 }

 static void on_bma456_tap(bma456_tap_kind_t kind, void *ctx) {
  (void)ctx;
-  if (!s_joined) {
+  if (!s_joined || s_assigned_id == 0) {
    return;
  }
  bool enabled = false;
@@ -531,7 +793,7 @@ static void on_bma456_tap(bma456_tap_kind_t kind, void *ctx) {
  if (!enabled) {
    return;
  }
-  (void)send_tap_event(s_master_mac, esp_now_core_own_mac()[5], (uint32_t)kind);
+  (void)send_tap_event(s_master_mac, s_assigned_id, (uint32_t)kind);
 }

 static void heartbeat_task(void *param) {
@@ -624,6 +886,11 @@ void esp_now_slave_on_recv(const esp_now_recv_info_t *info, const uint8_t *data,
      handle_tap_config(info->src_addr, &msg.payload.tap_config);
    }
    break;
+  case alox_EspNowMessage_battery_uv_tag:
+    if (from_joined_master(info->src_addr)) {
+      handle_battery_uv(info->src_addr, &msg.payload.battery_uv);
+    }
+    break;
  case alox_EspNowMessage_accel_stream_tag:
    if (from_joined_master(info->src_addr)) {
      handle_accel_stream(info->src_addr, &msg.payload.accel_stream);
@@ -634,6 +901,11 @@ void esp_now_slave_on_recv(const esp_now_recv_info_t *info, const uint8_t *data,
      handle_tap_notify(info->src_addr, &msg.payload.tap_notify);
    }
    break;
+  case alox_EspNowMessage_input_send_mode_tag:
+    if (from_joined_master(info->src_addr)) {
+      handle_input_send_mode(info->src_addr, &msg.payload.input_send_mode);
+    }
+    break;
  case alox_EspNowMessage_battery_query_tag:
    if (from_joined_master(info->src_addr)) {
      handle_battery_query(info->src_addr, &msg.payload.battery_query);
@@ -654,6 +926,12 @@ void esp_now_slave_on_recv(const esp_now_recv_info_t *info, const uint8_t *data,
      handle_restart(info->src_addr, &msg.payload.restart);
    }
    break;
+  case alox_EspNowMessage_assign_id_tag:
+    handle_assign_id(info->src_addr, &msg.payload.assign_id);
+    break;
+  case alox_EspNowMessage_clear_id_binding_tag:
+    handle_clear_id_binding(info->src_addr);
+    break;
  case alox_EspNowMessage_ota_start_tag:
    if (from_joined_master(info->src_addr)) {
      ota_espnow_slave_on_start(info->src_addr, &msg.payload.ota_start);
@@ -668,6 +946,22 @@ void esp_now_slave_on_recv(const esp_now_recv_info_t *info, const uint8_t *data,

 esp_err_t esp_now_slave_start(void) {
  reset_join();
+  load_id_binding();
+
+  s_accel_slot_sem = xSemaphoreCreateBinary();
+  if (s_accel_slot_sem == NULL) {
+    ESP_LOGE(TAG, "failed to create accel slot semaphore");
+    return ESP_ERR_NO_MEM;
+  }
+  const esp_timer_create_args_t slot_timer_args = {
+      .callback = &accel_slot_timer_cb,
+      .name = "accel_slot",
+  };
+  esp_err_t terr = esp_timer_create(&slot_timer_args, &s_accel_slot_timer);
+  if (terr != ESP_OK) {
+    ESP_LOGE(TAG, "failed to create accel slot timer: %s", esp_err_to_name(terr));
+    return terr;
+  }

  s_tx_queue = xQueueCreate(4, sizeof(slave_tx_op_t));
  if (s_tx_queue == NULL) {
@@ -0,0 +1,106 @@
+#include "host_transport.h"
+#include "cmd_handler.h"
+#include "esp_log.h"
+#include "uart.h"
+#include "uart_messages.pb.h"
+#include <stdlib.h>
+#include <string.h>
+
+static const char *TAG = "[HOST]";
+
+static host_tx_fn_t s_tx_fn;
+static QueueHandle_t s_cmd_queue;
+static uart_packet_t s_rx_packet = {.state = STATE_START};
+static TickType_t s_last_byte_ticks;
+static const TickType_t s_rx_timeout_ticks = pdMS_TO_TICKS(50);
+
+void host_transport_set_tx(host_tx_fn_t tx_fn) { s_tx_fn = tx_fn; }
+
+void host_transport_set_cmd_queue(QueueHandle_t cmd_queue) {
+  s_cmd_queue = cmd_queue;
+}
+
+QueueHandle_t host_transport_cmd_queue(void) { return s_cmd_queue; }
+
+bool host_enqueue_packet(const uint8_t *payload, size_t len) {
+  if (s_cmd_queue == NULL || payload == NULL || len == 0) {
+    return false;
+  }
+
+  generic_msg_t msg = {
+      .msg_id = payload[0],
+      .len = len > 1 ? (len - 1) : 0,
+      .payload = NULL,
+  };
+
+  if (msg.len > 0) {
+    msg.payload = malloc(msg.len);
+    if (msg.payload == NULL) {
+      ESP_LOGE(TAG, "failed to allocate command payload");
+      return false;
+    }
+    memcpy(msg.payload, &payload[1], msg.len);
+  }
+
+  if (xQueueSend(s_cmd_queue, &msg, pdMS_TO_TICKS(500)) != pdPASS) {
+    free(msg.payload);
+    ESP_LOGW(TAG, "command queue full (cmd 0x%02x)", (unsigned)msg.msg_id);
+    return false;
+  }
+  return true;
+}
+
+esp_err_t host_send_framed(const uint8_t *payload, size_t len) {
+  if (payload == NULL || len == 0 || len > MAX_PAYLOAD_SIZE) {
+    return ESP_ERR_INVALID_ARG;
+  }
+  if (s_tx_fn == NULL) {
+    return ESP_ERR_INVALID_STATE;
+  }
+
+  uint8_t checksum = 0;
+  for (size_t i = 0; i < len; i++) {
+    checksum ^= payload[i];
+  }
+
+  uint8_t frame[UART_FRAME_OVERHEAD + MAX_PAYLOAD_SIZE];
+  size_t pos = 0;
+  frame[pos++] = START_MARKER;
+  frame[pos++] = (uint8_t)(len & 0xff);
+  frame[pos++] = (uint8_t)((len >> 8) & 0xff);
+  memcpy(&frame[pos], payload, len);
+  pos += len;
+  frame[pos++] = checksum;
+  frame[pos++] = STOP_MARKER;
+
+  return s_tx_fn(frame, pos);
+}
+
+void host_rx_bytes(const uint8_t *data, size_t len) {
+  if (data == NULL || len == 0) {
+    return;
+  }
+
+  TickType_t now = xTaskGetTickCount();
+  if (s_rx_packet.state != STATE_START &&
+      (now - s_last_byte_ticks) > s_rx_timeout_ticks) {
+    s_rx_packet.state = STATE_START;
+  }
+
+  for (size_t i = 0; i < len; i++) {
+    if (parse_uart_byte(data[i], &s_rx_packet)) {
+      uint8_t cmd =
+          s_rx_packet.len > 0 ? s_rx_packet.payload[0] : 0;
+      /* OTA payloads are high-rate; avoid INFO spam starving the dispatcher. */
+      if (cmd == (uint8_t)alox_MessageType_OTA_PAYLOAD) {
+        ESP_LOGD(TAG, "received message cmd=0x%02x len=%u", cmd,
+                 (unsigned)s_rx_packet.len);
+      } else {
+        ESP_LOGI(TAG, "received message cmd=0x%02x len=%u", cmd,
+                 (unsigned)s_rx_packet.len);
+      }
+      host_enqueue_packet(s_rx_packet.payload, s_rx_packet.len);
+    }
+  }
+  s_last_byte_ticks = now;
+}
@@ -0,0 +1,36 @@
+#ifndef HOST_TRANSPORT_H
+#define HOST_TRANSPORT_H
+
+#include "esp_err.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/queue.h"
+#include <stddef.h>
+#include <stdint.h>
+
+/** TX callback: send a complete framed packet (0xAA … 0xCC). */
+typedef esp_err_t (*host_tx_fn_t)(const uint8_t *frame, size_t frame_len);
+
+/** Set the active host TX backend (UART write or BLE notify). */
+void host_transport_set_tx(host_tx_fn_t tx_fn);
+
+/** Bind the shared cmd_queue used by uart_enqueue_packet / host RX. */
+void host_transport_set_cmd_queue(QueueHandle_t cmd_queue);
+
+QueueHandle_t host_transport_cmd_queue(void);
+
+/**
+ * Build AA|len_lo|len_hi|payload|xor|CC and send via the registered TX backend.
+ * Same semantics as uart_send_framed.
+ */
+esp_err_t host_send_framed(const uint8_t *payload, size_t len);
+
+/**
+ * Feed raw host RX bytes into the shared frame parser and enqueue complete
+ * packets onto the cmd_queue.
+ */
+void host_rx_bytes(const uint8_t *data, size_t len);
+
+/** Enqueue a completed uart_packet_t (payload[0]=msg type). */
+bool host_enqueue_packet(const uint8_t *payload, size_t len);
+
+#endif
@@ -27,6 +27,16 @@ static led_strip_handle_t led_ring;
 #define LED_RING_BATTERY_LOW_R 255
 #define LED_RING_BATTERY_LOW_G 0
 #define LED_RING_BATTERY_LOW_B 0
+/** Boot chase: all RING_LEDS within ~1 s. */
+#define LED_RING_BOOT_STEP_MS 10
+#define LED_RING_BOOT_R 255
+#define LED_RING_BOOT_G 255
+#define LED_RING_BOOT_B 255
+/** Connected: every other LED briefly blue. */
+#define LED_RING_CONNECTED_HOLD_MS 120
+#define LED_RING_CONNECTED_R 0
+#define LED_RING_CONNECTED_G 0
+#define LED_RING_CONNECTED_B 255

 static QueueHandle_t led_queue;
 static SemaphoreHandle_t s_battery_low_done;
@@ -166,6 +176,33 @@ void vTaskLedRing(void *pvParameters) {
          xSemaphoreGive(s_battery_low_done);
        }
        continue;
+      } else if (cmd.mode == LED_CMD_BOOT) {
+        uint8_t br = LED_RING_BOOT_R;
+        uint8_t bg = LED_RING_BOOT_G;
+        uint8_t bb = LED_RING_BOOT_B;
+        led_ring_scale_rgb(&br, &bg, &bb, LED_RING_DEFAULT_INTENSITY);
+        for (uint32_t i = 0; i < RING_LEDS; i++) {
+          led_strip_clear(led_ring);
+          led_strip_set_pixel(led_ring, i, br, bg, bb);
+          led_strip_refresh(led_ring);
+          vTaskDelay(pdMS_TO_TICKS(LED_RING_BOOT_STEP_MS));
+        }
+        led_strip_clear(led_ring);
+        led_strip_refresh(led_ring);
+        continue;
+      } else if (cmd.mode == LED_CMD_CONNECTED) {
+        uint8_t cr = LED_RING_CONNECTED_R;
+        uint8_t cg = LED_RING_CONNECTED_G;
+        uint8_t cb = LED_RING_CONNECTED_B;
+        led_ring_scale_rgb(&cr, &cg, &cb, LED_RING_DEFAULT_INTENSITY);
+        for (uint32_t i = 0; i < RING_LEDS; i += 2) {
+          led_strip_set_pixel(led_ring, i, cr, cg, cb);
+        }
+        led_strip_refresh(led_ring);
+        vTaskDelay(pdMS_TO_TICKS(LED_RING_CONNECTED_HOLD_MS));
+        led_strip_clear(led_ring);
+        led_strip_refresh(led_ring);
+        continue;
      }
      led_strip_refresh(led_ring);
    }
@@ -256,3 +293,13 @@ void led_ring_show_battery_low(void) {
  led_ring_send_command(&cmd);
  (void)xSemaphoreTake(s_battery_low_done, portMAX_DELAY);
 }
+
+void led_ring_boot_anim(void) {
+  led_command_t cmd = {.mode = LED_CMD_BOOT};
+  led_ring_send_command(&cmd);
+}
+
+void led_ring_connected_anim(void) {
+  led_command_t cmd = {.mode = LED_CMD_CONNECTED};
+  led_ring_send_command(&cmd);
+}
@@ -19,7 +19,9 @@ typedef enum {
  LED_CMD_PROGRESS,
  LED_CMD_BLINK,
  LED_CMD_FIND_ME,
-  LED_CMD_BATTERY_LOW
+  LED_CMD_BATTERY_LOW,
+  LED_CMD_BOOT,
+  LED_CMD_CONNECTED
 } led_mode_t;

 typedef struct {
@@ -53,4 +55,10 @@ void led_ring_find_me(void);
 /** First 4 LEDs red at ~10 % for 5 s, then off (blocking in LED task). */
 void led_ring_show_battery_low(void);

+/** Chase: each ring LED lights once in sequence (~1 s total). */
+void led_ring_boot_anim(void);
+
+/** Every second LED briefly blue (join / reconnect). */
+void led_ring_connected_anim(void);
+
 #endif
@@ -0,0 +1,60 @@
+#include "ota_confirm.h"
+#include "esp_log.h"
+#include "esp_ota_ops.h"
+#include "esp_partition.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+
+static const char *TAG = "[OTA_CONFIRM]";
+
+/** Long enough for early crash loops (e.g. assert in a worker task) to reboot
+ * before we cancel rollback; short enough that a follow-up OTA is not blocked
+ * for long (esp_ota_begin fails while PENDING_VERIFY). */
+#define OTA_CONFIRM_DELAY_MS 8000u
+
+static void ota_confirm_task(void *param) {
+  (void)param;
+
+  vTaskDelay(pdMS_TO_TICKS(OTA_CONFIRM_DELAY_MS));
+
+  const esp_partition_t *running = esp_ota_get_running_partition();
+  if (running == NULL) {
+    ESP_LOGW(TAG, "no running partition");
+    vTaskDelete(NULL);
+    return;
+  }
+
+  esp_ota_img_states_t state = ESP_OTA_IMG_UNDEFINED;
+  esp_err_t err = esp_ota_get_state_partition(running, &state);
+  if (err != ESP_OK) {
+    /* otadata missing / non-OTA slot — nothing to confirm. */
+    ESP_LOGI(TAG, "ota state unavailable (%s) — skip confirm",
+             esp_err_to_name(err));
+    vTaskDelete(NULL);
+    return;
+  }
+
+  if (state != ESP_OTA_IMG_PENDING_VERIFY) {
+    ESP_LOGI(TAG, "running %s state=%d — no pending verify", running->label,
+             (int)state);
+    vTaskDelete(NULL);
+    return;
+  }
+
+  err = esp_ota_mark_app_valid_cancel_rollback();
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "mark_app_valid failed: %s", esp_err_to_name(err));
+  } else {
+    ESP_LOGI(TAG, "app confirmed valid (%s) — rollback cancelled",
+             running->label);
+  }
+  vTaskDelete(NULL);
+}
+
+void ota_confirm_schedule(void) {
+  if (xTaskCreate(ota_confirm_task, "ota_confirm", 3072, NULL, 3, NULL) !=
+      pdPASS) {
+    ESP_LOGE(TAG, "failed to create confirm task — attempting immediate mark");
+    (void)esp_ota_mark_app_valid_cancel_rollback();
+  }
+}
@@ -0,0 +1,14 @@
+#ifndef OTA_CONFIRM_H
+#define OTA_CONFIRM_H
+
+/**
+ * After OTA with BOOTLOADER_APP_ROLLBACK_ENABLE, the new image boots as
+ * ESP_OTA_IMG_PENDING_VERIFY. If we crash/reset before confirming, the
+ * bootloader rolls back to the previous app on the next boot.
+ *
+ * Call once from app_main after init: schedules a delayed confirm so early
+ * panics (task asserts, etc.) still trigger rollback.
+ */
+void ota_confirm_schedule(void);
+
+#endif
@@ -10,6 +10,7 @@
 #include "freertos/event_groups.h"
 #include "freertos/idf_additions.h"
 #include "ota_uart.h"
+#include "pod_reboot.h"
 #include <string.h>

 static const char *TAG = "[OTA_ESPNOW]";
@@ -28,6 +29,12 @@ static const char *TAG = "[OTA_ESPNOW]";
 #define OTA_ST_SUCCESS 4u
 #define OTA_ST_FAILED 5u

+/**
+ * Event-group fail bit. FreeRTOS reserves the top 8 bits (assert if used);
+ * targets use bits 0..CLIENT_REGISTRY_MAX-1 (max 16).
+ */
+#define OTA_EG_FAIL_BIT (1u << 16)
+
 /** ESP-NOW OTA receive on slave (blue progress bar). */
 #define OTA_LED_ESPNOW_RX_R 0
 #define OTA_LED_ESPNOW_RX_G 0
@@ -58,6 +65,7 @@ typedef struct {
 static EventGroupHandle_t s_eg;
 static QueueHandle_t s_slave_work_queue;
 static bool s_distribution_active;
+static TaskHandle_t s_slave_prep_task;

 typedef struct {
  uint8_t count;
@@ -70,6 +78,9 @@ typedef struct {

 static ota_dist_t s_dist;

+/** Always-reserved flash block for ESP-NOW distribute (not on task stack). */
+static uint8_t s_ota_block_buf[OTA_UART_FLASH_BLOCK_SIZE];
+
 typedef struct {
  uint32_t client_id;
  uint32_t bytes_written;
@@ -164,14 +175,52 @@ static uint32_t all_target_bits(void) {
  return (1u << s_dist.count) - 1u;
 }

+static bool any_target_failed(void) {
+  for (uint8_t i = 0; i < s_prog.count; i++) {
+    if (s_prog.entries[i].status == OTA_ST_FAILED) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Wait until all want_bits are set, or OTA_EG_FAIL_BIT (slave FAILED).
+ * Returns true only when every target bit is set; false on fail or timeout.
+ *
+ * Wait only for *still missing* bits. Waiting on the full mask with "any bit"
+ * busy-spins after the first slave ACK (already-set bits make WaitBits return
+ * immediately) and starves IDLE → task_wdt.
+ */
 static bool wait_target_bits(uint32_t want_bits, uint32_t timeout_ms) {
  if (s_eg == NULL || want_bits == 0) {
    return false;
  }
-  EventBits_t got =
-      xEventGroupWaitBits(s_eg, want_bits, pdTRUE, pdTRUE,
-                          pdMS_TO_TICKS(timeout_ms));
-  return (got & want_bits) == want_bits;
+
+  const TickType_t start = xTaskGetTickCount();
+  const TickType_t timeout_ticks = pdMS_TO_TICKS(timeout_ms);
+
+  while (true) {
+    TickType_t elapsed = xTaskGetTickCount() - start;
+    if (elapsed >= timeout_ticks) {
+      return false;
+    }
+    TickType_t remain = timeout_ticks - elapsed;
+
+    EventBits_t have = xEventGroupGetBits(s_eg);
+    if (have & OTA_EG_FAIL_BIT) {
+      xEventGroupClearBits(s_eg, OTA_EG_FAIL_BIT);
+      return false;
+    }
+    if ((have & want_bits) == want_bits) {
+      xEventGroupClearBits(s_eg, want_bits);
+      return true;
+    }
+
+    EventBits_t missing = want_bits & ~have;
+    (void)xEventGroupWaitBits(s_eg, missing | OTA_EG_FAIL_BIT, pdFALSE,
+                               pdFALSE, remain);
+  }
 }

 static uint32_t block_ack_timeout_ms(void) {
@@ -272,9 +321,10 @@ static void process_slave_payload(const uint8_t master_mac[6],

  ota_feed_result_t r = ota_uart_feed_chunk(payload->seq, payload->data.bytes,
                                            payload->data.size);
+  /* Gap: keep session; master block-retries from the last ACK boundary. */
  if (r == OTA_FEED_SEQ_GAP) {
-    led_ring_ota_failed();
-    send_slave_status(master_mac, OTA_ST_FAILED, ota_uart_bytes_written(), 16);
+    ESP_LOGW(TAG, "ESP-NOW OTA seq gap (got %lu) — waiting for retry",
+             (unsigned long)payload->seq);
    return;
  }
  if (r == OTA_FEED_SEQ_DUP) {
@@ -329,6 +379,9 @@ static void process_slave_end(const uint8_t master_mac[6]) {
  led_ring_ota_success();
  ESP_LOGI(TAG, "slave OTA success (%lu bytes), reboot to run",
           (unsigned long)written);
+  /* Boot partition already set in ota_uart_finish(true); must reboot or we
+   * keep running the old image while the master expects the new one. */
+  pod_schedule_restart();
 }

 static void ota_slave_work_task(void *param) {
@@ -372,11 +425,21 @@ void ota_espnow_slave_init(void) {
  }
 }

+static void drain_slave_work_queue(void) {
+  if (s_slave_work_queue == NULL) {
+    return;
+  }
+  ota_slave_work_t junk;
+  while (xQueueReceive(s_slave_work_queue, &junk, 0) == pdTRUE) {
+  }
+}
+
 static void ota_slave_prepare_task(void *param) {
  uint32_t total_size = (uint32_t)(uintptr_t)param;
  uint8_t master_mac[6];

  if (!esp_now_comm_get_master_mac(master_mac)) {
+    s_slave_prep_task = NULL;
    vTaskDelete(NULL);
    return;
  }
@@ -386,6 +449,7 @@ static void ota_slave_prepare_task(void *param) {
  int slot = ota_uart_prepare(total_size);
  if (slot < 0) {
    send_slave_status(master_mac, OTA_ST_FAILED, 0, 1);
+    s_slave_prep_task = NULL;
    vTaskDelete(NULL);
    return;
  }
@@ -393,6 +457,7 @@ static void ota_slave_prepare_task(void *param) {
  send_slave_status(master_mac, OTA_ST_READY, 0, 0);
  led_ring_show_ota_progress(0, total_size, OTA_LED_ESPNOW_RX_R, OTA_LED_ESPNOW_RX_G,
                             OTA_LED_ESPNOW_RX_B);
+  s_slave_prep_task = NULL;
  vTaskDelete(NULL);
 }

@@ -404,14 +469,31 @@ void ota_espnow_slave_on_start(const uint8_t master_mac[6],

  ESP_LOGI(TAG, "ESP-NOW OTA_START (%lu bytes)", (unsigned long)start->total_size);

-  if (ota_uart_is_active()) {
-    queue_slave_status(master_mac, OTA_ST_FAILED, 0, 4);
+  /* Duplicate START while prepare task still running — ignore. */
+  if (s_slave_prep_task != NULL) {
+    ESP_LOGW(TAG, "OTA prepare already in flight — ignore START");
    return;
  }

+  if (ota_uart_is_active()) {
+    /* Same image, nothing written yet: sticky READY after master timeout /
+     * duplicate START — re-ACK instead of failing with err=4. */
+    if (ota_uart_total_size() == start->total_size &&
+        ota_uart_bytes_received() == 0) {
+      ESP_LOGI(TAG, "OTA already prepared for %lu bytes — re-send READY",
+               (unsigned long)start->total_size);
+      queue_slave_status(master_mac, OTA_ST_READY, 0, 0);
+      return;
+    }
+    ESP_LOGW(TAG, "aborting sticky OTA session for new START");
+    ota_uart_abort();
+    drain_slave_work_queue();
+  }
+
  if (xTaskCreate(ota_slave_prepare_task, "ota_esp_prep", OTA_ESPNOW_PREPARE_STACK,
                  (void *)(uintptr_t)start->total_size, OTA_ESPNOW_PREPARE_PRIO,
-                  NULL) != pdPASS) {
+                  &s_slave_prep_task) != pdPASS) {
+    s_slave_prep_task = NULL;
    queue_slave_status(master_mac, OTA_ST_FAILED, 0, 5);
  }
 }
@@ -479,6 +561,8 @@ void ota_espnow_master_on_status(const uint8_t slave_mac[6],
                    status->error);
    ESP_LOGW(TAG, "slave %lu OTA failed (err=%lu)",
             (unsigned long)s_dist.id[idx], (unsigned long)status->error);
+    /* Wake wait_target_bits so distribute aborts instead of waiting for READY. */
+    xEventGroupSetBits(s_eg, OTA_EG_FAIL_BIT);
    break;
  default:
    break;
@@ -527,7 +611,7 @@ static esp_err_t distribute_image(const esp_partition_t *partition,
  uint32_t target_mask = all_target_bits();
  esp_err_t err;

-  xEventGroupClearBits(s_eg, target_mask);
+  xEventGroupClearBits(s_eg, target_mask | OTA_EG_FAIL_BIT);
  for (uint8_t i = 0; i < s_dist.count; i++) {
    err = esp_now_comm_send_ota_start(s_dist.mac[i], size);
    if (err != ESP_OK) {
@@ -540,6 +624,12 @@ static esp_err_t distribute_image(const esp_partition_t *partition,
  }

  if (!wait_target_bits(target_mask, OTA_PREPARE_TIMEOUT_MS)) {
+    if (any_target_failed()) {
+      ESP_LOGE(TAG, "slave OTA failed during prepare");
+      prog_end();
+      s_distribution_active = false;
+      return ESP_FAIL;
+    }
    ESP_LOGE(TAG, "timeout waiting for slave OTA ready");
    prog_end();
    s_distribution_active = false;
@@ -551,7 +641,6 @@ static esp_err_t distribute_image(const esp_partition_t *partition,
    s_dist.progress.aggregate(0, size, s_dist.count);
  }

-  uint8_t block_buf[OTA_UART_FLASH_BLOCK_SIZE];
  uint32_t offset = 0;
  uint32_t seq = 0;

@@ -561,7 +650,7 @@ static esp_err_t distribute_image(const esp_partition_t *partition,
      block_len = OTA_UART_FLASH_BLOCK_SIZE;
    }

-    err = esp_partition_read(partition, offset, block_buf, block_len);
+    err = esp_partition_read(partition, offset, s_ota_block_buf, block_len);
    if (err != ESP_OK) {
      ESP_LOGE(TAG, "partition read @%lu failed: %s", (unsigned long)offset,
               esp_err_to_name(err));
@@ -591,7 +680,7 @@ static esp_err_t distribute_image(const esp_partition_t *partition,
                 (unsigned long)send_attempt,
                 (unsigned long)OTA_BLOCK_MAX_RETRIES);
      }
-      err = send_block_payloads(block_buf, block_len, &seq);
+      err = send_block_payloads(s_ota_block_buf, block_len, &seq);
      if (err == ESP_OK) {
        block_sent = true;
        break;
@@ -614,6 +703,13 @@ static esp_err_t distribute_image(const esp_partition_t *partition,
          acked = true;
          break;
        }
+        if (any_target_failed()) {
+          ESP_LOGE(TAG, "slave OTA failed during block @%lu",
+                   (unsigned long)s_dist.expected_bytes);
+          prog_end();
+          s_distribution_active = false;
+          return ESP_FAIL;
+        }
        log_missing_block_acks(s_dist.expected_bytes);
        if (attempt >= OTA_BLOCK_MAX_RETRIES) {
          break;
@@ -622,9 +718,9 @@ static esp_err_t distribute_image(const esp_partition_t *partition,
                 (unsigned long)s_dist.expected_bytes,
                 (unsigned long)(attempt + 1),
                 (unsigned long)OTA_BLOCK_MAX_RETRIES);
-        xEventGroupClearBits(s_eg, target_mask);
+        xEventGroupClearBits(s_eg, target_mask | OTA_EG_FAIL_BIT);
        seq = block_start_seq;
-        err = send_block_payloads(block_buf, block_len, &seq);
+        err = send_block_payloads(s_ota_block_buf, block_len, &seq);
        if (err != ESP_OK) {
          prog_end();
          s_distribution_active = false;
@@ -653,7 +749,7 @@ static esp_err_t distribute_image(const esp_partition_t *partition,
    }
  }

-  xEventGroupClearBits(s_eg, target_mask);
+  xEventGroupClearBits(s_eg, target_mask | OTA_EG_FAIL_BIT);
  for (uint8_t i = 0; i < s_dist.count; i++) {
    err = esp_now_comm_send_ota_end(s_dist.mac[i]);
    if (err != ESP_OK) {
@@ -664,6 +760,12 @@ static esp_err_t distribute_image(const esp_partition_t *partition,
  }

  if (!wait_target_bits(target_mask, OTA_END_TIMEOUT_MS)) {
+    if (any_target_failed()) {
+      ESP_LOGE(TAG, "slave OTA failed during end");
+      prog_end();
+      s_distribution_active = false;
+      return ESP_FAIL;
+    }
    ESP_LOGE(TAG, "timeout waiting for slave OTA success");
    prog_end();
    s_distribution_active = false;
@@ -97,7 +97,13 @@ int ota_uart_prepare(uint32_t total_size) {
  esp_ota_handle_t handle;
  esp_err_t err = esp_ota_begin(update_partition, OTA_SIZE_UNKNOWN, &handle);
  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "esp_ota_begin failed: %s", esp_err_to_name(err));
+    if (err == ESP_ERR_OTA_ROLLBACK_INVALID_STATE) {
+      ESP_LOGE(TAG,
+               "esp_ota_begin blocked: running app still PENDING_VERIFY "
+               "(wait for ota_confirm ~8 s after boot, or let rollback finish)");
+    } else {
+      ESP_LOGE(TAG, "esp_ota_begin failed: %s", esp_err_to_name(err));
+    }
    return -1;
  }

@@ -45,7 +45,9 @@ void ota_uart_abort(void);

 /**
 * Append up to 200 bytes with strict seq checking (0, 1, 2, …).
- * Duplicates (seq < expected) return OTA_FEED_SEQ_DUP; gaps return OTA_FEED_SEQ_GAP.
+ * Duplicates (seq < expected) return OTA_FEED_SEQ_DUP.
+ * Gaps (seq > expected) return OTA_FEED_SEQ_GAP without consuming — caller
+ * should keep the session so the host can retry the current flash block.
 */
 ota_feed_result_t ota_uart_feed_chunk(uint32_t seq, const uint8_t *data, size_t len);

@@ -9,10 +9,33 @@ static const char *TAG = "[SETTINGS]";
 static const char *NS = "powerpod";
 static const char *KEY_ACCEL_DZ = "accel_dz";
 static const char *KEY_UV_LATCH = "uv_latch";
+static const char *KEY_UV_EN = "uv_en";
 static const char *KEY_TAP_CFG = "tap_cfg";
+static const char *KEY_ID_MAP = "id_map";
+static const char *KEY_ID_BIND = "id_bind";

 #define ACCEL_DEADZONE_MAX 4095u
 #define TAP_CFG_NVS_VERSION 1u
+#define ID_MAP_NVS_VERSION 1u
+#define ID_BIND_NVS_VERSION 1u
+
+typedef struct __attribute__((packed)) {
+  uint8_t mac[POD_ID_MAC_LEN];
+  uint8_t id;
+} id_map_entry_nvs_t;
+
+typedef struct __attribute__((packed)) {
+  uint8_t version;
+  uint8_t next_id;
+  uint8_t count;
+  id_map_entry_nvs_t entries[POD_ID_MAP_MAX];
+} id_map_nvs_t;
+
+typedef struct __attribute__((packed)) {
+  uint8_t version;
+  uint8_t master_mac[POD_ID_MAC_LEN];
+  uint8_t assigned_id;
+} id_bind_nvs_t;

 /** Packed layout for NVS blob (stable across rebuilds). */
 typedef struct __attribute__((packed)) {
@@ -302,3 +325,280 @@ esp_err_t pod_settings_set_uv_latched(bool latched) {
 esp_err_t pod_settings_clear_uv_latched(void) {
  return pod_settings_set_uv_latched(false);
 }
+
+bool pod_settings_is_uv_enabled(void) {
+  if (!s_nvs_ready) {
+    return false;
+  }
+
+  nvs_handle_t handle;
+  esp_err_t err = nvs_open(NS, NVS_READONLY, &handle);
+  if (err != ESP_OK) {
+    return false;
+  }
+
+  uint8_t value = 0;
+  err = nvs_get_u8(handle, KEY_UV_EN, &value);
+  nvs_close(handle);
+
+  if (err == ESP_ERR_NVS_NOT_FOUND) {
+    return false;
+  }
+  if (err != ESP_OK) {
+    return false;
+  }
+  return value != 0;
+}
+
+esp_err_t pod_settings_set_uv_enabled(bool enabled) {
+  esp_err_t err = ensure_nvs();
+  if (err != ESP_OK) {
+    return err;
+  }
+
+  nvs_handle_t handle;
+  err = nvs_open(NS, NVS_READWRITE, &handle);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "nvs_open failed: %s", esp_err_to_name(err));
+    return err;
+  }
+
+  err = nvs_set_u8(handle, KEY_UV_EN, enabled ? 1u : 0u);
+  if (err == ESP_OK) {
+    err = nvs_commit(handle);
+  }
+  nvs_close(handle);
+
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "save uv_en failed: %s", esp_err_to_name(err));
+    return err;
+  }
+
+  ESP_LOGI(TAG, "UV protection %s", enabled ? "enabled" : "disabled");
+  return ESP_OK;
+}
+
+esp_err_t pod_settings_load_id_map(pod_id_map_t *out) {
+  if (out == NULL) {
+    return ESP_ERR_INVALID_ARG;
+  }
+  memset(out, 0, sizeof(*out));
+  out->next_id = (uint8_t)POD_CLIENT_ID_MIN;
+  if (!s_nvs_ready) {
+    return ESP_OK;
+  }
+
+  nvs_handle_t handle;
+  esp_err_t err = nvs_open(NS, NVS_READONLY, &handle);
+  if (err != ESP_OK) {
+    return ESP_OK;
+  }
+
+  id_map_nvs_t blob;
+  memset(&blob, 0, sizeof(blob));
+  size_t len = sizeof(blob);
+  err = nvs_get_blob(handle, KEY_ID_MAP, &blob, &len);
+  nvs_close(handle);
+
+  if (err == ESP_ERR_NVS_NOT_FOUND) {
+    return ESP_OK;
+  }
+  if (err != ESP_OK || len < 3 || blob.version != ID_MAP_NVS_VERSION) {
+    ESP_LOGW(TAG, "read id_map failed: %s (len=%u)", esp_err_to_name(err),
+             (unsigned)len);
+    return ESP_OK;
+  }
+  if (blob.next_id < POD_CLIENT_ID_MIN) {
+    blob.next_id = (uint8_t)POD_CLIENT_ID_MIN;
+  }
+
+  out->next_id = blob.next_id;
+  out->count = blob.count;
+  for (uint8_t i = 0; i < blob.count; i++) {
+    memcpy(out->entries[i].mac, blob.entries[i].mac, POD_ID_MAC_LEN);
+    out->entries[i].id = blob.entries[i].id;
+  }
+  ESP_LOGI(TAG, "loaded id_map count=%u next_id=%u", (unsigned)out->count,
+           (unsigned)out->next_id);
+  return ESP_OK;
+}
+
+esp_err_t pod_settings_save_id_map(const pod_id_map_t *map) {
+  if (map == NULL) {
+    return ESP_ERR_INVALID_ARG;
+  }
+  if (map->next_id < POD_CLIENT_ID_MIN) {
+    return ESP_ERR_INVALID_ARG;
+  }
+
+  esp_err_t err = ensure_nvs();
+  if (err != ESP_OK) {
+    return err;
+  }
+
+  id_map_nvs_t blob;
+  memset(&blob, 0, sizeof(blob));
+  blob.version = ID_MAP_NVS_VERSION;
+  blob.next_id = map->next_id;
+  blob.count = map->count;
+  for (uint8_t i = 0; i < map->count; i++) {
+    memcpy(blob.entries[i].mac, map->entries[i].mac, POD_ID_MAC_LEN);
+    blob.entries[i].id = map->entries[i].id;
+  }
+
+  nvs_handle_t handle;
+  err = nvs_open(NS, NVS_READWRITE, &handle);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "nvs_open failed: %s", esp_err_to_name(err));
+    return err;
+  }
+
+  err = nvs_set_blob(handle, KEY_ID_MAP, &blob, sizeof(blob));
+  if (err == ESP_OK) {
+    err = nvs_commit(handle);
+  }
+  nvs_close(handle);
+
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "save id_map failed: %s", esp_err_to_name(err));
+    return err;
+  }
+  ESP_LOGI(TAG, "saved id_map count=%u next_id=%u", (unsigned)map->count,
+           (unsigned)map->next_id);
+  return ESP_OK;
+}
+
+esp_err_t pod_settings_clear_id_map(void) {
+  esp_err_t err = ensure_nvs();
+  if (err != ESP_OK) {
+    return err;
+  }
+
+  nvs_handle_t handle;
+  err = nvs_open(NS, NVS_READWRITE, &handle);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "nvs_open failed: %s", esp_err_to_name(err));
+    return err;
+  }
+
+  err = nvs_erase_key(handle, KEY_ID_MAP);
+  if (err == ESP_ERR_NVS_NOT_FOUND) {
+    err = ESP_OK;
+  }
+  if (err == ESP_OK) {
+    err = nvs_commit(handle);
+  }
+  nvs_close(handle);
+
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "clear id_map failed: %s", esp_err_to_name(err));
+    return err;
+  }
+  ESP_LOGI(TAG, "cleared id_map");
+  return ESP_OK;
+}
+
+bool pod_settings_load_id_binding(uint8_t master_mac[POD_ID_MAC_LEN],
+                                  uint32_t *assigned_id_out) {
+  if (master_mac == NULL || assigned_id_out == NULL) {
+    return false;
+  }
+  memset(master_mac, 0, POD_ID_MAC_LEN);
+  *assigned_id_out = 0;
+  if (!s_nvs_ready) {
+    return false;
+  }
+
+  nvs_handle_t handle;
+  esp_err_t err = nvs_open(NS, NVS_READONLY, &handle);
+  if (err != ESP_OK) {
+    return false;
+  }
+
+  id_bind_nvs_t blob = {0};
+  size_t len = sizeof(blob);
+  err = nvs_get_blob(handle, KEY_ID_BIND, &blob, &len);
+  nvs_close(handle);
+
+  if (err != ESP_OK || len != sizeof(blob) ||
+      blob.version != ID_BIND_NVS_VERSION) {
+    return false;
+  }
+  if (blob.assigned_id < POD_CLIENT_ID_MIN) {
+    return false;
+  }
+
+  memcpy(master_mac, blob.master_mac, POD_ID_MAC_LEN);
+  *assigned_id_out = blob.assigned_id;
+  return true;
+}
+
+esp_err_t pod_settings_save_id_binding(const uint8_t master_mac[POD_ID_MAC_LEN],
+                                       uint32_t assigned_id) {
+  if (master_mac == NULL || assigned_id < POD_CLIENT_ID_MIN ||
+      assigned_id > POD_CLIENT_ID_MAX) {
+    return ESP_ERR_INVALID_ARG;
+  }
+
+  esp_err_t err = ensure_nvs();
+  if (err != ESP_OK) {
+    return err;
+  }
+
+  id_bind_nvs_t blob = {
+      .version = ID_BIND_NVS_VERSION,
+      .assigned_id = (uint8_t)assigned_id,
+  };
+  memcpy(blob.master_mac, master_mac, POD_ID_MAC_LEN);
+
+  nvs_handle_t handle;
+  err = nvs_open(NS, NVS_READWRITE, &handle);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "nvs_open failed: %s", esp_err_to_name(err));
+    return err;
+  }
+
+  err = nvs_set_blob(handle, KEY_ID_BIND, &blob, sizeof(blob));
+  if (err == ESP_OK) {
+    err = nvs_commit(handle);
+  }
+  nvs_close(handle);
+
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "save id_bind failed: %s", esp_err_to_name(err));
+    return err;
+  }
+  ESP_LOGI(TAG, "saved id_bind id=%lu master=%02x:…:%02x",
+           (unsigned long)assigned_id, master_mac[0], master_mac[5]);
+  return ESP_OK;
+}
+
+esp_err_t pod_settings_clear_id_binding(void) {
+  esp_err_t err = ensure_nvs();
+  if (err != ESP_OK) {
+    return err;
+  }
+
+  nvs_handle_t handle;
+  err = nvs_open(NS, NVS_READWRITE, &handle);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "nvs_open failed: %s", esp_err_to_name(err));
+    return err;
+  }
+
+  err = nvs_erase_key(handle, KEY_ID_BIND);
+  if (err == ESP_ERR_NVS_NOT_FOUND) {
+    err = ESP_OK;
+  }
+  if (err == ESP_OK) {
+    err = nvs_commit(handle);
+  }
+  nvs_close(handle);
+
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "clear id_bind failed: %s", esp_err_to_name(err));
+    return err;
+  }
+  ESP_LOGI(TAG, "cleared id_bind");
+  return ESP_OK;
+}
@@ -35,4 +35,43 @@ bool pod_settings_is_uv_latched(void);
 esp_err_t pod_settings_set_uv_latched(bool latched);
 esp_err_t pod_settings_clear_uv_latched(void);

+/**
+ * Runtime enable for software UV protection (NVS). Missing key → disabled.
+ * Independent of POWERPOD_BATTERY_UV_ENABLE compile gate.
+ */
+bool pod_settings_is_uv_enabled(void);
+esp_err_t pod_settings_set_uv_enabled(bool enabled);
+
+/** Logical slave ids: 1…POD_CLIENT_ID_MAX (0 reserved for local master). */
+#define POD_CLIENT_ID_MIN 1u
+#define POD_CLIENT_ID_MAX 255u
+#define POD_ID_MAP_MAX 255u
+#define POD_ID_MAC_LEN 6u
+
+typedef struct {
+  uint8_t mac[POD_ID_MAC_LEN];
+  uint8_t id;
+} pod_id_map_entry_t;
+
+typedef struct {
+  uint8_t next_id; /**< Next candidate when allocating (1…255). */
+  uint8_t count;
+  pod_id_map_entry_t entries[POD_ID_MAP_MAX];
+} pod_id_map_t;
+
+/** Master: load MAC→id map from NVS (zeros *out if unset). */
+esp_err_t pod_settings_load_id_map(pod_id_map_t *out);
+esp_err_t pod_settings_save_id_map(const pod_id_map_t *map);
+esp_err_t pod_settings_clear_id_map(void);
+
+/**
+ * Slave: load persisted {master_mac, assigned_id}.
+ * Returns true when a valid binding was loaded.
+ */
+bool pod_settings_load_id_binding(uint8_t master_mac[POD_ID_MAC_LEN],
+                                  uint32_t *assigned_id_out);
+esp_err_t pod_settings_save_id_binding(const uint8_t master_mac[POD_ID_MAC_LEN],
+                                       uint32_t assigned_id);
+esp_err_t pod_settings_clear_id_binding(void);
+
 #endif
@@ -2,6 +2,7 @@
 #include "cmd_handler.h"
 #include "cmd_accel_deadzone.h"
 #include "cmd_accel_stream.h"
+#include "cmd_input_send_mode.h"
 #include "cmd_tap_notify.h"
 #include "cmd_tap_config.h"
 #include "cmd_cache_status.h"
@@ -9,12 +10,15 @@
 #include "cmd_espnow_echo_ping.h"
 #include "cmd_espnow_find_me.h"
 #include "cmd_restart.h"
+#include "cmd_client_id_map_reset.h"
 #include "cmd_client_info.h"
 #include "cmd_version.h"
 #include "cmd_ota.h"
 #include "cmd_ota_slave_progress.h"
+#include "ota_confirm.h"
 #include "cmd_led_ring.h"
 #include "cmd_battery.h"
+#include "cmd_battery_uv.h"
 #include "cmd_set_log_level.h"
 #include "esp_now_comm.h"
 #include "powerpod.h"
@@ -32,8 +36,10 @@
 #include "led_ring.h"
 #include "pod_settings.h"
 #include "uart.h"
+#include "ble_host.h"
 #include "battery_uv.h"
 #include <stdint.h>
+#include <string.h>

 enum MASTER_STATES {
  MSTATE_INIT,
@@ -94,7 +100,8 @@ void app_main(void) {
  gpio_reset_pin(DIP_MASTER);
  gpio_set_direction(DIP_MASTER, GPIO_MODE_INPUT);
  uint8_t master = gpio_get_level(DIP_MASTER) ? 0 : 1;
-  uint8_t network = 0;
+  uint8_t network = 1;
+  bool host_ble = false;

  esp_err_t err;

@@ -137,12 +144,20 @@ void app_main(void) {
                                      -1);
    if (err != ESP_OK) {
      ESP_LOGI(TAG, "Could not read IO Expander input %d", err);
+    } else {
+      /* High nibble physically reversed on PCB; DIP1..8 after reverse+invert. */
+      uint8_t bits = (uint8_t)(~reverse_high_nibble_lut(read_val));
+      /* DIP8 (bit7) = host transport: 1 = BLE, 0 = UART */
+      host_ble = (bits & 0x80u) != 0;
+      uint8_t net_bits = (uint8_t)(bits & 0x7Fu);
+      if (net_bits == 0 || (net_bits & (net_bits - 1u)) != 0) {
+        ESP_LOGW(TAG, "invalid network DIP one-hot=0x%02x; fallback network=1",
+                 net_bits);
+        network = 1;
+      } else {
+        network = (uint8_t)(__builtin_ctz(net_bits) + 1); /* 1..7 */
+      }
    }
-    // Build NetworkNumber because Pin 5-8 are reversed
-    network = reverse_high_nibble_lut(read_val);
-    network = ~network; // reverse bits
-    network = __builtin_ctz(network) +
-              1; // map network to 0-8, 0 is not a valid network
  }

  if (bus_handle != NULL) {
@@ -167,6 +182,7 @@ void app_main(void) {

  app_config.master = (master != 0);
  app_config.network = network;
+  app_config.host_ble = host_ble;
  if (running != NULL) {
    memcpy(app_config.running_partition, running->label,
           sizeof(app_config.running_partition));
@@ -177,6 +193,8 @@ void app_main(void) {
  ESP_LOGI(TAG, "RUNNING CONFIG:");
  ESP_LOGI(TAG, "Master:            %d", app_config.master);
  ESP_LOGI(TAG, "Network:           %d", app_config.network);
+  ESP_LOGI(TAG, "Host:              %s (DIP8; reboot to switch)",
+           app_config.host_ble ? "BLE" : "UART");
  ESP_LOGI(TAG, "Running Partition: %s (OTA slot %d)",
           app_config.running_partition, ota_slot);

@@ -189,15 +207,24 @@ void app_main(void) {
  }

  led_ring_init();
+  led_ring_boot_anim();

  if (app_config.master) {
    cmd_queue = xQueueCreate(64, sizeof(generic_msg_t));
    init_cmdHandler(cmd_queue);
-    init_uart(cmd_queue);
+    if (app_config.host_ble) {
+      err = init_ble_host(cmd_queue);
+      if (err != ESP_OK) {
+        ESP_LOGE(TAG, "BLE host init failed: %s", esp_err_to_name(err));
+      }
+    } else {
+      init_uart(cmd_queue);
+    }
    cmd_version_register();
    cmd_client_info_register();
    cmd_accel_deadzone_register();
    cmd_accel_stream_register();
+    cmd_input_send_mode_register();
    cmd_tap_notify_register();
    cmd_tap_config_register();
    cmd_cache_status_register();
@@ -205,14 +232,20 @@ void app_main(void) {
    cmd_espnow_echo_ping_register();
    cmd_espnow_find_me_register();
    cmd_restart_register();
+    cmd_client_id_map_reset_register();
    cmd_led_ring_register();
    cmd_battery_register();
+    cmd_battery_uv_register();
    cmd_ota_register();
    cmd_ota_slave_progress_register();
    cmd_set_log_level_register();
  }

-  ESP_LOGI(TAG, "LED ring: UART LED_RING commands only (no local demo loop)");
+  ESP_LOGI(TAG, "LED ring: boot anim + UART LED_RING commands");
+
+  /* After OTA: PENDING_VERIFY until confirm; crash before this → rollback. */
+  ota_confirm_schedule();
+
  while (1) {
    vTaskDelay(portMAX_DELAY);
  }
@@ -3,7 +3,7 @@

 /** 1 = software LiPo UV latch + energy-save mode; 0 = disabled (LED mode 6 still works). */
 #ifndef POWERPOD_BATTERY_UV_ENABLE
-#define POWERPOD_BATTERY_UV_ENABLE 0
+#define POWERPOD_BATTERY_UV_ENABLE 1
 #endif

 #define DIP_MASTER 4
@@ -27,6 +27,12 @@ PB_BIND(alox_EspNowDiscover, alox_EspNowDiscover, AUTO)
 PB_BIND(alox_EspNowSlavePresence, alox_EspNowSlavePresence, AUTO)


+PB_BIND(alox_EspNowAssignId, alox_EspNowAssignId, AUTO)
+
+
+PB_BIND(alox_EspNowClearIdBinding, alox_EspNowClearIdBinding, AUTO)
+
+
 PB_BIND(alox_EspNowAccelDeadzone, alox_EspNowAccelDeadzone, AUTO)


@@ -48,6 +54,12 @@ PB_BIND(alox_EspNowTapConfig, alox_EspNowTapConfig, AUTO)
 PB_BIND(alox_EspNowTapEvent, alox_EspNowTapEvent, AUTO)


+PB_BIND(alox_EspNowInputSendMode, alox_EspNowInputSendMode, AUTO)
+
+
+PB_BIND(alox_EspNowBatteryUv, alox_EspNowBatteryUv, AUTO)
+
+
 PB_BIND(alox_EspNowBatteryReport, alox_EspNowBatteryReport, AUTO)


@@ -32,7 +32,15 @@ typedef enum _alox_EspNowMessageType {
    alox_EspNowMessageType_ESPNOW_TAP_EVENT = 18,
    alox_EspNowMessageType_ESPNOW_ECHO_PING = 19,
    alox_EspNowMessageType_ESPNOW_ECHO_PONG = 20,
-    alox_EspNowMessageType_ESPNOW_SET_TAP_CONFIG = 21
+    alox_EspNowMessageType_ESPNOW_SET_TAP_CONFIG = 21,
+    /* * Master → slave: assigned logical client id after join/presence. */
+    alox_EspNowMessageType_ESPNOW_ASSIGN_ID = 22,
+    /* * Master → slave: forget persisted master/id binding (debug reset). */
+    alox_EspNowMessageType_ESPNOW_CLEAR_ID_BINDING = 23,
+    /* * Master → slave: accel/tap ESP-NOW send path (best_effort/fast/wait/reliable). */
+    alox_EspNowMessageType_ESPNOW_SET_INPUT_SEND_MODE = 24,
+    /* * Master → slave: enable/disable software LiPo UV protection (NVS). */
+    alox_EspNowMessageType_ESPNOW_SET_BATTERY_UV = 25
 } alox_EspNowMessageType;

 /* Struct definitions */
@@ -68,29 +76,44 @@ typedef struct _alox_EspNowDiscover {
    uint32_t network;
    /* * Master is in an OTA session (UART upload or ESP-NOW distribution). */
    bool master_ota_pending;
+    /* *
+ Master esp_timer_get_time() (µs) at broadcast. Slaves use this to phase
+ accel TX into 1 ms slots: offset_ms = (assigned_id - 1) % 8. */
+    uint64_t master_time_us;
 } alox_EspNowDiscover;

 typedef struct _alox_EspNowSlavePresence {
    uint32_t network;
    pb_callback_t mac;
    uint32_t version;
+    /* * Preferred id from NVS for this master (0 = none / unbound). */
    uint32_t slave_id;
    bool available;
    bool used;
 } alox_EspNowSlavePresence;

+/* * Master → slave: definitive logical client id for this session/master. */
+typedef struct _alox_EspNowAssignId {
+    uint32_t assigned_id;
+} alox_EspNowAssignId;
+
+/* * Master → slave: clear persisted {master_mac, assigned_id} binding. */
+typedef struct _alox_EspNowClearIdBinding {
+    char dummy_field;
+} alox_EspNowClearIdBinding;
+
 typedef struct _alox_EspNowAccelDeadzone {
    uint32_t deadzone;
    uint32_t client_id; /* 0 = all slaves; otherwise only matching slave_id applies */
 } alox_EspNowAccelDeadzone;

-/* * Master → slave: enable/disable periodic accel ESP-NOW stream (~16 ms). */
+/* * Master → slave: enable/disable periodic accel ESP-NOW stream (~10 ms). */
 typedef struct _alox_EspNowAccelStream {
    bool enable;
    uint32_t client_id;
 } alox_EspNowAccelStream;

-/* * Slave → master: latest BMA456 sample (sent ~every 16 ms). */
+/* * Slave → master: latest BMA456 sample (best-effort, ~every 10 ms). */
 typedef struct _alox_EspNowAccelSample {
    uint32_t slave_id;
    int32_t x;
@@ -132,6 +155,20 @@ typedef struct _alox_EspNowTapEvent {
    uint32_t kind;
 } alox_EspNowTapEvent;

+/* *
+ Master → slave: which esp_now_core_send_* path to use for ACCEL_SAMPLE / TAP_EVENT.
+ Values match uart InputSendMode (0=best_effort … 3=reliable). */
+typedef struct _alox_EspNowInputSendMode {
+    uint32_t client_id; /* 0 = all slaves; otherwise only matching slave_id applies */
+    uint32_t mode;
+} alox_EspNowInputSendMode;
+
+/* * Master → slave: software LiPo UV protection enable (persisted in NVS). */
+typedef struct _alox_EspNowBatteryUv {
+    uint32_t client_id; /* 0 = all slaves; otherwise only matching slave_id applies */
+    bool enabled;
+} alox_EspNowBatteryUv;
+
 /* * Slave → master: LiPo voltages (periodic ~30 s and on query). */
 typedef struct _alox_EspNowBatteryReport {
    uint32_t client_id;
@@ -204,6 +241,10 @@ typedef struct _alox_EspNowMessage {
        alox_EspNowEchoPing echo_ping;
        alox_EspNowEchoPong echo_pong;
        alox_EspNowTapConfig tap_config;
+        alox_EspNowAssignId assign_id;
+        alox_EspNowClearIdBinding clear_id_binding;
+        alox_EspNowInputSendMode input_send_mode;
+        alox_EspNowBatteryUv battery_uv;
    } payload;
 } alox_EspNowMessage;

@@ -214,8 +255,12 @@ extern "C" {

 /* Helper constants for enums */
 #define _alox_EspNowMessageType_MIN alox_EspNowMessageType_ESPNOW_UNKNOWN
-#define _alox_EspNowMessageType_MAX alox_EspNowMessageType_ESPNOW_SET_TAP_CONFIG
-#define _alox_EspNowMessageType_ARRAYSIZE ((alox_EspNowMessageType)(alox_EspNowMessageType_ESPNOW_SET_TAP_CONFIG+1))
+#define _alox_EspNowMessageType_MAX alox_EspNowMessageType_ESPNOW_SET_BATTERY_UV
+#define _alox_EspNowMessageType_ARRAYSIZE ((alox_EspNowMessageType)(alox_EspNowMessageType_ESPNOW_SET_BATTERY_UV+1))
+
+
+
+



@@ -246,8 +291,10 @@ extern "C" {
 #define alox_EspNowEchoPong_init_default         {0, 0}
 #define alox_EspNowFindMe_init_default           {0}
 #define alox_EspNowRestart_init_default          {0}
-#define alox_EspNowDiscover_init_default         {0, 0}
+#define alox_EspNowDiscover_init_default         {0, 0, 0}
 #define alox_EspNowSlavePresence_init_default    {0, {{NULL}, NULL}, 0, 0, 0, 0}
+#define alox_EspNowAssignId_init_default         {0}
+#define alox_EspNowClearIdBinding_init_default   {0}
 #define alox_EspNowAccelDeadzone_init_default    {0, 0}
 #define alox_EspNowAccelStream_init_default      {0, 0}
 #define alox_EspNowAccelSample_init_default      {0, 0, 0, 0}
@@ -255,6 +302,8 @@ extern "C" {
 #define alox_EspNowTapNotify_init_default        {0, 0, 0, 0}
 #define alox_EspNowTapConfig_init_default        {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define alox_EspNowTapEvent_init_default         {0, 0}
+#define alox_EspNowInputSendMode_init_default    {0, 0}
+#define alox_EspNowBatteryUv_init_default        {0, 0}
 #define alox_EspNowBatteryReport_init_default    {0, 0, 0, 0, 0}
 #define alox_EspNowLedRing_init_default          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define alox_EspNowOtaStart_init_default         {0}
@@ -267,8 +316,10 @@ extern "C" {
 #define alox_EspNowEchoPong_init_zero            {0, 0}
 #define alox_EspNowFindMe_init_zero              {0}
 #define alox_EspNowRestart_init_zero             {0}
-#define alox_EspNowDiscover_init_zero            {0, 0}
+#define alox_EspNowDiscover_init_zero            {0, 0, 0}
 #define alox_EspNowSlavePresence_init_zero       {0, {{NULL}, NULL}, 0, 0, 0, 0}
+#define alox_EspNowAssignId_init_zero            {0}
+#define alox_EspNowClearIdBinding_init_zero      {0}
 #define alox_EspNowAccelDeadzone_init_zero       {0, 0}
 #define alox_EspNowAccelStream_init_zero         {0, 0}
 #define alox_EspNowAccelSample_init_zero         {0, 0, 0, 0}
@@ -276,6 +327,8 @@ extern "C" {
 #define alox_EspNowTapNotify_init_zero           {0, 0, 0, 0}
 #define alox_EspNowTapConfig_init_zero           {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define alox_EspNowTapEvent_init_zero            {0, 0}
+#define alox_EspNowInputSendMode_init_zero       {0, 0}
+#define alox_EspNowBatteryUv_init_zero           {0, 0}
 #define alox_EspNowBatteryReport_init_zero       {0, 0, 0, 0, 0}
 #define alox_EspNowLedRing_init_zero             {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define alox_EspNowOtaStart_init_zero            {0}
@@ -294,12 +347,14 @@ extern "C" {
 #define alox_EspNowRestart_client_id_tag         1
 #define alox_EspNowDiscover_network_tag          1
 #define alox_EspNowDiscover_master_ota_pending_tag 2
+#define alox_EspNowDiscover_master_time_us_tag   3
 #define alox_EspNowSlavePresence_network_tag     1
 #define alox_EspNowSlavePresence_mac_tag         2
 #define alox_EspNowSlavePresence_version_tag     3
 #define alox_EspNowSlavePresence_slave_id_tag    4
 #define alox_EspNowSlavePresence_available_tag   5
 #define alox_EspNowSlavePresence_used_tag        6
+#define alox_EspNowAssignId_assigned_id_tag      1
 #define alox_EspNowAccelDeadzone_deadzone_tag    1
 #define alox_EspNowAccelDeadzone_client_id_tag   2
 #define alox_EspNowAccelStream_enable_tag        1
@@ -325,6 +380,10 @@ extern "C" {
 #define alox_EspNowTapConfig_enable_triple_tag   10
 #define alox_EspNowTapEvent_slave_id_tag         1
 #define alox_EspNowTapEvent_kind_tag             2
+#define alox_EspNowInputSendMode_client_id_tag   1
+#define alox_EspNowInputSendMode_mode_tag        2
+#define alox_EspNowBatteryUv_client_id_tag       1
+#define alox_EspNowBatteryUv_enabled_tag         2
 #define alox_EspNowBatteryReport_client_id_tag   1
 #define alox_EspNowBatteryReport_lipo1_valid_tag 2
 #define alox_EspNowBatteryReport_lipo2_valid_tag 3
@@ -368,6 +427,10 @@ extern "C" {
 #define alox_EspNowMessage_echo_ping_tag         20
 #define alox_EspNowMessage_echo_pong_tag         21
 #define alox_EspNowMessage_tap_config_tag        22
+#define alox_EspNowMessage_assign_id_tag         23
+#define alox_EspNowMessage_clear_id_binding_tag  24
+#define alox_EspNowMessage_input_send_mode_tag   25
+#define alox_EspNowMessage_battery_uv_tag        26

 /* Struct field encoding specification for nanopb */
 #define alox_EspNowUnicastTest_FIELDLIST(X, a) \
@@ -399,7 +462,8 @@ X(a, STATIC,   SINGULAR, UINT32,   client_id,         1)

 #define alox_EspNowDiscover_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   network,           1) \
-X(a, STATIC,   SINGULAR, BOOL,     master_ota_pending,   2)
+X(a, STATIC,   SINGULAR, BOOL,     master_ota_pending,   2) \
+X(a, STATIC,   SINGULAR, UINT64,   master_time_us,    3)
 #define alox_EspNowDiscover_CALLBACK NULL
 #define alox_EspNowDiscover_DEFAULT NULL

@@ -413,6 +477,16 @@ X(a, STATIC,   SINGULAR, BOOL,     used,              6)
 #define alox_EspNowSlavePresence_CALLBACK pb_default_field_callback
 #define alox_EspNowSlavePresence_DEFAULT NULL

+#define alox_EspNowAssignId_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   assigned_id,       1)
+#define alox_EspNowAssignId_CALLBACK NULL
+#define alox_EspNowAssignId_DEFAULT NULL
+
+#define alox_EspNowClearIdBinding_FIELDLIST(X, a) \
+
+#define alox_EspNowClearIdBinding_CALLBACK NULL
+#define alox_EspNowClearIdBinding_DEFAULT NULL
+
 #define alox_EspNowAccelDeadzone_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   deadzone,          1) \
 X(a, STATIC,   SINGULAR, UINT32,   client_id,         2)
@@ -466,6 +540,18 @@ X(a, STATIC,   SINGULAR, UINT32,   kind,              2)
 #define alox_EspNowTapEvent_CALLBACK NULL
 #define alox_EspNowTapEvent_DEFAULT NULL

+#define alox_EspNowInputSendMode_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   client_id,         1) \
+X(a, STATIC,   SINGULAR, UINT32,   mode,              2)
+#define alox_EspNowInputSendMode_CALLBACK NULL
+#define alox_EspNowInputSendMode_DEFAULT NULL
+
+#define alox_EspNowBatteryUv_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   client_id,         1) \
+X(a, STATIC,   SINGULAR, BOOL,     enabled,           2)
+#define alox_EspNowBatteryUv_CALLBACK NULL
+#define alox_EspNowBatteryUv_DEFAULT NULL
+
 #define alox_EspNowBatteryReport_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   client_id,         1) \
 X(a, STATIC,   SINGULAR, BOOL,     lipo1_valid,       2) \
@@ -534,7 +620,11 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload,tap_notify,payload.tap_notify),  18)
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload,tap_event,payload.tap_event),  19) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload,echo_ping,payload.echo_ping),  20) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload,echo_pong,payload.echo_pong),  21) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload,tap_config,payload.tap_config),  22)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,tap_config,payload.tap_config),  22) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,assign_id,payload.assign_id),  23) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,clear_id_binding,payload.clear_id_binding),  24) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,input_send_mode,payload.input_send_mode),  25) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,battery_uv,payload.battery_uv),  26)
 #define alox_EspNowMessage_CALLBACK NULL
 #define alox_EspNowMessage_DEFAULT NULL
 #define alox_EspNowMessage_payload_discover_MSGTYPE alox_EspNowDiscover
@@ -558,6 +648,10 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload,tap_config,payload.tap_config),  22)
 #define alox_EspNowMessage_payload_echo_ping_MSGTYPE alox_EspNowEchoPing
 #define alox_EspNowMessage_payload_echo_pong_MSGTYPE alox_EspNowEchoPong
 #define alox_EspNowMessage_payload_tap_config_MSGTYPE alox_EspNowTapConfig
+#define alox_EspNowMessage_payload_assign_id_MSGTYPE alox_EspNowAssignId
+#define alox_EspNowMessage_payload_clear_id_binding_MSGTYPE alox_EspNowClearIdBinding
+#define alox_EspNowMessage_payload_input_send_mode_MSGTYPE alox_EspNowInputSendMode
+#define alox_EspNowMessage_payload_battery_uv_MSGTYPE alox_EspNowBatteryUv

 extern const pb_msgdesc_t alox_EspNowUnicastTest_msg;
 extern const pb_msgdesc_t alox_EspNowEchoPing_msg;
@@ -566,6 +660,8 @@ extern const pb_msgdesc_t alox_EspNowFindMe_msg;
 extern const pb_msgdesc_t alox_EspNowRestart_msg;
 extern const pb_msgdesc_t alox_EspNowDiscover_msg;
 extern const pb_msgdesc_t alox_EspNowSlavePresence_msg;
+extern const pb_msgdesc_t alox_EspNowAssignId_msg;
+extern const pb_msgdesc_t alox_EspNowClearIdBinding_msg;
 extern const pb_msgdesc_t alox_EspNowAccelDeadzone_msg;
 extern const pb_msgdesc_t alox_EspNowAccelStream_msg;
 extern const pb_msgdesc_t alox_EspNowAccelSample_msg;
@@ -573,6 +669,8 @@ extern const pb_msgdesc_t alox_EspNowBatteryQuery_msg;
 extern const pb_msgdesc_t alox_EspNowTapNotify_msg;
 extern const pb_msgdesc_t alox_EspNowTapConfig_msg;
 extern const pb_msgdesc_t alox_EspNowTapEvent_msg;
+extern const pb_msgdesc_t alox_EspNowInputSendMode_msg;
+extern const pb_msgdesc_t alox_EspNowBatteryUv_msg;
 extern const pb_msgdesc_t alox_EspNowBatteryReport_msg;
 extern const pb_msgdesc_t alox_EspNowLedRing_msg;
 extern const pb_msgdesc_t alox_EspNowOtaStart_msg;
@@ -589,6 +687,8 @@ extern const pb_msgdesc_t alox_EspNowMessage_msg;
 #define alox_EspNowRestart_fields &alox_EspNowRestart_msg
 #define alox_EspNowDiscover_fields &alox_EspNowDiscover_msg
 #define alox_EspNowSlavePresence_fields &alox_EspNowSlavePresence_msg
+#define alox_EspNowAssignId_fields &alox_EspNowAssignId_msg
+#define alox_EspNowClearIdBinding_fields &alox_EspNowClearIdBinding_msg
 #define alox_EspNowAccelDeadzone_fields &alox_EspNowAccelDeadzone_msg
 #define alox_EspNowAccelStream_fields &alox_EspNowAccelStream_msg
 #define alox_EspNowAccelSample_fields &alox_EspNowAccelSample_msg
@@ -596,6 +696,8 @@ extern const pb_msgdesc_t alox_EspNowMessage_msg;
 #define alox_EspNowTapNotify_fields &alox_EspNowTapNotify_msg
 #define alox_EspNowTapConfig_fields &alox_EspNowTapConfig_msg
 #define alox_EspNowTapEvent_fields &alox_EspNowTapEvent_msg
+#define alox_EspNowInputSendMode_fields &alox_EspNowInputSendMode_msg
+#define alox_EspNowBatteryUv_fields &alox_EspNowBatteryUv_msg
 #define alox_EspNowBatteryReport_fields &alox_EspNowBatteryReport_msg
 #define alox_EspNowLedRing_fields &alox_EspNowLedRing_msg
 #define alox_EspNowOtaStart_fields &alox_EspNowOtaStart_msg
@@ -611,12 +713,16 @@ extern const pb_msgdesc_t alox_EspNowMessage_msg;
 #define alox_EspNowAccelDeadzone_size            12
 #define alox_EspNowAccelSample_size              24
 #define alox_EspNowAccelStream_size              8
+#define alox_EspNowAssignId_size                 6
 #define alox_EspNowBatteryQuery_size             6
 #define alox_EspNowBatteryReport_size            22
-#define alox_EspNowDiscover_size                 8
+#define alox_EspNowBatteryUv_size                8
+#define alox_EspNowClearIdBinding_size           0
+#define alox_EspNowDiscover_size                 19
 #define alox_EspNowEchoPing_size                 22
 #define alox_EspNowEchoPong_size                 22
 #define alox_EspNowFindMe_size                   6
+#define alox_EspNowInputSendMode_size            12
 #define alox_EspNowLedRing_size                  60
 #define alox_EspNowOtaEnd_size                   0
 #define alox_EspNowOtaPayload_size               209
@@ -27,6 +27,14 @@ enum EspNowMessageType {
  ESPNOW_ECHO_PING = 19;
  ESPNOW_ECHO_PONG = 20;
  ESPNOW_SET_TAP_CONFIG = 21;
+  /** Master → slave: assigned logical client id after join/presence. */
+  ESPNOW_ASSIGN_ID = 22;
+  /** Master → slave: forget persisted master/id binding (debug reset). */
+  ESPNOW_CLEAR_ID_BINDING = 23;
+  /** Master → slave: accel/tap ESP-NOW send path (best_effort/fast/wait/reliable). */
+  ESPNOW_SET_INPUT_SEND_MODE = 24;
+  /** Master → slave: enable/disable software LiPo UV protection (NVS). */
+  ESPNOW_SET_BATTERY_UV = 25;
 }

 message EspNowUnicastTest {
@@ -61,29 +69,43 @@ message EspNowDiscover {
  uint32 network = 1;
  /** Master is in an OTA session (UART upload or ESP-NOW distribution). */
  bool master_ota_pending = 2;
+  /**
+   * Master esp_timer_get_time() (µs) at broadcast. Slaves use this to phase
+   * accel TX into 1 ms slots: offset_ms = (assigned_id - 1) % 8.
+   */
+  uint64 master_time_us = 3;
 }

 message EspNowSlavePresence {
  uint32 network = 1;
  bytes mac = 2;
  uint32 version = 3;
+  /** Preferred id from NVS for this master (0 = none / unbound). */
  uint32 slave_id = 4;
  bool available = 5;
  bool used = 6;
 }

+/** Master → slave: definitive logical client id for this session/master. */
+message EspNowAssignId {
+  uint32 assigned_id = 1;
+}
+
+/** Master → slave: clear persisted {master_mac, assigned_id} binding. */
+message EspNowClearIdBinding {}
+
 message EspNowAccelDeadzone {
  uint32 deadzone = 1;
  uint32 client_id = 2; // 0 = all slaves; otherwise only matching slave_id applies
 }

-/** Master → slave: enable/disable periodic accel ESP-NOW stream (~16 ms). */
+/** Master → slave: enable/disable periodic accel ESP-NOW stream (~10 ms). */
 message EspNowAccelStream {
  bool enable = 1;
  uint32 client_id = 2;
 }

-/** Slave → master: latest BMA456 sample (sent ~every 16 ms). */
+/** Slave → master: latest BMA456 sample (best-effort, ~every 10 ms). */
 message EspNowAccelSample {
  uint32 slave_id = 1;
  sint32 x = 2;
@@ -125,6 +147,21 @@ message EspNowTapEvent {
  uint32 kind = 2;
 }

+/**
+ * Master → slave: which esp_now_core_send_* path to use for ACCEL_SAMPLE / TAP_EVENT.
+ * Values match uart InputSendMode (0=best_effort … 3=reliable).
+ */
+message EspNowInputSendMode {
+  uint32 client_id = 1; // 0 = all slaves; otherwise only matching slave_id applies
+  uint32 mode = 2;
+}
+
+/** Master → slave: software LiPo UV protection enable (persisted in NVS). */
+message EspNowBatteryUv {
+  uint32 client_id = 1; // 0 = all slaves; otherwise only matching slave_id applies
+  bool enabled = 2;
+}
+
 /** Slave → master: LiPo voltages (periodic ~30 s and on query). */
 message EspNowBatteryReport {
  uint32 client_id = 1;
@@ -193,5 +230,9 @@ message EspNowMessage {
    EspNowEchoPing echo_ping = 20;
    EspNowEchoPong echo_pong = 21;
    EspNowTapConfig tap_config = 22;
+    EspNowAssignId assign_id = 23;
+    EspNowClearIdBinding clear_id_binding = 24;
+    EspNowInputSendMode input_send_mode = 25;
+    EspNowBatteryUv battery_uv = 26;
  }
 }
@@ -42,6 +42,18 @@ PB_BIND(alox_AccelStreamRequest, alox_AccelStreamRequest, AUTO)
 PB_BIND(alox_AccelStreamResponse, alox_AccelStreamResponse, AUTO)


+PB_BIND(alox_InputSendModeRequest, alox_InputSendModeRequest, AUTO)
+
+
+PB_BIND(alox_InputSendModeResponse, alox_InputSendModeResponse, AUTO)
+
+
+PB_BIND(alox_BatteryUvRequest, alox_BatteryUvRequest, AUTO)
+
+
+PB_BIND(alox_BatteryUvResponse, alox_BatteryUvResponse, AUTO)
+
+
 PB_BIND(alox_BatteryStatusRequest, alox_BatteryStatusRequest, AUTO)


@@ -81,6 +93,9 @@ PB_BIND(alox_CacheClientStatus, alox_CacheClientStatus, AUTO)
 PB_BIND(alox_CacheStatusResponse, alox_CacheStatusResponse, 2)


+PB_BIND(alox_BleStreamTick, alox_BleStreamTick, 2)
+
+
 PB_BIND(alox_EspNowUnicastTestRequest, alox_EspNowUnicastTestRequest, AUTO)


@@ -111,6 +126,12 @@ PB_BIND(alox_RestartRequest, alox_RestartRequest, AUTO)
 PB_BIND(alox_RestartResponse, alox_RestartResponse, AUTO)


+PB_BIND(alox_ClientIdMapResetRequest, alox_ClientIdMapResetRequest, AUTO)
+
+
+PB_BIND(alox_ClientIdMapResetResponse, alox_ClientIdMapResetResponse, AUTO)
+
+
 PB_BIND(alox_SetLogLevelRequest, alox_SetLogLevelRequest, AUTO)


@@ -149,3 +170,5 @@ PB_BIND(alox_OtaSlaveProgressResponse, alox_OtaSlaveProgressResponse, 2)



+
+
@@ -31,16 +31,40 @@ typedef enum _alox_MessageType {
    alox_MessageType_ACCEL_STREAM = 25,
    alox_MessageType_BATTERY_STATUS = 26,
    alox_MessageType_TAP_NOTIFY = 27,
-    /* * Combined cached accel + tap poll (one UART round-trip, ~16 ms cadence). */
+    /* * Combined cached accel + tap poll (one UART round-trip, ~10 ms cadence). */
    alox_MessageType_CACHE_STATUS = 29,
    /* * Host → master → slave → master: timestamp echo round-trip (latency test). */
    alox_MessageType_ESPNOW_ECHO_PING = 30,
    /* * Host → master: get/set ESP-IDF log level for tag "*" (global). */
    alox_MessageType_SET_LOG_LEVEL = 31,
    /* * Host → master: get/set BMA456H multitap detection parameters. */
-    alox_MessageType_TAP_CONFIG = 32
+    alox_MessageType_TAP_CONFIG = 32,
+    /* * Master → host (BLE only): periodic pushed cache snapshot with ESP timestamp. */
+    alox_MessageType_BLE_STREAM_TICK = 33,
+    /* *
+ Host → device: clear master client-id NVS map + live registry (and notify
+ online slaves), or on a slave clear local master/id binding only. */
+    alox_MessageType_CLIENT_ID_MAP_RESET = 34,
+    /* *
+ Host → master: get/set slave ESP-NOW send path for accel/tap
+ (best_effort / fast / wait / reliable). */
+    alox_MessageType_INPUT_SEND_MODE = 35,
+    /* *
+ Host → master: get/set software LiPo UV protection enable (NVS per pod).
+ client_id 0 = master; >0 = one slave; all_clients = master + every slave. */
+    alox_MessageType_BATTERY_UV = 36
 } alox_MessageType;

+/* *
+ Slave ESP-NOW TX path for ACCEL_SAMPLE / TAP_EVENT (debug A/B).
+ Maps 1:1 to esp_now_core_send_*. */
+typedef enum _alox_InputSendMode {
+    alox_InputSendMode_INPUT_SEND_BEST_EFFORT = 0,
+    alox_InputSendMode_INPUT_SEND_FAST = 1,
+    alox_InputSendMode_INPUT_SEND_WAIT = 2,
+    alox_InputSendMode_INPUT_SEND_RELIABLE = 3
+} alox_InputSendMode;
+
 typedef enum _alox_TapKind {
    alox_TapKind_TAP_NONE = 0,
    alox_TapKind_TAP_SINGLE = 1,
@@ -78,6 +102,8 @@ typedef struct _alox_ClientInfo {
    bool tap_notify_single;
    bool tap_notify_double;
    bool tap_notify_triple;
+    /* * Master cache: software UV protection enabled on this slave (NVS on device). */
+    bool uv_protection_enabled;
 } alox_ClientInfo;

 typedef struct _alox_ClientInfoResponse {
@@ -112,13 +138,15 @@ typedef struct _alox_AccelDeadzoneResponse {
    uint32_t slaves_updated;
 } alox_AccelDeadzoneResponse;

-/* Host → master: enable/disable slave accel ESP-NOW stream (~16 ms per slave).
- write=false: read; write=true: apply. client_id 0 invalid for write (use >0 or all_clients). */
+/* Host → master: enable/disable slave accel ESP-NOW stream (~10 ms per slave, best-effort).
+ write=false: read; write=true: apply. client_id 0 invalid for write (use >0 or all_clients).
+ period_ms (10–16): BLE host push interval for BleStreamTick; ignored on UART (default 10). */
 typedef struct _alox_AccelStreamRequest {
    bool write;
    bool enable;
    uint32_t client_id;
    bool all_clients;
+    uint32_t period_ms;
 } alox_AccelStreamRequest;

 typedef struct _alox_AccelStreamResponse {
@@ -128,6 +156,40 @@ typedef struct _alox_AccelStreamResponse {
    uint32_t slaves_updated;
 } alox_AccelStreamResponse;

+/* Host → master: get/set input send mode on slaves.
+ write=false: return last mode remembered on master (client_id ignored).
+ write=true: push mode via ESP-NOW (all_clients or one client_id). */
+typedef struct _alox_InputSendModeRequest {
+    bool write;
+    alox_InputSendMode mode;
+    uint32_t client_id;
+    bool all_clients;
+} alox_InputSendModeRequest;
+
+typedef struct _alox_InputSendModeResponse {
+    bool success;
+    alox_InputSendMode mode;
+    uint32_t client_id;
+    uint32_t slaves_updated;
+} alox_InputSendModeResponse;
+
+/* write=false: read UV enable; write=true: persist enable (and clear latch when disabling).
+ client_id 0 = local master; >0 = one slave; all_clients = master + every registered slave. */
+typedef struct _alox_BatteryUvRequest {
+    bool write;
+    bool enabled;
+    uint32_t client_id;
+    bool all_clients;
+} alox_BatteryUvRequest;
+
+typedef struct _alox_BatteryUvResponse {
+    uint32_t client_id;
+    bool success;
+    bool enabled;
+    bool latched;
+    uint32_t slaves_updated;
+} alox_BatteryUvResponse;
+
 /* * Host → master: read LiPo ADC voltages (master local and/or slaves via ESP-NOW). */
 typedef struct _alox_BatteryStatusRequest {
    /* * 0 = master only; >0 = one slave; ignored when all_clients */
@@ -231,6 +293,14 @@ typedef struct _alox_CacheStatusResponse {
    alox_CacheClientStatus clients[16];
 } alox_CacheStatusResponse;

+/* * Master → host over BLE notify: aggregated cache + ESP timer timestamp. */
+typedef struct _alox_BleStreamTick {
+    uint64_t esp_timestamp_us;
+    uint32_t period_ms;
+    pb_size_t clients_count;
+    alox_CacheClientStatus clients[16];
+} alox_BleStreamTick;
+
 typedef struct _alox_EspNowUnicastTestRequest {
    uint32_t client_id;
    uint32_t seq;
@@ -311,6 +381,15 @@ typedef struct _alox_RestartResponse {
    uint32_t client_id;
 } alox_RestartResponse;

+/* * Host → master or slave: clear persisted client-id assignment state. */
+typedef struct _alox_ClientIdMapResetRequest {
+    char dummy_field;
+} alox_ClientIdMapResetRequest;
+
+typedef struct _alox_ClientIdMapResetResponse {
+    bool success;
+} alox_ClientIdMapResetResponse;
+
 /* * Host → master: read/write global log level (esp_log_level_set("*", …)). */
 typedef struct _alox_SetLogLevelRequest {
    bool write;
@@ -355,7 +434,7 @@ typedef struct _alox_TapConfigResponse {
    bool enable_triple;
 } alox_TapConfigResponse;

-/* Host → device: begin UART OTA (erase inactive OTA slot; device replies OTA_STATUS). */
+/* Host → device: begin host OTA over UART or BLE (erase inactive OTA slot; device replies OTA_STATUS). */
 typedef struct _alox_OtaStartPayload {
    uint32_t total_size;
 } alox_OtaStartPayload;
@@ -443,6 +522,13 @@ typedef struct _alox_UartMessage {
        alox_SetLogLevelResponse set_log_level_response;
        alox_TapConfigRequest tap_config_request;
        alox_TapConfigResponse tap_config_response;
+        alox_BleStreamTick ble_stream_tick;
+        alox_ClientIdMapResetRequest client_id_map_reset_request;
+        alox_ClientIdMapResetResponse client_id_map_reset_response;
+        alox_InputSendModeRequest input_send_mode_request;
+        alox_InputSendModeResponse input_send_mode_response;
+        alox_BatteryUvRequest battery_uv_request;
+        alox_BatteryUvResponse battery_uv_response;
    } payload;
 } alox_UartMessage;

@@ -453,8 +539,12 @@ extern "C" {

 /* Helper constants for enums */
 #define _alox_MessageType_MIN alox_MessageType_UNKNOWN
-#define _alox_MessageType_MAX alox_MessageType_TAP_CONFIG
-#define _alox_MessageType_ARRAYSIZE ((alox_MessageType)(alox_MessageType_TAP_CONFIG+1))
+#define _alox_MessageType_MAX alox_MessageType_BATTERY_UV
+#define _alox_MessageType_ARRAYSIZE ((alox_MessageType)(alox_MessageType_BATTERY_UV+1))
+
+#define _alox_InputSendMode_MIN alox_InputSendMode_INPUT_SEND_BEST_EFFORT
+#define _alox_InputSendMode_MAX alox_InputSendMode_INPUT_SEND_RELIABLE
+#define _alox_InputSendMode_ARRAYSIZE ((alox_InputSendMode)(alox_InputSendMode_INPUT_SEND_RELIABLE+1))

 #define _alox_TapKind_MIN alox_TapKind_TAP_NONE
 #define _alox_TapKind_MAX alox_TapKind_TAP_TRIPLE
@@ -473,6 +563,12 @@ extern "C" {



+#define alox_InputSendModeRequest_mode_ENUMTYPE alox_InputSendMode
+
+#define alox_InputSendModeResponse_mode_ENUMTYPE alox_InputSendMode
+
+
+



@@ -506,6 +602,9 @@ extern "C" {



+
+
+



@@ -515,14 +614,18 @@ extern "C" {
 #define alox_Ack_init_default                    {0}
 #define alox_EchoPayload_init_default            {{{NULL}, NULL}}
 #define alox_VersionResponse_init_default        {0, {{NULL}, NULL}, {{NULL}, NULL}}
-#define alox_ClientInfo_init_default             {0, 0, 0, {{NULL}, NULL}, 0, 0, 0, 0, 0, 0, 0}
+#define alox_ClientInfo_init_default             {0, 0, 0, {{NULL}, NULL}, 0, 0, 0, 0, 0, 0, 0, 0}
 #define alox_ClientInfoResponse_init_default     {{{NULL}, NULL}}
 #define alox_ClientInput_init_default            {0, 0, 0, 0}
 #define alox_ClientInputResponse_init_default    {{{NULL}, NULL}}
 #define alox_AccelDeadzoneRequest_init_default   {0, 0, 0, 0}
 #define alox_AccelDeadzoneResponse_init_default  {0, 0, 0, 0}
-#define alox_AccelStreamRequest_init_default     {0, 0, 0, 0}
+#define alox_AccelStreamRequest_init_default     {0, 0, 0, 0, 0}
 #define alox_AccelStreamResponse_init_default    {0, 0, 0, 0}
+#define alox_InputSendModeRequest_init_default   {0, _alox_InputSendMode_MIN, 0, 0}
+#define alox_InputSendModeResponse_init_default  {0, _alox_InputSendMode_MIN, 0, 0}
+#define alox_BatteryUvRequest_init_default       {0, 0, 0, 0}
+#define alox_BatteryUvResponse_init_default      {0, 0, 0, 0, 0}
 #define alox_BatteryStatusRequest_init_default   {0, 0}
 #define alox_LipoReading_init_default            {0, 0}
 #define alox_BatterySample_init_default          {0, false, alox_LipoReading_init_default, false, alox_LipoReading_init_default, 0}
@@ -536,6 +639,7 @@ extern "C" {
 #define alox_CacheClientTap_init_default         {_alox_TapKind_MIN, 0}
 #define alox_CacheClientStatus_init_default      {0, false, alox_CacheClientAccel_init_default, false, alox_CacheClientTap_init_default}
 #define alox_CacheStatusResponse_init_default    {0, {alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default}}
+#define alox_BleStreamTick_init_default          {0, 0, 0, {alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default, alox_CacheClientStatus_init_default}}
 #define alox_EspNowUnicastTestRequest_init_default {0, 0}
 #define alox_EspNowUnicastTestResponse_init_default {0, 0}
 #define alox_EspNowEchoPingRequest_init_default  {0, 0}
@@ -546,6 +650,8 @@ extern "C" {
 #define alox_EspNowFindMeResponse_init_default   {0, 0}
 #define alox_RestartRequest_init_default         {0}
 #define alox_RestartResponse_init_default        {0, 0}
+#define alox_ClientIdMapResetRequest_init_default {0}
+#define alox_ClientIdMapResetResponse_init_default {0}
 #define alox_SetLogLevelRequest_init_default     {0, 0}
 #define alox_SetLogLevelResponse_init_default    {0, 0}
 #define alox_TapConfigRequest_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -561,14 +667,18 @@ extern "C" {
 #define alox_Ack_init_zero                       {0}
 #define alox_EchoPayload_init_zero               {{{NULL}, NULL}}
 #define alox_VersionResponse_init_zero           {0, {{NULL}, NULL}, {{NULL}, NULL}}
-#define alox_ClientInfo_init_zero                {0, 0, 0, {{NULL}, NULL}, 0, 0, 0, 0, 0, 0, 0}
+#define alox_ClientInfo_init_zero                {0, 0, 0, {{NULL}, NULL}, 0, 0, 0, 0, 0, 0, 0, 0}
 #define alox_ClientInfoResponse_init_zero        {{{NULL}, NULL}}
 #define alox_ClientInput_init_zero               {0, 0, 0, 0}
 #define alox_ClientInputResponse_init_zero       {{{NULL}, NULL}}
 #define alox_AccelDeadzoneRequest_init_zero      {0, 0, 0, 0}
 #define alox_AccelDeadzoneResponse_init_zero     {0, 0, 0, 0}
-#define alox_AccelStreamRequest_init_zero        {0, 0, 0, 0}
+#define alox_AccelStreamRequest_init_zero        {0, 0, 0, 0, 0}
 #define alox_AccelStreamResponse_init_zero       {0, 0, 0, 0}
+#define alox_InputSendModeRequest_init_zero      {0, _alox_InputSendMode_MIN, 0, 0}
+#define alox_InputSendModeResponse_init_zero     {0, _alox_InputSendMode_MIN, 0, 0}
+#define alox_BatteryUvRequest_init_zero          {0, 0, 0, 0}
+#define alox_BatteryUvResponse_init_zero         {0, 0, 0, 0, 0}
 #define alox_BatteryStatusRequest_init_zero      {0, 0}
 #define alox_LipoReading_init_zero               {0, 0}
 #define alox_BatterySample_init_zero             {0, false, alox_LipoReading_init_zero, false, alox_LipoReading_init_zero, 0}
@@ -582,6 +692,7 @@ extern "C" {
 #define alox_CacheClientTap_init_zero            {_alox_TapKind_MIN, 0}
 #define alox_CacheClientStatus_init_zero         {0, false, alox_CacheClientAccel_init_zero, false, alox_CacheClientTap_init_zero}
 #define alox_CacheStatusResponse_init_zero       {0, {alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero}}
+#define alox_BleStreamTick_init_zero             {0, 0, 0, {alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero, alox_CacheClientStatus_init_zero}}
 #define alox_EspNowUnicastTestRequest_init_zero  {0, 0}
 #define alox_EspNowUnicastTestResponse_init_zero {0, 0}
 #define alox_EspNowEchoPingRequest_init_zero     {0, 0}
@@ -592,6 +703,8 @@ extern "C" {
 #define alox_EspNowFindMeResponse_init_zero      {0, 0}
 #define alox_RestartRequest_init_zero            {0}
 #define alox_RestartResponse_init_zero           {0, 0}
+#define alox_ClientIdMapResetRequest_init_zero   {0}
+#define alox_ClientIdMapResetResponse_init_zero  {0}
 #define alox_SetLogLevelRequest_init_zero        {0, 0}
 #define alox_SetLogLevelResponse_init_zero       {0, 0}
 #define alox_TapConfigRequest_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -620,6 +733,7 @@ extern "C" {
 #define alox_ClientInfo_tap_notify_single_tag    9
 #define alox_ClientInfo_tap_notify_double_tag    10
 #define alox_ClientInfo_tap_notify_triple_tag    11
+#define alox_ClientInfo_uv_protection_enabled_tag 12
 #define alox_ClientInfoResponse_clients_tag      1
 #define alox_ClientInput_id_tag                  1
 #define alox_ClientInput_lage_x_tag              2
@@ -638,10 +752,28 @@ extern "C" {
 #define alox_AccelStreamRequest_enable_tag       2
 #define alox_AccelStreamRequest_client_id_tag    3
 #define alox_AccelStreamRequest_all_clients_tag  4
+#define alox_AccelStreamRequest_period_ms_tag    5
 #define alox_AccelStreamResponse_enabled_tag     1
 #define alox_AccelStreamResponse_client_id_tag   2
 #define alox_AccelStreamResponse_success_tag     3
 #define alox_AccelStreamResponse_slaves_updated_tag 4
+#define alox_InputSendModeRequest_write_tag      1
+#define alox_InputSendModeRequest_mode_tag       2
+#define alox_InputSendModeRequest_client_id_tag  3
+#define alox_InputSendModeRequest_all_clients_tag 4
+#define alox_InputSendModeResponse_success_tag   1
+#define alox_InputSendModeResponse_mode_tag      2
+#define alox_InputSendModeResponse_client_id_tag 3
+#define alox_InputSendModeResponse_slaves_updated_tag 4
+#define alox_BatteryUvRequest_write_tag          1
+#define alox_BatteryUvRequest_enabled_tag        2
+#define alox_BatteryUvRequest_client_id_tag      3
+#define alox_BatteryUvRequest_all_clients_tag    4
+#define alox_BatteryUvResponse_client_id_tag     1
+#define alox_BatteryUvResponse_success_tag       2
+#define alox_BatteryUvResponse_enabled_tag       3
+#define alox_BatteryUvResponse_latched_tag       4
+#define alox_BatteryUvResponse_slaves_updated_tag 5
 #define alox_BatteryStatusRequest_client_id_tag  1
 #define alox_BatteryStatusRequest_all_clients_tag 2
 #define alox_LipoReading_valid_tag               1
@@ -685,6 +817,9 @@ extern "C" {
 #define alox_CacheClientStatus_accel_tag         2
 #define alox_CacheClientStatus_tap_tag           3
 #define alox_CacheStatusResponse_clients_tag     1
+#define alox_BleStreamTick_esp_timestamp_us_tag  1
+#define alox_BleStreamTick_period_ms_tag         2
+#define alox_BleStreamTick_clients_tag           3
 #define alox_EspNowUnicastTestRequest_client_id_tag 1
 #define alox_EspNowUnicastTestRequest_seq_tag    2
 #define alox_EspNowUnicastTestResponse_success_tag 1
@@ -719,6 +854,7 @@ extern "C" {
 #define alox_RestartRequest_client_id_tag        1
 #define alox_RestartResponse_success_tag         1
 #define alox_RestartResponse_client_id_tag       2
+#define alox_ClientIdMapResetResponse_success_tag 1
 #define alox_SetLogLevelRequest_write_tag        1
 #define alox_SetLogLevelRequest_level_tag        2
 #define alox_SetLogLevelResponse_success_tag     1
@@ -801,6 +937,13 @@ extern "C" {
 #define alox_UartMessage_set_log_level_response_tag 38
 #define alox_UartMessage_tap_config_request_tag  39
 #define alox_UartMessage_tap_config_response_tag 40
+#define alox_UartMessage_ble_stream_tick_tag     41
+#define alox_UartMessage_client_id_map_reset_request_tag 42
+#define alox_UartMessage_client_id_map_reset_response_tag 43
+#define alox_UartMessage_input_send_mode_request_tag 44
+#define alox_UartMessage_input_send_mode_response_tag 45
+#define alox_UartMessage_battery_uv_request_tag  46
+#define alox_UartMessage_battery_uv_response_tag 47

 /* Struct field encoding specification for nanopb */
 #define alox_UartMessage_FIELDLIST(X, a) \
@@ -839,7 +982,14 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload,espnow_echo_ping_response,payload.es
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload,set_log_level_request,payload.set_log_level_request),  37) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload,set_log_level_response,payload.set_log_level_response),  38) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload,tap_config_request,payload.tap_config_request),  39) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload,tap_config_response,payload.tap_config_response),  40)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,tap_config_response,payload.tap_config_response),  40) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,ble_stream_tick,payload.ble_stream_tick),  41) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,client_id_map_reset_request,payload.client_id_map_reset_request),  42) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,client_id_map_reset_response,payload.client_id_map_reset_response),  43) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,input_send_mode_request,payload.input_send_mode_request),  44) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,input_send_mode_response,payload.input_send_mode_response),  45) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,battery_uv_request,payload.battery_uv_request),  46) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload,battery_uv_response,payload.battery_uv_response),  47)
 #define alox_UartMessage_CALLBACK NULL
 #define alox_UartMessage_DEFAULT NULL
 #define alox_UartMessage_payload_ack_payload_MSGTYPE alox_Ack
@@ -877,6 +1027,13 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload,tap_config_response,payload.tap_conf
 #define alox_UartMessage_payload_set_log_level_response_MSGTYPE alox_SetLogLevelResponse
 #define alox_UartMessage_payload_tap_config_request_MSGTYPE alox_TapConfigRequest
 #define alox_UartMessage_payload_tap_config_response_MSGTYPE alox_TapConfigResponse
+#define alox_UartMessage_payload_ble_stream_tick_MSGTYPE alox_BleStreamTick
+#define alox_UartMessage_payload_client_id_map_reset_request_MSGTYPE alox_ClientIdMapResetRequest
+#define alox_UartMessage_payload_client_id_map_reset_response_MSGTYPE alox_ClientIdMapResetResponse
+#define alox_UartMessage_payload_input_send_mode_request_MSGTYPE alox_InputSendModeRequest
+#define alox_UartMessage_payload_input_send_mode_response_MSGTYPE alox_InputSendModeResponse
+#define alox_UartMessage_payload_battery_uv_request_MSGTYPE alox_BatteryUvRequest
+#define alox_UartMessage_payload_battery_uv_response_MSGTYPE alox_BatteryUvResponse

 #define alox_Ack_FIELDLIST(X, a) \

@@ -906,7 +1063,8 @@ X(a, STATIC,   SINGULAR, UINT32,   version,           7) \
 X(a, STATIC,   SINGULAR, BOOL,     accel_stream_enabled,   8) \
 X(a, STATIC,   SINGULAR, BOOL,     tap_notify_single,   9) \
 X(a, STATIC,   SINGULAR, BOOL,     tap_notify_double,  10) \
-X(a, STATIC,   SINGULAR, BOOL,     tap_notify_triple,  11)
+X(a, STATIC,   SINGULAR, BOOL,     tap_notify_triple,  11) \
+X(a, STATIC,   SINGULAR, BOOL,     uv_protection_enabled,  12)
 #define alox_ClientInfo_CALLBACK pb_default_field_callback
 #define alox_ClientInfo_DEFAULT NULL

@@ -950,7 +1108,8 @@ X(a, STATIC,   SINGULAR, UINT32,   slaves_updated,    4)
 X(a, STATIC,   SINGULAR, BOOL,     write,             1) \
 X(a, STATIC,   SINGULAR, BOOL,     enable,            2) \
 X(a, STATIC,   SINGULAR, UINT32,   client_id,         3) \
-X(a, STATIC,   SINGULAR, BOOL,     all_clients,       4)
+X(a, STATIC,   SINGULAR, BOOL,     all_clients,       4) \
+X(a, STATIC,   SINGULAR, UINT32,   period_ms,         5)
 #define alox_AccelStreamRequest_CALLBACK NULL
 #define alox_AccelStreamRequest_DEFAULT NULL

@@ -962,6 +1121,39 @@ X(a, STATIC,   SINGULAR, UINT32,   slaves_updated,    4)
 #define alox_AccelStreamResponse_CALLBACK NULL
 #define alox_AccelStreamResponse_DEFAULT NULL

+#define alox_InputSendModeRequest_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, BOOL,     write,             1) \
+X(a, STATIC,   SINGULAR, UENUM,    mode,              2) \
+X(a, STATIC,   SINGULAR, UINT32,   client_id,         3) \
+X(a, STATIC,   SINGULAR, BOOL,     all_clients,       4)
+#define alox_InputSendModeRequest_CALLBACK NULL
+#define alox_InputSendModeRequest_DEFAULT NULL
+
+#define alox_InputSendModeResponse_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, BOOL,     success,           1) \
+X(a, STATIC,   SINGULAR, UENUM,    mode,              2) \
+X(a, STATIC,   SINGULAR, UINT32,   client_id,         3) \
+X(a, STATIC,   SINGULAR, UINT32,   slaves_updated,    4)
+#define alox_InputSendModeResponse_CALLBACK NULL
+#define alox_InputSendModeResponse_DEFAULT NULL
+
+#define alox_BatteryUvRequest_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, BOOL,     write,             1) \
+X(a, STATIC,   SINGULAR, BOOL,     enabled,           2) \
+X(a, STATIC,   SINGULAR, UINT32,   client_id,         3) \
+X(a, STATIC,   SINGULAR, BOOL,     all_clients,       4)
+#define alox_BatteryUvRequest_CALLBACK NULL
+#define alox_BatteryUvRequest_DEFAULT NULL
+
+#define alox_BatteryUvResponse_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   client_id,         1) \
+X(a, STATIC,   SINGULAR, BOOL,     success,           2) \
+X(a, STATIC,   SINGULAR, BOOL,     enabled,           3) \
+X(a, STATIC,   SINGULAR, BOOL,     latched,           4) \
+X(a, STATIC,   SINGULAR, UINT32,   slaves_updated,    5)
+#define alox_BatteryUvResponse_CALLBACK NULL
+#define alox_BatteryUvResponse_DEFAULT NULL
+
 #define alox_BatteryStatusRequest_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   client_id,         1) \
 X(a, STATIC,   SINGULAR, BOOL,     all_clients,       2)
@@ -1064,6 +1256,14 @@ X(a, STATIC,   REPEATED, MESSAGE,  clients,           1)
 #define alox_CacheStatusResponse_DEFAULT NULL
 #define alox_CacheStatusResponse_clients_MSGTYPE alox_CacheClientStatus

+#define alox_BleStreamTick_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT64,   esp_timestamp_us,   1) \
+X(a, STATIC,   SINGULAR, UINT32,   period_ms,         2) \
+X(a, STATIC,   REPEATED, MESSAGE,  clients,           3)
+#define alox_BleStreamTick_CALLBACK NULL
+#define alox_BleStreamTick_DEFAULT NULL
+#define alox_BleStreamTick_clients_MSGTYPE alox_CacheClientStatus
+
 #define alox_EspNowUnicastTestRequest_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   client_id,         1) \
 X(a, STATIC,   SINGULAR, UINT32,   seq,               2)
@@ -1138,6 +1338,16 @@ X(a, STATIC,   SINGULAR, UINT32,   client_id,         2)
 #define alox_RestartResponse_CALLBACK NULL
 #define alox_RestartResponse_DEFAULT NULL

+#define alox_ClientIdMapResetRequest_FIELDLIST(X, a) \
+
+#define alox_ClientIdMapResetRequest_CALLBACK NULL
+#define alox_ClientIdMapResetRequest_DEFAULT NULL
+
+#define alox_ClientIdMapResetResponse_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, BOOL,     success,           1)
+#define alox_ClientIdMapResetResponse_CALLBACK NULL
+#define alox_ClientIdMapResetResponse_DEFAULT NULL
+
 #define alox_SetLogLevelRequest_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, BOOL,     write,             1) \
 X(a, STATIC,   SINGULAR, UINT32,   level,             2)
@@ -1242,6 +1452,10 @@ extern const pb_msgdesc_t alox_AccelDeadzoneRequest_msg;
 extern const pb_msgdesc_t alox_AccelDeadzoneResponse_msg;
 extern const pb_msgdesc_t alox_AccelStreamRequest_msg;
 extern const pb_msgdesc_t alox_AccelStreamResponse_msg;
+extern const pb_msgdesc_t alox_InputSendModeRequest_msg;
+extern const pb_msgdesc_t alox_InputSendModeResponse_msg;
+extern const pb_msgdesc_t alox_BatteryUvRequest_msg;
+extern const pb_msgdesc_t alox_BatteryUvResponse_msg;
 extern const pb_msgdesc_t alox_BatteryStatusRequest_msg;
 extern const pb_msgdesc_t alox_LipoReading_msg;
 extern const pb_msgdesc_t alox_BatterySample_msg;
@@ -1255,6 +1469,7 @@ extern const pb_msgdesc_t alox_CacheClientAccel_msg;
 extern const pb_msgdesc_t alox_CacheClientTap_msg;
 extern const pb_msgdesc_t alox_CacheClientStatus_msg;
 extern const pb_msgdesc_t alox_CacheStatusResponse_msg;
+extern const pb_msgdesc_t alox_BleStreamTick_msg;
 extern const pb_msgdesc_t alox_EspNowUnicastTestRequest_msg;
 extern const pb_msgdesc_t alox_EspNowUnicastTestResponse_msg;
 extern const pb_msgdesc_t alox_EspNowEchoPingRequest_msg;
@@ -1265,6 +1480,8 @@ extern const pb_msgdesc_t alox_EspNowFindMeRequest_msg;
 extern const pb_msgdesc_t alox_EspNowFindMeResponse_msg;
 extern const pb_msgdesc_t alox_RestartRequest_msg;
 extern const pb_msgdesc_t alox_RestartResponse_msg;
+extern const pb_msgdesc_t alox_ClientIdMapResetRequest_msg;
+extern const pb_msgdesc_t alox_ClientIdMapResetResponse_msg;
 extern const pb_msgdesc_t alox_SetLogLevelRequest_msg;
 extern const pb_msgdesc_t alox_SetLogLevelResponse_msg;
 extern const pb_msgdesc_t alox_TapConfigRequest_msg;
@@ -1290,6 +1507,10 @@ extern const pb_msgdesc_t alox_OtaSlaveProgressResponse_msg;
 #define alox_AccelDeadzoneResponse_fields &alox_AccelDeadzoneResponse_msg
 #define alox_AccelStreamRequest_fields &alox_AccelStreamRequest_msg
 #define alox_AccelStreamResponse_fields &alox_AccelStreamResponse_msg
+#define alox_InputSendModeRequest_fields &alox_InputSendModeRequest_msg
+#define alox_InputSendModeResponse_fields &alox_InputSendModeResponse_msg
+#define alox_BatteryUvRequest_fields &alox_BatteryUvRequest_msg
+#define alox_BatteryUvResponse_fields &alox_BatteryUvResponse_msg
 #define alox_BatteryStatusRequest_fields &alox_BatteryStatusRequest_msg
 #define alox_LipoReading_fields &alox_LipoReading_msg
 #define alox_BatterySample_fields &alox_BatterySample_msg
@@ -1303,6 +1524,7 @@ extern const pb_msgdesc_t alox_OtaSlaveProgressResponse_msg;
 #define alox_CacheClientTap_fields &alox_CacheClientTap_msg
 #define alox_CacheClientStatus_fields &alox_CacheClientStatus_msg
 #define alox_CacheStatusResponse_fields &alox_CacheStatusResponse_msg
+#define alox_BleStreamTick_fields &alox_BleStreamTick_msg
 #define alox_EspNowUnicastTestRequest_fields &alox_EspNowUnicastTestRequest_msg
 #define alox_EspNowUnicastTestResponse_fields &alox_EspNowUnicastTestResponse_msg
 #define alox_EspNowEchoPingRequest_fields &alox_EspNowEchoPingRequest_msg
@@ -1313,6 +1535,8 @@ extern const pb_msgdesc_t alox_OtaSlaveProgressResponse_msg;
 #define alox_EspNowFindMeResponse_fields &alox_EspNowFindMeResponse_msg
 #define alox_RestartRequest_fields &alox_RestartRequest_msg
 #define alox_RestartResponse_fields &alox_RestartResponse_msg
+#define alox_ClientIdMapResetRequest_fields &alox_ClientIdMapResetRequest_msg
+#define alox_ClientIdMapResetResponse_fields &alox_ClientIdMapResetResponse_msg
 #define alox_SetLogLevelRequest_fields &alox_SetLogLevelRequest_msg
 #define alox_SetLogLevelResponse_fields &alox_SetLogLevelResponse_msg
 #define alox_TapConfigRequest_fields &alox_TapConfigRequest_msg
@@ -1332,21 +1556,26 @@ extern const pb_msgdesc_t alox_OtaSlaveProgressResponse_msg;
 /* alox_ClientInfo_size depends on runtime parameters */
 /* alox_ClientInfoResponse_size depends on runtime parameters */
 /* alox_ClientInputResponse_size depends on runtime parameters */
-#define ALOX_UART_MESSAGES_PB_H_MAX_SIZE         alox_CacheStatusResponse_size
+#define ALOX_UART_MESSAGES_PB_H_MAX_SIZE         alox_BleStreamTick_size
 #define alox_AccelDeadzoneRequest_size           16
 #define alox_AccelDeadzoneResponse_size          20
 #define alox_AccelSample_size                    32
-#define alox_AccelStreamRequest_size             12
+#define alox_AccelStreamRequest_size             18
 #define alox_AccelStreamResponse_size            16
 #define alox_Ack_size                            0
 #define alox_BatterySample_size                  32
 #define alox_BatteryStatusRequest_size           8
 #define alox_BatteryStatusResponse_size          580
+#define alox_BatteryUvRequest_size               12
+#define alox_BatteryUvResponse_size              18
+#define alox_BleStreamTick_size                  753
 #define alox_CacheClientAccel_size               26
 #define alox_CacheClientStatus_size              44
 #define alox_CacheClientTap_size                 8
 #define alox_CacheStatusRequest_size             0
 #define alox_CacheStatusResponse_size            736
+#define alox_ClientIdMapResetRequest_size        0
+#define alox_ClientIdMapResetResponse_size       2
 #define alox_ClientInput_size                    22
 #define alox_EspNowEchoPingRequest_size          17
 #define alox_EspNowEchoPingResponse_size         25
@@ -1354,6 +1583,8 @@ extern const pb_msgdesc_t alox_OtaSlaveProgressResponse_msg;
 #define alox_EspNowFindMeResponse_size           8
 #define alox_EspNowUnicastTestRequest_size       12
 #define alox_EspNowUnicastTestResponse_size      8
+#define alox_InputSendModeRequest_size           12
+#define alox_InputSendModeResponse_size          16
 #define alox_LedRingProgressRequest_size         64
 #define alox_LedRingProgressResponse_size        32
 #define alox_LipoReading_size                    8
@@ -27,7 +27,7 @@ enum MessageType {
  BATTERY_STATUS = 26;
  TAP_NOTIFY = 27;
  reserved 28;
-  /** Combined cached accel + tap poll (one UART round-trip, ~16 ms cadence). */
+  /** Combined cached accel + tap poll (one UART round-trip, ~10 ms cadence). */
  CACHE_STATUS = 29;
  /** Host → master → slave → master: timestamp echo round-trip (latency test). */
  ESPNOW_ECHO_PING = 30;
@@ -35,6 +35,23 @@ enum MessageType {
  SET_LOG_LEVEL = 31;
  /** Host → master: get/set BMA456H multitap detection parameters. */
  TAP_CONFIG = 32;
+  /** Master → host (BLE only): periodic pushed cache snapshot with ESP timestamp. */
+  BLE_STREAM_TICK = 33;
+  /**
+   * Host → device: clear master client-id NVS map + live registry (and notify
+   * online slaves), or on a slave clear local master/id binding only.
+   */
+  CLIENT_ID_MAP_RESET = 34;
+  /**
+   * Host → master: get/set slave ESP-NOW send path for accel/tap
+   * (best_effort / fast / wait / reliable).
+   */
+  INPUT_SEND_MODE = 35;
+  /**
+   * Host → master: get/set software LiPo UV protection enable (NVS per pod).
+   * client_id 0 = master; >0 = one slave; all_clients = master + every slave.
+   */
+  BATTERY_UV = 36;
 }

 message UartMessage {
@@ -75,6 +92,13 @@ message UartMessage {
    SetLogLevelResponse set_log_level_response = 38;
    TapConfigRequest tap_config_request = 39;
    TapConfigResponse tap_config_response = 40;
+    BleStreamTick ble_stream_tick = 41;
+    ClientIdMapResetRequest client_id_map_reset_request = 42;
+    ClientIdMapResetResponse client_id_map_reset_response = 43;
+    InputSendModeRequest input_send_mode_request = 44;
+    InputSendModeResponse input_send_mode_response = 45;
+    BatteryUvRequest battery_uv_request = 46;
+    BatteryUvResponse battery_uv_response = 47;
  }
 }

@@ -105,6 +129,8 @@ message ClientInfo {
  bool tap_notify_single = 9;
  bool tap_notify_double = 10;
  bool tap_notify_triple = 11;
+  /** Master cache: software UV protection enabled on this slave (NVS on device). */
+  bool uv_protection_enabled = 12;
 }

 message ClientInfoResponse { 
@@ -139,13 +165,15 @@ message AccelDeadzoneResponse {
  uint32 slaves_updated = 4;
 }

-// Host → master: enable/disable slave accel ESP-NOW stream (~16 ms per slave).
+// Host → master: enable/disable slave accel ESP-NOW stream (~10 ms per slave, best-effort).
 // write=false: read; write=true: apply. client_id 0 invalid for write (use >0 or all_clients).
+// period_ms (10–16): BLE host push interval for BleStreamTick; ignored on UART (default 10).
 message AccelStreamRequest {
  bool write = 1;
  bool enable = 2;
  uint32 client_id = 3;
  bool all_clients = 4;
+  uint32 period_ms = 5;
 }

 message AccelStreamResponse {
@@ -155,6 +183,51 @@ message AccelStreamResponse {
  uint32 slaves_updated = 4;
 }

+/**
+ * Slave ESP-NOW TX path for ACCEL_SAMPLE / TAP_EVENT (debug A/B).
+ * Maps 1:1 to esp_now_core_send_*.
+ */
+enum InputSendMode {
+  INPUT_SEND_BEST_EFFORT = 0;
+  INPUT_SEND_FAST = 1;
+  INPUT_SEND_WAIT = 2;
+  INPUT_SEND_RELIABLE = 3;
+}
+
+// Host → master: get/set input send mode on slaves.
+// write=false: return last mode remembered on master (client_id ignored).
+// write=true: push mode via ESP-NOW (all_clients or one client_id).
+message InputSendModeRequest {
+  bool write = 1;
+  InputSendMode mode = 2;
+  uint32 client_id = 3;
+  bool all_clients = 4;
+}
+
+message InputSendModeResponse {
+  bool success = 1;
+  InputSendMode mode = 2;
+  uint32 client_id = 3;
+  uint32 slaves_updated = 4;
+}
+
+// write=false: read UV enable; write=true: persist enable (and clear latch when disabling).
+// client_id 0 = local master; >0 = one slave; all_clients = master + every registered slave.
+message BatteryUvRequest {
+  bool write = 1;
+  bool enabled = 2;
+  uint32 client_id = 3;
+  bool all_clients = 4;
+}
+
+message BatteryUvResponse {
+  uint32 client_id = 1;
+  bool success = 2;
+  bool enabled = 3;
+  bool latched = 4;
+  uint32 slaves_updated = 5;
+}
+
 /** Host → master: read LiPo ADC voltages (master local and/or slaves via ESP-NOW). */
 message BatteryStatusRequest {
  /** 0 = master only; >0 = one slave; ignored when all_clients */
@@ -257,6 +330,13 @@ message CacheStatusResponse {
  repeated CacheClientStatus clients = 1 [(nanopb).max_count = 16];
 }

+/** Master → host over BLE notify: aggregated cache + ESP timer timestamp. */
+message BleStreamTick {
+  uint64 esp_timestamp_us = 1;
+  uint32 period_ms = 2;
+  repeated CacheClientStatus clients = 3 [(nanopb).max_count = 16];
+}
+
 message EspNowUnicastTestRequest {
  uint32 client_id = 1;
  uint32 seq = 2;
@@ -337,6 +417,13 @@ message RestartResponse {
  uint32 client_id = 2;
 }

+/** Host → master or slave: clear persisted client-id assignment state. */
+message ClientIdMapResetRequest {}
+
+message ClientIdMapResetResponse {
+  bool success = 1;
+}
+
 /** Host → master: read/write global log level (esp_log_level_set("*", …)). */
 message SetLogLevelRequest {
  bool write = 1;
@@ -381,7 +468,7 @@ message TapConfigResponse {
  bool enable_triple = 12;
 }

-// Host → device: begin UART OTA (erase inactive OTA slot; device replies OTA_STATUS).
+// Host → device: begin host OTA over UART or BLE (erase inactive OTA slot; device replies OTA_STATUS).
 message OtaStartPayload {
  uint32 total_size = 1;
 }
@@ -4,46 +4,28 @@
 #include "esp_log.h"
 #include "freertos/idf_additions.h"
 #include "hal/uart_types.h"
+#include "host_transport.h"
 #include "uart.h"
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>

 static const char *TAG = "[UART]";
-static QueueHandle_t uart_cmd_queue;

-static bool uart_enqueue_packet(const uart_packet_t *packet) {
-  if (packet->len == 0) {
-    return false;
+static esp_err_t uart_host_tx(const uint8_t *frame, size_t frame_len) {
+  int written = uart_write_bytes(UART_NUM, frame, frame_len);
+  if (written < 0 || (size_t)written != frame_len) {
+    return ESP_FAIL;
  }
-
-  generic_msg_t msg = {
-      .msg_id = packet->payload[0],
-      .len = packet->len > 1 ? packet->len - 1 : 0,
-      .payload = NULL,
-  };
-
-  if (msg.len > 0) {
-    msg.payload = malloc(msg.len);
-    if (msg.payload == NULL) {
-      ESP_LOGE(TAG, "failed to allocate command payload");
-      return false;
-    }
-    memcpy(msg.payload, &packet->payload[1], msg.len);
-  }
-
-  if (xQueueSend(uart_cmd_queue, &msg, pdMS_TO_TICKS(500)) != pdPASS) {
-    free(msg.payload);
-    ESP_LOGW(TAG, "command queue full (cmd 0x%02x)", (unsigned)msg.msg_id);
-    return false;
-  }
-  return true;
+  return ESP_OK;
 }

 void init_uart(QueueHandle_t cmd_queue) {
  esp_err_t err;

-  uart_cmd_queue = cmd_queue;
+  host_transport_set_cmd_queue(cmd_queue);
+  host_transport_set_tx(uart_host_tx);
+
  uart_config_t uart_config = {
      .baud_rate = UART_BAUD_RATE,
      .data_bits = UART_DATA_8_BITS,
@@ -85,27 +67,10 @@ void uart_read_task(void *param) {
    return;
  }

-  int len = 0;
-  uart_packet_t packet = {.state = STATE_START};
-  TickType_t last_byte_time = xTaskGetTickCount();
-  const TickType_t timeout_ticks = pdMS_TO_TICKS(50);
-
  while (1) {
-    len = uart_read_bytes(UART_NUM, data, UART_BUF_SIZE, pdMS_TO_TICKS(20));
+    int len = uart_read_bytes(UART_NUM, data, UART_BUF_SIZE, pdMS_TO_TICKS(20));
    if (len > 0) {
-      for (int i = 0; i < len; ++i) {
-        if (parse_uart_byte(data[i], &packet)) {
-          ESP_LOGI(TAG, "received message cmd=0x%02x len=%u",
-                   packet.len > 0 ? packet.payload[0] : 0, (unsigned)packet.len);
-          uart_enqueue_packet(&packet);
-        }
-      }
-      last_byte_time = xTaskGetTickCount();
-    } else if (packet.state != STATE_START) {
-      TickType_t now = xTaskGetTickCount();
-      if ((now - last_byte_time) > timeout_ticks) {
-        packet.state = STATE_START;
-      }
+      host_rx_bytes(data, (size_t)len);
    }
  }
 }
@@ -116,18 +81,27 @@ bool parse_uart_byte(uint8_t byte, uart_packet_t *p) {
    if (byte == START_MARKER) {
      p->index = 0;
      p->checksum = 0;
-      p->state = STATE_LEN;
+      p->len = 0;
+      p->state = STATE_LEN_LO;
    }
    break;

-  case STATE_LEN:
-    if (byte > MAX_PAYLOAD_SIZE || byte == 0) {
+  case STATE_LEN_LO:
+    p->len = byte;
+    p->state = STATE_LEN_HI;
+    break;
+
+  case STATE_LEN_HI: {
+    uint16_t len = (uint16_t)(p->len | ((uint16_t)byte << 8));
+    if (len == 0 || len > MAX_PAYLOAD_SIZE) {
      p->state = STATE_START;
    } else {
-      p->len = byte;
+      p->len = len;
+      p->index = 0;
      p->state = STATE_DATA;
    }
    break;
+  }

  case STATE_DATA:
    p->payload[p->index++] = byte;
@@ -156,27 +130,5 @@ bool parse_uart_byte(uint8_t byte, uart_packet_t *p) {
 }

 esp_err_t uart_send_framed(const uint8_t *payload, size_t len) {
-  if (payload == NULL || len == 0 || len > MAX_PAYLOAD_SIZE) {
-    return ESP_ERR_INVALID_ARG;
-  }
-
-  uint8_t checksum = 0;
-  for (size_t i = 0; i < len; i++) {
-    checksum ^= payload[i];
-  }
-
-  uint8_t frame[4 + MAX_PAYLOAD_SIZE];
-  size_t pos = 0;
-  frame[pos++] = START_MARKER;
-  frame[pos++] = (uint8_t)len;
-  memcpy(&frame[pos], payload, len);
-  pos += len;
-  frame[pos++] = checksum;
-  frame[pos++] = STOP_MARKER;
-
-  int written = uart_write_bytes(UART_NUM, frame, pos);
-  if (written < 0 || (size_t)written != pos) {
-    return ESP_FAIL;
-  }
-  return ESP_OK;
+  return host_send_framed(payload, len);
 }
@@ -22,13 +22,18 @@
 #define UART_DRIVER_TX_BUF_SIZE 4096
 #define START_MARKER 0xAA
 #define STOP_MARKER 0xCC
-#define MAX_BUF_SIZE 252
-#define MAX_PAYLOAD_SIZE                                                       \
-  MAX_BUF_SIZE - 4 // Buffer overhead, Start, Len, CRC, End
+/** Frame: AA | len_lo | len_hi | payload[len] | xor | CC */
+#define UART_FRAME_OVERHEAD 5
+/**
+ * Max application payload (type byte + protobuf). Sized for CLIENT_REGISTRY_MAX
+ * aggregations (CLIENT_INFO / BATTERY_STATUS with 16+ samples).
+ */
+#define MAX_PAYLOAD_SIZE 1024

 typedef enum {
  STATE_START,
-  STATE_LEN,
+  STATE_LEN_LO,
+  STATE_LEN_HI,
  STATE_DATA,
  STATE_CHECKSUM,
  STATE_STOP
@@ -36,8 +41,8 @@ typedef enum {

 typedef struct {
  uint8_t payload[MAX_PAYLOAD_SIZE];
-  uint8_t len;
-  uint8_t index;
+  uint16_t len;
+  uint16_t index;
  uint8_t checksum;
  parser_state_t state;
 } uart_packet_t;
@@ -42,7 +42,8 @@ void uart_cmd_init_response(alox_UartMessage *msg, alox_MessageType type,
 esp_err_t uart_cmd_send(const alox_UartMessage *msg, const char *log_tag) {
  esp_err_t err = uart_send_uart_message(msg);
  if (err != ESP_OK && log_tag != NULL) {
-    ESP_LOGE(log_tag, "failed to send UART response");
+    ESP_LOGE(log_tag, "failed to send UART response: %s",
+             esp_err_to_name(err));
  }
  return err;
 }
@@ -1,18 +1,26 @@
 #include "uart_proto.h"
+#include "esp_log.h"
 #include "pb_encode.h"
 #include "uart.h"
 #include <string.h>

+static const char *TAG = "[UART_PROTO]";
+
 esp_err_t uart_send_uart_message(const alox_UartMessage *msg) {
  uint8_t pb_buf[MAX_PAYLOAD_SIZE];
  pb_ostream_t stream = pb_ostream_from_buffer(pb_buf, sizeof(pb_buf));

  if (!pb_encode(&stream, alox_UartMessage_fields, msg)) {
+    ESP_LOGE(TAG, "pb_encode failed type=%u (%s)", (unsigned)msg->type,
+             PB_GET_ERROR(&stream));
    return ESP_FAIL;
  }

  uint8_t payload[MAX_PAYLOAD_SIZE];
  if (stream.bytes_written + 1 > sizeof(payload)) {
+    ESP_LOGE(TAG, "payload too large type=%u need=%u max=%u",
+             (unsigned)msg->type, (unsigned)(stream.bytes_written + 1),
+             (unsigned)sizeof(payload));
    return ESP_ERR_NO_MEM;
  }

@@ -421,7 +421,8 @@ CONFIG_BOOTLOADER_PROJECT_VER=1
 #
 # Application Rollback
 #
-# CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE is not set
+CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
+# CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK is not set
 # end of Application Rollback

 #
@@ -650,16 +651,296 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
 #
 # Bluetooth
 #
-# CONFIG_BT_ENABLED is not set
+CONFIG_BT_ENABLED=y
+# CONFIG_BT_BLUEDROID_ENABLED is not set
+CONFIG_BT_NIMBLE_ENABLED=y
+# CONFIG_BT_CONTROLLER_ONLY is not set
+CONFIG_BT_CONTROLLER_ENABLED=y
+# CONFIG_BT_CONTROLLER_DISABLED is not set
+
+#
+# NimBLE Options
+#
+CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
+# CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_NONE is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_ERROR is not set
+# CONFIG_BT_NIMBLE_LOG_LEVEL_WARNING is not set
+CONFIG_BT_NIMBLE_LOG_LEVEL_INFO=y
+# CONFIG_BT_NIMBLE_LOG_LEVEL_DEBUG is not set
+CONFIG_BT_NIMBLE_LOG_LEVEL=1
+CONFIG_BT_NIMBLE_MAX_CONNECTIONS=3
+CONFIG_BT_NIMBLE_MAX_BONDS=3
+CONFIG_BT_NIMBLE_MAX_CCCDS=8
+CONFIG_BT_NIMBLE_L2CAP_COC_MAX_NUM=0
+# CONFIG_BT_NIMBLE_PINNED_TO_CORE_0 is not set
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=y
+CONFIG_BT_NIMBLE_PINNED_TO_CORE=1
+CONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=4096
+CONFIG_BT_NIMBLE_ROLE_CENTRAL=y
+CONFIG_BT_NIMBLE_ROLE_PERIPHERAL=y
+CONFIG_BT_NIMBLE_ROLE_BROADCASTER=y
+CONFIG_BT_NIMBLE_ROLE_OBSERVER=y
+CONFIG_BT_NIMBLE_GATT_CLIENT=y
+CONFIG_BT_NIMBLE_GATT_SERVER=y
+# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
+# CONFIG_BT_NIMBLE_SMP_ID_RESET is not set
+CONFIG_BT_NIMBLE_SECURITY_ENABLE=y
+CONFIG_BT_NIMBLE_SM_LEGACY=y
+CONFIG_BT_NIMBLE_SM_SC=y
+# CONFIG_BT_NIMBLE_SM_SC_DEBUG_KEYS is not set
+CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_ENCRYPTION=y
+CONFIG_BT_NIMBLE_SM_LVL=0
+CONFIG_BT_NIMBLE_SM_SC_ONLY=0
+CONFIG_BT_NIMBLE_PRINT_ERR_NAME=y
+# CONFIG_BT_NIMBLE_DEBUG is not set
+# CONFIG_BT_NIMBLE_DYNAMIC_SERVICE is not set
+CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="nimble"
+CONFIG_BT_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31
+CONFIG_BT_NIMBLE_ATT_PREFERRED_MTU=256
+CONFIG_BT_NIMBLE_ATT_MAX_PREP_ENTRIES=64
+CONFIG_BT_NIMBLE_SVC_GAP_APPEARANCE=0
+
+#
+# Memory Settings
+#
+CONFIG_BT_NIMBLE_MSYS_1_BLOCK_COUNT=12
+CONFIG_BT_NIMBLE_MSYS_1_BLOCK_SIZE=256
+CONFIG_BT_NIMBLE_MSYS_2_BLOCK_COUNT=24
+CONFIG_BT_NIMBLE_MSYS_2_BLOCK_SIZE=320
+CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=24
+CONFIG_BT_NIMBLE_TRANSPORT_ACL_SIZE=255
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_SIZE=70
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_COUNT=30
+CONFIG_BT_NIMBLE_TRANSPORT_EVT_DISCARD_COUNT=8
+CONFIG_BT_NIMBLE_L2CAP_COC_SDU_BUFF_COUNT=1
+# end of Memory Settings
+
+CONFIG_BT_NIMBLE_GATT_MAX_PROCS=4
+# CONFIG_BT_NIMBLE_HS_FLOW_CTRL is not set
+CONFIG_BT_NIMBLE_RPA_TIMEOUT=900
+# CONFIG_BT_NIMBLE_MESH is not set
+CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS=y
+CONFIG_BT_NIMBLE_HS_STOP_TIMEOUT_MS=2000
+CONFIG_BT_NIMBLE_ENABLE_CONN_REATTEMPT=y
+CONFIG_BT_NIMBLE_MAX_CONN_REATTEMPT=3
+# CONFIG_BT_NIMBLE_HANDLE_REPEAT_PAIRING_DELETION is not set
+CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=y
+CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY=y
+CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY=y
+# CONFIG_BT_NIMBLE_EXT_ADV is not set
+CONFIG_BT_NIMBLE_EXT_SCAN=y
+CONFIG_BT_NIMBLE_ENABLE_PERIODIC_SYNC=y
+CONFIG_BT_NIMBLE_MAX_PERIODIC_SYNCS=0
+# CONFIG_BT_NIMBLE_GATT_CACHING is not set
+# CONFIG_BT_NIMBLE_INCL_SVC_DISCOVERY is not set
+CONFIG_BT_NIMBLE_WHITELIST_SIZE=12
+# CONFIG_BT_NIMBLE_TEST_THROUGHPUT_TEST is not set
+# CONFIG_BT_NIMBLE_BLUFI_ENABLE is not set
+CONFIG_BT_NIMBLE_USE_ESP_TIMER=y
+CONFIG_BT_NIMBLE_LEGACY_VHCI_ENABLE=y
+# CONFIG_BT_NIMBLE_BLE_GATT_BLOB_TRANSFER is not set
+
+#
+# BLE Services
+#
+CONFIG_BT_NIMBLE_PROX_SERVICE=y
+CONFIG_BT_NIMBLE_ANS_SERVICE=y
+CONFIG_BT_NIMBLE_CTS_SERVICE=y
+CONFIG_BT_NIMBLE_HTP_SERVICE=y
+CONFIG_BT_NIMBLE_IPSS_SERVICE=y
+CONFIG_BT_NIMBLE_TPS_SERVICE=y
+CONFIG_BT_NIMBLE_IAS_SERVICE=y
+CONFIG_BT_NIMBLE_LLS_SERVICE=y
+CONFIG_BT_NIMBLE_SPS_SERVICE=y
+CONFIG_BT_NIMBLE_HR_SERVICE=y
+# CONFIG_BT_NIMBLE_HID_SERVICE is not set
+CONFIG_BT_NIMBLE_BAS_SERVICE=y
+# CONFIG_BT_NIMBLE_SVC_BAS_BATTERY_LEVEL_NOTIFY is not set
+CONFIG_BT_NIMBLE_DIS_SERVICE=y
+# CONFIG_BT_NIMBLE_SVC_DIS_MANUFACTURER_NAME is not set
+# CONFIG_BT_NIMBLE_SVC_DIS_SERIAL_NUMBER is not set
+# CONFIG_BT_NIMBLE_SVC_DIS_HARDWARE_REVISION is not set
+# CONFIG_BT_NIMBLE_SVC_DIS_FIRMWARE_REVISION is not set
+# CONFIG_BT_NIMBLE_SVC_DIS_SOFTWARE_REVISION is not set
+# CONFIG_BT_NIMBLE_SVC_DIS_SYSTEM_ID is not set
+# CONFIG_BT_NIMBLE_SVC_DIS_PNP_ID is not set
+# CONFIG_BT_NIMBLE_SVC_DIS_INCLUDED is not set
+CONFIG_BT_NIMBLE_GAP_SERVICE=y
+
+#
+# GAP Appearance write permissions
+#
+# CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE is not set
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM=0
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM_ENC=0
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM_ATHN=0
+CONFIG_BT_NIMBLE_SVC_GAP_APPEAR_WRITE_PERM_ATHR=0
+# end of GAP Appearance write permissions
+
+CONFIG_BT_NIMBLE_SVC_GAP_CAR_CHAR_NOT_SUPP=y
+# CONFIG_BT_NIMBLE_SVC_GAP_CAR_NOT_SUPP is not set
+# CONFIG_BT_NIMBLE_SVC_GAP_CAR_SUPP is not set
+CONFIG_BT_NIMBLE_SVC_GAP_CENT_ADDR_RESOLUTION=-1
+
+#
+# GAP device name write permissions
+#
+# CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE is not set
+# end of GAP device name write permissions
+
+#
+# Peripheral Preferred Connection Parameters (PPCP) settings
+#
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_MAX_CONN_INTERVAL=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_MIN_CONN_INTERVAL=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_SLAVE_LATENCY=0
+CONFIG_BT_NIMBLE_SVC_GAP_PPCP_SUPERVISION_TMO=0
+# end of Peripheral Preferred Connection Parameters (PPCP) settings
+
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM=0
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM_ENC=0
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM_AUTHEN=0
+CONFIG_BT_NIMBLE_SVC_GAP_NAME_WRITE_PERM_AUTHOR=0
+# CONFIG_BT_NIMBLE_SVC_GAP_GATT_SECURITY_LEVEL is not set
+# CONFIG_BT_NIMBLE_SVC_GAP_RPA_ONLY is not set
+# end of BLE Services
+
+# CONFIG_BT_NIMBLE_VS_SUPPORT is not set
+# CONFIG_BT_NIMBLE_ENC_ADV_DATA is not set
+# CONFIG_BT_NIMBLE_HIGH_DUTY_ADV_ITVL is not set
+# CONFIG_BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN is not set
+# CONFIG_BT_NIMBLE_HOST_QUEUE_CONG_CHECK is not set
+# CONFIG_BT_NIMBLE_GATTC_PROC_PREEMPTION_PROTECT is not set
+# CONFIG_BT_NIMBLE_GATTC_AUTO_PAIR is not set
+
+#
+# Host-controller Transport
+#
+CONFIG_UART_HW_FLOWCTRL_DISABLE=y
+# CONFIG_UART_HW_FLOWCTRL_CTS_RTS is not set
+CONFIG_BT_NIMBLE_HCI_UART_FLOW_CTRL=0
+CONFIG_BT_NIMBLE_HCI_UART_RTS_PIN=19
+CONFIG_BT_NIMBLE_HCI_UART_CTS_PIN=23
+# end of Host-controller Transport
+
+CONFIG_BT_NIMBLE_EATT_CHAN_NUM=0
+# CONFIG_BT_NIMBLE_SUBRATE is not set
+# end of NimBLE Options
+
+#
+# Controller Options
+#
+CONFIG_BT_CTRL_MODE_EFF=1
+CONFIG_BT_CTRL_BLE_MAX_ACT=6
+CONFIG_BT_CTRL_BLE_MAX_ACT_EFF=6
+CONFIG_BT_CTRL_BLE_STATIC_ACL_TX_BUF_NB=0
+CONFIG_BT_CTRL_PINNED_TO_CORE_0=y
+# CONFIG_BT_CTRL_PINNED_TO_CORE_1 is not set
+CONFIG_BT_CTRL_PINNED_TO_CORE=0
+CONFIG_BT_CTRL_HCI_MODE_VHCI=y
+# CONFIG_BT_CTRL_HCI_MODE_UART_H4 is not set
+CONFIG_BT_CTRL_HCI_TL=1
+CONFIG_BT_CTRL_ADV_DUP_FILT_MAX=30
+CONFIG_BT_BLE_CCA_MODE_NONE=y
+# CONFIG_BT_BLE_CCA_MODE_HW is not set
+# CONFIG_BT_BLE_CCA_MODE_SW is not set
+CONFIG_BT_BLE_CCA_MODE=0
+CONFIG_BT_CTRL_HW_CCA_VAL=75
+CONFIG_BT_CTRL_HW_CCA_EFF=0
+CONFIG_BT_CTRL_CE_LENGTH_TYPE_ORIG=y
+# CONFIG_BT_CTRL_CE_LENGTH_TYPE_CE is not set
+# CONFIG_BT_CTRL_CE_LENGTH_TYPE_SD is not set
+CONFIG_BT_CTRL_CE_LENGTH_TYPE_EFF=0
+CONFIG_BT_CTRL_TX_ANTENNA_INDEX_0=y
+# CONFIG_BT_CTRL_TX_ANTENNA_INDEX_1 is not set
+CONFIG_BT_CTRL_TX_ANTENNA_INDEX_EFF=0
+CONFIG_BT_CTRL_RX_ANTENNA_INDEX_0=y
+# CONFIG_BT_CTRL_RX_ANTENNA_INDEX_1 is not set
+CONFIG_BT_CTRL_RX_ANTENNA_INDEX_EFF=0
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N24 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N21 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N18 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N15 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N12 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N9 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N6 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N3 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_N0 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P3 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P6 is not set
+CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P9=y
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P12 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P15 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P18 is not set
+# CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_P20 is not set
+CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF=11
+CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP=y
+CONFIG_BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_NUM=100
+CONFIG_BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
+CONFIG_BT_CTRL_BLE_SCAN_DUPL=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DEVICE=y
+# CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA is not set
+# CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE is not set
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE=0
+CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE=100
+CONFIG_BT_CTRL_DUPL_SCAN_CACHE_REFRESH_PERIOD=0
+# CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN is not set
+# CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EN is not set
+CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
+CONFIG_BT_CTRL_COEX_PHY_CODED_TX_RX_TLIM_EFF=0
+
+#
+# MODEM SLEEP Options
+#
+# CONFIG_BT_CTRL_MODEM_SLEEP is not set
+# end of MODEM SLEEP Options
+
+CONFIG_BT_CTRL_SLEEP_MODE_EFF=0
+CONFIG_BT_CTRL_SLEEP_CLOCK_EFF=0
+CONFIG_BT_CTRL_HCI_TL_EFF=1
+# CONFIG_BT_CTRL_AGC_RECORRECT_EN is not set
+# CONFIG_BT_CTRL_SCAN_BACKOFF_UPPERLIMITMAX is not set
+# CONFIG_BT_BLE_ADV_DATA_LENGTH_ZERO_AUX is not set
+CONFIG_BT_CTRL_CHAN_ASS_EN=y
+CONFIG_BT_CTRL_LE_PING_EN=y
+
+#
+# BLE disconnects when Instant Passed (0x28) occurs
+#
+# CONFIG_BT_CTRL_BLE_LLCP_CONN_UPDATE is not set
+# CONFIG_BT_CTRL_BLE_LLCP_CHAN_MAP_UPDATE is not set
+# CONFIG_BT_CTRL_BLE_LLCP_PHY_UPDATE is not set
+# end of BLE disconnects when Instant Passed (0x28) occurs
+
+# CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY is not set
+CONFIG_BT_CTRL_DTM_ENABLE=y
+CONFIG_BT_CTRL_BLE_MASTER=y
+# CONFIG_BT_CTRL_BLE_TEST is not set
+CONFIG_BT_CTRL_BLE_SCAN=y
+CONFIG_BT_CTRL_BLE_SECURITY_ENABLE=y
+CONFIG_BT_CTRL_BLE_ADV=y
+# CONFIG_BT_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS is not set
+
+#
+# Controller debug log Options (Experimental)
+#
+# end of Controller debug log Options (Experimental)
+# end of Controller Options

 #
 # Common Options
 #
+CONFIG_BT_ALARM_MAX_NUM=50
 # CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED is not set
 # CONFIG_BT_BLE_LOG_UHCI_OUT_ENABLED is not set
 # end of Common Options
+
+# CONFIG_BT_HCI_LOG_DEBUG_EN is not set
 # end of Bluetooth

+# CONFIG_BLE_MESH is not set
+
 #
 # Console Library
 #
@@ -789,7 +1070,8 @@ CONFIG_ESP_TLS_DYN_BUF_STRATEGY_SUPPORTED=y
 # Wireless Coexistence
 #
 CONFIG_ESP_COEX_ENABLED=y
-# CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE is not set
+CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
+# CONFIG_ESP_COEX_POWER_MANAGEMENT is not set
 # CONFIG_ESP_COEX_GPIO_DEBUG is not set
 # end of Wireless Coexistence

@@ -2233,6 +2515,11 @@ CONFIG_WL_SECTOR_SIZE=4096
 #
 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
+# CONFIG_WIFI_PROV_BLE_BONDING is not set
+CONFIG_WIFI_PROV_BLE_SEC_CONN=y
+# CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION is not set
+# CONFIG_WIFI_PROV_BLE_NOTIFY is not set
+# CONFIG_WIFI_PROV_KEEP_BLE_ON_AFTER_PROV is not set
 CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 # CONFIG_WIFI_PROV_STA_FAST_SCAN is not set
 # end of Wi-Fi Provisioning Manager
@@ -2243,7 +2530,8 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 # Deprecated options for backward compatibility
 # CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
 # CONFIG_NO_BLOBS is not set
-# CONFIG_APP_ROLLBACK_ENABLE is not set
+CONFIG_APP_ROLLBACK_ENABLE=y
+# CONFIG_APP_ANTI_ROLLBACK is not set
 # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
 # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
 # CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
@@ -2275,8 +2563,48 @@ CONFIG_STACK_CHECK_NONE=y
 # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set
 CONFIG_ESP32_APPTRACE_DEST_NONE=y
 CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y
-# CONFIG_EXTERNAL_COEX_ENABLE is not set
-# CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set
+# CONFIG_BLUEDROID_ENABLED is not set
+CONFIG_NIMBLE_ENABLED=y
+CONFIG_NIMBLE_MEM_ALLOC_MODE_INTERNAL=y
+# CONFIG_NIMBLE_MEM_ALLOC_MODE_DEFAULT is not set
+CONFIG_NIMBLE_MAX_CONNECTIONS=3
+CONFIG_NIMBLE_MAX_BONDS=3
+CONFIG_NIMBLE_MAX_CCCDS=8
+CONFIG_NIMBLE_L2CAP_COC_MAX_NUM=0
+# CONFIG_NIMBLE_PINNED_TO_CORE_0 is not set
+CONFIG_NIMBLE_PINNED_TO_CORE_1=y
+CONFIG_NIMBLE_PINNED_TO_CORE=1
+CONFIG_NIMBLE_TASK_STACK_SIZE=4096
+CONFIG_BT_NIMBLE_TASK_STACK_SIZE=4096
+CONFIG_NIMBLE_ROLE_CENTRAL=y
+CONFIG_NIMBLE_ROLE_PERIPHERAL=y
+CONFIG_NIMBLE_ROLE_BROADCASTER=y
+CONFIG_NIMBLE_ROLE_OBSERVER=y
+# CONFIG_NIMBLE_NVS_PERSIST is not set
+CONFIG_NIMBLE_SM_LEGACY=y
+CONFIG_NIMBLE_SM_SC=y
+# CONFIG_NIMBLE_SM_SC_DEBUG_KEYS is not set
+CONFIG_BT_NIMBLE_SM_SC_LVL=0
+# CONFIG_NIMBLE_DEBUG is not set
+CONFIG_NIMBLE_SVC_GAP_DEVICE_NAME="nimble"
+CONFIG_NIMBLE_GAP_DEVICE_NAME_MAX_LEN=31
+CONFIG_NIMBLE_ATT_PREFERRED_MTU=256
+CONFIG_NIMBLE_SVC_GAP_APPEARANCE=0
+CONFIG_BT_NIMBLE_MSYS1_BLOCK_COUNT=12
+CONFIG_BT_NIMBLE_ACL_BUF_COUNT=24
+CONFIG_BT_NIMBLE_ACL_BUF_SIZE=255
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_BT_NIMBLE_HCI_EVT_HI_BUF_COUNT=30
+CONFIG_BT_NIMBLE_HCI_EVT_LO_BUF_COUNT=8
+# CONFIG_NIMBLE_HS_FLOW_CTRL is not set
+CONFIG_NIMBLE_RPA_TIMEOUT=900
+# CONFIG_NIMBLE_MESH is not set
+CONFIG_NIMBLE_CRYPTO_STACK_MBEDTLS=y
+# CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EN is not set
+CONFIG_BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_DIS=y
+CONFIG_SW_COEXIST_ENABLE=y
+CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
+CONFIG_ESP_WIFI_SW_COEXIST_ENABLE=y
 # CONFIG_CAM_CTLR_DVP_CAM_ISR_IRAM_SAFE is not set
 # CONFIG_GPTIMER_ISR_IRAM_SAFE is not set
 # CONFIG_MCPWM_ISR_IRAM_SAFE is not set
@@ -0,0 +1,11 @@
+# BLE host transport (NimBLE) + WiFi/ESP-NOW coexistence
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
+
+# Pin stacks to different cores (WiFi stays on core 0)
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=y
+CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y
+
+# OTA A/B: new image boots PENDING_VERIFY; crash/reset before confirm → rollback
+CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
Author	SHA1	Message	Date
skrueckenandCursor	8f90dfe82f	Send ESP-NOW accel only on deadzone change and harden BLE+WiFi OTA coex. Quiet pods no longer spam 100 Hz samples; mute wifi logs and throttle BLE notifies during slave distribution so the wifi task stack does not panic. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 00:55:50 +01:00
skrueckenandCursor	141176a824	Send large BLE host frames across multiple notifies. Prefer ATT MTU 517 and chunk oversized responses so CLIENT_INFO/BATTERY work with many pods; reset the goTool parser after timeouts so partial frames do not poison the next exchange. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 23:53:40 +01:00
skrueckenandCursor	9046677460	Raise host frame payload limit so multi-client UART replies fit. Use a uint16 LE length and 1024-byte max payload so CLIENT_INFO and BATTERY_STATUS no longer fail encoding past ~10 connected pods. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 23:43:33 +01:00
skrueckenandCursor	73f48c8002	Add LED ring boot chase and connect flash animations. Give pods quick visual feedback on power-up and when a slave joins the master. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 22:57:31 +01:00
skrueckenandCursor	7f28a48a10	Add runtime UV protection toggle and treat near-zero sense as external power. Per-pod NVS enable (default off) via UART/ESP-NOW/dashboard, and skip UV latch when LiPo ADC reads ~0 mV so USB/external supply still boots. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 22:51:17 +01:00
skrueckenandCursor	c3b20887bf	Phase accel ESP-NOW TX into 1 ms slots from Discover sync. Master broadcasts master_time_us; slaves schedule sends at offset_ms=(assigned_id-1)%8 so concurrent streams collide less. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 22:35:47 +01:00
skrueckenandCursor	1adaddd6c8	Add selectable ESP-NOW send path for accel/tap input. Expose best_effort/fast/wait/reliable via UART, dashboard, and CLI so loss vs latency can be compared under real multi-pod load. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 22:34:03 +01:00
skrueckenandCursor	178ab46cec	Make controller input best-effort and harden OTA rollback. Accel/tap use fire-and-forget ESP-NOW with a 10 ms FreeRTOS-safe cadence, OTA recovers from seq gaps and auto-reboots after success, and bootloader app rollback confirms after a stable boot. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 22:16:28 +01:00
skrueckenandCursor	ae8ef40820	Enable host OTA over BLE and harden ESP-NOW slave distribution. Allow the same staged firmware upload path on BLE as UART, fix distribute stack/event-group crashes, and recover sticky slave OTA sessions instead of failing with err=4. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 20:42:14 +01:00
skrueckenandCursor	567dab6d0a	Assign sequential pod IDs from the master with NVS-stable bindings. Replaces MAC-byte self-IDs with master allocation (1–255), slave preferred-ID reconnect, debug reset via UART/UI, and rate-limited ASSIGN to avoid ESP-NOW NO_MEM storms. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 17:25:07 +01:00
skrueckenandCursor	af20635047	Harden BLE host link and expose latency tools in the dashboard. Add BLE RTT/stream tests and live tick median in the UI, fix concurrent WebSocket writes and late BATTERY replies, and skip 2M PHY updates that assert under ESP-NOW coexistence. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-23 23:27:39 +02:00
skrueckenandCursor	aa67edfe94	Add dynamic UART/BLE host connect for serve, dashboard, and WS. Serve starts without a required port; REST/WS/UI can scan and switch transports, with BLE live ticks and UART-only OTA. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-23 22:40:28 +02:00
skrueckenandCursor	92a13d7fd0	Add BLE host transport selectable via DIP8 alongside UART. Master can speak the same framed protobuf protocol over NimBLE or UART; goTool gains -ble, ble-rtt, and ble-stream timing checks for ESP-NOW coexistence. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-23 16:11:10 +02:00