Apply the periodic frame minimum to engineering frames too

.agents/skills/hardware-test/SKILL.md

@@ -115,7 +115,7 @@ Per-topic scripts, each described in the matching `reference/recipes/<component>
 (host driver, Zephyr driver probe), `rtsp_server/` (protocol client, raw rate reader, measurement set,
 API image grab), `cse7766/` (API observer with ping), `zephyr_coredump/` (reader flow, decode with the
 Zephyr tools), `libretiny_prefs/` (rtc preference harness header), `libretiny_crash/` (BK72xx crash probe header and
-capture decoder), `api_outgoing/` (wake cycle and Wi-Fi drop timing readers), `ld2450/` (zone number driver, loopback harness driver with number and binary sensor states and TX frame summarizer), `api/` (raw plaintext native API client for user defined actions), `dfrobot_sen0395/` (API driver and case runner), `homeassistant_light/` (direct bulb driver, held-report case driver), `usb_audio/` (URL player), `speaker_media_player/` (API player driver, pipeline task case runner), `web_server/` (SSE client, request mix, SSE and HTTPD case runners), `mqtt/` (broker config with TLS, client-certificate and WebSocket listeners, test CA with server and client certificates, transport case runner, flash-and-drive runner, CLI TLS check without a board), `udp/` (datagram recorder, `udp.write` payload checker and case driver), `entity_icons/` (icon and device class readback over the API, MQTT discovery, web_server and dump_config, with a comparer).
+capture decoder), `api_outgoing/` (wake cycle and Wi-Fi drop timing readers), `ld2450/` (zone number driver), `dfrobot_sen0395/` (API driver and case runner), `homeassistant_light/` (direct bulb driver, held-report case driver), `usb_audio/` (URL player), `speaker_media_player/` (API player driver, pipeline task case runner), `web_server/` (SSE client, request mix, SSE and HTTPD case runners), `mqtt/` (broker config with TLS, client-certificate and WebSocket listeners, test CA with server and client certificates, transport case runner, flash-and-drive runner, CLI TLS check without a board), `udp/` (datagram recorder, `udp.write` payload checker and case driver), `entity_icons/` (icon and device class readback over the API, MQTT discovery, web_server and dump_config, with a comparer).
 
 ## Templates in `$SKILL/templates`
 

.agents/skills/hardware-test/reference/boards.md

@@ -7,9 +7,6 @@ Ports are not listed on purpose: they follow the USB hub port and change on ever
 
 - 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`).
-- UART0 can be looped back onto itself (`USC0(0) |= (1 << UCLBE)` in an `on_boot` lambda) so a UART
-  component is testable without its device: frames written with `uart.write` arrive on RX. Log over the
-  API with `logger: baud_rate: 0`, since the serial port carries the component's bytes.
 - `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.

.agents/skills/hardware-test/reference/recipes/README.md

@@ -4,13 +4,12 @@ Each flow names the pull requests it was used on, so their result tables show wh
 
 One file per component, named after it:
 
-- [`api.md`](api.md): noise handshake and OTA encryption on the ESP8266, outgoing connection wake timing on deep sleep and after a Wi-Fi drop, user defined action listing and execution with a raw plaintext client
+- [`api.md`](api.md): noise handshake and OTA encryption on the ESP8266, outgoing connection wake timing on deep sleep and after a Wi-Fi drop
 - [`captive_portal.md`](captive_portal.md): fallback AP and /wifisave hammer
 - [`cse7766.md`](cse7766.md): Sonoff S31 parser check over the API
 - [`espnow.md`](espnow.md): ESP8266 broadcast receive
 - [`hdmi_cec.md`](hdmi_cec.md): two-board wire
-- [`ld2450.md`](ld2450.md): polygon zones, zone number round trip through the radar's readback, ESP8266 loopback harness without a radar
-- [`ld2412.md`](ld2412.md): output pin level through the basic configuration command, held back writes
+- [`ld2450.md`](ld2450.md): polygon zones, zone number round trip through the radar's readback
 - [`libretiny.md`](libretiny.md): rtc preference emulation, BK72xx crash report on the next boot
 - [`mqtt.md`](mqtt.md): broker bench, QoS, reconnect, crash log over MQTT, WebSocket transports with a local and a public broker, TLS trust sources (own CA, client certificate, certificate bundle, no verification) with the CLI check
 - [`nrf52.md`](nrf52.md): dongle board support
@@ -21,7 +20,7 @@ One file per component, named after it:
 - [`scheduler.md`](scheduler.md): loop wake A/B
 - [`udp.md`](udp.md): datagrams, multicast, sockets, `udp.write` payload shapes
 - [`usb_cdc_acm.md`](usb_cdc_acm.md): nRF52840 dongle host driver
-- [`wifi.md`](wifi.md): reboot_timeout with a fallback AP, DHCP lease cache, Easy Connect (DPP), WISP bridge with an ethernet upstream
+- [`wifi.md`](wifi.md): reboot_timeout with a fallback AP, DHCP lease cache, Easy Connect (DPP)
 - [`zephyr.md`](zephyr.md): preferences on the nRF52840 dongle
 - [`zephyr_coredump.md`](zephyr_coredump.md): crash and decode on nRF52 boards
 - [`zwave_proxy.md`](zwave_proxy.md): frame checksums on a live proxy

.agents/skills/hardware-test/reference/recipes/api.md

@@ -28,15 +28,3 @@ connected first, and the loop-time maxima. For the loop cost of polling, repeat
 so after a drop every dial is closed and HA's incoming reconnect wins 11 to 33 s later; the measurable effect is the
 first dial landing in the loop the network flag flips.
 Results: https://github.com/esphome/esphome/pull/21085#issuecomment-6254742791
-
-## User defined action listing and execution without a client library (#18882)
-
-`scripts/api/rawactions.py HOST list` speaks the plaintext native API over a raw socket and decodes every
-`ListEntitiesServicesResponse` by field number (argument fields 1 name, 2 type, 3 description, 4 example, 5 optional,
-6 default_value), so new wire fields show up without waiting for the client library. `rawactions.py HOST exec ACTION
-k=v ...` sends `ExecuteServiceRequest` with `sint32` ints (field 5, not the legacy int32 field 2), fixed32 floats,
-length delimited strings and `int[]` as repeated sint32 (field 7); `ALLOW_MISSING=1` leaves arguments out on purpose
-(the device then drops the call). `templates/api-actions-dut.yaml` (D1 mini, three actions, optional variables with
-defaults) and `templates/api-actions-strings-dut.yaml` (required strings) log what arrived. String arguments are
-`StringRef`s that are not null terminated: copy them with `snprintf("%.*s", size, c_str())` into a buffer before
-logging, and do not pass `%.*s` to `logger.log`, whose validator counts it as one pattern.

.agents/skills/hardware-test/reference/recipes/ld2412.md

@@ -1,13 +0,0 @@
-# ld2412
-
-## Output pin level and the basic configuration command (#21353)
-
-`templates/ld2412-select-only-dut.yaml` (ESP32-S3, the module on GPIO43 and GPIO44 at 115200, only the output pin
-level select, the module's OUT pin on GPIO38 as a binary sensor plus the presence sensor) with `uart: debug:
-direction: BOTH`. Drive the select with `scripts/ld2450/lddrive.py HOST KEY LOGFILE sel:NAME=OPTION` and read the TX
-dump for command `02` carrying the level byte, then the OUT pin binary sensor against presence: with level high the
-pin follows presence, with level low it is inverted. A module that never answers the boot query (no `<<<` lines)
-only shows the held back path: `Command 02 held back until the module reports its settings`, a query `12`, and after
-2 s `Command 02 not sent, the module did not report its settings` with the select republished to the last known
-level. With the full set of numbers configured a select change also needs every number to have a state, so wait
-for the boot query answer before judging.

.agents/skills/hardware-test/reference/recipes/ld2450.md

@@ -13,30 +13,3 @@ selects over the API and prints every LD2450 state update. After each set the hu
 the radar and republishes all twelve coordinates from the answer, so set each coordinate of each zone to a distinct
 value and check the readbacks; no target is needed. Readbacks can arrive late over Wi-Fi, so match them by content.
 Results: https://github.com/esphome/esphome/pull/21146#issuecomment-6278026922
-
-## ESP8266 loopback harness, no radar needed (#21349)
-
-`templates/ld2450-loopback.yaml` (package; substitutions `name` and `baud`) runs the hub on UART0 (GPIO1 and GPIO3)
-with `logger: baud_rate: 0` and sets the UART0 loopback bit in `on_boot` (`USC0(0) |= (1 << UCLBE)`), so everything
-the hub or a `uart.write` action sends comes back on RX. Template buttons inject periodic frames (all four direction
-strings, targets 2 and 3), query zone acks (zone type 0, 1 and 2 for the select readback) and call the name based
-setters with a valid and a bogus name. `uart: debug: direction: TX` delimited on the command footer dumps every
-command the hub sends. Drive it with `scripts/ld2450/lddrive.py HOST KEY LOGFILE press:NAME sel:NAME=OPTION wait:S`
-(logs over the API at VERBOSE, 2 s between steps because the API log stream drops lines while `send_command_`
-blocks), then `txsum.py LOGFILE` lists the TX frames per step; diff the summaries of the two builds. The hub reads its
-own commands back and logs `Invalid status` for each, which is harmless. The boot readback of the baud rate select
-comes from the UART setting, so a second build at `baud: "9600"` checks the flash table lookup.
-Results: https://github.com/esphome/esphome/pull/21349#issuecomment-6332320026
-
-## Frame splitter collisions (#21357)
-
-The loopback template also carries the zone 1 numbers and seven collision buttons: a periodic frame with the
-command footer inside target 1, zone acks with `55 CC` and with `04 03 02 01` inside the coordinates, a periodic
-frame cut after 12 bytes followed by a zone ack, a frame missing its last byte followed by a complete one, a bogus
-255 byte length then a frame, and garbage then a frame. Judge by the state updates plus the `Handling Periodic` and
-`Handling Ack` lines. Through a real radar the set zone ack is sometimes corrupted by the radar itself (its tail
-replaced by the periodic frame it was sending, for example `04 03 03 03 00 ... 55 CC`), so count readbacks over at
-least 24 selects per build and read the raw bytes with `uart: debug: direction: RX` (`!extend` the package's uart
-id) before blaming the parser; the API log stream drops lines under that dump volume, so some misses stay
-unclassified.
-Results: https://github.com/esphome/esphome/pull/21357#issuecomment-6333244886

.agents/skills/hardware-test/reference/recipes/wifi.md

@@ -23,17 +23,3 @@ Only an Android phone configures: Settings, network details, Add device, Share W
 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.
-
-## WISP bridge with an ethernet upstream (#7147)
-
-`templates/wisp-ethernet-dut.yaml` (ESP32-S3 with a W5500, `wifi: ap:` with `ap_mode: WISP` and no station) and
-`templates/wisp-client.yaml` (D1 mini joining the bridge, `http_request` to a web server on the wired LAN and to
-`http://example.com/` every 15 s, `time: sntp`). Secrets: `wisp_psk` and `lan_http` (serve a text file on the host
-with `python -m http.server 8787 --bind 0.0.0.0` from a scratch directory). Judge by the client's `GET status 200`
-lines, the web server log showing the device's ethernet address as the source (NAT), the client's DHCP info (DNS1 is
-the LAN resolver) and `SNTP synced`. The device logs `Starting AP` and `DHCP DNS server: <resolver>` on its USB
-console; flashing over the air reboots it for repeat boots. Before the AP address and DHCP server moved ahead of the
-AP start (the fix in that PR), the first AP start failed on every boot with `esp_netif_dhcps_option failed: 20484`
-(DHCP server already started by the AP start event) and `Failed to enable NAT`, and the bridge only came up on the
-retry 90 s later; a client that cannot find the SSID for the first minute on an older build is that. With the fix
-the bridge is up 6 s after boot. Any change to the ESP-IDF AP start should also rerun the captive portal hammer.

.agents/skills/hardware-test/scripts/api/rawactions.py

@@ -1,211 +0,0 @@
-"""Plaintext native API client that lists user actions with their raw argument fields and executes one.
-
-usage: rawactions.py HOST list
-       rawactions.py HOST exec ACTION key=value [...]   (every argument must be given; types from the listing)
-Fields of ListEntitiesServicesArgument: 1 name, 2 type, 3 description, 4 example, 5 optional, 6 default_value.
-"""
-
-import os
-import socket
-import struct
-import sys
-
-HOST = sys.argv[1]
-CMD = sys.argv[2]
-ARGS = sys.argv[3:]
-TYPE_NAMES = {
-    0: "bool",
-    1: "int",
-    2: "float",
-    3: "string",
-    4: "bool[]",
-    5: "int[]",
-    6: "float[]",
-    7: "string[]",
-}
-
-
-def varint(v: int) -> bytes:
-    out = bytearray()
-    while True:
-        b = v & 0x7F
-        v >>= 7
-        if v:
-            out.append(b | 0x80)
-        else:
-            out.append(b)
-            return bytes(out)
-
-
-def svarint(v: int) -> bytes:
-    return varint((v << 1) ^ (v >> 63))
-
-
-def decode_varint(buf: bytes, pos: int) -> tuple[int, int]:
-    value = shift = 0
-    while True:
-        b = buf[pos]
-        pos += 1
-        value |= (b & 0x7F) << shift
-        if not b & 0x80:
-            return value, pos
-        shift += 7
-
-
-def fields(payload: bytes) -> list[tuple[int, int, object]]:
-    out = []
-    pos = 0
-    while pos < len(payload):
-        key, pos = decode_varint(payload, pos)
-        fnum, wt = key >> 3, key & 7
-        if wt == 0:
-            v, pos = decode_varint(payload, pos)
-        elif wt == 2:
-            ln, pos = decode_varint(payload, pos)
-            v = payload[pos : pos + ln]
-            pos += ln
-        elif wt == 5:
-            v = payload[pos : pos + 4]  # fixed32, caller unpacks
-            pos += 4
-        else:
-            raise ValueError(f"wire type {wt}")
-        out.append((fnum, wt, v))
-    return out
-
-
-def frame(mtype: int, payload: bytes) -> bytes:
-    return b"\x00" + varint(len(payload)) + varint(mtype) + payload
-
-
-def field_bytes(fnum: int, data: bytes) -> bytes:
-    return varint((fnum << 3) | 2) + varint(len(data)) + data
-
-
-def field_varint(fnum: int, v: int) -> bytes:
-    return varint((fnum << 3) | 0) + varint(v)
-
-
-def recv_frames(
-    sock: socket.socket, until: set[int], limit: float = 5.0
-) -> list[tuple[int, bytes]]:
-    sock.settimeout(limit)
-    buf = bytearray()
-    frames = []
-    while True:
-        try:
-            chunk = sock.recv(4096)
-        except TimeoutError:
-            return frames
-        if not chunk:
-            return frames
-        buf += chunk
-        while True:
-            if len(buf) < 3:
-                break
-            if buf[0] != 0:
-                raise ValueError("not plaintext")
-            try:
-                ln, p = decode_varint(buf, 1)
-                mt, p = decode_varint(buf, p)
-            except IndexError:
-                break
-            if len(buf) < p + ln:
-                break
-            frames.append((mt, bytes(buf[p : p + ln])))
-            del buf[: p + ln]
-            if mt in until:
-                return frames
-
-
-def main() -> None:
-    sock = socket.create_connection((HOST, 6053), timeout=5)
-    sock.sendall(
-        frame(
-            1, field_bytes(1, b"rawactions") + field_varint(2, 1) + field_varint(3, 10)
-        )
-    )  # HelloRequest
-    recv_frames(sock, {2})
-    sock.sendall(frame(3, b""))  # ConnectRequest, no password
-    recv_frames(sock, {4})
-    sock.sendall(frame(11, b""))  # ListEntitiesRequest
-    frames = recv_frames(sock, {19})
-    services = {}
-    for mt, payload in frames:
-        if mt != 41:
-            continue
-        name = key = None
-        args = []
-        for fnum, _, v in fields(payload):
-            if fnum == 1:
-                name = v.decode()
-            elif fnum == 2:
-                key = struct.unpack("<I", v)[0]
-            elif fnum == 3:
-                a = {
-                    "name": None,
-                    "type": 0,
-                    "description": None,
-                    "example": None,
-                    "optional": None,
-                    "default": None,
-                }
-                for af, _, av in fields(v):
-                    if af == 1:
-                        a["name"] = av.decode()
-                    elif af == 2:
-                        a["type"] = av
-                    elif af == 3:
-                        a["description"] = av.decode()
-                    elif af == 4:
-                        a["example"] = av.decode()
-                    elif af == 5:
-                        a["optional"] = bool(av)
-                    elif af == 6:
-                        a["default"] = av.decode()
-                    else:
-                        a[f"field{af}"] = av
-                args.append(a)
-        services[name] = (key, args)
-    if CMD == "list":
-        for name, (key, args) in services.items():
-            print(f"action {name} key={key}")
-            for a in args:
-                extra = {
-                    k: v
-                    for k, v in a.items()
-                    if k not in ("name", "type") and v is not None
-                }
-                print(f"  {a['name']}: {TYPE_NAMES.get(a['type'], a['type'])} {extra}")
-        return
-    name = ARGS[0]
-    key, args = services[name]
-    payload = varint((1 << 3) | 5) + struct.pack("<I", key)
-    given = dict(kv.split("=", 1) for kv in ARGS[1:])
-    for a in args:
-        if a["name"] not in given:
-            if os.environ.get("ALLOW_MISSING"):
-                continue  # leave the argument out of the request on purpose
-            sys.exit(f"missing {a['name']}")
-        raw = given[a["name"]]
-        t = a["type"]
-        if t == 0:
-            av = field_varint(1, 1 if raw.lower() == "true" else 0)
-        elif t == 1:
-            av = varint((5 << 3) | 0) + svarint(int(raw))  # sint32 int_
-        elif t == 2:
-            av = varint((3 << 3) | 5) + struct.pack("<f", float(raw))
-        elif t == 3:
-            av = field_bytes(4, raw.encode())
-        elif t == 5:
-            av = b"".join(
-                varint((7 << 3) | 0) + svarint(int(x)) for x in raw.split(",") if x
-            )  # repeated sint32 int_array
-        else:
-            sys.exit(f"type {t} not supported here")
-        payload += field_bytes(2, av)
-    sock.sendall(frame(42, payload))  # ExecuteServiceRequest
-    print(f"sent {name} with {given}")
-    sock.close()
-
-
-main()

.agents/skills/hardware-test/scripts/ld2450/lddrive.py

@@ -1,123 +0,0 @@
-"""Drive an LD24xx harness over the API: press buttons, set selects and numbers, print state updates, save the log.
-
-usage: lddrive.py HOST KEY LOGFILE OP [OP ...]   (KEY of - means a plaintext API)
-  OP: list | press:NAME | sel:NAME=OPTION | set:NAME=VALUE | wait:SECONDS
-Steps are 2 s apart: the API log stream drops lines while the hub blocks in send_command_.
-"""
-
-import asyncio
-from pathlib import Path
-import sys
-import time
-
-from aioesphomeapi import (
-    APIClient,
-    BinarySensorState,
-    ButtonInfo,
-    LogLevel,
-    NumberInfo,
-    NumberState,
-    SelectInfo,
-    SelectState,
-    SensorInfo,
-    SensorState,
-    TextSensorInfo,
-    TextSensorState,
-)
-
-HOST, KEY, LOGFILE = sys.argv[1], sys.argv[2], sys.argv[3]
-OPS = sys.argv[4:]
-T0 = time.time()
-STEP_GAP_S = 2.0
-
-
-def stamp() -> str:
-    return f"{time.time() - T0:7.3f}"
-
-
-async def run(c: APIClient, log) -> None:
-    info = await c.device_info()
-    print(
-        f"device {info.name} esphome {info.esphome_version} compiled {info.compilation_time}"
-    )
-    ents, _ = await c.list_entities_services()
-    by_key = {e.key: e for e in ents}
-    buttons = {e.name: e for e in ents if isinstance(e, ButtonInfo)}
-    selects = {e.name: e for e in ents if isinstance(e, SelectInfo)}
-    numbers = {e.name: e for e in ents if isinstance(e, NumberInfo)}
-
-    def on_state(s) -> None:
-        e = by_key.get(s.key)
-        if e is None:
-            return
-        missing = " (missing)" if getattr(s, "missing_state", False) else ""
-        if isinstance(s, TextSensorState):
-            print(f"{stamp()} TXT {e.name} = {s.state!r}{missing}", flush=True)
-        elif isinstance(s, BinarySensorState):
-            print(f"{stamp()} BIN {e.name} = {s.state}{missing}", flush=True)
-        elif isinstance(s, NumberState):
-            print(f"{stamp()} NUM {e.name} = {s.state:.0f}{missing}", flush=True)
-        elif isinstance(s, SelectState):
-            print(f"{stamp()} SEL {e.name} = {s.state!r}{missing}", flush=True)
-        elif (
-            isinstance(s, SensorState)
-            and isinstance(e, SensorInfo)
-            and "Count" in e.name
-        ):
-            print(f"{stamp()} CNT {e.name} = {s.state:.0f}", flush=True)
-
-    def on_log(msg) -> None:
-        log.write(f"{stamp()} {msg.message.decode(errors='replace')}\n")
-
-    c.subscribe_states(on_state)
-    c.subscribe_logs(on_log, log_level=LogLevel.LOG_LEVEL_VERBOSE)
-    await asyncio.sleep(1.5)
-    for op in OPS:
-        if op == "list":
-            for n in sorted(buttons):
-                print("button:", n)
-            for n in sorted(selects):
-                print("select:", n, selects[n].options)
-            for e in ents:
-                if isinstance(e, TextSensorInfo):
-                    print("text_sensor:", e.name)
-            continue
-        kind, _, rest = op.partition(":")
-        if kind == "wait":
-            await asyncio.sleep(float(rest))
-            continue
-        if kind == "press":
-            if rest not in buttons:
-                sys.exit(f"no button named {rest!r}; have {sorted(buttons)}")
-            print(f"{stamp()} >>> press {rest}", flush=True)
-            log.write(f"{stamp()} >>> press {rest}\n")
-            c.button_command(buttons[rest].key)
-        elif kind == "set":
-            name, _, value = rest.partition("=")
-            if name not in numbers:
-                sys.exit(f"no number named {name!r}; have {sorted(numbers)}")
-            print(f"{stamp()} >>> set {name} = {value}", flush=True)
-            log.write(f"{stamp()} >>> set {name} = {value}\n")
-            c.number_command(numbers[name].key, float(value))
-        elif kind == "sel":
-            name, _, value = rest.partition("=")
-            if name not in selects:
-                sys.exit(f"no select named {name!r}; have {sorted(selects)}")
-            print(f"{stamp()} >>> select {name} = {value}", flush=True)
-            log.write(f"{stamp()} >>> select {name} = {value}\n")
-            c.select_command(selects[name].key, value)
-        else:
-            sys.exit(f"unknown op {op!r}")
-        await asyncio.sleep(STEP_GAP_S)
-    await asyncio.sleep(1)
-
-
-async def main() -> None:
-    c = APIClient(HOST, 6053, None, noise_psk=None if KEY == "-" else KEY)
-    await c.connect(login=True)
-    with Path(LOGFILE).open("w", encoding="utf-8") as log:
-        await run(c, log)
-    await c.disconnect()
-
-
-asyncio.run(main())

.agents/skills/hardware-test/scripts/ld2450/txsum.py

@@ -1,33 +0,0 @@
-"""Summarize an lddrive.py log: for each step, the LD2450 TX frames, commands and publishes.
-
-usage: txsum.py LOGFILE   (diff the output of two builds)
-"""
-
-from pathlib import Path
-import re
-import sys
-
-ANSI = re.compile(r"\x1b\[[0-9;]*m")
-out: list[str] = []
-with Path(sys.argv[1]).open(encoding="utf-8", errors="replace") as log:
-    for raw in log:
-        line = ANSI.sub("", raw.rstrip("\n"))
-        m = re.match(r"\s*[\d.]+ (.*)", line)
-        if not m:
-            continue
-        text = m.group(1)
-        if text.startswith(">>>"):
-            out.append(f"\n# {text[4:]}")
-        elif "[uart_debug" in text:
-            out.append(f"  TX {text.split('>>> ')[1]}")
-        elif "[ld2450" in text and (
-            "Sending COMMAND" in text
-            or "zone type" in text.lower()
-            or "Query zone" in text
-        ):
-            out.append(f"  LOG {text.split(']: ', 1)[1]}")
-        elif "[select:" in text and ">>" in text:
-            out.append(f"  SEL {text.split(']: ', 1)[1]}")
-        elif "[text_sensor:098]" in text:
-            out.append(f"  TXT {text.split(']: ', 1)[1]}")
-print("\n".join(out))

.agents/skills/hardware-test/templates/api-actions-dut.yaml

@@ -1,65 +0,0 @@
-esphome:
-  name: ${name}
-
-esp8266:
-  board: d1_mini
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  power_save_mode: none
-
-logger:
-  level: DEBUG
-
-api:
-  reboot_timeout: 0s
-  actions:
-    - action: play_buzzer
-      description: Play a song or build one from parts
-      variables:
-        song_str:
-          type: string
-          description: Full RTTTL string
-          example: "scale:d=4,o=5,b=100:c,d,e"
-          required: false
-        notes:
-          type: string
-          required: false
-        octave:
-          type: int
-          default: 5
-        bpm:
-          type: int
-          default: 100
-        tempo:
-          type: float
-          default: 1.5
-        loud:
-          type: bool
-          default: true
-        label:
-          type: string
-          default: ""
-      then:
-        - lambda: |-
-            char s[40], n[40], l[40];
-            snprintf(s, sizeof(s), "%.*s", (int) song_str.size(), song_str.c_str());
-            snprintf(n, sizeof(n), "%.*s", (int) notes.size(), notes.c_str());
-            snprintf(l, sizeof(l), "%.*s", (int) label.size(), label.c_str());
-            ESP_LOGD("main", "play_buzzer song=%s(%d) notes=%s(%d) octave=%d bpm=%d tempo=%.1f loud=%d label=%s(%d)", s,
-                     (int) song_str.size(), n, (int) notes.size(), octave, bpm, tempo, loud, l, (int) label.size());
-    - action: plain_action
-      variables:
-        value: int
-      then:
-        - logger.log:
-            format: "plain_action value=%d"
-            args: ["value"]
-    - action: list_action
-      variables:
-        values: int[]
-      then:
-        - logger.log:
-            format: "list_action n=%d"
-            args: ["values.size()"]

.agents/skills/hardware-test/templates/api-actions-strings-dut.yaml

@@ -1,28 +0,0 @@
-esphome:
-  name: ${name}
-
-esp8266:
-  board: d1_mini
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  power_save_mode: none
-
-logger:
-  level: DEBUG
-
-api:
-  reboot_timeout: 0s
-  actions:
-    - action: str_action
-      variables:
-        song_str: string
-        notes: string
-        octave: int
-      then:
-        - lambda: |-
-            char s[40], n[40];
-            snprintf(s, sizeof(s), "%.*s", (int) song_str.size(), song_str.c_str());
-            snprintf(n, sizeof(n), "%.*s", (int) notes.size(), notes.c_str());
-            ESP_LOGD("main", "str_action song=%s(%d) notes=%s(%d) octave=%d", s, (int) song_str.size(), n, (int) notes.size(), octave);

.agents/skills/hardware-test/templates/ld2412-select-only-dut.yaml

