Merge remote-tracking branch 'origin/assign-bits-helper' into assign-bits-migrate-misc

# Conflicts:
#	esphome/components/light/light_call.h

.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

.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

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,
@@ -447,17 +446,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
     ]
 
@@ -587,7 +578,7 @@ def apply_action_builder(
             if isinstance(spec, ApplyBytes):
                 statements.extend(
                     await _render_bytes(
-                        spec, config, receiver, parent, args, table_name
+                        spec, config, receiver, parent, lambda_args, table_name
                     )
                 )
                 continue
@@ -617,14 +608,10 @@ async def _render_bytes(
     config: ConfigType,
     receiver: str,
     parent: str,
-    args: TemplateArgsType,
+    lambda_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.
-    """
+    """The statements for one ``ApplyBytes``: what ``TemplatableBytes::visit`` does, inlined."""
     value = _config_lookup(config, spec.conf_key)
     if value is None:
         return []
@@ -635,23 +622,21 @@ async def _render_bytes(
 
     if isinstance(value, Lambda):
         inner = await cg.process_lambda(
-            value, args, return_type=cg.std_vector.template(cg.uint8)
+            value, lambda_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"  const std::vector<uint8_t> esphome__bytes = ({call_lambda(inner)});",
             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}"
+    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)]
+        return [send(spec.progmem_target, args)]
     if not CORE.is_esp8266:
-        return [send(spec.target, table_args)]
+        return [send(spec.target, 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.
@@ -664,7 +649,7 @@ async def _render_bytes(
         )
     statements = ["{", f"  {buffer}"]
     if size:
-        statements.append(f"  esphome::progmem_memcpy({data}, {table_args});")
+        statements.append(f"  esphome::progmem_memcpy({data}, {args});")
     return [*statements, f"  {send(spec.target, f'{data}, {size}')}", "}"]
 
 

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/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/ds248x/ds248x_one_wire_bus.cpp

@@ -1,5 +1,6 @@
 #include "ds248x_one_wire_bus.h"
 #include "ds248x.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
 namespace esphome::ds248x {
@@ -151,11 +152,7 @@ uint64_t DS248xOneWireBus::search_int() {
     }
 
     // Update address based on direction taken
-    if (dir_taken) {
-      address |= bit_mask;
-    } else {
-      address &= ~bit_mask;
-    }
+    assign_bits(address, bit_mask, dir_taken);
   }
 
   // Search successful

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/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/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/htu21d/htu21d.cpp

@@ -1,6 +1,7 @@
 #include "htu21d.h"
-#include "esphome/core/log.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 
 namespace esphome::htu21d {
 
@@ -112,11 +113,7 @@ void HTU21DComponent::set_heater(bool status) {
     this->status_set_warning();
     return;
   }
-  if (status) {
-    raw_heater |= (1 << HTU21D_REG_HTRE_BIT);
-  } else {
-    raw_heater &= ~(1 << HTU21D_REG_HTRE_BIT);
-  }
+  assign_bits(raw_heater, 1 << HTU21D_REG_HTRE_BIT, status);
   if (this->write_register(HTU21D_WRITERHT_REG_CMD, &raw_heater, 1) != i2c::ERROR_OK) {
     this->status_set_warning();
     return;

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.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "light_color_values.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/string_ref.h"
 
 namespace esphome {
@@ -229,13 +230,7 @@ class LightCall {
   inline bool get_save_() { return (this->flags_ & FLAG_SAVE) != 0; }
 
   // Helper to set flag - defaults to true for common case
-  void set_flag_(FieldFlags flag, bool value = true) ESPHOME_ALWAYS_INLINE {
-    if (value) {
-      this->flags_ |= flag;
-    } else {
-      this->flags_ &= ~flag;
-    }
-  }
+  void set_flag_(FieldFlags flag, bool value = true) ESPHOME_ALWAYS_INLINE { assign_bits(this->flags_, flag, value); }
 
   // Helper to clear flag - reduces code size for common case
   void clear_flag_(FieldFlags flag) ESPHOME_ALWAYS_INLINE { this->flags_ &= ~flag; }

esphome/components/media_player/media_player.cpp

@@ -1,6 +1,7 @@
 #include "media_player.h"
-#include "esphome/core/defines.h"
 #include "esphome/core/controller_registry.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "esphome/core/progmem.h"
 
@@ -77,19 +78,12 @@ const char *media_player_command_to_string(MediaPlayerCommand command) {
 }
 
 void MediaPlayerTraits::set_supports_pause(bool supports_pause) {
-  if (supports_pause) {
-    this->feature_flags_ |= MediaPlayerEntityFeature::PAUSE | MediaPlayerEntityFeature::PLAY;
-  } else {
-    this->feature_flags_ &= ~(MediaPlayerEntityFeature::PAUSE | MediaPlayerEntityFeature::PLAY);
-  }
+  assign_bits(this->feature_flags_, MediaPlayerEntityFeature::PAUSE | MediaPlayerEntityFeature::PLAY, supports_pause);
 }
 
 void MediaPlayerTraits::set_supports_turn_off_on(bool supports_turn_off_on) {
-  if (supports_turn_off_on) {
-    this->feature_flags_ |= MediaPlayerEntityFeature::TURN_OFF | MediaPlayerEntityFeature::TURN_ON;
-  } else {
-    this->feature_flags_ &= ~(MediaPlayerEntityFeature::TURN_OFF | MediaPlayerEntityFeature::TURN_ON);
-  }
+  assign_bits(this->feature_flags_, MediaPlayerEntityFeature::TURN_OFF | MediaPlayerEntityFeature::TURN_ON,
+              supports_turn_off_on);
 }
 
 void MediaPlayerCall::validate_() {

esphome/components/mpr121/mpr121.cpp

@@ -3,6 +3,7 @@
 #include <cstdint>
 
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
 namespace esphome::mpr121 {
@@ -84,11 +85,7 @@ bool MPR121Component::digital_read(uint8_t pin) { return (this->gpio_input_ & (1
 
 void MPR121Component::digital_write(uint8_t pin, bool value) {
   const uint8_t ionum = pin - 4;
-  if (value) {
-    this->gpio_output_ |= (1 << ionum);
-  } else {
-    this->gpio_output_ &= ~(1 << ionum);
-  }
+  assign_bits(this->gpio_output_, 1 << ionum, value);
   this->flush_gpio_();
 }
 

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/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/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/provisioning/provisioning.h

@@ -46,11 +46,7 @@ class ProvisioningManager : public Component {
   void set_source_provisioned(uint8_t source, bool provisioned) {
     if (source >= MAX_SOURCES)
       return;
-    if (provisioned) {
-      this->provisioned_mask_ |= (1UL << source);
-    } else {
-      this->provisioned_mask_ &= ~(1UL << source);
-    }
+    assign_bits(this->provisioned_mask_, 1UL << source, provisioned);
   }
 
   // True once every registered source is provisioned. Config validation guarantees

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/rx8111/rx8111.cpp

@@ -1,4 +1,5 @@
 #include "rx8111.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
 namespace esphome::rx8111 {
@@ -106,11 +107,7 @@ bool RX8111Component::set_stop_bit_(bool stop) {
   uint8_t control;
   if (!this->read_byte(RX8111_REG_CONTROL, &control))
     return false;
-  if (stop) {
-    control |= RX8111_CTRL_STOP;
-  } else {
-    control &= ~RX8111_CTRL_STOP;
-  }
+  assign_bits(control, RX8111_CTRL_STOP, stop);
   return this->write_byte(RX8111_REG_CONTROL, control);
 }
 

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/shutdown/button/__init__.py

@@ -1,13 +1,18 @@
+import esphome.codegen as cg
 from esphome.components import button
-from esphome.const import ENTITY_CATEGORY_CONFIG, ICON_POWER
+import esphome.config_validation as cv
+from esphome.const import CONF_ID, ENTITY_CATEGORY_CONFIG, ICON_POWER
 from esphome.types import ConfigType
 
+shutdown_ns = cg.esphome_ns.namespace("shutdown")
+ShutdownButton = shutdown_ns.class_("ShutdownButton", button.Button, cg.Component)
+
 CONFIG_SCHEMA = button.button_schema(
-    button.ApplyButton, entity_category=ENTITY_CATEGORY_CONFIG, icon=ICON_POWER
-)
+    ShutdownButton, entity_category=ENTITY_CATEGORY_CONFIG, icon=ICON_POWER
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config: ConfigType) -> None:
-    await button.sub_buttons(config).create(
-        config, None, apply="shutdown::shutdown_device()"
-    )
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await button.register_button(var, config)

esphome/components/shutdown/button/shutdown_button.cpp

@@ -14,7 +14,8 @@ namespace esphome::shutdown {
 
 ESPHOME_LOG_TAG(TAG, "shutdown.button");
 
-void shutdown_device() {
+void ShutdownButton::dump_config() { LOG_BUTTON("", "Shutdown Button", this); }
+void ShutdownButton::press_action() {
   ESP_LOGI(TAG, "Shutting down");
   // Let MQTT settle a bit
   delay(100);  // NOLINT

esphome/components/shutdown/button/shutdown_button.h

@@ -1,8 +1,16 @@
 #pragma once
 
+#include "esphome/core/component.h"
+#include "esphome/components/button/button.h"
+
 namespace esphome::shutdown {
 
-/// Run by the shutdown button.
-void shutdown_device();
+class ShutdownButton final : public button::Button, public Component {
+ public:
+  void dump_config() override;
+
+ protected:
+  void press_action() override;
+};
 
 }  // namespace esphome::shutdown

esphome/components/socket/bsd_sockets_impl.cpp

@@ -62,11 +62,7 @@ int BSDSocketImpl::setblocking(bool blocking) {
   if (fl < 0) {
     return fl;
   }
-  if (blocking) {
-    fl &= ~O_NONBLOCK;
-  } else {
-    fl |= O_NONBLOCK;
-  }
+  assign_bits(fl, O_NONBLOCK, !blocking);
   return ::fcntl(this->fd_, F_SETFL, fl);
 }
 

esphome/components/socket/lwip_sockets_impl.cpp

@@ -52,11 +52,7 @@ int LwIPSocketImpl::setblocking(bool blocking) {
   if (fl < 0) {
     return fl;
   }
-  if (blocking) {
-    fl &= ~O_NONBLOCK;
-  } else {
-    fl |= O_NONBLOCK;
-  }
+  assign_bits(fl, O_NONBLOCK, !blocking);
   return lwip_fcntl(this->fd_, F_SETFL, fl);
 }
 

esphome/components/spi/__init__.py

@@ -17,7 +17,6 @@ from esphome.components.esp32 import (
     VARIANT_ESP32S2,
     VARIANT_ESP32S3,
     VARIANT_ESP32S31,
-    idf_version,
     only_on_variant,
 )
 from esphome.components.psram import DOMAIN as PSRAM_DOMAIN
@@ -143,19 +142,13 @@ TYPE_CLASS = {
 }
 
 
-def _require_psram_dma_idf(value: Any) -> Any:
-    if idf_version() < cv.Version(5, 5, 3):
-        raise cv.Invalid("psram_dma requires ESP-IDF 5.5.3 or newer")
-    return value
-
-
 def _validate_psram_dma(value: Any) -> bool:
     value = cv.boolean(value)
     if not value:
         return value
     return cv.All(
         cv.only_on_esp32,
-        _require_psram_dma_idf,
+        cv.only_with_framework("esp-idf"),
         only_on_variant(
             supported=[
                 VARIANT_ESP32C5,
@@ -166,6 +159,7 @@ def _validate_psram_dma(value: Any) -> bool:
             ],
             msg_prefix="PSRAM DMA",
         ),
+        cv.require_framework_version(esp_idf=cv.Version(5, 5, 3)),
         cv.requires_component(PSRAM_DOMAIN),
     )(value)
 

esphome/components/sx126x/__init__.py

@@ -11,9 +11,10 @@ from esphome.components.const import (
     CONF_RST_PIN,
 )
 import esphome.config_validation as cv
-from esphome.const import CONF_BUSY_PIN, CONF_DATA, CONF_FREQUENCY
-from esphome.core import TimePeriod
-from esphome.types import ConfigType
+from esphome.const import CONF_BUSY_PIN, CONF_DATA, CONF_FREQUENCY, CONF_ID
+from esphome.core import ID, TimePeriod
+from esphome.cpp_generator import MockObj
+from esphome.types import ConfigType, TemplateArgsType
 
 DOMAIN = "sx126x"
 MULTI_CONF = True
@@ -132,6 +133,10 @@ SHAPING = {
     "NONE": SX126xPulseShape.NO_FILTER,
 }
 
+SendPacketAction = sx126x_ns.class_(
+    "SendPacketAction", automation.Action, cg.Parented.template(SX126x)
+)
+
 
 def validate_raw_data(value: Any) -> bytes | list[int]:
     if isinstance(value, str):
@@ -319,8 +324,25 @@ SEND_PACKET_ACTION_SCHEMA = cv.maybe_simple_value(
 )
 
 
-automation.register_apply_action(
+@automation.register_action(
     "sx126x.send_packet",
+    SendPacketAction,
     SEND_PACKET_ACTION_SCHEMA,
-    automation.ApplyBytes(CONF_DATA, "transmit_packet({})", stack=MAX_PACKET_SIZE),
+    synchronous=True,
 )
+async def send_packet_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
+    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,
+        "sx126x_data",
+    )
+    return var

esphome/components/sx126x/automation.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/sx126x/sx126x.h"
+
+namespace esphome::sx126x {
+
+template<typename... Ts> class SendPacketAction final : public Action<Ts...>, public Parented<SX126x> {
+  TEMPLATABLE_BYTES(data)
+
+  void play(const Ts &...x) override {
+    this->data_.template visit<SX126X_MAX_PACKET_SIZE>(
+        [this](const uint8_t *data, size_t len) { this->parent_->transmit_packet(data, len); }, x...);
+  }
+};
+
+}  // namespace esphome::sx126x

esphome/components/sx127x/__init__.py

@@ -11,7 +11,9 @@ from esphome.components.const import (
     CONF_RST_PIN,
 )
 import esphome.config_validation as cv
-from esphome.const import CONF_DATA, CONF_FREQUENCY
+from esphome.const import CONF_DATA, CONF_FREQUENCY, CONF_ID
+from esphome.core import ID
+from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType
 
 DOMAIN = "sx127x"
@@ -115,6 +117,10 @@ SHAPING = {
     "NONE": SX127xPaRamp.SHAPING_NONE,
 }
 
+SendPacketAction = sx127x_ns.class_(
+    "SendPacketAction", automation.Action, cg.Parented.template(SX127x)
+)
+
 
 def validate_raw_data(value: Any) -> bytes | list[int]:
     if isinstance(value, str):
@@ -285,8 +291,25 @@ SEND_PACKET_ACTION_SCHEMA = cv.maybe_simple_value(
 )
 
 
-automation.register_apply_action(
+@automation.register_action(
     "sx127x.send_packet",
+    SendPacketAction,
     SEND_PACKET_ACTION_SCHEMA,
-    automation.ApplyBytes(CONF_DATA, "transmit_packet({})", stack=MAX_PACKET_SIZE),
+    synchronous=True,
 )
+async def send_packet_action_to_code(
+    config: ConfigType,
+    action_id: ID,
+    template_arg: cg.TemplateArguments,
+    args: TemplateArgsType,
+) -> MockObj:
+    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,
+        "sx127x_data",
+    )
+    return var

esphome/components/sx127x/automation.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/sx127x/sx127x.h"
+
+namespace esphome::sx127x {
+
+template<typename... Ts> class SendPacketAction final : public Action<Ts...>, public Parented<SX127x> {
+  TEMPLATABLE_BYTES(data)
+
+ public:
+  void play(const Ts &...x) override {
+    this->data_.template visit<SX127X_MAX_PACKET_SIZE>(
+        [this](const uint8_t *data, size_t len) { this->parent_->transmit_packet(data, len); }, x...);
+  }
+};
+
+}  // namespace esphome::sx127x

esphome/components/tmp1075/tmp1075.cpp

@@ -51,8 +51,8 @@ void TMP1075Sensor::dump_config() {
                 "  polarity   : %d\n"
                 "  alert_mode : %d\n"
                 "  shutdown   : %d",
-                this->alert_limit_low_, this->alert_limit_high_, this->config_.oneshot, this->config_.rate,
-                this->config_.faults, this->config_.polarity, this->config_.alert_mode, this->config_.shutdown);
+                alert_limit_low_, alert_limit_high_, config_.fields.oneshot, config_.fields.rate, config_.fields.faults,
+                config_.fields.polarity, config_.fields.alert_mode, config_.fields.shutdown);
 }
 
 void TMP1075Sensor::set_fault_count(const int faults) {
@@ -64,7 +64,7 @@ void TMP1075Sensor::set_fault_count(const int faults) {
     ESP_LOGE(TAG, "'%s' - fault_count too high: %d", LOG_STR_ARG(this->get_log_name()), faults);
     return;
   }
-  this->config_.faults = faults - 1;
+  config_.fields.faults = faults - 1;
 }
 
 void TMP1075Sensor::log_config_() {
@@ -75,28 +75,28 @@ void TMP1075Sensor::log_config_() {
            "  polarity  : %d\n"
            "  alert_mode: %d\n"
            "  shutdown  : %d",
-           this->config_.oneshot, this->config_.rate, this->config_.faults, this->config_.polarity,
-           this->config_.alert_mode, this->config_.shutdown);
+           config_.fields.oneshot, config_.fields.rate, config_.fields.faults, config_.fields.polarity,
+           config_.fields.alert_mode, config_.fields.shutdown);
 }
 
 void TMP1075Sensor::write_config() {
-  this->send_alert_limit_low_();
-  this->send_alert_limit_high_();
-  this->send_config_();
+  send_alert_limit_low_();
+  send_alert_limit_high_();
+  send_config_();
 }
 
 void TMP1075Sensor::send_config_() {
-  ESP_LOGV(TAG, "'%s' - sending configuration %02x", LOG_STR_ARG(this->get_log_name()), this->config_.to_byte());
-  this->log_config_();
-  if (!this->write_byte(REG_CFGR, this->config_.to_byte())) {
+  ESP_LOGV(TAG, "'%s' - sending configuration %02x", LOG_STR_ARG(this->get_log_name()), config_.regvalue);
+  log_config_();
+  if (!this->write_byte(REG_CFGR, config_.regvalue)) {
     ESP_LOGW(TAG, "'%s' - unable to write configuration register", LOG_STR_ARG(this->get_log_name()));
     return;
   }
 }
 
 void TMP1075Sensor::send_alert_limit_low_() {
-  ESP_LOGV(TAG, "'%s' - sending alert limit low %.3f °C", LOG_STR_ARG(this->get_log_name()), this->alert_limit_low_);
-  const uint16_t regvalue = temp2regvalue(this->alert_limit_low_);
+  ESP_LOGV(TAG, "'%s' - sending alert limit low %.3f °C", LOG_STR_ARG(this->get_log_name()), alert_limit_low_);
+  const uint16_t regvalue = temp2regvalue(alert_limit_low_);
   if (!this->write_byte_16(REG_LLIM, regvalue)) {
     ESP_LOGW(TAG, "'%s' - unable to write low limit register", LOG_STR_ARG(this->get_log_name()));
     return;
@@ -104,8 +104,8 @@ void TMP1075Sensor::send_alert_limit_low_() {
 }
 
 void TMP1075Sensor::send_alert_limit_high_() {
-  ESP_LOGV(TAG, "'%s' - sending alert limit high %.3f °C", LOG_STR_ARG(this->get_log_name()), this->alert_limit_high_);
-  const uint16_t regvalue = temp2regvalue(this->alert_limit_high_);
+  ESP_LOGV(TAG, "'%s' - sending alert limit high %.3f °C", LOG_STR_ARG(this->get_log_name()), alert_limit_high_);
+  const uint16_t regvalue = temp2regvalue(alert_limit_high_);
   if (!this->write_byte_16(REG_HLIM, regvalue)) {
     ESP_LOGW(TAG, "'%s' - unable to write high limit register", LOG_STR_ARG(this->get_log_name()));
     return;

esphome/components/tmp1075/tmp1075.h

@@ -7,38 +7,37 @@
 namespace esphome::tmp1075 {
 
 struct TMP1075Config {
-  bool oneshot{false};  // One-shot conversion mode. Writing 1, starts a single temperature
-                        // conversion. Read returns 0.
+  union {
+    struct {
+      uint8_t oneshot : 1;  // One-shot conversion mode. Writing 1, starts a single temperature
+                            // conversion. Read returns 0.
 
-  uint8_t rate{0};  // Conversion rate setting when device is in continuous conversion mode.
-                    // 00: 27.5 ms conversion rate
-                    // 01: 55 ms conversion rate
-                    // 10: 110 ms conversion rate
-                    // 11: 220 ms conversion rate (35 ms TMP1075N)
+      uint8_t rate : 2;  // Conversion rate setting when device is in continuous conversion mode.
+                         // 00: 27.5 ms conversion rate
+                         // 01: 55 ms conversion rate
+                         // 10: 110 ms conversion rate
+                         // 11: 220 ms conversion rate (35 ms TMP1075N)
 
-  uint8_t faults{0};  // Consecutive fault measurements to trigger the alert function.
-                      // 00: 1 fault
-                      // 01: 2 faults
-                      // 10: 3 faults (4 faults TMP1075N)
-                      // 11: 4 faults (6 faults TMP1075N)
+      uint8_t faults : 2;  // Consecutive fault measurements to trigger the alert function.
+                           // 00: 1 fault
+                           // 01: 2 faults
+                           // 10: 3 faults (4 faults TMP1075N)
+                           // 11: 4 faults (6 faults TMP1075N)
 
-  bool polarity{false};  // Polarity of the output pin.
-                         // 0: Active low ALERT pin
-                         // 1: Active high ALERT pin
+      uint8_t polarity : 1;  // Polarity of the output pin.
+                             // 0: Active low ALERT pin
+                             // 1: Active high ALERT pin
 
-  bool alert_mode{false};  // Selects the function of the ALERT pin.
-                           // 0: ALERT pin functions in comparator mode
-                           // 1: ALERT pin functions in interrupt mode
+      uint8_t alert_mode : 1;  // Selects the function of the ALERT pin.
+                               // 0: ALERT pin functions in comparator mode
+                               // 1: ALERT pin functions in interrupt mode
 
-  bool shutdown{false};  // Sets the device in shutdown mode to conserve power.
-                         // 0: Device is in continuous conversion
-                         // 1: Device is in shutdown mode
-
-  // Upper byte of the configuration register: OS R1 R0 F1 F0 POL TM SD
-  uint8_t to_byte() const {
-    return (this->oneshot << 7) | ((this->rate & 0x03) << 5) | ((this->faults & 0x03) << 3) | (this->polarity << 2) |
-           (this->alert_mode << 1) | this->shutdown;
-  }
+      uint8_t shutdown : 1;  // Sets the device in shutdown mode to conserve power.
+                             // 0: Device is in continuous conversion
+                             // 1: Device is in shutdown mode
+    } fields;
+    uint8_t regvalue;
+  };
 };
 
 enum EConversionRate {
@@ -64,10 +63,10 @@ class TMP1075Sensor final : public PollingComponent, public sensor::Sensor, publ
   // the IC. The setup() function also does this.
   void set_alert_limit_low(const float temp) { this->alert_limit_low_ = temp; }
   void set_alert_limit_high(const float temp) { this->alert_limit_high_ = temp; }
-  void set_oneshot(const bool oneshot) { this->config_.oneshot = oneshot; }
-  void set_conversion_rate(const enum EConversionRate rate) { this->config_.rate = rate; }
-  void set_alert_polarity(const bool polarity) { this->config_.polarity = polarity; }
-  void set_alert_function(const enum EAlertFunction function) { this->config_.alert_mode = function; }
+  void set_oneshot(const bool oneshot) { config_.fields.oneshot = oneshot; }
+  void set_conversion_rate(const enum EConversionRate rate) { config_.fields.rate = rate; }
+  void set_alert_polarity(const bool polarity) { config_.fields.polarity = polarity; }
+  void set_alert_function(const enum EAlertFunction function) { config_.fields.alert_mode = function; }
   void set_fault_count(int faults);
 
   void write_config();

esphome/components/uart/__init__.py

@@ -121,6 +121,7 @@ HOST_BAUD_RATES = [
 ]
 
 UARTDevice = uart_ns.class_("UARTDevice")
+UARTWriteAction = uart_ns.class_("UARTWriteAction", automation.Action)
 UARTDebugger = uart_ns.class_("UARTDebugger", cg.Component, automation.Action)
 UARTDummyReceiver = uart_ns.class_("UARTDummyReceiver", cg.Component)
 MULTI_CONF = True
@@ -592,8 +593,9 @@ def new_uart_component(
     return cg.new_bus_component(register_uart_device, config, *args)
 
 
-automation.register_apply_action(
+@automation.register_action(
     "uart.write",
+    UARTWriteAction,
     cv.maybe_simple_value(
         {
             cv.GenerateID(): cv.use_id(UARTComponent),
@@ -601,11 +603,15 @@ automation.register_apply_action(
         },
         key=CONF_DATA,
     ),
-    # A constant stays in flash: write_array_progmem copies it out in chunks on ESP8266
-    automation.ApplyBytes(
-        CONF_DATA, "write_array({})", progmem_target="write_array_progmem({})"
-    ),
+    synchronous=True,
 )
+async def uart_write_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, "uart_data"
+    )
+    return var
 
 
 @coroutine_with_priority(CoroPriority.FINAL)

esphome/components/uart/automation.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "uart.h"
+#include "esphome/core/automation.h"
+
+#include <vector>
+
+namespace esphome::uart {
+
+template<typename... Ts> class UARTWriteAction final : public Action<Ts...>, public Parented<UARTComponent> {
+  TEMPLATABLE_BYTES(data)
+
+  void play(const Ts &...x) override {
+    if (this->data_.is_static()) {
+      this->parent_->write_array_progmem(this->data_.data(), this->data_.size());
+    } else {
+      this->parent_->write_array(this->data_.value(x...));
+    }
+  }
+};
+
+}  // namespace esphome::uart

esphome/components/uart/uart_component_host.cpp

@@ -162,11 +162,7 @@ void HostUartComponent::setup() {
       break;
   };
   // Set stop bits
-  if (this->stop_bits_ == 2) {
-    options.c_cflag |= CSTOPB;
-  } else {
-    options.c_cflag &= ~CSTOPB;
-  }
+  assign_bits(options.c_cflag, CSTOPB, this->stop_bits_ == 2);
   cfsetispeed(&options, baud);
   cfsetospeed(&options, baud);
   tcsetattr(this->file_descriptor_, TCSANOW, &options);

esphome/components/udp/__init__.py

@@ -29,6 +29,7 @@ DOMAIN = "udp"
 MULTI_CONF = True
 udp_ns = cg.esphome_ns.namespace("udp")
 UDPComponent = udp_ns.class_("UDPComponent", cg.Component)
+UDPWriteAction = udp_ns.class_("UDPWriteAction", automation.Action)
 trigger_argname = "data"
 # Listener callback type (non-owning span from UDP component)
 listener_args = cg.std_span.template(cg.uint8.operator("const"))
@@ -239,23 +240,17 @@ def validate_raw_data(value: Any) -> bytes | list[int]:
     )
 
 
-_UDP_WRITE_SCHEMA = cv.maybe_simple_value(
-    {
-        cv.GenerateID(): cv.use_id(UDPComponent),
-        cv.Required(CONF_DATA): cv.templatable(validate_raw_data),
-    },
-    key=CONF_DATA,
-)
-_udp_write_builder = automation.apply_action_builder(
-    "udp.write",
-    _UDP_WRITE_SCHEMA,
-    # Constant payloads up to this size are sent from the stack on ESP8266
-    automation.ApplyBytes(CONF_DATA, "send_packet({})", stack=128),
-)
-
-
 @automation.register_action(
-    "udp.write", automation.ApplyAction, _UDP_WRITE_SCHEMA, synchronous=True
+    "udp.write",
+    UDPWriteAction,
+    cv.maybe_simple_value(
+        {
+            cv.GenerateID(): cv.use_id(UDPComponent),
+            cv.Required(CONF_DATA): cv.templatable(validate_raw_data),
+        },
+        key=CONF_DATA,
+    ),
+    synchronous=True,
 )
 async def udp_write_to_code(
     config: ConfigType,
@@ -263,6 +258,11 @@ async def udp_write_to_code(
     template_arg: cg.TemplateArguments,
     args: TemplateArgsType,
 ) -> MockObj:
+    var = cg.new_Pvariable(action_id, template_arg)
     udp_var = await cg.get_variable(config[CONF_ID])
+    await cg.register_parented(var, udp_var)
     cg.add(udp_var.set_should_broadcast())
-    return await _udp_write_builder(config, action_id, template_arg, args)
+    await automation.templatable_bytes(
+        config[CONF_DATA], args, var.set_data_template, var.set_data_static, "udp_data"
+    )
+    return var

esphome/components/udp/automation.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "udp_component.h"
+#ifdef USE_NETWORK
+#include "esphome/core/automation.h"
+
+namespace esphome::udp {
+
+/// Constant payloads up to this size are sent from the stack on ESP8266.
+static constexpr size_t STACK_PAYLOAD_SIZE = 128;
+
+template<typename... Ts> class UDPWriteAction final : public Action<Ts...>, public Parented<UDPComponent> {
+  TEMPLATABLE_BYTES(data)
+
+  void play(const Ts &...x) override {
+    // One sendto per packet, so a failed allocation never sends a partial packet
+    this->data_.template visit<STACK_PAYLOAD_SIZE>(
+        [this](const uint8_t *data, size_t len) { this->parent_->send_packet(data, len); }, x...);
+  }
+};
+
+}  // namespace esphome::udp
+
+#endif

esphome/components/ufire_ec/ufire_ec.cpp

@@ -1,3 +1,4 @@
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "ufire_ec.h"
 #include <cmath>
@@ -19,11 +20,8 @@ void UFireECComponent::setup() {
   // Write option for temperature adjustments
   uint8_t config;
   this->read_byte(REGISTER_CONFIG, &config);
-  if (this->temperature_sensor_ == nullptr && this->temperature_sensor_external_ == nullptr) {
-    config &= ~CONFIG_TEMP_COMPENSATION;
-  } else {
-    config |= CONFIG_TEMP_COMPENSATION;
-  }
+  assign_bits(config, CONFIG_TEMP_COMPENSATION,
+              this->temperature_sensor_ != nullptr || this->temperature_sensor_external_ != nullptr);
   this->write_byte(REGISTER_CONFIG, config);
 
   // Update temperature compensation

esphome/components/ufire_ise/ufire_ise.cpp

@@ -1,3 +1,4 @@
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "ufire_ise.h"
 
@@ -20,11 +21,8 @@ void UFireISEComponent::setup() {
   // Write option for temperature adjustments
   uint8_t config;
   this->read_byte(REGISTER_CONFIG, &config);
-  if (this->temperature_sensor_ == nullptr && this->temperature_sensor_external_ == nullptr) {
-    config &= ~CONFIG_TEMP_COMPENSATION;
-  } else {
-    config |= CONFIG_TEMP_COMPENSATION;
-  }
+  assign_bits(config, CONFIG_TEMP_COMPENSATION,
+              this->temperature_sensor_ != nullptr || this->temperature_sensor_external_ != nullptr);
   this->write_byte(REGISTER_CONFIG, config);
 }
 

esphome/components/usb_uart/__init__.py

@@ -1,5 +1,3 @@
-from collections.abc import Callable
-
 import esphome.codegen as cg
 from esphome.components.const import CONF_DATA_BITS, CONF_PARITY, CONF_STOP_BITS
 from esphome.components.esp32 import VARIANT_ESP32P4, get_esp32_variant
@@ -156,19 +154,6 @@ FILTER_SOURCE_FILES = filter_source_files_from_defines(
 )
 
 
-def _channel_limit(type_: Type) -> Callable[[list], list]:
-    """Check the channel count against the type's limit, which depends on the target."""
-
-    def validator(value: list) -> list:
-        if len(value) > (limit := type_.max_channels):
-            raise cv.Invalid(
-                f"Device type {type_.name} supports a maximum of {limit} channels"
-            )
-        return value
-
-    return validator
-
-
 def channel_schema(type_: "Type") -> cv.Schema:
     schema = cv.Schema(
         {
@@ -207,7 +192,10 @@ def channel_schema(type_: "Type") -> cv.Schema:
                         }
                     )
                 ),
-                _channel_limit(type_),
+                cv.Length(
+                    max=type_.max_channels,
+                    msg=f"Device type {type_.name} supports a maximum of {type_.max_channels} channels",
+                ),
             ),
         }
     )

