[core] Script improvements including choose (#20547 )

[dfrobot_sen0465] Add DFRobot SEN0465-SEN0476 electrochemical gas sensors (#20880 )
Co-authored-by: J. Nick Koston <nick@home-assistant.io> Co-authored-by: J. Nick Koston <nick@koston.org>
2026-10-17 11:42:51 +00:00 · 2026-10-17 21:23:12 +11:00 · 2026-10-16 22:47:50 -10:00 · 2026-10-16 22:47:28 -10:00 · 2026-10-16 22:05:21 -10:00 · 2026-10-16 22:04:01 -10:00
1167 changed files with 46299 additions and 6234 deletions
@@ -0,0 +1,123 @@
+---
+name: hardware-test
+description: Test an ESPHome change on real boards over USB. Use this whenever a task asks to test, verify, reproduce, bench, A/B or soak a pull request, a branch or a crash on hardware, or mentions flashing, serial logs, esphome upload, a captive portal or fallback AP test, or results to post on a PR. Covers finding the serial ports, building from the right checkout, flashing each chip family (including the LibreTiny kits that stock tools cannot flash), bounded log capture, proven test flows and how to report results.
+allowed-tools: Read, Write, Edit, Bash, Glob, Grep
+---
+
+# Hardware testing
+
+The goal of a hardware test is evidence a reviewer can trust: which build ran on which board, what was
+driven, what the logs show, and the same flow on a `dev` build when a quirk could be pre-existing.
+`$SKILL` below is this directory (`.agents/skills/hardware-test`).
+
+## Ground rules
+
+1. **Serial ports cannot be shared.** One bounded capture per port, stopped before any flash on that
+   port, never an open-ended `esphome logs`. Stop a capture with `pkill -f "[s]erial_capture.py <port> "`,
+   naming the port so a capture on another board survives; the bracket keeps the pattern from matching
+   the shell that runs it. Never run `esphome logs` in a
+   `while true` loop: the loop respawns it and holds the port.
+2. **Credentials stay local.** Put a `secrets.yaml` next to the scratch configs and reference it with
+   `!secret`. Never paste a config with credentials into a PR, never commit scratch configs or logs.
+3. **Build from the tree under test.** `python -m esphome` puts the current directory first on
+   `sys.path`, so run it with the checkout or worktree as the working directory and pass the yaml by
+   its absolute path. A venv `esphome` entry point may import an installed snapshot instead of the
+   checkout. Confirm with `python -c 'import esphome; print(esphome.__file__)'`, and for an A/B grep
+   the build's `src/` for the change before trusting any number.
+4. **PR build and baseline build get different `name:` values.** Builds share
+   `.esphome/build/<name>`, so the same name means `esphome upload` can flash the wrong binary. Saved
+   Wi-Fi credentials are keyed by the name too, so a test that must start unprovisioned gets a fresh
+   name every run.
+5. **Flash and RAM deltas are measured against the PR's merge base** (`git merge-base origin/dev HEAD`
+   checked out in a throwaway worktree), with the baseline commit named in the table. When a delta
+   looks odd, diff symbol sizes (`nm -S -C --size-sort` from the matching toolchain) before quoting it.
+6. **Prove a quirk is pre-existing before blaming the PR:** run the identical flow on a `dev` build in
+   the same session and say so in the results.
+7. **Pipe safely.** Set `PYTHONUNBUFFERED=1` on any `esphome run` or `esphome logs` whose output is
+   piped, or lines land minutes late. Bound every long command with `timeout` (coreutils) or
+   `perl -e 'alarm shift; exec @ARGV' <seconds> <command>` on macOS without it.
+
+## Workflow
+
+1. **Find the boards:** `python $SKILL/scripts/ports.py` (any Python with pyserial, for example the
+   ESPHome venv). Port names follow the USB hub port and change on every replug, so never reuse a name
+   from an earlier session. CH340 adapters (D1 mini, BW15 kit, BK7238, CB3S) all look the same; tell
+   them apart with a 10 s capture using `serial_capture.py --reset` (ESP8266 prints its ROM banner at
+   74880 baud, LibreTiny boards print `[LT]` and ESPHome lines, BK7238 prints its bootloader version).
+   `ports.py --wait 2e8a` blocks until a Pico re-enumerates.
+2. **Make a scratch directory** outside the checkout, with `secrets.yaml` and the templates you need.
+   One yaml per board per variant, file name equal to `name:`.
+3. **Compile** in the right tree:
+   `(cd <worktree> && PYTHONUNBUFFERED=1 timeout 1500 python -m esphome compile <abs yaml> > <name>-compile.log 2>&1)`.
+   Keep the RAM and flash lines at the end. Two ESP-IDF or two LibreTiny builds at the same time race
+   over tool caches; run them one at a time.
+4. **Flash** per chip family (table below). Stop the capture on that port first.
+5. **Capture** with `serial_capture.py PORT SECONDS OUT` in the background, then poll the file with
+   `grep` in an `until ... sleep 2` loop with a cap. USB CDC boards (Pico, nRF52, native USB ESP32)
+   drop the port on reboot; the script reopens it until its deadline.
+6. **Drive** the test: a second board running a client config, `curl`, an aioesphomeapi script that
+   presses a template button and subscribes to logs, MQTT publishes, or `interval:` and `on_boot:`
+   automations in the config itself.
+7. **Analyze** with `grep -a -c` counts over the capture and keep an `-events.txt` extract of the lines
+   that matter. Decode crashes with the platform's `addr2line` (see `reference/boards.md`).
+8. **Report** on the PR as a table: build SHA, board and framework, what was driven, counts, result,
+   plus the `dev` control row and the exact flow in a `<details>` block. No credentials, no port names,
+   no IP addresses.
+
+## Flashing by chip family
+
+| Board | Flash | Log |
+|---|---|---|
+| ESP8266 D1 mini (CH340) | `python -m esphome upload <yaml> --device <port>` | `serial_capture.py` at 115200; `esphome logs` on some CH340s emits garbage after the RTS reset. A failed esptool write can wedge the adapter until the board is replugged. `esptool erase_flash` before a test that needs an unprovisioned device: the preference sector survives a reflash |
+| ESP32 devkit (CP2102 or CH340) | `esphome upload --device <port>`, ESP-IDF or Arduino | `serial_capture.py`. Default Wi-Fi light sleep delays API driven actions by seconds; judge timing from device logs. `power_save_mode: none` for OTA overlap tests |
+| ESP32-S3, C3, C6, H2 native USB | `esphome upload --device /dev/cu.usbmodem*` | `logger: hardware_uart: USB_SERIAL_JTAG`. The USB console can wedge when the app takes over the console (0 bytes, esptool `No serial data received`); replug, or watch through `esphome logs --device <name>.local` |
+| Pico W / Pico 2 W | `esphome upload --device <port>` (1200 baud touch); first flash ever via BOOTSEL and `--device /Volumes/RPI-RP2` or `RP2350` | port re-enumerates after upload: `ports.py --wait 2e8a` then capture |
+| BW15 kit (RTL8720CF, rtl87xx) | `~/.platformio/penv/.libretiny/bin/python $SKILL/scripts/flash_rtl87xx_kit.py flash write -d <port> <build>/.pioenvs/<name>/*.uf2`. Plain `esphome upload` and plain ltchiptool time out because opening the port asserts DTR/RTS and holds the chip in reset | `serial_capture.py --released`, never `esphome logs` |
+| BK7238 / CB3S (bk72xx, RTS on CEN) | `~/.platformio/penv/.libretiny/bin/python $SKILL/scripts/flash_bk72xx.py flash write -d <port> <uf2>` (about 75 s) | logs are on UART2 by default; `logger: hardware_uart: UART1` puts them on the flashing adapter. Opening the port resets the chip, so keep one capture open for the whole test |
+| LN882H | ltchiptool forces 1 Mbaud for writes; weak adapters need `LN882H_YM_BAUDRATE` patched to 115200 in the penv's `ln882htool.py`; short BOOT to GND while the tool connects | OTA after the first flash |
+| nRF52840 Dongle (PCA10059) | Nordic `nrfutil nrf5sdk-tools dfu usb-serial` on the bootloader port, or `dfu: true` in the config so the 1200 baud touch pin-resets into the bootloader; adafruit-nrfutil is refused | app has two CDC ports, ESPHome log on the second |
+| Adafruit-style nRF52 (UF2 bootloader) | `UF2BOOT` volume or adafruit-nrfutil; `dfu: true` works through GPREGRET | single CDC port |
+| Any reachable device | `esphome upload <yaml> --device <ip or name.local>`; `--file <bin>` for a prebuilt image | `esphome logs --device <ip>` bounded with `timeout` |
+
+ESP-IDF OTA image: `.esphome/build/<name>/build/firmware.ota.bin`. LibreTiny OTA port is 8892.
+
+## Scripts in `$SKILL/scripts`
+
+- `ports.py`: list ports with VID:PID, product, serial and a board guess; `--wait VID[:PID]`,
+  `--product NAME`, `--serial SN` (one specific board, whatever path it comes back under) and
+  `--serial-of PORT` (the serial number behind a path).
+- `serial_capture.py PORT SECONDS OUT [--baud] [--released] [--reset] [--append]`: bounded timestamped
+  capture, ANSI stripped, `LOG_SECRET` text written as `<secret>`, reopens a vanished port, exits at the
+  deadline. OUT is truncated unless `--append` is given, so counts over it cover one run.
+- `flash_rtl87xx_kit.py`: ltchiptool wrapper for the BW15 kit whose CH340 drives CEN (RTS) and the boot
+  strap (DTR). `flash read` needs the family `realtek-ambz2`; `flash write` does not.
+- `flash_bk72xx.py`: ltchiptool wrapper for BK72xx boards whose RTS drives CEN.
+- `wifisave_hammer.sh KIND DUT_PORT DUT_YAML DUT_TREE CLIENT_PORT CLIENT_YAML CLIENT_TREE [SETTLE]`:
+  the fallback AP plus captive portal hammer end to end (compile, flash, capture, counts) with the
+  templates below. KIND is `esp`, `pico`, `bw15` or `bk`. It ends with `RESULT PASS` (exit 0),
+  `RESULT FAIL` (exit 3: a crash, a reboot after the AP came up, or the device never joined the network),
+  `RESULT INVALID`
+  (exit 2: a precondition was missed, the stimulus was insufficient, or a capture did not last the run)
+  or exits 1 when a build, flash or port step failed.
+
+## Templates in `$SKILL/templates`
+
+- `dut-fallback-ap.yaml` (package): a device that never finds its network, falls back to its AP and
+  serves the captive portal. `example-dut.yaml` is the per-run file with the platform block.
+- `client-wifisave.yaml` (package): joins that AP, posts N bogus `/wifisave` requests, then the real
+  credentials from `!secret`. `example-client.yaml` is the per-run file. `bogus_saves: "1"` gives a
+  plain provisioning check.
+
+## When something looks wrong
+
+- A capture stopped early or a line is missing: check the timestamps before trusting it.
+- The client never joins the AP: another board may still run an AP with the same SSID, or the device
+  booted with saved credentials because the name was reused. One AP device at a time on the bench.
+- Builds come out byte-identical between branches: the wrong tree was imported (rule 3).
+- Multicast from the host never arrives on some access points: test it device to device. Broadcast
+  is lossy under Wi-Fi power save, unicast is not. Throttle UDP floods to a fixed packet rate.
+- `api:` reboots a board after 15 min without a client: `reboot_timeout: 0s` on `api:` and `mqtt:` for
+  soak tests.
+
+`reference/boards.md` has per-chip facts and crash decoding; `reference/recipes.md` has the proven
+flows. Add new findings there.
@@ -0,0 +1,138 @@
+# Board facts
+
+Ports are not listed on purpose: they follow the USB hub port and change on every replug. Run
+`scripts/ports.py`.
+
+## ESP8266 (D1 mini, NodeMCU, CH340 or CP2102)
+
+- Opening the port usually resets the board through DTR, but not always; `serial_capture.py --reset`
+  pulses RTS to capture from boot. 74880 baud shows the ROM boot messages (`rst cause`, `boot mode`).
+- `esphome logs` on some CH340s emits thousands of duplicated garbage lines right after the RTS reset;
+  a plain pyserial capture at 115200 is reliable.
+- A failed esptool write can wedge the adapter (`termios` error 22, or an open that hangs) until replug.
+- The preference sector survives a reflash: a provisioned API key or saved Wi-Fi credentials stay
+  active. `esptool erase_flash` gives a clean device.
+- `Panic core_esp8266_main.cpp:191 __yield` with `ctx: sys` means a yield from lwIP context (a web
+  handler, an lwIP callback). Decode stacks with
+  `xtensa-lx106-elf-addr2line -e <build>/.pioenvs/<name>/firmware.elf -f -C -i <addr...>` from the
+  toolchain under `~/.platformio/packages/toolchain-xtensa/bin/` (PlatformIO builds) or the ESPHome
+  cache directory (native toolchain builds).
+- Constant data lives in RAM unless marked `PROGMEM`; with 80 KB of RAM a few hundred bytes are worth a
+  row in the PR.
+- AsyncMqttClient drops inbound topics over 128 characters; topics of 255 or more wrap a counter and
+  stall the link until the broker drops TCP.
+
+## ESP32 classic devkit
+
+- Takes ESP-IDF and Arduino. Default Wi-Fi light sleep delays API driven actions by up to 6 s; judge
+  timings from device logs, not from the host. `power_save_mode: none` for OTA overlap tests (an IDF web
+  upload of 739 KB took 107 s with power save and 45 s without).
+- Receives only a few percent of IPv6 multicast on some access points with power save on; a raw lwIP
+  socket loses the same, so that is the AP or driver, not a PR.
+- Decode with `xtensa-esp32-elf-addr2line` from the IDF tools directory against
+  `<build>/.pioenvs/<name>/firmware.elf` (PlatformIO) or `<build>/build/<name>.elf` (IDF native).
+- Clean reboot between runs with the capture stopped: `esptool --after hard_reset chip_id`.
+- Trigger a forced crash only after the app is marked valid (45 s after boot is plenty), never on an
+  image still pending OTA rollback.
+- Signed OTA testing: build with `esp32.framework.advanced.signed_ota_verification.verification_keys`
+  under a different name, sign with `python -m espsecure sign_data --version 2 --keyfile
+  tests/components/esp32/dummy_signing_key.pem`, upload with `esphome upload --file`. The verifier
+  refuses unsigned images afterwards, so restore with a signed plain build.
+
+## ESP32-S3, C3, C6, H2 with native USB
+
+- `/dev/cu.usbmodem*`, esptool works, `logger: hardware_uart: USB_SERIAL_JTAG`.
+- The USB console can die at the moment the app takes over the console during a reboot (log stops after
+  `Disabling RNG early entropy source`, then 0 bytes, esptool reports `No serial data received`). Only a
+  USB replug fixes it. Fallback: `esphome logs --device <name>.local` (API log stream, which drops lines
+  while Wi-Fi is off).
+- The ESP32-P4 before silicon revision 3 is bricked by rev3-only firmware (boot loop at bootloader entry).
+
+## RP2040 / RP2350 (Pico W, Pico 2 W)
+
+- The CDC port re-enumerates after every reboot and after `esphome upload` (1200 baud touch). Re-detect
+  with `ports.py --wait 2e8a` before capturing; `serial_capture.py` reopens on its own if the port
+  vanishes mid-capture.
+- First flash ever: BOOTSEL, then `esphome upload --device /Volumes/RPI-RP2` (or `RP2350`).
+- arduino-pico creates the lwIP netif in `WiFi.begin()`, so any IGMP join during component setup fails;
+  joins must wait for `network::is_connected()`.
+- Parallel Pico builds race on package extraction after a PlatformIO package wipe; one at a time.
+- An RTS pulse from pyserial does not reset the board; reboot with `App.safe_reboot()` or the touch.
+
+## BW15 kit (RTL8720CF, LibreTiny rtl87xx)
+
+- The kit's CH340 wires RTS to CEN and DTR to PA00 (boot strap). A plain pyserial open asserts both and
+  holds the chip in reset, which is why `esphome upload`, plain `ltchiptool` and `esphome logs` all fail
+  ("Timeout while linking", or silence). `scripts/flash_rtl87xx_kit.py` sets DTR high and RTS released
+  on every open, pulses RTS once so the ROM answers `ping`, and after the command drops DTR and pulses
+  RTS to boot the app. Run it with the PlatformIO LibreTiny penv Python.
+- `flash write -d <port> <uf2>` takes no family argument; `flash read -d <port> -s 0 -l <len>
+  realtek-ambz2 <out>` does.
+- Capture with `serial_capture.py --released`. The ESPHome log is on the flashing UART already.
+- The macOS CH340 driver only pushes DTR/RTS to the wire once a session has driven them, so the first
+  plain open after a replug streams logs and the second is silent; always open with the lines released.
+- Driver quirks seen on `dev`: `WiFi.begin` can refuse the real network on the first try after bogus
+  credentials (it connects after two cooldowns); right after connecting while the AP is still up the
+  driver can bus-fault in `rtw_is_adapter_up` (`R0 = 0xdeadbeef`) and reboot; the AP restarts on every
+  STA retry, so stations cannot stay joined; `WiFi.begin` fails synchronously for an absent network and
+  lands in a cooldown at once; connecting blocks the loop 2.5 to 4.1 s.
+- Decode faults with `arm-none-eabi-addr2line -e <build>/.pioenvs/<name>/raw_firmware.elf -f -C -i <PC>`
+  from `~/.platformio/packages/toolchain-gccarmnoneeabi/bin/` (`raw_firmware.elf`, not `firmware.elf`).
+  Fault dumps print PC, LR and R0 to R3.
+- The AmebaZ2 SDK sets `LWIP_TCPIP_CORE_LOCKING 0`.
+
+## BK7238, WB3S, CB3S (BK7231N) (LibreTiny bk72xx, CH340, RTS on CEN)
+
+- Stock ltchiptool closes and reopens the port after its reset, and pyserial raises both lines on open,
+  holding CEN low through the BootROM window. `scripts/flash_bk72xx.py` opens with both released and
+  pulses the reset right before the link checks. A write takes about 75 s. Only a CEN or power reset
+  reaches the downloader; no software reboot does.
+- ESPHome logs on UART2 by default; `logger: hardware_uart: UART1` puts them on the flashing adapter.
+- Opening the port resets the chip (bootloader banner on every open, even with DTR/RTS low), so keep one
+  capture open for the whole test and never reopen mid-phase.
+- Callbacks run on the `async_tcp` task and log lines can lose a byte. Wi-Fi connect takes tens of ms;
+  radio enable 160 to 278 ms, disable about 200 ms.
+
+## BW16 kit (RTL8720DN, AmebaD)
+
+- The kit's own USB-C (CH340) is on LOG_UART and flashes fine. Its two-transistor circuit resets while
+  RTS alone is asserted and straps BURN while DTR alone is; both asserted does nothing. ROM entry is
+  esptool's classic sequence (`dtr:false,rts:true` 100 ms, `dtr:true,rts:false` 400 ms, both false); the
+  first pulse after a replug can be lost, retry up to three times.
+- Any reopen resets the chip, 460800 is flaky, 115200 is solid: one open per session, in-place baud
+  changes only. The ROM and the loader NAK continuously while idle, so ACK scans must drain first.
+- The AmebaD core has no mDNS responder (`mdns: disabled: true`).
+
+## LN882H
+
+- ltchiptool forces 1 Mbaud for writes; adapters that cannot hold it fail with "Timeout while linking"
+  or die mid-write. Patch `LN882H_YM_BAUDRATE` in the penv's `ltchiptool/soc/ln882h/util/ln882htool.py`
+  to 115200 (lost on reprovision). Weak 3.3 V from the adapter: feed the module's 5 V pad instead. Short
+  BOOT to GND while the tool connects. OTA afterwards.
+- `USE_WIFI_AP_EXCLUSIVE` (one radio mode at a time) exists only on LN882x; compile-check changes there.
+
+## nRF52840
+
+- Nordic PCA10059 dongle: the factory Open DFU bootloader enumerates as `1915:521F` on its own port
+  name; the app as `2FE3:0100` with two CDC ports, ESPHome log on the second. Only Nordic
+  `nrfutil nrf5sdk-tools` works (`pkg generate --hw-version 52 --sd-req 0x00 --application-version 1
+  --application zephyr.hex app.zip`, then `dfu usb-serial -pkg app.zip -p <port>`); ESPHome downloads
+  it on the first build. GPREGRET does not enter the bootloader; a pin reset through P0.19 does, which
+  `dfu: true` wires up on this board. A pulsing red LED means bootloader; the side RESET button
+  re-enters it.
+- Makerdiary MDK USB dongle: UF2 bootloader without SoftDevice, app at 0x1000, `UF2BOOT` volume,
+  adafruit-nrfutil, GPREGRET 0x57 works. RGB LED active low (red P0.23, green P0.22, blue P0.24),
+  button P0.18.
+
+## ESP Thread Border Router board v1.2 (S3 host + H2 RCP)
+
+- S3 host on USB JTAG serial, H2 RCP on its own USB. Spinel UART1 from the host: `rx_pin: GPIO17`,
+  `tx_pin: GPIO18`, RCP reset `GPIO7` active low, 460800. The config needs `network: enable_ipv6: true`.
+- The shipped H2 firmware fails `CheckRadioCapabilities` with IDF 5.5; build `examples/openthread/ot_rcp`
+  for esp32h2 with ESPHome's own IDF (`IDF_PATH` at the cached framework, its penv and tools,
+  `IDF_PYTHON_CHECK_CONSTRAINTS=no`) and flash with esptool at 0x0, 0x8000 and 0x10000.
+- A crash-looping S3 pulses the H2 reset every boot, so the H2 cannot be flashed and the S3 will not
+  enter its bootloader over USB. Hold S3 BOOT, tap S3 RST, flash the H2, release, then replug both.
+- `dns-sd -L <name> _meshcop._udp local.` shows the `omr` prefix; it disappears when routing is dead.
+  Keep one capture per chip; never reset the H2 over USB mid-test unless that is the test (the host
+  logs `Unexpected RCP reset: RESET_OTHER` and recovers).
@@ -0,0 +1,117 @@
+# Proven test flows
+
+Each flow names the pull requests it was used on, so their result tables show what to post.
+
+## Captive portal `/wifisave` hammer (#20802, #20784)
+
+Reproduces a `/wifisave` arriving during the STA cooldown, and proves a fix on every board.
+Device under test: `templates/example-dut.yaml` (bogus network, `ap:` with `ap_timeout: 15s`,
+`captive_portal:`). Client: `templates/example-client.yaml` on an ESP32 or a D1 mini; it joins the
+device's AP, posts 15 bogus saves 3 s apart, then the real credentials. With the portal up the cooldown
+is 30 s, so nearly every save lands inside one. Driver: `scripts/wifisave_hammer.sh`. Settle 40 s on
+ESP boards, 90 s on the BW15 (its first attempt on the real network fails, see boards.md).
+
+Counts that matter: `Requested WiFi Settings Change` (saves received), `Exiting cooldown early`, crash
+markers, boots (`Log initialized`), and the client's `bogus save status 200` and `real save status 200`.
+A healthy run: every save answered 200, one cooldown exit per save (two on the BW15, whose retry enters
+the adapter restart), no panic, and the real credentials connect the device within about 10 s.
+
+Fault injection for AP start failures: wrap `this->ap_setup_ = this->wifi_start_ap_(this->ap_)` in
+`setup_ap_config_()` with an `HWTEST_AP_FAIL_COUNT` build flag
+(`esphome: platformio_options: build_flags: -DHWTEST_AP_FAIL_COUNT=2`), raise the portal's "Captive
+portal started" from LOGV to LOGI, and after provisioning curl the device's STA address: connection
+refused proves the portal's server is gone.
+
+## `reboot_timeout` with a fallback AP (#9958)
+
+Only one board runs the AP at a time, or stations join the wrong one. AP probe: bogus network,
+`ap: {ssid, password, ap_timeout: 5s}`, `reboot_timeout: 60s`, `logger: level: VERBOSE` (ESP32 and
+ESP8266 log `AP client connected MAC=` at verbose), `on_boot: logger.log: BOOT`. Station probes:
+`reboot_timeout: 0s`, `interval: 150s` running `wifi.disable`, `delay: 20s`, `wifi.enable` (60 s cycles
+are too short to cover the due moment). Pass pattern: "Can't connect; rebooting" exactly 60 s after boot
+with no station joined, no reboot for minutes while one is, then a reboot within a second of the last
+disconnect. The BW15 restarts its AP on every STA retry and cannot be tested this way.
+
+## MQTT (#20433, #17935, #20762, #20767, #20768)
+
+A local mosquitto with `allow_anonymous true`, `log_type all` and `log_dest file`: the broker log gives
+each subscription's QoS, the device address (`New client connected from <ip> as <name>-<mac>`) and exact
+subscribe counts. Kill and restart mosquitto to exercise `on_disconnect` (reason 0) and resubscription.
+Keep `reboot_timeout: 0s` on `api:` and `mqtt:`. The ESP-IDF outbox swings free heap about 2 kB right
+after bulk subscribe and unsubscribe; read the heap seconds later over several rounds before calling a
+leak. Spawned subscriptions need about 2.5 s to reach the broker before the next publish.
+`esphome logs --device MQTT` only uses the MQTT transport when the config has no `api:`. Driver pattern: a
+paho script publishes and polls the serial capture file.
+
+## UDP, multicast, sockets (#20556 to #20559, #20585, #20590)
+
+A listener on port 9 needs no privileges on macOS. Test multicast device to device; host to device
+multicast never arrives on some access points, and `239.255.x.x` groups are unreliable even to a stock
+listener. Broadcast to boards is lossy under power save, unicast is not. Flood at a fixed packet rate
+(the host hits `ENOBUFS` unthrottled); 1500 packets per second survived on every board. A forced Wi-Fi
+reconnect on the Pico keeps IGMP membership. Set a long loop interval from `wifi.on_connect`
+(`App.set_loop_interval(20000)`), not `on_boot`, or Wi-Fi connect crawls. The `logger.log` action
+rejects `%.*s`; use a lambda.
+
+## OTA overlap and lock (#20588), OTA timeouts (#19041), deflate (#19037)
+
+All overlap orders (a web upload during a native OTA and the reverse) must be refused; the lock release
+after an interrupted web upload waits about 14 s (ESP8266) or 7 s (ESP-IDF) for disconnect detection. A
+refused web client on `web_server_idf` never gets the busy reply; the connection drops at reboot.
+`pkill -f "a\|b"` does not alternate; use two pkills.
+
+## DHCP lease cache (#17767)
+
+Cycle 20 s awake, `deep_sleep.enter 30s`, wake, 20 s, `App.safe_reboot()`, logging `millis()` at the
+`wifi.connected` condition. An RTS hardware reset must fall back to DHCP; a software reboot and a deep
+sleep wake must apply the cache. `esphome run --no-logs` silently skipped the upload on one board; use
+`upload` then `logs`.
+
+## HDMI-CEC two-board wire (#9189)
+
+Two boards on one wire: promiscuous mode, a 0x8F request answered with 0x90 0x00, a `destination:`
+filter on the reply handler, template buttons for each target plus lambdas calling
+`send(source, dest, span)` as another initiator. Healthy numbers: device-side turnaround 15 to 22 ms,
+round trip 144 to 156 ms. Press buttons over the API; judge timings from device logs (ESP32 light sleep
+lags the press).
+
+## LD2450 polygon zones (#20154)
+
+To make a target "leave" without anyone moving, set the radar's Zone-1 numbers over the target and
+switch the zone type to `Filter` (the count drops to 0 within 0.5 s); set it back to `Disabled` after.
+Writing those numbers blocks the ld2450 loop about 50 ms.
+
+## Scheduler and loop wake A/B (#20356)
+
+An external component whose template button arms an SDK `os_timer` (50 ms, one shot) on the ESP8266;
+the callback runs in SYS context, records `millis()` and calls `set_timeout` or `defer`; the timeout
+logs the elapsed time and loop count delta. Drive with an aioesphomeapi script (`subscribe_logs` plus
+`button_command`). Build the same yaml twice with different names, one per tree.
+
+## Noise handshake and OTA encryption on the ESP8266 (#19062, #19233)
+
+Host side timing is useless on a weak link; use an on-device bench with the minimum of five runs over
+two boots. Provision a key with `noise_encryption_set_key` through aioesphomeapi and upload with
+`espota2.run_ota(host, 8266, None, bin, noise_psk=key)` when the key is not in the yaml.
+
+## ESP-NOW on the ESP8266 (#14407)
+
+The NONOS SDK only delivers broadcast ESP-NOW frames while the station is associated or a soft-AP is
+up; a hidden, open, client-less soft-AP (60 s beacon, DHCP stopped) makes broadcasts arrive. In AP-only
+mode the device transmits from the soft-AP MAC.
+
+## Wi-Fi Easy Connect (DPP) enrollee (#17934)
+
+Only an Android phone configures: Settings, network details, Add device, Share Wi-Fi (the Wi-Fi list's
+QR scanner makes the phone an enrollee). Render the URI with the `qrcode` module and open the PNG.
+`esp32: framework: log_level: DEBUG` plus `sdkconfig_options: CONFIG_WPA_DEBUG_PRINT: y` prints the
+supplicant state machine.
+
+## Thread border router (#18104)
+
+See boards.md for the ESP Thread BR board. Check that the H2 answers Spinel before blaming a PR.
+
+## nRF52840 dongle boards (#19009, #20814)
+
+Test config: the two LEDs as inverted GPIO outputs, the button as an inverted pull-up binary sensor, a
+10 s alive interval. To retest the nrfutil download path, move the cached `sdk-nrf/nrfutil` aside first.
@@ -0,0 +1,51 @@
+"""ltchiptool for boards whose RTS drives CEN: reset and link on one open port.
+
+Stock ltchiptool closes and reopens the port after its DTR/RTS reset, and
+pyserial raises both lines on open, holding CEN low through the BootROM's
+listen window. Open with both lines released and pulse the reset right
+before the LinkChecks instead.
+"""
+
+import sys
+
+import bk7231tools.serial.main as bk_main
+from ltchiptool.__main__ import cli
+from ltchiptool.soc.bk72xx.flash import BK72XXFlash
+from serial import Serial
+
+
+class ReleasedSerial(Serial):
+    def __init__(self, port=None, **kwargs):
+        super().__init__(None, **kwargs)
+        self.dtr = False
+        self.rts = False
+        self.port = port
+        self.open()
+
+
+bk_main.Serial = ReleasedSerial
+
+_connect = BK72XXFlash.flash_connect
+
+
+def flash_hw_reset(self) -> None:
+    self._reset_pending = True
+
+
+def flash_connect(self) -> None:
+    pending = getattr(self, "_reset_pending", False)
+    if self.bk and self.conn.linked and not pending:
+        return
+    self.flash_build_protocol()
+    if pending:
+        self._reset_pending = False
+        self.bk.hw_reset()
+        self.conn.linked = False  # the chip rebooted, so link again below
+    _connect(self)
+
+
+BK72XXFlash.flash_hw_reset = flash_hw_reset
+BK72XXFlash.flash_connect = flash_connect
+
+sys.argv = ["ltchiptool", *sys.argv[1:]]
+cli()
@@ -0,0 +1,87 @@
+"""ltchiptool for the BW15 kit whose CH340 drives CEN (RTS) and PA00 (DTR).
+
+A plain open asserts both lines and holds the chip in reset. Here every open keeps DTR high and RTS
+released; the first open pulses RTS so the ROM comes up; after the command DTR low plus an RTS pulse
+boots the app. The exit status is ltchiptool's; 2 means the flash succeeded but the app was not
+booted (boot pulse failed, or no -d PORT to send it to), so the board sits in the ROM until reset.
+
+Usage: python flash_rtl87xx_kit.py flash write -d <port> firmware.uf2
+"""
+
+import sys
+import time
+
+import serial
+
+_first = [True]
+_orig_open = serial.Serial.open
+
+
+def _open(self):
+    self.dtr = True  # PA00 high: ROM download mode on the next reset
+    self.rts = False  # CEN released
+    _orig_open(self)
+    if _first[0]:
+        _first[0] = False
+        self.rts = True
+        time.sleep(0.1)
+        self.rts = False
+        time.sleep(0.3)  # reset into the ROM
+        self.reset_input_buffer()
+
+
+serial.Serial.open = _open
+
+from ltchiptool.__main__ import cli_entrypoint  # noqa: E402
+
+
+def port_argument(argv: list[str]) -> str | None:
+    for i, a in enumerate(argv):
+        if a in ("-d", "--device") and i + 1 < len(argv):
+            return argv[i + 1]
+        if a.startswith(("-d=", "--device=")):
+            return a.split("=", 1)[1]
+        if a.startswith("-d") and len(a) > 2:
+            return a[2:]
+    return None
+
+
+def boot_app(port: str) -> None:
+    s = serial.Serial(port=None)
+    s.port = port
+    s.dtr = False
+    s.rts = False
+    _orig_open(s)
+    s.rts = True
+    time.sleep(0.1)
+    s.rts = False
+    s.close()
+
+
+def main() -> int:
+    rc = 1
+    try:
+        result = cli_entrypoint.main(args=sys.argv[1:], standalone_mode=False)
+        rc = int(result) if isinstance(result, int) else 0
+    finally:
+        port = port_argument(sys.argv)
+        if not port:
+            print(
+                "[flash_rtl87xx_kit] no -d PORT given, the application was not booted",
+                file=sys.stderr,
+            )
+            if rc == 0:
+                rc = 2
+        else:
+            try:
+                boot_app(port)
+                print("[flash_rtl87xx_kit] application booted")
+            except (serial.SerialException, OSError) as err:
+                print(f"[flash_rtl87xx_kit] boot pulse failed: {err}", file=sys.stderr)
+                if rc == 0:
+                    rc = 2  # flashed, but the board is still in the ROM: press reset
+    return rc
+
+
+if __name__ == "__main__":
+    sys.exit(main())
@@ -0,0 +1,123 @@
+"""List the boards on USB, or wait for one to enumerate.
+
+  ports.py                          table: port, vid:pid, product, serial number, guess
+  ports.py --wait 2e8a              print the first port with VID 0x2e8a once it appears (default 60 s)
+  ports.py --wait 1a86:7523 --timeout 30
+  ports.py --product "USB Serial"   first port whose USB product string matches (case-insensitive)
+  ports.py --wait 2e8a --serial SN  the port of one specific board, whatever name it comes back under
+  ports.py --serial-of PORT         print the USB serial number behind a port name
+
+Run with a Python that has pyserial (any ESPHome venv). Port names follow the hub port on macOS, so
+re-run this after every replug instead of trusting a name from an earlier session.
+"""
+
+import argparse
+import sys
+import time
+
+from serial.tools import list_ports
+
+GUESS = [
+    (
+        (0x1A86, 0x7523),
+        "CH340: D1 mini, BW15 kit, BK7238/CB3S or LN882H adapter; identify by the boot banner",
+    ),
+    ((0x1A86, 0x55D3), "CH343: ESP32-P4 devkit console"),
+    ((0x1A86, 0x55D4), "CH343: ESP32 devkit"),
+    ((0x1A86, None), "WCH CH34x USB serial bridge"),
+    ((0x10C4, 0xEA60), "CP2102: classic ESP32 devkit (esp32dev)"),
+    (
+        (0x303A, 0x1001),
+        "Espressif USB JTAG serial: S3/C3/C6/H2 native USB (logger hardware_uart USB_SERIAL_JTAG)",
+    ),
+    (
+        (0x2E8A, None),
+        "Raspberry Pi Pico W / Pico 2 W CDC; the port vanishes and comes back on every reboot",
+    ),
+    ((0x1915, 0x521F), "nRF52840 Dongle (PCA10059) in the Open DFU bootloader"),
+    (
+        (0x2FE3, 0x0100),
+        "nRF52840 Dongle running a Zephyr app; two CDC ports, ESPHome log on the second",
+    ),
+    ((0x1915, 0xCAFE), "Makerdiary nRF52840 MDK dongle running a Zephyr app"),
+    ((0x239A, None), "Adafruit style nRF52 board (UF2 bootloader family)"),
+]
+
+
+def guess(vid: int, pid: int) -> str:
+    for (gv, gp), text in GUESS:
+        if vid == gv and (gp is None or pid == gp):
+            return text
+    return ""
+
+
+def parse_id(text: str) -> tuple[int, int | None]:
+    vid, _, pid = text.partition(":")
+    return int(vid, 16), (int(pid, 16) if pid else None)
+
+
+def matches(
+    port, vid: int | None, pid: int | None, product: str | None, serial: str | None
+) -> bool:
+    if vid is not None and (port.vid != vid or (pid is not None and port.pid != pid)):
+        return False
+    if product and (port.product or "").lower() != product.lower():
+        return False
+    return not serial or (port.serial_number or "") == serial
+
+
+def main() -> int:
+    ap = argparse.ArgumentParser(
+        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    ap.add_argument(
+        "--wait",
+        metavar="VID[:PID]",
+        help="block until a matching port appears, print it",
+    )
+    ap.add_argument("--product", help="USB product string to match")
+    ap.add_argument("--serial", help="USB serial number to match")
+    ap.add_argument(
+        "--serial-of", metavar="PORT", help="print the USB serial number of PORT"
+    )
+    ap.add_argument("--timeout", type=float, default=60)
+    args = ap.parse_args()
+
+    if args.serial_of:
+        for p in list_ports.comports():
+            if p.device == args.serial_of and p.serial_number:
+                print(p.serial_number)
+                return 0
+        print(f"no USB serial number for {args.serial_of}", file=sys.stderr)
+        return 1
+
+    vid = pid = None
+    if args.wait:
+        vid, pid = parse_id(args.wait)
+
+    if args.wait or args.product or args.serial:
+        deadline = time.time() + args.timeout
+        while True:
+            for p in sorted(list_ports.comports(), key=lambda p: p.device):
+                if p.vid and matches(p, vid, pid, args.product, args.serial):
+                    print(p.device)
+                    return 0
+            if time.time() >= deadline:
+                print("no matching port", file=sys.stderr)
+                return 1
+            time.sleep(1)
+
+    rows = [p for p in list_ports.comports() if p.vid]
+    if not rows:
+        print("no USB serial ports")
+        return 1
+    for p in sorted(rows, key=lambda p: p.device):
+        print(
+            f"{p.device:32} {p.vid:04x}:{p.pid:04x}  {p.product or '?':34} "
+            f"{p.serial_number or '':18} {guess(p.vid, p.pid)}"
+        )
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
@@ -0,0 +1,157 @@
+"""Bounded, timestamped serial capture that always exits and closes the port.
+
+  serial_capture.py PORT SECONDS OUTFILE [--baud 115200] [--released] [--reset] [--append]
+
+  default      open with DTR/RTS as pyserial leaves them (asserted); fine for ESP devkits and the Pico.
+  --released   drive DTR and RTS low before opening: the BW15 and BK7238 CH340 kits strap the boot pin
+               (DTR) and reset (RTS), so a plain open holds the chip in reset.
+  --reset      pulse reset after opening (DTR low, RTS high 100 ms, RTS low) to capture a fresh boot.
+  --baud       115200 by default; 74880 shows the ESP8266 ROM boot messages.
+  --append     keep what OUTFILE already holds; by default it is truncated so counts cover this run only.
+
+Exit status 1 when nothing was received (wrong port name, or a port another capture still holds).
+Text ESPHome marks as secret (LOG_SECRET, the Wi-Fi password) is written as <secret>.
+Lines are written as [HH:MM:SS]text with ANSI colour stripped and flushed one by one, so a shell
+loop can grep the file while the capture runs. If the port is missing or disappears (USB CDC boards
+re-enumerate on reboot) the script retries until the deadline, and follows the board by its USB serial
+number when it comes back under another device path.
+
+Never run an open-ended serial session: every capture has a deadline, and a flash on the same port
+needs the capture stopped first (pkill -f "[s]erial_capture.py" does not match the killing shell).
+"""
+
+import argparse
+import contextlib
+import pathlib
+import re
+import sys
+import time
+
+import serial
+from serial.tools import list_ports
+
+ANSI = re.compile(rb"\x1b\[[0-9;]*[A-Za-z]")
+# ESPHome's LOG_SECRET span (a Wi-Fi password); a span cut off before its end marker is secret to the end
+SECRET = re.compile(rb"\x1b\[8m.*?(?:\x1b\[28m|$)", re.DOTALL)
+PORT_ERRORS = (serial.SerialException, OSError)
+
+
+def identify(port: str) -> tuple[str | None, int]:
+    """USB serial number of the port and its position among that device's ports (a dongle has two)."""
+    ports = sorted(list_ports.comports(), key=lambda p: p.device)
+    serial_number = next((p.serial_number for p in ports if p.device == port), None)
+    siblings = [
+        p.device for p in ports if serial_number and p.serial_number == serial_number
+    ]
+    return serial_number, siblings.index(port) if port in siblings else 0
+
+
+def current_path(port: str, serial_number: str | None, index: int) -> str:
+    """The port's current device path: a USB CDC board can come back under a new name after a reboot."""
+    if serial_number:
+        ports = sorted(list_ports.comports(), key=lambda p: p.device)
+        siblings = [p.device for p in ports if p.serial_number == serial_number]
+        if index < len(siblings):
+            return siblings[index]
+    return port
+
+
+def open_port(args: argparse.Namespace, path: str) -> serial.Serial:
+    s = serial.Serial(port=None, baudrate=args.baud, timeout=0.2)
+    s.port = path
+    if args.released:
+        s.dtr = False
+        s.rts = False
+    s.open()
+    if args.reset:
+        try:
+            s.dtr = False
+            s.rts = True
+            time.sleep(0.1)
+            s.rts = False
+            s.reset_input_buffer()
+        except PORT_ERRORS:
+            s.close()
+            raise
+    return s
+
+
+def write_line(out, tag: bytes, data: bytes) -> None:
+    stamp = time.strftime("[%H:%M:%S]").encode()
+    out.write(stamp + tag + ANSI.sub(b"", SECRET.sub(b"<secret>", data)) + b"\n")
+    out.flush()
+
+
+def note(out, text: str) -> None:
+    write_line(out, b"[capture] ", text.encode())
+
+
+def capture(args: argparse.Namespace, out) -> int:
+    """Returns the number of bytes received."""
+    deadline = time.time() + args.seconds
+    buf = b""
+    s = None
+    received = 0
+    serial_number, index = None, 0
+    while time.time() < deadline:
+        if s is None:
+            path = current_path(args.port, serial_number, index)
+            try:
+                s = open_port(args, path)
+                args.reset = False  # only reset on the first open
+                if serial_number is None:
+                    serial_number, index = identify(path)
+                if path != args.port:
+                    note(out, f"reopened as {path}")
+            except PORT_ERRORS as err:
+                note(out, f"open failed: {err}")
+                time.sleep(1)
+                continue
+        try:
+            data = s.read(4096)
+        except PORT_ERRORS as err:
+            if buf:  # keep the cut-off line apart from the next boot's first line
+                write_line(out, b"[partial]", buf)
+                buf = b""
+            note(out, f"port lost: {err}")
+            with contextlib.suppress(*PORT_ERRORS):
+                s.close()
+            s = None
+            time.sleep(1)
+            continue
+        if not data:
+            continue
+        received += len(data)
+        buf += data
+        while b"\n" in buf:
+            line, buf = buf.split(b"\n", 1)
+            write_line(out, b"", line.rstrip(b"\r"))
+    if buf:
+        write_line(out, b"[partial]", buf)
+    if s is not None:
+        s.close()
+    return received
+
+
+def main() -> int:
+    ap = argparse.ArgumentParser(
+        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    ap.add_argument("port")
+    ap.add_argument("seconds", type=float)
+    ap.add_argument("outfile")
+    ap.add_argument("--baud", type=int, default=115200)
+    ap.add_argument("--released", action="store_true")
+    ap.add_argument("--reset", action="store_true")
+    ap.add_argument("--append", action="store_true")
+    args = ap.parse_args()
+    with pathlib.Path(args.outfile).open("ab" if args.append else "wb") as out:
+        received = capture(args, out)
+    if received == 0:
+        print(f"[capture] nothing received from {args.port}", file=sys.stderr)
+        return 1
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
@@ -0,0 +1,133 @@
+#!/bin/bash
+# wifisave_hammer.sh: the device under test (DUT) falls back to its AP; a client board joins it and posts
+# /wifisave repeatedly, then the real credentials. Compiles, flashes, captures both serial logs and
+# prints counts. Configs come from templates/example-dut.yaml and templates/example-client.yaml.
+#
+# Usage: wifisave_hammer.sh DUT_KIND DUT_PORT DUT_YAML DUT_TREE CLIENT_PORT CLIENT_YAML CLIENT_TREE [SETTLE_S]
+#   DUT_KIND    esp (esphome upload), pico (upload, then re-find the CDC port by USB serial number),
+#               bw15 (flash_rtl87xx_kit.py) or bk (flash_bk72xx.py)
+#   *_YAML      absolute path; the file name without .yaml must equal the config's `name`
+#   *_TREE      checkout or worktree whose esphome code must build that yaml (cwd for python -m esphome)
+#   SETTLE_S    seconds to keep capturing after the client reports the real save (default 40; BW15 wants 90)
+# Env: PY (python with esphome; default DUT_TREE/venv/bin/python, else python3 on PATH; an explicit PY must exist), LTPY
+#      (LibreTiny penv python with ltchiptool; default ~/.platformio/penv/.libretiny/bin/python)
+# Output next to each yaml: NAME-compile.log, NAME-upload.log, NAME-serial.log, NAME-capture.err, and DUT NAME-events.txt
+# (addresses redacted so the extract can go on a PR; the serial logs themselves stay local).
+# Exit status: 0 RESULT PASS (no crash marker or reboot after the AP came up, the device joined the network,
+# and real stimulus: saves answered and a cooldown exit); 3 RESULT FAIL (the counts show
+# a failure); 2 RESULT INVALID (a precondition or the stimulus was missed, or a capture did not last the run);
+# 1 when a build, flash or port step fails (nothing is reported).
+set -u
+SKILL=$(cd "$(dirname "$0")/.." && pwd)
+KIND=$1; DPORT=$2; DYAML=$3; DTREE=$4; CPORT=$5; CYAML=$6; CTREE=$7; SETTLE=${8:-40}
+if [ -n "${PY:-}" ]; then [ -x "$PY" ] || { echo "[hammer] FAILED: PY=$PY is not executable"; exit 1; }
+else PY=$DTREE/venv/bin/python; [ -x "$PY" ] || PY=$(command -v python3) || { echo "[hammer] FAILED: no python found, set PY"; exit 1; }; fi
+LTPY=${LTPY:-$HOME/.platformio/penv/.libretiny/bin/python}
+DDIR=$(dirname "$DYAML"); DNAME=$(basename "$DYAML" .yaml)
+CDIR=$(dirname "$CYAML"); CNAME=$(basename "$CYAML" .yaml)
+DLOG=$DDIR/$DNAME-serial.log; CLOG=$CDIR/$CNAME-serial.log
+INVALID=""
+AP_WAIT=120; UPLOAD_WAIT=300; SAVE_WAIT=240
+# Crash signatures (extended regex), not bare words: "aborting connection attempt" is a normal Wi-Fi retry line
+CRASH_RE='Panic |abort\(\)|Fatal exception|Exception \(|Guru Meditation|HardFault|Bus Fault|Backtrace:|Soft WDT reset|wdt reset|Brownout|rst cause:[24]'
+# Boot banners and port losses are counted apart: a Pico reboot shows as a port loss (and maybe a banner too),
+# while on a UART board a port loss comes from the adapter or the hub, not the chip
+BANNER_RE='Log initialized'; LOSS_RE='\[capture\] port lost'
+DUT_CAPTURE=$((AP_WAIT + UPLOAD_WAIT + SAVE_WAIT + SETTLE + 60)); CLIENT_CAPTURE=$((SAVE_WAIT + SETTLE + 60))
+
+bound() { local t=$1; shift; if command -v timeout >/dev/null; then timeout "$t" "$@"; else perl -e 'alarm shift; exec @ARGV' "$t" "$@"; fi; }
+count() { LC_ALL=C grep -a -c "$1" "$2"; }
+wait_for() { # wait_for FILE PATTERN SECONDS -> prints elapsed, status 1 on timeout
+  local n=0; until LC_ALL=C grep -a -q "$2" "$1"; do sleep 2; n=$((n+2)); [ $n -ge "$3" ] && { echo "$n"; return 1; }; done; echo "$n"; }
+# Only this run's captures: another capture on the host (a soak on a third board) must survive
+stop_tails() { pkill -f "[s]erial_capture.py $DPORT " 2>/dev/null; pkill -f "[s]erial_capture.py $CPORT " 2>/dev/null; sleep 1; }
+fail() { echo "[hammer] FAILED: $1"; stop_tails; exit 1; }
+port_never_opened() { # an open failure and no line that is not a capture note: the port, not the firmware
+  LC_ALL=C grep -a -q '\[capture\] open failed' "$1" && ! LC_ALL=C grep -a -q -v '^\[[0-9:]*\]\[capture\]' "$1"; }
+compile() { # compile YAML TREE
+  (cd "$2" && PYTHONUNBUFFERED=1 bound 1500 "$PY" -m esphome compile "$1" > "${1%.yaml}-compile.log" 2>&1); local rc=$?
+  echo "[hammer] compile $(basename "$1"): rc=$rc"; return $rc; }
+esp_upload() { # esp_upload YAML PORT TREE
+  (cd "$3" && bound $UPLOAD_WAIT "$PY" -m esphome upload "$1" --device "$2" > "${1%.yaml}-upload.log" 2>&1)
+  local ok; ok=$(count 'Successfully uploaded' "${1%.yaml}-upload.log"); echo "[hammer] upload $(basename "$1"): ok=$ok"; [ "$ok" -ge 1 ]; }
+
+stop_tails
+compile "$DYAML" "$DTREE" || fail "DUT build failed, see $DDIR/$DNAME-compile.log"
+compile "$CYAML" "$CTREE" || fail "client build failed, see $CDIR/$CNAME-compile.log"
+
+TAILOPT=""
+case $KIND in
+  esp) esp_upload "$DYAML" "$DPORT" "$DTREE" || fail "DUT upload failed" ;;
+  pico)
+    SN=$("$PY" "$SKILL/scripts/ports.py" --serial-of "$DPORT") || fail "no USB serial number for $DPORT"
+    esp_upload "$DYAML" "$DPORT" "$DTREE" || fail "DUT upload failed"
+    # The Pico drops its CDC port on reboot and may already be back: take whatever path this board has now;
+    # the capture follows the serial number if the path changes again
+    DPORT=$("$PY" "$SKILL/scripts/ports.py" --wait 2e8a --serial "$SN" --timeout 60) || fail "pico did not re-enumerate"
+    echo "[hammer] pico port after upload: $DPORT"; sleep 2 ;;
+  bw15|bk)
+    UF2=$(ls "$DDIR/.esphome/build/$DNAME/.pioenvs/$DNAME/"*.uf2 2>/dev/null | head -1)
+    [ -n "$UF2" ] || fail "no uf2 under $DDIR/.esphome/build/$DNAME"
+    echo "[hammer] uf2: ${UF2##*/}"
+    W=$SKILL/scripts/flash_rtl87xx_kit.py; [ "$KIND" = bk ] && W=$SKILL/scripts/flash_bk72xx.py
+    (cd "$DDIR" && bound 400 "$LTPY" "$W" flash write -d "$DPORT" "$UF2" > "$DDIR/$DNAME-upload.log" 2>&1); rc=$?
+    echo "[hammer] $KIND flash: rc=$rc"; [ $rc -eq 0 ] || fail "DUT flash failed, see $DDIR/$DNAME-upload.log"
+    TAILOPT="--released" ;;
+  *) echo "unknown DUT_KIND $KIND"; exit 1 ;;
+esac
+
+: > "$DLOG"; ("$PY" "$SKILL/scripts/serial_capture.py" "$DPORT" $DUT_CAPTURE "$DLOG" $TAILOPT 2> "${DLOG%-serial.log}-capture.err" &)
+if ! n=$(wait_for "$DLOG" "Captive portal\|Starting fallback AP" $AP_WAIT); then
+  [ -s "$DLOG" ] || fail "the DUT capture produced nothing (the capture itself failed), see ${DLOG%-serial.log}-capture.err"
+  port_never_opened "$DLOG" && fail "could not open $DPORT (held by another process, or the wrong port), see $DLOG"
+  fail "DUT never raised its AP within ${n}s, see $DLOG"
+fi
+echo "[hammer] DUT fallback AP after ${n}s"; sleep 2
+# reboots are counted from here; the first banner may predate the capture
+BANNER_BASE=$(count "$BANNER_RE" "$DLOG"); LOSS_BASE=$(count "$LOSS_RE" "$DLOG")
+
+esp_upload "$CYAML" "$CPORT" "$CTREE" || fail "client upload failed"
+: > "$CLOG"; ("$PY" "$SKILL/scripts/serial_capture.py" "$CPORT" $CLIENT_CAPTURE "$CLOG" 2> "${CLOG%-serial.log}-capture.err" &)
+if n=$(wait_for "$CLOG" "real save status\|posting the real" $SAVE_WAIT); then
+  echo "[hammer] client posted the real credentials after ${n}s; settling ${SETTLE}s"; sleep "$SETTLE"
+else
+  [ -s "$CLOG" ] || fail "the client capture produced nothing (the capture itself failed), see ${CLOG%-serial.log}-capture.err"
+  port_never_opened "$CLOG" && fail "could not open $CPORT (held by another process, or the wrong port), see $CLOG"
+  INVALID="client never reached the real save within ${n}s"; echo "[hammer] WARNING: $INVALID"
+fi
+
+# A verdict needs complete evidence: both captures must have lasted the run and logged no error of their own
+for spec in "$DPORT:${DLOG%-serial.log}-capture.err" "$CPORT:${CLOG%-serial.log}-capture.err"; do
+  port=${spec%%:*}; err=${spec#*:}
+  pgrep -f "[s]erial_capture.py $port " >/dev/null || INVALID="${INVALID:+$INVALID; }the capture on $port ended before the run did, see $err"
+  [ -s "$err" ] && INVALID="${INVALID:+$INVALID; }the capture on $port reported an error, see $err"
+done
+CRASHES=$(LC_ALL=C grep -a -c -E "$CRASH_RE" "$DLOG")
+BANNERS=$(( $(count "$BANNER_RE" "$DLOG") - BANNER_BASE )); LOSSES=$(( $(count "$LOSS_RE" "$DLOG") - LOSS_BASE ))
+if [ "$KIND" = pico ]; then
+  REBOOTS=$BANNERS; [ "$LOSSES" -gt "$REBOOTS" ] && REBOOTS=$LOSSES  # one reboot can show as both, so take the larger
+else
+  REBOOTS=$BANNERS; [ "$LOSSES" -gt 0 ] && INVALID="${INVALID:+$INVALID; }the DUT port dropped $LOSSES time(s) mid-run (adapter or hub, not the chip)"
+fi
+STA=$(LC_ALL=C grep -a 'IP Address:' "$DLOG" | grep -v -c '192\.168\.4\.'); REAL=$(LC_ALL=C grep -a -o 'real save status [-0-9]*' "$CLOG" | tail -1 | awk '{print $4}')
+SAVES=$(count 'Requested WiFi Settings Change' "$DLOG"); EXITS=$(count 'cooldown early' "$DLOG"); ANSWERED=$(count 'bogus save status 200' "$CLOG")
+echo "[hammer] $DNAME: saves requested $SAVES, cooldown exits $EXITS, crash markers $CRASHES, after the AP came up: boot banners $BANNERS, port losses $LOSSES, reboots $REBOOTS; STA addresses $STA"
+FAILED=$(count 'bogus save status -1' "$CLOG")
+echo "[hammer] $CNAME: bogus saves answered $ANSWERED, failed $FAILED, real save status ${REAL:-none}"
+# Only whole messages, matched where the message starts, so a credential line or an odd SSID never gets in
+LC_ALL=C grep -a -E "^\[[0-9:]+\](\[[A-Z]\]\[[a-z_]+:[0-9]+\]: *(Exiting cooldown early|Starting fallback AP|Captive portal|Requested WiFi Settings Change|Retry phase|Connected\$|IP Address: )|\[capture\] port lost|($CRASH_RE))" "$DLOG" | LC_ALL=C tr -cd '\11\12\15\40-\176' | sed -E 's/(IP Address: )[^ ]+/\1<redacted>/' | cut -c1-110 | head -80 > "$DDIR/$DNAME-events.txt"
+echo "[hammer] events: $DDIR/$DNAME-events.txt"
+stop_tails
+[ -z "$INVALID" ] || { echo "[hammer] RESULT INVALID: $INVALID"; exit 2; }
+# Provisioning is proven by the device joining the network; the client's answer to the real save can time
+# out because the device leaves the AP before replying, so its status is information only
+if [ "$CRASHES" -gt 0 ] || [ "$REBOOTS" -gt 0 ] || [ "$STA" -lt 1 ]; then
+  echo "[hammer] RESULT FAIL: crash markers $CRASHES, reboots $REBOOTS, STA addresses $STA, real save status ${REAL:-none}"; exit 3
+fi
+# A pass needs the stimulus the flow is about: at least half the configured bogus saves answered and one cooldown exit
+CONFIGURED=$(LC_ALL=C grep -a -E '^[[:space:]]*bogus_saves:' "$CYAML" | head -1 | tr -dc '0-9'); CONFIGURED=${CONFIGURED:-15}
+if [ "$EXITS" -lt 1 ] || [ $((ANSWERED * 2)) -lt "$CONFIGURED" ]; then
+  echo "[hammer] RESULT INVALID: insufficient stimulus (bogus saves answered $ANSWERED of $CONFIGURED, cooldown exits $EXITS)"; exit 2
+fi
+[ "$FAILED" -eq 0 ] || echo "[hammer] WARNING: $FAILED of $CONFIGURED bogus saves got no answer"
+echo "[hammer] RESULT PASS"; exit 0
@@ -0,0 +1,77 @@
+# Package for the client board: it joins the device under test's AP (priority 10), posts
+# `bogus_saves` bogus /wifisave requests `save_interval` apart, then posts the real credentials once.
+# Include from a per-run yaml that holds the platform block and the substitutions (example-client.yaml);
+# real_ssid and real_psk come from the scratch directory's secrets.yaml and must be URL safe.
+# Set bogus_saves to 1 for a plain provisioning check. Log lines the driver script counts:
+#   "bogus save N", "bogus save status 200", "posting the real credentials", "real save status 200"
+# The hammer is a single-mode script, so a reconnect to the AP (the device under test rebooted) does not
+# start a second series on top of the first.
+substitutions:
+  ap_password: hwtestpass
+  bogus_saves: "15"
+  save_interval: 3s
+  bogus_ssid: hwtest-no-such-network
+  bogus_psk: nosuchpassword
+
+esphome:
+  name: ${name}
+
+logger:
+  level: DEBUG
+
+http_request:
+  id: http
+  verify_ssl: false
+  timeout: 10s
+
+wifi:
+  id: wifi_id
+  networks:
+    - ssid: ${ap_ssid}
+      password: ${ap_password}
+      priority: 10
+    - ssid: ${real_ssid}
+      password: ${real_psk}
+  on_connect:
+    - lambda: |-
+        char b[40];
+        ESP_LOGI("test", "connected, ip %s", id(wifi_id).get_ip_addresses()[0].str_to(b));
+    - if:
+        condition:
+          lambda: |-
+            char b[40];
+            return strncmp(id(wifi_id).get_ip_addresses()[0].str_to(b), "192.168.4.", 10) == 0;
+        then:
+          - script.execute: hammer
+
+script:
+  - id: hammer
+    mode: single
+    then:
+      - delay: 3s
+      - logger.log: "hammering /wifisave with bogus credentials"
+      - repeat:
+          count: ${bogus_saves}
+          then:
+            - lambda: ESP_LOGI("test", "bogus save %u", (unsigned) iteration + 1);
+            - http_request.get:
+                url: "http://192.168.4.1/wifisave?ssid=${bogus_ssid}&psk=${bogus_psk}"
+                capture_response: true
+                on_response:
+                  - lambda: ESP_LOGI("test", "bogus save status %d", response->status_code);
+                on_error:
+                  - lambda: ESP_LOGW("test", "bogus save status -1");
+            - delay: ${save_interval}
+      - logger.log: "posting the real credentials"
+      - http_request.get:
+          url: "http://192.168.4.1/wifisave?ssid=${real_ssid}&psk=${real_psk}"
+          capture_response: true
+          on_response:
+            - lambda: ESP_LOGI("test", "real save status %d", response->status_code);
+          on_error:
+            - lambda: ESP_LOGW("test", "real save status -1");
+
+interval:
+  - interval: 5s
+    then:
+      - lambda: ESP_LOGI("test", "alive %u s", (unsigned) (millis() / 1000));
@@ -0,0 +1,31 @@
+# Package for a device under test that never finds its network, falls back to its AP and serves the
+# captive portal. Include it from a per-run yaml that holds the platform block and the substitutions
+# (see example-dut.yaml). Bump `name` on every run: saved credentials are keyed by it, and a reused
+# name boots straight onto the real network and never raises the AP.
+substitutions:
+  ap_password: hwtestpass
+  ap_timeout: 15s
+  bogus_ssid: hwtest-no-such-network
+  bogus_psk: nosuchpassword
+
+esphome:
+  name: ${name}
+
+logger:
+  level: DEBUG
+
+wifi:
+  networks:
+    - ssid: ${bogus_ssid}
+      password: ${bogus_psk}
+  ap:
+    ssid: ${ap_ssid}
+    password: ${ap_password}
+    ap_timeout: ${ap_timeout}
+
+captive_portal:
+
+interval:
+  - interval: 5s
+    then:
+      - lambda: ESP_LOGI("test", "alive %u s", (unsigned) (millis() / 1000));
@@ -0,0 +1,18 @@
+# Client board for the /wifisave hammer. Copy into a scratch directory next to a secrets.yaml;
+# ap_ssid must match the device under test, real_ssid and real_psk must be URL safe.
+substitutions:
+  name: hwtest-client-1
+  ap_ssid: hwtest-ap
+  real_ssid: !secret wifi_ssid
+  real_psk: !secret wifi_password
+  bogus_saves: "15"
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+
+# esp8266: {board: d1_mini}
+
+packages:
+  hwtest: !include client-wifisave.yaml
@@ -0,0 +1,16 @@
+# Device under test for the /wifisave hammer. Copy into a scratch directory, keep the file name equal
+# to `name`, pick one platform block, bump `name` every run.
+substitutions:
+  name: hwtest-dut-1
+  ap_ssid: hwtest-ap
+
+esp8266:
+  board: d1_mini
+
+# esp32: {board: esp32dev, framework: {type: esp-idf}}
+# rtl87xx: {board: bw15}
+# bk72xx: {board: generic-bk7238}   # plus logger: {hardware_uart: UART1}, BK72xx logs on UART2 by default
+# rp2040: {board: rpipico2w}
+
+packages:
+  hwtest: !include dut-fallback-ap.yaml
@@ -32,7 +32,7 @@ runs:
      # detects the activated venv via ``VIRTUAL_ENV`` so the venv layout
      # downstream jobs rely on is preserved.
      if: steps.cache-venv.outputs.cache-hit != 'true'
-      uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+      uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
      with:
        enable-cache: true
        # Pull request saves land in per-PR scopes nothing else can
@@ -28,7 +28,7 @@ jobs:

      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
        with:
          client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -29,7 +29,7 @@ jobs:
      - name: Set up uv
        # ``--system`` (below) installs into the setup-python interpreter;
        # no venv is created or restored by this workflow.
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pull-request-only workflow: a save could never be shared and
@@ -97,7 +97,7 @@ jobs:
        run: git diff
      - if: failure()
        name: Archive artifacts
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
        with:
          name: generated-proto-files
          path: |
@@ -128,7 +128,7 @@ jobs:

      - name: Upload compile-test image artifact
        if: matrix.os == 'ubuntu-24.04' && matrix.build_type == 'docker'
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
        with:
          # The tar is already compressed, so upload it as-is. archive: false
          # skips the redundant zip and makes the file name the artifact name
@@ -210,7 +210,7 @@ jobs:
    steps:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
      - name: Download image artifact
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
        with:
          name: compile-test-image.tar.zst
      - name: Load image
@@ -49,7 +49,7 @@ jobs:
        # detects the activated venv via ``VIRTUAL_ENV`` so downstream jobs
        # that ``. venv/bin/activate`` see an identical layout.
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pull request saves land in per-PR scopes nothing else can
@@ -81,8 +81,8 @@ jobs:
      - name: Install apt packages (cached)
        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
        with:
-          packages: libsdl2-dev ccache
-          version: 1.1
+          packages: libsdl2-dev libmbedtls-dev ccache
+          version: 1.2

  determine-jobs:
    name: Determine which jobs to run
@@ -395,6 +395,8 @@ jobs:
      - common
      - determine-jobs
    if: needs.determine-jobs.outputs.integration-tests == 'true'
+    # A hung test is failed by pytest's --timeout below; this bounds the rest
+    timeout-minutes: 60
    strategy:
      fail-fast: false
      matrix:
@@ -415,8 +417,8 @@ jobs:
        timeout-minutes: 10
        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
        with:
-          packages: libsdl2-dev ccache
-          version: 1.1
+          packages: libsdl2-dev libmbedtls-dev ccache
+          version: 1.2
      - name: Set up Python 3.13
        id: python
        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
@@ -438,7 +440,7 @@ jobs:
      - name: Set up uv
        # Only needed on cache miss to populate the venv.
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pull request saves land in per-PR scopes nothing else can
@@ -471,13 +473,14 @@ jobs:
            exit 1
          fi
          echo "Bucket ${{ matrix.bucket.name }}: running ${#test_files[@]} integration tests"
-          pytest -vv --no-cov --tb=native --durations=30 -n auto --dist worksteal \
+          # A hung test fails after 30 min: the 15 min shared build lock wait plus a cold compile
+          pytest -vv --no-cov --tb=native --durations=30 -n auto --dist worksteal --timeout=1800 \
            --junitxml=junit-integration.xml "${test_files[@]}"
      - name: Upload test artifacts
        # Tests that compare rendered output write the image they actually got here, so a
        # failure can be looked at without reproducing the whole build locally.
        if: failure()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
        with:
          name: integration-test-artifacts-${{ matrix.bucket.name }}
          path: test_artifacts/
@@ -488,7 +491,7 @@ jobs:
        # script/update_integration_test_durations.py; only full matrix dev
        # runs produce usable data.
        if: github.ref == 'refs/heads/dev' && needs.determine-jobs.outputs.integration-run-all == 'true'
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
        with:
          name: junit-integration-${{ strategy.job-index }}
          path: junit-integration.xml
@@ -528,7 +531,7 @@ jobs:
          script/check_import_time.py --check --har importtime.har
      - name: Upload waterfall HAR
        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
        with:
          name: import-time-waterfall
          path: importtime.har
@@ -626,7 +629,7 @@ jobs:
            apt-get install -y libc6-dbg

      - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@c4fd08a3a159bd0cc208da1e0edf32b8c47d75e5 # v5.4.0
+        uses: CodSpeedHQ/action@f842b9a3ffe213dbb81768fd7f7eeb4dfcf1c369 # v5.4.2
        with:
          run: |
            . venv/bin/activate
@@ -680,7 +683,7 @@ jobs:
        include:
          - id: clang-tidy
            name: Run script/clang-tidy for ESP8266
-            options: --environment esp8266-arduino-tidy --grep USE_ESP8266
+            options: --environment esp8266-arduino-tidy --grep USE_ESP8266 --grep USE_SOCKET_IMPL_LWIP_TCP --grep USE_SHD_FIRMWARE_DATA
            pio_cache_key: tidyesp8266
          - id: clang-tidy
            name: Run script/clang-tidy for ESP32 Arduino
@@ -693,12 +696,16 @@ jobs:
            ignore_errors: false
          - id: clang-tidy
            name: Run script/clang-tidy for RP2
-            options: --environment rp2-tidy --grep USE_RP2
+            options: --environment rp2-tidy --grep USE_RP2 --grep USE_BLE_SCAN_RESPONSE_MERGER
            pio_cache_key: tidyrp2
+          - id: clang-tidy
+            name: Run script/clang-tidy for host
+            options: --environment host-tidy --grep USE_HOST
+            pio_cache_key: tidyhost
          - id: clang-tidy
            name: Run script/clang-tidy for LibreTiny
            environments: bk72xx-tidy ln882h-tidy rtl87xxb-tidy rtl87xxc-tidy
-            options: --grep USE_LIBRETINY --grep USE_BK72XX --grep USE_RTL87XX --grep USE_LN882X
+            options: --grep USE_LIBRETINY --grep USE_BK72XX --grep USE_RTL87XX --grep USE_LN882X --grep USE_LN882H_BLE --grep USE_SOCKET_IMPL_LWIP_SOCKETS
            pio_cache_key: tidylibretiny

    steps:
@@ -707,6 +714,16 @@ jobs:
        with:
          # Need history for HEAD~1 to work for checking changed files
          fetch-depth: 2
+      - name: Install apt packages (cached)
+        if: matrix.pio_cache_key == 'tidyhost'
+        # libsdl2-dev is needed by the sdl component on the host, libmbedtls-dev
+        # by dsmr and dlms_meter. Packages and version must match seed-apt-cache
+        # exactly.
+        timeout-minutes: 10
+        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
+        with:
+          packages: libsdl2-dev libmbedtls-dev ccache
+          version: 1.2

      - name: Restore Python
        id: restore-python
@@ -989,14 +1006,14 @@ jobs:
          - id: clang-tidy
            name: Run script/clang-tidy for ESP32 S3
            # yamllint disable-line rule:line-length
-            options: --environment esp32s3-idf-tidy --grep SOC_TEMP_SENSOR_SUPPORTED --grep USE_ESP32_VARIANT_ESP32S3 --grep USE_LOGGER_USB_CDC
+            options: --environment esp32s3-idf-tidy --grep SOC_TEMP_SENSOR_SUPPORTED --grep USE_ESP32_VARIANT_ESP32S3 --grep USE_LOGGER_USB_CDC --grep SOC_I2S_SUPPORTS_TDM --grep USE_OPENTHREAD
            tidy_environment: esp32s3-idf-tidy
          - id: clang-tidy
            name: Run script/clang-tidy for ESP32 P4
            # P4 has no native Wi-Fi/BLE; those run over the hosted co-processor,
            # so their code paths differ -- lint them under the P4 build too.
            # yamllint disable-line rule:line-length
-            options: --environment esp32p4-idf-tidy --grep USE_ESP32_VARIANT_ESP32P4 --grep USE_ESP32_HOSTED --grep USE_WIFI --grep USE_BLE
+            options: --environment esp32p4-idf-tidy --grep USE_ESP32_VARIANT_ESP32P4 --grep CONFIG_IDF_TARGET_ESP32P4 --grep USE_ESP32_HOSTED --grep USE_WIFI --grep USE_BLE
            tidy_environment: esp32p4-idf-tidy
          - id: clang-tidy
            name: Run script/clang-tidy for ESP32 C6
@@ -1102,8 +1119,8 @@ jobs:
        timeout-minutes: 10
        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
        with:
-          packages: libsdl2-dev ccache
-          version: 1.1
+          packages: libsdl2-dev libmbedtls-dev ccache
+          version: 1.2

      - name: Check out code from GitHub
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -1448,7 +1465,7 @@ jobs:
        # install step (order-of-magnitude faster on cold boots,
        # with its own wheel cache). actions/setup-python still
        # provides the interpreter.
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pull request saves land in per-PR scopes nothing else can
@@ -1647,7 +1664,7 @@ jobs:
          fi

      - name: Upload memory analysis JSON
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
        with:
          name: memory-analysis-target
          path: memory-analysis-target.json
@@ -1710,7 +1727,7 @@ jobs:
            --platform "$platform"

      - name: Upload memory analysis JSON
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
        with:
          name: memory-analysis-pr
          path: memory-analysis-pr.json
@@ -1740,13 +1757,13 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
      - name: Download target analysis JSON
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
        with:
          name: memory-analysis-target
          path: ./memory-analysis
        continue-on-error: true
      - name: Download PR analysis JSON
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
        with:
          name: memory-analysis-pr
          path: ./memory-analysis
@@ -35,7 +35,7 @@ jobs:

      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
        with:
          client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -56,7 +56,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
+        uses: github/codeql-action/init@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
        with:
          languages: ${{ matrix.language }}
          build-mode: ${{ matrix.build-mode }}
@@ -84,6 +84,6 @@ jobs:
          exit 1

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
+        uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
        with:
          category: "/language:${{matrix.language}}"
@@ -15,7 +15,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
        with:
          client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -162,7 +162,7 @@ jobs:
      #     version: ${{ needs.init.outputs.tag }}

      - name: Upload digests
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
        with:
          name: digests-${{ matrix.platform.arch }}
          path: /tmp/digests
@@ -195,7 +195,7 @@ jobs:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Download digests
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
        with:
          pattern: digests-*
          path: /tmp/digests
@@ -245,7 +245,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
        with:
          client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -27,7 +27,7 @@ jobs:
      days-before-close: 7
      stale-label: stale
      exempt-label: not-stale
-      conflict-label: needs-rebase
+      conflict-label: has-conflicts
      ignored-users: esphbot,codecov-commenter
      stale-pr-message: >
        There hasn't been any activity on this pull request recently. This
@@ -43,7 +43,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
        with:
          client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -19,7 +19,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
        with:
          client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -47,7 +47,7 @@ jobs:
        # setup-python interpreter so subsequent ``prek`` /
        # ``script/run-in-env.py`` steps find the deps without a
        # ``uv run`` prefix.
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
        with:
          enable-cache: true
          # Pin uv version so the action does not have to fetch the
@@ -20,7 +20,7 @@ jobs:
    steps:
      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        uses: actions/create-github-app-token@64ab729a6294000f5aa4a4bc0b73d1f32bc45510 # v3.3.0
        with:
          client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -10,7 +10,7 @@ ci:
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.16.10
+    rev: v0.17.0
    hooks:
      # Run the linter.
      - id: ruff
@@ -36,7 +36,7 @@ repos:
      - id: end-of-file-fixer
      - id: trailing-whitespace
  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.21.2
+    rev: v3.22.0
    hooks:
      - id: pyupgrade
        args: [--py312-plus]
@@ -144,6 +144,9 @@ file does, and it is the authority when they disagree. The most useful starting

 *   **C++ Preprocessor Directives:**
    *   **Avoid `#define` for constants:** Using `#define` for constants is discouraged and should be replaced with `const` variables or enums.
+    *   **A constant with a compile-time initializer is `static constexpr`,** not `static const`, at namespace scope
+        and inside functions; `static const` is only for a value computed at run time. A function-local
+        `static constexpr` table is a static constant to clang-tidy, so it is `UPPER_SNAKE_CASE` too.
    *   **Use `#define` only for:**
        - Conditional compilation (`#ifdef`, `#ifndef`)
        - Compile-time sizes calculated during Python code generation (e.g., configuring `std::array` or `StaticVector` dimensions via `cg.add_define()`)
@@ -217,8 +220,20 @@ file does, and it is the authority when they disagree. The most useful starting
        listener base (a second vptr per entity).
    *   **A global feature define** says the code is compiled in, not that this instance uses it: keep the
        per-instance check (`if (this->aux_device_ == ...)`) inside the `#ifdef`.
+    *   **Model-specific code** sits behind a define the Python side emits only for configs that use that model
+        (`cg.add_define("USE_SELEC_METER_EM4M")`), so the other models' builds leave it out; the runtime model check
+        stays inside the `#ifdef`.
    *   **Failures after `setup()`:** `mark_failed()` is for `setup()` only. A runtime read or write failure
        sets `status_set_warning()` and the next success clears it; writes skip work when `is_failed()`.
+    *   **`dump_config()` already prints the failure reason:** for a failed component, core prints
+        `<component> is marked FAILED: <reason>` right after the component's `dump_config()`, using the reason
+        passed to `mark_failed()`. So `dump_config()` never checks `is_failed()` to log a failure, and no
+        `error_code_` member exists only to pick that message. Pass the reason where setup fails instead:
+        `this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL))` for a failed bus transfer, a short specific reason
+        otherwise (`LOG_STR("Wrong chip ID")`). Core also logs it at that moment, so no `ESP_LOGE` repeats it
+        before `mark_failed()`; keep a separate line only when it prints a value read at run time, such as the
+        chip ID that did not match. Only the first reason is kept, so do not call `status_set_error()` before
+        `mark_failed()` and do not mark the component failed again after a helper already did.
    *   **Fixed platform facts compile to nothing:** gate on `#ifdef USE_ESP8266` and friends, not on a
        runtime check of something the build already knows.
    *   **Logging string literals:** wrap literals passed as `%s` arguments in `LOG_STR_LITERAL()` so they
@@ -567,6 +582,9 @@ file does, and it is the authority when they disagree. The most useful starting
    An intentionally empty body (an unused `register_dumper` builder, for example) gets a one-line docstring, not `pass`.

 *   **Configuration Validation:**
+    *   **One schema per model:** when a component's options depend on a `model` key, use `cv.typed_schema({...},
+        key=CONF_MODEL, default_type=...)` with each model's own keys and defaults, not one schema plus a validator
+        that rejects keys and fills defaults afterwards.
    *   **Reuse existing validators:** Before writing a custom validator, check for an existing one in `config_validation.py` and compose it in `cv.All(...)` rather than duplicating logic across components. For example, rename a config key with `cv.rename_key(CONF_OLD, CONF_NEW, removed_in="2026.6.0")`, and reject mutually-exclusive keys with `cv.has_at_most_one_key(...)` / `cv.has_exactly_one_key(...)`. See how `api` composes `cv.has_exactly_one_key` + `cv.rename_key`.
    *   **Common Validators:** `cv.int_`, `cv.float_`, `cv.string`, `cv.boolean`, `cv.int_range(min=0, max=100)`, `cv.positive_int`, `cv.percentage`.
    *   **Complex Validation:** `cv.All(cv.string, cv.Length(min=1, max=50))`, `cv.Any(cv.int_, cv.string)`.
@@ -609,6 +627,9 @@ file does, and it is the authority when they disagree. The most useful starting
        `on_tx` lambda with a static counter and `inject_to_rx_buffer` (see `uart_mock_ld2412_requery_after_giveup.yaml`).
    *   **Keep build-test variants few:** one `test.<platform>.yaml` per platform the code actually differs
        on. A variant per board for platform-identical code only adds CI time.
+    *   **A test that needs a shared component in a particular state** (`esp32_ble` security settings, an option
+        that PSRAM rejects) cannot be grouped: the merged block wins and the whole batch fails. Add the component to
+        `ISOLATED_COMPONENTS` in `script/analyze_component_buses.py`, or move the option to a `test-<variant>` file.
    *   **Component Tests:** YAML-based compilation tests are located in `tests/`. The structure is as follows:
        ```
        tests/
