[sprinkler] Fix scheduler deprecation warnings and heap churn with FixedVector (#13251)

2026.1.0b2

esphome/analyze_memory/__init__.py

@@ -22,7 +22,7 @@ from .helpers import (
     map_section_name,
     parse_symbol_line,
 )
-from .toolchain import find_tool, resolve_tool_path, run_tool
+from .toolchain import find_tool, run_tool
 
 if TYPE_CHECKING:
     from esphome.platformio_api import IDEData
@@ -132,12 +132,6 @@ class MemoryAnalyzer:
             readelf_path = readelf_path or idedata.readelf_path
             _LOGGER.debug("Using toolchain paths from PlatformIO idedata")
 
-        # Validate paths exist, fall back to find_tool if they don't
-        # This handles cases like Zephyr where cc_path doesn't include full path
-        # and the toolchain prefix may differ (e.g., arm-zephyr-eabi- vs arm-none-eabi-)
-        objdump_path = resolve_tool_path("objdump", objdump_path, objdump_path)
-        readelf_path = resolve_tool_path("readelf", readelf_path, objdump_path)
-
         self.objdump_path = objdump_path or "objdump"
         self.readelf_path = readelf_path or "readelf"
         self.external_components = external_components or set()

esphome/analyze_memory/const.py

@@ -15,7 +15,6 @@ ESPHOME_COMPONENT_PATTERN = re.compile(r"esphome::([a-zA-Z0-9_]+)::")
 # - LibreTiny RTL87xx: .xip.code_* (flash), .ram.code_* (RAM)
 # - LibreTiny BK7231: .itcm.code (fast RAM), .vectors (interrupt vectors)
 # - LibreTiny LN882X: .flash_text, .flash_copy* (flash code)
-# - Zephyr/nRF52: text, rodata, datas, bss (no leading dots)
 SECTION_MAPPING = {
     ".text": frozenset(
         [
@@ -31,9 +30,6 @@ SECTION_MAPPING = {
             # LibreTiny LN882X flash code
             ".flash_text",
             ".flash_copy",
-            # Zephyr/nRF52 sections (no leading dots)
-            "text",
-            "rom_start",
         ]
     ),
     ".rodata": frozenset(
@@ -41,8 +37,6 @@ SECTION_MAPPING = {
             ".rodata",
             # LibreTiny RTL87xx read-only data in RAM
             ".ram.code_rodata",
-            # Zephyr/nRF52 sections (no leading dots)
-            "rodata",
         ]
     ),
     # .bss patterns - must be before .data to catch ".dram0.bss"
@@ -51,19 +45,9 @@ SECTION_MAPPING = {
             ".bss",
             # LibreTiny LN882X BSS
             ".bss_ram",
-            # Zephyr/nRF52 sections (no leading dots)
-            "bss",
-            "noinit",
-        ]
-    ),
-    ".data": frozenset(
-        [
-            ".data",
-            ".dram",
-            # Zephyr/nRF52 sections (no leading dots)
-            "datas",
         ]
     ),
+    ".data": frozenset([".data", ".dram"]),
 }
 
 # Section to ComponentMemory attribute mapping

esphome/analyze_memory/helpers.py

@@ -94,13 +94,13 @@ def parse_symbol_line(line: str) -> tuple[str, str, int, str] | None:
         return None
 
     # Find section, size, and name
-    # Try each part as a potential section name
     for i, part in enumerate(parts):
-        # Skip parts that are clearly flags, addresses, or other metadata
-        # Sections start with '.' (standard ELF) or are known section names (Zephyr)
+        if not part.startswith("."):
+            continue
+
         section = map_section_name(part)
         if not section:
-            continue
+            break
 
         # Need at least size field after section
         if i + 1 >= len(parts):

esphome/analyze_memory/toolchain.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import logging
-import os
 from pathlib import Path
 import subprocess
 from typing import TYPE_CHECKING
@@ -18,82 +17,10 @@ TOOLCHAIN_PREFIXES = [
     "xtensa-lx106-elf-",  # ESP8266
     "xtensa-esp32-elf-",  # ESP32
     "xtensa-esp-elf-",  # ESP32 (newer IDF)
-    "arm-zephyr-eabi-",  # nRF52/Zephyr SDK
-    "arm-none-eabi-",  # Generic ARM (RP2040, etc.)
     "",  # System default (no prefix)
 ]
 
 
-def _find_in_platformio_packages(tool_name: str) -> str | None:
-    """Search for a tool in PlatformIO package directories.
-
-    This handles cases like Zephyr SDK where tools are installed in nested
-    directories that aren't in PATH.
-
-    Args:
-        tool_name: Name of the tool (e.g., "readelf", "objdump")
-
-    Returns:
-        Full path to the tool or None if not found
-    """
-    # Get PlatformIO packages directory
-    platformio_home = Path(os.path.expanduser("~/.platformio/packages"))
-    if not platformio_home.exists():
-        return None
-
-    # Search patterns for toolchains that might contain the tool
-    # Order matters - more specific patterns first
-    search_patterns = [
-        # Zephyr SDK deeply nested structure (4 levels)
-        # e.g., toolchain-gccarmnoneeabi/zephyr-sdk-0.17.4/arm-zephyr-eabi/bin/arm-zephyr-eabi-objdump
-        f"toolchain-*/*/*/bin/*-{tool_name}",
-        # Zephyr SDK nested structure (3 levels)
-        f"toolchain-*/*/bin/*-{tool_name}",
-        f"toolchain-*/bin/*-{tool_name}",
-        # Standard PlatformIO toolchain structure
-        f"toolchain-*/bin/*{tool_name}",
-    ]
-
-    for pattern in search_patterns:
-        matches = list(platformio_home.glob(pattern))
-        if matches:
-            # Sort to get consistent results, prefer arm-zephyr-eabi over arm-none-eabi
-            matches.sort(key=lambda p: ("zephyr" not in str(p), str(p)))
-            tool_path = str(matches[0])
-            _LOGGER.debug("Found %s in PlatformIO packages: %s", tool_name, tool_path)
-            return tool_path
-
-    return None
-
-
-def resolve_tool_path(
-    tool_name: str,
-    derived_path: str | None,
-    objdump_path: str | None = None,
-) -> str | None:
-    """Resolve a tool path, falling back to find_tool if derived path doesn't exist.
-
-    Args:
-        tool_name: Name of the tool (e.g., "objdump", "readelf")
-        derived_path: Path derived from idedata (may not exist for some platforms)
-        objdump_path: Path to objdump binary to derive other tool paths from
-
-    Returns:
-        Resolved path to the tool, or the original derived_path if it exists
-    """
-    if derived_path and not Path(derived_path).exists():
-        found = find_tool(tool_name, objdump_path)
-        if found:
-            _LOGGER.debug(
-                "Derived %s path %s not found, using %s",
-                tool_name,
-                derived_path,
-                found,
-            )
-            return found
-    return derived_path
-
-
 def find_tool(
     tool_name: str,
     objdump_path: str | None = None,
@@ -101,8 +28,7 @@ def find_tool(
     """Find a toolchain tool by name.
 
     First tries to derive the tool path from objdump_path (if provided),
-    then searches PlatformIO package directories (for cross-compile toolchains),
-    and finally falls back to searching for platform-specific tools in PATH.
+    then falls back to searching for platform-specific tools.
 
     Args:
         tool_name: Name of the tool (e.g., "objdump", "nm", "c++filt")
@@ -121,13 +47,7 @@ def find_tool(
             _LOGGER.debug("Found %s at: %s", tool_name, potential_path)
             return potential_path
 
-    # Search in PlatformIO packages directory first (handles Zephyr SDK, etc.)
-    # This must come before PATH search because system tools (e.g., /usr/bin/objdump)
-    # are for the host architecture, not the target (ARM, Xtensa, etc.)
-    if found := _find_in_platformio_packages(tool_name):
-        return found
-
-    # Try platform-specific tools in PATH (fallback for when tools are installed globally)
+    # Try platform-specific tools
     for prefix in TOOLCHAIN_PREFIXES:
         cmd = f"{prefix}{tool_name}"
         try:

esphome/components/sprinkler/sprinkler.cpp

@@ -332,6 +332,7 @@ Sprinkler::Sprinkler(const std::string &name) {
   // The `name` is needed to set timers up, hence non-default constructor
   // replaces `set_name()` method previously existed
   this->name_ = name;
+  this->timer_.init(2);
   this->timer_.push_back({this->name_ + "sm", false, 0, 0, std::bind(&Sprinkler::sm_timer_callback_, this)});
   this->timer_.push_back({this->name_ + "vs", false, 0, 0, std::bind(&Sprinkler::valve_selection_callback_, this)});
 }
@@ -1574,7 +1575,8 @@ const LogString *Sprinkler::state_as_str_(SprinklerState state) {
 
 void Sprinkler::start_timer_(const SprinklerTimerIndex timer_index) {
   if (this->timer_duration_(timer_index) > 0) {
-    this->set_timeout(this->timer_[timer_index].name, this->timer_duration_(timer_index),
+    // FixedVector ensures timer_ can't be resized, so .c_str() pointers remain valid
+    this->set_timeout(this->timer_[timer_index].name.c_str(), this->timer_duration_(timer_index),
                       this->timer_cbf_(timer_index));
     this->timer_[timer_index].start_time = millis();
     this->timer_[timer_index].active = true;
@@ -1585,7 +1587,7 @@ void Sprinkler::start_timer_(const SprinklerTimerIndex timer_index) {
 
 bool Sprinkler::cancel_timer_(const SprinklerTimerIndex timer_index) {
   this->timer_[timer_index].active = false;
-  return this->cancel_timeout(this->timer_[timer_index].name);
+  return this->cancel_timeout(this->timer_[timer_index].name.c_str());
 }
 
 bool Sprinkler::timer_active_(const SprinklerTimerIndex timer_index) { return this->timer_[timer_index].active; }

esphome/components/sprinkler/sprinkler.h

@@ -3,6 +3,7 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
 #include "esphome/components/number/number.h"
 #include "esphome/components/switch/switch.h"
 
@@ -553,8 +554,8 @@ class Sprinkler : public Component {
   /// Sprinkler valve operator objects
   std::vector<SprinklerValveOperator> valve_op_{2};
 
-  /// Valve control timers
-  std::vector<SprinklerTimer> timer_{};
+  /// Valve control timers - FixedVector enforces that this can never grow beyond init() size
+  FixedVector<SprinklerTimer> timer_;
 
   /// Other Sprinkler instances we should be aware of (used to check if pumps are in use)
   std::vector<Sprinkler *> other_controllers_;

script/determine-jobs.py

@@ -93,7 +93,6 @@ class Platform(StrEnum):
     RTL87XX_ARD = "rtl87xx-ard"  # LibreTiny RTL8720x
     LN882X_ARD = "ln882x-ard"  # LibreTiny LN882x
     RP2040_ARD = "rp2040-ard"  # Raspberry Pi Pico
-    NRF52_ZEPHYR = "nrf52-adafruit"  # Nordic nRF52 (Zephyr)
 
 
 # Memory impact analysis constants
@@ -113,7 +112,7 @@ PLATFORM_SPECIFIC_COMPONENTS = frozenset(
         "rtl87xx",  # Realtek RTL87xx platform implementation (uses LibreTiny)
         "ln882x",  # Winner Micro LN882x platform implementation (uses LibreTiny)
         "host",  # Host platform (for testing on development machine)
-        "nrf52",  # Nordic nRF52 platform implementation (uses Zephyr)
+        "nrf52",  # Nordic nRF52 platform implementation
     }
 )
 
@@ -127,7 +126,6 @@ PLATFORM_SPECIFIC_COMPONENTS = frozenset(
 # 4-6. Other ESP32 variants - Less commonly used but still supported
 # 7-9. LibreTiny platforms (BK72XX, RTL87XX, LN882X) - good for detecting LibreTiny-specific changes
 # 10. RP2040 - Raspberry Pi Pico platform
-# 11. nRF52 - Nordic nRF52 with Zephyr (good for detecting Zephyr-specific changes)
 MEMORY_IMPACT_PLATFORM_PREFERENCE = [
     Platform.ESP32_C6_IDF,  # ESP32-C6 IDF (newest, supports Thread/Zigbee)
     Platform.ESP8266_ARD,  # ESP8266 Arduino (most memory constrained, fastest builds)
@@ -139,7 +137,6 @@ MEMORY_IMPACT_PLATFORM_PREFERENCE = [
     Platform.RTL87XX_ARD,  # LibreTiny RTL8720x
     Platform.LN882X_ARD,  # LibreTiny LN882x
     Platform.RP2040_ARD,  # Raspberry Pi Pico
-    Platform.NRF52_ZEPHYR,  # Nordic nRF52 (Zephyr)
 ]
 
 
@@ -466,10 +463,6 @@ def _detect_platform_hint_from_filename(filename: str) -> Platform | None:
     if "pico" in filename_lower or "rp2040" in filename_lower:
         return Platform.RP2040_ARD
 
-    # nRF52 / Zephyr
-    if "nrf52" in filename_lower or "zephyr" in filename_lower:
-        return Platform.NRF52_ZEPHYR
-
     return None
 
 

tests/script/test_determine_jobs.py

@@ -1499,23 +1499,6 @@ def test_detect_memory_impact_config_runs_at_component_limit(tmp_path: Path) ->
             "tests/components/rp2040/test.rp2040-ard.yaml",
             determine_jobs.Platform.RP2040_ARD,
         ),
-        # nRF52 / Zephyr detection
-        (
-            "tests/components/logger/test.nrf52-adafruit.yaml",
-            determine_jobs.Platform.NRF52_ZEPHYR,
-        ),
-        (
-            "esphome/components/nrf52/gpio.cpp",
-            determine_jobs.Platform.NRF52_ZEPHYR,
-        ),
-        (
-            "esphome/components/zephyr/core.cpp",
-            determine_jobs.Platform.NRF52_ZEPHYR,
-        ),
-        (
-            "esphome/components/zephyr_ble_server/ble_server.cpp",
-            determine_jobs.Platform.NRF52_ZEPHYR,
-        ),
         # No platform hint (generic files)
         ("esphome/components/wifi/wifi.cpp", None),
         ("esphome/components/sensor/sensor.h", None),
@@ -1545,10 +1528,6 @@ def test_detect_memory_impact_config_runs_at_component_limit(tmp_path: Path) ->
         "pico_i2c",
         "pico_spi",
         "rp2040_test_yaml",
-        "nrf52_test_yaml",
-        "nrf52_gpio",
-        "zephyr_core",
-        "zephyr_ble_server",
         "generic_wifi_no_hint",
         "generic_sensor_no_hint",
         "core_helpers_no_hint",
@@ -1575,11 +1554,6 @@ def test_detect_platform_hint_from_filename(
         ("file_ESP8266.cpp", determine_jobs.Platform.ESP8266_ARD),
         # ESP32 with different cases
         ("file_ESP32.cpp", determine_jobs.Platform.ESP32_IDF),
-        # nRF52/Zephyr with different cases
-        ("file_NRF52.cpp", determine_jobs.Platform.NRF52_ZEPHYR),
-        ("file_Nrf52.cpp", determine_jobs.Platform.NRF52_ZEPHYR),
-        ("file_ZEPHYR.cpp", determine_jobs.Platform.NRF52_ZEPHYR),
-        ("file_Zephyr.cpp", determine_jobs.Platform.NRF52_ZEPHYR),
     ],
     ids=[
         "rp2040_uppercase",
@@ -1588,10 +1562,6 @@ def test_detect_platform_hint_from_filename(
         "pico_titlecase",
         "esp8266_uppercase",
         "esp32_uppercase",
-        "nrf52_uppercase",
-        "nrf52_mixedcase",
-        "zephyr_uppercase",
-        "zephyr_titlecase",
     ],
 )
 def test_detect_platform_hint_from_filename_case_insensitive(