esphome/components/voice_assistant/__init__.py

@@ -1,6 +1,12 @@
 from esphome import automation, core
 import esphome.codegen as cg
-from esphome.components import media_player, micro_wake_word, microphone, speaker
+from esphome.components import (
+    media_player,
+    micro_wake_word,
+    microphone,
+    network,
+    speaker,
+)
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ID,
@@ -169,6 +175,7 @@ CONFIG_SCHEMA = cv.All(
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.key_requires((CONF_ON_TTS_STREAM_START, CONF_ON_TTS_STREAM_END), CONF_SPEAKER),
+    network.require_ipv4("voice_assistant"),
 )
 
 FINAL_VALIDATE_SCHEMA = cv.All(

esphome/components/voice_assistant/voice_assistant.cpp

@@ -82,11 +82,7 @@ void VoiceAssistant::setup() {
 float VoiceAssistant::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }
 
 bool VoiceAssistant::start_udp_socket_() {
-#if USE_NETWORK_IPV4
   this->socket_ = socket::socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
-#else
-  this->socket_ = socket::socket_ip(SOCK_DGRAM, IPPROTO_IP);
-#endif
   if (this->socket_ == nullptr) {
     ESP_LOGE(TAG, "Could not create socket");
     this->mark_failed();
@@ -667,20 +663,17 @@ void VoiceAssistant::start_streaming(struct sockaddr_storage *addr, uint16_t por
   }
 
   memcpy(&this->dest_addr_, addr, sizeof(this->dest_addr_));
-  switch (this->dest_addr_.ss_family) {
-#if USE_NETWORK_IPV4
-    case AF_INET:
-      ((struct sockaddr_in *) &this->dest_addr_)->sin_port = htons(port);
-      break;
-#endif
+  if (this->dest_addr_.ss_family == AF_INET) {
+    ((struct sockaddr_in *) &this->dest_addr_)->sin_port = htons(port);
+  }
 #if LWIP_IPV6
-    case AF_INET6:
-      ((struct sockaddr_in6 *) &this->dest_addr_)->sin6_port = htons(port);
-      break;
+  else if (this->dest_addr_.ss_family == AF_INET6) {
+    ((struct sockaddr_in6 *) &this->dest_addr_)->sin6_port = htons(port);
+  }
 #endif
-    default:
-      ESP_LOGW(TAG, "Unknown address family: %d", this->dest_addr_.ss_family);
-      return;
+  else {
+    ESP_LOGW(TAG, "Unknown address family: %d", this->dest_addr_.ss_family);
+    return;
   }
 
   // Only primary microphone channel over UDP

esphome/components/water_heater/water_heater.cpp

@@ -5,6 +5,7 @@
 #include "esphome/core/application.h"
 #include "esphome/core/controller_registry.h"
 #include "esphome/core/progmem.h"
+#include "esphome/core/helpers.h"
 
 #include <cmath>
 #include <cstring>
@@ -59,21 +60,13 @@ WaterHeaterCall &WaterHeaterCall::set_target_temperature_high(float temperature)
 }
 
 WaterHeaterCall &WaterHeaterCall::set_away(bool away) {
-  if (away) {
-    this->state_ |= WATER_HEATER_STATE_AWAY;
-  } else {
-    this->state_ &= ~WATER_HEATER_STATE_AWAY;
-  }
+  assign_bits(this->state_, WATER_HEATER_STATE_AWAY, away);
   this->state_mask_ |= WATER_HEATER_STATE_AWAY;
   return *this;
 }
 
 WaterHeaterCall &WaterHeaterCall::set_on(bool on) {
-  if (on) {
-    this->state_ |= WATER_HEATER_STATE_ON;
-  } else {
-    this->state_ &= ~WATER_HEATER_STATE_ON;
-  }
+  assign_bits(this->state_, WATER_HEATER_STATE_ON, on);
   this->state_mask_ |= WATER_HEATER_STATE_ON;
   return *this;
 }

esphome/components/water_heater/water_heater.h

@@ -252,13 +252,7 @@ class WaterHeater : public EntityBase {
   /// Set the state flags. Should only be called from control().
   void set_state_(uint32_t state) { this->state_ = state; }
   /// Set or clear a state flag. Should only be called from control().
-  void set_state_flag_(uint32_t flag, bool value) {
-    if (value) {
-      this->state_ |= flag;
-    } else {
-      this->state_ &= ~flag;
-    }
-  }
+  void set_state_flag_(uint32_t flag, bool value) { assign_bits(this->state_, flag, value); }
 
   WaterHeaterMode mode_{WATER_HEATER_MODE_OFF};
   float current_temperature_{NAN};

esphome/components/wifi/__init__.py

@@ -9,7 +9,6 @@ from esphome.components.esp32 import (
     add_idf_sdkconfig_option,
     const,
     get_esp32_variant,
-    idf_version,
     only_on_variant,
     request_wifi,
     require_mbedtls_tls,
@@ -66,6 +65,7 @@ from esphome.const import (
     CONF_USE_ADDRESS,
     CONF_USERNAME,
     PLACEHOLDER_WIFI_SSID,
+    Framework,
     Platform,
     PlatformFramework,
 )
@@ -224,16 +224,21 @@ WIFI_AP_MODE_WISP = "WISP"
 def _validate_ap_mode(value: str) -> str:
     value = cv.one_of(WIFI_AP_MODE_FALLBACK, WIFI_AP_MODE_WISP, upper=True)(value)
     if value == WIFI_AP_MODE_WISP:
-        # The bridge is part of the ESP32 backend, on both of its frameworks
-        cv.only_on_esp32(value)
+        # esp_netif_napt_enable() exists from ESP-IDF 5.1
+        cv.require_framework_version(
+            esp_idf=cv.Version(5, 1, 0), extra_message="WISP mode routes through NAT"
+        )(value)
     return value
 
 
 def _validate_dns_servers(value: list) -> list:
     if any(ip.is_unspecified for ip in value):
         raise cv.Invalid("0.0.0.0 is not a DNS server the access point can offer")
-    if len(value) > 1 and CORE.is_esp32 and idf_version() < cv.Version(6, 0, 0):
-        raise cv.Invalid("The access point offers a second DNS server from ESP-IDF 6.0")
+    if len(value) > 1:
+        cv.require_framework_version(
+            esp_idf=cv.Version(6, 0, 0),
+            extra_message="The access point offers a second DNS server from ESP-IDF 6.0",
+        )(value)
     return value
 
 
@@ -642,6 +647,7 @@ def _lease_cache_schema(value: Any) -> ConfigType:
     value = LEASE_CACHE_SCHEMA(value)
     if value[CONF_ENABLED]:
         cv.only_on_esp32(value)
+        cv.only_with_framework(Framework.ESP_IDF)(value)
         if CONF_STORAGE not in value:
             if not preferences.rtc_supported():
                 raise cv.Invalid(
@@ -868,7 +874,7 @@ async def to_code(config):
 
     if (dpp := config.get(CONF_DPP)) is not None:
         add_idf_sdkconfig_option("CONFIG_ESP_WIFI_DPP_SUPPORT", True)
-        add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_HOST_FEAT_WIFI_EXT_DPP", True)
+        add_idf_sdkconfig_option("CONFIG_ESP_HOSTED_ENABLE_DPP", True)
         if (key := dpp.get(CONF_PRIVATE_KEY)) is not None:
             cg.add(var.set_dpp_key(key))
         if (info := dpp.get(CONF_DEVICE_INFO)) is not None:

esphome/components/wifi/wifi_component_esp_idf.cpp

@@ -730,7 +730,7 @@ bool WiFiComponent::wifi_sta_ip_config_(const optional<ManualIP> &manual_ip) {
 
     uint32_t age = lease_cache_age_secs(lease);
     uint32_t remaining = lease.lease_secs > age ? lease.lease_secs - age : 0;
-    ESP_LOGI(TAG, "Applying cached lease " IPSTR ", ~%" PRIu32 "s left, skipping DHCP", IP2STR(&ip4), remaining);
+    ESP_LOGI(TAG, "Applying cached lease " IPSTR ", ~%us left, skipping DHCP", IP2STR(&ip4), remaining);
 
     // Still awake at T1: switch to real DHCP. lease_valid_for_apply_() guarantees age < T1.
     uint32_t renew_in = lease_renew_at_secs(lease) - age;
@@ -846,7 +846,7 @@ void WiFiComponent::save_lease_settings_() {
   this->lease_cache_pref_.save(&lease);
   this->cached_lease_ = lease;
 
-  ESP_LOGD(TAG, "Lease cache: saved " IPSTR " (network %d, lease %" PRIu32 "s)", IP2STR(&info.ip), lease.ap_index,
+  ESP_LOGD(TAG, "Lease cache: saved " IPSTR " (network %d, lease %us)", IP2STR(&info.ip), lease.ap_index,
            lease.lease_secs);
 }
 #endif

esphome/core/entity_helpers.py

@@ -533,8 +533,7 @@ class SubEntities:
         """Create the entity from ``conf``; ``setter`` may be None when the hub keeps no pointer.
 
         With ``apply`` the entity is the domain's ``Apply*`` class and its control runs
-        ``parent->apply``, or ``apply`` as a namespaced free statement when no parent is bound, with
-        ``publish`` ("before"/"after") placing the domain's publish.
+        ``parent->apply``, with ``publish`` ("before"/"after") placing the domain's publish.
         """
         entity_id: ID = conf[CONF_ID]
         is_apply_class = self.apply_entity is not None and str(entity_id.type) == str(
@@ -546,13 +545,8 @@ class SubEntities:
             raise ValueError(
                 f"{entity_id}: apply= needs the domain's Apply class, not {entity_id.type}"
             )
-        # A parentless statement is a namespaced free function, so a hub platform that forgot
-        # parent= fails here instead of in the generated C++
-        if apply is not None and self.parent is None and "::" not in apply:
-            raise ValueError(
-                f"{entity_id}: apply= without a parent must call a namespaced free function "
-                f"(ns::fn()); bind parent= for a hub method"
-            )
+        if apply is not None and self.parent is None:
+            raise ValueError(f"{entity_id}: apply= needs a parent")
         if publish is not None and (apply is None or self.apply_entity.publish is None):
             raise ValueError(f"{entity_id}: publish= needs apply= on a stateful domain")
         if publish not in (None, "before", "after"):
@@ -577,7 +571,7 @@ class SubEntities:
         if isinstance(parent, ID):
             parent = await get_variable(parent)
         apply_entity = self.apply_entity
-        body = [f"{apply};" if parent is None else f"{parent_ref(parent)}->{apply};"]
+        body = [f"{parent_ref(parent)}->{apply};"]
         if publish == "before":
             body.insert(0, apply_entity.publish)
         elif publish == "after":

esphome/idf_component.yml

@@ -40,7 +40,7 @@ dependencies:
     rules:
       - if: "target in [esp32h2, esp32p4]"
   espressif/esp_hosted:
-    version: 3.0.10
+    version: 2.12.13
     rules:
       - if: "target in [esp32h2, esp32p4]"
   francescopace/espectre:

esphome/util.py

@@ -201,19 +201,8 @@ class RedirectText:
         """Whether output is handled line by line rather than passed through."""
         return self._filter_pattern is not None or bool(self._line_callbacks)
 
-    def _drop_line(self, line: str) -> None:
-        """Leave out a filtered line, keeping the color codes it carried.
-
-        cmake ends a warning with the reset code on a line of its own; dropped
-        with the blank lines, it would leave everything after it in the
-        warning's color.
-        """
-        if codes := "".join(ANSI_ESCAPE.findall(line)):
-            self._write_color_replace(codes)
-
     def _emit_line(self, line: str) -> None:
         if self._is_filtered(line):
-            self._drop_line(line)
             return
         line_without_end = ANSI_ESCAPE.sub("", line).rstrip()
 

platformio.ini

@@ -48,7 +48,7 @@ lib_deps =
     improv/Improv@1.2.7                    ; improv_serial / improv_ble
     kikuchan98/pngle@1.1.0                 ; runtime_image
     ; Using the repository directly, otherwise ESP-IDF can't use the library
-    https://github.com/esphome-libs/JPEGDEC.git#1.8.4-esphome.3    ; runtime_image
+    https://github.com/bitbank2/JPEGDEC.git#1.8.4    ; runtime_image
     ; This dependency is used only in unit tests.
     ; Must coincide with PLATFORMIO_GOOGLE_TEST_LIB in scripts/cpp_unit_test.py
     ; See scripts/cpp_unit_test.py and tests/components/README.md
@@ -253,7 +253,7 @@ lib_deps =
     heman/AsyncMqttClient-esphome@2.0.0   ; mqtt
     improv/Improv@1.2.7                   ; improv_serial
     kikuchan98/pngle@1.1.0                ; runtime_image
-    https://github.com/esphome-libs/JPEGDEC.git#1.8.4-esphome.3    ; runtime_image
+    https://github.com/bitbank2/JPEGDEC.git#1.8.4    ; runtime_image
 build_flags =
     ${common:arduino.build_flags}
     -DUSE_LIBRETINY

requirements.txt

@@ -31,9 +31,9 @@ smp==4.2.0; platform_system != "Darwin" or platform_machine != "x86_64"
 smp==4.1.0; platform_system == "Darwin" and platform_machine == "x86_64"
 requests==2.34.2
 py7zr==1.1.4
-platformdirs==4.13.5  # native esp-idf toolchain global cache dir
+platformdirs==4.13.4  # native esp-idf toolchain global cache dir
 ninja==1.13.2  # native host and esp8266 arduino toolchain build driver
-filelock==4.2.4  # inter-process locks (PlatformIO cache heal, git clone cache); >=3.32 for FileLock(fallback_to_soft=...), older versions silently drop the kwarg
+filelock==4.2.2  # inter-process locks (PlatformIO cache heal, git clone cache); >=3.32 for FileLock(fallback_to_soft=...), older versions silently drop the kwarg
 
 # esp-idf >= 5.0 requires this
 pyparsing >= 3.3.3

requirements_test.txt

@@ -1,7 +1,7 @@
 pylint==4.1.3
 ruff==0.17.1  # .pre-commit-config.yaml rev synced by script/sync_dependency_versions.py
 pyupgrade==3.22.0  # .pre-commit-config.yaml rev synced by script/sync_dependency_versions.py
-prek==0.5.6  # .github/workflows/ci.yml reads this pin
+prek==0.5.5  # .github/workflows/ci.yml reads this pin
 yamlrocks==0.7.1  # used by script/sync_dependency_versions.py
 
 # Unit tests

sdkconfig.defaults.esp32p4

@@ -4,29 +4,25 @@
 # codegen via add_idf_sdkconfig_option, which the stub tidy build skips).
 
 # esp32_hosted (P4 has no native Wi-Fi; it drives a co-processor over SDIO/SPI).
-# Mirrors a default SDIO 4-bit setup (slot 1, ESP32-C6 co-processor) on the
-# esp_hosted 3.x host line pinned in esphome/idf_component.yml, so the esp_hosted
+# Mirrors a default SDIO 4-bit setup (slot 1, ESP32-C6 slave) so the esp_hosted
 # code paths compile under static analysis.
-CONFIG_ESP_HOSTED_CP_TARGET_ESP32C6=y
-CONFIG_ESP_HOSTED_HOST_TRANSPORT_BUS_SDIO=y
+CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
 CONFIG_ESP_HOSTED_SDIO_SLOT_1=y
-CONFIG_ESP_HOSTED_HOST_SDIO_BUS_WIDTH_4=y
-CONFIG_ESP_HOSTED_HOST_SDIO_CLK_KHZ=40000
-CONFIG_ESP_HOSTED_HOST_RESET_GPIO=54
-CONFIG_ESP_HOSTED_HOST_SDIO_PIN_CLK=18
-CONFIG_ESP_HOSTED_HOST_SDIO_PIN_CMD=19
-CONFIG_ESP_HOSTED_HOST_SDIO_PIN_D0=14
-CONFIG_ESP_HOSTED_HOST_SDIO_PIN_D1=15
-CONFIG_ESP_HOSTED_HOST_SDIO_PIN_D2=16
-CONFIG_ESP_HOSTED_HOST_SDIO_PIN_D3=17
-
-# ESP-NOW-over-hosted shim (esp_now_hosted.cpp) uses the peer-data feature.
-CONFIG_ESP_HOSTED_HOST_FEAT_PEER_DATA=y
-CONFIG_ESP_HOSTED_HOST_FEAT_PEER_DATA_MAX_CUSTOM_MSG_HANDLERS=8
+CONFIG_ESP_HOSTED_SDIO_4_BIT_BUS=y
+CONFIG_ESP_HOSTED_CUSTOM_SDIO_PINS=y
+CONFIG_ESP_HOSTED_SDIO_CLOCK_FREQ_KHZ=40000
+CONFIG_ESP_HOSTED_SDIO_RESET_ACTIVE_HIGH=y
+CONFIG_ESP_HOSTED_SDIO_GPIO_RESET_SLAVE=54
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CLK_SLOT_1=18
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_CMD_SLOT_1=19
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D0_SLOT_1=14
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D1_4BIT_BUS_SLOT_1=15
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D2_4BIT_BUS_SLOT_1=16
+CONFIG_ESP_HOSTED_PRIV_SDIO_PIN_D3_4BIT_BUS_SLOT_1=17
 
 # BLE runs over the hosted co-processor on P4 (no native BT controller), so
-# the esp32_ble components must take the hosted bluedroid path instead of <esp_bt.h>.
-CONFIG_ESP_HOSTED_HOST_FEAT_BT=y
+# esp32_ble_tracker must take the hosted bluedroid path instead of <esp_bt.h>.
+CONFIG_ESP_HOSTED_ENABLE_BT_BLUEDROID=y
 
 # tinyusb CDC (usb_cdc_acm), same as esp32s3
 CONFIG_TINYUSB_CDC_ENABLED=y

tests/component_tests/cc1101/test_cc1101_payload_tables.py

@@ -14,7 +14,7 @@ def test_constant_payloads_share_progmem_tables(
     generate_main: Callable[[str | Path], str],
     component_config_path: Callable[[str], Path],
 ) -> None:
-    """Equal send_packet payloads share one table; a lambda is sent from its vector."""
+    """Equal send_packet payloads share one table; lambdas stay templates."""
     main_cpp = generate_main(component_config_path("payload_tables.yaml"))
 
     tables = re.findall(
@@ -23,10 +23,8 @@ def test_constant_payloads_share_progmem_tables(
     assert [v for _, v in tables] == [
         "{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}"
     ]
-    assert main_cpp.count(f"->transmit_packet(::{tables[0][0]}, 8);") == 2
-    assert (
-        "->transmit_packet(esphome__bytes.data(), esphome__bytes.size());" in main_cpp
-    )
+    assert main_cpp.count(f"set_data_static({tables[0][0]}, 8);") == 2
+    assert "set_data_template(" in main_cpp
 
 
 @pytest.mark.parametrize("size", [64, 65])

tests/component_tests/esp32/config/file_macro_idf_5_0.yaml

@@ -0,0 +1,8 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+  framework:
+    type: esp-idf
+    version: 5.0.6

tests/component_tests/esp32/test_esp32.py

@@ -1279,33 +1279,24 @@ def test_platformio_arduino_enables_reproducible_build(
 
 
 @pytest.mark.parametrize(
-    "config_file", ["reproducible_build.yaml", "reproducible_build_arduino.yaml"]
+    ("config_file", "expected"),
+    [
+        ("reproducible_build.yaml", True),
+        ("reproducible_build_arduino.yaml", True),
+        ("file_macro_idf_5_0.yaml", False),
+    ],
 )
 def test_file_macro_is_basename_only(
     generate_main: Callable[[str | Path], str],
     component_config_path: Callable[[str], Path],
     config_file: str,
+    expected: bool,
 ) -> None:
-    """__FILE__ becomes the basename; every supported IDF ships a GCC 12 toolchain."""
+    """__FILE__ becomes the basename on GCC 12 toolchains; IDF 5.0 (GCC 11) is skipped."""
     generate_main(component_config_path(config_file))
 
-    assert "-D__FILE__=__FILE_NAME__" in CORE.build_flags
-    assert "-Wno-builtin-macro-redefined" in CORE.build_flags
-
-
-def test_esp_idf_5_0_is_rejected(set_core_config: SetCoreConfigCallable) -> None:
-    """ESP-IDF 5.0 is out: its Kconfig names and toolchain predate what the component writes."""
-    set_core_config(PlatformFramework.ESP32_IDF)
-    from esphome.components.esp32 import CONFIG_SCHEMA
-
-    with pytest.raises(cv.Invalid, match=r"Only ESP-IDF 5\.1\+ is supported"):
-        CONFIG_SCHEMA(
-            {
-                "variant": "esp32",
-                "board": "esp32dev",
-                "framework": {"type": "esp-idf", "version": "5.0.6"},
-            }
-        )
+    assert ("-D__FILE__=__FILE_NAME__" in CORE.build_flags) is expected
+    assert ("-Wno-builtin-macro-redefined" in CORE.build_flags) is expected
 
 
 def test_native_idf_enables_reproducible_build(
@@ -1426,7 +1417,7 @@ def test_flash_mode_unset_leaves_defaults(
             {},
             {
                 "CONFIG_ESP_WIFI_ENABLED": False,
-                "CONFIG_ESP_COEX_SW_COEXIST_ENABLE": False,
+                "CONFIG_SW_COEXIST_ENABLE": False,
             },
             id="idf_ethernet_only",
         ),
@@ -1438,7 +1429,7 @@ def test_flash_mode_unset_leaves_defaults(
                 "CONFIG_BT_ENABLED": True,
                 "CONFIG_BT_BLE_42_FEATURES_SUPPORTED": True,
                 "CONFIG_BT_BLE_50_FEATURES_SUPPORTED": False,
-                "CONFIG_ESP_COEX_SW_COEXIST_ENABLE": True,
+                "CONFIG_SW_COEXIST_ENABLE": True,
                 "CONFIG_ESP_WIFI_SOFTAP_SUPPORT": False,
                 "CONFIG_LWIP_DHCPS": False,
             },
@@ -1490,7 +1481,7 @@ def test_flash_mode_unset_leaves_defaults(
             {},
             {
                 "CONFIG_ESP_WIFI_ENABLED": False,
-                "CONFIG_ESP_COEX_SW_COEXIST_ENABLE": False,
+                "CONFIG_SW_COEXIST_ENABLE": False,
             },
             id="arduino_ethernet_only_disables_wifi",
         ),
@@ -1501,7 +1492,7 @@ def test_flash_mode_unset_leaves_defaults(
             {},
             {
                 "CONFIG_ESP_WIFI_ENABLED": False,
-                "CONFIG_ESP_COEX_SW_COEXIST_ENABLE": False,
+                "CONFIG_SW_COEXIST_ENABLE": False,
             },
             id="arduino_ethernet_dhcps_exclusion",
         ),
@@ -1713,7 +1704,7 @@ def test_network_ethernet_only_reconciles_end_to_end(
     generate_main(component_config_path("network_ethernet_only.yaml"))
     sdkconfig = CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS]
     assert sdkconfig.get("CONFIG_ESP_WIFI_ENABLED") is False
-    assert sdkconfig.get("CONFIG_ESP_COEX_SW_COEXIST_ENABLE") is False
+    assert sdkconfig.get("CONFIG_SW_COEXIST_ENABLE") is False
     # The whole radio stack stays out of the build set as well.
     excluded = CORE.data[KEY_ESP32][KEY_EXCLUDE_COMPONENTS]
     assert {"esp_wifi", "wpa_supplicant", "esp_phy", "esp_coex", "bt"} <= excluded
@@ -1733,7 +1724,7 @@ def test_network_wifi_ble_coexistence_reconciles_end_to_end(
     assert sdkconfig.get("CONFIG_BT_ENABLED") is True
     assert sdkconfig.get("CONFIG_BT_BLE_42_FEATURES_SUPPORTED") is True
     assert sdkconfig.get("CONFIG_BT_BLE_50_FEATURES_SUPPORTED") is False
-    assert sdkconfig.get("CONFIG_ESP_COEX_SW_COEXIST_ENABLE") is True
+    assert sdkconfig.get("CONFIG_SW_COEXIST_ENABLE") is True
     assert sdkconfig.get("CONFIG_ESP_WIFI_SOFTAP_SUPPORT") is False
     assert sdkconfig.get("CONFIG_LWIP_DHCPS") is False
     # WiFi present alongside BT -> WiFi stack must stay enabled.
@@ -1751,7 +1742,7 @@ def test_network_wifi_ethernet_priority_keeps_wifi_enabled(
     generate_main(component_config_path("network_wifi_ethernet_priority.yaml"))
     sdkconfig = CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS]
     assert "CONFIG_ESP_WIFI_ENABLED" not in sdkconfig
-    assert "CONFIG_ESP_COEX_SW_COEXIST_ENABLE" not in sdkconfig
+    assert "CONFIG_SW_COEXIST_ENABLE" not in sdkconfig
     # WiFi has no AP here, so SoftAP/DHCP server are still dropped.
     assert sdkconfig.get("CONFIG_ESP_WIFI_SOFTAP_SUPPORT") is False
     assert sdkconfig.get("CONFIG_LWIP_DHCPS") is False

tests/component_tests/esp32_hosted/test_init.py

@@ -1,75 +1,20 @@
-"""Tests for the esp32_hosted validation."""
-
-import logging
+"""Tests for the esp32_hosted ESP-IDF version gate."""
 
 import pytest
 
 from esphome import config_validation as cv
-from esphome.components.esp32 import (
-    KEY_BOARD,
-    KEY_IDF_VERSION,
-    KEY_VARIANT,
-    VARIANT_ESP32P4,
-)
-from esphome.components.esp32_hosted import (
-    CONF_ACTIVE_HIGH,
-    CONF_BUS_WIDTH,
-    CONF_CMD_PIN,
-    CONF_D0_PIN,
-    CONF_D1_PIN,
-    CONF_D2_PIN,
-    CONF_D3_PIN,
-    CONFIG_SCHEMA,
-    _final_validate,
-    _validate_active_high,
-)
-from esphome.const import CONF_CLK_PIN, CONF_RESET_PIN, CONF_VARIANT, PlatformFramework
-from esphome.types import ConfigType
+from esphome.components.esp32 import KEY_IDF_VERSION
+from esphome.components.esp32_hosted import _final_validate
+from esphome.const import PlatformFramework
 
 from ..types import SetCoreConfigCallable
 
-SDIO_PINS: ConfigType = {
-    CONF_VARIANT: "ESP32C6",
-    CONF_RESET_PIN: 54,
-    CONF_CMD_PIN: 19,
-    CONF_CLK_PIN: 18,
-    CONF_D0_PIN: 14,
-    CONF_D1_PIN: 15,
-    CONF_D2_PIN: 16,
-    CONF_D3_PIN: 17,
-}
 
-
-@pytest.fixture
-def p4_core(set_core_config: SetCoreConfigCallable) -> None:
-    set_core_config(
-        PlatformFramework.ESP32_IDF,
-        platform_data={
-            KEY_BOARD: "esp32-p4-evboard",
-            KEY_IDF_VERSION: cv.Version.parse("5.5.6"),
-            KEY_VARIANT: VARIANT_ESP32P4,
-        },
-    )
-
-
-@pytest.mark.parametrize("idf", ["5.0.0", "5.2.2", "5.3.2", "5.4.2"])
-def test_final_validate_rejects_old_idf(
-    set_core_config: SetCoreConfigCallable, idf: str
-) -> None:
-    """ESP-IDF older than 5.5 is rejected with a clear error."""
-    set_core_config(
-        PlatformFramework.ESP32_IDF,
-        platform_data={KEY_IDF_VERSION: cv.Version.parse(idf)},
-    )
-    with pytest.raises(cv.Invalid, match="requires ESP-IDF 5.5 or newer"):
-        _final_validate({})
-
-
-@pytest.mark.parametrize("idf", ["5.5.0", "5.5.6"])
+@pytest.mark.parametrize("idf", ["5.3.0", "5.4.2", "5.5.5"])
 def test_final_validate_accepts_supported_idf(
     set_core_config: SetCoreConfigCallable, idf: str
 ) -> None:
-    """ESP-IDF 5.5 and newer passes validation unchanged."""
+    """ESP-IDF 5.3 and newer passes validation unchanged."""
     set_core_config(
         PlatformFramework.ESP32_IDF,
         platform_data={KEY_IDF_VERSION: cv.Version.parse(idf)},
@@ -77,48 +22,14 @@ def test_final_validate_accepts_supported_idf(
     _final_validate({})
 
 
-@pytest.mark.usefixtures("p4_core")
-@pytest.mark.parametrize("bus_width", [1, 4])
-def test_sdio_requires_d1_pin(bus_width: int) -> None:
-    """D1 carries the card interrupt, so a 1-bit bus needs it too."""
-    config = {k: v for k, v in SDIO_PINS.items() if k != CONF_D1_PIN}
-    config[CONF_BUS_WIDTH] = bus_width
-    with pytest.raises(cv.Invalid, match="required key not provided"):
-        CONFIG_SCHEMA(config)
-
-
-@pytest.mark.usefixtures("p4_core")
-@pytest.mark.parametrize("pin", [CONF_D2_PIN, CONF_D3_PIN])
-def test_sdio_4bit_requires_d2_d3(pin: str) -> None:
-    """A 4-bit bus needs D2 and D3."""
-    config = {k: v for k, v in SDIO_PINS.items() if k != pin}
-    with pytest.raises(cv.Invalid, match=f"{pin} is required when bus_width is 4"):
-        CONFIG_SCHEMA(config)
-
-
-@pytest.mark.usefixtures("p4_core")
-def test_sdio_1bit_accepts_d0_d1_only() -> None:
-    """A 1-bit bus validates with just D0 and D1."""
-    config = {k: v for k, v in SDIO_PINS.items() if k not in (CONF_D2_PIN, CONF_D3_PIN)}
-    config[CONF_BUS_WIDTH] = 1
-    CONFIG_SCHEMA(config)
-
-
-def test_active_high_absent_is_silent(caplog: pytest.LogCaptureFixture) -> None:
-    """A config without the deprecated key logs nothing."""
-    with caplog.at_level(logging.WARNING):
-        assert _validate_active_high({}) == {}
-    assert "active_high" not in caplog.text
-
-
-def test_active_high_true_warns(caplog: pytest.LogCaptureFixture) -> None:
-    """The old required value still validates, with a deprecation warning."""
-    with caplog.at_level(logging.WARNING):
-        _validate_active_high({CONF_ACTIVE_HIGH: True})
-    assert "'active_high' is deprecated" in caplog.text
-
-
-def test_active_high_false_rejected() -> None:
-    """esp_hosted drives the reset line with a low pulse only."""
-    with pytest.raises(cv.Invalid, match="active_high: false"):
-        _validate_active_high({CONF_ACTIVE_HIGH: False})
+@pytest.mark.parametrize("idf", ["5.0.0", "5.2.2"])
+def test_final_validate_rejects_old_idf(
+    set_core_config: SetCoreConfigCallable, idf: str
+) -> None:
+    """ESP-IDF older than 5.3 is rejected with a clear error."""
+    set_core_config(
+        PlatformFramework.ESP32_IDF,
+        platform_data={KEY_IDF_VERSION: cv.Version.parse(idf)},
+    )
+    with pytest.raises(cv.Invalid, match="requires ESP-IDF 5.3 or newer"):
+        _final_validate({})

tests/component_tests/openthread/test_openthread.py

@@ -132,7 +132,7 @@ def test_border_router_codegen(
     sdkconfig = CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS]
     for option, value in BORDER_ROUTER_SDKCONFIG_OPTIONS.items():
         assert sdkconfig[option] == value
-    assert sdkconfig["CONFIG_ESP_COEX_SW_COEXIST_ENABLE"] is True
+    assert sdkconfig["CONFIG_SW_COEXIST_ENABLE"] is True
     assert sdkconfig["CONFIG_OPENTHREAD_SRP_CLIENT"] is False
     assert sdkconfig["CONFIG_OPENTHREAD_DNS64_CLIENT"] is False
     assert (
@@ -158,7 +158,7 @@ def test_border_router_rcp_codegen(
     assert sdkconfig["CONFIG_OPENTHREAD_RADIO_NATIVE"] is False
     assert sdkconfig["CONFIG_OPENTHREAD_RADIO_SPINEL_UART"] is True
     assert sdkconfig["CONFIG_VFS_SUPPORT_DIR"] is True
-    assert sdkconfig.get("CONFIG_ESP_COEX_SW_COEXIST_ENABLE") is not True
+    assert sdkconfig.get("CONFIG_SW_COEXIST_ENABLE") is not True
     assert any(define.name == "USE_OPENTHREAD_RCP_UART" for define in CORE.defines)
     assert "OpenThreadComponent(460800, 18, 17, nullptr)" in cpp_main
 

tests/component_tests/psram/test_psram.py

@@ -5,9 +5,6 @@ from typing import Any
 import pytest
 
 from esphome.components.esp32 import (
-    KEY_ESP32,
-    KEY_IDF_VERSION,
-    KEY_SDKCONFIG_OPTIONS,
     KEY_VARIANT,
     VARIANT_ESP32,
     VARIANT_ESP32C2,
@@ -24,7 +21,6 @@ from esphome.components.esp32 import (
 )
 import esphome.config_validation as cv
 from esphome.const import CONF_ESPHOME, PlatformFramework
-from esphome.core import CORE
 from tests.component_tests.types import SetCoreConfigCallable
 
 UNSUPPORTED_PSRAM_VARIANTS = [
@@ -259,29 +255,3 @@ def test_psram_final_validation(
     else:
         # This should not raise an exception
         FINAL_VALIDATE_SCHEMA(validated_config)
-
-
-@pytest.mark.parametrize(
-    ("version", "key"),
-    [
-        (cv.Version(5, 3, 2), "CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY"),
-        (cv.Version(5, 4, 0), "CONFIG_FREERTOS_TASK_CREATE_ALLOW_EXT_MEM"),
-    ],
-)
-def test_external_task_stack_uses_the_kconfig_name_of_the_idf(
-    version: cv.Version, key: str, set_core_config: SetCoreConfigCallable
-) -> None:
-    """ESP-IDF 5.4 renamed the option; the old name is mapped there but reported on every configure."""
-    set_core_config(
-        PlatformFramework.ESP32_IDF,
-        platform_data={
-            KEY_VARIANT: VARIANT_ESP32,
-            KEY_IDF_VERSION: version,
-            KEY_SDKCONFIG_OPTIONS: {},
-        },
-    )
-    from esphome.components.psram import request_external_task_stack
-
-    request_external_task_stack()
-
-    assert CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS] == {key: True}