@@ -40,6 +40,7 @@ esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
 esphome/components/apc1/* @ademuri
+esphome/components/apc_proteous/* @clydebarrow
 esphome/components/apds9306/* @aodrenah
 esphome/components/apds9930/* @iyesin
 esphome/components/api/* @esphome/core
@@ -48,6 +49,7 @@ esphome/components/aranet/* @patrickod
 esphome/components/as5600/* @ammmze
 esphome/components/as5600/sensor/* @ammmze
 esphome/components/as7341/* @mrgnr
+esphome/components/as734x/* @latonita @mrgnr
 esphome/components/async_tcp/* @esphome/core
 esphome/components/at581x/* @X-Ryl669
 esphome/components/atc_mithermometer/* @ahpohl
@@ -155,6 +157,10 @@ esphome/components/delonghi/* @grob6000
 esphome/components/dew_point/* @CFlix
 esphome/components/dfplayer/* @glmnet
 esphome/components/dfrobot_sen0395/* @niklasweber
+esphome/components/dfrobot_sen0465_base/* @tzabbi
+esphome/components/dfrobot_sen0465_i2c/* @tzabbi
+esphome/components/dfrobot_sen0465_uart/* @tzabbi
+esphome/components/dfrobot_sen0609/* @remcom
 esphome/components/dht/* @OttoWinter
 esphome/components/display_menu_base/* @numo68
 esphome/components/dlms_meter/* @latonita @PolarGoose @SimonFischer04 @Tomer27cz
@@ -183,6 +189,7 @@ esphome/components/es7243e/* @kbx81
 esphome/components/es8156/* @kbx81
 esphome/components/es8311/* @kahrendt @kroimon
 esphome/components/es8388/* @P4uLT
+esphome/components/es9038q2m_katana/* @GioMez
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @bdraco @jesserockz @Rapsssito
 esphome/components/esp32_ble_client/* @bdraco @jesserockz
@@ -212,12 +219,14 @@ esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
 esphome/components/file/* @esphome/core
+esphome/components/filter_lifetime/* @tuct
 esphome/components/fingerprint_grow/* @alexborro @loongyh @OnFreund
 esphome/components/font/* @clydebarrow @esphome/core
 esphome/components/friedrich/* @rwrozelle
 esphome/components/fs3000/* @kahrendt
 esphome/components/ft5x06/* @clydebarrow
 esphome/components/ft63x6/* @gpambrozio
+esphome/components/fusb302b/* @remcom
 esphome/components/gcja5/* @gcormier
 esphome/components/gdk101/* @Szewcson
 esphome/components/gl_r01_i2c/* @pkejval
@@ -239,9 +248,14 @@ esphome/components/gt911/* @clydebarrow @jesserockz
 esphome/components/haier/* @paveldn
 esphome/components/haier/binary_sensor/* @paveldn
 esphome/components/haier/button/* @paveldn
+esphome/components/haier/select/* @paveldn
 esphome/components/haier/sensor/* @paveldn
 esphome/components/haier/switch/* @paveldn
 esphome/components/haier/text_sensor/* @paveldn
+esphome/components/haier_tundra/* @fauxpark
+esphome/components/haier_tundra/button/* @fauxpark
+esphome/components/haier_tundra/switch/* @fauxpark
+esphome/components/haier_water_heater/* @TheLexus
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
@@ -250,6 +264,7 @@ esphome/components/hc8/* @omartijn
 esphome/components/hdc2010/* @optimusprimespace @ssieb
 esphome/components/hdc2080/* @G-Pereira @jesserockz
 esphome/components/hdc302x/* @joshuasing
+esphome/components/hdmi_cec/* @JosVanEijndhoven
 esphome/components/he60r/* @clydebarrow
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
@@ -286,6 +301,7 @@ esphome/components/i2s_audio/microphone/* @jesserockz
 esphome/components/i2s_audio/speaker/* @jesserockz @kahrendt
 esphome/components/i2s_clockless_led_strip/* @j9brown
 esphome/components/iaqcore/* @yozik04
+esphome/components/icm20689/* @lboue
 esphome/components/icnt86/* @danepowell
 esphome/components/ili9xxx/* @clydebarrow @nielsnl68
 esphome/components/improv_base/* @esphome/core
@@ -378,8 +394,10 @@ esphome/components/micro_wake_word/* @jesserockz @kahrendt
 esphome/components/micronova/* @edenhaus @jorre05
 esphome/components/microphone/* @jesserockz @kahrendt
 esphome/components/mics_4514/* @jesserockz
+esphome/components/mics_5524/* @nliaudat
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
+esphome/components/midea_portasplit/* @Fexiven
 esphome/components/mipi_dsi/* @clydebarrow
 esphome/components/mipi_rgb/* @clydebarrow
 esphome/components/mipi_spi/* @clydebarrow
@@ -434,6 +452,7 @@ esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/packet_transport/* @clydebarrow
 esphome/components/pca6416a/* @Mat931
+esphome/components/pca9505/* @ajfriesen @ssieb
 esphome/components/pca9554/* @bdraco @clydebarrow @hwstar
 esphome/components/pcf85063/* @brogon
 esphome/components/pcf8563/* @KoenBreeman
@@ -497,6 +516,7 @@ esphome/components/rtttl/* @glmnet @ximex
 esphome/components/runtime_image/* @clydebarrow @guillempages @kahrendt
 esphome/components/runtime_stats/* @bdraco
 esphome/components/rx8025t/* @remcom
+esphome/components/rx8111/* @techdregs
 esphome/components/rx8130/* @beormund
 esphome/components/safe_mode/* @jsuanet @kbx81 @paulmonigatti
 esphome/components/samsung/* @jorofi
@@ -22,7 +22,7 @@ RUN \
    -r /requirements.txt

 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.23.1
+RUN uv pip install --no-cache-dir esphome-device-builder==1.24.0

 RUN \
    platformio settings set enable_telemetry No \
@@ -483,12 +483,9 @@ def has_ota() -> bool:

 def has_native_ota() -> bool:
    """Check if native API OTA upload is available (``platform: esphome``)."""
-    if CONF_OTA not in CORE.config:
-        return False
-    return any(
-        ota_item.get(CONF_PLATFORM) == CONF_ESPHOME
-        for ota_item in CORE.config[CONF_OTA]
-    )
+    from esphome.espota2 import esphome_ota_items
+
+    return bool(esphome_ota_items(CORE.config))


 def has_web_server_ota() -> bool:
@@ -1359,14 +1356,17 @@ def _choose_ota_platform(config: ConfigType, requested: str | None) -> str:
    return CONF_WEB_SERVER


+def _esphome_ota_conf(config: ConfigType) -> ConfigType | None:
+    """The validated esphome OTA platform block, if configured."""
+    from esphome.espota2 import esphome_ota_items
+
+    return next(iter(esphome_ota_items(config)), None)
+
+
 def _upload_via_native_api(
    config: ConfigType, network_devices: list[str], args: ArgsProtocol
 ) -> tuple[int, str | None]:
-    ota_conf: ConfigType = {}
-    for ota_item in config.get(CONF_OTA, []):
-        if ota_item.get(CONF_PLATFORM) == CONF_ESPHOME:
-            ota_conf = ota_item
-            break
+    ota_conf = _esphome_ota_conf(config) or {}

    from esphome import espota2
    from esphome.components.noise import static_encryption_key
@@ -1457,10 +1457,8 @@ def _old_key_notice(config: ConfigType) -> None:
    `upload` may send a stale image that still carries the previous key."""
    from esphome import espota2

-    for item in config.get(CONF_OTA, []):
-        if item.get(CONF_PLATFORM) == CONF_ESPHOME and (
-            item.get(CONF_ENCRYPTION) or {}
-        ).get(espota2.CONF_OLD_KEY):
+    for item in espota2.esphome_ota_items(config):
+        if (item.get(CONF_ENCRYPTION) or {}).get(espota2.CONF_OLD_KEY):
            _LOGGER.warning(espota2.OLD_KEY_REMOVE_NOTICE)


@@ -1468,12 +1466,12 @@ def _upload_via_web_server(
    config: ConfigType, network_devices: list[str], binary: Path
 ) -> tuple[int, str | None]:
    from esphome import web_server_ota
+    from esphome.espota2 import esphome_ota_items
    from esphome.web_server_helpers import get_web_server_connection

    if any(
-        ota_item.get(CONF_PLATFORM) == CONF_ESPHOME
-        and ota_item.get(CONF_ENCRYPTION) is not None
-        for ota_item in config.get(CONF_OTA, [])
+        ota_item.get(CONF_ENCRYPTION) is not None
+        for ota_item in esphome_ota_items(config)
    ):
        _LOGGER.warning(
            "This config has OTA encryption, but the web_server OTA path sends "
@@ -14,6 +14,7 @@ from esphome.const import (
    CONF_COUNT,
    CONF_ELSE,
    CONF_ID,
+    CONF_IF,
    CONF_THEN,
    CONF_TIME,
    CONF_TIMEOUT,
@@ -34,6 +35,9 @@ from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
 from esphome.types import ConfigType, SafeExpType
 from esphome.util import Registry

+CONF_CHOOSE = "choose"
+CONF_CHOICE_ID = "choice_id"
+

 def progmem_bytes(name: str, data: bytes | list[int]) -> MockObj:
    """Shared PROGMEM table for constant bytes; equal payloads share one, empty is nullptr."""
@@ -840,10 +844,39 @@ async def delay_action_to_code(
    return var


+def _wrap_bare_if_condition(value: Any) -> Any:
+    """Allow a single condition directly under `if:` in place of `condition: {...}`."""
+    if not isinstance(value, dict):
+        return value
+    # `any` and `all` are also registered conditions, but here they are the if action's own keys
+    bare = [
+        key
+        for key in value
+        if key in CONDITION_REGISTRY and key not in (CONF_ANY, CONF_ALL)
+    ]
+    if not bare:
+        return value
+    if len(bare) > 1:
+        raise cv.Invalid(
+            f"Only one condition may be given directly under 'if', found {', '.join(bare)}. "
+            f"Use '{CONF_CONDITION}', '{CONF_ALL}' or '{CONF_ANY}' to combine conditions"
+        )
+    if other := [k for k in (CONF_CONDITION, CONF_ANY, CONF_ALL) if k in value]:
+        raise cv.Invalid(
+            f"'{bare[0]}' given directly under 'if' cannot be used with '{other[0]}'. "
+            f"Move it into '{other[0]}'"
+        )
+    key = bare[0]
+    result = {k: v for k, v in value.items() if k != key}
+    result[CONF_CONDITION] = {key: value[key]}
+    return result
+
+
@register_action(
    "if",
    IfAction,
    cv.All(
+        _wrap_bare_if_condition,
        {
            cv.Exclusive(
                CONF_CONDITION, CONF_CONDITION
@@ -870,14 +903,104 @@ async def if_action_to_code(
    cond_conf = next(el for el in config if el in (CONF_ANY, CONF_ALL, CONF_CONDITION))
    condition = await build_condition(config[cond_conf], template_arg, args)
    var = cg.new_Pvariable(action_id, if_template_arg, condition)
+    then_actions = else_actions = None
    if CONF_THEN in config:
-        for action in await build_action_list(config[CONF_THEN], template_arg, args):
+        then_actions = await build_action_list(config[CONF_THEN], template_arg, args)
+    if has_else:
+        else_actions = await build_action_list(config[CONF_ELSE], template_arg, args)
+    _add_if_branches(var, then_actions, else_actions)
+    return var
+
+
+def _add_if_branches(
+    var: MockObj,
+    then_actions: list[MockObj] | None,
+    else_actions: list[MockObj] | None,
+) -> None:
+    """Add the branches of an IfAction one action at a time; None leaves a branch out."""
+    if then_actions is not None:
+        for action in then_actions:
            cg.add(var.add_then_action(action))
        cg.add(var.finish_then())
-    if has_else:
-        for action in await build_action_list(config[CONF_ELSE], template_arg, args):
+    if else_actions is not None:
+        for action in else_actions:
            cg.add(var.add_else_action(action))
        cg.add(var.finish_else())
+
+
+def _validate_choice(choice: ConfigType) -> ConfigType:
+    """A choice is either `if` with `then`, or `else` on its own."""
+    if CONF_ELSE in choice:
+        for key in (CONF_IF, CONF_THEN):
+            if key in choice:
+                raise cv.Invalid(f"'{key}' cannot be used with 'else'", path=[key])
+        return choice
+    for key in (CONF_IF, CONF_THEN):
+        if key not in choice:
+            raise cv.Invalid(f"'{key}' is required", path=[key])
+    return choice
+
+
+def _validate_choose_else(choices: list[ConfigType]) -> list[ConfigType]:
+    """`else` may only be the last choice, and not the only one."""
+    for index, choice in enumerate(choices[:-1]):
+        if CONF_ELSE in choice:
+            raise cv.Invalid(
+                "Only the last choice may be 'else'", path=[index, CONF_ELSE]
+            )
+    if len(choices) == 1 and CONF_ELSE in choices[0]:
+        raise cv.Invalid(
+            "At least one choice must have 'if' and 'then'", path=[0, CONF_ELSE]
+        )
+    return choices
+
+
+@register_action(
+    CONF_CHOOSE,
+    IfAction,
+    cv.All(
+        cv.ensure_list(
+            cv.All(
+                cv.Schema(
+                    {
+                        cv.GenerateID(CONF_CHOICE_ID): cv.declare_id(IfAction),
+                        cv.Optional(CONF_IF): validate_potentially_and_condition,
+                        cv.Optional(CONF_THEN): validate_action_list,
+                        cv.Optional(CONF_ELSE): validate_action_list,
+                    }
+                ),
+                _validate_choice,
+            )
+        ),
+        cv.Length(min=1),
+        _validate_choose_else,
+    ),
+    synchronous=True,
+)
+async def choose_action_to_code(
+    config: list[ConfigType],
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
+    # Built as a chain of if/else actions: each choice's else branch holds the next choice,
+    # and the last choice's else branch holds the `else` actions, if any.
+    else_actions: list[MockObj] | None = None
+    if CONF_ELSE in config[-1]:
+        else_actions = await build_action_list(
+            config[-1][CONF_ELSE], template_arg, args
+        )
+        config = config[:-1]
+    var: MockObj | None = None
+    for index in reversed(range(len(config))):
+        choice = config[index]
+        if_template_arg = cg.TemplateArguments(else_actions is not None, *template_arg)
+        condition = await build_condition(choice[CONF_IF], template_arg, args)
+        choice_id = action_id if index == 0 else choice[CONF_CHOICE_ID]
+        var = cg.new_Pvariable(choice_id, if_template_arg, condition)
+        then_actions = await build_action_list(choice[CONF_THEN], template_arg, args)
+        _add_if_branches(var, then_actions, else_actions)
+        else_actions = [var]
    return var


@@ -906,6 +1029,21 @@ async def while_action_to_code(
    return var


+def _shadow_iteration(args: TemplateArgsType) -> TemplateArgsType:
+    """Rename an inherited `iteration` so the inner repeat's own counter can shadow it."""
+    names = {name for _, name in args}
+    renamed: TemplateArgsType = []
+    for type_, name in args:
+        if name == "iteration":
+            depth = 1
+            while f"iteration_{depth}" in names:
+                depth += 1
+            name = f"iteration_{depth}"
+            names.add(name)
+        renamed.append((type_, name))
+    return renamed
+
+
@register_action(
    "repeat",
    RepeatAction,
@@ -929,7 +1067,7 @@ async def repeat_action_to_code(
    actions = await build_action_list(
        config[CONF_THEN],
        cg.TemplateArguments(cg.uint32, *template_arg.args),
-        [(cg.uint32, "iteration"), *args],
+        [(cg.uint32, "iteration"), *_shadow_iteration(args)],
    )
    for action in actions:
        cg.add(var.add_then_action(action))
@@ -19,11 +19,7 @@ AbsoluteHumidityComponent = absolute_humidity_ns.class_(
 SaturationVaporPressureEquation = absolute_humidity_ns.enum(
    "SaturationVaporPressureEquation"
 )
-EQUATION = {
-    "BUCK": SaturationVaporPressureEquation.BUCK,
-    "TETENS": SaturationVaporPressureEquation.TETENS,
-    "WOBUS": SaturationVaporPressureEquation.WOBUS,
-}
+EQUATION = SaturationVaporPressureEquation.options("BUCK", "TETENS", "WOBUS")

 CONFIG_SCHEMA = (
    sensor.sensor_schema(
@@ -14,11 +14,9 @@ ac_dimmer_ns = cg.esphome_ns.namespace("ac_dimmer")
 AcDimmer = ac_dimmer_ns.class_("AcDimmer", output.FloatOutput, cg.Component)

 DimMethod = ac_dimmer_ns.enum("DimMethod")
-DIM_METHODS = {
-    "LEADING_PULSE": DimMethod.DIM_METHOD_LEADING_PULSE,
-    "LEADING": DimMethod.DIM_METHOD_LEADING,
-    "TRAILING": DimMethod.DIM_METHOD_TRAILING,
-}
+DIM_METHODS = DimMethod.options(
+    "LEADING_PULSE", "LEADING", "TRAILING", prefix="DIM_METHOD_"
+)

 ZC_INTERRUPT_TYPES = {
    "RISING": gpio_ns.INTERRUPT_RISING_EDGE,
@@ -46,11 +46,7 @@ ATTENUATION_MODES = {

 sampling_mode = adc_ns.enum("SamplingMode", is_class=True)

-SAMPLING_MODES = {
-    "avg": sampling_mode.AVG,
-    "min": sampling_mode.MIN,
-    "max": sampling_mode.MAX,
-}
+SAMPLING_MODES = sampling_mode.options("avg", "min", "max")

 adc_unit_t = cg.global_ns.enum("adc_unit_t", is_class=True)

@@ -11,12 +11,6 @@

 namespace esphome::ade7880 {

-// adapted from https://stackoverflow.com/a/55912127/1886371
-template<size_t Bits, typename T> inline T sign_extend(const T &v) noexcept {
-  using S = struct { signed Val : Bits; };
-  return reinterpret_cast<const S *>(&v)->Val;
-}
-
 // Register types
 // unsigned 8-bit (uint8_t)
 // signed 10-bit - 16-bit ZP on wire (int16_t, needs sign extension)
@@ -49,7 +43,7 @@ uint16_t ADE7880::read_u16_register16_(uint16_t a_register) {

 int32_t ADE7880::read_s24zp_register16_(uint16_t a_register) {
  // s24zp means 24 bit signed value in the lower 24 bits of a 32-bit register
-  int32_t in;
+  uint32_t in;
  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
  return sign_extend<24>(convert_big_endian(in));
 }
@@ -11,7 +11,7 @@ static const uint8_t ADS1115_REGISTER_CONFIG = 0x01;
 void ADS1115Component::setup() {
  uint16_t value;
  if (!this->read_byte_16(ADS1115_REGISTER_CONVERSION, &value)) {
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }

@@ -58,7 +58,7 @@ void ADS1115Component::setup() {
  config |= 0b0000000000000011;

  if (!this->write_byte_16(ADS1115_REGISTER_CONFIG, config)) {
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }
  this->prev_config_ = config;
@@ -66,9 +66,6 @@ void ADS1115Component::setup() {
 void ADS1115Component::dump_config() {
  ESP_LOGCONFIG(TAG, "ADS1115:");
  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-  }
 }
 float ADS1115Component::request_measurement(ADS1115Multiplexer multiplexer, ADS1115Gain gain,
                                            ADS1115Resolution resolution, ADS1115Samplerate samplerate) {
@@ -84,11 +84,9 @@ automation.register_apply_action(
 )

 AGS10SetZeroPointActionMode = ags10_ns.enum("AGS10SetZeroPointActionMode")
-AGS10_SET_ZERO_POINT_ACTION_MODE = {
-    "FACTORY_DEFAULT": AGS10SetZeroPointActionMode.FACTORY_DEFAULT,
-    "CURRENT_VALUE": AGS10SetZeroPointActionMode.CURRENT_VALUE,
-    "CUSTOM_VALUE": AGS10SetZeroPointActionMode.CUSTOM_VALUE,
-}
+AGS10_SET_ZERO_POINT_ACTION_MODE = AGS10SetZeroPointActionMode.options(
+    "FACTORY_DEFAULT", "CURRENT_VALUE", "CUSTOM_VALUE"
+)

 AGS10_SET_ZERO_POINT_SCHEMA = cv.Schema(
    {
@@ -52,8 +52,7 @@ void AHT10Component::setup() {
      break;
  }
  if (error_code != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }
  uint8_t cal_attempts = 0;
@@ -61,20 +60,17 @@ void AHT10Component::setup() {
  while (data & AHT10_STATUS_BUSY) {
    delay(AHT10_DEFAULT_DELAY);
    if (this->read(&data, 1) != i2c::ERROR_OK) {
-      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-      this->mark_failed();
+      this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
      return;
    }
    ++cal_attempts;
    if (cal_attempts > AHT10_INIT_ATTEMPTS) {
-      ESP_LOGE(TAG, "Initialization timed out");
-      this->mark_failed();
+      this->mark_failed(LOG_STR("Initialization timed out"));
      return;
    }
  }
  if ((data & 0x68) != 0x08) {  // Bit[6:5] = 0b00, NORMAL mode and Bit[3] = 0b1, CALIBRATED
-    ESP_LOGE(TAG, "Initialization failed");
-    this->mark_failed();
+    this->mark_failed(LOG_STR("Initialization failed"));
    return;
  }
 }
@@ -152,9 +148,6 @@ void AHT10Component::update() {
 void AHT10Component::dump_config() {
  ESP_LOGCONFIG(TAG, "AHT10:");
  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-  }
  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
 }
@@ -20,10 +20,7 @@ aht10_ns = cg.esphome_ns.namespace("aht10")
 AHT10Component = aht10_ns.class_("AHT10Component", cg.PollingComponent, i2c.I2CDevice)

 AHT10Variant = aht10_ns.enum("AHT10Variant")
-AHT10_VARIANTS = {
-    "AHT10": AHT10Variant.AHT10,
-    "AHT20": AHT10Variant.AHT20,
-}
+AHT10_VARIANTS = AHT10Variant.options("AHT10", "AHT20")

 CONFIG_SCHEMA = (
    cv.Schema(
@@ -10,8 +10,7 @@ ESPHOME_LOG_TAG(TAG, "aic3204");

 #define ERROR_CHECK(err, msg) \
  if (!(err)) { \
-    ESP_LOGE(TAG, msg); \
-    this->mark_failed(); \
+    this->mark_failed(LOG_STR(msg)); \
    return; \
  }

@@ -108,10 +107,6 @@ void AIC3204::setup() {
 void AIC3204::dump_config() {
  ESP_LOGCONFIG(TAG, "AIC3204:");
  LOG_I2C_DEVICE(this);
-
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-  }
 }

 bool AIC3204::set_mute_off() {
@@ -29,10 +29,7 @@ AirthingsWavePlus = airthings_wave_plus_ns.class_(

 CONF_DEVICE_TYPE = "device_type"
 WaveDeviceType = airthings_wave_plus_ns.enum("WaveDeviceType")
-DEVICE_TYPES = {
-    "WAVE_PLUS": WaveDeviceType.WAVE_PLUS,
-    "WAVE_GEN2": WaveDeviceType.WAVE_GEN2,
-}
+DEVICE_TYPES = WaveDeviceType.options("WAVE_PLUS", "WAVE_GEN2")


 def validate_wave_gen2_config(config: ConfigType) -> ConfigType:
@@ -42,21 +42,18 @@ bool AM2315C::reset_register_(uint8_t reg) {
  data[2] = 0;
  ESP_LOGD(TAG, "Reset register: 0x%02x", reg);
  if (this->write(data, 3) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Write failed!");
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return false;
  }
  delay(5);
  if (this->read(data, 3) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Read failed!");
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return false;
  }
  delay(10);
  data[0] = 0xB0 | reg;
  if (this->write(data, 3) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Write failed!");
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return false;
  }
  delay(5);
@@ -76,8 +73,7 @@ void AM2315C::setup() {
  // get status
  uint8_t status = 0;
  if (this->read(&status, 1) != i2c::ERROR_OK) {
-    ESP_LOGE(TAG, "Read failed!");
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }

@@ -86,19 +82,10 @@ void AM2315C::setup() {
  // never required during testing
  if ((status & 0x18) != 0x18) {
    ESP_LOGD(TAG, "Resetting AM2315C registers");
-    if (!this->reset_register_(0x1B)) {
-      this->mark_failed();
+    // reset_register_() marks the component failed with its own reason
+    if (!this->reset_register_(0x1B) || !this->reset_register_(0x1C) || !this->reset_register_(0x1E))
      return;
  }
-    if (!this->reset_register_(0x1C)) {
-      this->mark_failed();
-      return;
-    }
-    if (!this->reset_register_(0x1E)) {
-      this->mark_failed();
-      return;
-    }
-  }
 }

 void AM2315C::update() {
@@ -168,9 +155,6 @@ void AM2315C::update() {
 void AM2315C::dump_config() {
  ESP_LOGCONFIG(TAG, "AM2315C:");
  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-  }
  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
 }
@@ -37,16 +37,13 @@ void AM2320Component::setup() {
  data[0] = 0;
  data[1] = 4;
  if (!this->read_data_(data)) {
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }
 }
 void AM2320Component::dump_config() {
  ESP_LOGD(TAG, "AM2320:");
  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-  }
  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
 }
@@ -5,8 +5,8 @@
 namespace esphome::animation {

 Animation::Animation(const uint8_t *data_start, int width, int height, uint32_t animation_frame_count,
-                     image::ImageType type, image::Transparency transparent)
-    : Image(data_start, width, height, type, transparent),
+                     image::ImageType type, image::Transparency transparent, bool big_endian)
+    : Image(data_start, width, height, type, transparent, big_endian),
      animation_data_start_(data_start),
      current_frame_(0),
      animation_frame_count_(animation_frame_count),
@@ -6,7 +6,7 @@ namespace esphome::animation {
 class Animation final : public image::Image {
 public:
  Animation(const uint8_t *data_start, int width, int height, uint32_t animation_frame_count, image::ImageType type,
-            image::Transparency transparent);
+            image::Transparency transparent, bool big_endian = false);

  uint32_t get_animation_frame_count() const;
  int get_current_frame() const;
@@ -1,6 +1,6 @@
 from esphome import automation
 import esphome.codegen as cg
-from esphome.components.const import CONF_LOOP
+from esphome.components.const import CONF_BYTE_ORDER, CONF_LOOP
 from esphome.components.file import image as file_image
 from esphome.components.file.image import image_schema, write_image
 from esphome.components.image import Image_, validate_settings
@@ -90,6 +90,7 @@ async def setup_animation(config: ConfigType) -> None:
        frame_count,
        image_type,
        trans_value,
+        config.get(CONF_BYTE_ORDER) == "BIG_ENDIAN",
    )
    if loop_config := config.get(CONF_LOOP):
        start = loop_config[CONF_START_FRAME]
@@ -0,0 +1,3 @@
+CODEOWNERS = ["@clydebarrow"]
+DEPENDENCIES = ["uart"]
+DOMAIN = "apc_proteous"
@@ -0,0 +1,236 @@
+#include "apc_proteous_cover.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+
+namespace esphome::apc_proteous {
+
+ESPHOME_LOG_TAG(TAG, "apc_proteous.cover");
+static constexpr const char *START_CMD = "*1\r";  // start/stop toggle
+static constexpr const char *OPEN_CMD = "*6\r";
+static constexpr const char *CLOSE_CMD = "*7\r";
+static constexpr const char *QUERY_S = "?s\r";
+static constexpr const char *QUERY_X = "?x\r";
+
+// Depending on calibration the reported position may stop a little short of the physical limits
+// (e.g. 99% at the fully open reed switch), so readings this close to an end count as that end.
+static constexpr uint8_t ENDPOINT_MARGIN = 2;
+
+using namespace esphome::cover;
+
+void APCProteousCover::setup() {
+  auto restore = this->restore_state_();
+  if (restore.has_value()) {
+    restore->apply(this);
+  } else {
+    this->position = 0.5f;
+  }
+}
+
+void APCProteousCover::loop() {
+  uint8_t data;
+  while (this->available() > 0) {
+    if (!this->read_byte(&data)) {
+      continue;
+    }
+    const char *line = this->line_reader_.feed(data);
+    if (this->line_reader_.overflowed()) {
+      // Start over from this byte, so a frame right after unterminated noise is still read
+      ESP_LOGVV(TAG, "rx overflow, discarding");
+      this->line_reader_.restart_with(data);
+    } else if (line != nullptr && line[0] != '\0') {
+      ESP_LOGVV(TAG, "rx: '%s'", line);
+      this->parse_response_(line);
+    }
+  }
+}
+
+void APCProteousCover::parse_response_(const char *line) {
+  // Expected format: "?s=XX" or "?x=XX" where XX is a hex value
+  if (line[0] != '?' || line[1] == '\0' || line[2] != '=' || line[3] == '\0') {
+    ESP_LOGV(TAG, "Invalid response: %s", line);
+    return;
+  }
+
+  const char *hex_str = line + 3;
+  char *end_ptr;
+  uint8_t value = static_cast<uint8_t>(strtol(hex_str, &end_ptr, 16));
+  if (end_ptr == hex_str) {
+    ESP_LOGW(TAG, "Failed to parse hex value: %s", line);
+    return;
+  }
+
+  bool state_changed = false;
+  char type = line[1];
+  if (type == 's') {
+    // bit 0 = operating, bit 1 = direction (0 = opening, 1 = closing)
+    CoverOperation new_operation = COVER_OPERATION_IDLE;
+    if (value & 0x01) {
+      new_operation = (value & 0x02) ? COVER_OPERATION_CLOSING : COVER_OPERATION_OPENING;
+    }
+    if (this->current_operation != new_operation) {
+      this->current_operation = new_operation;
+      state_changed = true;
+    }
+    // Motion in the commanded direction acknowledges the pending command
+    if ((this->pending_command_ == OPEN_CMD && new_operation == COVER_OPERATION_OPENING) ||
+        (this->pending_command_ == CLOSE_CMD && new_operation == COVER_OPERATION_CLOSING)) {
+      this->clear_pending_();
+    }
+    // A partial move is over once the acknowledged motion has stopped, wherever it stopped, so an
+    // old target cannot halt a movement started from the wall button or the remote later on
+    if (new_operation == COVER_OPERATION_IDLE && this->pending_command_ == nullptr) {
+      this->target_position_.reset();
+    }
+    ESP_LOGV(TAG, "s-status: 0x%02X (operation=%d)", value, new_operation);
+  } else if (type == 'x') {
+    // Position percentage, snapped to the ends so is_open/is_closed can latch despite calibration offsets
+    float new_position;
+    if (value + ENDPOINT_MARGIN >= 100) {
+      new_position = COVER_OPEN;
+    } else if (value <= ENDPOINT_MARGIN) {
+      new_position = COVER_CLOSED;
+    } else {
+      new_position = value / 100.0f;
+    }
+    if (this->position != new_position) {
+      this->position = new_position;
+      state_changed = true;
+      // Until the controller has confirmed motion in the commanded direction, current_operation may
+      // still show the previous one, so a reversing partial move must not be judged against it
+      if (this->target_position_.has_value() && this->pending_command_ == nullptr &&
+          ((this->current_operation == COVER_OPERATION_OPENING && this->position >= *this->target_position_) ||
+           (this->current_operation == COVER_OPERATION_CLOSING && this->position <= *this->target_position_))) {
+        ESP_LOGD(TAG, "Target position %.2f reached", *this->target_position_);
+        this->stop_cmd_(App.get_loop_component_start_time());
+      }
+    }
+    ESP_LOGV(TAG, "x-status: %d%% (position=%.2f)", value, this->position);
+  }
+
+  if (state_changed) {
+    this->publish_state();
+  }
+}
+
+void APCProteousCover::clear_pending_() {
+  this->pending_command_ = nullptr;
+  this->command_retries_ = 0;
+}
+
+void APCProteousCover::retry_pending_command_(uint32_t now) {
+  if (this->pending_command_ == nullptr || (now - this->pending_command_time_) < COMMAND_ACK_MS) {
+    return;
+  }
+  bool is_open_cmd = this->pending_command_ == OPEN_CMD;
+  // Nothing to resend once the gate is at the commanded end
+  if ((is_open_cmd && this->position >= COVER_OPEN) || (!is_open_cmd && this->position <= COVER_CLOSED)) {
+    this->clear_pending_();
+    return;
+  }
+  const LogString *label = is_open_cmd ? LOG_STR("open") : LOG_STR("close");
+  if (this->command_retries_ >= MAX_COMMAND_RETRIES) {
+    ESP_LOGW(TAG, "Gate did not acknowledge %s command after %u retries", LOG_STR_ARG(label), this->command_retries_);
+    this->clear_pending_();
+    this->target_position_.reset();
+    return;
+  }
+  this->command_retries_++;
+  ESP_LOGD(TAG, "Gate did not respond, resending %s command (retry %u)", LOG_STR_ARG(label), this->command_retries_);
+  this->pending_command_time_ = now;
+  this->write_command_(this->pending_command_, now);
+}
+
+void APCProteousCover::update() {
+  const uint32_t now = App.get_loop_component_start_time();
+  this->retry_pending_command_(now);
+
+  // Let the command and its echo clear the line before the next query
+  if ((now - this->last_command_tx_) < COMMAND_QUIET_MS) {
+    return;
+  }
+  // The line is idle, so anything left in the buffer is an unterminated echo
+  if (this->line_reader_.length() != 0) {
+    ESP_LOGVV(TAG, "discarding stale rx '%s' before query", this->line_reader_.partial());
+  }
+  this->line_reader_.reset();
+
+  const char *query = this->query_s_next_ ? QUERY_S : QUERY_X;
+  ESP_LOGVV(TAG, "tx: %s", query);
+  this->write_str(query);
+  this->query_s_next_ = !this->query_s_next_;
+}
+
+void APCProteousCover::dump_config() {
+  LOG_COVER("", "APC Proteous Cover", this);
+  LOG_UPDATE_INTERVAL(this);
+}
+
+CoverTraits APCProteousCover::get_traits() {
+  auto traits = CoverTraits();
+  traits.set_supports_position(true);
+  traits.set_supports_stop(true);
+  traits.set_supports_toggle(true);
+  return traits;
+}
+
+void APCProteousCover::write_command_(const char *cmd, uint32_t now) {
+  ESP_LOGVV(TAG, "tx: %s", cmd);
+  this->last_command_tx_ = now;
+  this->write_str(cmd);
+}
+
+void APCProteousCover::send_command_(const char *cmd) {
+  // The published state comes only from status reads; this just records the command so a stop
+  // can cancel it before the controller reports motion, and so it can be resent if dropped.
+  // The commands are idempotent, so only skip one when the gate is already moving that way.
+  CoverOperation operation = cmd == OPEN_CMD ? COVER_OPERATION_OPENING : COVER_OPERATION_CLOSING;
+  if (this->current_operation == operation) {
+    return;
+  }
+  ESP_LOGD(TAG, "Sending %s command",
+           operation == COVER_OPERATION_OPENING ? LOG_STR_LITERAL("open") : LOG_STR_LITERAL("close"));
+  const uint32_t now = App.get_loop_component_start_time();
+  this->pending_command_ = cmd;
+  this->pending_command_time_ = now;
+  this->command_retries_ = 0;
+  this->write_command_(cmd, now);
+}
+
+void APCProteousCover::stop_cmd_(uint32_t now) {
+  // START_CMD is a start/stop toggle, so it is only sent while the gate is moving, or while a
+  // movement command is in flight that the controller has not reported yet; otherwise it would start the gate.
+  if (this->current_operation == COVER_OPERATION_IDLE && this->pending_command_ == nullptr) {
+    ESP_LOGD(TAG, "Cover already idle, ignoring stop command");
+    return;
+  }
+  ESP_LOGD(TAG, "Sending stop command");
+  this->write_command_(START_CMD, now);
+  this->clear_pending_();
+  this->target_position_.reset();
+}
+
+void APCProteousCover::control(const CoverCall &call) {
+  if (call.get_stop()) {
+    this->stop_cmd_(App.get_loop_component_start_time());
+  } else if (call.get_position().has_value()) {
+    float target = *call.get_position();
+    ESP_LOGD(TAG, "Target position: %.2f, current: %.2f", target, this->position);
+    // There is no position command: a partial target is reached by moving towards it and stopping
+    // once the reported position gets there
+    this->target_position_.reset();
+    if (target == COVER_OPEN) {
+      this->send_command_(OPEN_CMD);
+    } else if (target == COVER_CLOSED) {
+      this->send_command_(CLOSE_CMD);
+    } else if (target != this->position) {
+      this->target_position_ = target;
+      this->send_command_(target > this->position ? OPEN_CMD : CLOSE_CMD);
+    }
+  } else if (call.get_toggle()) {
+    this->clear_pending_();
+    this->target_position_.reset();
+    this->write_command_(START_CMD, App.get_loop_component_start_time());
+  }
+}
+
+}  // namespace esphome::apc_proteous
@@ -0,0 +1,52 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/line_reader.h"
+#include "esphome/components/uart/uart.h"
+#include "esphome/components/cover/cover.h"
+
+namespace esphome::apc_proteous {
+
+class APCProteousCover : public cover::Cover, public PollingComponent, public uart::UARTDevice {
+ public:
+  void setup() override;
+  void loop() override;
+  void update() override;
+  void dump_config() override;
+
+  cover::CoverTraits get_traits() override;
+
+ protected:
+  void control(const cover::CoverCall &call) override;
+  void parse_response_(const char *line);
+  void send_command_(const char *cmd);
+  void write_command_(const char *cmd, uint32_t now);
+  void stop_cmd_(uint32_t now);
+  void retry_pending_command_(uint32_t now);
+  void clear_pending_();
+
+  // The longest valid frame is "?s=XX"; anything longer is line noise
+  static constexpr size_t MAX_RESPONSE_LEN = 16;
+
+  // A movement command is acknowledged once the controller reports motion in the commanded
+  // direction; resend it this often, up to MAX_COMMAND_RETRIES times, since the serial link
+  // occasionally drops one. The stop toggle is never resent because a spurious toggle could start the gate.
+  static constexpr uint32_t COMMAND_ACK_MS = 2000;
+  static constexpr uint8_t MAX_COMMAND_RETRIES = 3;
+
+  // The controller echoes every command, sometimes without a terminator. A query sent too soon
+  // after a command collides with that echo, so polling pauses for this long after each command.
+  static constexpr uint32_t COMMAND_QUIET_MS = 250;
+
+  // Set only for a partial target; the gate is stopped when the reported position reaches it
+  optional<float> target_position_{};
+  // Last movement command sent and not yet acknowledged; lets a stop cancel it and drives the retries
+  const char *pending_command_{nullptr};
+  uint32_t pending_command_time_{0};
+  uint32_t last_command_tx_{0};
+  LineReader<MAX_RESPONSE_LEN + 1, '\r', '\n'> line_reader_;
+  uint8_t command_retries_{0};
+  bool query_s_next_{true};
+};
+
+}  // namespace esphome::apc_proteous
@@ -0,0 +1,33 @@
+import esphome.codegen as cg
+from esphome.components import cover, uart
+import esphome.config_validation as cv
+from esphome.types import ConfigType
+
+from . import DOMAIN
+
+apc_proteous_ns = cg.esphome_ns.namespace("apc_proteous")
+APCProteousCover = apc_proteous_ns.class_(
+    "APCProteousCover", cover.Cover, cg.PollingComponent, uart.UARTDevice
+)
+
+CONFIG_SCHEMA = (
+    cover.cover_schema(APCProteousCover)
+    .extend(uart.UART_DEVICE_SCHEMA)
+    .extend(cv.polling_component_schema("500ms"))
+)
+
+FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
+    DOMAIN,
+    baud_rate=9600,
+    require_tx=True,
+    require_rx=True,
+    data_bits=8,
+    parity="NONE",
+    stop_bits=1,
+)
+
+
+async def to_code(config: ConfigType) -> None:
+    var = await cover.new_cover(config)
+    await cg.register_component(var, config)
+    await uart.register_uart_device(var, config)
@@ -34,8 +34,7 @@ enum {  // APDS9306 registers

 #define APDS9306_ERROR_CHECK(func, error) \
  if (!(func)) { \
-    ESP_LOGE(TAG, error); \
-    this->mark_failed(); \
+    this->mark_failed(LOG_STR(error)); \
    return; \
  }
 #define APDS9306_WARNING_CHECK(func, warning) \
@@ -48,21 +47,19 @@ enum {  // APDS9306 registers
  ESP_LOGV(TAG, "Writing 0x%02x to 0x%02x", value, reg); \
  if (!this->write_byte(reg, value)) { \
    ESP_LOGE(TAG, "Failed writing 0x%02x to 0x%02x", value, reg); \
-    this->mark_failed(); \
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL)); \
    return; \
  }

 void APDS9306::setup() {
  uint8_t id;
  if (!this->read_byte(APDS9306_PART_ID, &id)) {  // Part ID register
-    this->error_code_ = COMMUNICATION_FAILED;
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }

  if (id != 0xB1 && id != 0xB3) {  // 0xB1 for APDS9306 0xB3 for APDS9306-065
-    this->error_code_ = WRONG_ID;
-    this->mark_failed();
+    this->mark_failed(LOG_STR("APDS9306 has invalid id"));
    return;
  }

@@ -89,20 +86,6 @@ void APDS9306::dump_config() {
  LOG_SENSOR("", "APDS9306", this);
  LOG_I2C_DEVICE(this);

-  if (this->is_failed()) {
-    switch (this->error_code_) {
-      case COMMUNICATION_FAILED:
-        ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-        break;
-      case WRONG_ID:
-        ESP_LOGE(TAG, "APDS9306 has invalid id!");
-        break;
-      default:
-        ESP_LOGE(TAG, "Setting up APDS9306 registers failed!");
-        break;
-    }
-  }
-
  ESP_LOGCONFIG(TAG,
                "  Gain: %u\n"
                "  Measurement rate: %u\n"
@@ -50,12 +50,6 @@ class APDS9306 final : public sensor::Sensor, public PollingComponent, public i2
  void set_ambient_light_gain(AmbientLightGain gain) { this->gain_ = gain; }

 protected:
-  enum ErrorCode {
-    NONE = 0,
-    COMMUNICATION_FAILED,
-    WRONG_ID,
-  } error_code_{NONE};
-
  MeasurementBitWidth bit_width_;
  MeasurementRate measurement_rate_;
  AmbientLightGain gain_;
@@ -8,7 +8,7 @@ ESPHOME_LOG_TAG(TAG, "apds9960");

 #define APDS9960_ERROR_CHECK(func) \
  if (!(func)) { \
-    this->mark_failed(); \
+    this->mark_failed(LOG_STR("Setting up APDS9960 registers failed")); \
    return; \
  }
 #define APDS9960_WRITE_BYTE(reg, value) APDS9960_ERROR_CHECK(this->write_byte(reg, value));
@@ -16,14 +16,12 @@ ESPHOME_LOG_TAG(TAG, "apds9960");
 void APDS9960::setup() {
  uint8_t id;
  if (!this->read_byte(0x92, &id)) {  // ID register
-    this->error_code_ = COMMUNICATION_FAILED;
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }

  if (id != 0xAB && id != 0x9C && id != 0xA8 && id != 0x9E) {  // APDS9960 all should have one of these IDs
-    this->error_code_ = WRONG_ID;
-    this->mark_failed();
+    this->mark_failed(LOG_STR("APDS9960 has invalid id"));
    return;
  }

@@ -135,20 +133,6 @@ void APDS9960::dump_config() {
  LOG_SENSOR("  ", "Clear channel", this->clear_sensor_);
  LOG_SENSOR("  ", "Proximity", this->proximity_sensor_);
 #endif
-
-  if (this->is_failed()) {
-    switch (this->error_code_) {
-      case COMMUNICATION_FAILED:
-        ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-        break;
-      case WRONG_ID:
-        ESP_LOGE(TAG, "APDS9960 has invalid id!");
-        break;
-      default:
-        ESP_LOGE(TAG, "Setting up APDS9960 registers failed!");
-        break;
-    }
-  }
 }

 #define APDS9960_WARNING_CHECK(func, warning) \
@@ -58,11 +58,6 @@ class APDS9960 final : public PollingComponent, public i2c::I2CDevice {
  uint8_t gesture_gain_;
  uint8_t gesture_wait_time_;

-  enum ErrorCode {
-    NONE = 0,
-    COMMUNICATION_FAILED,
-    WRONG_ID,
-  } error_code_{NONE};
  bool gesture_up_started_{false};
  bool gesture_down_started_{false};
  bool gesture_left_started_{false};
@@ -251,9 +251,6 @@ def _validate_supports_response(value: Any) -> str:
    return cv.enum(SUPPORTS_RESPONSE_OPTIONS, lower=True)(value)


-# ESP8266 copies every string of an action into a stack buffer sized by codegen; keep it small
-ESP8266_ACTION_STRINGS_MAX_TOTAL = 384
-
 VARIABLE_SCHEMA = cv.Schema(
    {
        cv.Required(CONF_TYPE): cv.one_of(*SERVICE_ARG_NATIVE_TYPES, lower=True),
@@ -484,29 +481,6 @@ def _action_strings(conf: ConfigType, has_metadata: bool) -> list[str | None]:
    return strings


-def _action_strings_size(strings: list[str | None]) -> int:
-    """Bytes needed to copy every string out of flash, each with its terminator."""
-    return sum(
-        len(string.encode("utf-8")) + 1 for string in strings if string is not None
-    )
-
-
-def _validate_esp8266_action_strings(config: ConfigType) -> ConfigType:
-    if not CORE.is_esp8266:
-        return config
-    actions = config.get(CONF_ACTIONS, [])
-    has_metadata = _has_action_metadata(actions)
-    for conf in actions:
-        size = _action_strings_size(_action_strings(conf, has_metadata))
-        if size > ESP8266_ACTION_STRINGS_MAX_TOTAL:
-            raise cv.Invalid(
-                f"Action '{conf[CONF_ACTION]}' has {size} bytes of name, variable name, "
-                f"description and example text; ESP8266 allows at most "
-                f"{ESP8266_ACTION_STRINGS_MAX_TOTAL} bytes per action"
-            )
-    return config
-
-
 def _validate_outgoing_host_ipv6(config: ConfigType) -> ConfigType:
    """An IPv6 host can never be parsed, so never dialed, without IPv6."""
    if (
@@ -531,7 +505,6 @@ def _validate_wizard(config: ConfigType) -> ConfigType:


 FINAL_VALIDATE_SCHEMA = cv.All(
-    _validate_esp8266_action_strings,
    _validate_outgoing_host_ipv6,
    _validate_wizard,
 )
@@ -587,7 +560,6 @@ async def to_code(config: ConfigType) -> None:
    if config[CONF_HOMEASSISTANT_STATES]:
        cg.add_define("USE_API_HOMEASSISTANT_STATES")

-    scratch_size = 0
    if actions:
        # Metadata is compiled in for every action once any action declares it, because the
        # string table layout is fixed by the define rather than per action
@@ -639,8 +611,6 @@ async def to_code(config: ConfigType) -> None:
                func_args.append((native, name))
            strings = _action_strings(conf, has_metadata)
            table = _add_action_strings(index, strings)
-            if CORE.is_esp8266:
-                scratch_size = max(scratch_size, _action_strings_size(strings))
            # Template args: supports_response mode, then user service arg types
            templ = cg.TemplateArguments(supports_response, *service_template_args)
            # Key is hashed here because the name is not readable at runtime on ESP8266
@@ -667,9 +637,6 @@ async def to_code(config: ConfigType) -> None:
                cg.add(auto.add_action(unregister_action))
        # Register all services at once - single allocation, no reallocations
        cg.add(var.initialize_user_services(triggers))
-    if CORE.is_esp8266 and has_user_actions:
-        # Stack buffer that list-entities copies PROGMEM strings into, sized for the largest action
-        cg.add_define("API_USER_ACTION_STRINGS_SCRATCH_SIZE", max(scratch_size, 1))

    if (wizard_config := config.get(wizard.CONF_WIZARD)) is not None:
        await wizard.to_code(wizard_config)
@@ -403,6 +403,9 @@ message WizardCapabilities {
 message SendspinCapabilities {
  // Bitmask of the Sendspin features this device supports
  uint32 feature_flags = 1;
+  // The Sendspin client_id: base64url of the client's static public key, 43 characters.
+  // Empty until the Sendspin client has started once since boot.
+  string client_id = 2 [(max_data_length) = 43];
 }

 message DeviceCapabilitiesResponse {
@@ -1026,8 +1029,8 @@ message SubscribeHomeassistantServicesRequest {
 }

 message HomeassistantServiceMap {
-  string key = 1;
-  string value = 2;
+  string key = 1 [(progmem) = true];
+  string value = 2 [(progmem) = true];
 }

 message HomeassistantActionRequest {
@@ -1036,7 +1039,7 @@ message HomeassistantActionRequest {
  option (no_delay) = true;
  option (ifdef) = "USE_API_HOMEASSISTANT_SERVICES";

-  string service = 1;
+  string service = 1 [(progmem) = true];
  repeated HomeassistantServiceMap data = 2 [(fixed_vector) = true];
  repeated HomeassistantServiceMap data_template = 3 [(fixed_vector) = true];
  repeated HomeassistantServiceMap variables = 4 [(fixed_vector) = true];
@@ -1157,21 +1160,21 @@ enum SupportsResponseType {
 }
 message ListEntitiesServicesArgument {
  option (ifdef) = "USE_API_USER_DEFINED_ACTIONS";
-  string name = 1;
+  string name = 1 [(progmem) = true];
  ServiceArgType type = 2;
-  string description = 3 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_METADATA"];
-  string example = 4 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_METADATA"];
+  string description = 3 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_METADATA", (progmem) = true];
+  string example = 4 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_METADATA", (progmem) = true];
 }
 message ListEntitiesServicesResponse {
  option (id) = 41;
  option (source) = SOURCE_SERVER;
  option (ifdef) = "USE_API_USER_DEFINED_ACTIONS";

-  string name = 1;
+  string name = 1 [(progmem) = true];
  fixed32 key = 2 [(force) = true];
  repeated ListEntitiesServicesArgument args = 3 [(fixed_vector) = true];
  SupportsResponseType supports_response = 4;
-  string description = 5 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_METADATA"];
+  string description = 5 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_METADATA", (progmem) = true];
 }
 message ExecuteServiceArgument {
  option (ifdef) = "USE_API_USER_DEFINED_ACTIONS";
@@ -3043,12 +3046,15 @@ enum SerialProxyIdentityFlag {
                                             // IDs below are empty
 }

-// The descriptor fields of a USB device as seen by the host stack
+// The descriptor fields of a USB device as seen by the host stack, and the port's index
+// among those a vendor driver exposes on the interface
 message UsbDeviceDescriptor {
  uint32 vendor_id = 1;
  uint32 product_id = 2;
  uint32 bcd_device = 3;
-  uint32 interface_number = 4;   // bInterfaceNumber the host driver binds to
+  uint32 interface_number = 4;  // bInterfaceNumber the port is bound through
+  uint32 interface_class = 5;   // bInterfaceClass of that interface
+  uint32 port_number = 6;
 }

 // The identity of the device behind a port. Identifies one physical device among others of
@@ -1,4 +1,7 @@
 #include "api_connection.h"
+#if defined(USE_LOGGER) && defined(USE_CRASH_HANDLER)
+#include "esphome/components/logger/logger.h"
+#endif
 #ifdef USE_API
 #include "api_connection_buffer.h"  // for the APIServer-dependent APIConnection inlines
 #ifdef USE_API_NOISE
@@ -451,6 +454,15 @@ bool APIConnection::send_disconnect_response_() {
  DisconnectResponse resp;
  return this->send_message(resp);
 }
+void APIConnection::on_subscribe_logs_request(const SubscribeLogsRequest &msg) {
+  this->flags_.log_subscription = msg.level;
+  if (msg.dump_config)
+    App.schedule_dump_config();
+#if defined(USE_LOGGER) && defined(USE_CRASH_HANDLER)
+  logger::log_crash_to_client();
+#endif
+}
+
 void APIConnection::on_disconnect_response() {
  // Don't close socket here, let APIServer::loop() do it
  // so getpeername() still works for the disconnect trigger
@@ -2119,6 +2131,7 @@ bool APIConnection::send_device_capabilities_response_() {
 #endif
 #if defined(USE_SENDSPIN) && defined(USE_ESP_IDF)
  resp.sendspin.feature_flags = sendspin_::global_sendspin_hub->get_feature_flags();
+  resp.sendspin.client_id = sendspin_::global_sendspin_hub->get_client_id();
 #endif
  return this->send_message(resp);
 }
@@ -15,15 +15,6 @@
 #include "subscribe_state.h"
 #include "esphome/core/application.h"
 #include "esphome/core/component.h"
-#ifdef USE_ESP32_CRASH_HANDLER
-#include "esphome/components/esp32/crash_handler.h"
-#endif
-#ifdef USE_RP2_CRASH_HANDLER
-#include "esphome/components/rp2/crash_handler.h"
-#endif
-#ifdef USE_ESP8266_CRASH_HANDLER
-#include "esphome/components/esp8266/crash_handler.h"
-#endif
 #include "esphome/core/entity_base.h"
 #include "esphome/core/log.h"
 #include "esphome/core/string_ref.h"
@@ -298,21 +289,7 @@ class APIConnection final : public APIServerConnectionBase {
      this->begin_iterator_(ActiveIterator::INITIAL_STATE);
    }
  }
-  void on_subscribe_logs_request(const SubscribeLogsRequest &msg) {
-    this->flags_.log_subscription = msg.level;
-    if (msg.dump_config)
-      App.schedule_dump_config();
-#ifdef USE_ESP32_CRASH_HANDLER
-    esp32::crash_handler_log();
-    esp32::crash_handler_clear();
-#endif
-#ifdef USE_RP2_CRASH_HANDLER
-    rp2::crash_handler_log();
-#endif
-#ifdef USE_ESP8266_CRASH_HANDLER
-    esp8266::crash_handler_log();
-#endif
-  }
+  void on_subscribe_logs_request(const SubscribeLogsRequest &msg);
 #ifdef USE_API_HOMEASSISTANT_SERVICES
  void on_subscribe_homeassistant_services_request() { this->flags_.service_call_subscription = true; }
 #endif
@@ -123,7 +123,7 @@ extend google.protobuf.FieldOptions {
    // from an absent one (e.g. a UTC ParsedTimezone, which is all zeros).
    optional bool track_presence = 50020 [default=false];

-    // progmem: The pointer_to_buffer bytes field points into flash (PROGMEM).
+    // progmem: The string field, or pointer_to_buffer bytes field, points into flash (PROGMEM).
    // The generated encode and dump copy it with progmem_memcpy, as ESP8266
    // cannot read flash with ordinary loads.
    optional bool progmem = 50021 [default=false];
@@ -310,12 +310,14 @@ uint32_t WizardCapabilities::calc_size_msg(const void *self) {
 uint8_t *SendspinCapabilities::encode_msg(const void *self, uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM) {
  const auto &msg = *static_cast<const SendspinCapabilities *>(self);
  pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 1, msg.feature_flags);
+  pos = ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 2, msg.client_id);
  return pos;
 }
 uint32_t SendspinCapabilities::calc_size_msg(const void *self) {
  const auto &msg = *static_cast<const SendspinCapabilities *>(self);
  uint32_t size = 0;
  size += ProtoSize::calc_uint32(1, msg.feature_flags);
+  size += !msg.client_id.empty() ? 2 + msg.client_id.size() : 0;
  return size;
 }
 #endif
@@ -1140,8 +1142,8 @@ uint32_t NoiseEncryptionSetKeyResponse::calc_size_msg(const void *self) {
 #ifdef USE_API_HOMEASSISTANT_SERVICES
 uint8_t *HomeassistantServiceMap::encode_msg(const void *self, uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM) {
  const auto &msg = *static_cast<const HomeassistantServiceMap *>(self);
-  pos = ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 1, msg.key);
-  pos = ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 2, msg.value);
+  pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 1, msg.key);
+  pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 2, msg.value);
  return pos;
 }
 uint32_t HomeassistantServiceMap::calc_size_msg(const void *self) {
@@ -1153,7 +1155,7 @@ uint32_t HomeassistantServiceMap::calc_size_msg(const void *self) {
 }
 uint8_t *HomeassistantActionRequest::encode_msg(const void *self, uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM) {
  const auto &msg = *static_cast<const HomeassistantActionRequest *>(self);
-  pos = ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 1, msg.service);
+  pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 1, msg.service);
  for (auto &it : msg.data) {
    pos = ProtoEncode::encode_sub_message(pos PROTO_ENCODE_DEBUG_ARG, 2, it);
  }
@@ -1324,13 +1326,13 @@ void GetTimeResponse::decode_field(void *self, uint32_t tag, const uint8_t *data
 uint8_t *ListEntitiesServicesArgument::encode_msg(const void *self,
                                                  uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM) {
  const auto &msg = *static_cast<const ListEntitiesServicesArgument *>(self);
-  pos = ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 1, msg.name);
+  pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 1, msg.name);
  pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 2, static_cast<uint32_t>(msg.type));
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  pos = ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 3, msg.description);
+  pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 3, msg.description);
 #endif
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  pos = ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 4, msg.example);
+  pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 4, msg.example);
 #endif
  return pos;
 }
@@ -1350,14 +1352,14 @@ uint32_t ListEntitiesServicesArgument::calc_size_msg(const void *self) {
 uint8_t *ListEntitiesServicesResponse::encode_msg(const void *self,
                                                  uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM) {
  const auto &msg = *static_cast<const ListEntitiesServicesResponse *>(self);
-  pos = ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 1, msg.name);
+  pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 1, msg.name);
  pos = ProtoEncode::write_tag_and_fixed32(pos PROTO_ENCODE_DEBUG_ARG, 21, msg.key);
  for (auto &it : msg.args) {
    pos = ProtoEncode::encode_sub_message(pos PROTO_ENCODE_DEBUG_ARG, 3, it);
  }
  pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 4, static_cast<uint32_t>(msg.supports_response));
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  pos = ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 5, msg.description);
+  pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 5, msg.description);
 #endif
  return pos;
 }
@@ -4175,6 +4177,8 @@ uint8_t *UsbDeviceDescriptor::encode_msg(const void *self, uint8_t *__restrict__
  pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 2, msg.product_id);
  pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 3, msg.bcd_device);
  pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 4, msg.interface_number);
+  pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 5, msg.interface_class);
+  pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 6, msg.port_number);
  return pos;
 }
 uint32_t UsbDeviceDescriptor::calc_size_msg(const void *self) {
@@ -4184,6 +4188,8 @@ uint32_t UsbDeviceDescriptor::calc_size_msg(const void *self) {
  size += ProtoSize::calc_uint32(1, msg.product_id);
  size += ProtoSize::calc_uint32(1, msg.bcd_device);
  size += ProtoSize::calc_uint32(1, msg.interface_number);
+  size += ProtoSize::calc_uint32(1, msg.interface_class);
+  size += ProtoSize::calc_uint32(1, msg.port_number);
  return size;
 }
 uint8_t *SerialProxyIdentity::encode_msg(const void *self, uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM) {
@@ -750,6 +750,7 @@ class WizardCapabilities final : public ProtoMessage {
 class SendspinCapabilities final : public ProtoMessage {
 public:
  uint32_t feature_flags{0};
+  StringRef client_id{nullptr, 0};  // null until set, encode only
  static uint8_t *encode_msg(const void *self, uint8_t *pos PROTO_ENCODE_DEBUG_PARAM);
  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
    return encode_msg(this, buffer.get_pos() PROTO_ENCODE_DEBUG_ARG);
@@ -1388,8 +1389,8 @@ class NoiseEncryptionSetKeyResponse final : public ProtoMessage {
 #ifdef USE_API_HOMEASSISTANT_SERVICES
 class HomeassistantServiceMap final : public ProtoMessage {
 public:
-  StringRef key{nullptr, 0};    // null until set, encode only
-  StringRef value{nullptr, 0};  // null until set, encode only
+  ProgmemStringRef key{};
+  ProgmemStringRef value{};
  static uint8_t *encode_msg(const void *self, uint8_t *pos PROTO_ENCODE_DEBUG_PARAM);
  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
    return encode_msg(this, buffer.get_pos() PROTO_ENCODE_DEBUG_ARG);
@@ -1409,7 +1410,7 @@ class HomeassistantActionRequest final : public ProtoMessage {
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const LogString *message_name() const override { return LOG_STR("homeassistant_action_request"); }
 #endif
-  StringRef service{nullptr, 0};  // null until set, encode only
+  ProgmemStringRef service{};
  FixedVector<HomeassistantServiceMap> data{};
  FixedVector<HomeassistantServiceMap> data_template{};
  FixedVector<HomeassistantServiceMap> variables{};
@@ -1576,13 +1577,13 @@ class GetTimeResponse final : public ProtoDecodableMessage {
 #ifdef USE_API_USER_DEFINED_ACTIONS
 class ListEntitiesServicesArgument final : public ProtoMessage {
 public:
-  StringRef name{nullptr, 0};  // null until set, encode only
+  ProgmemStringRef name{};
  enums::ServiceArgType type{};
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  StringRef description{nullptr, 0};  // null until set, encode only
+  ProgmemStringRef description{};
 #endif
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  StringRef example{nullptr, 0};  // null until set, encode only
+  ProgmemStringRef example{};
 #endif
  static uint8_t *encode_msg(const void *self, uint8_t *pos PROTO_ENCODE_DEBUG_PARAM);
  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
@@ -1603,12 +1604,12 @@ class ListEntitiesServicesResponse final : public ProtoMessage {
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const LogString *message_name() const override { return LOG_STR("list_entities_services_response"); }
 #endif
-  StringRef name{nullptr, 0};  // null until set, encode only
+  ProgmemStringRef name{};
  uint32_t key{0};
  FixedVector<ListEntitiesServicesArgument> args{};
  enums::SupportsResponseType supports_response{};
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  StringRef description{nullptr, 0};  // null until set, encode only
+  ProgmemStringRef description{};
 #endif
  static uint8_t *encode_msg(const void *self, uint8_t *pos PROTO_ENCODE_DEBUG_PARAM);
  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
@@ -4083,6 +4084,8 @@ class UsbDeviceDescriptor final : public ProtoMessage {
  uint32_t product_id{0};
  uint32_t bcd_device{0};
  uint32_t interface_number{0};
+  uint32_t interface_class{0};
+  uint32_t port_number{0};
  static uint8_t *encode_msg(const void *self, uint8_t *pos PROTO_ENCODE_DEBUG_PARAM);
  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
    return encode_msg(this, buffer.get_pos() PROTO_ENCODE_DEBUG_ARG);
@@ -12,8 +12,9 @@ namespace esphome::api {

 #ifdef USE_ESP8266
 // Out-of-line to avoid inlining strlen_P/memcpy_P at every call site
-void DumpBuffer::append_p_esp8266(const char *str) {
-  size_t len = strlen_P(str);
+void DumpBuffer::append_p_esp8266(const char *str) { this->append_p_esp8266(str, strlen_P(str)); }
+
+void DumpBuffer::append_p_esp8266(const char *str, size_t len) {
  size_t space = CAPACITY - 1 - pos_;
  if (len > space)
    len = space;
@@ -134,6 +135,13 @@ static void dump_progmem_bytes_field(DumpBuffer &out, const char *field_name, co
  progmem_memcpy(data_buf, data, len);
  dump_bytes_field(out, field_name, data_buf, len, indent);
 }
+
+// Helper for string fields in flash
+static void dump_progmem_string_field(DumpBuffer &out, const char *field_name, const ProgmemStringRef &value,
+                                      int indent = 2) {
+  append_field_prefix(out, field_name, indent);
+  out.append("'").append_p(value.progmem_ptr(), value.size()).append("'\n");
+}
 #pragma GCC diagnostic pop

 template<> const char *proto_enum_to_string<enums::DisconnectReason>(enums::DisconnectReason value) {
@@ -1119,6 +1127,7 @@ const char *WizardCapabilities::dump_to(DumpBuffer &out) const {
 const char *SendspinCapabilities::dump_to(DumpBuffer &out) const {
  MessageDumpHelper helper(out, ESPHOME_PSTR("SendspinCapabilities"));
  dump_field(out, ESPHOME_PSTR("feature_flags"), this->feature_flags);
+  dump_field(out, ESPHOME_PSTR("client_id"), this->client_id);
  return out.c_str();
 }
 #endif
@@ -1511,13 +1520,13 @@ const char *NoiseEncryptionSetKeyResponse::dump_to(DumpBuffer &out) const {
 #ifdef USE_API_HOMEASSISTANT_SERVICES
 const char *HomeassistantServiceMap::dump_to(DumpBuffer &out) const {
  MessageDumpHelper helper(out, ESPHOME_PSTR("HomeassistantServiceMap"));
-  dump_field(out, ESPHOME_PSTR("key"), this->key);
-  dump_field(out, ESPHOME_PSTR("value"), this->value);
+  dump_progmem_string_field(out, ESPHOME_PSTR("key"), this->key);
+  dump_progmem_string_field(out, ESPHOME_PSTR("value"), this->value);
  return out.c_str();
 }
 const char *HomeassistantActionRequest::dump_to(DumpBuffer &out) const {
  MessageDumpHelper helper(out, ESPHOME_PSTR("HomeassistantActionRequest"));
-  dump_field(out, ESPHOME_PSTR("service"), this->service);
+  dump_progmem_string_field(out, ESPHOME_PSTR("service"), this->service);
  for (const auto &it : this->data) {
    out.append(4, ' ').append_p(ESPHOME_PSTR("data")).append(": ");
    it.dump_to(out);
@@ -1612,19 +1621,19 @@ const char *GetTimeResponse::dump_to(DumpBuffer &out) const {
 #ifdef USE_API_USER_DEFINED_ACTIONS
 const char *ListEntitiesServicesArgument::dump_to(DumpBuffer &out) const {
  MessageDumpHelper helper(out, ESPHOME_PSTR("ListEntitiesServicesArgument"));
-  dump_field(out, ESPHOME_PSTR("name"), this->name);
+  dump_progmem_string_field(out, ESPHOME_PSTR("name"), this->name);
  dump_field(out, ESPHOME_PSTR("type"), static_cast<enums::ServiceArgType>(this->type));
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  dump_field(out, ESPHOME_PSTR("description"), this->description);
+  dump_progmem_string_field(out, ESPHOME_PSTR("description"), this->description);
 #endif
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  dump_field(out, ESPHOME_PSTR("example"), this->example);
+  dump_progmem_string_field(out, ESPHOME_PSTR("example"), this->example);
 #endif
  return out.c_str();
 }
 const char *ListEntitiesServicesResponse::dump_to(DumpBuffer &out) const {
  MessageDumpHelper helper(out, ESPHOME_PSTR("ListEntitiesServicesResponse"));
-  dump_field(out, ESPHOME_PSTR("name"), this->name);
+  dump_progmem_string_field(out, ESPHOME_PSTR("name"), this->name);
  dump_field(out, ESPHOME_PSTR("key"), this->key);
  for (const auto &it : this->args) {
    out.append(4, ' ').append_p(ESPHOME_PSTR("args")).append(": ");
@@ -1633,7 +1642,7 @@ const char *ListEntitiesServicesResponse::dump_to(DumpBuffer &out) const {
  }
  dump_field(out, ESPHOME_PSTR("supports_response"), static_cast<enums::SupportsResponseType>(this->supports_response));
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  dump_field(out, ESPHOME_PSTR("description"), this->description);
+  dump_progmem_string_field(out, ESPHOME_PSTR("description"), this->description);
 #endif
  return out.c_str();
 }
@@ -2942,6 +2951,8 @@ const char *UsbDeviceDescriptor::dump_to(DumpBuffer &out) const {
  dump_field(out, ESPHOME_PSTR("product_id"), this->product_id);
  dump_field(out, ESPHOME_PSTR("bcd_device"), this->bcd_device);
  dump_field(out, ESPHOME_PSTR("interface_number"), this->interface_number);
+  dump_field(out, ESPHOME_PSTR("interface_class"), this->interface_class);
+  dump_field(out, ESPHOME_PSTR("port_number"), this->port_number);
  return out.c_str();
 }
 const char *SerialProxyIdentity::dump_to(DumpBuffer &out) const {
@@ -547,7 +547,7 @@ void APIServer::send_homeassistant_action(const HomeassistantActionRequest &call
    // arrive before the subscription and are lost - warn instead of failing silently.
    ESP_LOGW(TAG, "Home Assistant %s '%.*s' dropped; %s",
             call.is_event ? LOG_STR_LITERAL("event") : LOG_STR_LITERAL("action"),
-             static_cast<int>(call.service.size()), call.service.empty() ? "" : call.service.c_str(),
+             static_cast<int>(call.service.size()), call.service.empty() ? "" : call.service.progmem_ptr(),
             this->is_connected() ? LOG_STR_LITERAL("client has not subscribed to actions (yet)")
                                  : LOG_STR_LITERAL("no client connected"));
  }
@@ -247,7 +247,7 @@ class CustomAPIDevice {
   */
  void call_homeassistant_service(const std::string &service_name) {
    HomeassistantActionRequest resp;
-    resp.service = StringRef(service_name);
+    resp.service = ProgmemStringRef(StringRef(service_name));
    global_api_server->send_homeassistant_action(resp);
  }