@@ -1,57 +0,0 @@
-substitutions:
-  name: ld2412sel
-
-esphome:
-  name: ${name}
-
-esp32:
-  variant: esp32s3
-  board: esp32-s3-devkitc-1
-  flash_size: 8MB
-  framework:
-    type: esp-idf
-
-logger:
-  level: VERBOSE
-
-api:
-  reboot_timeout: 0s
-
-ota:
-  - platform: esphome
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-  power_save_mode: none
-
-uart:
-  - id: uart_ld2412
-    tx_pin: GPIO43
-    rx_pin: GPIO44
-    baud_rate: 115200
-    debug:
-      direction: BOTH
-      dummy_receiver: false
-      after:
-        timeout: 10ms
-        bytes: 120
-
-ld2412:
-  id: ld2412_radar
-  uart_id: uart_ld2412
-
-select:
-  - platform: ld2412
-    ld2412_id: ld2412_radar
-    out_pin_level:
-      name: "LD2412 Hardware output pin level"
-
-binary_sensor:
-  - platform: gpio
-    name: "LD2412 Out Pin"
-    pin: GPIO38
-  - platform: ld2412
-    ld2412_id: ld2412_radar
-    has_target:
-      name: "LD2412 Presence"

.agents/skills/hardware-test/templates/ld2450-loopback.yaml

@@ -1,258 +0,0 @@
-esphome:
-  name: ${name}
-  on_boot:
-    priority: -100
-    then:
-      - lambda: |-
-          // UART0 TX looped back into its own RX so injected frames reach the hub
-          USC0(0) |= (1 << UCLBE);
-          ESP_LOGI("harness", "UART0 loopback on");
-
-esp8266:
-  board: d1_mini
-
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
-
-api:
-  reboot_timeout: 0s
-
-logger:
-  baud_rate: 0
-  level: VERBOSE
-
-uart:
-  id: radar_uart
-  tx_pin: GPIO1
-  rx_pin: GPIO3
-  baud_rate: ${baud}
-  debug:
-    direction: TX
-    dummy_receiver: false
-    after:
-      delimiter: [0x04, 0x03, 0x02, 0x01]
-
-ld2450:
-  id: radar
-  uart_id: radar_uart
-
-select:
-  - platform: ld2450
-    baud_rate:
-      name: Baud Rate
-    zone_type:
-      name: Zone Type
-
-text_sensor:
-  - platform: ld2450
-    version:
-      name: Radar Version
-    target_1:
-      direction:
-        name: T1 Direction
-    target_2:
-      direction:
-        name: T2 Direction
-    target_3:
-      direction:
-        name: T3 Direction
-
-sensor:
-  - platform: ld2450
-    target_count:
-      name: Target Count
-
-button:
-  # periodic frames: header, 3 x (x, y, speed, resolution), footer
-  - platform: template
-    name: Frame Approach
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xAA, 0xFF, 0x03, 0x00,
-                 0x00, 0x00, 0xE8, 0x83, 0x14, 0x00, 0x64, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x55, 0xCC]
-  - platform: template
-    name: Frame Away
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xAA, 0xFF, 0x03, 0x00,
-                 0x00, 0x00, 0xE8, 0x83, 0x14, 0x80, 0x64, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x55, 0xCC]
-  - platform: template
-    name: Frame Stationary
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xAA, 0xFF, 0x03, 0x00,
-                 0x00, 0x00, 0xE8, 0x83, 0x00, 0x00, 0x64, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x55, 0xCC]
-  - platform: template
-    name: Frame None
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xAA, 0xFF, 0x03, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x55, 0xCC]
-  - platform: template
-    name: Frame T2 T3
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xAA, 0xFF, 0x03, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0xF4, 0x81, 0x20, 0x83, 0x1E, 0x00, 0x64, 0x00,
-                 0x2C, 0x01, 0xB0, 0x84, 0x0A, 0x80, 0x64, 0x00,
-                 0x55, 0xCC]
-  # query zone acks: header, length, command C1, status 01, 00 00, zone type, 00, 24 coordinate bytes, footer
-  - platform: template
-    name: Zone Ack Disabled
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xFD, 0xFC, 0xFB, 0xFA, 0x1E, 0x00, 0xC1, 0x01, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x04, 0x03, 0x02, 0x01]
-  - platform: template
-    name: Zone Ack Detection
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xFD, 0xFC, 0xFB, 0xFA, 0x1E, 0x00, 0xC1, 0x01, 0x00, 0x00, 0x01, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x04, 0x03, 0x02, 0x01]
-  - platform: template
-    name: Zone Ack Filter
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xFD, 0xFC, 0xFB, 0xFA, 0x1E, 0x00, 0xC1, 0x01, 0x00, 0x00, 0x02, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x04, 0x03, 0x02, 0x01]
-  # name based setters, the path lambdas use
-  - platform: template
-    name: Set Zone Filter By Name
-    on_press:
-      - lambda: id(radar).set_zone_type("Filter");
-  - platform: template
-    name: Set Zone Bogus By Name
-    on_press:
-      - lambda: id(radar).set_zone_type("Bogus");
-  - platform: template
-    name: Set Baud 57600 By Name
-    on_press:
-      - lambda: id(radar).set_baud_rate("57600");
-  - platform: template
-    name: Set Baud Bogus By Name
-    on_press:
-      - lambda: id(radar).set_baud_rate("Bogus");
-  # target 1 at x 772, y 258: bytes 04 03 02 01 are the command footer
-  - platform: template
-    name: Frame CmdFooter In Payload
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xAA, 0xFF, 0x03, 0x00,
-                 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x64, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x55, 0xCC]
-  # zone ack, type Detection, zone 1 x1 = 0xCC55: bytes 55 CC are the periodic footer
-  - platform: template
-    name: Zone Ack DataFooter In Payload
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xFD, 0xFC, 0xFB, 0xFA, 0x1E, 0x00, 0xC1, 0x01, 0x00, 0x00, 0x01, 0x00,
-                 0x55, 0xCC, 0xC8, 0x00, 0xDC, 0x05, 0xB8, 0x0B, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x04, 0x03, 0x02, 0x01]
-  # zone ack, type Filter, zone 1 x1 = 0x0304 and y1 = 0x0102: bytes 04 03 02 01 are the command footer
-  - platform: template
-    name: Zone Ack CmdFooter In Payload
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xFD, 0xFC, 0xFB, 0xFA, 0x1E, 0x00, 0xC1, 0x01, 0x00, 0x00, 0x02, 0x00,
-                 0x04, 0x03, 0x02, 0x01, 0xDC, 0x05, 0xB8, 0x0B, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x04, 0x03, 0x02, 0x01]
-  # a periodic frame cut after 12 bytes, then a complete zone ack (type Disabled, zeros)
-  - platform: template
-    name: Cut Frame Then Zone Ack
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xAA, 0xFF, 0x03, 0x00, 0x00, 0x00, 0xE8, 0x83, 0x14, 0x00, 0x64, 0x00,
-                 0xFD, 0xFC, 0xFB, 0xFA, 0x1E, 0x00, 0xC1, 0x01, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x04, 0x03, 0x02, 0x01]
-  # a periodic frame missing its last byte, then a complete one (target 1 moving away)
-  - platform: template
-    name: Cut Frame Then Frame
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xAA, 0xFF, 0x03, 0x00,
-                 0x00, 0x00, 0xE8, 0x83, 0x14, 0x00, 0x64, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x55,
-                 0xAA, 0xFF, 0x03, 0x00,
-                 0x00, 0x00, 0xE8, 0x83, 0x14, 0x80, 0x64, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x55, 0xCC]
-  # a command header claiming a 255 byte payload, then a complete periodic frame (target 1 stationary)
-  - platform: template
-    name: Bogus Length Then Frame
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0xFD, 0xFC, 0xFB, 0xFA, 0xFF, 0x00,
-                 0xAA, 0xFF, 0x03, 0x00,
-                 0x00, 0x00, 0xE8, 0x83, 0x00, 0x00, 0x64, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x55, 0xCC]
-  # five garbage bytes, then a complete periodic frame (target 1 approaching)
-  - platform: template
-    name: Garbage Then Frame
-    on_press:
-      - uart.write:
-          id: radar_uart
-          data: [0x01, 0x02, 0x03, 0x42, 0x99,
-                 0xAA, 0xFF, 0x03, 0x00,
-                 0x00, 0x00, 0xE8, 0x83, 0x14, 0x00, 0x64, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x55, 0xCC]
-
-number:
-  - platform: ld2450
-    presence_timeout:
-      name: Presence Timeout
-    zone_1:
-      x1:
-        name: Z1 X1
-      y1:
-        name: Z1 Y1
-      x2:
-        name: Z1 X2
-      y2:
-        name: Z1 Y2

.agents/skills/hardware-test/templates/wisp-client.yaml

@@ -1,57 +0,0 @@
-substitutions:
-  name: wispcli
-  ap_ssid: wisp-bridge
-
-esphome:
-  name: ${name}
-
-esp8266:
-  board: d1_mini
-
-logger:
-  level: DEBUG
-
-wifi:
-  ssid: ${ap_ssid}
-  password: !secret wisp_psk
-  power_save_mode: none
-  reboot_timeout: 0s
-
-http_request:
-  esp8266_disable_ssl_support: true
-  timeout: 8s
-
-time:
-  - platform: sntp
-    id: sntp_time
-    on_time_sync:
-      - logger.log:
-          format: "SNTP synced"
-          level: INFO
-
-interval:
-  - interval: 15s
-    then:
-      - http_request.get:
-          url: !secret lan_http
-          capture_response: true
-          on_response:
-            - logger.log:
-                format: "LAN GET status %d body %s"
-                args: ["response->status_code", "body.c_str()"]
-                level: INFO
-          on_error:
-            - logger.log:
-                format: "LAN GET failed"
-                level: WARN
-      - http_request.get:
-          url: http://example.com/
-          on_response:
-            - logger.log:
-                format: "WAN GET status %d"
-                args: ["response->status_code"]
-                level: INFO
-          on_error:
-            - logger.log:
-                format: "WAN GET failed"
-                level: WARN

.agents/skills/hardware-test/templates/wisp-ethernet-dut.yaml

@@ -1,40 +0,0 @@
-substitutions:
-  name: wispeth
-  ap_ssid: wisp-bridge
-
-esphome:
-  name: ${name}
-
-esp32:
-  board: esp32-s3-devkitc-1
-  variant: esp32s3
-  flash_size: 16MB
-  framework:
-    type: esp-idf
-
-logger:
-  hardware_uart: USB_SERIAL_JTAG
-  level: VERBOSE
-
-api:
-  encryption:
-    key: !secret api_key
-  reboot_timeout: 0s
-
-ota:
-  - platform: esphome
-
-ethernet:
-  type: W5500
-  clk_pin: GPIO13
-  mosi_pin: GPIO11
-  miso_pin: GPIO12
-  cs_pin: GPIO14
-  interrupt_pin: GPIO10
-  reset_pin: GPIO9
-
-wifi:
-  ap:
-    ssid: ${ap_ssid}
-    password: !secret wisp_psk
-    ap_mode: WISP

.clang-tidy

@@ -12,7 +12,6 @@ Checks: >-
   -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-narrowing-conversions,
   -bugprone-tagged-union-member-count,
-  -bugprone-signed-bitwise,
   -bugprone-signed-char-misuse,
   -bugprone-switch-missing-default-case,
   -cert-dcl50-cpp,
@@ -40,7 +39,6 @@ Checks: >-
   -cppcoreguidelines-avoid-const-or-ref-data-members,
   -cppcoreguidelines-avoid-do-while,
   -cppcoreguidelines-avoid-magic-numbers,
-  -cppcoreguidelines-explicit-constructor,
   -cppcoreguidelines-init-variables,
   -cppcoreguidelines-macro-to-enum,
   -cppcoreguidelines-macro-usage,
@@ -86,7 +84,6 @@ Checks: >-
   -llvm-use-ranges,
   -llvmlibc-*,
   -misc-const-correctness,
-  -misc-explicit-constructor,
   -misc-include-cleaner,
   -misc-multiple-inheritance,
   -misc-no-recursion,
@@ -116,7 +113,6 @@ Checks: >-
   -objc-*,
   -performance-enum-size,
   -portability-avoid-pragma-once,
-  -portability-no-assembler,
   -portability-template-virtual-member-function,
   -readability-ambiguous-smartptr-reset-call,
   -readability-avoid-nested-conditional-operator,
@@ -133,13 +129,9 @@ Checks: >-
   -readability-named-parameter,
   -readability-redundant-casting,
   -readability-redundant-inline-specifier,
-  -readability-redundant-lambda-parameter-list,
   -readability-redundant-member-init,
-  -readability-redundant-nested-if,
   -readability-redundant-parentheses,
   -readability-redundant-typename,
-  -readability-trailing-comma,
-  -readability-trivial-switch,
   -readability-uppercase-literal-suffix,
   -readability-use-anyofallof,
   -readability-use-std-min-max,

.github/workflows/ci.yml

@@ -286,7 +286,7 @@ jobs:
           fi
           echo "version=$version" >> "$GITHUB_OUTPUT"
       - name: Run prek
-        uses: j178/prek-action@af4d4fcb6922b8e6f65c0426947125fcc38794ce # v3.0.2
+        uses: j178/prek-action@1382ad72dea72f9d53832f2bcb65b3e87a947204 # v3.0.1
         with:
           prek-version: ${{ steps.prek.outputs.version }}
           # This job only runs on pull requests, so nothing ever populates

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
       - id: yamllint
         exclude: ^(\.clang-format|\.clang-tidy)$
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v23.1.3
+    rev: v22.1.8
     hooks:
       - id: clang-format
         types_or: [c, c++]

AGENTS.md

@@ -205,16 +205,15 @@ file does, and it is the authority when they disagree. The most useful starting
         for a table of structs copy the whole entry out and return the copy, never a pointer into flash.
         On other platforms they are a plain `memcpy` and dereference, so no `#ifdef` is needed. Declare log tags with
         `ESPHOME_LOG_TAG(TAG, "name")`, pass status text as `LOG_STR`, e.g.
-        `this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL))`. An action that only forwards a byte payload is
-        registered with `automation.ApplyBytes` (see Actions below), which keeps a constant payload in flash;
-        `TEMPLATABLE_BYTES` is for a `play()` that does more with the bytes.
+        `this->mark_failed(LOG_STR(ESP_LOG_MSG_COMM_FAIL))`, and give an action whose payload is a byte array
+        a `TEMPLATABLE_BYTES` field so a static code stays in flash.
     *   **Fixed sets of names** (status words, model names): a `PROGMEM_STRING_TABLE` (`esphome/core/progmem.h`),
         logged with `get_log_str` and `LOG_STR_ARG`, copied out with `ESPHOME_strncpy_P` before `publish_state`.
         A `dump_config` helper that picks a name returns `const LogString *` from `LOG_STR(...)`.
     *   **CRCs and bit tricks** come from `esphome/core/helpers.h` (`crc8`, `crc16`, `xor_bytes`, `sum16_bytes`,
-        `reverse_bits`, `encode_uint16`, `encode_value_le`, `sign_extend<BITS>`, `bcd_to_uint8`, `assign_bits`); pick
-        the helper's arguments instead of writing a loop. 7-byte BCD RTC calendars use `time::decode_bcd_calendar<LAYOUT>`
-        and `encode_bcd_calendar<LAYOUT>` with `EPSON_BCD_CALENDAR`, `DS_BCD_CALENDAR` or `PCF_BCD_CALENDAR`.
+        `reverse_bits`, `encode_uint16`, `encode_value_le`, `sign_extend<BITS>`, `bcd_to_uint8`); pick the helper's
+        arguments instead of writing a loop. Epson style 7-byte RTC calendars (one-hot weekday) use
+        `time::decode_bcd_calendar`.
     *   **Bus helpers:** UART drains with `read_available(on_byte)` and `discard_available()`, text lines with
         `LineReader<N>`; I2C has `update_register`, `write_registers` (PROGMEM `I2CRegValue` table), `check_chip_id`
         and `read_bytes_16_le`. `if (!this->status_comm_result(ok)) return;` sets or clears the warning.