@@ -267,12 +267,12 @@ class CustomAPIDevice {
   */
  void call_homeassistant_service(const std::string &service_name, const std::map<std::string, std::string> &data) {
    HomeassistantActionRequest resp;
-    resp.service = StringRef(service_name);
+    resp.service = ProgmemStringRef(StringRef(service_name));
    resp.data.init(data.size());
    for (auto &it : data) {
      auto &kv = resp.data.emplace_back();
-      kv.key = StringRef(it.first);
-      kv.value = StringRef(it.second);  // data map lives until send completes
+      kv.key = ProgmemStringRef(StringRef(it.first));
+      kv.value = ProgmemStringRef(StringRef(it.second));  // data map lives until send completes
    }
    global_api_server->send_homeassistant_action(resp);
  }
@@ -289,7 +289,7 @@ class CustomAPIDevice {
   */
  void fire_homeassistant_event(const std::string &event_name) {
    HomeassistantActionRequest resp;
-    resp.service = StringRef(event_name);
+    resp.service = ProgmemStringRef(StringRef(event_name));
    resp.is_event = true;
    global_api_server->send_homeassistant_action(resp);
  }
@@ -309,13 +309,13 @@ class CustomAPIDevice {
   */
  void fire_homeassistant_event(const std::string &service_name, const std::map<std::string, std::string> &data) {
    HomeassistantActionRequest resp;
-    resp.service = StringRef(service_name);
+    resp.service = ProgmemStringRef(StringRef(service_name));
    resp.is_event = true;
    resp.data.init(data.size());
    for (auto &it : data) {
      auto &kv = resp.data.emplace_back();
-      kv.key = StringRef(it.first);
-      kv.value = StringRef(it.second);  // data map lives until send completes
+      kv.key = ProgmemStringRef(StringRef(it.first));
+      kv.value = ProgmemStringRef(StringRef(it.second));  // data map lives until send completes
    }
    global_api_server->send_homeassistant_action(resp);
  }
@@ -116,42 +116,18 @@ template<typename... Ts> class HomeAssistantServiceCallAction final : public Act
    const Field *fields = this->fields_;
    const size_t total = 1 + this->data_count_ + this->data_template_count_ + this->variables_count_;

-    // Lambda results, and on ESP8266 the RAM copies of the flash strings, must live until the send
+    // Lambda results must live until the send; the constant strings are encoded from flash where they are
    size_t lambda_count = 0;
-#ifdef USE_ESP8266
-    size_t flash_len = 0;
-#endif
-    for (size_t i = 0; i < total; i++) {
+    for (size_t i = 0; i < total; i++)
      lambda_count += fields[i].fn != nullptr;
-#ifdef USE_ESP8266
-      if (fields[i].fn == nullptr)
-        flash_len += ESPHOME_strlen_P(fields[i].value);
-      if (fields[i].key != nullptr)
-        flash_len += ESPHOME_strlen_P(fields[i].key);
-#endif
-    }
    FixedVector<std::string> results;
    results.init(lambda_count);
-#ifdef USE_ESP8266
-    SmallBufferWithHeapFallback<128, char> flash_copy(flash_len);
-    char *cursor = flash_copy.get();
-#endif
-    auto string_ref = [&](const char *str) {
-#ifdef USE_ESP8266
-      size_t len = ESPHOME_strlen_P(str);
-      memcpy_P(cursor, str, len);
-      StringRef ref(cursor, len);
-      cursor += len;
-      return ref;
-#else
-      return StringRef(str);
-#endif
-    };
+    auto string_ref = [](const char *str) { return ProgmemStringRef(str, ESPHOME_strlen_P(str)); };
    auto value_ref = [&](const Field &field) {
      if (field.fn == nullptr)
        return string_ref(field.value);
      results.push_back(field.fn(x...));
-      return StringRef(results.back());
+      return ProgmemStringRef(StringRef(results.back()));
    };
    auto fill = [&](FixedVector<HomeassistantServiceMap> &dest, uint8_t count) {
      dest.init(count);
@@ -99,8 +99,7 @@ ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(clie
 static constexpr uint8_t SERVICE_YIELD_INTERVAL = 3;

 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
-  UserActionScratch scratch;
-  auto resp = service->encode_list_service_response(scratch);
+  auto resp = service->encode_list_service_response();
  if (!this->client_->send_message(resp))
    return false;
  // at_ is this service's index
@@ -418,6 +418,18 @@ class ProtoEncode {
    std::memcpy(pos + 2, ref.c_str(), ref.size());
    return pos + 2 + ref.size();
  }
+  /// encode_short_string_force for a string that may be in flash (PROGMEM).
+  [[nodiscard]] static inline uint8_t *encode_short_progmem_string_force(
+      uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM, uint8_t tag, const ProgmemStringRef &ref) {
+#ifdef ESPHOME_DEBUG_API
+    assert(ref.size() < 128 && "encode_short_progmem_string_force: string exceeds max_data_length < 128");
+#endif
+    PROTO_ENCODE_CHECK_BOUNDS(pos, 2 + ref.size());
+    pos[0] = tag;
+    pos[1] = static_cast<uint8_t>(ref.size());
+    progmem_memcpy(pos + 2, ref.progmem_ptr(), ref.size());
+    return pos + 2 + ref.size();
+  }
  /// Write a precomputed tag byte + 32-bit value. Outlined on embedded: one copy beats inline stores per field.
  [[nodiscard]] static PROTO_OUTLINE_FOR_SIZE uint8_t *write_tag_and_fixed32(
      uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM, uint8_t tag, uint32_t value) {
@@ -481,6 +493,17 @@ class ProtoEncode {
    progmem_memcpy(pos, data, len);
    return pos + len;
  }
+  /// encode_progmem_bytes for a string field that may be in flash.
+  [[nodiscard]] static inline uint8_t *encode_progmem_string(uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM,
+                                                             uint32_t field_id, const ProgmemStringRef &ref) {
+    return encode_progmem_bytes(pos PROTO_ENCODE_DEBUG_ARG, field_id,
+                                reinterpret_cast<const uint8_t *>(ref.progmem_ptr()), ref.size());
+  }
+  [[nodiscard]] static inline uint8_t *encode_progmem_string_force(uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM,
+                                                                   uint32_t field_id, const ProgmemStringRef &ref) {
+    return encode_progmem_bytes_force(pos PROTO_ENCODE_DEBUG_ARG, field_id,
+                                      reinterpret_cast<const uint8_t *>(ref.progmem_ptr()), ref.size());
+  }
  [[nodiscard]] static inline uint8_t *encode_uint32_force(uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM,
                                                           uint32_t field_id, uint32_t value) {
    pos = encode_field_raw(pos PROTO_ENCODE_DEBUG_ARG, field_id, 0);
@@ -680,9 +703,20 @@ class DumpBuffer {
    return *this;
  }

+  /// Append len bytes of a PROGMEM string
+  DumpBuffer &append_p(const char *str, size_t len) {
+#ifdef USE_ESP8266
+    append_p_esp8266(str, len);
+#else
+    append_impl_(str, len);
+#endif
+    return *this;
+  }
+
 #ifdef USE_ESP8266
  /// Out-of-line ESP8266 PROGMEM append to avoid inlining strlen_P/memcpy_P at every call site
  void append_p_esp8266(const char *str);
+  void append_p_esp8266(const char *str, size_t len);
 #endif

  const char *c_str() const { return buf_; }
@@ -1,47 +1,36 @@
 #include "user_services.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
+#include "esphome/core/progmem.h"
 #include "esphome/core/string_ref.h"

 namespace esphome::api {

-StringRef UserServiceStatic::str_(size_t idx, std::span<char> &scratch) const {
+ProgmemStringRef UserServiceStatic::str_(size_t idx) const {
  const char *s = progmem_read_ptr(&this->strings_[idx]);
  if (s == nullptr)
    return {};
-#ifdef USE_ESP8266
-  // Codegen sizes the scratch buffer for the largest service; the bound only guards other callers
-  if (scratch.empty())
-    return {};
-  size_t len = strnlen_P(s, scratch.size() - 1);
-  progmem_memcpy(scratch.data(), s, len);
-  scratch[len] = '\0';
-  StringRef ref(scratch.data(), len);
-  scratch = scratch.subspan(len + 1);
-  return ref;
-#else
-  return StringRef(s);
-#endif
+  return ProgmemStringRef(s, ESPHOME_strlen_P(s));
 }

 ListEntitiesServicesResponse UserServiceStatic::encode_list_service_response_(
-    std::span<const enums::ServiceArgType> arg_types, std::span<char> scratch) const {
+    std::span<const enums::ServiceArgType> arg_types) const {
  ListEntitiesServicesResponse msg;
-  msg.name = this->str_(0, scratch);
+  msg.name = this->str_(0);
  msg.key = this->key_;
  msg.supports_response = this->supports_response_;
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  msg.description = this->str_(1, scratch);
+  msg.description = this->str_(1);
 #endif
  msg.args.init(arg_types.size());
  for (size_t i = 0; i < arg_types.size(); i++) {
    size_t base = USER_ACTION_HEADER_STRINGS + i * USER_ACTION_ARG_STRINGS;
    auto &arg = msg.args.emplace_back();
    arg.type = arg_types[i];
-    arg.name = this->str_(base, scratch);
+    arg.name = this->str_(base);
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
-    arg.description = this->str_(base + 1, scratch);
-    arg.example = this->str_(base + 2, scratch);
+    arg.description = this->str_(base + 1);
+    arg.example = this->str_(base + 2);
 #endif
  }
  return msg;
@@ -20,9 +20,8 @@ class APIServer;

 class UserServiceDescriptor {
 public:
-  /// Build the list-entities message. On ESP8266 the strings live in PROGMEM and are copied into
-  /// `scratch`, so the returned message is only valid while `scratch` is; other platforms ignore it.
-  virtual ListEntitiesServicesResponse encode_list_service_response(std::span<char> scratch) = 0;
+  /// Build the list-entities message; its strings may point into flash (PROGMEM).
+  virtual ListEntitiesServicesResponse encode_list_service_response() = 0;

  virtual bool execute_service(const ExecuteServiceRequest &req) = 0;
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES
@@ -37,13 +36,6 @@ template<typename T> T get_execute_arg_value(const ExecuteServiceArgument &arg);

 template<typename T> enums::ServiceArgType to_service_arg_type();

-// Scratch buffer list-entities hands to encode_list_service_response(); only ESP8266 copies into it
-#ifdef USE_ESP8266
-using UserActionScratch = std::array<char, API_USER_ACTION_STRINGS_SCRATCH_SIZE>;
-#else
-using UserActionScratch = std::array<char, 0>;
-#endif
-
 // Non-template base for YAML-defined services so the list-entities encoder is compiled once.
 // All strings live in one PROGMEM pointer table emitted by codegen (see _action_strings in
 // __init__.py), so each service costs a single pointer of RAM. Layout: the action name, then
@@ -63,12 +55,9 @@ class UserServiceStatic : public UserServiceDescriptor {
      : strings_(strings), key_(key), supports_response_(supports_response) {}

 protected:
-  ListEntitiesServicesResponse encode_list_service_response_(std::span<const enums::ServiceArgType> arg_types,
-                                                             std::span<char> scratch) const;
-  /// Reference table entry `idx`; nullptr gives an empty StringRef.
-  /// On ESP8266 the bytes are copied out of PROGMEM into `scratch` with a terminator, and the span
-  /// is advanced past the copy.
-  StringRef str_(size_t idx, std::span<char> &scratch) const;
+  ListEntitiesServicesResponse encode_list_service_response_(std::span<const enums::ServiceArgType> arg_types) const;
+  /// Table entry `idx` as it sits in flash; nullptr gives an empty string.
+  ProgmemStringRef str_(size_t idx) const;

  const char *const *strings_;  // PROGMEM pointer table, read with progmem_read_ptr()
  uint32_t key_;
@@ -79,9 +68,9 @@ template<typename... Ts> class UserServiceBase : public UserServiceStatic {
 public:
  using UserServiceStatic::UserServiceStatic;

-  ListEntitiesServicesResponse encode_list_service_response(std::span<char> scratch) override {
+  ListEntitiesServicesResponse encode_list_service_response() override {
    std::array<enums::ServiceArgType, sizeof...(Ts)> arg_types = {to_service_arg_type<Ts>()...};
-    return this->encode_list_service_response_(arg_types, scratch);
+    return this->encode_list_service_response_(arg_types);
  }

  bool execute_service(const ExecuteServiceRequest &req) override {
@@ -125,9 +114,9 @@ template<typename... Ts> class UserServiceDynamic : public UserServiceDescriptor
    this->key_ = fnv1_hash(this->name_.c_str());
  }

-  ListEntitiesServicesResponse encode_list_service_response(std::span<char> /*scratch*/) override {
+  ListEntitiesServicesResponse encode_list_service_response() override {
    ListEntitiesServicesResponse msg;
-    msg.name = StringRef(this->name_);
+    msg.name = ProgmemStringRef(StringRef(this->name_));
    msg.key = this->key_;
    msg.supports_response = enums::SUPPORTS_RESPONSE_NONE;  // Dynamic services don't support responses yet
    std::array<enums::ServiceArgType, sizeof...(Ts)> arg_types = {to_service_arg_type<Ts>()...};
@@ -135,7 +124,7 @@ template<typename... Ts> class UserServiceDynamic : public UserServiceDescriptor
    for (size_t i = 0; i < sizeof...(Ts); i++) {
      auto &arg = msg.args.emplace_back();
      arg.type = arg_types[i];
-      arg.name = StringRef(this->arg_names_[i]);
+      arg.name = ProgmemStringRef(StringRef(this->arg_names_[i]));
    }
    return msg;
  }
@@ -23,7 +23,7 @@ static const uint8_t REGISTER_MAGNITUDE = 0x1B;  // 16 bytes / R

 void AS5600Component::setup() {
  if (!this->read_byte(REGISTER_STATUS).has_value()) {
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }

@@ -54,7 +54,7 @@ void AS5600Component::setup() {

  // write config to config register
  if (!this->write_byte_16(REGISTER_CONF, config)) {
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }

@@ -87,10 +87,8 @@ void AS5600Component::dump_config() {
  ESP_LOGCONFIG(TAG, "AS5600:");
  LOG_I2C_DEVICE(this);

-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
+  if (this->is_failed())
    return;
-  }

  ESP_LOGCONFIG(TAG,
                "  Watchdog: %d\n"
@@ -30,10 +30,7 @@ CONF_END_POSITION = "end_position"
 CONF_OUT_OF_RANGE_MODE = "out_of_range_mode"

 OutOfRangeMode = as5600_ns.enum("OutRangeMode")
-OUT_OF_RANGE_MODES = {
-    "MIN_MAX": OutOfRangeMode.OUT_RANGE_MODE_MIN_MAX,
-    "NAN": OutOfRangeMode.OUT_RANGE_MODE_NAN,
-}
+OUT_OF_RANGE_MODES = OutOfRangeMode.options("MIN_MAX", "NAN", prefix="OUT_RANGE_MODE_")


 CONF_AS5600_ID = "as5600_id"
@@ -14,14 +14,13 @@ void AS7341Component::setup() {
  this->read_byte(AS7341_ID, &id);
  ESP_LOGCONFIG(TAG, "  Read ID: 0x%X", id);
  if ((id & 0xFC) != (AS7341_CHIP_ID << 2)) {
-    this->mark_failed();
+    this->mark_failed(LOG_STR("Wrong chip ID"));
    return;
  }

  // Power on (enter IDLE state)
  if (!this->enable_power(true)) {
-    ESP_LOGE(TAG, "  Power on failed!");
-    this->mark_failed();
+    this->mark_failed(LOG_STR("Power on failed"));
    return;
  }

@@ -35,9 +34,6 @@ void AS7341Component::setup() {
 void AS7341Component::dump_config() {
  ESP_LOGCONFIG(TAG, "AS7341:");
  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-  }
  LOG_UPDATE_INTERVAL(this);
  ESP_LOGCONFIG(TAG,
                "  Gain: %u\n"
@@ -0,0 +1,185 @@
+import esphome.codegen as cg
+from esphome.components import i2c
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_CALIBRATION,
+    CONF_GAIN,
+    CONF_GLASS_ATTENUATION_FACTOR,
+    CONF_ID,
+    CONF_TYPE,
+    CONF_UPDATE_INTERVAL,
+)
+from esphome.types import ConfigType
+
+CODEOWNERS = ["@latonita", "@mrgnr"]
+DEPENDENCIES = ["i2c"]
+AUTO_LOAD = ["sensor"]
+MULTI_CONF = True
+DOMAIN = "as734x"
+
+CONF_AS734X_ID = "as734x_id"
+CONF_ATIME = "atime"
+CONF_ASTEP = "astep"
+CONF_CHANNEL_CORRECTION = "channel_correction"
+CONF_DARK_CURRENT = "dark_current"
+CONF_NORMALIZE_BASIC_COUNTS = "normalize_basic_counts"
+
+# Band order is a contract with the readout maps in as734x.cpp: the index selects the counts slot.
+BANDS_43 = (
+    "f1",
+    "f2",
+    "fz",
+    "f3",
+    "f4",
+    "fy",
+    "f5",
+    "fxl",
+    "f6",
+    "f7",
+    "f8",
+    "nir",
+    "clear",
+)
+BANDS_41 = tuple(b for b in BANDS_43 if b not in ("fz", "fy", "fxl"))
+
+as734x_ns = cg.esphome_ns.namespace("as734x")
+AS734XComponent = as734x_ns.class_(
+    "AS734XComponent", cg.PollingComponent, i2c.I2CDevice
+)
+
+Gain = as734x_ns.enum("Gain")
+GAINS_41 = {
+    f"X{name}": getattr(Gain, f"GAIN_{name.replace('.', '_')}X")
+    for name in ("0.5", "1", "2", "4", "8", "16", "32", "64", "128", "256", "512")
+}
+GAINS_43 = {**GAINS_41, "X1024": Gain.GAIN_1024X, "X2048": Gain.GAIN_2048X}
+
+Normalization = as734x_ns.enum("Normalization", True)
+NORMALIZATIONS = Normalization.options(
+    "NONE", "ALL", "BANDS", "CLEAR", prefix="NORMALIZATION_"
+)
+
+# Per-channel correction for the golden device, measured by the manufacturer.
+DEFAULT_CHANNEL_CORRECTION_43 = [
+    1.055464349,
+    1.043509797,
+    1.029576268,
+    1.0175052,
+    1.00441899,
+    0.987356499,
+    0.957597044,
+    0.995863485,
+    1.014628964,
+    0.996500814,
+    0.933072749,
+    1.052236338,
+    0.999570232,
+]
+
+# One integration cycle lasts (ATIME + 1) * (ASTEP + 1) * 2.78 us
+CYCLE_STEP_SECONDS = 2.78e-6
+
+
+def _float_list(length: int) -> cv.All:
+    """One float per band, so the list length has to match the chip."""
+    return cv.All(cv.ensure_list(cv.float_), cv.Length(min=length, max=length))
+
+
+def _calibration_schema(bands: tuple[str, ...]) -> cv.Schema:
+    correction = (
+        DEFAULT_CHANNEL_CORRECTION_43 if bands == BANDS_43 else [1.0] * len(bands)
+    )
+    return cv.Schema(
+        {
+            cv.Optional(CONF_CHANNEL_CORRECTION, default=correction): _float_list(
+                len(bands)
+            ),
+            cv.Optional(CONF_DARK_CURRENT, default=[0.0] * len(bands)): _float_list(
+                len(bands)
+            ),
+            cv.Optional(CONF_GLASS_ATTENUATION_FACTOR, default=1.0): cv.positive_float,
+        }
+    )
+
+
+def _validate_exposure(cycles: int):
+    """Reject an exposure that is empty or longer than the update interval."""
+
+    def validator(config: ConfigType) -> ConfigType:
+        atime, astep = config[CONF_ATIME], config[CONF_ASTEP]
+        if atime == 0 and astep == 0:
+            raise cv.Invalid(f"{CONF_ATIME} and {CONF_ASTEP} must not both be 0")
+        measurement = (atime + 1) * (astep + 1) * CYCLE_STEP_SECONDS * cycles
+        if measurement > config[CONF_UPDATE_INTERVAL].total_seconds:
+            raise cv.Invalid(
+                f"A measurement takes {measurement:.1f}s with these {CONF_ATIME} and "
+                f"{CONF_ASTEP} values, longer than the {CONF_UPDATE_INTERVAL}"
+            )
+        return config
+
+    return validator
+
+
+def _schema(
+    gains: dict, address: int, cycles: int, bands: tuple[str, ...]
+) -> cv.Schema:
+    return cv.All(
+        cv.Schema(
+            {
+                cv.GenerateID(): cv.declare_id(AS734XComponent),
+                cv.Optional(CONF_GAIN, default="X8"): cv.enum(gains),
+                cv.Optional(CONF_ATIME, default=29): cv.int_range(min=0, max=255),
+                cv.Optional(CONF_ASTEP, default=599): cv.int_range(min=0, max=65534),
+                cv.Optional(CONF_CALIBRATION, default={}): _calibration_schema(bands),
+                cv.Optional(CONF_NORMALIZE_BASIC_COUNTS, default="NONE"): cv.enum(
+                    NORMALIZATIONS, upper=True
+                ),
+            }
+        )
+        .extend(cv.polling_component_schema("60s"))
+        .extend(i2c.i2c_device_schema(address)),
+        _validate_exposure(cycles),
+    )
+
+
+CONFIG_SCHEMA = cv.typed_schema(
+    {
+        # two SMUX steps per update
+        "AS7341": _schema(GAINS_41, 0x39, cycles=2, bands=BANDS_41),
+        "AS7343": _schema(GAINS_43, 0x39, cycles=3, bands=BANDS_43),
+        "TCS3448": _schema(GAINS_43, 0x59, cycles=3, bands=BANDS_43),
+    },
+    upper=True,
+)
+
+
+def _per_band(
+    values: list[float], bands: tuple[str, ...], absent: float
+) -> list[float]:
+    """Spread per-band calibration over the 13 slots the C++ side indexes by band."""
+    spread = [absent] * len(BANDS_43)
+    for value, band in zip(values, bands, strict=True):
+        spread[BANDS_43.index(band)] = value
+    return spread
+
+
+async def to_code(config: ConfigType) -> None:
+    chip = config[CONF_TYPE]
+    cg.add_define("USE_AS7341" if chip == "AS7341" else "USE_AS7343")
+    var = cg.new_Pvariable(config[CONF_ID], cg.RawExpression(f"&as734x::{chip}_CHIP"))
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+    cg.add(var.set_gain(config[CONF_GAIN]))
+    cg.add(var.set_atime(config[CONF_ATIME]))
+    cg.add(var.set_astep(config[CONF_ASTEP]))
+    cg.add(var.set_basic_counts_normalization(config[CONF_NORMALIZE_BASIC_COUNTS]))
+
+    bands = BANDS_41 if chip == "AS7341" else BANDS_43
+    calibration = config[CONF_CALIBRATION]
+    cg.add(
+        var.set_channel_correction(
+            _per_band(calibration[CONF_CHANNEL_CORRECTION], bands, 1.0)
+        )
+    )
+    cg.add(var.set_dark_current(_per_band(calibration[CONF_DARK_CURRENT], bands, 0.0)))
+    cg.add(var.set_glass_attenuation_factor(calibration[CONF_GLASS_ATTENUATION_FACTOR]))
@@ -0,0 +1,671 @@
+#include "as734x.h"
+#include "color_helpers.h"
+#include "esphome/core/application.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+#include "esphome/core/progmem.h"
+
+#include <algorithm>
+#include <cstdio>
+
+namespace esphome::as734x {
+
+ESPHOME_LOG_TAG(TAG, "as734x");
+
+// Registers and bits shared by both chips
+static constexpr uint8_t REG_ENABLE = 0x80;
+static constexpr uint8_t REG_ATIME = 0x81;
+static constexpr uint8_t REG_ASTATUS = 0x94;
+static constexpr uint8_t ENABLE_PON = 0x01;
+static constexpr uint8_t ENABLE_SP_EN = 0x02;
+static constexpr uint8_t ENABLE_SMUX_EN = 0x10;
+static constexpr uint8_t CFG0_REG_BANK = 0x10;
+static constexpr uint8_t BANK_SPLIT = 0x80;  // registers below this need REG_BANK set
+static constexpr uint8_t STATUS2_AVALID = 0x40;
+static constexpr uint8_t ASTATUS_ASAT = 0x80;
+static constexpr uint8_t LED_ACT = 0x80;  // LED driver on, in the chip's LED register
+static constexpr uint8_t CONFIG_LED_SEL = 0x08;
+
+static constexpr uint8_t AS7341_CFG6 = 0xAF;
+static constexpr uint8_t AS7341_SMUX_CMD_WRITE = 0x10;  // copy the SMUX image from RAM to the chain
+static constexpr uint8_t AS7341_SMUX_RAM = 0x00;
+static constexpr uint8_t AS7343_CHAIN_CMD = 0xE4;
+static constexpr uint8_t AS7343_CHAIN_SMUX = 0xE7;
+static constexpr uint8_t AS7343_CHAINS = 3;
+
+// Read one field of a ChipInfo kept in flash
+template<typename T> static T pgm(const T &field) {
+  T value;
+  progmem_memcpy(&value, &field, sizeof(T));
+  return value;
+}
+
+static constexpr uint8_t NO_SLOT = 0xFF;
+static constexpr uint8_t CLEAR_BAND = NUM_BANDS - 1;
+static constexpr uint8_t MAX_SMUX_LEN = 20;
+static constexpr uint8_t MAX_ADC_SLOTS = 18;
+static constexpr uint32_t MIN_COLLECTION_TIMEOUT_MS = 30 * 1000;
+static constexpr uint32_t MAX_ADC_COUNT = 65535;
+
+PROGMEM_STRING_TABLE(BandNames, "F1", "F2", "FZ", "F3", "F4", "FY", "F5", "FXL", "F6", "F7", "F8", "NIR", "Clear");
+
+#ifdef USE_AS7341
+static const char AS7341_NAME[] PROGMEM = "AS7341";
+static constexpr uint8_t AS7341_ADC_SLOTS = 6;
+static constexpr uint8_t AS7341_SMUX_LEN = 20;
+static constexpr uint8_t AS7341_SMUX_STEPS = 2;
+static const RegValue AS7341_INIT[] PROGMEM = {{0x70, 0x00}};  // CONFIG: SPM mode, INT_SEL and LED_SEL cleared
+static const uint8_t AS7341_SMUX[] PROGMEM = {
+    0x30, 0x01, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x50, 0x00,  // step 0: F1 to F4, NIR, Clear
+    0x00, 0x00, 0x20, 0x04, 0x00, 0x30, 0x01, 0x50, 0x00, 0x06,  // step 0, continued
+    0x00, 0x00, 0x00, 0x40, 0x02, 0x00, 0x10, 0x03, 0x50, 0x10,  // step 1: F5 to F8, NIR, Clear
+    0x03, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x50, 0x00, 0x06,  // step 1, continued
+};
+static_assert(sizeof(AS7341_SMUX) == AS7341_SMUX_STEPS * AS7341_SMUX_LEN && AS7341_SMUX_LEN <= MAX_SMUX_LEN);
+static constexpr uint8_t N = NO_SLOT;
+static const uint8_t AS7341_READOUT[] PROGMEM = {
+    0, 1, N, 2, 3, N, N, N, N, N, N, N, N,  // step 0
+    N, N, N, N, N, N, 0, N, 1, 2, 3, 5, 4,  // step 1: SMUX routes clear to ADC4 and NIR to ADC5
+};
+static_assert(sizeof(AS7341_READOUT) == AS7341_SMUX_STEPS * NUM_BANDS && AS7341_ADC_SLOTS <= MAX_ADC_SLOTS);
+// This chip has no FZ, FY or FXL band, so those slots are marked absent.
+// clang-format off
+static const uint16_t AS7341_WAVELENGTHS[] PROGMEM = {
+    415, 445, ABSENT_NM, 480, 515, ABSENT_NM, 555, ABSENT_NM, 590, 630, 680, 910, WIDEBAND_NM,
+};
+// clang-format on
+static_assert(sizeof(AS7341_WAVELENGTHS) == NUM_BANDS * sizeof(uint16_t));
+// Datasheet values for the golden device: gain correction per gain step, the same for every band.
+// The last two entries stay at zero because this chip has no 1024x or 2048x gain.
+static const float AS7341_GAIN_CORRECTION[] PROGMEM = {1.0577f, 1.0491f, 1.0479f, 1.0491f, 1.0207f, 1.0158f, 1.0109f,
+                                                       1.0000f, 1.0003f, 0.9873f, 0.9593f, 0.0f,    0.0f};
+static_assert(sizeof(AS7341_GAIN_CORRECTION) == GAIN_COUNT * sizeof(float));
+// clang-format off
+// The three bands this chip does not have contribute nothing to the weighted sums.
+static const ChannelContribution AS7341_CONTRIBUTIONS[] PROGMEM = {
+    {0.005261294f, 5.936230324f, 0.020518273f},     // F1
+    {0.242615252f, 3.572528495f, 0.013525490f},     // F2
+    {0.0f, 0.0f, 0.0f},                             // FZ, absent
+    {0.174482552f, 2.914113437f, 0.011585145f},     // F3
+    {1.479499075f, 2.452851227f, 0.010604986f},     // F4
+    {0.0f, 0.0f, 0.0f},                             // FY, absent
+    {1.906818555f, 1.940656433f, 0.008890531f},     // F5
+    {0.0f, 0.0f, 0.0f},                             // FXL, absent
+    {1.162058142f, 1.533976606f, 0.007441544f},     // F6
+    {0.462374845f, 1.819838250f, 0.009393590f},     // F7
+    {-0.017794572f, 1.232942274f, 0.006890812f},    // F8
+    {-0.260730901f, -1.102368000f, -0.004647911f},  // NIR
+    {-0.022604075f, -0.033304813f, -0.000129106f},  // Clear
+};
+static const ChannelTristimulus AS7341_TRISTIMULUS[] PROGMEM = {
+    {0.39814f, 0.01396f, 1.95010f},     // F1
+    {1.29540f, 0.16748f, 6.45490f},     // F2
+    {0.0f, 0.0f, 0.0f},                 // FZ, absent
+    {0.36956f, 0.23538f, 2.78010f},     // F3
+    {0.10902f, 1.42750f, 0.18501f},     // F4
+    {0.0f, 0.0f, 0.0f},                 // FY, absent
+    {0.71942f, 1.88670f, 0.15325f},     // F5
+    {0.0f, 0.0f, 0.0f},                 // FXL, absent
+    {1.78180f, 1.14200f, 0.09539f},     // F6
+    {1.10110f, 0.46497f, 0.10563f},     // F7
+    {-0.03991f, -0.02702f, 0.08866f},   // F8
+    {-0.27597f, -0.24468f, -0.61140f},  // NIR
+    {-0.02347f, -0.01993f, -0.00938f},  // Clear
+};
+// clang-format on
+static_assert(sizeof(AS7341_CONTRIBUTIONS) == NUM_BANDS * sizeof(ChannelContribution));
+static_assert(sizeof(AS7341_TRISTIMULUS) == NUM_BANDS * sizeof(ChannelTristimulus));
+const ChipInfo AS7341_CHIP PROGMEM = {
+    .name = AS7341_NAME,
+    .init = AS7341_INIT,
+    .smux = AS7341_SMUX,
+    .readout = AS7341_READOUT,
+    .wavelengths = AS7341_WAVELENGTHS,
+    .gain_correction = AS7341_GAIN_CORRECTION,
+    .contributions = AS7341_CONTRIBUTIONS,
+    .tristimulus = AS7341_TRISTIMULUS,
+    .init_count = 1,
+    .astep_reg = 0xCA,
+    .cfg0_reg = 0xA9,
+    .cfg1_reg = 0xAA,
+    .status2_reg = 0xA3,
+    .id_reg = 0x92,
+    .id_mask = 0xFC,
+    .id_value = 0x09 << 2,
+    .led_reg = 0x74,
+    .led_sel_reg = 0x70,  // CONFIG, whose LED_SEL bit connects the pin to the driver
+    .adc_slots = AS7341_ADC_SLOTS,
+    .smux_steps = AS7341_SMUX_STEPS,
+    .integration_cycles = 1,
+    .smux_len = AS7341_SMUX_LEN,
+    .auto_smux = false,
+    .gain_correction_per_band = false,
+    .extra_clear_slot = NO_SLOT,
+};
+#endif
+
+#ifdef USE_AS7343
+static const char AS7343_NAME[] PROGMEM = "AS7343";
+static constexpr uint8_t AS7343_ADC_SLOTS = 18;
+static constexpr uint8_t AS7343_SMUX_LEN = 10;
+static const char TCS3448_NAME[] PROGMEM = "TCS3448";
+// CFG6, FD_CFG0, CFG10, CFG8, CFG20 (auto_smux, 18 channels in 3 cycles), AGC_GAIN_MAX, FD_TIME_1, FD_TIME_2
+static const RegValue AS7343_INIT[] PROGMEM = {{0xF5, 0x00}, {0xDF, 0xA1}, {0x65, 0xF2}, {0xC9, 0xC8},
+                                               {0xD6, 0x62}, {0xD7, 0x99}, {0xE0, 0x64}, {0xE2, 0x21}};
+static const uint8_t AS7343_SMUX[] PROGMEM = {0x00, 0x04, 0x65, 0x02, 0x00, 0x05, 0x00, 0x01, 0x00, 0x30,
+                                              0x00, 0x00, 0x60, 0x20, 0x04, 0x50, 0x03, 0x00, 0x01, 0x05,
+                                              0x05, 0x00, 0x60, 0x00, 0x30, 0x00, 0x40, 0x10, 0x20, 0x00};
+// Clear is the average of the cycle 1 (slot 4) and cycle 2 (slot 10) readings; cycle 3 always reads 0.
+static const uint8_t AS7343_READOUT[] PROGMEM = {12, 6, 0, 7, 8, 1, 15, 2, 9, 13, 14, 3, 10};
+static_assert(sizeof(AS7343_SMUX) == AS7343_CHAINS * AS7343_SMUX_LEN && AS7343_SMUX_LEN <= MAX_SMUX_LEN);
+static_assert(sizeof(AS7343_READOUT) == NUM_BANDS && AS7343_ADC_SLOTS <= MAX_ADC_SLOTS);
+// clang-format off
+static const uint16_t AS7343_WAVELENGTHS[] PROGMEM = {
+    405, 425, 450, 475, 515, 555, 550, 600, 640, 690, 745, 855, WIDEBAND_NM,
+};
+// clang-format on
+static_assert(sizeof(AS7343_WAVELENGTHS) == NUM_BANDS * sizeof(uint16_t));
+// Datasheet values for the golden device: gain correction per gain step, per band.
+// clang-format off
+static const float AS7343_GAIN_CORRECTION[] PROGMEM = {
+    1.149f, 1.100f, 1.060f, 1.070f, 1.063f, 1.051f, 1.062f, 1.056f, 1.049f, 1.040f, 1.080f, 1.038f, 1.065f,  // 0.5x
+    1.090f, 1.128f, 1.064f, 1.071f, 1.063f, 1.050f, 1.068f, 1.055f, 1.047f, 1.039f, 1.075f, 1.038f, 1.085f,  // 1x
+    1.083f, 1.086f, 1.062f, 1.070f, 1.062f, 1.049f, 1.057f, 1.053f, 1.045f, 1.038f, 1.063f, 1.037f, 1.069f,  // 2x
+    1.059f, 1.068f, 1.056f, 1.066f, 1.058f, 1.046f, 1.051f, 1.051f, 1.044f, 1.036f, 1.059f, 1.035f, 1.053f,  // 4x
+    1.100f, 1.109f, 1.096f, 1.108f, 1.099f, 1.089f, 1.091f, 1.092f, 1.082f, 1.078f, 1.100f, 1.076f, 1.088f,  // 8x
+    1.099f, 1.109f, 1.096f, 1.108f, 1.099f, 1.089f, 1.091f, 1.092f, 1.082f, 1.078f, 1.100f, 1.075f, 1.087f,  // 16x
+    1.088f, 1.096f, 1.085f, 1.097f, 1.087f, 1.078f, 1.079f, 1.080f, 1.071f, 1.067f, 1.087f, 1.064f, 1.076f,  // 32x
+    1.083f, 1.091f, 1.078f, 1.090f, 1.079f, 1.072f, 1.072f, 1.073f, 1.064f, 1.062f, 1.080f, 1.057f, 1.069f,  // 64x
+    1.076f, 1.084f, 1.072f, 1.085f, 1.074f, 1.066f, 1.062f, 1.067f, 1.055f, 1.056f, 1.074f, 1.051f, 1.061f,  // 128x
+    1.067f, 1.074f, 1.063f, 1.075f, 1.064f, 1.059f, 1.055f, 1.058f, 1.049f, 1.051f, 1.064f, 1.044f, 1.053f,  // 256x
+    1.000f, 1.000f, 1.000f, 1.000f, 1.000f, 1.000f, 1.000f, 1.000f, 1.000f, 1.000f, 1.000f, 1.000f, 1.000f,  // 512x
+    1.033303857f, 1.034763813f, 1.029855013f, 1.036911249f, 0.988150537f, 1.029003501f, 1.021363258f,
+    0.98762089f, 1.021713376f, 1.040108204f, 0.987417698f, 1.019481421f, 0.987270057f,  // 1024x
+    0.986859143f, 0.980877221f, 0.9469769f, 0.985535324f, 0.926243961f, 0.959814787f, 1.007963896f,
+    0.942685187f, 1.007630587f, 1.025460005f, 0.928696275f, 1.001296639f, 1.041275263f,  // 2048x
+};
+// clang-format on
+static_assert(sizeof(AS7343_GAIN_CORRECTION) == GAIN_COUNT * NUM_BANDS * sizeof(float));
+// clang-format off
+static const ChannelContribution AS7343_CONTRIBUTIONS[] PROGMEM = {
+    {-0.028559089f, 0.450293995f, 0.001266925f},    // F1
+    {-0.042150948f, 3.566379984f, 0.012515925f},    // F2
+    {0.000661721f, 2.877424672f, 0.010243005f},     // FZ
+    {-0.108791278f, 2.273837581f, 0.009376157f},    // F3
+    {-0.167172180f, 1.519298503f, 0.006017556f},    // F4
+    {5.726660294f, 4.199345859f, 0.019357905f},     // FY
+    {0.0f, 0.0f, 0.0f},                             // F5
+    {-0.241492014f, 1.185259160f, 0.006516325f},    // FXL
+    {-0.047665296f, 1.759469826f, 0.009780714f},    // F6
+    {-0.012516990f, 1.702006611f, 0.009950228f},    // F7
+    {-0.026424974f, -1.059196137f, -0.005425656f},  // F8
+    {-0.007565221f, -0.064827881f, -0.000232267f},  // NIR
+    {0.0f, 0.0f, 0.0f},                             // Clear
+};
+static const ChannelTristimulus AS7343_TRISTIMULUS[] PROGMEM = {
+    {-0.07879f, -0.03269f, -0.31295f},  // F1
+    {-0.12235f, -0.01297f, -0.57885f},  // F2
+    {1.99879f, -0.04011f, 10.00197f},   // FZ
+    {-0.33364f, -0.06889f, -0.31281f},  // F3
+    {-0.06795f, -0.17453f, -0.19657f},  // F4
+    {-0.45419f, 5.69083f, -0.11077f},   // FY
+    {0.0f, 0.0f, 0.0f},                 // F5
+    {5.27242f, -0.22956f, -0.06132f},   // FXL
+    {-0.05072f, -0.04762f, -0.03536f},  // F6
+    {-0.04666f, -0.01295f, -0.06025f},  // F7
+    {-0.03931f, -0.02797f, -0.12174f},  // F8
+    {0.0f, 0.0f, 0.0f},                 // NIR
+    {0.0f, 0.0f, 0.0f},                 // Clear
+};
+// clang-format on
+static_assert(sizeof(AS7343_CONTRIBUTIONS) == NUM_BANDS * sizeof(ChannelContribution));
+static_assert(sizeof(AS7343_TRISTIMULUS) == NUM_BANDS * sizeof(ChannelTristimulus));
+static constexpr ChipInfo as7343_chip(const char *name) {
+  return {
+      .name = name,
+      .init = AS7343_INIT,
+      .smux = AS7343_SMUX,
+      .readout = AS7343_READOUT,
+      .wavelengths = AS7343_WAVELENGTHS,
+      .gain_correction = AS7343_GAIN_CORRECTION,
+      .contributions = AS7343_CONTRIBUTIONS,
+      .tristimulus = AS7343_TRISTIMULUS,
+      .init_count = sizeof(AS7343_INIT) / sizeof(RegValue),
+      .astep_reg = 0xD4,
+      .cfg0_reg = 0xBF,
+      .cfg1_reg = 0xC6,
+      .status2_reg = 0x90,
+      .id_reg = 0x5A,
+      .id_mask = 0xFF,
+      .id_value = 0x81,
+      .led_reg = 0xCD,
+      .led_sel_reg = 0,  // the LED register drives the pin on its own
+      .adc_slots = AS7343_ADC_SLOTS,
+      .smux_steps = 1,
+      .integration_cycles = 3,
+      .smux_len = AS7343_SMUX_LEN,
+      .auto_smux = true,
+      .gain_correction_per_band = true,
+      .extra_clear_slot = 4,
+  };
+}
+const ChipInfo AS7343_CHIP PROGMEM = as7343_chip(AS7343_NAME);
+const ChipInfo TCS3448_CHIP PROGMEM = as7343_chip(TCS3448_NAME);  // AS7343 register map, address 0x59
+#endif
+
+// Registers below 0x80 are only reachable with the REG_BANK bit of CFG0 set; CFG0 itself always answers.
+bool AS734XComponent::select_bank_(uint8_t reg) {
+  const bool low = reg < BANK_SPLIT;
+  if (low == this->bank_low_) {
+    return true;
+  }
+  this->bank_low_ = low;
+  return this->write_byte(pgm(this->chip_->cfg0_reg), low ? CFG0_REG_BANK : 0);
+}
+
+bool AS734XComponent::update_bits_(uint8_t reg, uint8_t mask, bool value) {
+  uint8_t data = 0;
+  if (!this->select_bank_(reg) || !this->read_byte(reg, &data)) {
+    return false;
+  }
+  data = value ? (data | mask) : (data & ~mask);
+  return this->write_byte(reg, data);
+}
+
+// The exposure is applied before every measurement, so a gain, ATIME or ASTEP changed at runtime
+// takes effect on the next reading rather than only after a restart.
+bool AS734XComponent::write_exposure_() {
+  const ChipInfo *chip = this->chip_;
+  if (!this->select_bank_(REG_ATIME) || !this->write_byte(REG_ATIME, this->atime_) ||
+      !this->write_byte_16(pgm(chip->astep_reg), byteswap(this->astep_)) ||
+      !this->write_byte(pgm(chip->cfg1_reg), this->gain_)) {
+    return false;
+  }
+  this->reading_gain_ = this->gain_;
+  this->reading_atime_ = this->atime_;
+  this->reading_astep_ = this->astep_;
+  // One integration cycle lasts (ATIME + 1) * (ASTEP + 1) * 2.78 us.
+  const uint32_t cycle_ms = (this->atime_ + 1UL) * (this->astep_ + 1UL) * 139 / 50000;
+  this->integration_ms_ = cycle_ms * pgm(chip->integration_cycles);
+  this->timeout_ms_ = std::max(MIN_COLLECTION_TIMEOUT_MS, 2 * this->integration_ms_);
+  return true;
+}
+
+void AS734XComponent::setup() {
+  const ChipInfo *chip = this->chip_;
+  const uint8_t id_reg = pgm(chip->id_reg);
+  uint8_t id = 0;
+  // The sensor keeps its bank across an MCU reset, so the first access always writes CFG0
+  bool ok = this->select_bank_(REG_ENABLE) && this->write_byte(REG_ENABLE, ENABLE_PON);
+  delayMicroseconds(200);  // oscillator start-up
+  ok = ok && this->select_bank_(id_reg) && this->read_byte(id_reg, &id);
+  if (ok && (id & pgm(chip->id_mask)) != pgm(chip->id_value)) {
+    this->mark_failed(LOG_STR("Wrong chip ID"));
+    return;
+  }
+  const RegValue *init = pgm(chip->init);
+  for (uint8_t i = 0, n = pgm(chip->init_count); ok && i < n; i++) {
+    RegValue rv;
+    progmem_memcpy(&rv, &init[i], sizeof(rv));
+    ok = this->select_bank_(rv.reg) && this->write_byte(rv.reg, rv.value);
+  }
+  // Everything from here on, including the measurement registers, is in the high bank.
+  ok = ok && this->write_exposure_();
+  if (pgm(chip->auto_smux)) {
+    const uint8_t *smux = pgm(chip->smux);
+    const uint8_t len = pgm(chip->smux_len);
+    for (uint8_t i = 0; ok && i < AS7343_CHAINS * len; i++) {
+      ok = this->write_byte(AS7343_CHAIN_SMUX, progmem_read_byte(&smux[i])) &&
+           this->write_byte(AS7343_CHAIN_CMD, 0x46 + (i / len) * 0x10);
+    }
+  }
+  if (!ok) {
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
+    return;
+  }
+  this->disable_loop();
+}
+
+void AS734XComponent::dump_config() {
+  const float gain = this->gain_ == GAIN_0_5X ? 0.5f : static_cast<float>(1 << (this->gain_ - 1));
+  ESP_LOGCONFIG(TAG,
+                "AS734x:\n"
+                "  Chip: %s\n"
+                "  Gain: %gx\n"
+                "  ATIME: %u\n"
+                "  ASTEP: %u\n"
+                "  Glass attenuation factor: %.3f",
+                LOG_STR_ARG(pgm(this->chip_->name)), gain, this->atime_, this->astep_, this->glass_attenuation_factor_);
+  LOG_I2C_DEVICE(this);
+  LOG_UPDATE_INTERVAL(this);
+  for (uint8_t band = 0; band < NUM_BANDS; band++) {
+    char label[24];
+    const char *name = LOG_STR_ARG(BandNames::get_log_str(band, BandNames::LAST_INDEX));
+    snprintf(label, sizeof(label), "Counts %s", name);
+    sensor::log_sensor(TAG, "  ", label, this->sensors_[band]);
+    snprintf(label, sizeof(label), "Basic counts %s", name);
+    sensor::log_sensor(TAG, "  ", label, this->basic_counts_sensors_[band]);
+  }
+  LOG_SENSOR("  ", "Saturation level", this->saturation_level_sensor_);
+  LOG_SENSOR("  ", "Illuminance", this->illuminance_sensor_);
+  LOG_SENSOR("  ", "Irradiance photopic", this->irradiance_photopic_sensor_);
+  LOG_SENSOR("  ", "Irradiance PAR", this->irradiance_par_sensor_);
+  LOG_SENSOR("  ", "PPFD", this->ppfd_sensor_);
+  LOG_SENSOR("  ", "Color temperature", this->color_temperature_sensor_);
+#ifdef USE_AS734X_RGB
+  LOG_TEXT_SENSOR("  ", "RGB hex", this->rgb_hex_sensor_);
+#endif
+}
+
+void AS734XComponent::enable_led(bool enable) {
+  const uint8_t led_reg = pgm(this->chip_->led_reg);
+  if (led_reg == 0) {
+    return;
+  }
+  // The LED register only drives the LED while LED_SEL is set, so the pin is handed over before
+  // switching on and released only after switching off. The other order would leave the LED lit
+  // with nothing able to turn it off.
+  const uint8_t led_sel_reg = pgm(this->chip_->led_sel_reg);
+  bool ok = true;
+  if (enable && led_sel_reg != 0) {
+    ok = this->update_bits_(led_sel_reg, CONFIG_LED_SEL, true);
+  }
+  ok = this->update_bits_(led_reg, LED_ACT, enable) && ok;
+  if (!enable && led_sel_reg != 0) {
+    ok = this->update_bits_(led_sel_reg, CONFIG_LED_SEL, false) && ok;
+  }
+  // The measurement path assumes the high bank, so leave the chip there for a reading in flight
+  ok = this->select_bank_(REG_ENABLE) && ok;
+  if (!ok) {
+    ESP_LOGW(TAG, "Failed to switch the LED");
+  }
+}
+
+void AS734XComponent::update() {
+  if (this->state_ != State::STATE_IDLE) {
+    ESP_LOGW(TAG, "Skipping update, previous measurement still running");
+    return;
+  }
+  if (!this->write_exposure_()) {
+    this->abort_measurement_(LOG_STR("Failed to apply measurement settings"));
+    return;
+  }
+  this->step_ = 0;
+  this->peak_raw_count_ = 0;
+  this->raw_counts_.fill(0);
+  this->enable_loop();
+  if (!this->start_step_()) {
+    this->abort_measurement_(LOG_STR("Failed to start measurement"));
+  }
+}
+
+bool AS734XComponent::start_step_() {
+  this->start_ms_ = App.get_loop_component_start_time();
+  if (pgm(this->chip_->auto_smux)) {
+    this->state_ = State::STATE_READ_DATA;
+    return this->write_byte(REG_ENABLE, ENABLE_PON | ENABLE_SP_EN);
+  }
+  // Load this step's image into SMUX RAM; SMUX_EN copies it to the chain and clears itself when done.
+  std::array<uint8_t, MAX_SMUX_LEN> image{};
+  const uint8_t len = pgm(this->chip_->smux_len);
+  progmem_memcpy(image.data(), pgm(this->chip_->smux) + this->step_ * len, len);
+  this->state_ = State::STATE_WAIT_SMUX;
+  return this->write_byte(AS7341_CFG6, AS7341_SMUX_CMD_WRITE) &&
+         this->write_bytes(AS7341_SMUX_RAM, image.data(), len) &&
+         this->write_byte(REG_ENABLE, ENABLE_PON | ENABLE_SMUX_EN);
+}
+
+void AS734XComponent::loop() {
+  const uint32_t now = App.get_loop_component_start_time();
+  uint8_t value = 0;
+  switch (this->state_) {
+    case State::STATE_WAIT_SMUX:
+      // A failed read counts as busy, so the timeout below catches a chip that stops answering.
+      if (this->read_byte(REG_ENABLE, &value) && !(value & ENABLE_SMUX_EN)) {
+        this->start_ms_ = now;
+        this->state_ = State::STATE_READ_DATA;
+        if (!this->write_byte(REG_ENABLE, ENABLE_PON | ENABLE_SP_EN)) {
+          this->abort_measurement_(LOG_STR("Failed to start integration"));
+        }
+        return;
+      }
+      break;
+    case State::STATE_READ_DATA:
+      if (now - this->start_ms_ < this->integration_ms_) {
+        return;
+      }
+      if (this->read_byte(pgm(this->chip_->status2_reg), &value) && (value & STATUS2_AVALID)) {
+        this->read_step_();
+        return;
+      }
+      break;
+    case State::STATE_IDLE:
+      this->disable_loop();
+      return;
+  }
+  if (now - this->start_ms_ > this->timeout_ms_) {
+    this->abort_measurement_(LOG_STR("Measurement timeout"));
+  }
+}
+
+void AS734XComponent::read_step_() {
+  // Reading ASTATUS latches the data, which is only consistent within one burst starting there.
+  std::array<uint8_t, 1 + 2 * MAX_ADC_SLOTS> frame{};
+  if (!this->read_bytes(REG_ASTATUS, frame.data(), 1 + 2 * pgm(this->chip_->adc_slots)) ||
+      !this->write_byte(REG_ENABLE, ENABLE_PON)) {
+    this->abort_measurement_(LOG_STR("Failed to read channel data"));
+    return;
+  }
+  if (frame[0] & ASTATUS_ASAT) {
+    ESP_LOGV(TAG, "Step %u saturated", this->step_);
+  }
+  auto slot_value = [&frame](uint8_t slot) { return encode_uint16(frame[2 + 2 * slot], frame[1 + 2 * slot]); };
+  const uint8_t *readout = pgm(this->chip_->readout) + this->step_ * NUM_BANDS;
+  const uint8_t extra_clear = pgm(this->chip_->extra_clear_slot);
+  for (uint8_t band = 0; band < NUM_BANDS; band++) {
+    const uint8_t slot = progmem_read_byte(&readout[band]);
+    if (slot == NO_SLOT) {
+      continue;
+    }
+    const uint16_t raw = slot_value(slot);
+    this->peak_raw_count_ = std::max(this->peak_raw_count_, raw);
+    uint16_t counts = raw;
+    if (band == CLEAR_BAND && extra_clear != NO_SLOT) {
+      const uint16_t extra = slot_value(extra_clear);
+      this->peak_raw_count_ = std::max(this->peak_raw_count_, extra);
+      counts = (static_cast<uint32_t>(raw) + extra) / 2;
+    }
+    this->raw_counts_[band] = counts;
+  }
+  if (++this->step_ < pgm(this->chip_->smux_steps)) {
+    if (!this->start_step_()) {
+      this->abort_measurement_(LOG_STR("Failed to configure SMUX"));
+    }
+    return;
+  }
+  this->publish_measurement_();
+  this->status_clear_warning();
+  this->state_ = State::STATE_IDLE;
+  this->disable_loop();
+}
+
+// A basic count is the raw count scaled to one unit of gain and one millisecond of integration
+// time, which makes readings taken with different settings comparable. The manufacturer's
+// conversion factors are calibrated against that definition.
+void AS734XComponent::calculate_basic_counts_() {
+  this->basic_counts_.fill(0.0f);
+  this->max_basic_count_ = 0.0f;
+  this->max_band_basic_count_ = 0.0f;
+  this->clear_basic_count_ = 0.0f;
+
+  // The gain enum counts in powers of two starting at 0.5x, so the multiplier is 2^gain / 2.
+  const float gain_x = static_cast<float>(1 << this->reading_gain_) / 2.0f;
+  const float integration_ms = (1.0f + this->reading_atime_) * (1.0f + this->reading_astep_) * 2.78e-3f;
+  if (gain_x <= 0.0f || integration_ms <= 0.0f) {
+    return;
+  }
+  const float inv_exposure = 1.0f / (gain_x * integration_ms);
+  const ChipInfo *chip = this->chip_;
+  const uint16_t *wavelengths = pgm(chip->wavelengths);
+  const float *gain_correction = pgm(chip->gain_correction);
+  const bool per_band = pgm(chip->gain_correction_per_band);
+  const uint8_t correction_base = per_band ? this->reading_gain_ * NUM_BANDS : this->reading_gain_;
+
+  for (uint8_t band = 0; band < NUM_BANDS; band++) {
+    const uint16_t wavelength = pgm(wavelengths[band]);
+    if (wavelength == ABSENT_NM) {
+      continue;
+    }
+    float basic_count = this->raw_counts_[band] * inv_exposure;
+    basic_count -= this->dark_current_[band];
+    basic_count = std::max(basic_count, 0.0f);
+    basic_count *= pgm(gain_correction[per_band ? correction_base + band : correction_base]);
+    basic_count *= this->channel_correction_[band];
+    basic_count *= this->glass_attenuation_factor_;
+
+    this->basic_counts_[band] = basic_count;
+    this->max_basic_count_ = std::max(this->max_basic_count_, basic_count);
+    if (wavelength == WIDEBAND_NM) {
+      this->clear_basic_count_ = basic_count;
+    } else if (wavelength >= VISIBLE_MIN_NM && wavelength <= VISIBLE_MAX_NM) {
+      this->max_band_basic_count_ = std::max(this->max_band_basic_count_, basic_count);
+    }
+  }
+}
+
+float AS734XComponent::normalization_divisor_() const {
+  float divisor = 1.0f;
+  switch (this->normalization_) {
+    case Normalization::NORMALIZATION_ALL:
+      divisor = this->max_basic_count_;
+      break;
+    case Normalization::NORMALIZATION_BANDS:
+      divisor = this->max_band_basic_count_;
+      break;
+    case Normalization::NORMALIZATION_CLEAR:
+      divisor = this->clear_basic_count_;
+      break;
+    case Normalization::NORMALIZATION_NONE:
+      return 1.0f;
+  }
+  // In the dark the reference can be zero, and dividing by that would publish infinities.
+  return divisor > 0.0f ? divisor : 1.0f;
+}
+
+void AS734XComponent::publish_basic_counts_() {
+  // Normalization describes the shape of the spectrum rather than its absolute level. Channels
+  // outside the chosen reference can exceed 1.0 and are left that way rather than clipped: with
+  // BANDS the near infrared channel legitimately sits well above the visible bands.
+  const float scale = 1.0f / this->normalization_divisor_();
+  for (uint8_t band = 0; band < NUM_BANDS; band++) {
+    if (this->basic_counts_sensors_[band] != nullptr) {
+      this->basic_counts_sensors_[band]->publish_state(this->basic_counts_[band] * scale);
+    }
+  }
+}
+
+// Each band contributes a fixed amount per basic count to every integrated quantity, so the
+// totals are a weighted sum over the bands.
+// The weighted sums can go negative under light the tables were not fitted for, such as pure blue or
+// far red, so the published values are floored at zero.
+void AS734XComponent::publish_light_metrics_() {
+  float irradiance_photopic = 0.0f;
+  float irradiance_par = 0.0f;
+  float ppfd = 0.0f;
+
+  const ChannelContribution *contributions = pgm(this->chip_->contributions);
+  for (uint8_t band = 0; band < NUM_BANDS; band++) {
+    const float basic_count = this->basic_counts_[band];
+    const ChannelContribution contribution = pgm(contributions[band]);
+
+    irradiance_photopic += contribution.irradiance_photopic * basic_count;
+    irradiance_par += contribution.irradiance_par * basic_count;
+    ppfd += contribution.ppfd * basic_count;
+  }
+  irradiance_photopic = std::max(irradiance_photopic, 0.0f);
+  irradiance_par = std::max(irradiance_par, 0.0f);
+  ppfd = std::max(ppfd, 0.0f) * 1e3f;
+  const float illuminance = irradiance_photopic * LUMENS_PER_WATT;
+
+  ESP_LOGV(TAG, "Photopic irradiance %.4f, PAR %.4f, PPFD %.4f, illuminance %.2f lx", irradiance_photopic,
+           irradiance_par, ppfd, illuminance);
+  if (this->illuminance_sensor_ != nullptr) {
+    this->illuminance_sensor_->publish_state(illuminance);
+  }
+  if (this->irradiance_photopic_sensor_ != nullptr) {
+    this->irradiance_photopic_sensor_->publish_state(irradiance_photopic);
+  }
+  if (this->irradiance_par_sensor_ != nullptr) {
+    this->irradiance_par_sensor_->publish_state(irradiance_par);
+  }
+  if (this->ppfd_sensor_ != nullptr) {
+    this->ppfd_sensor_->publish_state(ppfd);
+  }
+}
+
+void AS734XComponent::publish_color_() {
+  float tri_x = 0.0f;
+  float tri_y = 0.0f;
+  float tri_z = 0.0f;
+
+  const ChannelTristimulus *table = pgm(this->chip_->tristimulus);
+  for (uint8_t band = 0; band < NUM_BANDS; band++) {
+    const float basic_count = this->basic_counts_[band];
+    const ChannelTristimulus tristimulus = pgm(table[band]);
+
+    tri_x += tristimulus.x * basic_count;
+    tri_y += tristimulus.y * basic_count;
+    tri_z += tristimulus.z * basic_count;
+  }
+
+  const float color_temperature = tristimulus_to_cct(tri_x, tri_y, tri_z);
+  ESP_LOGV(TAG, "XYZ %.4f, %.4f, %.4f -> CCT %.0f K", tri_x, tri_y, tri_z, color_temperature);
+  if (this->color_temperature_sensor_ != nullptr) {
+    this->color_temperature_sensor_->publish_state(color_temperature);
+  }
+
+#ifdef USE_AS734X_RGB
+  if (this->rgb_hex_sensor_ == nullptr) {
+    return;
+  }
+  // Convert to chromaticity first, so the colour describes the hue rather than the brightness.
+  // Absolute tristimulus values clamp to white under anything but dim light.
+  char rgb_hex[7] = "000000";  // no usable chromaticity reads as black rather than an empty string
+  const float sum = tri_x + tri_y + tri_z;
+  if (sum > MIN_TRISTIMULUS_SUM) {
+    uint8_t rgb[3];
+    tristimulus_to_rgb(tri_x / sum, tri_y / sum, tri_z / sum, rgb[0], rgb[1], rgb[2]);
+    format_hex_to(rgb_hex, rgb, sizeof(rgb));
+  }
+  this->rgb_hex_sensor_->publish_state(rgb_hex);
+#endif
+}
+
+void AS734XComponent::publish_measurement_() {
+  this->calculate_basic_counts_();
+  for (uint8_t band = 0; band < NUM_BANDS; band++) {
+    if (this->sensors_[band] != nullptr) {
+      this->sensors_[band]->publish_state(this->raw_counts_[band]);
+    }
+  }
+  this->publish_basic_counts_();
+  this->publish_light_metrics_();
+  this->publish_color_();
+  if (this->saturation_level_sensor_ != nullptr) {
+    const uint32_t max_adc =
+        std::min<uint32_t>((this->reading_atime_ + 1UL) * (this->reading_astep_ + 1UL), MAX_ADC_COUNT);
+    const float level = max_adc == 0 ? 0.0f : 100.0f * this->peak_raw_count_ / max_adc;
+    ESP_LOGV(TAG, "Highest ADC count %u of %u (%.1f%%)", this->peak_raw_count_, static_cast<unsigned>(max_adc), level);
+    this->saturation_level_sensor_->publish_state(level);
+  }
+}
+
+void AS734XComponent::abort_measurement_(const LogString *reason) {
+  ESP_LOGW(TAG, "%s", LOG_STR_ARG(reason));
+  this->write_byte(REG_ENABLE, ENABLE_PON);
+  this->status_set_warning(reason);
+  this->state_ = State::STATE_IDLE;
+  this->disable_loop();
+}
+
+}  // namespace esphome::as734x
@@ -0,0 +1,199 @@
+#pragma once
+
+#include <array>
+#include <cstdint>
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/sensor/sensor.h"
+#ifdef USE_AS734X_RGB
+#include "esphome/components/text_sensor/text_sensor.h"
+#endif
+
+namespace esphome::as734x {
+
+enum Gain : uint8_t {
+  GAIN_0_5X,
+  GAIN_1X,
+  GAIN_2X,
+  GAIN_4X,
+  GAIN_8X,
+  GAIN_16X,
+  GAIN_32X,
+  GAIN_64X,
+  GAIN_128X,
+  GAIN_256X,
+  GAIN_512X,
+  GAIN_1024X,  // AS7343 only
+  GAIN_2048X,  // AS7343 only
+};
+
+static constexpr uint8_t GAIN_COUNT = 13;  // entries in Gain, for sizing the correction tables
+static constexpr uint8_t NUM_BANDS = 13;   // band order of BANDS_43 in __init__.py
+
+// What the published basic counts are divided by. The clear channel is wideband, so it is roughly
+// the size of all the bands together, and the near infrared channel outgrows them under daylight.
+// Dividing by the largest of every channel therefore leaves the visible bands squeezed into the
+// bottom of the range.
+enum class Normalization : uint8_t {
+  NORMALIZATION_NONE,   // publish absolute basic counts
+  NORMALIZATION_ALL,    // largest of every channel
+  NORMALIZATION_BANDS,  // largest of the visible bands only
+  NORMALIZATION_CLEAR,  // the wideband clear channel
+};
+
+// Nominal centre wavelengths in nanometres bound the visible bands. The clear channel is wideband
+// and has no single centre wavelength, so it is marked with zero instead.
+static constexpr uint16_t VISIBLE_MIN_NM = 380;
+static constexpr uint16_t VISIBLE_MAX_NM = 700;
+static constexpr uint16_t WIDEBAND_NM = 0;
+static constexpr uint16_t ABSENT_NM = 0xFFFF;  // band this chip does not have
+
+// Luminous efficacy at 555 nm, for turning photopic irradiance into lux.
+static constexpr float LUMENS_PER_WATT = 683.002f;
+
+// How much one basic count of a band contributes to each integrated quantity. The factors come
+// from the manufacturer's golden-device calibration, convolved for a reconstructed spectrum.
+struct ChannelContribution {
+  float irradiance_photopic;  // weighted by the CIE 1931 V(lambda) curve
+  float irradiance_par;       // 400-700 nm only
+  float ppfd;                 // 400-700 nm only, scaled by 1e3 before publishing
+};
+
+// CIE 1931 tristimulus contribution of one basic count of a band.
+struct ChannelTristimulus {
+  float x;
+  float y;
+  float z;
+};
+
+struct RegValue {
+  uint8_t reg;
+  uint8_t value;
+};
+
+/// Per-chip constants, stored in flash. The pointed-to tables are in flash too.
+struct ChipInfo {
+  const char *name;
+  const RegValue *init;                      // written in order; the bank is selected per register address
+  const uint8_t *smux;                       // AS7341: SMUX RAM image per step; AS7343: the three chain images
+  const uint8_t *readout;                    // per step, the ADC slot of each band (0xFF: not read in this step)
+  const uint16_t *wavelengths;               // per band, WIDEBAND_NM for clear and ABSENT_NM for a missing band
+  const float *gain_correction;              // GAIN_COUNT entries, or GAIN_COUNT * NUM_BANDS when per band
+  const ChannelContribution *contributions;  // per band
+  const ChannelTristimulus *tristimulus;     // per band
+  uint8_t init_count;
+  uint8_t astep_reg;
+  uint8_t cfg0_reg;
+  uint8_t cfg1_reg;
+  uint8_t status2_reg;
+  uint8_t id_reg;
+  uint8_t id_mask;
+  uint8_t id_value;
+  uint8_t led_reg;      // LED driver register (0: this chip has no LED control)
+  uint8_t led_sel_reg;  // register whose LED_SEL bit hands the pin to the driver (0: not needed)
+  uint8_t adc_slots;    // 16-bit data registers read after ASTATUS
+  uint8_t smux_steps;   // measurements per update
+  uint8_t integration_cycles;
+  uint8_t smux_len;               // bytes per SMUX image
+  bool auto_smux;                 // the chip cycles its SMUX itself after a one-time chain setup
+  bool gain_correction_per_band;  // the correction table is indexed by gain and band, not gain alone
+  uint8_t extra_clear_slot;       // averaged into the clear band (0xFF: none)
+};
+
+#ifdef USE_AS7341
+extern const ChipInfo AS7341_CHIP;
+#endif
+#ifdef USE_AS7343
+extern const ChipInfo AS7343_CHIP;
+extern const ChipInfo TCS3448_CHIP;
+#endif
+
+class AS734XComponent : public PollingComponent, public i2c::I2CDevice {
+ public:
+  // Channel correction is multiplicative, so it starts at unity rather than zero in case no
+  // calibration is configured.
+  explicit AS734XComponent(const ChipInfo *chip) : chip_(chip) { this->channel_correction_.fill(1.0f); }
+
+  void setup() override;
+  void dump_config() override;
+  void update() override;
+  void loop() override;
+
+  void set_gain(Gain gain) { this->gain_ = gain; }
+  void set_atime(uint8_t atime) { this->atime_ = atime; }
+  void set_astep(uint16_t astep) { this->astep_ = astep; }
+
+  /// Turns the sensor's LED driver on or off. Meant for lambdas.
+  void enable_led(bool enable);
+
+  // Calibration applied while turning raw counts into basic counts.
+  void set_dark_current(const std::array<float, NUM_BANDS> &values) { this->dark_current_ = values; }
+  void set_channel_correction(const std::array<float, NUM_BANDS> &values) { this->channel_correction_ = values; }
+  void set_glass_attenuation_factor(float factor) { this->glass_attenuation_factor_ = factor; }
+
+  /// Chooses what the published basic counts are divided by.
+  void set_basic_counts_normalization(Normalization normalization) { this->normalization_ = normalization; }
+
+  void set_counts_sensor(sensor::Sensor *sensor, uint8_t band) { this->sensors_[band] = sensor; }
+  void set_basic_counts_sensor(sensor::Sensor *sensor, uint8_t band) { this->basic_counts_sensors_[band] = sensor; }
+
+  SUB_SENSOR(saturation_level)
+  SUB_SENSOR(illuminance)
+  SUB_SENSOR(irradiance_photopic)
+  SUB_SENSOR(irradiance_par)
+  SUB_SENSOR(ppfd)
+  SUB_SENSOR(color_temperature)
+
+#ifdef USE_AS734X_RGB
+  void set_rgb_hex_sensor(text_sensor::TextSensor *sensor) { this->rgb_hex_sensor_ = sensor; }
+#endif
+
+ protected:
+  bool select_bank_(uint8_t reg);
+  bool update_bits_(uint8_t reg, uint8_t mask, bool value);
+  bool write_exposure_();
+  bool start_step_();
+  void read_step_();
+  void abort_measurement_(const LogString *reason);
+  void calculate_basic_counts_();
+  void publish_light_metrics_();
+  void publish_color_();
+  void publish_measurement_();
+  void publish_basic_counts_();
+  float normalization_divisor_() const;
+
+  std::array<sensor::Sensor *, NUM_BANDS> sensors_{};
+  std::array<sensor::Sensor *, NUM_BANDS> basic_counts_sensors_{};
+  std::array<float, NUM_BANDS> dark_current_{};
+  std::array<float, NUM_BANDS> channel_correction_;
+  std::array<float, NUM_BANDS> basic_counts_{};
+  std::array<uint16_t, NUM_BANDS> raw_counts_{};
+  const ChipInfo *chip_;  // in flash, read field by field with progmem_memcpy
+  uint32_t start_ms_{0};
+  uint32_t integration_ms_{0};
+  uint32_t timeout_ms_{0};
+  float glass_attenuation_factor_{1.0f};
+  float max_basic_count_{0.0f};       // largest of every channel
+  float max_band_basic_count_{0.0f};  // largest of the visible bands only
+  float clear_basic_count_{0.0f};     // the wideband clear channel
+  uint16_t astep_{0};
+  uint16_t peak_raw_count_{0};  // highest ADC value of this measurement, before the clear channels are averaged
+  // What the running measurement was started with, so the maths matches the data even if the
+  // configuration is changed while a measurement is in flight.
+  uint16_t reading_astep_{0};
+  Gain reading_gain_{GAIN_1X};
+  uint8_t reading_atime_{0};
+  enum class State : uint8_t { STATE_IDLE, STATE_WAIT_SMUX, STATE_READ_DATA } state_{State::STATE_IDLE};
+  Normalization normalization_{Normalization::NORMALIZATION_NONE};
+  Gain gain_{GAIN_1X};
+  uint8_t atime_{0};
+  uint8_t step_{0};
+  bool bank_low_{true};  // unknown until setup() writes CFG0
+#ifdef USE_AS734X_RGB
+  text_sensor::TextSensor *rgb_hex_sensor_{nullptr};
+#endif
+};
+
+}  // namespace esphome::as734x
@@ -0,0 +1,63 @@
+#include "color_helpers.h"
+
+#include <algorithm>
+#include <cmath>
+
+namespace esphome::as734x {
+
+namespace {
+
+// Range McCamy's approximation is meaningful over.
+constexpr float CCT_MIN_K = 1000.0f;
+constexpr float CCT_MAX_K = 25000.0f;
+
+#ifdef USE_AS734X_RGB
+// sRGB transfer function.
+float gamma_correct(float channel) {
+  if (channel <= 0.0031308f) {
+    return 12.92f * channel;
+  }
+  return 1.055f * std::pow(channel, 1.0f / 2.4f) - 0.055f;
+}
+
+uint8_t to_byte(float channel) { return static_cast<uint8_t>(std::clamp(channel, 0.0f, 1.0f) * 255.0f); }
+#endif
+
+}  // namespace
+
+float tristimulus_to_cct(float x, float y, float z) {
+  const float sum = x + y + z;
+  // The conversion matrices carry negative coefficients, so a spectrum unlike the one they were
+  // calibrated against can drive the sum to zero or below. Chromaticity is undefined there, and
+  // McCamy's formula would still return a plausible looking number from it.
+  if (sum <= MIN_TRISTIMULUS_SUM) {
+    return NAN;
+  }
+  const float chroma_x = x / sum;
+  const float chroma_y = y / sum;
+
+  // McCamy's approximation: cct = 437 n^3 + 3601 n^2 + 6861 n + 5517. The pole at
+  // chroma_y = 0.1858 sends the cubic off to either infinity, and it stays meaningless well
+  // either side of that, so the answer is only reported where the approximation holds.
+  const float denominator = 0.1858f - chroma_y;
+  if (std::abs(denominator) < 1e-4f) {
+    return NAN;
+  }
+  const float n = (chroma_x - 0.3320f) / denominator;
+  const float cct = ((437.0f * n + 3601.0f) * n + 6861.0f) * n + 5517.0f;
+  return (cct >= CCT_MIN_K && cct <= CCT_MAX_K) ? cct : NAN;
+}
+
+#ifdef USE_AS734X_RGB
+void tristimulus_to_rgb(float x, float y, float z, uint8_t &r, uint8_t &g, uint8_t &b) {
+  const float r_linear = 3.2406f * x - 1.5372f * y - 0.4986f * z;
+  const float g_linear = -0.9689f * x + 1.8758f * y + 0.0415f * z;
+  const float b_linear = 0.0557f * x - 0.2040f * y + 1.0570f * z;
+
+  r = to_byte(gamma_correct(r_linear));
+  g = to_byte(gamma_correct(g_linear));
+  b = to_byte(gamma_correct(b_linear));
+}
+#endif
+
+}  // namespace esphome::as734x
@@ -0,0 +1,22 @@
+#pragma once
+#include <cstdint>
+
+#include "esphome/core/defines.h"
+
+namespace esphome::as734x {
+
+// Smallest tristimulus sum that still carries a usable hue.
+constexpr float MIN_TRISTIMULUS_SUM = 0.001f;
+
+// Correlated colour temperature in kelvin from CIE 1931 tristimulus values, using McCamy's
+// approximation. Returns NAN when the input carries no usable hue, or when the result falls
+// outside the range the approximation holds over.
+float tristimulus_to_cct(float x, float y, float z);
+
+#ifdef USE_AS734X_RGB
+// sRGB components for CIE 1931 tristimulus values. Pass chromaticity (x + y + z == 1) rather than
+// absolute values, otherwise anything but dim light clamps to white.
+void tristimulus_to_rgb(float x, float y, float z, uint8_t &r, uint8_t &g, uint8_t &b);
+#endif
+
+}  // namespace esphome::as734x
@@ -0,0 +1,144 @@
+import esphome.codegen as cg
+from esphome.components import sensor
+from esphome.components.const import UNIT_COUNTS
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_COLOR_TEMPERATURE,
+    CONF_COUNTS,
+    CONF_ILLUMINANCE,
+    CONF_TYPE,
+    DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_IRRADIANCE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_KELVIN,
+    UNIT_LUX,
+    UNIT_PERCENT,
+)
+import esphome.final_validate as fv
+from esphome.types import ConfigType
+
+from . import BANDS_41, BANDS_43, CONF_AS734X_ID, DOMAIN, AS734XComponent
+
+DEPENDENCIES = [DOMAIN]
+
+CONF_BASIC_COUNTS = "basic_counts"
+CONF_IRRADIANCE_PAR = "irradiance_par"
+CONF_IRRADIANCE_PHOTOPIC = "irradiance_photopic"
+CONF_PPFD = "ppfd"
+CONF_SATURATION_LEVEL = "saturation_level"
+
+UNIT_IRRADIANCE = "W/m\u00b2"
+UNIT_PPFD = "\u00b5mol/m\u00b2/s"
+
+ICON_COUNTS = "mdi:counter"
+ICON_SATURATION = "mdi:weather-sunny-alert"
+ICON_ILLUMINANCE = "mdi:weather-sunny"
+ICON_IRRADIANCE_PHOTOPIC = "mdi:sun-wireless-outline"
+ICON_PAR = "mdi:sprout"
+ICON_PPFD = "mdi:sprout-outline"
+ICON_COLOR_TEMPERATURE = "mdi:sun-thermometer-outline"
+
+_COUNTS_SENSOR = sensor.sensor_schema(
+    unit_of_measurement=UNIT_COUNTS,
+    icon=ICON_COUNTS,
+    accuracy_decimals=0,
+    state_class=STATE_CLASS_MEASUREMENT,
+)
+
+# Basic counts are fractional, so they need decimals where raw counts do not.
+_BASIC_COUNTS_SENSOR = sensor.sensor_schema(
+    unit_of_measurement=UNIT_COUNTS,
+    icon=ICON_COUNTS,
+    accuracy_decimals=6,
+    state_class=STATE_CLASS_MEASUREMENT,
+)
+
+_BAND_KEYS = (CONF_COUNTS, CONF_BASIC_COUNTS)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_AS734X_ID): cv.use_id(AS734XComponent),
+        cv.Optional(CONF_COUNTS, default={}): cv.Schema(
+            {cv.Optional(band): _COUNTS_SENSOR for band in BANDS_43}
+        ),
+        cv.Optional(CONF_BASIC_COUNTS, default={}): cv.Schema(
+            {cv.Optional(band): _BASIC_COUNTS_SENSOR for band in BANDS_43}
+        ),
+        cv.Optional(CONF_SATURATION_LEVEL): sensor.sensor_schema(
+            unit_of_measurement=UNIT_PERCENT,
+            icon=ICON_SATURATION,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_ILLUMINANCE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_LUX,
+            icon=ICON_ILLUMINANCE,
+            accuracy_decimals=0,
+            device_class=DEVICE_CLASS_ILLUMINANCE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_IRRADIANCE_PHOTOPIC): sensor.sensor_schema(
+            unit_of_measurement=UNIT_IRRADIANCE,
+            icon=ICON_IRRADIANCE_PHOTOPIC,
+            accuracy_decimals=3,
+            device_class=DEVICE_CLASS_IRRADIANCE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_IRRADIANCE_PAR): sensor.sensor_schema(
+            unit_of_measurement=UNIT_IRRADIANCE,
+            icon=ICON_PAR,
+            accuracy_decimals=3,
+            device_class=DEVICE_CLASS_IRRADIANCE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_PPFD): sensor.sensor_schema(
+            unit_of_measurement=UNIT_PPFD,
+            icon=ICON_PPFD,
+            accuracy_decimals=3,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_COLOR_TEMPERATURE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_KELVIN,
+            icon=ICON_COLOR_TEMPERATURE,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+    }
+)
+
+
+def _final_validate(config: ConfigType) -> ConfigType:
+    full = fv.full_config.get()
+    hub = full.get_config_for_path(full.get_path_for_id(config[CONF_AS734X_ID])[:-1])
+    if hub[CONF_TYPE] != "AS7341":
+        return config
+    for key in _BAND_KEYS:
+        if extra := [band for band in config.get(key, {}) if band not in BANDS_41]:
+            raise cv.Invalid(
+                f"The AS7341 has no {', '.join(extra)} band", path=[key, extra[0]]
+            )
+    return config
+
+
+FINAL_VALIDATE_SCHEMA = _final_validate
+
+
+async def to_code(config: ConfigType) -> None:
+    hub = await cg.get_variable(config[CONF_AS734X_ID])
+    counts = config[CONF_COUNTS]
+    basic_counts = config[CONF_BASIC_COUNTS]
+    for i, band in enumerate(BANDS_43):
+        if (conf := counts.get(band)) is not None:
+            sens = await sensor.new_sensor(conf)
+            cg.add(hub.set_counts_sensor(sens, i))
+        if (conf := basic_counts.get(band)) is not None:
+            sens = await sensor.new_sensor(conf)
+            cg.add(hub.set_basic_counts_sensor(sens, i))
+
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_SATURATION_LEVEL, hub.set_saturation_level_sensor)
+    await sensors(CONF_ILLUMINANCE, hub.set_illuminance_sensor)
+    await sensors(CONF_IRRADIANCE_PHOTOPIC, hub.set_irradiance_photopic_sensor)
+    await sensors(CONF_IRRADIANCE_PAR, hub.set_irradiance_par_sensor)
+    await sensors(CONF_PPFD, hub.set_ppfd_sensor)
+    await sensors(CONF_COLOR_TEMPERATURE, hub.set_color_temperature_sensor)
@@ -0,0 +1,28 @@
+import esphome.codegen as cg
+from esphome.components import text_sensor
+import esphome.config_validation as cv
+from esphome.types import ConfigType
+
+from . import CONF_AS734X_ID, DOMAIN, AS734XComponent
+
+DEPENDENCIES = [DOMAIN]
+
+CONF_RGB_HEX = "rgb_hex"
+
+ICON_PALETTE = "mdi:palette"
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_AS734X_ID): cv.use_id(AS734XComponent),
+        cv.Optional(CONF_RGB_HEX): text_sensor.text_sensor_schema(icon=ICON_PALETTE),
+    }
+)
+
+
+async def to_code(config: ConfigType) -> None:
+    if (conf := config.get(CONF_RGB_HEX)) is None:
+        return
+    hub = await cg.get_variable(config[CONF_AS734X_ID])
+    cg.add_define("USE_AS734X_RGB")
+    sens = await text_sensor.new_text_sensor(conf)
+    cg.add(hub.set_rgb_hex_sensor(sens))
@@ -93,7 +93,7 @@ def _megahertz(value: float) -> int:


 def _microamps(value: float) -> int:
-    return int(value * 1000000)
+    return round(value * 1000000)


 RADAR_SETTINGS_SCHEMA = cv.Schema(
@@ -52,7 +52,7 @@ void ATM90E26Component::setup() {
  uint16_t read = this->read16_(ATM90E26_REGISTER_LASTDATA);
  if (read != 0x0030) {
    ESP_LOGW(TAG, "Could not initialize ATM90E26 IC, check SPI settings: %d", read);
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }
  // TODO: 100 * <nominal voltage, e.g. 230> * sqrt(2) * <fraction of nominal, e.g. 0.9> / (4 * gain_voltage/32768)
@@ -120,21 +120,18 @@ void ATM90E26Component::setup() {

    ESP_LOGW(TAG, "Could not initialize ATM90E26 IC: CS1 was incorrect, expected: 0x%04X",
             this->read16_(ATM90E26_REGISTER_CS1));
-    this->mark_failed();
+    this->mark_failed(LOG_STR("Checksum mismatch"));
  }
  if (sys_status & 0x3000) {  // Checksum 2 Error
    ESP_LOGW(TAG, "Could not initialize ATM90E26 IC: CS2 was incorrect, expected: 0x%04X",
             this->read16_(ATM90E26_REGISTER_CS2));
-    this->mark_failed();
+    this->mark_failed(LOG_STR("Checksum mismatch"));
  }
 }

 void ATM90E26Component::dump_config() {
  ESP_LOGCONFIG("", "ATM90E26:");
  LOG_PIN("  CS Pin: ", this->cs_);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-  }
  LOG_UPDATE_INTERVAL(this);
  LOG_SENSOR("  ", "Voltage A", this->voltage_sensor_);
  LOG_SENSOR("  ", "Current A", this->current_sensor_);
@@ -168,7 +168,7 @@ void ATM90E32Component::setup() {
  this->write16_(ATM90E32_REGISTER_CFGREGACCEN, 0x55AA);       // enable register config access
  if (!this->validate_spi_read_(0x55AA, "setup()")) {
    ESP_LOGW(TAG, "Could not initialize ATM90E32 IC, check SPI settings");
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }

@@ -411,9 +411,6 @@ void ATM90E32Component::log_calibration_status_() {
 void ATM90E32Component::dump_config() {
  ESP_LOGCONFIG("", "ATM90E32:");
  LOG_PIN("  CS Pin: ", this->cs_);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-  }
  LOG_UPDATE_INTERVAL(this);
  LOG_SENSOR("  ", "Voltage A", this->phase_[PHASEA].voltage_sensor_);
  LOG_SENSOR("  ", "Current A", this->phase_[PHASEA].current_sensor_);
@@ -27,13 +27,7 @@ audio_ns = cg.esphome_ns.namespace("audio")

 AudioFile = audio_ns.struct("AudioFile")
 AudioFileType = audio_ns.enum("AudioFileType", is_class=True)
-AUDIO_FILE_TYPE_ENUM = {
-    "NONE": AudioFileType.NONE,
-    "WAV": AudioFileType.WAV,
-    "MP3": AudioFileType.MP3,
-    "FLAC": AudioFileType.FLAC,
-    "OPUS": AudioFileType.OPUS,
-}
+AUDIO_FILE_TYPE_ENUM = AudioFileType.options("NONE", "WAV", "MP3", "FLAC", "OPUS")

 MEMORY_PSRAM = "psram"
 MEMORY_INTERNAL = "internal"
@@ -338,7 +332,7 @@ async def to_code(config: ConfigType) -> None:
    # HTTPS streams verify the server against the root certificate bundle
    require_certificate_bundle()

-    add_idf_component(name="esphome/esp-audio-libs", ref="4.0.1")
+    add_idf_component(name="esphome/esp-audio-libs", ref="4.1.0")

    data = _get_data()

@@ -188,7 +188,7 @@ AudioDecoderState AudioDecoder::decode(bool stop_gracefully) {

    // Expose the next chunk of file data. Every decoder buffers internally and consumes only what it
    // processed, so the source does not need to accumulate or stitch chunks across fill() calls.
-    this->input_buffer_->fill(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS), false);
+    this->input_buffer_->fill(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS));

    const size_t available_before_decode = this->input_buffer_->available();

@@ -129,9 +129,8 @@ AudioResamplerState AudioResampler::resample(bool stop_gracefully, int32_t *ms_d
    delay(READ_WRITE_TIMEOUT_MS);
  }

-  // Expose a chunk of the ring buffer's internal storage. pre_shift is ignored by RingBufferAudioSource
-  // (there is no intermediate transfer buffer to compact).
-  this->audio_source_->fill(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS), false);
+  // Expose a chunk of the ring buffer's internal storage.
+  this->audio_source_->fill(pdMS_TO_TICKS(READ_WRITE_TIMEOUT_MS));

  if (this->audio_source_->available() == 0) {
    // No samples available to process
@@ -20,16 +20,6 @@ std::unique_ptr<AudioSinkTransferBuffer> AudioSinkTransferBuffer::create(size_t
  return sink_buffer;
 }

-std::unique_ptr<AudioSourceTransferBuffer> AudioSourceTransferBuffer::create(size_t buffer_size) {
-  std::unique_ptr<AudioSourceTransferBuffer> source_buffer = make_unique<AudioSourceTransferBuffer>();
-
-  if (!source_buffer->allocate_buffer_(buffer_size)) {
-    return nullptr;
-  }
-
-  return source_buffer;
-}
-
 size_t AudioTransferBuffer::free() const {
  if (this->buffer_size_ == 0) {
    return 0;
@@ -132,27 +122,6 @@ void AudioTransferBuffer::deallocate_buffer_() {
  this->buffer_length_ = 0;
 }

-size_t AudioSourceTransferBuffer::transfer_data_from_source(TickType_t ticks_to_wait, bool pre_shift) {
-  if (pre_shift) {
-    // Shift data in buffer to start
-    if (this->buffer_length_ > 0) {
-      std::memmove(this->buffer_, this->data_start_, this->buffer_length_);
-    }
-    this->data_start_ = this->buffer_;
-  }
-
-  size_t bytes_to_read = AudioTransferBuffer::free();
-  size_t bytes_read = 0;
-  if (bytes_to_read > 0) {
-    if (this->ring_buffer_ != nullptr) {
-      bytes_read = this->ring_buffer_->read((void *) this->get_buffer_end(), bytes_to_read, ticks_to_wait);
-    }
-
-    this->increase_buffer_length(bytes_read);
-  }
-  return bytes_read;
-}
-
 size_t AudioSinkTransferBuffer::transfer_data_to_sink(TickType_t ticks_to_wait, bool post_shift) {
  size_t bytes_written = 0;
  if (this->available()) {
@@ -192,9 +161,44 @@ bool AudioSinkTransferBuffer::has_buffered_data() const {
  return (this->available() > 0);
 }

+// AudioSourceTransferBuffer is deprecated. Remove before 2027.5.0.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+std::unique_ptr<AudioSourceTransferBuffer> AudioSourceTransferBuffer::create(size_t buffer_size) {
+  std::unique_ptr<AudioSourceTransferBuffer> source_buffer = make_unique<AudioSourceTransferBuffer>();
+
+  if (!source_buffer->allocate_buffer_(buffer_size)) {
+    return nullptr;
+  }
+
+  return source_buffer;
+}
+
+size_t AudioSourceTransferBuffer::transfer_data_from_source(TickType_t ticks_to_wait, bool pre_shift) {
+  if (pre_shift) {
+    // Shift data in buffer to start
+    if (this->buffer_length_ > 0) {
+      std::memmove(this->buffer_, this->data_start_, this->buffer_length_);
+    }
+    this->data_start_ = this->buffer_;
+  }
+
+  size_t bytes_to_read = AudioTransferBuffer::free();
+  size_t bytes_read = 0;
+  if (bytes_to_read > 0) {
+    if (this->ring_buffer_ != nullptr) {
+      bytes_read = this->ring_buffer_->read((void *) this->get_buffer_end(), bytes_to_read, ticks_to_wait);
+    }
+
+    this->increase_buffer_length(bytes_read);
+  }
+  return bytes_read;
+}
+
 size_t AudioSourceTransferBuffer::free() const { return AudioTransferBuffer::free(); }

 bool AudioSourceTransferBuffer::has_buffered_data() const { return AudioTransferBuffer::has_buffered_data(); }
+#pragma GCC diagnostic pop

 void ConstAudioSourceBuffer::set_data(const uint8_t *data, size_t length) {
  this->data_start_ = data;
@@ -268,6 +272,23 @@ void RingBufferAudioSource::clear_buffered_data() {
  this->ring_buffer_->reset();
 }

+size_t RingBufferAudioSource::expose_padded_partial(size_t frame_bytes) {
+  if (this->current_available_ > 0 || this->queued_length_ > 0) {
+    return 0;
+  }
+  // Moves any trailing bytes still inside a held item into the splice buffer
+  this->release_item_();
+  const size_t real_bytes = this->splice_length_;
+  if (real_bytes == 0 || frame_bytes == 0 || real_bytes % frame_bytes != 0) {
+    return 0;
+  }
+  std::memset(this->splice_buffer_ + real_bytes, 0, this->alignment_bytes_ - real_bytes);
+  this->splice_length_ = 0;
+  this->current_data_ = this->splice_buffer_;
+  this->current_available_ = this->alignment_bytes_;
+  return real_bytes;
+}
+
 bool RingBufferAudioSource::has_buffered_data() const {
  // splice_length_ is deliberately not considered here. It holds an incomplete frame whose completion
  // bytes must still arrive through the ring buffer, which ring_buffer_->available() already reports.
@@ -276,7 +297,7 @@ bool RingBufferAudioSource::has_buffered_data() const {
  return (this->current_available_ > 0) || (this->queued_length_ > 0) || (this->ring_buffer_->available() > 0);
 }

-size_t RingBufferAudioSource::fill(TickType_t ticks_to_wait, bool /*pre_shift*/) {
+size_t RingBufferAudioSource::fill(TickType_t ticks_to_wait) {
  if (this->current_available_ > 0) {
    // Caller has not finished consuming the current exposure
    return 0;
@@ -3,6 +3,7 @@
 #ifdef USE_ESP32
 #include "esphome/components/ring_buffer/ring_buffer.h"
 #include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"  // for ESPDEPRECATED

 #ifdef USE_SPEAKER
 #include "esphome/components/speaker/speaker.h"
@@ -152,13 +153,20 @@ class AudioReadableBuffer {

  /// @brief Refills the buffer from its source. No-op by default for read-only buffers.
  /// @param ticks_to_wait FreeRTOS ticks to block while waiting for data
-  /// @param pre_shift If true, shifts existing data to the start of the buffer before reading
  /// @return Number of bytes read
-  virtual size_t fill(TickType_t ticks_to_wait, bool pre_shift) { return 0; }
-  size_t fill(TickType_t ticks_to_wait) { return this->fill(ticks_to_wait, true); }
+  virtual size_t fill(TickType_t ticks_to_wait) { return 0; }
+
+  // Remove before 2027.5.0
+  ESPDEPRECATED("Use fill(ticks_to_wait) instead. Removed in 2027.5.0.", "2026.11.0")
+  virtual size_t fill(TickType_t ticks_to_wait, bool pre_shift) { return this->fill(ticks_to_wait); }
 };

-class AudioSourceTransferBuffer : public AudioTransferBuffer, public AudioReadableBuffer {
+// Remove before 2027.5.0
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+class ESPDEPRECATED("Use RingBufferAudioSource instead. Removed in 2027.5.0.", "2026.11.0") AudioSourceTransferBuffer
+    : public AudioTransferBuffer,
+      public AudioReadableBuffer {
  /*
   * @brief A class that implements a transfer buffer for audio sources.
   * Supports reading audio data from a ring buffer into the transfer buffer for processing.
@@ -189,10 +197,12 @@ class AudioSourceTransferBuffer : public AudioTransferBuffer, public AudioReadab
  size_t free() const override;
  void consume(size_t bytes) override { this->decrease_buffer_length(bytes); }
  bool has_buffered_data() const override;
+  size_t fill(TickType_t ticks_to_wait) override { return this->transfer_data_from_source(ticks_to_wait); }
  size_t fill(TickType_t ticks_to_wait, bool pre_shift) override {
    return this->transfer_data_from_source(ticks_to_wait, pre_shift);
  }
 };
+#pragma GCC diagnostic pop

 /// @brief A lightweight read-only audio buffer for const data sources (e.g., flash memory).
 /// Does not allocate memory or transfer data from external sources.
@@ -246,14 +256,21 @@ class RingBufferAudioSource : public AudioReadableBuffer {
  size_t available() const override { return this->current_available_; }
  void consume(size_t bytes) override;
  bool has_buffered_data() const override;
-  /// pre_shift is ignored: there is no intermediate transfer buffer to compact, so an unconsumed
-  /// exposure stays in place and fill() returns 0 until it is fully consumed.
-  size_t fill(TickType_t ticks_to_wait, bool pre_shift) override;
+  /// An unconsumed exposure stays in place and fill() returns 0 until it is fully consumed.
+  size_t fill(TickType_t ticks_to_wait) override;
+  // Keeps the deprecated fill(ticks_to_wait, pre_shift) overload visible. Remove before 2027.5.0.
+  using AudioReadableBuffer::fill;

  /// @brief Discards all buffered audio: releases any held ring buffer item, clears the source's in-flight
  /// state, and resets the underlying ring buffer. Must be invoked from the ring buffer's consumer thread.
  void clear_buffered_data();

+  /// @brief Zero-pads held whole frames short of an alignment unit and exposes them, so a stream's tail is not
+  /// stranded. A held partial frame is left to wait for its remaining bytes.
+  /// @param frame_bytes Bytes per audio frame
+  /// @return Real (unpadded) bytes exposed, or 0 if nothing is exposable
+  size_t expose_padded_partial(size_t frame_bytes);
+
  /// @brief Returns a mutable pointer to the currently exposed audio data.
  /// The pointer may reference the ring buffer's internal storage or, when exposing a stitched frame
  /// across a wrap boundary, an internal splice buffer. In either case mutations are safe but data
@@ -1,10 +1,11 @@
 #pragma once

 #include <set>
+#include "esphome/core/log.h"

 namespace esphome::bedjet {

-static const char *const TAG = "bedjet";
+ESPHOME_LOG_TAG(TAG, "bedjet");

 /// Converts a BedJet fan step to a speed percentage, in the range of 5% to 100%.
 inline static uint8_t bedjet_fan_step_to_speed(const uint8_t fan) {
@@ -12,14 +12,10 @@ DEPENDENCIES = ["bedjet"]
 BedJetClimate = bedjet_ns.class_("BedJetClimate", climate.Climate, cg.PollingComponent)
 BedjetHeatMode = bedjet_ns.enum("BedjetHeatMode")
 BedjetTemperatureSource = bedjet_ns.enum("BedjetTemperatureSource")
-BEDJET_HEAT_MODES = {
-    "heat": BedjetHeatMode.HEAT_MODE_HEAT,
-    "extended": BedjetHeatMode.HEAT_MODE_EXTENDED,
-}
-BEDJET_TEMPERATURE_SOURCES = {
-    "outlet": BedjetTemperatureSource.TEMPERATURE_SOURCE_OUTLET,
-    "ambient": BedjetTemperatureSource.TEMPERATURE_SOURCE_AMBIENT,
-}
+BEDJET_HEAT_MODES = BedjetHeatMode.options("heat", "extended", prefix="HEAT_MODE_")
+BEDJET_TEMPERATURE_SOURCES = BedjetTemperatureSource.options(
+    "outlet", "ambient", prefix="TEMPERATURE_SOURCE_"
+)

 CONFIG_SCHEMA = (
    climate.climate_schema(BedJetClimate)
@@ -25,11 +25,7 @@ BH1745Component = bh1745_ns.class_(
 )

 AdcGain = bh1745_ns.enum("AdcGain", is_class=True)
-ADC_GAINS = {
-    "1X": AdcGain.ADC_GAIN_1X,
-    "2X": AdcGain.ADC_GAIN_2X,
-    "16X": AdcGain.ADC_GAIN_16X,
-}
+ADC_GAINS = AdcGain.options("1X", "2X", "16X", prefix="ADC_GAIN_")

 MeasurementTime = bh1745_ns.enum("MeasurementTime", is_class=True)
 MEASUREMENT_TIMES = {
@@ -65,7 +65,7 @@ MTreg:
 void BH1750Sensor::setup() {
  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }
  this->state_ = IDLE;
@@ -74,9 +74,6 @@ void BH1750Sensor::setup() {
 void BH1750Sensor::dump_config() {
  LOG_SENSOR("", "BH1750", this);
  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL_FOR, this->get_name().c_str());
-  }

  LOG_UPDATE_INTERVAL(this);
 }
@@ -35,10 +35,9 @@ CONF_ENERGY_TOTAL = "energy_total"
 bl0939_ns = cg.esphome_ns.namespace("bl0939")
 BL0939 = bl0939_ns.class_("BL0939", cg.PollingComponent, uart.UARTDevice)
 BL0939Mode = bl0939_ns.enum("BL0939Mode", is_class=True)
-MODE_OPTIONS = {
-    "direct": BL0939Mode.BL0939_MODE_DIRECT,
-    "current_transformer": BL0939Mode.BL0939_MODE_CURRENT_TRANSFORMER,
-}
+MODE_OPTIONS = BL0939Mode.options(
+    "direct", "current_transformer", prefix="BL0939_MODE_"
+)
 # Must match the mode_ member initializer in bl0939.h; set_mode() is skipped
 # when the config already equals it.
 DEFAULT_MODE = "direct"
@@ -4,7 +4,7 @@

 namespace esphome::ble_client {

-const char *const Automation::TAG = "ble_client.automation";
+const char *const Automation::TAG = "ble_client.automation";  // NOLINT: ble_client never builds for ESP8266

 }  // namespace esphome::ble_client

@@ -62,7 +62,8 @@ void BluedroidGattClient::loop() {
    auto ret = esp_ble_gattc_app_register(this->app_id);
    if (ret) {
      ESP_LOGE(TAG, "gattc app register failed: app_id=%d code=%d", this->app_id, ret);
-      this->mark_failed();
+      this->mark_failed(
+          LOG_STR("Registration failed; if the error was ESP_GATT_NO_RESOURCES, reduce the connection slots"));
    }
    // Do not wait for REG_EVT; connect() rejects until it lands.
    this->set_idle_();
@@ -108,12 +109,7 @@ void BluedroidGattClient::ble_before_disabled_event_handler() {
  this->enable_loop();
 }

-void BluedroidGattClient::dump_config() {
-  ESP_LOGCONFIG(TAG, "Bluedroid GATT client %d", this->connection_index_);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "  Registration failed; if the error was ESP_GATT_NO_RESOURCES, reduce the connection slots");
-  }
-}
+void BluedroidGattClient::dump_config() { ESP_LOGCONFIG(TAG, "Bluedroid GATT client %d", this->connection_index_); }

 // ---- contract ops ----

@@ -382,7 +378,7 @@ void BluedroidGattClient::set_disconnecting_() {

 esp_err_t BluedroidGattClient::update_conn_params_(uint16_t min_interval, uint16_t max_interval, uint16_t latency,
                                                   uint16_t timeout, const char *param_type) {
-  esp_ble_conn_update_params_t conn_params = {{0}};
+  esp_ble_conn_update_params_t conn_params = {};
  memcpy(conn_params.bda, this->remote_bda_, sizeof(esp_bd_addr_t));
  conn_params.min_int = min_interval;
  conn_params.max_int = max_interval;
@@ -680,7 +676,8 @@ bool BluedroidGattClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
        this->gattc_if_ = esp_gattc_if;
      } else {
        ESP_LOGE(TAG, "[%d] gattc app registration failed, status=%d", this->connection_index_, param->reg.status);
-        this->mark_failed();
+        this->mark_failed(
+            LOG_STR("Registration failed; if the error was ESP_GATT_NO_RESOURCES, reduce the connection slots"));
      }
      break;
    }
@@ -76,16 +76,14 @@ void RP2GattClient::setup() {
  // Pre-create every pool entry so the packet handlers' allocate() calls are
  // always a free-list pop -- the IRQ path must never reach malloc().
  if (!this->event_pool_.warm() || !this->notify_pool_.warm()) {
-    ESP_LOGE(TAG, "GATT event pool warm-up failed");
-    this->mark_failed();
+    this->mark_failed(LOG_STR("GATT event pool warm-up failed"));
    return;
  }

  // Register this engine for IRQ-context event routing.
  if (instance_count >= ESPHOME_BLE_GATT_CLIENT_COUNT) {
    // Cannot happen with codegen-sized storage; refuse loudly if it ever does.
-    ESP_LOGE(TAG, "GATT client registry full");
-    this->mark_failed();
+    this->mark_failed(LOG_STR("GATT client registry full"));
    return;
  }
  {
@@ -21,7 +21,7 @@ static constexpr uint32_t MAX_TIMER_DURATION_S = 255 * 60;

 void BM8563::setup() {
  if (!this->write_byte_16(CONTROL_STATUS_1_REG, 0)) {
-    this->mark_failed();
+    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }
 }
@@ -31,9 +31,6 @@ void BM8563::update() { this->read_time(); }
 void BM8563::dump_config() {
  ESP_LOGCONFIG(TAG, "BM8563:");
  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-  }
 }

 void BM8563::start_timer(uint32_t duration_s) {
@@ -100,7 +97,8 @@ void BM8563::get_date_(ESPTime &time) {
  this->read_register(DATE_FIRST_REG, buf, sizeof(buf));

  time.day_of_month = this->bcd2_to_byte_(buf[0] & 0x3f);
-  time.day_of_week = this->bcd2_to_byte_(buf[1] & 0x07);
+  // The chip counts weekdays 0-6 from Sunday (not BCD), ESPTime counts 1-7
+  time.day_of_week = (buf[1] & 0x07) + 1;
  time.month = this->bcd2_to_byte_(buf[2] & 0x1f);

  uint8_t year_byte = this->bcd2_to_byte_(buf[3] & 0xff);
@@ -115,7 +113,7 @@ void BM8563::get_date_(ESPTime &time) {
 void BM8563::set_date_(const ESPTime &time) {
  uint8_t buf[4] = {
      this->byte_to_bcd2_(time.day_of_month),
-      this->byte_to_bcd2_(time.day_of_week),
+      static_cast<uint8_t>(time.day_of_week - 1),
      this->byte_to_bcd2_(time.month),
      this->byte_to_bcd2_(time.year % 100),
  };
@@ -24,23 +24,14 @@ DOMAIN = "bme280_base"

 bme280_ns = cg.esphome_ns.namespace("bme280_base")
 BME280Oversampling = bme280_ns.enum("BME280Oversampling")
-OVERSAMPLING_OPTIONS = {
-    "NONE": BME280Oversampling.BME280_OVERSAMPLING_NONE,
-    "1X": BME280Oversampling.BME280_OVERSAMPLING_1X,
-    "2X": BME280Oversampling.BME280_OVERSAMPLING_2X,
-    "4X": BME280Oversampling.BME280_OVERSAMPLING_4X,
-    "8X": BME280Oversampling.BME280_OVERSAMPLING_8X,
-    "16X": BME280Oversampling.BME280_OVERSAMPLING_16X,
-}
+OVERSAMPLING_OPTIONS = BME280Oversampling.options(
+    "NONE", "1X", "2X", "4X", "8X", "16X", prefix="BME280_OVERSAMPLING_"
+)

 BME280IIRFilter = bme280_ns.enum("BME280IIRFilter")
-IIR_FILTER_OPTIONS = {
-    "OFF": BME280IIRFilter.BME280_IIR_FILTER_OFF,
-    "2X": BME280IIRFilter.BME280_IIR_FILTER_2X,
-    "4X": BME280IIRFilter.BME280_IIR_FILTER_4X,
-    "8X": BME280IIRFilter.BME280_IIR_FILTER_8X,
-    "16X": BME280IIRFilter.BME280_IIR_FILTER_16X,
-}
+IIR_FILTER_OPTIONS = BME280IIRFilter.options(
+    "OFF", "2X", "4X", "8X", "16X", prefix="BME280_IIR_FILTER_"
+)

 CONFIG_SCHEMA_BASE = cv.Schema(
    {
@@ -3,12 +3,11 @@

 #include "bme280_base.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include <esphome/components/sensor/sensor.h>
 #include <esphome/core/component.h>

-#define BME280_ERROR_WRONG_CHIP_ID "Wrong chip ID or no response"
-
 namespace esphome::bme280_base {

 ESPHOME_LOG_TAG(TAG, "bme280.sensor");
@@ -100,13 +99,11 @@ void BME280Component::setup() {
  }

  if (!this->read_byte(BME280_REGISTER_CHIPID, &chip_id)) {
-    this->error_code_ = COMMUNICATION_FAILED;
    this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
    return;
  }
  if (chip_id != 0x60) {
-    this->error_code_ = WRONG_CHIP_ID;
-    this->mark_failed(LOG_STR(BME280_ERROR_WRONG_CHIP_ID));
+    this->mark_failed(LOG_STR("Wrong chip ID or no response"));
    return;
  }

@@ -148,11 +145,10 @@ void BME280Component::setup() {
  this->calibration_.h1 = read_u8_(BME280_REGISTER_DIG_H1);
  this->calibration_.h2 = read_s16_le_(BME280_REGISTER_DIG_H2);
  this->calibration_.h3 = read_u8_(BME280_REGISTER_DIG_H3);
-  // h4 and h5 are signed 12-bit values; shift left then arithmetic right shift to sign-extend
-  int16_t h4_raw = read_u8_(BME280_REGISTER_DIG_H4) << 4 | (read_u8_(BME280_REGISTER_DIG_H4 + 1) & 0x0F);
-  this->calibration_.h4 = static_cast<int16_t>(h4_raw << 4) >> 4;
-  int16_t h5_raw = read_u8_(BME280_REGISTER_DIG_H5 + 1) << 4 | (read_u8_(BME280_REGISTER_DIG_H5) >> 4);
-  this->calibration_.h5 = static_cast<int16_t>(h5_raw << 4) >> 4;
+  this->calibration_.h4 =
+      sign_extend<12>(read_u8_(BME280_REGISTER_DIG_H4) << 4 | (read_u8_(BME280_REGISTER_DIG_H4 + 1) & 0x0F));
+  this->calibration_.h5 =
+      sign_extend<12>(read_u8_(BME280_REGISTER_DIG_H5 + 1) << 4 | (read_u8_(BME280_REGISTER_DIG_H5) >> 4));
  this->calibration_.h6 = read_u8_(BME280_REGISTER_DIG_H6);

  uint8_t humid_control_val = 0;
@@ -182,17 +178,6 @@ void BME280Component::setup() {
 }
 void BME280Component::dump_config() {
  ESP_LOGCONFIG(TAG, "BME280:");
-  switch (this->error_code_) {
-    case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
-      break;
-    case WRONG_CHIP_ID:
-      ESP_LOGE(TAG, BME280_ERROR_WRONG_CHIP_ID);
-      break;
-    case NONE:
-    default:
-      break;
-  }
  ESP_LOGCONFIG(TAG, "  IIR Filter: %s", iir_filter_to_str(this->iir_filter_));
  LOG_UPDATE_INTERVAL(this);

@@ -101,11 +101,6 @@ class BME280Component : public PollingComponent {
  sensor::Sensor *temperature_sensor_{nullptr};
  sensor::Sensor *pressure_sensor_{nullptr};
  sensor::Sensor *humidity_sensor_{nullptr};
-  enum ErrorCode {
-    NONE = 0,
-    COMMUNICATION_FAILED,
-    WRONG_CHIP_ID,
-  } error_code_{NONE};
 };

 }  // namespace esphome::bme280_base
@@ -2,10 +2,11 @@

 #include "esphome/components/bme280_base/bme280_base.h"
 #include "esphome/components/i2c/i2c.h"
+#include "esphome/core/log.h"

 namespace esphome::bme280_i2c {

-static const char *const TAG = "bme280_i2c.sensor";
+ESPHOME_LOG_TAG(TAG, "bme280_i2c.sensor");

 class BME280I2CComponent final : public esphome::bme280_base::BME280Component, public i2c::I2CDevice {
  bool read_byte(uint8_t a_register, uint8_t *data) override;
--- a/Show More
+++ b/Show More