@@ -605,9 +604,7 @@ file does, and it is the authority when they disagree. The most useful starting
         )
         ```
         The `ApplyField`, `ApplyCall` and `register_apply_action` docstrings in `esphome/automation.py` cover
-        the rest; `cover.control` and `cover.template.publish` are in-tree examples. An action whose input is a
-        byte payload passes `automation.ApplyBytes(CONF_DATA, "send({})")` in the same call; a constant payload
-        stays in flash and a lambda's vector is forwarded as data and size. `TEMPLATABLE_VALUE` with
+        the rest; `cover.control` and `cover.template.publish` are in-tree examples. `TEMPLATABLE_VALUE` with
         `cg.templatable` stays for actions whose `play()` has real logic beyond forwarding values.
 
     *   **Conditions:**

CODEOWNERS

@@ -700,7 +700,6 @@ esphome/components/veml7700/* @latonita
 esphome/components/version/* @esphome/core
 esphome/components/vevor_dtx/* @Bofr5555
 esphome/components/vl53l1x/* @will-tm
-esphome/components/vnc/* @MindFreeze
 esphome/components/voice_assistant/* @jesserockz @kahrendt
 esphome/components/wake_on_lan/* @clydebarrow @willwill2will54
 esphome/components/watchdog/* @oarcher

esphome/automation.py

@@ -24,7 +24,6 @@ from esphome.const import (
 )
 from esphome.core import CORE, ID, EsphomeError, HexInt, Lambda
 from esphome.cpp_generator import (
-    CallExpression,
     Expression,
     LambdaExpression,
     MockObj,
@@ -60,15 +59,10 @@ async def templatable_bytes(
     if cg.is_template(value):
         fn = await cg.templatable(value, args, cg.std_vector.template(cg.uint8))
         cg.add(set_template(fn))
+    elif len(value) > 0xFFFF:
+        raise EsphomeError(f"Byte payload is {len(value)} bytes; the maximum is 65535")
     else:
-        cg.add(set_static(*_static_bytes(table_name, value)))
-
-
-def _static_bytes(table_name: str, value: bytes | list[int]) -> tuple[MockObj, int]:
-    """The shared PROGMEM table for a constant payload and its length."""
-    if (size := len(value)) > 0xFFFF:
-        raise EsphomeError(f"Byte payload is {size} bytes; the maximum is 65535")
-    return progmem_bytes(table_name, value), size
+        cg.add(set_static(progmem_bytes(table_name, value), len(value)))
 
 
 def maybe_simple_id(*validators):
@@ -362,33 +356,6 @@ class ApplyField:
         return ApplyCall(target, ((self.conf_key, self.type_, self.const_fn),))
 
 
-@dataclass(frozen=True)
-class ApplyBytes:
-    """A byte payload key forwarded as ``target``, whose ``{}`` stands for ``data, len``.
-
-    A constant payload is a shared PROGMEM table passed as is; on ESP8266 it is first copied
-    out, to the stack up to ``stack`` bytes and to the heap beyond, unless ``progmem_target``
-    names a call that reads flash itself. A lambda's ``std::vector<uint8_t>`` is passed as
-    its data and size. The template may name the parent as ``{parent}``. An absent key
-    emits nothing.
-    """
-
-    conf_key: str | tuple[str, ...]
-    target: str
-    stack: int = 64
-    progmem_target: str | None = None
-
-    def __post_init__(self) -> None:
-        for target in (self.target, self.progmem_target):
-            if target is None:
-                continue
-            fields = [
-                f for _, f, _, _ in string.Formatter().parse(target) if f is not None
-            ]
-            if fields.count("") != 1 or any(f not in ("", "parent") for f in fields):
-                raise ValueError(f"apply bytes target {target!r} needs one {{}}")
-
-
 def _config_lookup(config: ConfigType, key: str | tuple[str, ...]) -> Any:
     if isinstance(key, str):
         return config.get(key)
@@ -447,17 +414,9 @@ async def _apply_parent(config: ConfigType, id_key: str = CONF_ID) -> str:
 
 
 def _apply_lambda_args(args: TemplateArgsType) -> TemplateArgsType:
-    # The generated function's parameters: a reference keeps its spelling, so a mutable
-    # one stays mutable; a value is taken by const reference, so a std::string is never copied.
+    # The generated function's parameters; a std::string arg is never copied.
     return [
-        (
-            (
-                t
-                if str(cg.safe_exp(t)).rstrip().endswith("&")
-                else cg.RawExpression(f"const std::remove_cvref_t<{cg.safe_exp(t)}> &")
-            ),
-            arg,
-        )
+        (cg.RawExpression(f"const std::remove_cvref_t<{cg.safe_exp(t)}> &"), arg)
         for t, arg in args
     ]
 
@@ -529,7 +488,7 @@ def _apply_values(config: ConfigType, members: list[tuple[Any, Any, Any]]) -> li
 def register_apply_action(
     name: str,
     schema: cv.Schema,
-    *fields: ApplyField | ApplyCall | ApplyBytes,
+    *fields: ApplyField | ApplyCall,
     call: str | None = None,
     id_key: str = CONF_ID,
 ) -> None:
@@ -545,7 +504,7 @@ def register_apply_action(
 def apply_action_builder(
     name: str,
     schema: cv.Schema,
-    *fields: ApplyField | ApplyCall | ApplyBytes,
+    *fields: ApplyField | ApplyCall,
     call: str | None = None,
     id_key: str = CONF_ID,
 ) -> Callable[..., Awaitable[MockObj]]:
@@ -558,20 +517,17 @@ def apply_action_builder(
     and ``apply_call.perform()`` is appended.
     """
     # An action stores the value, so a std::string constant stays in flash on ESP8266.
+    statements_spec = [
+        (
+            c.target,
+            _default_std_string(c.members, flash_string),
+        )
+        for c in (f if isinstance(f, ApplyCall) else f.call() for f in fields)
+    ]
     _check_key_in_schema(name, schema, id_key)
-    statements_spec: list[ApplyBytes | tuple[str, list[tuple[Any, Any, Any]]]] = []
-    for f in fields:
-        if isinstance(f, ApplyBytes):
-            _check_key_in_schema(name, schema, f.conf_key)
-            statements_spec.append(f)
-            continue
-        c = f if isinstance(f, ApplyCall) else f.call()
-        members = _default_std_string(c.members, flash_string)
+    for _, members in statements_spec:
         for conf_key, _, _ in members:
             _check_key_in_schema(name, schema, conf_key)
-        statements_spec.append((c.target, members))
-    # Named like the generated function, so it cannot clash with an SDK symbol
-    table_name = f"esphome__{name.replace('.', '_')}__bytes"
 
     async def builder(
         config: ConfigType,
@@ -583,15 +539,7 @@ def apply_action_builder(
         lambda_args = _apply_lambda_args(args)
         receiver = "apply_call." if call else f"{parent}->"
         statements: list[str] = []
-        for spec in statements_spec:
-            if isinstance(spec, ApplyBytes):
-                statements.extend(
-                    await _render_bytes(
-                        spec, config, receiver, parent, args, table_name
-                    )
-                )
-                continue
-            target, members = spec
+        for target, members in statements_spec:
             values = _apply_values(config, members)
             if not _apply_call_active(members, values):
                 continue
@@ -612,62 +560,6 @@ def apply_action_builder(
     return builder
 
 
-async def _render_bytes(
-    spec: ApplyBytes,
-    config: ConfigType,
-    receiver: str,
-    parent: str,
-    args: TemplateArgsType,
-    table_name: str,
-) -> list[str]:
-    """The statements for one ``ApplyBytes``: what ``TemplatableBytes::visit`` does, inlined.
-
-    The payload lambda keeps the automation's own argument types, as ``TemplatableBytes``
-    gave it, and is always called, so a body that modifies an argument still compiles.
-    """
-    value = _config_lookup(config, spec.conf_key)
-    if value is None:
-        return []
-
-    # The temporary carries the generated-name prefix so a trigger argument cannot shadow it
-    def send(target: str, data: str) -> str:
-        return f"{receiver}{target.format(data, parent=parent)};"
-
-    if isinstance(value, Lambda):
-        inner = await cg.process_lambda(
-            value, args, return_type=cg.std_vector.template(cg.uint8)
-        )
-        # Never reduced into the outer function, whose own parameters are const
-        call = CallExpression(inner, *[cg.MockObj(name) for _, name in args])
-        return [
-            "{",
-            f"  const std::vector<uint8_t> esphome__bytes = {call};",
-            f"  {send(spec.target, 'esphome__bytes.data(), esphome__bytes.size()')}",
-            "}",
-        ]
-    table, size = _static_bytes(table_name, value)
-    # Qualified so a trigger argument cannot shadow a reused table; an empty payload is nullptr
-    table_args = f"::{table}, {size}" if size else f"{table}, {size}"
-    if CORE.is_esp8266 and spec.progmem_target is not None:
-        return [send(spec.progmem_target, table_args)]
-    if not CORE.is_esp8266:
-        return [send(spec.target, table_args)]
-    # A PROGMEM table must be read with aligned loads on ESP8266, so copy it out first;
-    # the length is known here, so the copy is an exact array, on the heap past ``stack``.
-    # An empty payload still gets a one byte array: the raw lwIP socket rejects a null buffer.
-    if size <= spec.stack:
-        buffer, data = f"uint8_t esphome__bytes[{max(size, 1)}];", "esphome__bytes"
-    else:
-        buffer, data = (
-            f"auto esphome__bytes = std::make_unique<uint8_t[]>({size});",
-            "esphome__bytes.get()",
-        )
-    statements = ["{", f"  {buffer}"]
-    if size:
-        statements.append(f"  esphome::progmem_memcpy({data}, {table_args});")
-    return [*statements, f"  {send(spec.target, f'{data}, {size}')}", "}"]
-
-
 def _apply_call_active(members: list[tuple[Any, Any, Any]], values: list[Any]) -> bool:
     """An ``ApplyCall`` is emitted unless it has keys and none of them is set."""
     return not members or any(value is not None for value in values)

esphome/build_helpers/tool_runner.py

@@ -111,9 +111,7 @@ class ToolOutput(RedirectText):
 
     def _emit_line(self, line: str) -> None:
         if self._progress and _PROGRESS.match(line):
-            if self._is_filtered(line):
-                self._drop_line(line)
-            else:
+            if not self._is_filtered(line):
                 text = _fit_terminal(line.strip("\r\n"))
                 self._write_color_replace(f"\r{text}\x1b[K")
                 self._on_progress_line = True

esphome/components/api/__init__.py

@@ -1,7 +1,5 @@
-from collections.abc import Callable
 from ipaddress import IPv4Address, IPv6Address
 import logging
-import math
 import re
 from typing import Any
 
@@ -29,7 +27,6 @@ from esphome.const import (
     CONF_CAPTURE_RESPONSE,
     CONF_DATA,
     CONF_DATA_TEMPLATE,
-    CONF_DEFAULT,
     CONF_DELAY,
     CONF_ENCRYPTION,
     CONF_EVENT,
@@ -139,7 +136,6 @@ SERVICE_ARG_FALLBACK_TYPES: dict[str, MockObj] = {
 CONF_BATCH_DELAY = "batch_delay"
 CONF_CUSTOM_SERVICES = "custom_services"
 CONF_EXAMPLE = "example"
-CONF_REQUIRED = "required"
 CONF_HOMEASSISTANT_SERVICES = "homeassistant_services"
 CONF_HOMEASSISTANT_STATES = "homeassistant_states"
 CONF_LISTEN_BACKLOG = "listen_backlog"
@@ -251,66 +247,12 @@ def _validate_supports_response(value: Any) -> str:
     return cv.enum(SUPPORTS_RESPONSE_OPTIONS, lower=True)(value)
 
 
-def _not_boolean(value: Any) -> Any:
-    # bool is an int subclass, and "true" cannot be parsed as a number by the client
-    if isinstance(value, bool):
-        raise cv.Invalid("Expected a number, got a boolean")
-    return value
-
-
-def _finite(value: float) -> float:
-    if not math.isfinite(value):
-        raise cv.Invalid("Expected a finite number")
-    return value
-
-
-def _no_nul(value: str) -> str:
-    # The default is a C string in flash, so a NUL would cut it short
-    if "\0" in value:
-        raise cv.Invalid("A default cannot contain a NUL character")
-    return value
-
-
-# The wire carries the default as text; the client parses it into ExecuteServiceArgument's
-# types, so the values are kept within what int32 and float hold
-FLOAT32_MAX = 3.4028235e38
-_DEFAULT_VALUE_VALIDATORS: dict[str, Callable[[Any], Any]] = {
-    "bool": cv.boolean,
-    "int": cv.All(_not_boolean, cv.int_range(min=-(2**31), max=2**31 - 1)),
-    "float": cv.All(
-        _not_boolean,
-        cv.float_,
-        _finite,
-        cv.float_range(min=-FLOAT32_MAX, max=FLOAT32_MAX),
-    ),
-    "string": cv.All(cv.string_strict, _no_nul),
-}
-assert _DEFAULT_VALUE_VALIDATORS.keys() == _SERVICE_ARG_SCALAR_TYPES.keys()
-
-
-def _validate_variable_optionality(value: ConfigType) -> ConfigType:
-    """Cross-validate required/default against the variable type."""
-    var_type = value[CONF_TYPE]
-    if _is_optional_var(value) and var_type not in _DEFAULT_VALUE_VALIDATORS:
-        raise cv.Invalid("Array variables cannot be optional")
-    if CONF_DEFAULT in value:
-        if value.get(CONF_REQUIRED) is True:
-            raise cv.Invalid("A variable with a default cannot set required: true")
-        value[CONF_DEFAULT] = _DEFAULT_VALUE_VALIDATORS[var_type](value[CONF_DEFAULT])
-    return value
-
-
-VARIABLE_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.Required(CONF_TYPE): cv.one_of(*SERVICE_ARG_NATIVE_TYPES, lower=True),
-            cv.Optional(CONF_DESCRIPTION): cv.string_strict,
-            cv.Optional(CONF_EXAMPLE): cv.string_strict,
-            cv.Optional(CONF_REQUIRED): cv.boolean,
-            cv.Optional(CONF_DEFAULT): cv.valid,
-        }
-    ),
-    _validate_variable_optionality,
+VARIABLE_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_TYPE): cv.one_of(*SERVICE_ARG_NATIVE_TYPES, lower=True),
+        cv.Optional(CONF_DESCRIPTION): cv.string_strict,
+        cv.Optional(CONF_EXAMPLE): cv.string_strict,
+    }
 )
 
 # Accepts the plain `name: type` shorthand or the full mapping form
@@ -522,28 +464,7 @@ def _has_action_metadata(actions: list[ConfigType]) -> bool:
     )
 
 
-def _is_optional_var(var_: ConfigType) -> bool:
-    return CONF_DEFAULT in var_ or var_.get(CONF_REQUIRED) is False
-
-
-def _has_optional_args(actions: list[ConfigType]) -> bool:
-    return any(
-        _is_optional_var(var_)
-        for conf in actions
-        for var_ in conf[CONF_VARIABLES].values()
-    )
-
-
-def _default_to_wire(value: Any) -> str:
-    """Serialize a validated default for the wire; clients coerce by arg type."""
-    if isinstance(value, bool):
-        return "true" if value else "false"
-    return str(value)
-
-
-def _action_strings(
-    conf: ConfigType, has_metadata: bool, has_optional: bool
-) -> list[str | None]:
+def _action_strings(conf: ConfigType, has_metadata: bool) -> list[str | None]:
     """Strings of one action in the table order UserServiceStatic (user_services.h) expects."""
     # An empty description or example is treated as unset
     strings: list[str | None] = [conf[CONF_ACTION]]
@@ -556,15 +477,6 @@ def _action_strings(
                 var_.get(CONF_DESCRIPTION) or None,
                 var_.get(CONF_EXAMPLE) or None,
             ]
-        if has_optional:
-            # The default slot doubles as the optional flag: nullptr for a required variable,
-            # "" for an optional one without a default (an empty string default is the same)
-            if not _is_optional_var(var_):
-                strings.append(None)
-            elif (default := var_.get(CONF_DEFAULT)) is None:
-                strings.append("")
-            else:
-                strings.append(_default_to_wire(default))
     return strings
 
 
@@ -573,7 +485,9 @@ def _validate_wizard(config: ConfigType) -> ConfigType:
     return config
 
 
-FINAL_VALIDATE_SCHEMA = _validate_wizard
+FINAL_VALIDATE_SCHEMA = cv.All(
+    _validate_wizard,
+)
 
 
 def _add_action_strings(index: int, strings: list[str | None]) -> MockObj:
@@ -632,9 +546,6 @@ async def to_code(config: ConfigType) -> None:
         has_metadata = _has_action_metadata(actions)
         if has_metadata:
             cg.add_define("USE_API_USER_DEFINED_ACTION_METADATA")
-        has_optional = _has_optional_args(actions)
-        if has_optional:
-            cg.add_define("USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS")
         # Collect all triggers first, then register all at once with initializer_list
         triggers: list[cg.MockObj] = []
         for index, conf in enumerate(actions):
@@ -678,7 +589,7 @@ async def to_code(config: ConfigType) -> None:
                     native = SERVICE_ARG_NATIVE_TYPES[var_type]
                 service_template_args.append(native)
                 func_args.append((native, name))
-            strings = _action_strings(conf, has_metadata, has_optional)
+            strings = _action_strings(conf, has_metadata)
             table = _add_action_strings(index, strings)
             # Template args: supports_response mode, then user service arg types
             templ = cg.TemplateArguments(supports_response, *service_template_args)

esphome/components/api/api.proto

@@ -608,7 +608,6 @@ message ListEntitiesCoverResponse {
   bool supports_stop = 12;
   uint32 device_id = 13 [(field_ifdef) = "USE_DEVICES"];
   bool supports_stop_tilt = 14;
-  bool supports_toggle = 15;
 }
 
 // Deprecated in API version 1.1
@@ -671,7 +670,6 @@ message CoverCommandRequest {
   bool stop = 8;
   uint32 device_id = 9 [(field_ifdef) = "USE_DEVICES"];
   bool stop_tilt = 10;
-  bool toggle = 11;
 }
 
 // ==================== FAN ====================
@@ -1174,10 +1172,6 @@ message ListEntitiesServicesArgument {
   ServiceArgType type = 2;
   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];
-  // Advisory: ExecuteServiceRequest still requires every argument
-  bool optional = 5 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS"];
-  // Always text: bool "true"/"false", numbers parseable as int/float; empty means no default
-  string default_value = 6 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS", (progmem) = true];
 }
 message ListEntitiesServicesResponse {
   option (id) = 41;
@@ -1789,8 +1783,6 @@ message MediaPlayerSupportedFormat {
   uint32 num_channels = 3;
   MediaPlayerFormatPurpose purpose = 4;
   uint32 sample_bytes = 5;
-  // Constant bitrate in kbps for lossy formats; 0 means no preference
-  uint32 bitrate = 6;
 }
 message ListEntitiesMediaPlayerResponse {
   option (id) = 63;

esphome/components/api/api_connection.cpp

@@ -555,7 +555,6 @@ uint16_t APIConnection::try_send_cover_info(EntityBase *entity, APIConnection *c
   msg.supports_tilt = traits.get_supports_tilt();
   msg.supports_stop = traits.get_supports_stop();
   msg.supports_stop_tilt = traits.get_supports_stop_tilt();
-  msg.supports_toggle = traits.get_supports_toggle();
   return fill_and_encode_entity_info_with_device_class(cover, msg, msg.device_class, conn, remaining_size);
 }
 void APIConnection::on_cover_command_request(const CoverCommandRequest &msg) {
@@ -568,8 +567,6 @@ void APIConnection::on_cover_command_request(const CoverCommandRequest &msg) {
     call.set_command_stop();
   if (msg.stop_tilt)
     call.set_command_stop_tilt();
-  if (msg.toggle)
-    call.set_command_toggle();
   call.perform();
 }
 #endif
@@ -1131,7 +1128,6 @@ uint16_t APIConnection::try_send_media_player_info(EntityBase *entity, APIConnec
     media_format.num_channels = supported_format.num_channels;
     media_format.purpose = static_cast<enums::MediaPlayerFormatPurpose>(supported_format.purpose);
     media_format.sample_bytes = supported_format.sample_bytes;
-    media_format.bitrate = supported_format.bitrate;
   }
   return fill_and_encode_entity_info(media_player, msg, conn, remaining_size);
 }

esphome/components/api/api_pb2.cpp

@@ -484,7 +484,6 @@ uint8_t *ListEntitiesCoverResponse::encode_msg(const void *self, uint8_t *__rest
   pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 13, msg.device_id);
 #endif
   pos = ProtoEncode::encode_bool(pos PROTO_ENCODE_DEBUG_ARG, 14, msg.supports_stop_tilt);
-  pos = ProtoEncode::encode_bool(pos PROTO_ENCODE_DEBUG_ARG, 15, msg.supports_toggle);
   return pos;
 }
 uint32_t ListEntitiesCoverResponse::calc_size_msg(const void *self) {
@@ -507,7 +506,6 @@ uint32_t ListEntitiesCoverResponse::calc_size_msg(const void *self) {
   size += ProtoSize::calc_uint32(1, msg.device_id);
 #endif
   size += ProtoSize::calc_bool(1, msg.supports_stop_tilt);
-  size += ProtoSize::calc_bool(1, msg.supports_toggle);
   return size;
 }
 uint8_t *CoverStateResponse::encode_msg(const void *self, uint8_t *__restrict__ pos PROTO_ENCODE_DEBUG_PARAM) {
@@ -567,9 +565,6 @@ void CoverCommandRequest::decode_field(void *self, uint32_t tag, const uint8_t *
     case proto_tag(10, WIRE_TYPE_VARINT):
       msg.stop_tilt = value.as_bool();
       break;
-    case proto_tag(11, WIRE_TYPE_VARINT):
-      msg.toggle = value.as_bool();
-      break;
     default:
       break;
   }
@@ -1369,12 +1364,6 @@ uint8_t *ListEntitiesServicesArgument::encode_msg(const void *self,
 #endif
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
   pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 4, msg.example);
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-  pos = ProtoEncode::encode_bool(pos PROTO_ENCODE_DEBUG_ARG, 5, msg.optional);
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-  pos = ProtoEncode::encode_progmem_string(pos PROTO_ENCODE_DEBUG_ARG, 6, msg.default_value);
 #endif
   return pos;
 }
@@ -1388,12 +1377,6 @@ uint32_t ListEntitiesServicesArgument::calc_size_msg(const void *self) {
 #endif
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
   size += ProtoSize::calc_length(1, msg.example.size());
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-  size += ProtoSize::calc_bool(1, msg.optional);
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-  size += ProtoSize::calc_length(1, msg.default_value.size());
 #endif
   return size;
 }
@@ -2385,7 +2368,6 @@ uint8_t *MediaPlayerSupportedFormat::encode_msg(const void *self, uint8_t *__res
   pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 3, msg.num_channels);
   pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 4, static_cast<uint32_t>(msg.purpose));
   pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 5, msg.sample_bytes);
-  pos = ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 6, msg.bitrate);
   return pos;
 }
 uint32_t MediaPlayerSupportedFormat::calc_size_msg(const void *self) {
@@ -2396,7 +2378,6 @@ uint32_t MediaPlayerSupportedFormat::calc_size_msg(const void *self) {
   size += ProtoSize::calc_uint32(1, msg.num_channels);
   size += msg.purpose ? 2 : 0;
   size += ProtoSize::calc_uint32(1, msg.sample_bytes);
-  size += ProtoSize::calc_uint32(1, msg.bitrate);
   return size;
 }
 uint8_t *ListEntitiesMediaPlayerResponse::encode_msg(const void *self,

esphome/components/api/api_pb2.h

@@ -911,7 +911,7 @@ class BinarySensorStateResponse final : public StateResponseProtoMessage {
 class ListEntitiesCoverResponse final : public InfoResponseProtoMessage {
  public:
   static constexpr uint16_t MESSAGE_TYPE = 13;
-  static constexpr uint8_t ESTIMATED_SIZE = 61;
+  static constexpr uint8_t ESTIMATED_SIZE = 59;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   const LogString *message_name() const override { return LOG_STR("list_entities_cover_response"); }
 #endif
@@ -921,7 +921,6 @@ class ListEntitiesCoverResponse final : public InfoResponseProtoMessage {
   ProgmemStringRef device_class{};
   bool supports_stop{false};
   bool supports_stop_tilt{false};
-  bool supports_toggle{false};
   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);
@@ -959,7 +958,7 @@ class CoverStateResponse final : public StateResponseProtoMessage {
 class CoverCommandRequest final : public CommandProtoMessage {
  public:
   static constexpr uint16_t MESSAGE_TYPE = 30;
-  static constexpr uint8_t ESTIMATED_SIZE = 29;
+  static constexpr uint8_t ESTIMATED_SIZE = 27;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   const LogString *message_name() const override { return LOG_STR("cover_command_request"); }
 #endif
@@ -969,7 +968,6 @@ class CoverCommandRequest final : public CommandProtoMessage {
   float tilt{0.0f};
   bool stop{false};
   bool stop_tilt{false};
-  bool toggle{false};
   void decode(const uint8_t *buffer, size_t length) {
     ProtoDecodableMessage::decode_fields(this, buffer, length, &decode_field);
   }
@@ -1593,12 +1591,6 @@ class ListEntitiesServicesArgument final : public ProtoMessage {
 #endif
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
   ProgmemStringRef example{};
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-  bool optional{false};
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-  ProgmemStringRef default_value{};
 #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 {
@@ -2269,7 +2261,6 @@ class MediaPlayerSupportedFormat final : public ProtoMessage {
   uint32_t num_channels{0};
   enums::MediaPlayerFormatPurpose purpose{};
   uint32_t sample_bytes{0};
-  uint32_t bitrate{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);

esphome/components/api/api_pb2_dump.cpp

@@ -1246,7 +1246,6 @@ const char *ListEntitiesCoverResponse::dump_to(DumpBuffer &out) const {
   dump_field(out, ESPHOME_PSTR("device_id"), this->device_id);
 #endif
   dump_field(out, ESPHOME_PSTR("supports_stop_tilt"), this->supports_stop_tilt);
-  dump_field(out, ESPHOME_PSTR("supports_toggle"), this->supports_toggle);
   return out.c_str();
 }
 const char *CoverStateResponse::dump_to(DumpBuffer &out) const {
@@ -1272,7 +1271,6 @@ const char *CoverCommandRequest::dump_to(DumpBuffer &out) const {
   dump_field(out, ESPHOME_PSTR("device_id"), this->device_id);
 #endif
   dump_field(out, ESPHOME_PSTR("stop_tilt"), this->stop_tilt);
-  dump_field(out, ESPHOME_PSTR("toggle"), this->toggle);
   return out.c_str();
 }
 #endif
@@ -1643,12 +1641,6 @@ const char *ListEntitiesServicesArgument::dump_to(DumpBuffer &out) const {
 #endif
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
   dump_progmem_string_field(out, ESPHOME_PSTR("example"), this->example);
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-  dump_field(out, ESPHOME_PSTR("optional"), this->optional);
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-  dump_progmem_string_field(out, ESPHOME_PSTR("default_value"), this->default_value);
 #endif
   return out.c_str();
 }
@@ -2105,7 +2097,6 @@ const char *MediaPlayerSupportedFormat::dump_to(DumpBuffer &out) const {
   dump_field(out, ESPHOME_PSTR("num_channels"), this->num_channels);
   dump_field(out, ESPHOME_PSTR("purpose"), static_cast<enums::MediaPlayerFormatPurpose>(this->purpose));
   dump_field(out, ESPHOME_PSTR("sample_bytes"), this->sample_bytes);
-  dump_field(out, ESPHOME_PSTR("bitrate"), this->bitrate);
   return out.c_str();
 }
 const char *ListEntitiesMediaPlayerResponse::dump_to(DumpBuffer &out) const {

esphome/components/api/proto.h

@@ -301,7 +301,7 @@ constexpr uint32_t VARINT_MAX_1_BYTE = 1 << 7;   // 128
 constexpr uint32_t VARINT_MAX_2_BYTE = 1 << 14;  // 16384
 
 /// Generated encode body: writes the fields at pos, returns the cursor past them.
-using ProtoEncodeFn = uint8_t *(*)(const void *, uint8_t *PROTO_ENCODE_DEBUG_PARAM);
+using ProtoEncodeFn = uint8_t *(*) (const void *, uint8_t *PROTO_ENCODE_DEBUG_PARAM);
 
 /// Static encode helpers for the generated encode bodies. Each takes the write cursor by value and
 /// returns it advanced, so outlined calls at -Os chain through the return register instead of a

esphome/components/api/user_services.cpp

@@ -31,13 +31,6 @@ ListEntitiesServicesResponse UserServiceStatic::encode_list_service_response_(
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
     arg.description = this->str_(base + 1);
     arg.example = this->str_(base + 2);
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-    // The default slot doubles as the optional flag: nullptr is required, "" optional without a default
-    const char *d = progmem_read_ptr(&this->strings_[base + USER_ACTION_ARG_BASE_STRINGS]);
-    arg.optional = d != nullptr;
-    if (d != nullptr)
-      arg.default_value = ProgmemStringRef(d, ESPHOME_strlen_P(d));
 #endif
   }
   return msg;

esphome/components/api/user_services.h

@@ -40,20 +40,13 @@ template<typename T> enums::ServiceArgType to_service_arg_type();
 // 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
 // each argument name; with USE_API_USER_DEFINED_ACTION_METADATA the action description follows
-// the name and every argument is (name, description, example); with
-// USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS every argument ends with its default: nullptr for a
-// required argument, "" for an optional one without a default. Unset is nullptr.
+// the name and every argument is (name, description, example). Unset metadata is nullptr.
 #ifdef USE_API_USER_DEFINED_ACTION_METADATA
 static constexpr size_t USER_ACTION_HEADER_STRINGS = 2;
-static constexpr size_t USER_ACTION_ARG_BASE_STRINGS = 3;
+static constexpr size_t USER_ACTION_ARG_STRINGS = 3;
 #else
 static constexpr size_t USER_ACTION_HEADER_STRINGS = 1;
-static constexpr size_t USER_ACTION_ARG_BASE_STRINGS = 1;
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_OPTIONAL_ARGS
-static constexpr size_t USER_ACTION_ARG_STRINGS = USER_ACTION_ARG_BASE_STRINGS + 1;
-#else
-static constexpr size_t USER_ACTION_ARG_STRINGS = USER_ACTION_ARG_BASE_STRINGS;
+static constexpr size_t USER_ACTION_ARG_STRINGS = 1;
 #endif
 class UserServiceStatic : public UserServiceDescriptor {
  public:

esphome/components/bl0906/constants.h

@@ -111,9 +111,10 @@ static const uint8_t BL0906_USR_WRPROT = 0x9E;
 // Reset Register
 static const uint8_t BL0906_SOFT_RESET = 0x9F;
 
-const uint8_t BL0906_INIT[2][6] = {// Reset to default
-                                   {BL0906_WRITE_COMMAND, BL0906_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x52},
-                                   // Enable User Operation Write
-                                   {BL0906_WRITE_COMMAND, BL0906_USR_WRPROT, 0x55, 0x55, 0x00, 0xB7}};
+const uint8_t BL0906_INIT[2][6] = {
+    // Reset to default
+    {BL0906_WRITE_COMMAND, BL0906_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x52},
+    // Enable User Operation Write
+    {BL0906_WRITE_COMMAND, BL0906_USR_WRPROT, 0x55, 0x55, 0x00, 0xB7}};
 
 }  // namespace esphome::bl0906

esphome/components/cc1101/__init__.py

@@ -295,6 +295,11 @@ async def to_code(config):
         )
 
 
+# Actions
+SendPacketAction = ns.class_(
+    "SendPacketAction", automation.Action, cg.Parented.template(CC1101Component)
+)
+
 CC1101_ACTION_SCHEMA = cv.Schema(
     maybe_simple_id({cv.GenerateID(CONF_ID): cv.use_id(CC1101Component)})
 )
@@ -333,11 +338,23 @@ SEND_PACKET_ACTION_SCHEMA = cv.maybe_simple_value(
 )
 
 
-automation.register_apply_action(
+@automation.register_action(
     "cc1101.send_packet",
+    SendPacketAction,
     SEND_PACKET_ACTION_SCHEMA,
-    automation.ApplyBytes(CONF_DATA, "transmit_packet({})"),
+    synchronous=True,
 )
+async def send_packet_action_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+    await automation.templatable_bytes(
+        config[CONF_DATA],
+        args,
+        var.set_data_template,
+        var.set_data_static,
+        "cc1101_data",
+    )
+    return var
 
 
 _CONFIG_VALIDATORS = {opt.schema: validator for opt, validator in CONFIG_MAP.items()}

esphome/components/cc1101/cc1101.h

@@ -132,4 +132,13 @@ class CC1101Component final : public Component,
   bool enter_tx_();
 };
 
+// Action Wrappers
+template<typename... Ts> class SendPacketAction final : public Action<Ts...>, public Parented<CC1101Component> {
+  TEMPLATABLE_BYTES(data)
+
+  void play(const Ts &...x) override {
+    this->data_.visit([this](const uint8_t *data, size_t len) { this->parent_->transmit_packet(data, len); }, x...);
+  }
+};
+
 }  // namespace esphome::cc1101

esphome/components/climate/climate.h

@@ -79,10 +79,6 @@ class ClimateCall {
   ClimateCall &set_fan_mode(optional<std::string> fan_mode);
   /// Set the custom fan mode of the climate device.
   ClimateCall &set_fan_mode(const char *custom_fan_mode);
-  /// Set the custom fan mode of the climate device (StringRef overload to resolve ambiguity, zero-copy).
-  ClimateCall &set_fan_mode(StringRef custom_fan_mode) {
-    return this->set_fan_mode(custom_fan_mode.c_str(), custom_fan_mode.size());
-  }
   /// Set the custom fan mode of the climate device (zero-copy API path).
   ClimateCall &set_fan_mode(const char *custom_fan_mode, size_t len);
   /// Set the swing mode of the climate device.
@@ -103,10 +99,6 @@ class ClimateCall {
   ClimateCall &set_preset(optional<std::string> preset);
   /// Set the custom preset of the climate device.
   ClimateCall &set_preset(const char *custom_preset);
-  /// Set the custom preset of the climate device (StringRef overload to resolve ambiguity, zero-copy).
-  ClimateCall &set_preset(StringRef custom_preset) {
-    return this->set_preset(custom_preset.c_str(), custom_preset.size());
-  }
   /// Set the custom preset of the climate device (zero-copy API path).
   ClimateCall &set_preset(const char *custom_preset, size_t len);
 

esphome/components/emontx/emontx.cpp

@@ -126,7 +126,7 @@ void EmonTx::loop() {
 
   // Read all available data to prevent UART buffer overflow
   this->read_available([this](uint8_t received) {
-    size_t len = 0;
+    size_t len;
     char *line = this->line_reader_.feed(received, len);
     this->line_reader_.log_if_overflowed(TAG);
     if (line == nullptr || len == 0) {

esphome/components/epaper_spi/epaper_goodisplay_3c.cpp

@@ -1,12 +0,0 @@
-#include "epaper_goodisplay_3c.h"
-
-namespace esphome::epaper_spi {
-
-void EPaperGoodDisplay3C::power_on() {}
-
-void EPaperGoodDisplay3C::refresh_screen(bool partial) {
-  EPaperWeAct3C::refresh_screen(partial);
-  this->next_delay_ = REFRESH_START_MS;
-}
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_goodisplay_3c.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "epaper_weact_3c.h"
-
-namespace esphome::epaper_spi {
-
-/**
- * Good Display 3-color e-paper displays (SSD1680 controller), e.g. GDEY029Z95.
- *
- * Driven as EPaperWeAct3C, except that there is no separate power-on: the full refresh (0xF7) powers the panel
- * up itself. Busy then only goes high a little after the refresh starts, so the next state waits before
- * checking it.
- */
-class EPaperGoodDisplay3C : public EPaperWeAct3C {
- public:
-  using EPaperWeAct3C::EPaperWeAct3C;
-
- protected:
-  // Time from master activation (0x20) until busy can be relied on
-  static constexpr uint16_t REFRESH_START_MS = 50;
-
-  // With EPaperWeAct3C's power-on (0x22 0xF8) first, this panel's refresh ends almost at once and the image
-  // does not change.
-  void power_on() override;
-  void refresh_screen(bool partial) override;
-};
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/models/weact_bwr.py

@@ -4,17 +4,11 @@ Supported models:
 - weact-2.13in-3c: 122x250 pixels (2.13" display)
 - weact-2.9in-3c: 128x296 pixels (2.9" display)
 - weact-4.2in-3c: 400x300 pixels (4.2" display)
-- goodisplay-gdey029z95-2.9: 128x296 pixels (Good Display GDEY029Z95 2.9" display)
 
 These displays use SSD1680 or SSD1683 controller and require a specific initialization
 sequence. The DRV_OUT_CTL command is calculated from the display height.
-The Good Display panel is driven as the WeAct ones, except that it must not get the
-separate power-on before the refresh, so it has its own driver class, EPaperGoodDisplay3C.
 """
 
-import esphome.config_validation as cv
-from esphome.const import CONF_BUSY_PIN, CONF_RESET_PIN
-
 from . import EpaperModel
 
 
@@ -23,10 +17,8 @@ class WeActBWR(EpaperModel):
 
     source_files = ("epaper_weact_3c.cpp",)
 
-    def __init__(
-        self, name: str, class_name: str = "EPaperWeAct3C", **defaults: object
-    ) -> None:
-        super().__init__(name, class_name, **defaults)
+    def __init__(self, name, **defaults):
+        super().__init__(name, "EPaperWeAct3C", **defaults)
 
     def get_init_sequence(self, config):
         """Generate initialization sequence for WeAct BWR displays.
@@ -83,27 +75,3 @@ weact_4p2in3c = WeActBWR(
     data_rate="10MHz",
     minimum_update_interval="10s",
 )
-
-
-class GoodDisplayBWR(WeActBWR):
-    """Good Display Black/White/Red displays using SSD1680 controller."""
-
-    source_files = ("epaper_weact_3c.cpp", "epaper_goodisplay_3c.cpp")
-
-    def __init__(self, name: str, **defaults: object) -> None:
-        super().__init__(name, "EPaperGoodDisplay3C", **defaults)
-
-    def option(self, name, fallback=cv.UNDEFINED) -> cv.Optional | cv.Required:
-        # Only a hardware reset wakes the panel from deep sleep, and refreshes are timed by busy
-        if name in (CONF_RESET_PIN, CONF_BUSY_PIN):
-            return cv.Required(name)
-        return super().option(name, fallback)
-
-
-# Model: Good Display GDEY029Z95 2.9" BWR - 128x296 pixels, SSD1680 controller
-GoodDisplayBWR(
-    "goodisplay-gdey029z95-2.9",
-    width=128,
-    height=296,
-    minimum_update_interval="10s",
-)

esphome/components/esp32/__init__.py

@@ -1303,8 +1303,8 @@ def _resolve_framework_version(value: ConfigType) -> cv.Version:
             raise cv.Invalid("Only Arduino 3.0+ is supported.")
         recommended = ARDUINO_FRAMEWORK_VERSION_LOOKUP["recommended"]
     else:
-        if version < cv.Version(5, 1, 0):
-            raise cv.Invalid("Only ESP-IDF 5.1+ is supported.")
+        if version < cv.Version(5, 0, 0):
+            raise cv.Invalid("Only ESP-IDF 5.0+ is supported.")
         recommended = ESP_IDF_FRAMEWORK_VERSION_LOOKUP["recommended"]
 
     if version != recommended:
@@ -2851,9 +2851,9 @@ async def _reconcile_network_sdkconfig() -> None:
     # Software coexistence: enable when requested (the schema only allows it
     # alongside WiFi). Disable only in the Ethernet-without-WiFi case.
     if net.software_coexistence:
-        set_idf_sdkconfig_default("CONFIG_ESP_COEX_SW_COEXIST_ENABLE", True)
+        set_idf_sdkconfig_default("CONFIG_SW_COEXIST_ENABLE", True)
     elif wifi_disabled:
-        set_idf_sdkconfig_default("CONFIG_ESP_COEX_SW_COEXIST_ENABLE", False)
+        set_idf_sdkconfig_default("CONFIG_SW_COEXIST_ENABLE", False)
 
     # SoftAP support: drop it when WiFi is used without AP mode (IDF only).
     if not is_arduino and net.wifi and not net.wifi_ap:
@@ -3031,9 +3031,10 @@ async def to_code(config):
     # assert(), HAL_ASSERT and ESP_ERROR_CHECK bake __FILE__ into rodata, and
     # IDF's noflash placement puts the flash driver's copies in DRAM. The
     # basename keeps the panic output useful at a fraction of the size.
-    # __FILE_NAME__ is a GCC 12 builtin, which every supported IDF ships.
-    cg.add_build_flag("-D__FILE__=__FILE_NAME__")
-    cg.add_build_flag("-Wno-builtin-macro-redefined")
+    # __FILE_NAME__ is a GCC 12 builtin; IDF 5.0 still ships GCC 11.2.
+    if idf_version() >= cv.Version(5, 1, 0):
+        cg.add_build_flag("-D__FILE__=__FILE_NAME__")
+        cg.add_build_flag("-Wno-builtin-macro-redefined")
     # Deferred so KEY_COMPONENTS is fully populated -- see the coroutine.
     CORE.add_job(_finalize_arduino_aware_flags)
     cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])

esphome/components/esp32_ble/__init__.py

@@ -473,11 +473,17 @@ def final_validation(config: ConfigType) -> None:
 
     # Check if hosted bluetooth is being used
     if ESP32_HOSTED_DOMAIN in full_config:
+        from esphome.components.esp32_hosted import uses_esp_hosted_3x
+
         add_idf_sdkconfig_option("CONFIG_BT_CLASSIC_ENABLED", False)
         add_idf_sdkconfig_option("CONFIG_BT_BLE_ENABLED", True)
         add_idf_sdkconfig_option("CONFIG_BT_BLUEDROID_ENABLED", True)
         add_idf_sdkconfig_option("CONFIG_BT_CONTROLLER_DISABLED", True)
-        add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_HOST_FEAT_BT", True)
+        if uses_esp_hosted_3x():
+            add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_HOST_FEAT_BT", True)
+        else:
+            add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_ENABLE_BT_BLUEDROID", True)
+            add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_BLUEDROID_HCI_VHCI", True)
 
     # Check if BLE Client is needed (via esp32_ble_tracker or esp32_ble_client)
     has_ble_client = (

esphome/components/esp32_ble/ble.cpp

@@ -14,10 +14,15 @@
 #include <cinttypes>
 extern "C" {
 #include <esp_hosted.h>
+#ifndef CONFIG_ESP_HOSTED_HOST_FEAT_BT
+#include <esp_hosted_misc.h>
+#include <esp_hosted_bluedroid.h>
+#endif
 }
-#include <eh_host_bt.h>
+#ifdef CONFIG_ESP_HOSTED_HOST_FEAT_BT
 #include <esp_hosted_bt_host_stack.h>
 #endif
+#endif
 #include <esp_bt_device.h>
 #include <esp_bt_main.h>
 #include <esp_gap_ble_api.h>
@@ -241,28 +246,44 @@ bool ESP32BLE::ble_setup_() {
   }
   ESP_LOGD(TAG, "Co-processor firmware %" PRIu32 ".%" PRIu32 ".%" PRIu32, fw_ver.major1, fw_ver.minor1, fw_ver.patch1);
 
-  // Not the library's bring-up: its retry loop can block for minutes on a silent co-processor
-  err = eh_host_bt_controller_init();
-  if (err != ESP_OK && err != ESP_ERR_INVALID_STATE) {
+#ifdef CONFIG_ESP_HOSTED_HOST_FEAT_BT
+  esp_hosted_bt_host_stack_cfg_t bt_cfg{};
+  bt_cfg.stack = ESP_HOSTED_BT_HOST_STACK_BLUEDROID;
+  bt_cfg.bring_up_controller = true;
+  bt_cfg.controller_ready_timeout_ms = EH_BT_CTRL_DEFAULT_READY_TIMEOUT_MS;
+  if (esp_hosted_bt_host_stack_setup(&bt_cfg) != ESP_OK) {
+    ESP_LOGE(TAG,
+             "BT controller bring-up failed; co-processor firmware %" PRIu32 ".%" PRIu32 ".%" PRIu32
+             " may lack BT support. Update it with the esp32_hosted update component; BLE disabled",
+             fw_ver.major1, fw_ver.minor1, fw_ver.patch1);
+    return false;
+  }
+#else
+  if (esp_hosted_bt_controller_init() != ESP_OK) {
     ESP_LOGE(TAG,
              "BT controller init failed; co-processor firmware %" PRIu32 ".%" PRIu32 ".%" PRIu32
              " may lack BT support. Update it with the esp32_hosted update component; BLE disabled",
              fw_ver.major1, fw_ver.minor1, fw_ver.patch1);
     return false;
   }
-  err = eh_host_bt_controller_enable();
-  if (err != ESP_OK && err != ESP_ERR_INVALID_STATE) {
-    ESP_LOGE(TAG, "BT controller enable failed: %s; BLE disabled", esp_err_to_name(err));
+
+  if (esp_hosted_bt_controller_enable() != ESP_OK) {
+    ESP_LOGE(TAG,
+             "BT controller enable failed; co-processor firmware %" PRIu32 ".%" PRIu32 ".%" PRIu32
+             " may lack BT support. Update it with the esp32_hosted update component; BLE disabled",
+             fw_ver.major1, fw_ver.minor1, fw_ver.patch1);
     return false;
   }
 
-  esp_hosted_bt_host_stack_cfg_t bt_cfg{};
-  bt_cfg.stack = ESP_HOSTED_BT_HOST_STACK_BLUEDROID;
-  bt_cfg.bring_up_controller = false;
-  if (esp_hosted_bt_host_stack_setup(&bt_cfg) != ESP_OK) {
-    ESP_LOGE(TAG, "BT host stack setup failed; BLE disabled");
-    return false;
-  }
+  hosted_hci_bluedroid_open();
+
+  esp_bluedroid_hci_driver_operations_t operations = {
+      .send = hosted_hci_bluedroid_send,
+      .check_send_available = hosted_hci_bluedroid_check_send_available,
+      .register_host_callback = hosted_hci_bluedroid_register_host_callback,
+  };
+  esp_bluedroid_attach_hci_driver(&operations);
+#endif
 #endif
 
   err = esp_bluedroid_init();
@@ -419,11 +440,23 @@ bool ESP32BLE::ble_dismantle_() {
       return false;
     }
   }
-#else
+#elif defined(CONFIG_ESP_HOSTED_HOST_FEAT_BT)
   if (esp_hosted_bt_host_stack_teardown() != ESP_OK) {
     ESP_LOGE(TAG, "esp_hosted_bt_host_stack_teardown failed");
     return false;
   }
+#else
+  if (esp_hosted_bt_controller_disable() != ESP_OK) {
+    ESP_LOGE(TAG, "esp_hosted_bt_controller_disable failed");
+    return false;
+  }
+
+  if (esp_hosted_bt_controller_deinit(false) != ESP_OK) {
+    ESP_LOGE(TAG, "esp_hosted_bt_controller_deinit failed");
+    return false;
+  }
+
+  hosted_hci_bluedroid_close();
 #endif
   return true;
 }

esphome/components/esp32_hosted/__init__.py

@@ -1,6 +1,6 @@
-import logging
 import os
 from pathlib import Path
+import re
 
 from esphome import pins
 from esphome.components import esp32
@@ -8,25 +8,33 @@ from esphome.components.const import CONF_SLOT, CONF_USE_PSRAM
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_CLK_PIN,
+    CONF_COMPONENTS,
     CONF_CS_PIN,
+    CONF_FRAMEWORK,
     CONF_FREQUENCY,
     CONF_MISO_PIN,
     CONF_MOSI_PIN,
+    CONF_NAME,
+    CONF_REF,
     CONF_RESET_PIN,
     CONF_TYPE,
     CONF_VARIANT,
+    KEY_ESP32,
 )
+from esphome.core import CORE
 from esphome.cpp_generator import add_define
+import esphome.final_validate as fv
 from esphome.types import ConfigType
 
-_LOGGER = logging.getLogger(__name__)
-
 CODEOWNERS = ["@swoboda1337"]
 DEPENDENCIES = ["esp32"]
 DOMAIN = "esp32_hosted"
 # esp32_ble raises the task watchdog around the remote BT controller bring-up
 AUTO_LOAD = ["watchdog"]
 
+# 3.x is opt-in via a pin under esp32.framework.components (needs ESP-IDF 5.5)
+ESP_HOSTED_COMPONENT = "espressif/esp_hosted"
+
 CONF_ACTIVE_HIGH = "active_high"
 CONF_BUS_WIDTH = "bus_width"
 CONF_CMD_PIN = "cmd_pin"
@@ -64,7 +72,7 @@ _MAX_CUSTOM_MSG_HANDLERS = 8
 BASE_SCHEMA = cv.Schema(
     {
         cv.Required(CONF_VARIANT): cv.one_of(*esp32.VARIANTS, upper=True),
-        cv.Optional(CONF_ACTIVE_HIGH): cv.boolean,
+        cv.Required(CONF_ACTIVE_HIGH): cv.boolean,
         cv.Required(CONF_RESET_PIN): pins.internal_gpio_output_pin_number,
         cv.Optional(CONF_USE_PSRAM, default=False): cv.boolean,
     }
@@ -75,7 +83,7 @@ SDIO_SCHEMA = BASE_SCHEMA.extend(
         cv.Required(CONF_CLK_PIN): pins.internal_gpio_output_pin_number,
         cv.Required(CONF_CMD_PIN): pins.internal_gpio_output_pin_number,
         cv.Required(CONF_D0_PIN): pins.internal_gpio_output_pin_number,
-        cv.Required(CONF_D1_PIN): pins.internal_gpio_output_pin_number,
+        cv.Optional(CONF_D1_PIN): pins.internal_gpio_output_pin_number,
         cv.Optional(CONF_D2_PIN): pins.internal_gpio_output_pin_number,
         cv.Optional(CONF_D3_PIN): pins.internal_gpio_output_pin_number,
         cv.Optional(CONF_BUS_WIDTH, default=4): cv.one_of(1, 4, int=True),
@@ -87,26 +95,9 @@ SDIO_SCHEMA = BASE_SCHEMA.extend(
 )
 
 
-def _validate_active_high(config: ConfigType) -> ConfigType:
-    # Remove before 2027.5.0
-    if (active_high := config.get(CONF_ACTIVE_HIGH)) is None:
-        return config
-    if not active_high:
-        raise cv.Invalid(
-            "esp_hosted always parks the reset line high with a low pulse, so "
-            "'active_high: false' is not supported.",
-            path=[CONF_ACTIVE_HIGH],
-        )
-    _LOGGER.warning(
-        "'active_high' is deprecated and ignored, remove it from esp32_hosted. "
-        "Removed in 2027.5.0"
-    )
-    return config
-
-
 def _validate_sdio(config: ConfigType) -> ConfigType:
     if config[CONF_BUS_WIDTH] == 4:
-        for pin in (CONF_D2_PIN, CONF_D3_PIN):
+        for pin in (CONF_D1_PIN, CONF_D2_PIN, CONF_D3_PIN):
             if pin not in config:
                 raise cv.Invalid(
                     f"{pin} is required when bus_width is 4",
@@ -159,26 +150,121 @@ def _validate_spi(config: ConfigType) -> ConfigType:
 
 CONFIG_SCHEMA = cv.typed_schema(
     {
-        "sdio": cv.All(SDIO_SCHEMA, _validate_sdio, _validate_active_high),
-        "spi": cv.All(SPI_SCHEMA, _validate_spi, _validate_active_high),
+        "sdio": cv.All(SDIO_SCHEMA, _validate_sdio),
+        "spi": cv.All(SPI_SCHEMA, _validate_spi),
     },
     default_type="sdio",
 )
 
 
+# Version specs that stay within one major (exact, ^, ~, ~=); other ranges are 3.x
+_PINNED_MAJOR = re.compile(r"^(?:==|\^|~=|~)?(\d+)(?:\.(?:\d+|\*))*$")
+
+
+def user_esp_hosted_major() -> int | None:
+    """Major version of a user-pinned esp_hosted, or None without a pin."""
+    try:
+        full_config = fv.full_config.get()
+    except LookupError:
+        full_config = CORE.config
+    esp32_config = full_config.get(KEY_ESP32) or {}
+    for component in esp32_config.get(CONF_FRAMEWORK, {}).get(CONF_COMPONENTS, []):
+        if component.get(CONF_NAME) != ESP_HOSTED_COMPONENT:
+            continue
+        ref = component.get(CONF_REF, "").strip()
+        if not ref:
+            return 2
+        if match := _PINNED_MAJOR.match(ref):
+            return int(match.group(1))
+        return 3
+    return None
+
+
+def uses_esp_hosted_3x() -> bool:
+    """Whether the user pinned esp_hosted 3.x."""
+    return (major := user_esp_hosted_major()) is not None and major >= 3
+
+
 def _final_validate(config: ConfigType) -> None:
-    if (idf_ver := esp32.idf_version()) < cv.Version(5, 5, 0):
+    # The esp_hosted releases compatible with older ESP-IDF versions crash at
+    # boot with a heap double free in the SDIO RX path (fixed in esp_hosted
+    # 2.11.0, which requires ESP-IDF 5.3), so reject them at validation time.
+    if (idf_ver := esp32.idf_version()) < cv.Version(5, 3, 0):
         raise cv.Invalid(
-            f"esp32_hosted requires ESP-IDF 5.5 or newer, got {idf_ver}. "
+            f"esp32_hosted requires ESP-IDF 5.3 or newer, got {idf_ver}. "
             "Remove the framework version from your configuration to use the "
-            "recommended version, or pin a version at or above 5.5."
+            "recommended version, or pin a version at or above 5.3."
+        )
+    if (major := user_esp_hosted_major()) is None or major < 3:
+        return
+    if idf_ver < cv.Version(5, 5, 0):
+        raise cv.Invalid(
+            f"esp_hosted 3.x requires ESP-IDF 5.5 or newer, got {idf_ver}. "
+            f"Remove the {ESP_HOSTED_COMPONENT} pin from esp32.framework."
+            "components to stay on the 2.x line, or use ESP-IDF 5.5 or newer."
+        )
+    if not config[CONF_ACTIVE_HIGH]:
+        raise cv.Invalid(
+            "esp_hosted 3.x always parks the reset line high with a low pulse, so "
+            "'active_high: false' cannot be expressed on it. Remove the "
+            f"{ESP_HOSTED_COMPONENT} pin from esp32.framework.components to stay "
+            "on the 2.x line."
+        )
+    if config[CONF_TYPE] == "sdio" and config[CONF_BUS_WIDTH] == 1:
+        raise cv.Invalid(
+            "esp_hosted 3.x cannot be built with a 1-bit SDIO bus "
+            "(espressif/esp-hosted-mcu#245). Remove the "
+            f"{ESP_HOSTED_COMPONENT} pin from esp32.framework.components to stay "
+            "on the 2.x line, or use a 4-bit bus."
         )
 
 
 FINAL_VALIDATE_SCHEMA = _final_validate
 
 
-def _configure_sdio(config: ConfigType) -> None:
+def _configure_sdio_2x(config: ConfigType) -> None:
+    slot = config[CONF_SLOT]
+    esp32.add_idf_sdkconfig_option(
+        f"CONFIG_ESP_HOSTED_SDIO_SLOT_{slot}",
+        True,
+    )
+    if config[CONF_BUS_WIDTH] == 1:
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_SDIO_1_BIT_BUS", True)
+    else:
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_SDIO_4_BIT_BUS", True)
+    esp32.add_idf_sdkconfig_option(
+        f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CLK_SLOT_{slot}",
+        config[CONF_CLK_PIN],
+    )
+    esp32.add_idf_sdkconfig_option(
+        f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CMD_SLOT_{slot}",
+        config[CONF_CMD_PIN],
+    )
+    esp32.add_idf_sdkconfig_option(
+        f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D0_SLOT_{slot}",
+        config[CONF_D0_PIN],
+    )
+    if config[CONF_BUS_WIDTH] == 4:
+        esp32.add_idf_sdkconfig_option(
+            f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D1_4BIT_BUS_SLOT_{slot}",
+            config[CONF_D1_PIN],
+        )
+        esp32.add_idf_sdkconfig_option(
+            f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D2_4BIT_BUS_SLOT_{slot}",
+            config[CONF_D2_PIN],
+        )
+        esp32.add_idf_sdkconfig_option(
+            f"CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D3_4BIT_BUS_SLOT_{slot}",
+            config[CONF_D3_PIN],
+        )
+    esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_CUSTOM_SDIO_PINS", True)
+    esp32.add_idf_sdkconfig_option(
+        "CONFIG_ESP_HOSTED_SDIO_CLOCK_FREQ_KHZ",
+        int(config[CONF_SDIO_FREQUENCY] // 1000),
+    )
+
+
+def _configure_sdio_3x(config: ConfigType) -> None:
     esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_HOST_TRANSPORT_BUS_SDIO", True)
     esp32.add_idf_sdkconfig_option(
         f"CONFIG_ESP_HOSTED_SDIO_SLOT_{config[CONF_SLOT]}",
@@ -197,11 +283,10 @@ def _configure_sdio(config: ConfigType) -> None:
     esp32.add_idf_sdkconfig_option(
         "CONFIG_ESP_HOSTED_HOST_SDIO_PIN_D0", config[CONF_D0_PIN]
     )
-    # D1 carries the card interrupt on a 1-bit bus too
-    esp32.add_idf_sdkconfig_option(
-        "CONFIG_ESP_HOSTED_HOST_SDIO_PIN_D1", config[CONF_D1_PIN]
-    )
     if config[CONF_BUS_WIDTH] == 4:
+        esp32.add_idf_sdkconfig_option(
+            "CONFIG_ESP_HOSTED_HOST_SDIO_PIN_D1", config[CONF_D1_PIN]
+        )
         esp32.add_idf_sdkconfig_option(
             "CONFIG_ESP_HOSTED_HOST_SDIO_PIN_D2", config[CONF_D2_PIN]
         )
@@ -214,7 +299,55 @@ def _configure_sdio(config: ConfigType) -> None:
     )
 
 
-def _configure_spi(config: ConfigType) -> None:
+def _configure_spi_2x(config: ConfigType) -> None:
+    esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_SPI_HOST_INTERFACE", True)
+    # SPI mode is set via per-variant choice options
+    variant = config[CONF_VARIANT]
+    mode = config[CONF_SPI_MODE]
+    suffix = "ESP32" if variant == "ESP32" else "ESP32XX"
+    esp32.add_idf_sdkconfig_option(
+        f"CONFIG_ESP_HOSTED_SPI_PRIV_MODE_{mode}_{suffix}",
+        True,
+    )
+    # Frequency is set via per-variant options
+    freq_mhz = int(config[CONF_FREQUENCY] // 1e6)
+    if variant == "ESP32":
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_SPI_FREQ_ESP32", freq_mhz)
+    elif variant == "ESP32C6":
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_SPI_FREQ_ESP32C6", freq_mhz)
+    else:
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_SPI_FREQ_ESP32XX", freq_mhz)
+    # Pin configuration (use HSPI variant as P4/H2 hosts don't have VSPI)
+    esp32.add_idf_sdkconfig_option(
+        "CONFIG_ESP_HOSTED_SPI_HSPI_GPIO_MOSI", config[CONF_MOSI_PIN]
+    )
+    esp32.add_idf_sdkconfig_option(
+        "CONFIG_ESP_HOSTED_SPI_HSPI_GPIO_MISO", config[CONF_MISO_PIN]
+    )
+    esp32.add_idf_sdkconfig_option(
+        "CONFIG_ESP_HOSTED_SPI_HSPI_GPIO_CLK", config[CONF_CLK_PIN]
+    )
+    esp32.add_idf_sdkconfig_option(
+        "CONFIG_ESP_HOSTED_SPI_HSPI_GPIO_CS", config[CONF_CS_PIN]
+    )
+    esp32.add_idf_sdkconfig_option(
+        "CONFIG_ESP_HOSTED_SPI_GPIO_HANDSHAKE", config[CONF_HANDSHAKE_PIN]
+    )
+    esp32.add_idf_sdkconfig_option(
+        "CONFIG_ESP_HOSTED_SPI_GPIO_DATA_READY", config[CONF_DATA_READY_PIN]
+    )
+    # Handshake and data_ready polarity
+    if config[CONF_HANDSHAKE_ACTIVE_HIGH]:
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_HS_ACTIVE_HIGH", True)
+    else:
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_HS_ACTIVE_LOW", True)
+    if config[CONF_DATA_READY_ACTIVE_HIGH]:
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_DR_ACTIVE_HIGH", True)
+    else:
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_DR_ACTIVE_LOW", True)
+
+
+def _configure_spi_3x(config: ConfigType) -> None:
     esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_HOST_TRANSPORT_BUS_SPI", True)
     esp32.add_idf_sdkconfig_option(
         "CONFIG_ESP_HOSTED_HOST_SPI_MODE", config[CONF_SPI_MODE]
@@ -259,28 +392,59 @@ def _configure_spi(config: ConfigType) -> None:
         )
 
 
-async def to_code(config: ConfigType) -> None:
-    add_define("USE_ESP32_HOSTED")
-    # The board choice defaults to an Espressif dev board, which locks every
-    # pin's Kconfig range to that board and silently drops other values
-    esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_P4_DEV_BOARD_NONE", True)
+def _configure_2x(config: ConfigType) -> None:
+    transport_prefix = "SDIO" if config[CONF_TYPE] == "sdio" else "SPI"
+    # Reset polarity
+    if config[CONF_ACTIVE_HIGH]:
+        esp32.add_idf_sdkconfig_option(
+            f"CONFIG_ESP_HOSTED_{transport_prefix}_RESET_ACTIVE_HIGH", True
+        )
+    else:
+        esp32.add_idf_sdkconfig_option(
+            f"CONFIG_ESP_HOSTED_{transport_prefix}_RESET_ACTIVE_LOW", True
+        )
+    # Reset GPIO
     esp32.add_idf_sdkconfig_option(
-        "CONFIG_ESP_HOSTED_HOST_RESET_GPIO", config[CONF_RESET_PIN]
+        f"CONFIG_ESP_HOSTED_{transport_prefix}_GPIO_RESET_SLAVE",  # NOLINT
+        config[CONF_RESET_PIN],
     )
-    # Co-processor variant. Wi-Fi Remote owns the choice and esp_hosted only
-    # offers the matching CP target, so both must name the same chip
+    # Slave variant  # NOLINT
     esp32.add_idf_sdkconfig_option(
         f"CONFIG_SLAVE_IDF_TARGET_{config[CONF_VARIANT]}",  # NOLINT
         True,
     )
+    if config[CONF_TYPE] == "sdio":
+        _configure_sdio_2x(config)
+    else:
+        _configure_spi_2x(config)
+    if esp32.get_esp32_variant() == esp32.VARIANT_ESP32P4:
+        # esp-hosted's CustomRpc ("peer data transfer") path — off by default.
+        esp32.add_idf_sdkconfig_option(
+            "CONFIG_ESP_HOSTED_ENABLE_PEER_DATA_TRANSFER", True
+        )
+        esp32.add_idf_sdkconfig_option(
+            "CONFIG_ESP_HOSTED_MAX_CUSTOM_MSG_HANDLERS", _MAX_CUSTOM_MSG_HANDLERS
+        )
+    # Place the transport mempool in PSRAM. Required on memory-tight host
+    # configurations (e.g. P4 with a large LVGL UI) where the internal-RAM
+    # mempool allocation fails at boot with `sdio_mempool_create` assert.
+    if config[CONF_USE_PSRAM]:
+        esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_MEMPOOL_PREFER_SPIRAM", True)
+
+
+def _configure_3x(config: ConfigType) -> None:
+    esp32.add_idf_sdkconfig_option(
+        "CONFIG_ESP_HOSTED_HOST_RESET_GPIO", config[CONF_RESET_PIN]
+    )
+    # Co-processor variant
     esp32.add_idf_sdkconfig_option(
         f"CONFIG_ESP_HOSTED_CP_TARGET_{config[CONF_VARIANT]}",
         True,
     )
     if config[CONF_TYPE] == "sdio":
-        _configure_sdio(config)
+        _configure_sdio_3x(config)
     else:
-        _configure_spi(config)
+        _configure_spi_3x(config)
     if esp32.get_esp32_variant() == esp32.VARIANT_ESP32P4:
         esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_HOST_FEAT_PEER_DATA", True)
         esp32.add_idf_sdkconfig_option(
@@ -291,6 +455,16 @@ async def to_code(config: ConfigType) -> None:
         esp32.add_idf_sdkconfig_option("CONFIG_EH_HOST_PORT_DMA_PREFER_SPIRAM", True)
         esp32.add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_DFLT_TASK_FROM_SPIRAM", True)
 
+
+async def to_code(config: ConfigType) -> None:
+    add_define("USE_ESP32_HOSTED")
+    use_3x = uses_esp_hosted_3x()
+
+    if use_3x:
+        _configure_3x(config)
+    else:
+        _configure_2x(config)
+
     # ESP-NOW-over-hosted shim: only the radio-less ESP32-P4 host needs it (see
     # the note by _MAX_CUSTOM_MSG_HANDLERS). Enabled for every P4 host, not
     # gated on the `espnow` component being present: the shim is tiny and the
@@ -304,14 +478,14 @@ async def to_code(config: ConfigType) -> None:
         # esp_now_hosted.cpp includes esp_now.h, which esp_wifi provides
         esp32.include_builtin_idf_component("esp_wifi")
 
-    # Library versions; this component set requires ESP-IDF 5.5 or newer,
+    # Library versions; this component set requires ESP-IDF 5.3 or newer,
     # which is enforced at validation time.
     idf_ver = esp32.idf_version()
     os.environ["ESP_IDF_VERSION"] = f"{idf_ver.major}.{idf_ver.minor}"
     esp32.add_idf_component(name="espressif/esp_wifi_remote", ref="1.6.5")
     esp32.add_idf_component(name="espressif/wifi_remote_over_eppp", ref="0.3.3")
     esp32.add_idf_component(name="espressif/eppp_link", ref="1.1.5")
-    esp32.add_idf_component(name="espressif/esp_hosted", ref="3.0.10")
+    esp32.add_idf_component(name="espressif/esp_hosted", ref="2.12.13")
     esp32.add_extra_script(
         "post",
         "esp32_hosted.py",

esphome/components/esp32_hosted/update/__init__.py

@@ -1,21 +1,12 @@
 import hashlib
-import logging
-from pathlib import Path
-from tempfile import TemporaryDirectory
 from typing import Any
 
-import voluptuous as vol
-
-from esphome import external_files
 import esphome.codegen as cg
 from esphome.components import esp32, update
 from esphome.components.const import CONF_SHA256
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_PATH, CONF_SOURCE, CONF_TYPE, CONF_URL
+from esphome.const import CONF_ID, CONF_PATH, CONF_SOURCE, CONF_TYPE
 from esphome.core import CORE, ID, HexInt
-from esphome.types import ConfigType
-
-_LOGGER = logging.getLogger(__name__)
 
 CODEOWNERS = ["@swoboda1337"]
 AUTO_LOAD = ["sha256", "watchdog", "json"]
@@ -49,15 +40,11 @@ BASE_SCHEMA = update.update_schema(Esp32HostedUpdate, device_class="firmware").e
     cv.polling_component_schema("6h")
 )
 
-EMBEDDED_SCHEMA = cv.All(
-    BASE_SCHEMA.extend(
-        {
-            cv.Optional(CONF_PATH): cv.file_,
-            cv.Optional(CONF_URL): cv.All(cv.url, vol.Match(r"^https?://")),
-            cv.Required(CONF_SHA256): _validate_sha256,
-        }
-    ),
-    cv.has_exactly_one_key(CONF_PATH, CONF_URL),
+EMBEDDED_SCHEMA = BASE_SCHEMA.extend(
+    {
+        cv.Required(CONF_PATH): cv.file_,
+        cv.Required(CONF_SHA256): _validate_sha256,
+    }
 )
 
 HTTP_SCHEMA = BASE_SCHEMA.extend(
@@ -83,50 +70,19 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _check_firmware_hash(data: bytes, expected: str, source: str | Path) -> None:
-    calculated = hashlib.sha256(data).hexdigest()
-    if calculated != expected:
-        raise cv.Invalid(
-            f"SHA256 mismatch for {source}: expected {expected}, got {calculated}"
-        )
-
-
-def _firmware_path(config: ConfigType) -> Path:
-    """The configured image file, or the cache slot of the pinned digest for a downloaded one."""
-    if CONF_URL in config:
-        cache_dir = external_files.compute_local_file_dir("esp32_hosted") / "firmware"
-        return cache_dir / f"{config[CONF_SHA256].lower()}.bin"
-    return CORE.relative_config_path(config[CONF_PATH])
-
-
-def _validate_firmware(config: ConfigType) -> None:
-    """Fetch and verify the image here; codegen only reads the file this leaves behind."""
+def _validate_firmware(config: dict[str, Any]) -> None:
     if config[CONF_TYPE] != TYPE_EMBEDDED:
         return
+
+    path = CORE.relative_config_path(config[CONF_PATH])
+    with path.open("rb") as f:
+        firmware_data = f.read()
+    calculated = hashlib.sha256(firmware_data).hexdigest()
     expected = config[CONF_SHA256].lower()
-    target = _firmware_path(config)
-    if (url := config.get(CONF_URL)) is None:
-        _check_firmware_hash(target.read_bytes(), expected, target)
-        return
-    # A pinned digest needs no remote freshness check.
-    if target.is_file():
-        actual = hashlib.sha256(target.read_bytes()).hexdigest()
-        if actual == expected:
-            return
-        # Named after its digest, so a mismatch means the file was damaged or edited
-        _LOGGER.warning(
-            "Cached firmware %s hashes to %s, downloading it again", target, actual
+    if calculated != expected:
+        raise cv.Invalid(
+            f"SHA256 mismatch for {config[CONF_PATH]}: expected {expected}, got {calculated}"
         )
-    target.parent.mkdir(parents=True, exist_ok=True)
-    # Keep unverified bytes out of the shared cache, even across concurrent builds.
-    with TemporaryDirectory(dir=target.parent) as temporary:
-        candidate = Path(temporary) / "firmware.bin"
-        data = external_files.download_content(url, candidate, allow_stale=False)
-        _check_firmware_hash(data, expected, url)
-        try:
-            candidate.replace(target)
-        except OSError as err:
-            raise cv.Invalid(f"Could not cache the firmware from {url}: {err}") from err
 
 
 FINAL_VALIDATE_SCHEMA = _validate_firmware
@@ -136,7 +92,9 @@ async def to_code(config: dict[str, Any]) -> None:
     var = await update.new_update(config)
 
     if config[CONF_TYPE] == TYPE_EMBEDDED:
-        firmware_data = _firmware_path(config).read_bytes()
+        path = config[CONF_PATH]
+        with CORE.relative_config_path(path).open("rb") as f:
+            firmware_data = f.read()
         rhs = [HexInt(x) for x in firmware_data]
         arr_id = ID(f"{config[CONF_ID]}_data", is_declaration=True, type=cg.uint8)
         prog_arr = cg.progmem_array(arr_id, rhs)

esphome/components/esp32_hosted/update/esp32_hosted_update.cpp

@@ -24,8 +24,8 @@ namespace esphome::esp32_hosted {
 
 ESPHOME_LOG_TAG(TAG, "esp32_hosted.update");
 
-// The host rejects writes above its per-RPC payload limit before they reach the coprocessor
-constexpr size_t CHUNK_SIZE = EH_HOST_CP_OTA_CHUNK_MAX;
+// Older coprocessor firmware versions have a 1500-byte limit per RPC call
+constexpr size_t CHUNK_SIZE = 1500;
 // OTA begin blocks while the coprocessor erases its partition, end while it validates the image
 constexpr uint32_t OTA_WDT_TIMEOUT_MS = 60000;
 

esphome/components/esphome/ota/ota_esphome_udp.cpp

@@ -222,13 +222,10 @@ void ESPHomeOTAComponent::udp_open_(UdpLink &link) {
   if (!random_bytes(token, sizeof(token)))
     return;
 #ifdef ESPHOME_OTA_UDP_LWIP
-#if USE_NETWORK_IPV4
   uint32_t ipv4;
   if (socket::sockaddr_to_ipv4(reinterpret_cast<const struct sockaddr *>(&peer), &ipv4)) {
     ip_addr_set_ip4_u32(&link.peer_ip, ipv4);
-  } else
-#endif
-  {
+  } else {
 #if USE_NETWORK_IPV6 && LWIP_IPV6
     inet6_addr_to_ip6addr(ip_2_ip6(&link.peer_ip), &reinterpret_cast<const sockaddr_in6 *>(&peer)->sin6_addr);
     IP_SET_TYPE_VAL(link.peer_ip, IPADDR_TYPE_V6);

esphome/components/ethernet/__init__.py

@@ -46,7 +46,6 @@ from esphome.const import (
     CONF_TYPE,
     CONF_USE_ADDRESS,
     CONF_VALUE,
-    CONF_WIFI,
     KEY_CORE,
     KEY_FRAMEWORK_VERSION,
     Platform,
@@ -563,25 +562,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-def _final_validate_wifi(config: ConfigType) -> None:
-    """A wifi station competes with ethernet for the primary interface, so both must be in network: priority:."""
-    full_config = fv.full_config.get()
-    if (wifi_config := full_config.get(CONF_WIFI)) is None:
-        return
-
-    from esphome.components.wifi import wifi_stays_ap_only
-
-    if wifi_stays_ap_only(wifi_config, full_config):
-        return  # an access point does not claim the primary interface
-
-    priority_ifaces = get_priority_interfaces_from_full_config(full_config)
-    if missing := [i for i in (DOMAIN, CONF_WIFI) if i not in priority_ifaces]:
-        raise cv.Invalid(
-            "When ethernet and a wifi station are used together, 'network: priority:' "
-            f"must list both interfaces; missing: {', '.join(missing)}"
-        )
-
-
 def _final_validate_spi(config: ConfigType) -> None:
     if not CORE.is_esp32:
         return  # SPI interface validation is ESP32-only
@@ -866,7 +846,22 @@ def _final_validate_rmii_pins(config: ConfigType) -> None:
 
 def _final_validate(config: ConfigType) -> None:
     """Final validation for Ethernet component."""
-    _final_validate_wifi(config)
+    # Allow ethernet + wifi coexistence only when both are declared in network: priority:.
+    if "wifi" in fv.full_config.get():
+        priority_ifaces = get_priority_interfaces_from_full_config(fv.full_config.get())
+        missing = [i for i in ("ethernet", "wifi") if i not in priority_ifaces]
+        if missing and priority_ifaces:
+            # A priority list exists but is incomplete: point at what to add.
+            raise cv.Invalid(
+                "When ethernet and wifi are used together, 'network: priority:' must "
+                f"list both interfaces; missing: {', '.join(missing)}"
+            )
+        if missing:
+            raise cv.Invalid(
+                "Component ethernet cannot be used together with component wifi "
+                "unless both are listed under 'network: priority:'"
+            )
+
     _final_validate_spi(config)
     _final_validate_rmii_pins(config)
 

esphome/components/factory_reset/button/__init__.py

@@ -1,20 +1,29 @@
+import esphome.codegen as cg
 from esphome.components import button
+import esphome.config_validation as cv
 from esphome.const import (
+    CONF_ID,
     DEVICE_CLASS_RESTART,
     ENTITY_CATEGORY_CONFIG,
     ICON_RESTART_ALERT,
 )
 from esphome.types import ConfigType
 
+from .. import factory_reset_ns
+
+FactoryResetButton = factory_reset_ns.class_(
+    "FactoryResetButton", button.Button, cg.Component
+)
+
 CONFIG_SCHEMA = button.button_schema(
-    button.ApplyButton,
+    FactoryResetButton,
     device_class=DEVICE_CLASS_RESTART,
     entity_category=ENTITY_CATEGORY_CONFIG,
     icon=ICON_RESTART_ALERT,
-)
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config: ConfigType) -> None:
-    await button.sub_buttons(config).create(
-        config, None, apply="factory_reset::factory_reset_device()"
-    )
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await button.register_button(var, config)

esphome/components/factory_reset/button/factory_reset_button.cpp

@@ -13,20 +13,24 @@ namespace esphome::factory_reset {
 
 ESPHOME_LOG_TAG(TAG, "factory_reset.button");
 
-static void reset_and_reboot() {
-  global_preferences->reset();
-  App.safe_reboot();
-}
-
-void factory_reset_device() {
+void FactoryResetButton::dump_config() { LOG_BUTTON("", "Factory Reset Button", this); }
+void FactoryResetButton::press_action() {
   ESP_LOGI(TAG, "Resetting");
   // Let MQTT settle a bit
   delay(100);  // NOLINT
 #ifdef USE_OPENTHREAD
-  openthread::global_openthread_component->on_factory_reset(reset_and_reboot);
+  openthread::global_openthread_component->on_factory_reset(FactoryResetButton::factory_reset_callback);
 #else
-  reset_and_reboot();
+  global_preferences->reset();
+  App.safe_reboot();
 #endif
 }
 
+#ifdef USE_OPENTHREAD
+void FactoryResetButton::factory_reset_callback() {
+  global_preferences->reset();
+  App.safe_reboot();
+}
+#endif
+
 }  // namespace esphome::factory_reset

esphome/components/factory_reset/button/factory_reset_button.h

@@ -1,8 +1,21 @@
 #pragma once
 
+#include "esphome/core/defines.h"
+
+#include "esphome/components/button/button.h"
+#include "esphome/core/component.h"
+
 namespace esphome::factory_reset {
 
-/// Run by the factory reset button.
-void factory_reset_device();
+class FactoryResetButton final : public button::Button, public Component {
+ public:
+  void dump_config() override;
+#ifdef USE_OPENTHREAD
+  static void factory_reset_callback();
+#endif
+
+ protected:
+  void press_action() override;
+};
 
 }  // namespace esphome::factory_reset

esphome/components/hdmi_cec/hdmi_cec.h

@@ -22,10 +22,10 @@ namespace esphome::hdmi_cec {
 // Release/acquire store and load. The read-modify-write forms of std::atomic are not available on
 // every target (the ESP8266 has none), so a writer computes the new value itself; that is safe here
 // because every atomic in this component has exactly one writer.
-template<typename T> inline ESPHOME_ALWAYS_INLINE void atomic_set(std::atomic<T> &atom, T value) {
+template<typename T> ESPHOME_ALWAYS_INLINE void atomic_set(std::atomic<T> &atom, T value) {
   atom.store(value, std::memory_order_release);
 }
-template<typename T> inline ESPHOME_ALWAYS_INLINE T atomic_get(const std::atomic<T> &atom) {
+template<typename T> ESPHOME_ALWAYS_INLINE T atomic_get(const std::atomic<T> &atom) {
   return atom.load(std::memory_order_acquire);
 }
 

esphome/components/homeassistant/light/homeassistant_light.cpp

@@ -203,8 +203,12 @@ void HomeassistantLight::on_report_(bool changed) {
       this->cancel_timeout(ECHO_TIMEOUT_ID);
     }
     // Noted as the report arrives, not when the deferred apply runs: a call read from the same loop
-    // pass before this report is older than it, one read after it is newer
-    this->state_->clear_called();
+    // pass before this report is older than it, one read after it is newer and must not pass for
+    // the transition the report is held for
+    this->report_in_transition_ = this->state_->is_transitioning();
+    if (this->report_in_transition_) {
+      this->held_hash_ = state_hash(this->state_->remote_values);
+    }
   }
   this->schedule_apply_();
 }
@@ -253,9 +257,8 @@ void HomeassistantLight::apply_imported_() {
   }
   if (!this->state_->set_external_state(values)) {
     // A report that changed something during a transition or flash is applied once it ends, in
-    // place of the values it ends at, unless a call came after the report; a trait or a repeated
-    // report has nothing newer to say
-    if (this->state_->is_transitioning() && !this->state_->called_since_clear()) {
+    // place of the values it ends at; a trait or a repeated report has nothing newer to say
+    if (this->report_in_transition_) {
       this->report_held_ = true;
       return;
     }
@@ -265,9 +268,20 @@ void HomeassistantLight::apply_imported_() {
     ESP_LOGD(TAG, "'%s': Report dropped, a local change is on its way", this->entity_id_);
     return;
   }
+  this->report_in_transition_ = false;
   ESP_LOGV(TAG, "'%s': Took over the state reported by Home Assistant", this->entity_id_);
 }
 
+uint32_t HomeassistantLight::state_hash(const LightColorValues &values) {
+  uint32_t hash = fnv1a_hash_extend(FNV1_OFFSET_BASIS, static_cast<uint8_t>(values.get_color_mode()));
+  for (const float channel :
+       {values.get_state(), values.get_brightness(), values.get_color_brightness(), values.get_red(),
+        values.get_green(), values.get_blue(), values.get_white(), values.get_cold_white(), values.get_warm_white()}) {
+    hash = fnv1a_hash_extend(hash, to_uint8_scale(channel));
+  }
+  return fnv1a_hash_extend(hash, static_cast<uint16_t>(values.get_color_temperature()));  // mireds exceed a byte
+}
+
 void HomeassistantLight::update_state(LightState *state) {
   // The light core's setup performs one call for the initial state; a second one before the first
   // write (an on_boot automation) is a local change merged into that write, so it must be sent
@@ -277,10 +291,11 @@ void HomeassistantLight::update_state(LightState *state) {
     }
     this->initial_seen_ = true;
   }
-  // Every call that changes the light reaches here within a loop pass (a new transformer's first
-  // apply() or set_immediately_()), and a call since the held report was read is newer than it
-  if (this->report_held_ && state->called_since_clear()) {
+  // A call without a transition replaces whatever ran, so a report held for it, or still waiting to
+  // be applied, is older than the call
+  if (!state->is_transitioning()) {
     this->report_held_ = false;
+    this->report_in_transition_ = false;
   }
 }
 
@@ -323,7 +338,11 @@ void HomeassistantLight::write_state(LightState *state) {
     return;
   }
   if (state->is_transitioning()) {
-    // A transition or flash runs here alone; Home Assistant gets the state it ends at
+    // A transition or flash runs here alone; Home Assistant gets the state it ends at. A call that
+    // replaces the transition a report was held for retargets it and is newer than the report
+    if (this->report_held_ && state_hash(state->remote_values) != this->held_hash_) {
+      this->report_held_ = false;
+    }
     this->transitioned_ = true;
     return;
   }
@@ -331,6 +350,7 @@ void HomeassistantLight::write_state(LightState *state) {
   const bool transitioned = this->transitioned_;
   this->report_held_ = false;
   this->transitioned_ = false;
+  this->report_in_transition_ = false;  // this change is newer than any report so far, held or dropped
   // Home Assistant changed meanwhile; its report is newer than what the transition ends at or
   // what the flash goes back to
   if (held) {

esphome/components/homeassistant/light/homeassistant_light.h

@@ -48,6 +48,8 @@ class HomeassistantLight final : public light::LightOutput, public Component {
     this->on_report_(field != value);
     field = value;
   }
+  /// A state at the resolution Home Assistant gets, to see a transition retargeted by a newer call
+  static uint32_t state_hash(const light::LightColorValues &values);
   /// Schedules apply_imported_() once for the attributes of one update
   void schedule_apply_();
   void apply_imported_();
@@ -61,12 +63,14 @@ class HomeassistantLight final : public light::LightOutput, public Component {
   light::LightTraits traits_{};
   Attributes imported_{};
   bool apply_scheduled_ : 1 {false};
-  bool initial_write_ : 1 {true};  // the light core's own first write is not a local change
-  bool initial_seen_ : 1 {false};  // the light core's setup call has set the initial state
-  bool echo_pending_ : 1 {false};  // a sent change waits for Home Assistant to report it back
-  bool report_held_ : 1 {false};   // a report arrived during a transition or flash; applied when it ends
-  bool transitioned_ : 1 {false};  // a transition or flash ran since the last write sent
+  bool initial_write_ : 1 {true};          // the light core's own first write is not a local change
+  bool initial_seen_ : 1 {false};          // the light core's setup call has set the initial state
+  bool echo_pending_ : 1 {false};          // a sent change waits for Home Assistant to report it back
+  bool report_held_ : 1 {false};           // a report arrived during a transition or flash; applied when it ends
+  bool transitioned_ : 1 {false};          // a transition or flash ran since the last write sent
+  bool report_in_transition_ : 1 {false};  // the last changed report, not yet applied, arrived during a transition
   uint8_t report_timeout_s_{10};
+  uint32_t held_hash_{0};  // state_hash() of what the transition a report was held for ends at
 };
 
 }  // namespace esphome::homeassistant

esphome/components/http_request/update/__init__.py

@@ -35,7 +35,7 @@ async def to_code(config: ConfigType) -> None:
     await cg.add_variable(var.set_ota_parent, config[CONF_OTA_ID])
     await cg.add_variable(var.set_request_parent, config[CONF_HTTP_REQUEST_ID])
 
-    cg.add(var.set_source_url_static(config[CONF_SOURCE]))
+    cg.add(var.set_source_url(config[CONF_SOURCE]))
 
     ota.request_ota_state_listeners()
 

esphome/components/http_request/update/http_request_update.cpp

@@ -24,6 +24,12 @@ namespace esphome::http_request {
 
 ESPHOME_LOG_TAG(TAG, "http_request.update");
 
+// Wraps UpdateInfo + error for the task→main-loop handoff.
+struct TaskResult {
+  update::UpdateInfo info;
+  const LogString *error_str{nullptr};
+};
+
 static const size_t MAX_READ_SIZE = 256;
 static constexpr uint32_t INITIAL_CHECK_INTERVAL_ID = 0;
 static constexpr uint32_t INITIAL_CHECK_INTERVAL_MS = 10000;
@@ -62,37 +68,6 @@ void HttpRequestUpdate::on_ota_state(ota::OTAState state, float progress, uint8_
   }
 }
 
-void HttpRequestUpdate::set_source_url(const char *source_url, size_t len) {
-  // Copy before releasing, so a caller passing the current URL back in stays valid.
-  char *copy = new char[len + 1];
-  memcpy(copy, source_url, len);
-  copy[len] = '\0';
-  this->release_source_url_();
-  this->source_url_ = copy;
-  this->source_url_owned_ = true;
-}
-
-void HttpRequestUpdate::release_source_url_() {
-  if (this->source_url_owned_)
-    delete[] this->source_url_;
-  this->source_url_owned_ = false;
-}
-
-void HttpRequestUpdate::begin_check_(TaskResult *result) {
-  result->update = this;
-  result->source_url = this->source_url_;
-  result->owns_source_url = this->source_url_owned_;
-  this->source_url_owned_ = false;
-}
-
-void HttpRequestUpdate::end_check_(TaskResult *result) {
-  if (this->source_url_ == result->source_url) {
-    this->source_url_owned_ = result->owns_source_url;
-  } else if (result->owns_source_url) {
-    delete[] result->source_url;  // replaced while the check ran
-  }
-}
-
 void HttpRequestUpdate::update() {
   if (!network::is_connected()) {
     ESP_LOGD(TAG, "Network not connected, skipping update check");
@@ -100,37 +75,28 @@ void HttpRequestUpdate::update() {
   }
   this->cancel_interval(INITIAL_CHECK_INTERVAL_ID);
 #ifdef USE_ESP32
-  if (this->task_result_ != nullptr) {
+  if (this->update_task_handle_ != nullptr) {
     ESP_LOGW(TAG, "Update check already in progress");
     return;
   }
-#endif
-  // Allocated once per check; every path in the task returns via its single defer, which frees it.
-  auto *result = new TaskResult();
-  this->begin_check_(result);
-#ifdef USE_ESP32
-  this->task_result_ = result;
-  if (xTaskCreate(HttpRequestUpdate::update_task, "update_task", 8192, result, 1, nullptr) != pdPASS) {
-    this->task_result_ = nullptr;
-    this->end_check_(result);
-    delete result;
-  }
+  xTaskCreate(HttpRequestUpdate::update_task, "update_task", 8192, (void *) this, 1, &this->update_task_handle_);
 #else
-  this->update_task(result);
-  this->end_check_(result);
+  this->update_task(this);
 #endif
 }
 
 void HttpRequestUpdate::update_task(void *params) {
-  auto *result = static_cast<TaskResult *>(params);
-  HttpRequestUpdate *this_update = result->update;
-  auto *info = &result->info;
-  const char *source_url = result->source_url;
+  HttpRequestUpdate *this_update = (HttpRequestUpdate *) params;
 
-  auto container = this_update->request_parent_->get(source_url);
+  // Allocate once — every path below returns via the single defer at the end.
+  // On failure, error_str is set; on success it is nullptr.
+  auto *result = new TaskResult();
+  auto *info = &result->info;
+
+  auto container = this_update->request_parent_->get(this_update->source_url_);
 
   if (container == nullptr || container->status_code != HTTP_STATUS_OK) {
-    ESP_LOGE(TAG, "Failed to fetch manifest from %s", source_url);
+    ESP_LOGE(TAG, "Failed to fetch manifest from %s", this_update->source_url_);
     if (container != nullptr)
       container->end();
     result->error_str = LOG_STR("Failed to fetch manifest");
@@ -210,14 +176,14 @@ void HttpRequestUpdate::update_task(void *params) {
     allocator.deallocate(data, content_length);
 
     if (!valid) {
-      ESP_LOGE(TAG, "Failed to parse JSON from %s", source_url);
+      ESP_LOGE(TAG, "Failed to parse JSON from %s", this_update->source_url_);
       result->error_str = LOG_STR("Failed to parse manifest JSON");
       goto defer;  // NOLINT(cppcoreguidelines-avoid-goto)
     }
 
     // Merge source_url_ and firmware_url
     if (!info->firmware_url.empty() && info->firmware_url.find("http") == std::string::npos) {
-      const char *source = source_url;
+      const char *source = this_update->source_url_;
       const size_t source_len = strlen(source);
       size_t prefix_len;
       if (info->firmware_url[0] == '/') {
@@ -249,8 +215,7 @@ defer:
   // Lambda captures only 2 pointers (8 bytes) — fits in std::function SBO on supported toolchains.
   this_update->defer([this_update, result]() {
 #ifdef USE_ESP32
-    this_update->task_result_ = nullptr;
-    this_update->end_check_(result);
+    this_update->update_task_handle_ = nullptr;
 #endif
     if (result->error_str != nullptr) {
       this_update->status_set_error(result->error_str);

esphome/components/http_request/update/http_request_update.h

@@ -13,21 +13,6 @@
 
 namespace esphome::http_request {
 
-namespace testing {
-class HttpRequestUpdateTest;
-}  // namespace testing
-
-class HttpRequestUpdate;
-
-// One manifest check: handed from update() to the task and back to the main loop.
-struct TaskResult {
-  HttpRequestUpdate *update{nullptr};
-  const char *source_url{nullptr};  // the URL this check reads, fixed before it starts
-  update::UpdateInfo info;
-  const LogString *error_str{nullptr};  // set on failure, nullptr on success
-  bool owns_source_url{false};          // the check holds the buffer until it ends, see begin_check_()
-};
-
 class HttpRequestUpdate final : public update::UpdateEntity, public PollingComponent, public ota::OTAStateListener {
  public:
   void setup() override;
@@ -36,18 +21,7 @@ class HttpRequestUpdate final : public update::UpdateEntity, public PollingCompo
   void perform(bool force) override;
   void check() override { this->update(); }
 
-  ~HttpRequestUpdate() override { this->release_source_url_(); }
-
-  /// Codegen only: the config literal lives in flash for the life of the program, so it is kept by pointer.
-  void set_source_url_static(const char *source_url) {
-    this->release_source_url_();
-    this->source_url_ = source_url;
-  }
-  /// Set the manifest URL at run time; the string is copied, so any storage may be passed.
-  void set_source_url(const char *source_url) { this->set_source_url(source_url, strlen(source_url)); }
-  void set_source_url(const std::string &source_url) { this->set_source_url(source_url.data(), source_url.size()); }
-  void set_source_url(const char *source_url, size_t len);
-  const char *get_source_url() const { return this->source_url_; }
+  void set_source_url(const char *source_url) { this->source_url_ = source_url; }
 
   void set_request_parent(HttpRequestComponent *request_parent) { this->request_parent_ = request_parent; }
   void set_ota_parent(OtaHttpRequestComponent *ota_parent) { this->ota_parent_ = ota_parent; }
@@ -62,21 +36,12 @@ class HttpRequestUpdate final : public update::UpdateEntity, public PollingCompo
 
   static void update_task(void *params);
 #ifdef USE_ESP32
-  TaskResult *task_result_{nullptr};  // set while a check runs on the update task
+  TaskHandle_t update_task_handle_{nullptr};
 #endif
   uint8_t initial_check_remaining_{0};
 
  private:
-  friend class testing::HttpRequestUpdateTest;
-  void release_source_url_();
-  // A check reads the URL it started with until it ends, on the update task or inline through an
-  // automation it triggers. Ownership of that buffer moves to the check, so a set_source_url in the
-  // meantime cannot free it; end_check_() hands it back or frees it on the main loop.
-  void begin_check_(TaskResult *result);
-  void end_check_(TaskResult *result);
-
-  bool source_url_owned_{false};  // source_url_ was copied by a run-time setter; sits in the padding above
-  const char *source_url_{nullptr};
+  const char *source_url_{nullptr};  // literal from codegen
 };
 
 }  // namespace esphome::http_request

esphome/components/ld2410/ld2410.cpp

@@ -407,10 +407,12 @@ void LD2410Component::handle_periodic_data_() {
 }
 
 #ifdef USE_NUMBER
-void set_number_value(number::Number *n, float value) {
+std::function<void()> set_number_value(number::Number *n, float value) {
   if (n != nullptr && (!n->has_state() || n->state != value)) {
-    n->publish_state(value);
+    n->state = value;
+    return [n, value]() { n->publish_state(value); };
   }
+  return []() {};
 }
 #endif
 
@@ -558,24 +560,29 @@ bool LD2410Component::handle_ack_data_() {
         Moving distance range: 13th byte
         Still distance range: 14th byte
       */
-      set_number_value(this->max_move_distance_gate_number_, this->buffer_data_[12]);
-      set_number_value(this->max_still_distance_gate_number_, this->buffer_data_[13]);
+      std::vector<std::function<void()>> updates;
+      updates.push_back(set_number_value(this->max_move_distance_gate_number_, this->buffer_data_[12]));
+      updates.push_back(set_number_value(this->max_still_distance_gate_number_, this->buffer_data_[13]));
       /*
         Moving Sensitivities: 15~23th bytes
       */
-      for (size_t i = 0; i < TOTAL_GATES; i++) {
-        set_number_value(this->gate_move_threshold_numbers_[i], this->buffer_data_[14 + i]);
+      for (std::vector<number::Number *>::size_type i = 0; i != this->gate_move_threshold_numbers_.size(); i++) {
+        updates.push_back(set_number_value(this->gate_move_threshold_numbers_[i], this->buffer_data_[14 + i]));
       }
       /*
         Still Sensitivities: 24~32th bytes
       */
-      for (size_t i = 0; i < TOTAL_GATES; i++) {
-        set_number_value(this->gate_still_threshold_numbers_[i], this->buffer_data_[23 + i]);
+      for (std::vector<number::Number *>::size_type i = 0; i != this->gate_still_threshold_numbers_.size(); i++) {
+        updates.push_back(set_number_value(this->gate_still_threshold_numbers_[i], this->buffer_data_[23 + i]));
       }
       /*
         None Duration: 33~34th bytes
       */
-      set_number_value(this->timeout_number_, encode_uint16(this->buffer_data_[33], this->buffer_data_[32]));
+      updates.push_back(
+          set_number_value(this->timeout_number_, encode_uint16(this->buffer_data_[33], this->buffer_data_[32])));
+      for (auto &update : updates) {
+        update();
+      }
 #endif
       break;
     }

esphome/components/ld2412/ld2412.cpp

@@ -186,23 +186,19 @@ static constexpr uint8_t CMD_DURATION_VALUE = 0x02;
 // Bitmasks for target states
 static constexpr uint8_t MOVE_BITMASK = 0x01;
 static constexpr uint8_t STILL_BITMASK = 0x02;
-// Header & Footer size
-static constexpr uint8_t HEADER_FOOTER_SIZE = 4;
-// Command Header & Footer
-static constexpr uint8_t CMD_FRAME_HEADER[HEADER_FOOTER_SIZE] = {0xFD, 0xFC, 0xFB, 0xFA};
-static constexpr uint8_t CMD_FRAME_FOOTER[HEADER_FOOTER_SIZE] = {0x04, 0x03, 0x02, 0x01};
+using ld24xx::CMD_FRAME_FOOTER;
+using ld24xx::CMD_FRAME_HEADER;
+using ld24xx::HEADER_FOOTER_SIZE;
+using ld24xx::validate_header_footer;
+// Smallest frames whose values can all be read: the last value, data footer and check, then the frame footer
+static constexpr uint8_t PERIODIC_FRAME_MIN = STILL_ENERGY + 3 + HEADER_FOOTER_SIZE;
+static constexpr uint8_t ENGINEERING_FRAME_MIN = LIGHT_SENSOR + 3 + HEADER_FOOTER_SIZE;
 // Data Header & Footer
 static constexpr uint8_t DATA_FRAME_HEADER[HEADER_FOOTER_SIZE] = {0xF4, 0xF3, 0xF2, 0xF1};
 static constexpr uint8_t DATA_FRAME_FOOTER[HEADER_FOOTER_SIZE] = {0xF8, 0xF7, 0xF6, 0xF5};
 // MAC address the module uses when Bluetooth is disabled
 static constexpr uint8_t NO_MAC[] = {0x08, 0x05, 0x04, 0x03, 0x02, 0x01};
 static constexpr uint8_t GATE_SENS_ACK_SIZE = ACK_PAYLOAD + TOTAL_GATES + HEADER_FOOTER_SIZE;
-// The length field counts the command word, the status word and the gates
-static constexpr uint16_t GATE_SENS_ACK_LENGTH = GATE_SENS_ACK_SIZE - COMMAND - HEADER_FOOTER_SIZE;
-
-static inline bool validate_header_footer(const uint8_t *header_footer, const uint8_t *buffer) {
-  return std::memcmp(header_footer, buffer, HEADER_FOOTER_SIZE) == 0;
-}
 
 void LD2412Component::dump_config() {
   char mac_s[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
@@ -371,6 +367,9 @@ void LD2412Component::handle_periodic_data_() {
     0x02: Normal mode
   */
   bool engineering_mode = this->buffer_data_[DATA_TYPES] == 0x01;
+  if (this->buffer_pos_ < PERIODIC_FRAME_MIN) {
+    return;  // too short to hold the values
+  }
 #ifdef USE_SWITCH
   if (this->engineering_mode_switch_ != nullptr) {
     this->engineering_mode_switch_->publish_state(engineering_mode);
@@ -421,8 +420,7 @@ void LD2412Component::handle_periodic_data_() {
     this->detection_distance_sensor_.publish_state_if_not_dup(new_detect_distance);
   }
   if (engineering_mode) {
-    // Engineering mode needs at least LIGHT_SENSOR + 1 bytes
-    if (this->buffer_pos_ < LIGHT_SENSOR + 1) {
+    if (this->buffer_pos_ < ENGINEERING_FRAME_MIN) {
       ESP_LOGW(TAG, "Engineering mode packet too short: %u", this->buffer_pos_);
     } else {
       /*
@@ -477,24 +475,15 @@ static constexpr uint32_t GATE_QUERY_TIMEOUT_ID = 0;
 static constexpr uint32_t GATE_QUERY_TIMEOUT_MS = 2000;
 #endif
 
-bool LD2412Component::handle_ack_data_() {
+void LD2412Component::handle_ack_data_() {
   ESP_LOGV(TAG, "Handling ACK DATA for COMMAND %02X", this->buffer_data_[COMMAND]);
-  if (this->buffer_pos_ < 10) {
-    ESP_LOGW(TAG, "Invalid length");
-    return true;
-  }
-  if (!ld2412::validate_header_footer(CMD_FRAME_HEADER, this->buffer_data_)) {
-    char hex_buf[format_hex_pretty_size(HEADER_FOOTER_SIZE)];
-    ESP_LOGW(TAG, "Invalid header: %s", format_hex_pretty_to(hex_buf, this->buffer_data_, HEADER_FOOTER_SIZE));
-    return true;
-  }
   if (this->buffer_data_[COMMAND_STATUS] != 0x01) {
     ESP_LOGW(TAG, "Invalid status");
-    return true;
+    return;
   }
   if (this->buffer_data_[8] || this->buffer_data_[9]) {
     ESP_LOGW(TAG, "Invalid command: %02X, %02X", this->buffer_data_[8], this->buffer_data_[9]);
-    return true;
+    return;
   }
 
   switch (this->buffer_data_[COMMAND]) {
@@ -517,8 +506,8 @@ bool LD2412Component::handle_ack_data_() {
       break;
 
     case CMD_QUERY_VERSION: {
-      if (this->buffer_pos_ < 12 + sizeof(this->version_)) {
-        return false;
+      if (this->buffer_pos_ < 12 + sizeof(this->version_) + HEADER_FOOTER_SIZE) {
+        break;  // too short to hold a version
       }
       std::memcpy(this->version_, &this->buffer_data_[12], sizeof(this->version_));
       char version_s[20];
@@ -532,6 +521,9 @@ bool LD2412Component::handle_ack_data_() {
       break;
     }
     case CMD_QUERY_DISTANCE_RESOLUTION: {
+      if (this->buffer_pos_ < 11 + HEADER_FOOTER_SIZE) {
+        break;  // too short to hold the resolution
+      }
       const auto *distance_resolution = find_str(DISTANCE_RESOLUTIONS_BY_UINT, this->buffer_data_[10]);
       ESP_LOGV(TAG, "Distance resolution: %s", distance_resolution);
 #ifdef USE_SELECT
@@ -543,6 +535,9 @@ bool LD2412Component::handle_ack_data_() {
     }
 
     case CMD_QUERY_LIGHT_CONTROL: {
+      if (this->buffer_pos_ < 12 + HEADER_FOOTER_SIZE) {
+        break;  // too short to hold the light settings
+      }
       this->light_function_ = this->buffer_data_[10];
       this->light_threshold_ = this->buffer_data_[11];
       const auto *light_function_str = find_str(LIGHT_FUNCTIONS_BY_UINT, this->light_function_);
@@ -562,7 +557,7 @@ bool LD2412Component::handle_ack_data_() {
 
     case CMD_QUERY_MAC_ADDRESS: {
       if (this->buffer_pos_ < 20) {
-        return false;
+        break;  // too short to hold a MAC address
       }
 
       this->bluetooth_on_ = std::memcmp(&this->buffer_data_[10], NO_MAC, sizeof(NO_MAC)) != 0;
@@ -591,6 +586,9 @@ bool LD2412Component::handle_ack_data_() {
       break;
 
     case CMD_QUERY_DYNAMIC_BACKGROUND_CORRECTION: {
+      if (this->buffer_pos_ < 11 + HEADER_FOOTER_SIZE) {
+        break;  // too short to hold the state
+      }
       ESP_LOGV(TAG, "Handled query dynamic background correction");
       bool dynamic_background_correction_active = (this->buffer_data_[10] != 0x00);
 #ifdef USE_BINARY_SENSOR
@@ -613,14 +611,10 @@ bool LD2412Component::handle_ack_data_() {
     case CMD_QUERY_MOTION_GATE_SENS:
     case CMD_QUERY_STATIC_GATE_SENS: {
 #ifdef USE_NUMBER
-      const uint16_t declared = encode_uint16(this->buffer_data_[FRAME_LENGTH + 1], this->buffer_data_[FRAME_LENGTH]);
-      if (declared != GATE_SENS_ACK_LENGTH || this->buffer_pos_ > GATE_SENS_ACK_SIZE) {
-        // A truncated answer merged with the next frame, or a length this driver does not know
+      if (this->buffer_pos_ != GATE_SENS_ACK_SIZE) {
+        // A length this driver does not know
         ESP_LOGW(TAG, "Dropping gate threshold answer of %u bytes", this->buffer_pos_);
-        return true;
-      }
-      if (this->buffer_pos_ < GATE_SENS_ACK_SIZE) {
-        return false;  // the footer pattern appeared inside the payload, keep reading
+        return;
       }
       const bool motion = this->buffer_data_[COMMAND] == CMD_QUERY_MOTION_GATE_SENS;
       GateThresholds &group = this->gate_thresholds_(motion);
@@ -646,8 +640,8 @@ bool LD2412Component::handle_ack_data_() {
     case CMD_QUERY_BASIC_CONF:  // Query parameters response
     {
 #ifdef USE_NUMBER
-      if (this->buffer_pos_ < 15) {
-        return false;
+      if (this->buffer_pos_ < 15 + HEADER_FOOTER_SIZE) {
+        break;  // too short to hold the configuration
       }
       /*
         Moving distance range: 9th byte
@@ -677,42 +671,36 @@ bool LD2412Component::handle_ack_data_() {
     default:
       break;
   }
-
-  return true;
 }
 
 void LD2412Component::readline_(int readch) {
   if (readch < 0) {
     return;  // No data available
   }
-  if (this->buffer_pos_ < HEADER_FOOTER_SIZE && readch != DATA_FRAME_HEADER[this->buffer_pos_] &&
-      readch != CMD_FRAME_HEADER[this->buffer_pos_]) {
-    this->buffer_pos_ = 0;
-    return;
-  }
-  if (this->buffer_pos_ < MAX_LINE_LENGTH - 1) {
-    this->buffer_data_[this->buffer_pos_++] = readch;
-    this->buffer_data_[this->buffer_pos_] = 0;
-  } else {
-    // We should never get here, but just in case...
-    ESP_LOGW(TAG, "Max command length exceeded; ignoring");
-    this->buffer_pos_ = 0;
-  }
-  if (this->buffer_pos_ < 4) {
-    return;  // Not enough data to process yet
-  }
-  if (ld2412::validate_header_footer(DATA_FRAME_FOOTER, &this->buffer_data_[this->buffer_pos_ - 4])) {
+  // Periodic and command frames both carry their count after the header
+  ld24xx::feed_frame_byte(
+      this->buffer_data_, this->buffer_pos_, readch, DATA_FRAME_HEADER, ld24xx::cmd_frame_length,
+      [this](uint8_t frame_len) { return this->handle_frame_(frame_len); }, []() { ESP_LOGW(TAG, "Invalid length"); });
+}
+
+// Dispatches the frame of frame_len bytes at the start of the buffer when its footer is in place
+bool LD2412Component::handle_frame_(uint8_t frame_len) {
+  this->buffer_pos_ = frame_len;  // the handlers take the frame length from here
+  const uint8_t *tail = &this->buffer_data_[frame_len - HEADER_FOOTER_SIZE];
+  if (this->buffer_data_[0] == DATA_FRAME_HEADER[0]) {
+    if (!ld2412::validate_header_footer(DATA_FRAME_FOOTER, tail)) {
+      return false;
+    }
     ESP_LOGV_HEX(TAG, this->buffer_data_, this->buffer_pos_, MAX_LINE_LENGTH, "Handling Periodic Data: %s");
     this->handle_periodic_data_();
-    this->buffer_pos_ = 0;  // Reset position index for next message
-  } else if (ld2412::validate_header_footer(CMD_FRAME_FOOTER, &this->buffer_data_[this->buffer_pos_ - 4])) {
-    ESP_LOGV_HEX(TAG, this->buffer_data_, this->buffer_pos_, MAX_LINE_LENGTH, "Handling Ack Data: %s");
-    if (this->handle_ack_data_()) {
-      this->buffer_pos_ = 0;  // Reset position index for next message
-    } else {
-      ESP_LOGV(TAG, "Ack Data incomplete");
-    }
+    return true;
   }
+  if (!ld2412::validate_header_footer(CMD_FRAME_FOOTER, tail)) {
+    return false;
+  }
+  ESP_LOGV_HEX(TAG, this->buffer_data_, this->buffer_pos_, MAX_LINE_LENGTH, "Handling Ack Data: %s");
+  this->handle_ack_data_();
+  return true;
 }
 
 void LD2412Component::set_config_mode_(bool enable) {

esphome/components/ld2412/ld2412.h

@@ -111,7 +111,8 @@ class LD2412Component final : public Component, public uart::UARTDevice {
   void send_command_(uint8_t command_str, const uint8_t *command_value, uint8_t command_value_len);
   void set_config_mode_(bool enable);
   void handle_periodic_data_();
-  bool handle_ack_data_();
+  void handle_ack_data_();
+  bool handle_frame_(uint8_t frame_len);
   void readline_(int readch);
   void query_parameters_();
   void get_version_();

esphome/components/ld24xx/ld24xx.h

@@ -3,6 +3,8 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
 
+#include <algorithm>
+#include <cstring>
 #include <memory>
 #include <span>
 
@@ -53,6 +55,74 @@ inline void format_version_str(const uint8_t *version, std::span<char, 20> buffe
            version[2]);
 }
 
+// Commands and their answers share this header, a little-endian byte count and this footer
+static constexpr uint8_t HEADER_FOOTER_SIZE = 4;
+static constexpr uint8_t CMD_FRAME_HEADER[HEADER_FOOTER_SIZE] = {0xFD, 0xFC, 0xFB, 0xFA};
+static constexpr uint8_t CMD_FRAME_FOOTER[HEADER_FOOTER_SIZE] = {0x04, 0x03, 0x02, 0x01};
+
+inline bool validate_header_footer(const uint8_t *header_footer, const uint8_t *buffer) {
+  return std::memcmp(header_footer, buffer, HEADER_FOOTER_SIZE) == 0;
+}
+
+// Whole command frame length, or 0 until the count arrives; 32 bit so 0xFFFF cannot wrap to 0
+inline uint32_t cmd_frame_length(const uint8_t *buffer, uint8_t count) {
+  if (count < HEADER_FOOTER_SIZE + 2) {
+    return 0;
+  }
+  return HEADER_FOOTER_SIZE + 2 + encode_value_le<uint16_t>(&buffer[HEADER_FOOTER_SIZE]) + HEADER_FOOTER_SIZE;
+}
+
+// Drops the first `from` bytes and anything after them that does not begin a header; returns the bytes kept
+inline uint8_t drop_to_next_header(uint8_t *buffer, uint8_t count, uint8_t from, const uint8_t *data_header) {
+  for (; from < count; from++) {
+    const size_t n = std::min<size_t>(HEADER_FOOTER_SIZE, count - from);
+    if (std::memcmp(&buffer[from], CMD_FRAME_HEADER, n) == 0 || std::memcmp(&buffer[from], data_header, n) == 0) {
+      std::memmove(buffer, &buffer[from], count - from);
+      return count - from;
+    }
+  }
+  return 0;
+}
+
+// Feeds one byte into a frame buffer. A frame opens with the command header or `data_header` and ends at
+// `frame_length(buffer, count)` bytes (0 while unknown); `handle_frame(len)` returns false for a footer out
+// of place. A dropped or oversized frame calls `on_drop()`. The handler may overwrite `pos`; the splitter
+// works from the count it saved.
+template<size_t N, typename LengthFn, typename HandleFn, typename DropFn>
+void feed_frame_byte(uint8_t (&buffer)[N], uint8_t &pos, uint8_t byte, const uint8_t *data_header,
+                     LengthFn frame_length, HandleFn handle_frame, DropFn on_drop) {
+  // The first byte picks the header; bytes that do not continue it are dropped
+  if (pos > 0 && pos < HEADER_FOOTER_SIZE) {
+    const uint8_t *header = buffer[0] == data_header[0] ? data_header : CMD_FRAME_HEADER;
+    if (byte != header[pos]) {
+      pos = 0;
+    }
+  }
+  if (pos == 0 && byte != data_header[0] && byte != CMD_FRAME_HEADER[0]) {
+    return;
+  }
+  buffer[pos++] = byte;
+  // Drain every whole frame left in the buffer
+  while (true) {
+    const uint32_t frame_len = frame_length(buffer, pos);
+    if (frame_len == 0 || (frame_len <= N && pos < frame_len)) {
+      return;
+    }
+    const uint8_t total = pos;
+    // Keep only what begins a header: after the frame, or after its first byte when it is dropped
+    uint8_t from = 1;
+    if (frame_len <= N && handle_frame(static_cast<uint8_t>(frame_len))) {
+      from = frame_len;
+    } else {
+      on_drop();
+    }
+    pos = drop_to_next_header(buffer, total, from, data_header);
+    if (pos == 0) {
+      return;
+    }
+  }
+}
+
 #ifdef USE_SENSOR
 template<typename T> using SensorWithDedup = sensor::SensorWithDedup<T>;
 #endif

esphome/components/ledc/ledc_output.cpp

@@ -169,9 +169,7 @@ void LEDCOutput::setup() {
 #if !defined(CLANG_TIDY)
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 1, 0)
     PERIPH_RCC_ATOMIC() { ledc_ll_reset_register(0); }
-#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 0, 0) || \
-    (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0) && !defined(__PERIPH_CTRL_ALLOW_LEGACY_API))
-    // Also on the targets whose periph_module_reset() is an empty stub in ESP-IDF 5.x (P4, C5, C61, H4)
+#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(6, 0, 0)
     PERIPH_RCC_ATOMIC() {
       ledc_ll_enable_reset_reg(true);
       ledc_ll_enable_reset_reg(false);

esphome/components/light/light_call.cpp

@@ -76,8 +76,6 @@ static void log_percent(const LogString *param, float value) {
 void LightCall::perform() {
   const char *name = LOG_STR_ARG(this->parent_->get_log_name());
   LightColorValues v = this->validate_();
-  // Any call counts as newer, even one that changes nothing
-  this->parent_->called_ = true;
   const bool publish = this->get_publish_();
 
   if (publish) {

esphome/components/light/light_call.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "light_color_values.h"
-#include "esphome/core/string_ref.h"
 
 namespace esphome {
 
@@ -134,8 +133,6 @@ class LightCall {
   LightCall &set_effect(const std::string &effect) { return this->set_effect(effect.data(), effect.size()); }
   /// Set the effect of the light by its name (const char * overload to resolve ambiguity).
   LightCall &set_effect(const char *effect) { return this->set_effect(effect, strlen(effect)); }
-  /// Set the effect of the light by its name (StringRef overload to resolve ambiguity, zero-copy).
-  LightCall &set_effect(StringRef effect) { return this->set_effect(effect.c_str(), effect.size()); }
   /// Set the effect of the light by its name and length (zero-copy from API).
   LightCall &set_effect(const char *effect, size_t len);
   /// Set the effect of the light by its internal index number (only for internal use).

esphome/components/light/light_state.h

@@ -90,11 +90,6 @@ class LightState : public EntityBase, public Component {
 
   /// True from the call that starts a transition or flash until it reaches its target.
   bool is_transitioning() const { return this->transformer_ != nullptr; }
-
-  /// True once a call is performed after clear_called(), so an output can tell whether a call came
-  /// after something it noted. Every call that changes the light reaches update_state() within a loop pass.
-  bool called_since_clear() const { return this->called_; }
-  void clear_called() { this->called_ = false; }
   LightCall make_call();
 
   /// Take over the state of a light mirrored from elsewhere: current and target values at once,
@@ -421,7 +416,6 @@ class LightState : public EntityBase, public Component {
   bool next_write_{true};  // a plain bool: it is the most written flag, and still shares the index's word
   // for effects, true if a transformer (transition) is active.
   bool is_transformer_active_ : 1 {false};
-  bool called_ : 1 {false};  // see called_since_clear()
   /// Whether this light persists its state to preferences at all.
   bool save_enabled_ : 1 {false};
 #ifdef USE_LIGHT_TRANSITION_PUBLISH_INTERVAL

esphome/components/media_player/__init__.py

@@ -3,7 +3,6 @@ from collections.abc import Callable
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components import audio
-from esphome.components.const import CONF_BITRATE
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ENTITY_CATEGORY,
@@ -56,30 +55,6 @@ FORMAT_MAPPING = {
 }
 
 
-# MP3 constant bitrates in kbps; the encoder rounds anything else to the nearest one
-MP3_BITRATES = (
-    8,
-    16,
-    24,
-    32,
-    40,
-    48,
-    56,
-    64,
-    80,
-    96,
-    112,
-    128,
-    144,  # MPEG-2 only, at 16, 22.05 and 24 kHz
-    160,
-    192,
-    224,
-    256,
-    320,
-)
-validate_mp3_bitrate = cv.one_of(*MP3_BITRATES, int=True)
-
-
 def build_supported_format_struct(
     format_config: ConfigType, purpose: MockObj
 ) -> cg.StructInitializer:
@@ -100,10 +75,6 @@ def build_supported_format_struct(
     if format_config[CONF_FORMAT] != "MP3":
         args.append(("sample_bytes", 2))
 
-    # Omitted means no preference, and the client keeps encoding as it always has.
-    if bitrate := format_config.get(CONF_BITRATE):
-        args.append(("bitrate", bitrate))
-
     return cg.StructInitializer(*args)
 
 
@@ -120,14 +91,6 @@ def validate_preferred_format(
         inherit_property_from(CONF_NUM_CHANNELS, audio_device_key)(config)
         inherit_property_from(CONF_SAMPLE_RATE, audio_device_key)(config)
 
-        # A constant bitrate is only meaningful for the one lossy format whose
-        # encoder Home Assistant can be told to fix
-        if CONF_BITRATE in config and config.get(CONF_FORMAT) != "MP3":
-            raise cv.Invalid(
-                f"{CONF_BITRATE} is only supported for the MP3 format",
-                path=[CONF_BITRATE],
-            )
-
         # Opus only supports 48 kHz
         if config.get(CONF_FORMAT) == "OPUS" and config.get(CONF_SAMPLE_RATE) != 48000:
             raise cv.Invalid("Opus only supports a sample rate of 48000 Hz")

esphome/components/media_player/media_player.h

@@ -77,7 +77,6 @@ struct MediaPlayerSupportedFormat {
   uint32_t num_channels;
   MediaPlayerFormatPurpose purpose;
   uint32_t sample_bytes;
-  uint32_t bitrate;
 };
 
 // Base features always reported for all media players

esphome/components/mipi_spi/mipi_spi.h

@@ -244,9 +244,9 @@ class MipiSpi : public display::Display,
     char hex_buf[format_hex_pretty_size(MIPI_SPI_MAX_CMD_LOG_BYTES)];
     // Don't spam the log after setup
     if (this->init_sequence_len_ == 0) {
-      esph_log_v(TAG, "Command %02X, length %zu, bytes %s", cmd, len, format_hex_pretty_to(hex_buf, bytes, len));
+      esph_log_v(TAG, "Command %02X, length %d, bytes %s", cmd, len, format_hex_pretty_to(hex_buf, bytes, len));
     } else {
-      esph_log_d(TAG, "Command %02X, length %zu, bytes %s", cmd, len, format_hex_pretty_to(hex_buf, bytes, len));
+      esph_log_d(TAG, "Command %02X, length %d, bytes %s", cmd, len, format_hex_pretty_to(hex_buf, bytes, len));
     }
     if constexpr (BUS_TYPE == BUS_TYPE_QUAD) {
       this->enable();

esphome/components/mipi_spi/models/lilygo.py

@@ -52,7 +52,6 @@ ST7796.extend(
     height=480,
     offset_width=49,
     draw_rounding=1,
-    data_rate="40MHz",
     cs_pin=39,
     reset_pin=47,
     dc_pin=9,

esphome/components/mqtt/mqtt_cover.cpp

@@ -50,10 +50,6 @@ void MQTTCoverComponent::setup() {
   }
   if (traits.get_supports_tilt()) {
     this->subscribe(this->get_tilt_command_topic(), [this](const std::string &topic, const std::string &payload) {
-      if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("STOP")) == 0) {
-        this->cover_->make_call().set_command_stop_tilt().perform();
-        return;
-      }
       auto value = parse_number<float>(payload);
       if (!value.has_value()) {
         ESP_LOGW(TAG, "Invalid tilt value: '%s'", payload.c_str());

esphome/components/mqtt/mqtt_fan.cpp

@@ -168,7 +168,8 @@ bool MQTTFanComponent::publish_state() {
   char topic_buf[MQTT_DEFAULT_TOPIC_MAX_LEN];
   const char *state_s = this->state_->state ? "ON" : "OFF";
   ESP_LOGD(TAG, "'%s' Sending state %s.", LOG_STR_ARG(this->state_->get_log_name()), state_s);
-  bool failed = !this->publish(this->get_state_topic_to_(topic_buf), state_s);
+  this->publish(this->get_state_topic_to_(topic_buf), state_s);
+  bool failed = false;
   if (this->state_->get_traits().supports_direction()) {
     bool success = this->publish(this->get_direction_state_topic_to(topic_buf),
                                  fan_direction_to_mqtt_str(this->state_->direction));

esphome/components/ms8607/ms8607.cpp

@@ -329,8 +329,8 @@ void MS8607Component::read_humidity_(float temperature_float) {
   humidity &= ~(0b11);  // strip status & unassigned bits from data
 
   // map 16 bit humidity value into range [-6%, 118%]
-  float const humidity_partial = float(humidity) / (1 << 16);
-  float const humidity_percentage = std::lerp(-6.0f, 118.0f, humidity_partial);
+  float const humidity_partial = double(humidity) / (1 << 16);
+  float const humidity_percentage = std::lerp(-6.0, 118.0, humidity_partial);
   float const compensated_humidity_percentage =
       humidity_percentage + (20 - temperature_float) * MS8607_H_TEMP_COEFFICIENT;
   ESP_LOGD(TAG, "Compensated for temperature, humidity=%.2f%%", compensated_humidity_percentage);

esphome/components/nrf52/__init__.py

@@ -1030,22 +1030,11 @@ def _generate_cmake_lists(pch_on: bool) -> bool:
         'target_include_directories(app PRIVATE "${CMAKE_CURRENT_LIST_DIR}/../src")',
     ]
 
-    defines = [flag for flag in compile_flags if flag.startswith("-D")]
-    options = [flag for flag in compile_flags if not flag.startswith("-D")]
-    if defines:
+    if compile_flags:
         lines += [
             "",
             "target_compile_options(app PRIVATE",
-            *[f'  "{flag}"' for flag in defines],
-            ")",
-        ]
-    if options:
-        # A target's own options come before the ones it inherits from zephyr_interface, and the
-        # compiler keeps the last of two opposing warning flags. Source options come after both.
-        lines += [
-            "",
-            "set_source_files_properties(${APP_SOURCES} PROPERTIES",
-            f'  COMPILE_OPTIONS "{";".join(options)}"',
+            *[f'  "{flag}"' for flag in compile_flags],
             ")",
         ]
 

esphome/components/online_image/download_buffer.cpp

@@ -1,6 +1,5 @@
 #include "download_buffer.h"
 #include "esphome/core/log.h"
-#include <algorithm>
 #include <cstring>
 
 namespace esphome::online_image {
@@ -35,46 +34,6 @@ size_t DownloadBuffer::read(size_t len) {
   return this->unread_;
 }
 
-void DownloadSource::compact() {
-  if (this->keep_read_ || this->pos_ == this->start_)
-    return;
-  this->buffer_.read(this->pos_ - this->start_);
-  this->start_ = this->pos_;
-}
-
-int32_t DownloadSource::read(uint8_t *buf, uint32_t len) {
-  const size_t offset = this->pos_ - this->start_;
-  const size_t n = std::min<size_t>(len, this->buffer_.unread() - offset);
-  memcpy(buf, this->buffer_.data(offset), n);
-  this->pos_ += n;
-  return static_cast<int32_t>(n);
-}
-
-bool DownloadSource::seek(uint32_t position) {
-  // Only what is still in the buffer can be read again; a decoder never skips ahead of the download
-  if (position < this->start_ || position > this->start_ + this->buffer_.unread())
-    return false;
-  this->pos_ = position;
-  return true;
-}
-
-bool DownloadBuffer::grow(size_t size) {
-  if (this->size_ >= size)
-    return true;
-  RAMAllocator<uint8_t> allocator;
-  uint8_t *buffer = allocator.allocate(size);
-  if (buffer == nullptr) {
-    ESP_LOGE(TAG, "allocation of %zu bytes failed. Biggest block in heap: %zu Bytes", size,
-             allocator.get_max_free_block_size());
-    return false;
-  }
-  memcpy(buffer, this->buffer_, this->unread_);
-  allocator.deallocate(this->buffer_, this->size_);
-  this->buffer_ = buffer;
-  this->size_ = size;
-  return true;
-}
-
 size_t DownloadBuffer::resize(size_t size) {
   if (this->size_ >= size) {
     // Avoid useless reallocations; if the buffer is big enough, don't reallocate.

esphome/components/online_image/download_buffer.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "esphome/components/runtime_image/image_decoder.h"
 #include "esphome/core/helpers.h"
 #include <cstddef>
 #include <cstdint>
@@ -36,8 +35,6 @@ class DownloadBuffer {
 
   void reset() { this->unread_ = 0; }
   size_t resize(size_t size);
-  /// Make the buffer at least size bytes, keeping the unread data. Returns false if the allocation failed.
-  bool grow(size_t size);
 
  protected:
   uint8_t *buffer_;
@@ -46,35 +43,4 @@ class DownloadBuffer {
   size_t unread_;
 };
 
-/**
- * @brief Lets a decoder read a download as it arrives, from the download buffer.
- *
- * The decoder reads at its own position in the buffer. Bytes it has read stay there until compact() drops
- * them, and compact() keeps everything while set_keep_read(true) is in effect, so the decoder can seek back
- * while it reads the headers.
- */
-class DownloadSource : public runtime_image::DecodeSource {
- public:
-  explicit DownloadSource(DownloadBuffer &buffer) : buffer_(buffer) {}
-
-  /// Start again at the beginning of a new download, keeping what is read
-  void reset() {
-    this->start_ = 0;
-    this->pos_ = 0;
-    this->keep_read_ = true;
-  }
-  void set_keep_read(bool keep) { this->keep_read_ = keep; }
-  /// Drop the bytes the decoder has read, to make room for more of the download
-  void compact();
-
-  int32_t read(uint8_t *buf, uint32_t len) override;
-  bool seek(uint32_t position) override;
-
- protected:
-  DownloadBuffer &buffer_;
-  size_t start_{0};  // Position in the download of the first byte in the buffer
-  size_t pos_{0};    // Position in the download the decoder reads next
-  bool keep_read_{true};
-};
-
 }  // namespace esphome::online_image

esphome/components/online_image/image.py

@@ -22,8 +22,6 @@ DEPENDENCIES = ["http_request"]
 CODEOWNERS = ["@guillempages", "@clydebarrow"]
 
 CONF_ON_DOWNLOAD_FINISHED = "on_download_finished"
-CONF_ON_DOWNLOAD_STARTED = "on_download_started"
-CONF_ON_DOWNLOAD_PROGRESS = "on_download_progress"
 CONF_UPDATE = "update"
 
 online_image_ns = cg.esphome_ns.namespace("online_image")
@@ -45,9 +43,7 @@ ONLINE_IMAGE_SCHEMA = (
             cv.Optional(CONF_REQUEST_HEADERS): cv.All(
                 cv.Schema({cv.string: cv.templatable(cv.string)})
             ),
-            cv.Optional(CONF_ON_DOWNLOAD_STARTED): automation.validate_automation({}),
             cv.Optional(CONF_ON_DOWNLOAD_FINISHED): automation.validate_automation({}),
-            cv.Optional(CONF_ON_DOWNLOAD_PROGRESS): automation.validate_automation({}),
             cv.Optional(CONF_ON_ERROR): automation.validate_automation({}),
         }
     )
@@ -100,17 +96,9 @@ automation.register_apply_action(
 
 
 _CALLBACK_AUTOMATIONS = (
-    automation.CallbackAutomation(
-        CONF_ON_DOWNLOAD_STARTED, "add_on_download_started_callback"
-    ),
     automation.CallbackAutomation(
         CONF_ON_DOWNLOAD_FINISHED, "add_on_finished_callback", [(bool, "cached")]
     ),
-    automation.CallbackAutomation(
-        CONF_ON_DOWNLOAD_PROGRESS,
-        "add_on_progress_callback",
-        [(float, "progress"), (cg.size_t, "bytes_read")],
-    ),
     automation.CallbackAutomation(CONF_ON_ERROR, "add_on_error_callback"),
 )
 

esphome/components/online_image/online_image.cpp

@@ -4,7 +4,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include <algorithm>
-#include <cmath>
 #include <cstdio>
 
 ESPHOME_LOG_TAG(TAG, "online_image");
@@ -16,11 +15,6 @@ static const char *const IF_MODIFIED_SINCE_HEADER_NAME = "if-modified-since";
 
 namespace esphome::online_image {
 
-// Time one loop pass may spend reading, and decoding a JPEG as it downloads
-static constexpr uint32_t PASS_BUDGET_MS = 20;
-// Shortest time between two on_download_progress calls
-static constexpr uint32_t PROGRESS_INTERVAL_MS = 100;
-
 OnlineImage::OnlineImage(const std::string &url, int width, int height, runtime_image::ImageFormat format,
                          image::ImageType type, image::Transparency transparency, image::Image *placeholder,
                          uint32_t buffer_size, bool is_big_endian)
@@ -146,12 +140,8 @@ void OnlineImage::update() {
     return;
   }
 
-  // A JPEG of known size is decoded as it arrives, so the download buffer only has to hold its headers.
-  // Otherwise the decoder needs the complete image in the buffer.
-  this->streaming_ = total_size > 0 && total_size <= INT32_MAX && this->decoder_supports_source();
-  this->stream_started_ = false;
-  this->source_.reset();
-  if (!this->streaming_ && format == runtime_image::JPEG && total_size > this->download_buffer_.size() &&
+  // JPEG requires the complete image in the download buffer before decoding
+  if (format == runtime_image::JPEG && total_size > this->download_buffer_.size() &&
       this->download_buffer_.resize(total_size) == 0) {
     // resize() logged the failed allocation; the next update() allocates the configured buffer again
     this->end_connection_();
@@ -162,8 +152,6 @@ void OnlineImage::update() {
   ESP_LOGI(TAG, "Downloading image (Size: %zu)", total_size);
   this->start_time_ = millis();
   this->last_data_time_ = this->start_time_;
-  this->download_started_callback_.call();
-  this->report_progress_(true);
   this->enable_loop();
 }
 
@@ -181,11 +169,6 @@ void OnlineImage::loop() {
     return;
   }
 
-  if (this->streaming_) {
-    this->loop_stream_();
-    return;
-  }
-
   // Check if download is complete — use decoder's format-specific completion check
   // to handle both known content-length and chunked transfer encoding
   if (this->is_decode_finished() || (this->downloader_->content_length > 0 &&
@@ -196,22 +179,15 @@ void OnlineImage::loop() {
   }
 
   // Download and decode more data
-  if (this->download_buffer_.free_capacity() > 0) {
-    const uint32_t now = App.get_loop_component_start_time();
-    size_t received = 0;
-    int len;
-    do {
-      len = this->downloader_->read(this->download_buffer_.append(),
-                                    std::min(this->download_buffer_.free_capacity(), READ_CHUNK));
-      if (len <= 0)
-        break;
-      this->download_buffer_.write(len);
-      received += len;
-    } while (this->download_buffer_.free_capacity() != 0 && millis() - now < PASS_BUDGET_MS);
+  size_t available = this->download_buffer_.free_capacity();
+  if (available > 0) {
+    // Download in chunks to avoid blocking
+    available = std::min(available, this->download_buffer_initial_size_);
+    auto len = this->downloader_->read(this->download_buffer_.append(), available);
 
-    if (received > 0) {
-      this->last_data_time_ = now;
-      this->report_progress_(false);
+    if (len > 0) {
+      this->last_data_time_ = App.get_loop_component_start_time();
+      this->download_buffer_.write(len);
 
       // Feed data to decoder
       auto consumed = this->feed_data(this->download_buffer_.data(), this->download_buffer_.unread());
@@ -279,114 +255,6 @@ void OnlineImage::loop() {
   }
 }
 
-void OnlineImage::loop_stream_() {
-  const uint32_t now = App.get_loop_component_start_time();
-  const size_t total = this->downloader_->content_length;
-  if (this->stream_started_)
-    this->source_.compact();
-
-  if (this->downloader_->get_bytes_read() < total) {
-    if (this->download_buffer_.free_capacity() == 0) {
-      // compact() already ran, so a full buffer means the decoder read nothing in the last pass
-      if (now - this->last_data_time_ >= this->parent_->get_timeout()) {
-        ESP_LOGE(TAG, "Image does not fit in the %zu byte download buffer; increase buffer_size",
-                 this->download_buffer_.size());
-        this->fail_download_();
-        return;
-      }
-    } else {
-      int len;
-      do {
-        len = this->downloader_->read(this->download_buffer_.append(),
-                                      std::min(this->download_buffer_.free_capacity(), READ_CHUNK));
-        if (len <= 0)
-          break;
-        this->last_data_time_ = now;
-        this->download_buffer_.write(len);
-        this->report_progress_(false);
-      } while (this->downloader_->get_bytes_read() < total && this->download_buffer_.free_capacity() != 0 &&
-               millis() - now < PASS_BUDGET_MS);
-      if (len < 0) {
-        ESP_LOGE(TAG, "Error downloading image: %d", len);
-        this->fail_download_();
-        return;
-      } else if (now - this->last_data_time_ >= this->parent_->get_timeout()) {
-        ESP_LOGE(TAG, "No data received for %" PRIu32 " ms", this->parent_->get_timeout());
-        this->fail_download_();
-        return;
-      }
-    }
-  }
-  const bool arrived = this->downloader_->get_bytes_read() >= total;
-
-  if (!this->stream_started_) {
-    // The decoder reads the headers when it opens the image, so wait until they are in the buffer
-    if (!arrived && this->download_buffer_.free_capacity() != 0)
-      return;
-    const int err = this->begin_source(&this->source_);
-    if (err != 0) {
-      // Headers cut short by a full buffer fail to parse, or make the decoder seek past the buffer. Such an image
-      // still decodes once it is all in memory, as it did before JPEG images were decoded as they download.
-      if (!arrived && (err == runtime_image::DECODE_ERROR_INVALID_TYPE || err == runtime_image::DECODE_ERROR_READ)) {
-        ESP_LOGW(TAG,
-                 "The image headers do not fit the %zu byte download buffer, so the whole image is downloaded "
-                 "before it is decoded; increase buffer_size to decode it as it downloads",
-                 this->download_buffer_.size());
-        // grow() logs a failed allocation
-        if (this->download_buffer_.grow(total)) {
-          this->streaming_ = false;
-        } else {
-          this->fail_download_();
-        }
-        return;
-      }
-      ESP_LOGE(TAG, "Error decoding image: %s", runtime_image::decode_error_to_string(err));
-      this->fail_download_();
-      return;
-    }
-    this->source_.set_keep_read(false);
-    this->stream_started_ = true;
-    // Opening the image and allocating its buffer is enough for one pass
-    return;
-  }
-
-  do {
-    const int result = this->decode_step();
-    if (result == runtime_image::DECODE_STEP_MORE)
-      continue;
-    if (result == runtime_image::DECODE_STEP_DONE) {
-      this->finish_download_();
-    } else if (result == runtime_image::DECODE_STEP_NEED_DATA) {
-      if (!arrived)
-        return;
-      // JPEGDEC only waits for bytes short of the size it was given, so this guards against a hang
-      ESP_LOGE(TAG, "Download ended before the image was complete");
-      this->fail_download_();
-    } else {
-      ESP_LOGE(TAG, "Error decoding image: %s", runtime_image::decode_error_to_string(result));
-      this->fail_download_();
-    }
-    return;
-  } while (millis() - now < PASS_BUDGET_MS);
-}
-
-void OnlineImage::report_progress_(bool force) {
-  const uint32_t now = App.get_loop_component_start_time();
-  const size_t bytes = this->downloader_->get_bytes_read();
-  const size_t total = this->downloader_->content_length;
-  // The last bytes are always reported, so a progress bar reaches 100%
-  if (!force && now - this->last_progress_time_ < PROGRESS_INTERVAL_MS && (total == 0 || bytes < total))
-    return;
-  this->last_progress_time_ = now;
-  const float progress = total > 0 ? std::min(100.0f, bytes * 100.0f / total) : NAN;
-  this->download_progress_callback_.call(progress, bytes);
-}
-
-void OnlineImage::fail_download_() {
-  this->end_connection_();
-  this->download_error_callback_.call();
-}
-
 void OnlineImage::finish_download_() {
   // Must be read before end_decode() ends the decoding session
   bool decoder_finished = this->is_decode_finished();
@@ -420,8 +288,6 @@ void OnlineImage::end_connection_() {
     this->downloader_ = nullptr;
   }
   this->download_buffer_.reset();
-  this->streaming_ = false;
-  this->stream_started_ = false;
   this->disable_loop();
 }
 

esphome/components/online_image/online_image.h

@@ -16,10 +16,6 @@ using t_http_codes = enum {
   HTTP_CODE_NOT_FOUND = 404,
 };
 
-/// Largest download read(). A read() blocks until it has every byte it asked for, so this bounds how long one loop
-/// pass waits on a slow link.
-static constexpr size_t READ_CHUNK = 1460;
-
 /**
  * @brief Download an image from a given URL, and decode it using the specified decoder.
  * The image will then be stored in a buffer, so that it can be re-displayed without the
@@ -74,17 +70,9 @@ class OnlineImage final : public PollingComponent,
    */
   void release();
 
-  /// Called when the server has accepted the request and the image starts to download
-  template<typename F> void add_on_download_started_callback(F &&callback) {
-    this->download_started_callback_.add(std::forward<F>(callback));
-  }
   template<typename F> void add_on_finished_callback(F &&callback) {
     this->download_finished_callback_.add(std::forward<F>(callback));
   }
-  /// Called with the percentage downloaded (NAN when the server did not send the size) and the bytes read so far
-  template<typename F> void add_on_progress_callback(F &&callback) {
-    this->download_progress_callback_.add(std::forward<F>(callback));
-  }
   template<typename F> void add_on_error_callback(F &&callback) {
     this->download_error_callback_.add(std::forward<F>(callback));
   }
@@ -93,20 +81,12 @@ class OnlineImage final : public PollingComponent,
   bool validate_url_(const std::string &url);
   void end_connection_();
   void finish_download_();
-  /// loop() for a JPEG that is decoded as it downloads
-  void loop_stream_();
-  void fail_download_();
-  /// Reports download progress, at most every PROGRESS_INTERVAL_MS unless force is set
-  void report_progress_(bool force);
 
   CallbackManager<void(bool)> download_finished_callback_{};
   CallbackManager<void()> download_error_callback_{};
-  LazyCallbackManager<void()> download_started_callback_{};
-  LazyCallbackManager<void(float, size_t)> download_progress_callback_{};
 
   std::shared_ptr<http_request::HttpContainer> downloader_{nullptr};
   DownloadBuffer download_buffer_;
-  DownloadSource source_{download_buffer_};
   /**
    * This is the *initial* size of the download buffer, not the current size.
    * The download buffer can be resized at runtime; the download_buffer_initial_size_
@@ -129,9 +109,6 @@ class OnlineImage final : public PollingComponent,
 
   uint32_t start_time_{0};
   uint32_t last_data_time_{0};
-  uint32_t last_progress_time_{0};
-  bool streaming_{false};       // The decoder reads the download itself, as it arrives
-  bool stream_started_{false};  // The decoder has read the headers
 };
 
 }  // namespace esphome::online_image

esphome/components/psram/__init__.py

@@ -115,11 +115,7 @@ def request_external_task_stack() -> None:
     ``to_code`` when the option is enabled. The sdkconfig option only permits external
     stacks; it does not move any stack into PSRAM on its own, so it stays opt-in per task.
     """
-    # Renamed in ESP-IDF 5.4; the old name is still mapped there, but each configure reports it
-    if idf_version() >= cv.Version(5, 4, 0):
-        add_idf_sdkconfig_option("CONFIG_FREERTOS_TASK_CREATE_ALLOW_EXT_MEM", True)
-    else:
-        add_idf_sdkconfig_option("CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY", True)
+    add_idf_sdkconfig_option("CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY", True)
 
 
 def validate_task_stack_in_psram(value: Any) -> bool:

esphome/components/restart/button/__init__.py

@@ -1,16 +1,26 @@
+import esphome.codegen as cg
 from esphome.components import button
-from esphome.const import DEVICE_CLASS_RESTART, ENTITY_CATEGORY_CONFIG, ICON_RESTART
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_ID,
+    DEVICE_CLASS_RESTART,
+    ENTITY_CATEGORY_CONFIG,
+    ICON_RESTART,
+)
 from esphome.types import ConfigType
 
+restart_ns = cg.esphome_ns.namespace("restart")
+RestartButton = restart_ns.class_("RestartButton", button.Button, cg.Component)
+
 CONFIG_SCHEMA = button.button_schema(
-    button.ApplyButton,
+    RestartButton,
     icon=ICON_RESTART,
     device_class=DEVICE_CLASS_RESTART,
     entity_category=ENTITY_CATEGORY_CONFIG,
-)
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config: ConfigType) -> None:
-    await button.sub_buttons(config).create(
-        config, None, apply="restart::restart_device()"
-    )
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await button.register_button(var, config)

esphome/components/restart/button/restart_button.cpp

@@ -7,11 +7,12 @@ namespace esphome::restart {
 
 ESPHOME_LOG_TAG(TAG, "restart.button");
 
-void restart_device() {
+void RestartButton::press_action() {
   ESP_LOGI(TAG, "Restarting device");
   // Let MQTT settle a bit
   delay(100);  // NOLINT
   App.safe_reboot();
 }
+void RestartButton::dump_config() { LOG_BUTTON("", "Restart Button", this); }
 
 }  // namespace esphome::restart

esphome/components/restart/button/restart_button.h

@@ -1,8 +1,19 @@
 #pragma once
 
+#include "esphome/components/button/button.h"
+#include "esphome/core/component.h"
+
 namespace esphome::restart {
 
-/// Run by the restart button.
-void restart_device();
+class RestartButton final : public button::Button, public Component {
+ public:
+  // User provided, not "= default": `new(p) RestartButton()` would zero-fill .bss that is already zero.
+  RestartButton() {}
+
+  void dump_config() override;
+
+ protected:
+  void press_action() override;
+};
 
 }  // namespace esphome::restart

esphome/components/runtime_image/__init__.py

@@ -92,17 +92,7 @@ class JPEGFormat(Format):
 
     def actions(self) -> None:
         cg.add_define("USE_RUNTIME_IMAGE_JPEG")
-        # 1.8.4 plus decodeBegin()/decodeRows(), so an image can be decoded a few rows at a time and
-        # can wait for input that has not arrived yet, and fixes for: input that arrives in short
-        # reads, garbled RGB8888 output of grayscale images, and two ARM NEON faults seen on arm64 hosts
-        # (swapped red and blue in the 4:2:0 RGB8888 path, writes past the row on clipped MCUs). It also
-        # uses the ESP32-S3 SIMD colour conversion in ESP-IDF builds, not only Arduino ones, and is built
-        # with -O2.
-        cg.add_library(
-            "JPEGDEC",
-            "1.8.4",
-            "https://github.com/esphome-libs/JPEGDEC#1.8.4-esphome.3",
-        )
+        cg.add_library("JPEGDEC", "1.8.4", "https://github.com/bitbank2/JPEGDEC#1.8.4")
         if CORE.is_host:
             # JPEGDEC's host detection checks __MACH__/__LINUX__, but gcc only
             # predefines the lowercase __linux__; without this a Linux host

esphome/components/runtime_image/image_decoder.cpp

@@ -2,6 +2,7 @@
 #include "runtime_image.h"
 #include "esphome/core/log.h"
 #include <algorithm>
+#include <cmath>
 
 namespace esphome::runtime_image {
 
@@ -10,48 +11,19 @@ ESPHOME_LOG_TAG(TAG, "image_decoder");
 bool ImageDecoder::set_size(int width, int height) {
   bool success = this->image_->resize(width, height) > 0;
   this->size_valid_ = success;
-  this->draw_width_ = width;
-  this->draw_height_ = height;
+  this->x_scale_ = static_cast<double>(this->image_->get_buffer_width()) / width;
+  this->y_scale_ = static_cast<double>(this->image_->get_buffer_height()) / height;
   return success;
 }
 
-int ImageDecoder::scaled_x_(int x) const {
-  if (this->draw_width_ <= 0)
-    return 0;
-  const uint32_t buffer_width = this->image_->get_buffer_width();
-  return static_cast<int>((static_cast<uint32_t>(x) * buffer_width + this->draw_width_ - 1) / this->draw_width_);
-}
-
-int ImageDecoder::scaled_y_(int y) const {
-  if (this->draw_height_ <= 0)
-    return 0;
-  const uint32_t buffer_height = this->image_->get_buffer_height();
-  return static_cast<int>((static_cast<uint32_t>(y) * buffer_height + this->draw_height_ - 1) / this->draw_height_);
-}
-
 void ImageDecoder::draw(int x, int y, int w, int h, const Color &color) {
   if (!this->size_valid_) {
     return;
   }
-  // A source pixel paints the target pixels from ceil(start * scale) up to ceil(end * scale). The spans of neighbouring
-  // pixels meet without overlapping, so when an image is shrunk each target pixel is painted once, by the first
-  // source pixel that reaches it, rather than by every pixel that lands on it. Integer maths: the S3 has no double FPU.
-  const int buffer_width = this->image_->get_buffer_width();
-  const int buffer_height = this->image_->get_buffer_height();
-  int x1 = x;
-  int y1 = y;
-  int x2 = x + w;
-  int y2 = y + h;
-  if (buffer_width != this->draw_width_ || buffer_height != this->draw_height_) {
-    x1 = this->scaled_x_(x);
-    y1 = this->scaled_y_(y);
-    x2 = this->scaled_x_(x + w);
-    y2 = this->scaled_y_(y + h);
-  }
-  x2 = std::min(buffer_width, x2);
-  y2 = std::min(buffer_height, y2);
-  for (int i = x1; i < x2; i++) {
-    for (int j = y1; j < y2; j++) {
+  auto width = std::min(this->image_->get_buffer_width(), static_cast<int>(std::ceil((x + w) * this->x_scale_)));
+  auto height = std::min(this->image_->get_buffer_height(), static_cast<int>(std::ceil((y + h) * this->y_scale_)));
+  for (int i = x * this->x_scale_; i < width; i++) {
+    for (int j = y * this->y_scale_; j < height; j++) {
       this->image_->draw_pixel(i, j, color);
     }
   }

esphome/components/runtime_image/image_decoder.h

@@ -1,6 +1,4 @@
 #pragma once
-#include <cstdint>
-
 #include "esphome/core/color.h"
 #include "image_format.h"
 
@@ -11,14 +9,6 @@ enum DecodeError : int {
   DECODE_ERROR_UNSUPPORTED_FORMAT = -2,
   DECODE_ERROR_OUT_OF_MEMORY = -3,
   DECODE_ERROR_INTERNAL_DECODER_ERROR = -4,
-  DECODE_ERROR_READ = -5,
-};
-
-/// Results of ImageDecoder::decode_step() other than a DecodeError
-enum DecodeStep : int {
-  DECODE_STEP_DONE = 0,
-  DECODE_STEP_MORE = 1,
-  DECODE_STEP_NEED_DATA = 2,  // The source has nothing more yet; call again once more has arrived
 };
 
 constexpr const char *decode_error_to_string(int error) {
@@ -31,8 +21,6 @@ constexpr const char *decode_error_to_string(int error) {
       return "Out of memory";
     case DECODE_ERROR_INTERNAL_DECODER_ERROR:
       return "Internal decoder error";
-    case DECODE_ERROR_READ:
-      return "Read error";
     default:
       return "Unknown error";
   }
@@ -40,19 +28,6 @@ constexpr const char *decode_error_to_string(int error) {
 
 class RuntimeImage;
 
-/// Input that a decoder reads itself as it goes, so the whole image never has to be in memory at once
-class DecodeSource {
- public:
-  virtual ~DecodeSource() = default;
-  /**
-   * Read up to len bytes at the current position. Returns the number read, which is less than len, even 0, when
-   * no more has arrived yet or at the end of the input, or negative on error.
-   */
-  virtual int32_t read(uint8_t *buf, uint32_t len) = 0;
-  /// Move to a position counted from the start. Returns false on error.
-  virtual bool seek(uint32_t position) = 0;
-};
-
 /**
  * @brief Class to abstract decoding different image formats.
  */
@@ -83,8 +58,8 @@ class ImageDecoder {
     this->expected_size_ = 0;
     this->decoded_bytes_ = 0;
     this->size_valid_ = true;
-    this->draw_width_ = 0;
-    this->draw_height_ = 0;
+    this->x_scale_ = 1.0;
+    this->y_scale_ = 1.0;
   }
 
   /**
@@ -113,28 +88,6 @@ class ImageDecoder {
    */
   virtual int decode(uint8_t *buffer, size_t size) = 0;
 
-  /// Whether this decoder can read a DecodeSource itself, a step at a time, instead of being fed data.
-  virtual bool supports_source() const { return false; }
-
-  /**
-   * @brief Start decoding from a source the decoder reads itself. Call after prepare(), in place of decode().
-   *
-   * The image headers (everything before the image data) must be readable from the source when this is called;
-   * only decode_step() can wait for more to arrive. The source must hold expected_size bytes in the end, and stay
-   * valid until the session ends.
-   * @return int 0 on success, or a {@see DecodeError} value.
-   */
-  virtual int begin_source(DecodeSource *source) { return DECODE_ERROR_UNSUPPORTED_FORMAT; }
-
-  /**
-   * @brief Decode a little more of an image started with begin_source(), keeping each call short.
-   *
-   * @return int DECODE_STEP_MORE while there is more to do, DECODE_STEP_NEED_DATA when the source has not
-   *             delivered enough to go on, DECODE_STEP_DONE when the image is complete, or a {@see DecodeError}
-   *             value.
-   */
-  virtual int decode_step() { return DECODE_ERROR_UNSUPPORTED_FORMAT; }
-
   /**
    * @brief Request the image to be resized once the actual dimensions are known.
    * Called by the callback functions, to be able to access the parent Image class.
@@ -159,9 +112,6 @@ class ImageDecoder {
    */
   void draw(int x, int y, int w, int h, const Color &color);
 
-  /// Bytes of the image the decoder has used so far
-  size_t get_decoded_bytes() const { return this->decoded_bytes_; }
-
   /**
    * @brief Check if the decoder has finished processing.
    *
@@ -184,13 +134,8 @@ class ImageDecoder {
   uint8_t *image_buffer_() const;
   bool image_is_big_endian_() const;
 
-  /// The first buffer column, or row, that source column x, or row y, paints: ceil(x * buffer size / draw size)
-  int scaled_x_(int x) const;
-  int scaled_y_(int y) const;
-
-  // Size of the image as the decoder draws it, which draw() spreads over the buffer
-  int draw_width_ = 0;
-  int draw_height_ = 0;
+  double x_scale_ = 1.0;
+  double y_scale_ = 1.0;
   RuntimeImage *image_;
   size_t expected_size_ = 0;  // Expected data size (0 if unknown)
   size_t decoded_bytes_ = 0;  // Bytes processed so far

esphome/components/runtime_image/jpeg_decoder.cpp

@@ -31,8 +31,8 @@ bool JpegDecoder::prepare_rgb565_scaling_(int width, int height) {
   const uint32_t target_width = this->image_->get_buffer_width();
   const uint32_t target_height = this->image_->get_buffer_height();
   // Boundary n is the first target pixel source pixel n covers, rounded up. When shrinking, the source
-  // pixel whose span lands on a target pixel paints it, so an 8 to 4 scale keeps columns 0, 2, 4 and 6,
-  // as the generic draw() path does
+  // pixel whose span lands on a target pixel paints it, so an 8 to 4 scale keeps columns 0, 2, 4 and 6;
+  // the generic draw() path rounds down and keeps the odd ones instead
   for (uint32_t x = 0; x <= static_cast<uint32_t>(width); x++) {
     this->x_boundaries_.push_back(static_cast<uint16_t>((x * target_width + width - 1) / width));
   }
@@ -135,24 +135,13 @@ int HOT JpegDecoder::decode(uint8_t *buffer, size_t size) {
     ESP_LOGE(TAG, "Could not open image for decoding: %d", this->jpeg_.getLastError());
     return DECODE_ERROR_INVALID_TYPE;
   }
-  const int err = this->start_();
-  if (err != 0)
-    return err;
-  if (!this->jpeg_.decode(0, 0, this->scale_option_()))
-    return this->fail_();
-  this->decoded_bytes_ = size;
-  this->jpeg_.close();
-  return size;
-}
-
-int JpegDecoder::start_() {
   auto jpeg_type = this->jpeg_.getJPEGType();
   if (jpeg_type == JPEG_MODE_INVALID) {
     ESP_LOGE(TAG, "Unsupported JPEG image");
     return DECODE_ERROR_INVALID_TYPE;
   } else if (jpeg_type == JPEG_MODE_PROGRESSIVE) {
     ESP_LOGE(TAG, "Progressive JPEG images not supported");
-    return DECODE_ERROR_UNSUPPORTED_FORMAT;
+    return DECODE_ERROR_INVALID_TYPE;
   }
   ESP_LOGD(TAG, "Image size: %d x %d, bpp: %d", this->jpeg_.getWidth(), this->jpeg_.getHeight(), this->jpeg_.getBpp());
 
@@ -165,133 +154,32 @@ int JpegDecoder::start_() {
   } else {
     this->jpeg_.setPixelType(RGB8888);
   }
-  const int width = this->jpeg_.getWidth();
-  const int height = this->jpeg_.getHeight();
-  if (!this->set_size(width, height)) {
+  if (!this->set_size(this->jpeg_.getWidth(), this->jpeg_.getHeight())) {
     return DECODE_ERROR_OUT_OF_MEMORY;
   }
-  // JPEGDEC can decode at 1/2, 1/4 or 1/8 size for much less work. Use the smallest size that still has at least as
-  // many pixels as the buffer, so a large image shown small is not decoded in full only to be thrown away.
-  const int buffer_width = this->image_->get_buffer_width();
-  const int buffer_height = this->image_->get_buffer_height();
-  this->scale_ = 1;
-  while (this->scale_ < JPEG_SCALE_EIGHTH && width / (this->scale_ * 2) >= buffer_width &&
-         height / (this->scale_ * 2) >= buffer_height) {
-    this->scale_ *= 2;
-  }
-  const int decoded_width = (width + this->scale_ - 1) / this->scale_;
-  const int decoded_height = (height + this->scale_ - 1) / this->scale_;
-  this->draw_width_ = decoded_width;
-  this->draw_height_ = decoded_height;
-  if (this->scale_ != 1) {
-    ESP_LOGD(TAG, "Decoding at 1/%d size, %d x %d", this->scale_, decoded_width, decoded_height);
-  }
-  if (this->direct_rgb565_ && !this->prepare_rgb565_scaling_(decoded_width, decoded_height)) {
+  if (this->direct_rgb565_ && !this->prepare_rgb565_scaling_(this->jpeg_.getWidth(), this->jpeg_.getHeight())) {
     return DECODE_ERROR_OUT_OF_MEMORY;
   }
-  return 0;
-}
-
-int JpegDecoder::fail_() {
-  const bool read_failed = this->source_ != nullptr && this->source_failed_;
-  const int error = this->jpeg_.getLastError();
-  this->jpeg_.close();
-  this->source_ = nullptr;
-  if (read_failed) {
-    ESP_LOGE(TAG, "Reading the image failed");
-    return DECODE_ERROR_READ;
-  }
-  ESP_LOGE(TAG, "Error while decoding: %d", error);
-  switch (error) {
-    case JPEG_ERROR_MEMORY:
-      return DECODE_ERROR_OUT_OF_MEMORY;
-    case JPEG_UNSUPPORTED_FEATURE:
-      return DECODE_ERROR_UNSUPPORTED_FORMAT;
-    case JPEG_INVALID_FILE:
-    case JPEG_INVALID_PARAMETER:
-      return DECODE_ERROR_INVALID_TYPE;
-    case JPEG_DECODE_ERROR:
-    default:
-      return DECODE_ERROR_INTERNAL_DECODER_ERROR;
-  }
-}
-
-void JpegDecoder::reset() {
-  // A decode from a source that was given up part way still has the image open
-  if (this->source_ != nullptr) {
+  if (!this->jpeg_.decode(0, 0, 0)) {
+    auto error = this->jpeg_.getLastError();
+    ESP_LOGE(TAG, "Error while decoding: %d", error);
     this->jpeg_.close();
-    this->source_ = nullptr;
+    switch (error) {
+      case JPEG_ERROR_MEMORY:
+        return DECODE_ERROR_OUT_OF_MEMORY;
+      case JPEG_UNSUPPORTED_FEATURE:
+        return DECODE_ERROR_UNSUPPORTED_FORMAT;
+      case JPEG_INVALID_FILE:
+      case JPEG_INVALID_PARAMETER:
+        return DECODE_ERROR_INVALID_TYPE;
+      case JPEG_DECODE_ERROR:
+      default:
+        return DECODE_ERROR_INTERNAL_DECODER_ERROR;
+    }
   }
-  ImageDecoder::reset();
-}
-
-int32_t JpegDecoder::source_read(JPEGFILE *file, uint8_t *buf, int32_t len) {
-  auto *decoder = static_cast<JpegDecoder *>(file->fHandle);
-  const int32_t n = decoder->source_->read(buf, len);
-  if (n < 0) {
-    // JPEGDEC has no way to report a failed read, so remember it and give it no data
-    decoder->source_failed_ = true;
-    return 0;
-  }
-  file->iPos += n;
-  return n;
-}
-
-int32_t JpegDecoder::source_seek(JPEGFILE *file, int32_t position) {
-  auto *decoder = static_cast<JpegDecoder *>(file->fHandle);
-  if (position < 0 || !decoder->source_->seek(position)) {
-    decoder->source_failed_ = true;
-    return file->iPos;
-  }
-  file->iPos = position;
-  return position;
-}
-
-int JpegDecoder::begin_source(DecodeSource *source) {
-  if (this->expected_size_ == 0 || this->expected_size_ > INT32_MAX) {
-    ESP_LOGE(TAG, "Image size %zu cannot be read from a source", this->expected_size_);
-    return DECODE_ERROR_INVALID_TYPE;
-  }
-  if (!source->seek(0)) {
-    ESP_LOGE(TAG, "Could not read the image");
-    return DECODE_ERROR_READ;
-  }
-  this->source_ = source;
-  this->source_failed_ = false;
-  if (!this->jpeg_.open(this, this->expected_size_, source_close, source_read, source_seek, draw_callback)) {
-    // The caller may recover, for example by reading the whole image first, so it reports the failure
-    ESP_LOGD(TAG, "Could not open image for decoding: %d", this->jpeg_.getLastError());
-    this->source_ = nullptr;
-    return this->source_failed_ ? DECODE_ERROR_READ : DECODE_ERROR_INVALID_TYPE;
-  }
-  const int err = this->start_();
-  if (err != 0) {
-    this->jpeg_.close();
-    this->source_ = nullptr;
-    return err;
-  }
-  if (!this->jpeg_.decodeBegin(0, 0, this->scale_option_()))
-    return this->fail_();
-  return 0;
-}
-
-int HOT JpegDecoder::decode_step() {
-  if (this->source_ == nullptr)
-    return DECODE_ERROR_INVALID_TYPE;
-  const int result = this->jpeg_.decodeRows(1);
-  // JPEGDEC may decode on with the missing data, so check the read before its result
-  if (this->source_failed_)
-    return this->fail_();
-  if (result == JPEG_DECODE_MORE)
-    return DECODE_STEP_MORE;
-  if (result == JPEG_DECODE_NEED_DATA)
-    return DECODE_STEP_NEED_DATA;
-  if (result == 0)
-    return this->fail_();
-  this->decoded_bytes_ = this->expected_size_;
+  this->decoded_bytes_ = size;
   this->jpeg_.close();
-  this->source_ = nullptr;
-  return DECODE_STEP_DONE;
+  return size;
 }
 
 }  // namespace esphome::runtime_image

esphome/components/runtime_image/jpeg_decoder.h

@@ -22,41 +22,19 @@ class JpegDecoder : public ImageDecoder {
   ~JpegDecoder() override {}
 
   int HOT decode(uint8_t *buffer, size_t size) override;
-  void reset() override;
-
-  /// The source is read as the decode needs it, through JPEGDEC's own 2 KB buffer
-  bool supports_source() const override { return true; }
-  int begin_source(DecodeSource *source) override;
-  /// Decodes one row of MCUs (8 or 16 pixel rows), or waits part way through one for more of the source
-  int HOT decode_step() override;
 
   bool uses_direct_rgb565() const { return this->direct_rgb565_; }
-  /// JPEGDEC decodes the image at 1/get_scale() of its size: 1, 2, 4 or 8
-  int get_scale() const { return this->scale_; }
   void draw_rgb565(int x, int y, int w, int h, const uint8_t *pixels);
 
  protected:
   bool prepare_rgb565_scaling_(int width, int height);
-  /// Set up an opened image for decoding. Returns 0, or a DecodeError.
-  int start_();
-  /// The JPEGDEC option for scale_: JPEG_SCALE_HALF, _QUARTER and _EIGHTH are the divisors themselves
-  int scale_option_() const { return this->scale_ == 1 ? 0 : this->scale_; }
-  /// The DecodeError for a failed read of the source or JPEGDEC's last error, closing the image
-  int fail_();
-
-  static int32_t source_read(JPEGFILE *file, uint8_t *buf, int32_t len);
-  static int32_t source_seek(JPEGFILE *file, int32_t position);
-  static void source_close(void *handle) {}
 
   JPEGDEC jpeg_{};
   FixedVector<uint16_t> x_boundaries_{};
   FixedVector<uint16_t> y_boundaries_{};
   int source_width_{0};
   int source_height_{0};
-  int scale_{1};                   // JPEGDEC decodes at 1/scale_ of the image size
-  DecodeSource *source_{nullptr};  // Set while a begin_source() decode is in progress
   bool direct_rgb565_{false};
-  bool source_failed_{false};
 };
 
 }  // namespace esphome::runtime_image

esphome/components/runtime_image/runtime_image.cpp

@@ -116,9 +116,7 @@ void RuntimeImage::draw_pixel(int x, int y, const Color &color) {
     }
     case image::IMAGE_TYPE_GRAYSCALE: {
       uint32_t pos = this->get_position_(x, y);
-      // 0.2125, 0.7154 and 0.0721 in 1/256ths, summing to 256 so white stays 255. Integer maths: the S3 has no
-      // double FPU
-      auto gray = static_cast<uint8_t>((54 * color.r + 183 * color.g + 19 * color.b) >> 8);
+      auto gray = static_cast<uint8_t>(0.2125 * color.r + 0.7154 * color.g + 0.0721 * color.b);
       if (this->transparency_ == image::TRANSPARENCY_CHROMA_KEY) {
         if (gray == 1) {
           gray = 0;
@@ -241,25 +239,6 @@ int RuntimeImage::feed_data(uint8_t *data, size_t len) {
   return consumed;
 }
 
-int RuntimeImage::begin_source(DecodeSource *source) {
-  if (!this->decoder_supports_source()) {
-    ESP_LOGE(TAG, "Decoder cannot read a source");
-    return DECODE_ERROR_UNSUPPORTED_FORMAT;
-  }
-  return this->decoder_->begin_source(source);
-}
-
-int RuntimeImage::decode_step() {
-  if (!this->is_decoding()) {
-    ESP_LOGE(TAG, "No decoder initialized");
-    return DECODE_ERROR_INVALID_TYPE;
-  }
-  const int result = this->decoder_->decode_step();
-  if (result == DECODE_STEP_DONE)
-    this->decoded_bytes_ = this->decoder_->get_decoded_bytes();
-  return result;
-}
-
 bool RuntimeImage::end_decode() {
   if (!this->is_decoding()) {
     return false;

esphome/components/runtime_image/runtime_image.h

@@ -76,22 +76,6 @@ class RuntimeImage : public image::Image {
    */
   int feed_data(uint8_t *data, size_t len);
 
-  /// Whether the active decoder can read a DecodeSource itself (see begin_source()).
-  bool decoder_supports_source() const { return this->is_decoding() && this->decoder_->supports_source(); }
-
-  /**
-   * @brief Decode from a source the decoder reads itself, in place of feed_data().
-   *
-   * Call after begin_decode() when decoder_supports_source() is true, once the image headers can be read from the
-   * source, then call decode_step() until it
-   * returns DECODE_STEP_DONE, and finish with end_decode().
-   * @return 0 on success, or a DecodeError value.
-   */
-  int begin_source(DecodeSource *source);
-
-  /// Decode a little more from the source; see ImageDecoder::decode_step().
-  int decode_step();
-
   /**
    * @brief Complete the decoding process.
    *

esphome/components/rx8025t/rx8025t.cpp

@@ -59,7 +59,7 @@ void RX8025TComponent::read_time() {
     return;
   }
 
-  ESPTime rtc_time = time::decode_bcd_calendar<time::EPSON_BCD_CALENDAR>(date);
+  ESPTime rtc_time = time::decode_bcd_calendar(date);
   if (!rtc_time.is_valid(/*check_day_of_week=*/true, /*check_day_of_year=*/false)) {
     ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");
     return;
@@ -77,7 +77,7 @@ void RX8025TComponent::write_time() {
   }
 
   uint8_t buff[7];
-  time::encode_bcd_calendar<time::EPSON_BCD_CALENDAR>(now, buff);
+  time::encode_bcd_calendar(now, buff);
   if (!this->write_bytes(RX8025T_REG_SEC, buff, sizeof(buff))) {
     ESP_LOGE(TAG, "Can't write I2C data.");
     this->status_set_warning(LOG_STR(ESP_LOG_MSG_COMM_FAIL));

esphome/components/rx8111/rx8111.cpp

@@ -60,7 +60,7 @@ void RX8111Component::read_time() {
     this->status_set_warning(LOG_STR("Invalid RTC time"));
     return;
   }
-  ESPTime rtc_time = time::decode_bcd_calendar<time::EPSON_BCD_CALENDAR>(buf);
+  ESPTime rtc_time = time::decode_bcd_calendar(buf);
   if (!rtc_time.is_valid(true, false) || rtc_time.second >= 60) {
     ESP_LOGW(TAG, "Invalid RTC time, not syncing to system clock");
     this->status_set_warning(LOG_STR("Invalid RTC time"));
@@ -88,7 +88,7 @@ void RX8111Component::write_time() {
   }
 
   uint8_t buf[7];
-  time::encode_bcd_calendar<time::EPSON_BCD_CALENDAR>(now, buf);
+  time::encode_bcd_calendar(now, buf);
   const bool written = this->write_bytes(RX8111_REG_SEC, buf, sizeof(buf));
   // Always try to restart the counter, even after a failed calendar write.
   const bool restarted = this->set_stop_bit_(false);

esphome/components/rx8130/rx8130.cpp

@@ -67,7 +67,7 @@ void RX8130Component::read_time() {
     this->status_set_warning(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
     return;
   }
-  ESPTime rtc_time = time::decode_bcd_calendar<time::EPSON_BCD_CALENDAR>(date);
+  ESPTime rtc_time = time::decode_bcd_calendar(date);
   if (!rtc_time.is_valid(/*check_day_of_week=*/true, /*check_day_of_year=*/false)) {
     ESP_LOGE(TAG, "Invalid RTC time, not syncing to system clock.");
     return;
@@ -84,7 +84,7 @@ void RX8130Component::write_time() {
     return;
   }
   uint8_t buff[7];
-  time::encode_bcd_calendar<time::EPSON_BCD_CALENDAR>(now, buff);
+  time::encode_bcd_calendar(now, buff);
   this->stop_(true);
   if (this->write_register(RX8130_REG_SEC, buff, 7) != i2c::ERROR_OK) {
     this->status_set_warning(LOG_STR(ESP_LOG_MSG_COMM_FAIL));

esphome/components/safe_mode/button/__init__.py

@@ -1,3 +1,4 @@
+import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
 from esphome.const import (
@@ -8,18 +9,26 @@ from esphome.const import (
 )
 from esphome.types import ConfigType
 
-from .. import SafeModeComponent
+from .. import SafeModeComponent, safe_mode_ns
 
 DEPENDENCIES = ["safe_mode"]
 
-CONFIG_SCHEMA = button.button_schema(
-    button.ApplyButton,
-    device_class=DEVICE_CLASS_RESTART,
-    entity_category=ENTITY_CATEGORY_CONFIG,
-    icon=ICON_RESTART_ALERT,
-).extend({cv.GenerateID(CONF_SAFE_MODE): cv.use_id(SafeModeComponent)})
+SafeModeButton = safe_mode_ns.class_("SafeModeButton", button.Button, cg.Component)
+
+CONFIG_SCHEMA = (
+    button.button_schema(
+        SafeModeButton,
+        device_class=DEVICE_CLASS_RESTART,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        icon=ICON_RESTART_ALERT,
+    )
+    .extend({cv.GenerateID(CONF_SAFE_MODE): cv.use_id(SafeModeComponent)})
+    .extend(cv.COMPONENT_SCHEMA)
+)
 
 
 async def to_code(config: ConfigType) -> None:
-    buttons = button.sub_buttons(config, parent=config[CONF_SAFE_MODE])
-    await buttons.create(config, None, apply="restart_in_safe_mode()")
+    var = await button.new_button(config)
+    await cg.register_component(var, config)
+
+    await cg.add_variable(var.set_safe_mode, config[CONF_SAFE_MODE])

esphome/components/safe_mode/button/safe_mode_button.cpp

@@ -0,0 +1,21 @@
+#include "safe_mode_button.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+
+namespace esphome::safe_mode {
+
+ESPHOME_LOG_TAG(TAG, "safe_mode.button");
+
+void SafeModeButton::press_action() {
+  ESP_LOGI(TAG, "Restarting in safe mode");
+  this->safe_mode_component_->set_safe_mode_pending(true);
+
+  // Let MQTT settle a bit
+  delay(100);  // NOLINT
+  App.safe_reboot();
+}
+
+void SafeModeButton::dump_config() { LOG_BUTTON("", "Safe Mode Button", this); }
+
+}  // namespace esphome::safe_mode

esphome/components/safe_mode/button/safe_mode_button.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "esphome/components/button/button.h"
+#include "esphome/components/safe_mode/safe_mode.h"
+#include "esphome/core/component.h"
+
+namespace esphome::safe_mode {
+
+class SafeModeButton final : public button::Button, public Component {
+ public:
+  void dump_config() override;
+  void set_safe_mode(SafeModeComponent *safe_mode_component) { this->safe_mode_component_ = safe_mode_component; }
+
+ protected:
+  SafeModeComponent *safe_mode_component_;
+  void press_action() override;
+};
+
+}  // namespace esphome::safe_mode

esphome/components/safe_mode/safe_mode.cpp

@@ -174,14 +174,6 @@ bool SafeModeComponent::get_safe_mode_pending() {
   return this->read_rtc_() == SafeModeComponent::ENTER_SAFE_MODE_MAGIC;
 }
 
-void SafeModeComponent::restart_in_safe_mode() {
-  ESP_LOGI(TAG, "Restarting in safe mode");
-  this->set_safe_mode_pending(true);
-  // Let MQTT settle a bit
-  delay(100);  // NOLINT
-  App.safe_reboot();
-}
-
 bool SafeModeComponent::should_enter_safe_mode(uint8_t num_attempts, uint32_t enable_time, uint32_t boot_is_good_after,
                                                bool in_flash) {
   this->safe_mode_start_time_ = millis();

esphome/components/safe_mode/safe_mode.h

@@ -25,8 +25,6 @@ class SafeModeComponent final : public Component {
   /// Set to true if the next startup will enter safe mode
   void set_safe_mode_pending(const bool &pending);
   bool get_safe_mode_pending();
-  /// Set safe mode pending and reboot; run by the safe mode button.
-  void restart_in_safe_mode();
 
   void dump_config() override;
   float get_setup_priority() const override;

esphome/components/sensor/__init__.py

@@ -39,16 +39,13 @@ from esphome.const import (
     CONF_REFERENCE_TEMPERATURE,
     CONF_SEND_EVERY,
     CONF_SEND_FIRST_AT,
-    CONF_SENSOR_ID,
     CONF_STATE_CLASS,
     CONF_TEMPERATURE,
-    CONF_TEMPERATURE_OFFSET,
     CONF_TIMEOUT,
     CONF_TO,
     CONF_TRIGGER_ID,
     CONF_TYPE_ID,
     CONF_UNIT_OF_MEASUREMENT,
-    CONF_USE_FAHRENHEIT,
     CONF_VALUE,
     CONF_WEB_SERVER,
     CONF_WINDOW_SIZE,
@@ -313,7 +310,6 @@ OrFilter = sensor_ns.class_("OrFilter", Filter)
 CalibrateLinearFilter = sensor_ns.class_("CalibrateLinearFilter", Filter)
 ToNTCResistanceFilter = sensor_ns.class_("ToNTCResistanceFilter", Filter)
 ToNTCTemperatureFilter = sensor_ns.class_("ToNTCTemperatureFilter", Filter)
-RHCorrectionFilter = sensor_ns.class_("RHCorrectionFilter", Filter)
 CalibratePolynomialFilter = sensor_ns.class_("CalibratePolynomialFilter", Filter)
 SensorInRangeCondition = sensor_ns.class_("SensorInRangeCondition", Filter)
 ClampFilter = sensor_ns.class_("ClampFilter", Filter)
@@ -1285,23 +1281,6 @@ async def calibrate_ntc_temperature_filter_to_code(config, filter_id):
     )
 
 
-@FILTER_REGISTRY.register(
-    "rh_correction",
-    RHCorrectionFilter,
-    cv.Schema(
-        {
-            cv.Required(CONF_TEMPERATURE_OFFSET): cv.templatable(cv.float_),
-            cv.Required(CONF_SENSOR_ID): cv.use_id(Sensor),
-            cv.Optional(CONF_USE_FAHRENHEIT, default=False): cv.boolean,
-        }
-    ),
-)
-async def rh_correction_filter_to_code(config: ConfigType, filter_id: ID) -> MockObj:
-    sensor = await cg.get_variable(config[CONF_SENSOR_ID])
-    offset = await cg.templatable(config[CONF_TEMPERATURE_OFFSET], [], cg.float_)
-    return cg.new_Pvariable(filter_id, offset, sensor, config[CONF_USE_FAHRENHEIT])
-
-
 def _mean(xs):
     return sum(xs) / len(xs)
 

esphome/components/sensor/filter.cpp

@@ -493,48 +493,6 @@ optional<float> ToNTCTemperatureFilter::new_value(float value) {
   return temp;
 }
 
-// RHCorrectionFilter
-static constexpr float MAGNUS_B = 17.67f, MAGNUS_C = 243.5f;
-
-static bool rh_correction_temp_in_band(float t) { return t >= -40.0f && t <= 50.0f; }
-
-optional<float> RHCorrectionFilter::new_value(float value) {
-  if (!this->temperature_sensor_->has_state()) {
-    if (!this->warned_) {
-      ESP_LOGW(TAG, "RHCorrectionFilter(%p): no temperature yet, passing humidity through uncorrected", this);
-      this->warned_ = true;
-    }
-    return value;
-  }
-  float offset = this->temperature_offset_.value();
-  float tc = this->temperature_sensor_->get_state();
-  if (this->use_fahrenheit_) {
-    tc = fahrenheit_to_celsius(tc);
-    offset /= 1.8f;
-  }
-  const float tnc = tc - offset;
-  // A NaN temperature or offset is a faulted input: keep the last corrected value
-  if (std::isnan(tnc)) {
-    if (!this->warned_) {
-      ESP_LOGW(TAG, "RHCorrectionFilter(%p): temperature or offset is NaN, dropping humidity updates", this);
-      this->warned_ = true;
-    }
-    return {};
-  }
-  if (!rh_correction_temp_in_band(tc) || !rh_correction_temp_in_band(tnc)) {
-    if (!this->warned_) {
-      ESP_LOGW(TAG, "RHCorrectionFilter(%p): Temperature out of range -40..50 °C. Tc=%f Tnc=%f", this, tc, tnc);
-      this->warned_ = true;
-    }
-    return value;
-  }
-  this->warned_ = false;
-  const float rh =
-      clamp(value * std::exp(MAGNUS_B * MAGNUS_C * (tnc - tc) / ((tnc + MAGNUS_C) * (tc + MAGNUS_C))), 0.0f, 100.0f);
-  ESP_LOGVV(TAG, "RHCorrectionFilter(%p)::new_value(%f) -> %f", this, value, rh);
-  return rh;
-}
-
 // StreamingFilter (base class)
 StreamingFilter::StreamingFilter(uint16_t window_size, uint16_t send_first_at)
     : window_size_(window_size), send_first_at_(send_first_at) {}

esphome/components/sensor/filter.h

@@ -647,26 +647,6 @@ class ToNTCTemperatureFilter : public Filter {
   double c_;
 };
 
-/** RH Temperature correction filter
- *
- * Allows for Relative Humidity Correction when a temperature offset is applied to the temperature sensor.
- * Uses the Magnus formula, rh = rh_nc * exp(b*(t_nc/(c+t_nc) - t/(c+t))) with b = 17.67, c = 243.5 °C;
- * see https://en.wikipedia.org/wiki/Dew_point
- */
-class RHCorrectionFilter : public Filter {
- public:
-  RHCorrectionFilter(TemplatableFn<float> offset, const Sensor *temperature_sensor, bool use_fahrenheit)
-      : temperature_offset_(offset), temperature_sensor_(temperature_sensor), use_fahrenheit_(use_fahrenheit) {}
-
-  optional<float> new_value(float value) override;
-
- protected:
-  TemplatableFn<float> temperature_offset_;
-  const Sensor *temperature_sensor_;
-  bool use_fahrenheit_;
-  bool warned_{false};
-};
-
 /** Base class for streaming filters (batch windows where window_size == send_every).
  *
  * When window_size equals send_every, we don't need a sliding window.