Refactor API entity update dispatch to reduce code duplication

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.github/workflows/ci.yml

@@ -214,51 +214,17 @@ jobs:
         if: matrix.os == 'windows-latest'
         run: |
           ./venv/Scripts/activate
-          pytest -vv --cov-report=xml --tb=native -n auto tests --ignore=tests/integration/
+          pytest -vv --cov-report=xml --tb=native -n auto tests
       - name: Run pytest
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
         run: |
           . venv/bin/activate
-          pytest -vv --cov-report=xml --tb=native -n auto tests --ignore=tests/integration/
+          pytest -vv --cov-report=xml --tb=native -n auto tests
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5.4.3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
-  integration-tests:
-    name: Run integration tests
-    runs-on: ubuntu-latest
-    needs:
-      - common
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Set up Python 3.13
-        id: python
-        uses: actions/setup-python@v5.6.0
-        with:
-          python-version: "3.13"
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.2.3
-        with:
-          path: venv
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
-      - name: Create Python virtual environment
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          python -m venv venv
-          . venv/bin/activate
-          python --version
-          pip install -r requirements.txt -r requirements_test.txt
-          pip install -e .
-      - name: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
-      - name: Run integration tests
-        run: |
-          . venv/bin/activate
-          pytest -vv --no-cov --tb=native -n auto tests/integration/
-
   clang-format:
     name: Check clang-format
     runs-on: ubuntu-24.04
@@ -528,7 +494,6 @@ jobs:
       - flake8
       - pylint
       - pytest
-      - integration-tests
       - pyupgrade
       - clang-tidy
       - list-components

.pre-commit-config.yaml

@@ -1,14 +1,6 @@
 ---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-
-ci:
-  autoupdate_commit_msg: 'pre-commit: autoupdate'
-  autoupdate_schedule: weekly
-  autofix_prs: false
-  # Skip hooks that have issues in pre-commit CI environment
-  skip: [pylint, yamllint]
-
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.

CODEOWNERS

@@ -170,7 +170,6 @@ esphome/components/ft5x06/* @clydebarrow
 esphome/components/ft63x6/* @gpambrozio
 esphome/components/gcja5/* @gcormier
 esphome/components/gdk101/* @Szewcson
-esphome/components/gl_r01_i2c/* @pkejval
 esphome/components/globals/* @esphome/core
 esphome/components/gp2y1010au0f/* @zry98
 esphome/components/gp8403/* @jesserockz
@@ -255,7 +254,6 @@ esphome/components/ln882x/* @lamauny
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
 esphome/components/logger/select/* @clydebarrow
-esphome/components/lps22/* @nagisa
 esphome/components/ltr390/* @latonita @sjtrny
 esphome/components/ltr501/* @latonita
 esphome/components/ltr_als_ps/* @latonita
@@ -331,6 +329,7 @@ esphome/components/opentherm/* @olegtarasov
 esphome/components/openthread/* @mrene
 esphome/components/opt3001/* @ccutrer
 esphome/components/ota/* @esphome/core
+esphome/components/ota_base/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/packet_transport/* @clydebarrow
 esphome/components/pca6416a/* @Mat931

Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = ESPHome
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2025.7.5
+PROJECT_NUMBER         = 2025.7.0-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

esphome/components/apds9960/apds9960.cpp

@@ -23,7 +23,7 @@ void APDS9960::setup() {
     return;
   }
 
-  if (id != 0xAB && id != 0x9C && id != 0xA8 && id != 0x9E) {  // APDS9960 all should have one of these IDs
+  if (id != 0xAB && id != 0x9C && id != 0xA8) {  // APDS9960 all should have one of these IDs
     this->error_code_ = WRONG_ID;
     this->mark_failed();
     return;

esphome/components/api/__init__.py

@@ -3,7 +3,6 @@ import base64
 from esphome import automation
 from esphome.automation import Condition
 import esphome.codegen as cg
-from esphome.config_helpers import get_logger_level
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ACTION,
@@ -26,7 +25,6 @@ from esphome.const import (
 )
 from esphome.core import CORE, coroutine_with_priority
 
-DOMAIN = "api"
 DEPENDENCIES = ["network"]
 AUTO_LOAD = ["socket"]
 CODEOWNERS = ["@OttoWinter"]
@@ -52,7 +50,6 @@ SERVICE_ARG_NATIVE_TYPES = {
 }
 CONF_ENCRYPTION = "encryption"
 CONF_BATCH_DELAY = "batch_delay"
-CONF_CUSTOM_SERVICES = "custom_services"
 
 
 def validate_encryption_key(value):
@@ -117,7 +114,6 @@ CONFIG_SCHEMA = cv.All(
                 cv.positive_time_period_milliseconds,
                 cv.Range(max=cv.TimePeriod(milliseconds=65535)),
             ),
-            cv.Optional(CONF_CUSTOM_SERVICES, default=False): cv.boolean,
             cv.Optional(CONF_ON_CLIENT_CONNECTED): automation.validate_automation(
                 single=True
             ),
@@ -142,11 +138,8 @@ async def to_code(config):
     cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
     cg.add(var.set_batch_delay(config[CONF_BATCH_DELAY]))
 
-    # Set USE_API_SERVICES if any services are enabled
-    if config.get(CONF_ACTIONS) or config[CONF_CUSTOM_SERVICES]:
-        cg.add_define("USE_API_SERVICES")
-
     if actions := config.get(CONF_ACTIONS, []):
+        cg.add_define("USE_API_YAML_SERVICES")
         for conf in actions:
             template_args = []
             func_args = []
@@ -323,22 +316,11 @@ async def api_connected_to_code(config, condition_id, template_arg, args):
 
 
 def FILTER_SOURCE_FILES() -> list[str]:
-    """Filter out api_pb2_dump.cpp when proto message dumping is not enabled
-    and user_services.cpp when no services are defined."""
-    files_to_filter = []
-
+    """Filter out api_pb2_dump.cpp when proto message dumping is not enabled."""
     # api_pb2_dump.cpp is only needed when HAS_PROTO_MESSAGE_DUMP is defined
     # This is a particularly large file that still needs to be opened and read
     # all the way to the end even when ifdef'd out
-    #
-    # HAS_PROTO_MESSAGE_DUMP is defined when ESPHOME_LOG_HAS_VERY_VERBOSE is set,
-    # which happens when the logger level is VERY_VERBOSE
-    if get_logger_level() != "VERY_VERBOSE":
-        files_to_filter.append("api_pb2_dump.cpp")
+    if "HAS_PROTO_MESSAGE_DUMP" not in CORE.defines:
+        return ["api_pb2_dump.cpp"]
 
-    # user_services.cpp is only needed when services are defined
-    config = CORE.config.get(DOMAIN, {})
-    if config and not config.get(CONF_ACTIONS) and not config[CONF_CUSTOM_SERVICES]:
-        files_to_filter.append("user_services.cpp")
-
-    return files_to_filter
+    return []

esphome/components/api/api.proto

@@ -374,7 +374,6 @@ message CoverCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_COVER";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
 
@@ -388,7 +387,6 @@ message CoverCommandRequest {
   bool has_tilt = 6;
   float tilt = 7;
   bool stop = 8;
-  uint32 device_id = 9;
 }
 
 // ==================== FAN ====================
@@ -443,7 +441,6 @@ message FanCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_FAN";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   bool has_state = 2;
@@ -458,7 +455,6 @@ message FanCommandRequest {
   int32 speed_level = 11;
   bool has_preset_mode = 12;
   string preset_mode = 13;
-  uint32 device_id = 14;
 }
 
 // ==================== LIGHT ====================
@@ -527,7 +523,6 @@ message LightCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_LIGHT";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   bool has_state = 2;
@@ -556,7 +551,6 @@ message LightCommandRequest {
   uint32 flash_length = 17;
   bool has_effect = 18;
   string effect = 19;
-  uint32 device_id = 28;
 }
 
 // ==================== SENSOR ====================
@@ -646,11 +640,9 @@ message SwitchCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_SWITCH";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   bool state = 2;
-  uint32 device_id = 3;
 }
 
 // ==================== TEXT SENSOR ====================
@@ -807,21 +799,18 @@ enum ServiceArgType {
   SERVICE_ARG_TYPE_STRING_ARRAY = 7;
 }
 message ListEntitiesServicesArgument {
-  option (ifdef) = "USE_API_SERVICES";
   string name = 1;
   ServiceArgType type = 2;
 }
 message ListEntitiesServicesResponse {
   option (id) = 41;
   option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_API_SERVICES";
 
   string name = 1;
   fixed32 key = 2;
   repeated ListEntitiesServicesArgument args = 3;
 }
 message ExecuteServiceArgument {
-  option (ifdef) = "USE_API_SERVICES";
   bool bool_ = 1;
   int32 legacy_int = 2;
   float float_ = 3;
@@ -837,7 +826,6 @@ message ExecuteServiceRequest {
   option (id) = 42;
   option (source) = SOURCE_CLIENT;
   option (no_delay) = true;
-  option (ifdef) = "USE_API_SERVICES";
 
   fixed32 key = 1;
   repeated ExecuteServiceArgument args = 2;
@@ -862,14 +850,12 @@ message ListEntitiesCameraResponse {
 
 message CameraImageResponse {
   option (id) = 44;
-  option (base_class) = "StateResponseProtoMessage";
   option (source) = SOURCE_SERVER;
   option (ifdef) = "USE_CAMERA";
 
   fixed32 key = 1;
   bytes data = 2;
   bool done = 3;
-  uint32 device_id = 4;
 }
 message CameraImageRequest {
   option (id) = 45;
@@ -994,7 +980,6 @@ message ClimateCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_CLIMATE";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   bool has_mode = 2;
@@ -1020,7 +1005,6 @@ message ClimateCommandRequest {
   string custom_preset = 21;
   bool has_target_humidity = 22;
   float target_humidity = 23;
-  uint32 device_id = 24;
 }
 
 // ==================== NUMBER ====================
@@ -1070,11 +1054,9 @@ message NumberCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_NUMBER";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   float state = 2;
-  uint32 device_id = 3;
 }
 
 // ==================== SELECT ====================
@@ -1114,11 +1096,9 @@ message SelectCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_SELECT";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   string state = 2;
-  uint32 device_id = 3;
 }
 
 // ==================== SIREN ====================
@@ -1157,7 +1137,6 @@ message SirenCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_SIREN";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   bool has_state = 2;
@@ -1168,7 +1147,6 @@ message SirenCommandRequest {
   uint32 duration = 7;
   bool has_volume = 8;
   float volume = 9;
-  uint32 device_id = 10;
 }
 
 // ==================== LOCK ====================
@@ -1223,14 +1201,12 @@ message LockCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_LOCK";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
   fixed32 key = 1;
   LockCommand command = 2;
 
   // Not yet implemented:
   bool has_code = 3;
   string code = 4;
-  uint32 device_id = 5;
 }
 
 // ==================== BUTTON ====================
@@ -1256,10 +1232,8 @@ message ButtonCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_BUTTON";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
-  uint32 device_id = 2;
 }
 
 // ==================== MEDIA PLAYER ====================
@@ -1327,7 +1301,6 @@ message MediaPlayerCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_MEDIA_PLAYER";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
 
@@ -1342,7 +1315,6 @@ message MediaPlayerCommandRequest {
 
   bool has_announcement = 8;
   bool announcement = 9;
-  uint32 device_id = 10;
 }
 
 // ==================== BLUETOOTH ====================
@@ -1871,11 +1843,9 @@ message AlarmControlPanelCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_ALARM_CONTROL_PANEL";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
   fixed32 key = 1;
   AlarmControlPanelStateCommand command = 2;
   string code = 3;
-  uint32 device_id = 4;
 }
 
 // ===================== TEXT =====================
@@ -1922,11 +1892,9 @@ message TextCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_TEXT";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   string state = 2;
-  uint32 device_id = 3;
 }
 
 
@@ -1968,13 +1936,11 @@ message DateCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_DATETIME_DATE";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   uint32 year = 2;
   uint32 month = 3;
   uint32 day = 4;
-  uint32 device_id = 5;
 }
 
 // ==================== DATETIME TIME ====================
@@ -2015,13 +1981,11 @@ message TimeCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_DATETIME_TIME";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   uint32 hour = 2;
   uint32 minute = 3;
   uint32 second = 4;
-  uint32 device_id = 5;
 }
 
 // ==================== EVENT ====================
@@ -2101,13 +2065,11 @@ message ValveCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_VALVE";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   bool has_position = 2;
   float position = 3;
   bool stop = 4;
-  uint32 device_id = 5;
 }
 
 // ==================== DATETIME DATETIME ====================
@@ -2146,11 +2108,9 @@ message DateTimeCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_DATETIME_DATETIME";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   fixed32 epoch_seconds = 2;
-  uint32 device_id = 3;
 }
 
 // ==================== UPDATE ====================
@@ -2200,9 +2160,7 @@ message UpdateCommandRequest {
   option (source) = SOURCE_CLIENT;
   option (ifdef) = "USE_UPDATE";
   option (no_delay) = true;
-  option (base_class) = "CommandProtoMessage";
 
   fixed32 key = 1;
   UpdateCommand command = 2;
-  uint32 device_id = 3;
 }

esphome/components/api/api_connection.cpp

@@ -45,14 +45,14 @@ static const int CAMERA_STOP_STREAM = 5000;
 // Helper macro for entity command handlers - gets entity by key, returns if not found, and creates call object
 #define ENTITY_COMMAND_MAKE_CALL(entity_type, entity_var, getter_name) \
   entity_type *entity_var = App.get_##getter_name##_by_key(msg.key); \
-  if ((entity_var) == nullptr) \
+  if (entity_var == nullptr) \
     return; \
-  auto call = (entity_var)->make_call();
+  auto call = entity_var->make_call();
 
 // Helper macro for entity command handlers that don't use make_call() - gets entity by key and returns if not found
 #define ENTITY_COMMAND_GET(entity_type, entity_var, getter_name) \
   entity_type *entity_var = App.get_##getter_name##_by_key(msg.key); \
-  if ((entity_var) == nullptr) \
+  if (entity_var == nullptr) \
     return;
 
 APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *parent)
@@ -193,15 +193,14 @@ void APIConnection::loop() {
       // If we can't send the ping request directly (tx_buffer full),
       // schedule it at the front of the batch so it will be sent with priority
       ESP_LOGW(TAG, "Buffer full, ping queued");
-      this->schedule_message_front_(nullptr, &APIConnection::try_send_ping_request, PingRequest::MESSAGE_TYPE,
-                                    PingRequest::ESTIMATED_SIZE);
+      this->schedule_message_front_(nullptr, &APIConnection::try_send_ping_request, PingRequest::MESSAGE_TYPE);
       this->flags_.sent_ping = true;  // Mark as sent to avoid scheduling multiple pings
     }
   }
 
 #ifdef USE_CAMERA
   if (this->image_reader_ && this->image_reader_->available() && this->helper_->can_write_without_blocking()) {
-    uint32_t to_send = std::min((size_t) MAX_BATCH_PACKET_SIZE, this->image_reader_->available());
+    uint32_t to_send = std::min((size_t) MAX_PACKET_SIZE, this->image_reader_->available());
     bool done = this->image_reader_->available() == to_send;
     uint32_t msg_size = 0;
     ProtoSize::add_fixed_field<4>(msg_size, 1, true);
@@ -266,7 +265,7 @@ void APIConnection::on_disconnect_response(const DisconnectResponse &value) {
 
 // Encodes a message to the buffer and returns the total number of bytes used,
 // including header and footer overhead. Returns 0 if the message doesn't fit.
-uint16_t APIConnection::encode_message_to_buffer(ProtoMessage &msg, uint8_t message_type, APIConnection *conn,
+uint16_t APIConnection::encode_message_to_buffer(ProtoMessage &msg, uint16_t message_type, APIConnection *conn,
                                                  uint32_t remaining_size, bool is_single) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
   // If in log-only mode, just log and return
@@ -317,7 +316,7 @@ uint16_t APIConnection::encode_message_to_buffer(ProtoMessage &msg, uint8_t mess
 #ifdef USE_BINARY_SENSOR
 bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor) {
   return this->send_message_smart_(binary_sensor, &APIConnection::try_send_binary_sensor_state,
-                                   BinarySensorStateResponse::MESSAGE_TYPE, BinarySensorStateResponse::ESTIMATED_SIZE);
+                                   BinarySensorStateResponse::MESSAGE_TYPE);
 }
 
 uint16_t APIConnection::try_send_binary_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -344,8 +343,7 @@ uint16_t APIConnection::try_send_binary_sensor_info(EntityBase *entity, APIConne
 
 #ifdef USE_COVER
 bool APIConnection::send_cover_state(cover::Cover *cover) {
-  return this->send_message_smart_(cover, &APIConnection::try_send_cover_state, CoverStateResponse::MESSAGE_TYPE,
-                                   CoverStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(cover, &APIConnection::try_send_cover_state, CoverStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_cover_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
@@ -402,8 +400,7 @@ void APIConnection::cover_command(const CoverCommandRequest &msg) {
 
 #ifdef USE_FAN
 bool APIConnection::send_fan_state(fan::Fan *fan) {
-  return this->send_message_smart_(fan, &APIConnection::try_send_fan_state, FanStateResponse::MESSAGE_TYPE,
-                                   FanStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(fan, &APIConnection::try_send_fan_state, FanStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_fan_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                            bool is_single) {
@@ -458,8 +455,7 @@ void APIConnection::fan_command(const FanCommandRequest &msg) {
 
 #ifdef USE_LIGHT
 bool APIConnection::send_light_state(light::LightState *light) {
-  return this->send_message_smart_(light, &APIConnection::try_send_light_state, LightStateResponse::MESSAGE_TYPE,
-                                   LightStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(light, &APIConnection::try_send_light_state, LightStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_light_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
@@ -547,8 +543,7 @@ void APIConnection::light_command(const LightCommandRequest &msg) {
 
 #ifdef USE_SENSOR
 bool APIConnection::send_sensor_state(sensor::Sensor *sensor) {
-  return this->send_message_smart_(sensor, &APIConnection::try_send_sensor_state, SensorStateResponse::MESSAGE_TYPE,
-                                   SensorStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(sensor, &APIConnection::try_send_sensor_state, SensorStateResponse::MESSAGE_TYPE);
 }
 
 uint16_t APIConnection::try_send_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -580,8 +575,7 @@ uint16_t APIConnection::try_send_sensor_info(EntityBase *entity, APIConnection *
 
 #ifdef USE_SWITCH
 bool APIConnection::send_switch_state(switch_::Switch *a_switch) {
-  return this->send_message_smart_(a_switch, &APIConnection::try_send_switch_state, SwitchStateResponse::MESSAGE_TYPE,
-                                   SwitchStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(a_switch, &APIConnection::try_send_switch_state, SwitchStateResponse::MESSAGE_TYPE);
 }
 
 uint16_t APIConnection::try_send_switch_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -617,7 +611,7 @@ void APIConnection::switch_command(const SwitchCommandRequest &msg) {
 #ifdef USE_TEXT_SENSOR
 bool APIConnection::send_text_sensor_state(text_sensor::TextSensor *text_sensor) {
   return this->send_message_smart_(text_sensor, &APIConnection::try_send_text_sensor_state,
-                                   TextSensorStateResponse::MESSAGE_TYPE, TextSensorStateResponse::ESTIMATED_SIZE);
+                                   TextSensorStateResponse::MESSAGE_TYPE);
 }
 
 uint16_t APIConnection::try_send_text_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -644,8 +638,7 @@ uint16_t APIConnection::try_send_text_sensor_info(EntityBase *entity, APIConnect
 
 #ifdef USE_CLIMATE
 bool APIConnection::send_climate_state(climate::Climate *climate) {
-  return this->send_message_smart_(climate, &APIConnection::try_send_climate_state, ClimateStateResponse::MESSAGE_TYPE,
-                                   ClimateStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(climate, &APIConnection::try_send_climate_state, ClimateStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_climate_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                bool is_single) {
@@ -741,8 +734,7 @@ void APIConnection::climate_command(const ClimateCommandRequest &msg) {
 
 #ifdef USE_NUMBER
 bool APIConnection::send_number_state(number::Number *number) {
-  return this->send_message_smart_(number, &APIConnection::try_send_number_state, NumberStateResponse::MESSAGE_TYPE,
-                                   NumberStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(number, &APIConnection::try_send_number_state, NumberStateResponse::MESSAGE_TYPE);
 }
 
 uint16_t APIConnection::try_send_number_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -778,8 +770,7 @@ void APIConnection::number_command(const NumberCommandRequest &msg) {
 
 #ifdef USE_DATETIME_DATE
 bool APIConnection::send_date_state(datetime::DateEntity *date) {
-  return this->send_message_smart_(date, &APIConnection::try_send_date_state, DateStateResponse::MESSAGE_TYPE,
-                                   DateStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(date, &APIConnection::try_send_date_state, DateStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_date_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
@@ -809,8 +800,7 @@ void APIConnection::date_command(const DateCommandRequest &msg) {
 
 #ifdef USE_DATETIME_TIME
 bool APIConnection::send_time_state(datetime::TimeEntity *time) {
-  return this->send_message_smart_(time, &APIConnection::try_send_time_state, TimeStateResponse::MESSAGE_TYPE,
-                                   TimeStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(time, &APIConnection::try_send_time_state, TimeStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_time_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
@@ -841,7 +831,7 @@ void APIConnection::time_command(const TimeCommandRequest &msg) {
 #ifdef USE_DATETIME_DATETIME
 bool APIConnection::send_datetime_state(datetime::DateTimeEntity *datetime) {
   return this->send_message_smart_(datetime, &APIConnection::try_send_datetime_state,
-                                   DateTimeStateResponse::MESSAGE_TYPE, DateTimeStateResponse::ESTIMATED_SIZE);
+                                   DateTimeStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_datetime_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                 bool is_single) {
@@ -872,8 +862,7 @@ void APIConnection::datetime_command(const DateTimeCommandRequest &msg) {
 
 #ifdef USE_TEXT
 bool APIConnection::send_text_state(text::Text *text) {
-  return this->send_message_smart_(text, &APIConnection::try_send_text_state, TextStateResponse::MESSAGE_TYPE,
-                                   TextStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(text, &APIConnection::try_send_text_state, TextStateResponse::MESSAGE_TYPE);
 }
 
 uint16_t APIConnection::try_send_text_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -907,8 +896,7 @@ void APIConnection::text_command(const TextCommandRequest &msg) {
 
 #ifdef USE_SELECT
 bool APIConnection::send_select_state(select::Select *select) {
-  return this->send_message_smart_(select, &APIConnection::try_send_select_state, SelectStateResponse::MESSAGE_TYPE,
-                                   SelectStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(select, &APIConnection::try_send_select_state, SelectStateResponse::MESSAGE_TYPE);
 }
 
 uint16_t APIConnection::try_send_select_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -956,8 +944,7 @@ void esphome::api::APIConnection::button_command(const ButtonCommandRequest &msg
 
 #ifdef USE_LOCK
 bool APIConnection::send_lock_state(lock::Lock *a_lock) {
-  return this->send_message_smart_(a_lock, &APIConnection::try_send_lock_state, LockStateResponse::MESSAGE_TYPE,
-                                   LockStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(a_lock, &APIConnection::try_send_lock_state, LockStateResponse::MESSAGE_TYPE);
 }
 
 uint16_t APIConnection::try_send_lock_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -999,8 +986,7 @@ void APIConnection::lock_command(const LockCommandRequest &msg) {
 
 #ifdef USE_VALVE
 bool APIConnection::send_valve_state(valve::Valve *valve) {
-  return this->send_message_smart_(valve, &APIConnection::try_send_valve_state, ValveStateResponse::MESSAGE_TYPE,
-                                   ValveStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(valve, &APIConnection::try_send_valve_state, ValveStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_valve_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
@@ -1037,7 +1023,7 @@ void APIConnection::valve_command(const ValveCommandRequest &msg) {
 #ifdef USE_MEDIA_PLAYER
 bool APIConnection::send_media_player_state(media_player::MediaPlayer *media_player) {
   return this->send_message_smart_(media_player, &APIConnection::try_send_media_player_state,
-                                   MediaPlayerStateResponse::MESSAGE_TYPE, MediaPlayerStateResponse::ESTIMATED_SIZE);
+                                   MediaPlayerStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_media_player_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                     bool is_single) {
@@ -1190,53 +1176,66 @@ void APIConnection::bluetooth_scanner_set_mode(const BluetoothScannerSetModeRequ
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-bool APIConnection::check_voice_assistant_api_connection_() const {
-  return voice_assistant::global_voice_assistant != nullptr &&
-         voice_assistant::global_voice_assistant->get_api_connection() == this;
-}
-
 void APIConnection::subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) {
   if (voice_assistant::global_voice_assistant != nullptr) {
     voice_assistant::global_voice_assistant->client_subscription(this, msg.subscribe);
   }
 }
 void APIConnection::on_voice_assistant_response(const VoiceAssistantResponse &msg) {
-  if (!this->check_voice_assistant_api_connection_()) {
-    return;
-  }
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return;
+    }
 
-  if (msg.error) {
-    voice_assistant::global_voice_assistant->failed_to_start();
-    return;
-  }
-  if (msg.port == 0) {
-    // Use API Audio
-    voice_assistant::global_voice_assistant->start_streaming();
-  } else {
-    struct sockaddr_storage storage;
-    socklen_t len = sizeof(storage);
-    this->helper_->getpeername((struct sockaddr *) &storage, &len);
-    voice_assistant::global_voice_assistant->start_streaming(&storage, msg.port);
+    if (msg.error) {
+      voice_assistant::global_voice_assistant->failed_to_start();
+      return;
+    }
+    if (msg.port == 0) {
+      // Use API Audio
+      voice_assistant::global_voice_assistant->start_streaming();
+    } else {
+      struct sockaddr_storage storage;
+      socklen_t len = sizeof(storage);
+      this->helper_->getpeername((struct sockaddr *) &storage, &len);
+      voice_assistant::global_voice_assistant->start_streaming(&storage, msg.port);
+    }
   }
 };
 void APIConnection::on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) {
-  if (this->check_voice_assistant_api_connection_()) {
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return;
+    }
+
     voice_assistant::global_voice_assistant->on_event(msg);
   }
 }
 void APIConnection::on_voice_assistant_audio(const VoiceAssistantAudio &msg) {
-  if (this->check_voice_assistant_api_connection_()) {
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return;
+    }
+
     voice_assistant::global_voice_assistant->on_audio(msg);
   }
 };
 void APIConnection::on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &msg) {
-  if (this->check_voice_assistant_api_connection_()) {
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return;
+    }
+
     voice_assistant::global_voice_assistant->on_timer_event(msg);
   }
 };
 
 void APIConnection::on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &msg) {
-  if (this->check_voice_assistant_api_connection_()) {
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return;
+    }
+
     voice_assistant::global_voice_assistant->on_announce(msg);
   }
 }
@@ -1244,29 +1243,35 @@ void APIConnection::on_voice_assistant_announce_request(const VoiceAssistantAnno
 VoiceAssistantConfigurationResponse APIConnection::voice_assistant_get_configuration(
     const VoiceAssistantConfigurationRequest &msg) {
   VoiceAssistantConfigurationResponse resp;
-  if (!this->check_voice_assistant_api_connection_()) {
-    return resp;
-  }
-
-  auto &config = voice_assistant::global_voice_assistant->get_configuration();
-  for (auto &wake_word : config.available_wake_words) {
-    VoiceAssistantWakeWord resp_wake_word;
-    resp_wake_word.id = wake_word.id;
-    resp_wake_word.wake_word = wake_word.wake_word;
-    for (const auto &lang : wake_word.trained_languages) {
-      resp_wake_word.trained_languages.push_back(lang);
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return resp;
     }
-    resp.available_wake_words.push_back(std::move(resp_wake_word));
+
+    auto &config = voice_assistant::global_voice_assistant->get_configuration();
+    for (auto &wake_word : config.available_wake_words) {
+      VoiceAssistantWakeWord resp_wake_word;
+      resp_wake_word.id = wake_word.id;
+      resp_wake_word.wake_word = wake_word.wake_word;
+      for (const auto &lang : wake_word.trained_languages) {
+        resp_wake_word.trained_languages.push_back(lang);
+      }
+      resp.available_wake_words.push_back(std::move(resp_wake_word));
+    }
+    for (auto &wake_word_id : config.active_wake_words) {
+      resp.active_wake_words.push_back(wake_word_id);
+    }
+    resp.max_active_wake_words = config.max_active_wake_words;
   }
-  for (auto &wake_word_id : config.active_wake_words) {
-    resp.active_wake_words.push_back(wake_word_id);
-  }
-  resp.max_active_wake_words = config.max_active_wake_words;
   return resp;
 }
 
 void APIConnection::voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) {
-  if (this->check_voice_assistant_api_connection_()) {
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return;
+    }
+
     voice_assistant::global_voice_assistant->on_set_configuration(msg.active_wake_words);
   }
 }
@@ -1276,8 +1281,7 @@ void APIConnection::voice_assistant_set_configuration(const VoiceAssistantSetCon
 #ifdef USE_ALARM_CONTROL_PANEL
 bool APIConnection::send_alarm_control_panel_state(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
   return this->send_message_smart_(a_alarm_control_panel, &APIConnection::try_send_alarm_control_panel_state,
-                                   AlarmControlPanelStateResponse::MESSAGE_TYPE,
-                                   AlarmControlPanelStateResponse::ESTIMATED_SIZE);
+                                   AlarmControlPanelStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_alarm_control_panel_state(EntityBase *entity, APIConnection *conn,
                                                            uint32_t remaining_size, bool is_single) {
@@ -1331,8 +1335,7 @@ void APIConnection::alarm_control_panel_command(const AlarmControlPanelCommandRe
 
 #ifdef USE_EVENT
 void APIConnection::send_event(event::Event *event, const std::string &event_type) {
-  this->schedule_message_(event, MessageCreator(event_type), EventResponse::MESSAGE_TYPE,
-                          EventResponse::ESTIMATED_SIZE);
+  this->schedule_message_(event, MessageCreator(event_type), EventResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_event_response(event::Event *event, const std::string &event_type, APIConnection *conn,
                                                 uint32_t remaining_size, bool is_single) {
@@ -1357,8 +1360,7 @@ uint16_t APIConnection::try_send_event_info(EntityBase *entity, APIConnection *c
 
 #ifdef USE_UPDATE
 bool APIConnection::send_update_state(update::UpdateEntity *update) {
-  return this->send_message_smart_(update, &APIConnection::try_send_update_state, UpdateStateResponse::MESSAGE_TYPE,
-                                   UpdateStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(update, &APIConnection::try_send_update_state, UpdateStateResponse::MESSAGE_TYPE);
 }
 uint16_t APIConnection::try_send_update_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                               bool is_single) {
@@ -1551,7 +1553,6 @@ void APIConnection::on_home_assistant_state_response(const HomeAssistantStateRes
     }
   }
 }
-#ifdef USE_API_SERVICES
 void APIConnection::execute_service(const ExecuteServiceRequest &msg) {
   bool found = false;
   for (auto *service : this->parent_->get_user_services()) {
@@ -1563,7 +1564,6 @@ void APIConnection::execute_service(const ExecuteServiceRequest &msg) {
     ESP_LOGV(TAG, "Could not find service");
   }
 }
-#endif
 #ifdef USE_API_NOISE
 NoiseEncryptionSetKeyResponse APIConnection::noise_encryption_set_key(const NoiseEncryptionSetKeyRequest &msg) {
   psk_t psk{};
@@ -1607,7 +1607,7 @@ bool APIConnection::try_to_clear_buffer(bool log_out_of_space) {
   }
   return false;
 }
-bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) {
+bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint16_t message_type) {
   if (!this->try_to_clear_buffer(message_type != SubscribeLogsResponse::MESSAGE_TYPE)) {  // SubscribeLogsResponse
     return false;
   }
@@ -1641,8 +1641,7 @@ void APIConnection::on_fatal_error() {
   this->flags_.remove = true;
 }
 
-void APIConnection::DeferredBatch::add_item(EntityBase *entity, MessageCreator creator, uint8_t message_type,
-                                            uint8_t estimated_size) {
+void APIConnection::DeferredBatch::add_item(EntityBase *entity, MessageCreator creator, uint16_t message_type) {
   // Check if we already have a message of this type for this entity
   // This provides deduplication per entity/message_type combination
   // O(n) but optimized for RAM and not performance.
@@ -1657,13 +1656,12 @@ void APIConnection::DeferredBatch::add_item(EntityBase *entity, MessageCreator c
   }
 
   // No existing item found, add new one
-  items.emplace_back(entity, std::move(creator), message_type, estimated_size);
+  items.emplace_back(entity, std::move(creator), message_type);
 }
 
-void APIConnection::DeferredBatch::add_item_front(EntityBase *entity, MessageCreator creator, uint8_t message_type,
-                                                  uint8_t estimated_size) {
+void APIConnection::DeferredBatch::add_item_front(EntityBase *entity, MessageCreator creator, uint16_t message_type) {
   // Insert at front for high priority messages (no deduplication check)
-  items.insert(items.begin(), BatchItem(entity, std::move(creator), message_type, estimated_size));
+  items.insert(items.begin(), BatchItem(entity, std::move(creator), message_type));
 }
 
 bool APIConnection::schedule_batch_() {
@@ -1735,7 +1733,7 @@ void APIConnection::process_batch_() {
   uint32_t total_estimated_size = 0;
   for (size_t i = 0; i < this->deferred_batch_.size(); i++) {
     const auto &item = this->deferred_batch_[i];
-    total_estimated_size += item.estimated_size;
+    total_estimated_size += get_estimated_message_size(item.message_type);
   }
 
   // Calculate total overhead for all messages
@@ -1773,9 +1771,9 @@ void APIConnection::process_batch_() {
 
     // Update tracking variables
     items_processed++;
-    // After first message, set remaining size to MAX_BATCH_PACKET_SIZE to avoid fragmentation
+    // After first message, set remaining size to MAX_PACKET_SIZE to avoid fragmentation
     if (items_processed == 1) {
-      remaining_size = MAX_BATCH_PACKET_SIZE;
+      remaining_size = MAX_PACKET_SIZE;
     }
     remaining_size -= payload_size;
     // Calculate where the next message's header padding will start
@@ -1829,7 +1827,7 @@ void APIConnection::process_batch_() {
 }
 
 uint16_t APIConnection::MessageCreator::operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
-                                                   bool is_single, uint8_t message_type) const {
+                                                   bool is_single, uint16_t message_type) const {
 #ifdef USE_EVENT
   // Special case: EventResponse uses string pointer
   if (message_type == EventResponse::MESSAGE_TYPE) {
@@ -1860,6 +1858,149 @@ uint16_t APIConnection::try_send_ping_request(EntityBase *entity, APIConnection
   return encode_message_to_buffer(req, PingRequest::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 
+uint16_t APIConnection::get_estimated_message_size(uint16_t message_type) {
+  // Use generated ESTIMATED_SIZE constants from each message type
+  switch (message_type) {
+#ifdef USE_BINARY_SENSOR
+    case BinarySensorStateResponse::MESSAGE_TYPE:
+      return BinarySensorStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesBinarySensorResponse::MESSAGE_TYPE:
+      return ListEntitiesBinarySensorResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_SENSOR
+    case SensorStateResponse::MESSAGE_TYPE:
+      return SensorStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesSensorResponse::MESSAGE_TYPE:
+      return ListEntitiesSensorResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_SWITCH
+    case SwitchStateResponse::MESSAGE_TYPE:
+      return SwitchStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesSwitchResponse::MESSAGE_TYPE:
+      return ListEntitiesSwitchResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_TEXT_SENSOR
+    case TextSensorStateResponse::MESSAGE_TYPE:
+      return TextSensorStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesTextSensorResponse::MESSAGE_TYPE:
+      return ListEntitiesTextSensorResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_NUMBER
+    case NumberStateResponse::MESSAGE_TYPE:
+      return NumberStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesNumberResponse::MESSAGE_TYPE:
+      return ListEntitiesNumberResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_TEXT
+    case TextStateResponse::MESSAGE_TYPE:
+      return TextStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesTextResponse::MESSAGE_TYPE:
+      return ListEntitiesTextResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_SELECT
+    case SelectStateResponse::MESSAGE_TYPE:
+      return SelectStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesSelectResponse::MESSAGE_TYPE:
+      return ListEntitiesSelectResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_LOCK
+    case LockStateResponse::MESSAGE_TYPE:
+      return LockStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesLockResponse::MESSAGE_TYPE:
+      return ListEntitiesLockResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_EVENT
+    case EventResponse::MESSAGE_TYPE:
+      return EventResponse::ESTIMATED_SIZE;
+    case ListEntitiesEventResponse::MESSAGE_TYPE:
+      return ListEntitiesEventResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_COVER
+    case CoverStateResponse::MESSAGE_TYPE:
+      return CoverStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesCoverResponse::MESSAGE_TYPE:
+      return ListEntitiesCoverResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_FAN
+    case FanStateResponse::MESSAGE_TYPE:
+      return FanStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesFanResponse::MESSAGE_TYPE:
+      return ListEntitiesFanResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_LIGHT
+    case LightStateResponse::MESSAGE_TYPE:
+      return LightStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesLightResponse::MESSAGE_TYPE:
+      return ListEntitiesLightResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_CLIMATE
+    case ClimateStateResponse::MESSAGE_TYPE:
+      return ClimateStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesClimateResponse::MESSAGE_TYPE:
+      return ListEntitiesClimateResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_ESP32_CAMERA
+    case ListEntitiesCameraResponse::MESSAGE_TYPE:
+      return ListEntitiesCameraResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_BUTTON
+    case ListEntitiesButtonResponse::MESSAGE_TYPE:
+      return ListEntitiesButtonResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_MEDIA_PLAYER
+    case MediaPlayerStateResponse::MESSAGE_TYPE:
+      return MediaPlayerStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesMediaPlayerResponse::MESSAGE_TYPE:
+      return ListEntitiesMediaPlayerResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_ALARM_CONTROL_PANEL
+    case AlarmControlPanelStateResponse::MESSAGE_TYPE:
+      return AlarmControlPanelStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesAlarmControlPanelResponse::MESSAGE_TYPE:
+      return ListEntitiesAlarmControlPanelResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_DATETIME_DATE
+    case DateStateResponse::MESSAGE_TYPE:
+      return DateStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesDateResponse::MESSAGE_TYPE:
+      return ListEntitiesDateResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_DATETIME_TIME
+    case TimeStateResponse::MESSAGE_TYPE:
+      return TimeStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesTimeResponse::MESSAGE_TYPE:
+      return ListEntitiesTimeResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_DATETIME_DATETIME
+    case DateTimeStateResponse::MESSAGE_TYPE:
+      return DateTimeStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesDateTimeResponse::MESSAGE_TYPE:
+      return ListEntitiesDateTimeResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_VALVE
+    case ValveStateResponse::MESSAGE_TYPE:
+      return ValveStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesValveResponse::MESSAGE_TYPE:
+      return ListEntitiesValveResponse::ESTIMATED_SIZE;
+#endif
+#ifdef USE_UPDATE
+    case UpdateStateResponse::MESSAGE_TYPE:
+      return UpdateStateResponse::ESTIMATED_SIZE;
+    case ListEntitiesUpdateResponse::MESSAGE_TYPE:
+      return ListEntitiesUpdateResponse::ESTIMATED_SIZE;
+#endif
+    case ListEntitiesServicesResponse::MESSAGE_TYPE:
+      return ListEntitiesServicesResponse::ESTIMATED_SIZE;
+    case ListEntitiesDoneResponse::MESSAGE_TYPE:
+      return ListEntitiesDoneResponse::ESTIMATED_SIZE;
+    case DisconnectRequest::MESSAGE_TYPE:
+      return DisconnectRequest::ESTIMATED_SIZE;
+    default:
+      // Fallback for unknown message types
+      return 24;
+  }
+}
+
 }  // namespace api
 }  // namespace esphome
 #endif

esphome/components/api/api_connection.h

@@ -33,7 +33,7 @@ class APIConnection : public APIServerConnection {
 
   bool send_list_info_done() {
     return this->schedule_message_(nullptr, &APIConnection::try_send_list_info_done,
-                                   ListEntitiesDoneResponse::MESSAGE_TYPE, ListEntitiesDoneResponse::ESTIMATED_SIZE);
+                                   ListEntitiesDoneResponse::MESSAGE_TYPE);
   }
 #ifdef USE_BINARY_SENSOR
   bool send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor);
@@ -195,9 +195,7 @@ class APIConnection : public APIServerConnection {
     // TODO
     return {};
   }
-#ifdef USE_API_SERVICES
   void execute_service(const ExecuteServiceRequest &msg) override;
-#endif
 #ifdef USE_API_NOISE
   NoiseEncryptionSetKeyResponse noise_encryption_set_key(const NoiseEncryptionSetKeyRequest &msg) override;
 #endif
@@ -258,7 +256,7 @@ class APIConnection : public APIServerConnection {
   }
 
   bool try_to_clear_buffer(bool log_out_of_space);
-  bool send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) override;
+  bool send_buffer(ProtoWriteBuffer buffer, uint16_t message_type) override;
 
   std::string get_client_combined_info() const {
     if (this->client_info_ == this->client_peername_) {
@@ -300,14 +298,9 @@ class APIConnection : public APIServerConnection {
   }
 
   // Non-template helper to encode any ProtoMessage
-  static uint16_t encode_message_to_buffer(ProtoMessage &msg, uint8_t message_type, APIConnection *conn,
+  static uint16_t encode_message_to_buffer(ProtoMessage &msg, uint16_t message_type, APIConnection *conn,
                                            uint32_t remaining_size, bool is_single);
 
-#ifdef USE_VOICE_ASSISTANT
-  // Helper to check voice assistant validity and connection ownership
-  inline bool check_voice_assistant_api_connection_() const;
-#endif
-
   // Helper method to process multiple entities from an iterator in a batch
   template<typename Iterator> void process_iterator_batch_(Iterator &iterator) {
     size_t initial_size = this->deferred_batch_.size();
@@ -445,6 +438,9 @@ class APIConnection : public APIServerConnection {
   static uint16_t try_send_disconnect_request(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                               bool is_single);
 
+  // Helper function to get estimated message size for buffer pre-allocation
+  static uint16_t get_estimated_message_size(uint16_t message_type);
+
   // Batch message method for ping requests
   static uint16_t try_send_ping_request(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                         bool is_single);
@@ -504,10 +500,10 @@ class APIConnection : public APIServerConnection {
 
     // Call operator - uses message_type to determine union type
     uint16_t operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single,
-                        uint8_t message_type) const;
+                        uint16_t message_type) const;
 
     // Manual cleanup method - must be called before destruction for string types
-    void cleanup(uint8_t message_type) {
+    void cleanup(uint16_t message_type) {
 #ifdef USE_EVENT
       if (message_type == EventResponse::MESSAGE_TYPE && data_.string_ptr != nullptr) {
         delete data_.string_ptr;
@@ -528,12 +524,11 @@ class APIConnection : public APIServerConnection {
     struct BatchItem {
       EntityBase *entity;      // Entity pointer
       MessageCreator creator;  // Function that creates the message when needed
-      uint8_t message_type;    // Message type for overhead calculation (max 255)
-      uint8_t estimated_size;  // Estimated message size (max 255 bytes)
+      uint16_t message_type;   // Message type for overhead calculation
 
       // Constructor for creating BatchItem
-      BatchItem(EntityBase *entity, MessageCreator creator, uint8_t message_type, uint8_t estimated_size)
-          : entity(entity), creator(std::move(creator)), message_type(message_type), estimated_size(estimated_size) {}
+      BatchItem(EntityBase *entity, MessageCreator creator, uint16_t message_type)
+          : entity(entity), creator(std::move(creator)), message_type(message_type) {}
     };
 
     std::vector<BatchItem> items;
@@ -559,9 +554,9 @@ class APIConnection : public APIServerConnection {
     }
 
     // Add item to the batch
-    void add_item(EntityBase *entity, MessageCreator creator, uint8_t message_type, uint8_t estimated_size);
+    void add_item(EntityBase *entity, MessageCreator creator, uint16_t message_type);
     // Add item to the front of the batch (for high priority messages like ping)
-    void add_item_front(EntityBase *entity, MessageCreator creator, uint8_t message_type, uint8_t estimated_size);
+    void add_item_front(EntityBase *entity, MessageCreator creator, uint16_t message_type);
 
     // Clear all items with proper cleanup
     void clear() {
@@ -630,7 +625,7 @@ class APIConnection : public APIServerConnection {
   // to send in one go. This is the maximum size of a single packet
   // that can be sent over the network.
   // This is to avoid fragmentation of the packet.
-  static constexpr size_t MAX_BATCH_PACKET_SIZE = 1390;  // MTU
+  static constexpr size_t MAX_PACKET_SIZE = 1390;  // MTU
 
   bool schedule_batch_();
   void process_batch_();
@@ -641,9 +636,9 @@ class APIConnection : public APIServerConnection {
 
 #ifdef HAS_PROTO_MESSAGE_DUMP
   // Helper to log a proto message from a MessageCreator object
-  void log_proto_message_(EntityBase *entity, const MessageCreator &creator, uint8_t message_type) {
+  void log_proto_message_(EntityBase *entity, const MessageCreator &creator, uint16_t message_type) {
     this->flags_.log_only_mode = true;
-    creator(entity, this, MAX_BATCH_PACKET_SIZE, true, message_type);
+    creator(entity, this, MAX_PACKET_SIZE, true, message_type);
     this->flags_.log_only_mode = false;
   }
 
@@ -654,22 +649,15 @@ class APIConnection : public APIServerConnection {
 #endif
 
   // Helper method to send a message either immediately or via batching
-  bool send_message_smart_(EntityBase *entity, MessageCreatorPtr creator, uint8_t message_type,
-                           uint8_t estimated_size) {
+  bool send_message_smart_(EntityBase *entity, MessageCreatorPtr creator, uint16_t message_type) {
     // Try to send immediately if:
-    // 1. It's an UpdateStateResponse (always send immediately to handle cases where
-    //    the main loop is blocked, e.g., during OTA updates)
-    // 2. OR: We should try to send immediately (should_try_send_immediately = true)
-    //        AND Batch delay is 0 (user has opted in to immediate sending)
-    // 3. AND: Buffer has space available
-    if ((
-#ifdef USE_UPDATE
-            message_type == UpdateStateResponse::MESSAGE_TYPE ||
-#endif
-            (this->flags_.should_try_send_immediately && this->get_batch_delay_ms_() == 0)) &&
+    // 1. We should try to send immediately (should_try_send_immediately = true)
+    // 2. Batch delay is 0 (user has opted in to immediate sending)
+    // 3. Buffer has space available
+    if (this->flags_.should_try_send_immediately && this->get_batch_delay_ms_() == 0 &&
         this->helper_->can_write_without_blocking()) {
       // Now actually encode and send
-      if (creator(entity, this, MAX_BATCH_PACKET_SIZE, true) &&
+      if (creator(entity, this, MAX_PACKET_SIZE, true) &&
           this->send_buffer(ProtoWriteBuffer{&this->parent_->get_shared_buffer_ref()}, message_type)) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
         // Log the message in verbose mode
@@ -682,25 +670,23 @@ class APIConnection : public APIServerConnection {
     }
 
     // Fall back to scheduled batching
-    return this->schedule_message_(entity, creator, message_type, estimated_size);
+    return this->schedule_message_(entity, creator, message_type);
   }
 
   // Helper function to schedule a deferred message with known message type
-  bool schedule_message_(EntityBase *entity, MessageCreator creator, uint8_t message_type, uint8_t estimated_size) {
-    this->deferred_batch_.add_item(entity, std::move(creator), message_type, estimated_size);
+  bool schedule_message_(EntityBase *entity, MessageCreator creator, uint16_t message_type) {
+    this->deferred_batch_.add_item(entity, std::move(creator), message_type);
     return this->schedule_batch_();
   }
 
   // Overload for function pointers (for info messages and current state reads)
-  bool schedule_message_(EntityBase *entity, MessageCreatorPtr function_ptr, uint8_t message_type,
-                         uint8_t estimated_size) {
-    return schedule_message_(entity, MessageCreator(function_ptr), message_type, estimated_size);
+  bool schedule_message_(EntityBase *entity, MessageCreatorPtr function_ptr, uint16_t message_type) {
+    return schedule_message_(entity, MessageCreator(function_ptr), message_type);
   }
 
   // Helper function to schedule a high priority message at the front of the batch
-  bool schedule_message_front_(EntityBase *entity, MessageCreatorPtr function_ptr, uint8_t message_type,
-                               uint8_t estimated_size) {
-    this->deferred_batch_.add_item_front(entity, MessageCreator(function_ptr), message_type, estimated_size);
+  bool schedule_message_front_(EntityBase *entity, MessageCreatorPtr function_ptr, uint16_t message_type) {
+    this->deferred_batch_.add_item_front(entity, MessageCreator(function_ptr), message_type);
     return this->schedule_batch_();
   }
 };

esphome/components/api/api_frame_helper.cpp

@@ -5,6 +5,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "proto.h"
+#include "api_pb2_size.h"
 #include <cstring>
 #include <cinttypes>
 
@@ -612,7 +613,7 @@ APIError APINoiseFrameHelper::read_packet(ReadPacketBuffer *buffer) {
   buffer->type = type;
   return APIError::OK;
 }
-APIError APINoiseFrameHelper::write_protobuf_packet(uint8_t type, ProtoWriteBuffer buffer) {
+APIError APINoiseFrameHelper::write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) {
   // Resize to include MAC space (required for Noise encryption)
   buffer.get_buffer()->resize(buffer.get_buffer()->size() + frame_footer_size_);
   PacketInfo packet{type, 0,
@@ -1001,7 +1002,7 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
   buffer->type = rx_header_parsed_type_;
   return APIError::OK;
 }
-APIError APIPlaintextFrameHelper::write_protobuf_packet(uint8_t type, ProtoWriteBuffer buffer) {
+APIError APIPlaintextFrameHelper::write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) {
   PacketInfo packet{type, 0, static_cast<uint16_t>(buffer.get_buffer()->size() - frame_header_padding_)};
   return write_protobuf_packets(buffer, std::span<const PacketInfo>(&packet, 1));
 }

esphome/components/api/api_frame_helper.h

@@ -30,11 +30,13 @@ struct ReadPacketBuffer {
 
 // Packed packet info structure to minimize memory usage
 struct PacketInfo {
-  uint16_t offset;        // Offset in buffer where message starts
-  uint16_t payload_size;  // Size of the message payload
-  uint8_t message_type;   // Message type (0-255)
+  uint16_t message_type;  // 2 bytes
+  uint16_t offset;        // 2 bytes (sufficient for packet size ~1460 bytes)
+  uint16_t payload_size;  // 2 bytes (up to 65535 bytes)
+  uint16_t padding;       // 2 byte (for alignment)
 
-  PacketInfo(uint8_t type, uint16_t off, uint16_t size) : offset(off), payload_size(size), message_type(type) {}
+  PacketInfo(uint16_t type, uint16_t off, uint16_t size)
+      : message_type(type), offset(off), payload_size(size), padding(0) {}
 };
 
 enum class APIError : uint16_t {
@@ -96,7 +98,7 @@ class APIFrameHelper {
   }
   // Give this helper a name for logging
   void set_log_info(std::string info) { info_ = std::move(info); }
-  virtual APIError write_protobuf_packet(uint8_t type, ProtoWriteBuffer buffer) = 0;
+  virtual APIError write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) = 0;
   // Write multiple protobuf packets in a single operation
   // packets contains (message_type, offset, length) for each message in the buffer
   // The buffer contains all messages with appropriate padding before each
@@ -195,7 +197,7 @@ class APINoiseFrameHelper : public APIFrameHelper {
   APIError init() override;
   APIError loop() override;
   APIError read_packet(ReadPacketBuffer *buffer) override;
-  APIError write_protobuf_packet(uint8_t type, ProtoWriteBuffer buffer) override;
+  APIError write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) override;
   APIError write_protobuf_packets(ProtoWriteBuffer buffer, std::span<const PacketInfo> packets) override;
   // Get the frame header padding required by this protocol
   uint8_t frame_header_padding() override { return frame_header_padding_; }
@@ -249,7 +251,7 @@ class APIPlaintextFrameHelper : public APIFrameHelper {
   APIError init() override;
   APIError loop() override;
   APIError read_packet(ReadPacketBuffer *buffer) override;
-  APIError write_protobuf_packet(uint8_t type, ProtoWriteBuffer buffer) override;
+  APIError write_protobuf_packet(uint16_t type, ProtoWriteBuffer buffer) override;
   APIError write_protobuf_packets(ProtoWriteBuffer buffer, std::span<const PacketInfo> packets) override;
   uint8_t frame_header_padding() override { return frame_header_padding_; }
   // Get the frame footer size required by this protocol

esphome/components/api/api_pb2_dump.cpp

@@ -162,7 +162,6 @@ template<> const char *proto_enum_to_string<enums::LogLevel>(enums::LogLevel val
       return "UNKNOWN";
   }
 }
-#ifdef USE_API_SERVICES
 template<> const char *proto_enum_to_string<enums::ServiceArgType>(enums::ServiceArgType value) {
   switch (value) {
     case enums::SERVICE_ARG_TYPE_BOOL:
@@ -185,7 +184,6 @@ template<> const char *proto_enum_to_string<enums::ServiceArgType>(enums::Servic
       return "UNKNOWN";
   }
 }
-#endif
 #ifdef USE_CLIMATE
 template<> const char *proto_enum_to_string<enums::ClimateMode>(enums::ClimateMode value) {
   switch (value) {
@@ -988,11 +986,6 @@ void CoverCommandRequest::dump_to(std::string &out) const {
   out.append("  stop: ");
   out.append(YESNO(this->stop));
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -1153,11 +1146,6 @@ void FanCommandRequest::dump_to(std::string &out) const {
   out.append("  preset_mode: ");
   out.append("'").append(this->preset_mode).append("'");
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -1431,11 +1419,6 @@ void LightCommandRequest::dump_to(std::string &out) const {
   out.append("  effect: ");
   out.append("'").append(this->effect).append("'");
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -1603,11 +1586,6 @@ void SwitchCommandRequest::dump_to(std::string &out) const {
   out.append("  state: ");
   out.append(YESNO(this->state));
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -1813,7 +1791,6 @@ void GetTimeResponse::dump_to(std::string &out) const {
   out.append("\n");
   out.append("}");
 }
-#ifdef USE_API_SERVICES
 void ListEntitiesServicesArgument::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
   out.append("ListEntitiesServicesArgument {\n");
@@ -1913,7 +1890,6 @@ void ExecuteServiceRequest::dump_to(std::string &out) const {
   }
   out.append("}");
 }
-#endif
 #ifdef USE_CAMERA
 void ListEntitiesCameraResponse::dump_to(std::string &out) const {
   __attribute__((unused)) char buffer[64];
@@ -1968,11 +1944,6 @@ void CameraImageResponse::dump_to(std::string &out) const {
   out.append("  done: ");
   out.append(YESNO(this->done));
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 void CameraImageRequest::dump_to(std::string &out) const {
@@ -2292,11 +2263,6 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   snprintf(buffer, sizeof(buffer), "%g", this->target_humidity);
   out.append(buffer);
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -2401,11 +2367,6 @@ void NumberCommandRequest::dump_to(std::string &out) const {
   snprintf(buffer, sizeof(buffer), "%g", this->state);
   out.append(buffer);
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -2487,11 +2448,6 @@ void SelectCommandRequest::dump_to(std::string &out) const {
   out.append("  state: ");
   out.append("'").append(this->state).append("'");
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -2607,11 +2563,6 @@ void SirenCommandRequest::dump_to(std::string &out) const {
   snprintf(buffer, sizeof(buffer), "%g", this->volume);
   out.append(buffer);
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -2707,11 +2658,6 @@ void LockCommandRequest::dump_to(std::string &out) const {
   out.append("  code: ");
   out.append("'").append(this->code).append("'");
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -2765,11 +2711,6 @@ void ButtonCommandRequest::dump_to(std::string &out) const {
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->key);
   out.append(buffer);
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -2916,11 +2857,6 @@ void MediaPlayerCommandRequest::dump_to(std::string &out) const {
   out.append("  announcement: ");
   out.append(YESNO(this->announcement));
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3746,11 +3682,6 @@ void AlarmControlPanelCommandRequest::dump_to(std::string &out) const {
   out.append("  code: ");
   out.append("'").append(this->code).append("'");
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3844,11 +3775,6 @@ void TextCommandRequest::dump_to(std::string &out) const {
   out.append("  state: ");
   out.append("'").append(this->state).append("'");
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3946,11 +3872,6 @@ void DateCommandRequest::dump_to(std::string &out) const {
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->day);
   out.append(buffer);
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -4048,11 +3969,6 @@ void TimeCommandRequest::dump_to(std::string &out) const {
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->second);
   out.append(buffer);
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -4222,11 +4138,6 @@ void ValveCommandRequest::dump_to(std::string &out) const {
   out.append("  stop: ");
   out.append(YESNO(this->stop));
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -4304,11 +4215,6 @@ void DateTimeCommandRequest::dump_to(std::string &out) const {
   snprintf(buffer, sizeof(buffer), "%" PRIu32, this->epoch_seconds);
   out.append(buffer);
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -4417,11 +4323,6 @@ void UpdateCommandRequest::dump_to(std::string &out) const {
   out.append("  command: ");
   out.append(proto_enum_to_string<enums::UpdateCommand>(this->command));
   out.append("\n");
-
-  out.append("  device_id: ");
-  snprintf(buffer, sizeof(buffer), "%" PRIu32, this->device_id);
-  out.append(buffer);
-  out.append("\n");
   out.append("}");
 }
 #endif

esphome/components/api/api_pb2_service.cpp

@@ -195,7 +195,6 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       this->on_home_assistant_state_response(msg);
       break;
     }
-#ifdef USE_API_SERVICES
     case 42: {
       ExecuteServiceRequest msg;
       msg.decode(msg_data, msg_size);
@@ -205,7 +204,6 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       this->on_execute_service_request(msg);
       break;
     }
-#endif
 #ifdef USE_CAMERA
     case 45: {
       CameraImageRequest msg;
@@ -662,13 +660,11 @@ void APIServerConnection::on_get_time_request(const GetTimeRequest &msg) {
     }
   }
 }
-#ifdef USE_API_SERVICES
 void APIServerConnection::on_execute_service_request(const ExecuteServiceRequest &msg) {
   if (this->check_authenticated_()) {
     this->execute_service(msg);
   }
 }
-#endif
 #ifdef USE_API_NOISE
 void APIServerConnection::on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &msg) {
   if (this->check_authenticated_()) {

esphome/components/api/api_pb2_service.h

@@ -69,9 +69,7 @@ class APIServerConnectionBase : public ProtoService {
   virtual void on_get_time_request(const GetTimeRequest &value){};
   virtual void on_get_time_response(const GetTimeResponse &value){};
 
-#ifdef USE_API_SERVICES
   virtual void on_execute_service_request(const ExecuteServiceRequest &value){};
-#endif
 
 #ifdef USE_CAMERA
   virtual void on_camera_image_request(const CameraImageRequest &value){};
@@ -218,9 +216,7 @@ class APIServerConnection : public APIServerConnectionBase {
   virtual void subscribe_homeassistant_services(const SubscribeHomeassistantServicesRequest &msg) = 0;
   virtual void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) = 0;
   virtual GetTimeResponse get_time(const GetTimeRequest &msg) = 0;
-#ifdef USE_API_SERVICES
   virtual void execute_service(const ExecuteServiceRequest &msg) = 0;
-#endif
 #ifdef USE_API_NOISE
   virtual NoiseEncryptionSetKeyResponse noise_encryption_set_key(const NoiseEncryptionSetKeyRequest &msg) = 0;
 #endif
@@ -337,9 +333,7 @@ class APIServerConnection : public APIServerConnectionBase {
   void on_subscribe_homeassistant_services_request(const SubscribeHomeassistantServicesRequest &msg) override;
   void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &msg) override;
   void on_get_time_request(const GetTimeRequest &msg) override;
-#ifdef USE_API_SERVICES
   void on_execute_service_request(const ExecuteServiceRequest &msg) override;
-#endif
 #ifdef USE_API_NOISE
   void on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &msg) override;
 #endif

esphome/components/api/api_pb2_size.h

@@ -0,0 +1,359 @@
+#pragma once
+
+#include "proto.h"
+#include <cstdint>
+#include <string>
+
+namespace esphome {
+namespace api {
+
+class ProtoSize {
+ public:
+  /**
+   * @brief ProtoSize class for Protocol Buffer serialization size calculation
+   *
+   * This class provides static methods to calculate the exact byte counts needed
+   * for encoding various Protocol Buffer field types. All methods are designed to be
+   * efficient for the common case where many fields have default values.
+   *
+   * Implements Protocol Buffer encoding size calculation according to:
+   * https://protobuf.dev/programming-guides/encoding/
+   *
+   * Key features:
+   * - Early-return optimization for zero/default values
+   * - Direct total_size updates to avoid unnecessary additions
+   * - Specialized handling for different field types according to protobuf spec
+   * - Templated helpers for repeated fields and messages
+   */
+
+  /**
+   * @brief Calculates the size in bytes needed to encode a uint32_t value as a varint
+   *
+   * @param value The uint32_t value to calculate size for
+   * @return The number of bytes needed to encode the value
+   */
+  static inline uint32_t varint(uint32_t value) {
+    // Optimized varint size calculation using leading zeros
+    // Each 7 bits requires one byte in the varint encoding
+    if (value < 128)
+      return 1;  // 7 bits, common case for small values
+
+    // For larger values, count bytes needed based on the position of the highest bit set
+    if (value < 16384) {
+      return 2;  // 14 bits
+    } else if (value < 2097152) {
+      return 3;  // 21 bits
+    } else if (value < 268435456) {
+      return 4;  // 28 bits
+    } else {
+      return 5;  // 32 bits (maximum for uint32_t)
+    }
+  }
+
+  /**
+   * @brief Calculates the size in bytes needed to encode a uint64_t value as a varint
+   *
+   * @param value The uint64_t value to calculate size for
+   * @return The number of bytes needed to encode the value
+   */
+  static inline uint32_t varint(uint64_t value) {
+    // Handle common case of values fitting in uint32_t (vast majority of use cases)
+    if (value <= UINT32_MAX) {
+      return varint(static_cast<uint32_t>(value));
+    }
+
+    // For larger values, determine size based on highest bit position
+    if (value < (1ULL << 35)) {
+      return 5;  // 35 bits
+    } else if (value < (1ULL << 42)) {
+      return 6;  // 42 bits
+    } else if (value < (1ULL << 49)) {
+      return 7;  // 49 bits
+    } else if (value < (1ULL << 56)) {
+      return 8;  // 56 bits
+    } else if (value < (1ULL << 63)) {
+      return 9;  // 63 bits
+    } else {
+      return 10;  // 64 bits (maximum for uint64_t)
+    }
+  }
+
+  /**
+   * @brief Calculates the size in bytes needed to encode an int32_t value as a varint
+   *
+   * Special handling is needed for negative values, which are sign-extended to 64 bits
+   * in Protocol Buffers, resulting in a 10-byte varint.
+   *
+   * @param value The int32_t value to calculate size for
+   * @return The number of bytes needed to encode the value
+   */
+  static inline uint32_t varint(int32_t value) {
+    // Negative values are sign-extended to 64 bits in protocol buffers,
+    // which always results in a 10-byte varint for negative int32
+    if (value < 0) {
+      return 10;  // Negative int32 is always 10 bytes long
+    }
+    // For non-negative values, use the uint32_t implementation
+    return varint(static_cast<uint32_t>(value));
+  }
+
+  /**
+   * @brief Calculates the size in bytes needed to encode an int64_t value as a varint
+   *
+   * @param value The int64_t value to calculate size for
+   * @return The number of bytes needed to encode the value
+   */
+  static inline uint32_t varint(int64_t value) {
+    // For int64_t, we convert to uint64_t and calculate the size
+    // This works because the bit pattern determines the encoding size,
+    // and we've handled negative int32 values as a special case above
+    return varint(static_cast<uint64_t>(value));
+  }
+
+  /**
+   * @brief Calculates the size in bytes needed to encode a field ID and wire type
+   *
+   * @param field_id The field identifier
+   * @param type The wire type value (from the WireType enum in the protobuf spec)
+   * @return The number of bytes needed to encode the field ID and wire type
+   */
+  static inline uint32_t field(uint32_t field_id, uint32_t type) {
+    uint32_t tag = (field_id << 3) | (type & 0b111);
+    return varint(tag);
+  }
+
+  /**
+   * @brief Common parameters for all add_*_field methods
+   *
+   * All add_*_field methods follow these common patterns:
+   *
+   * @param total_size Reference to the total message size to update
+   * @param field_id_size Pre-calculated size of the field ID in bytes
+   * @param value The value to calculate size for (type varies)
+   * @param force Whether to calculate size even if the value is default/zero/empty
+   *
+   * Each method follows this implementation pattern:
+   * 1. Skip calculation if value is default (0, false, empty) and not forced
+   * 2. Calculate the size based on the field's encoding rules
+   * 3. Add the field_id_size + calculated value size to total_size
+   */
+
+  /**
+   * @brief Calculates and adds the size of an int32 field to the total message size
+   */
+  static inline void add_int32_field(uint32_t &total_size, uint32_t field_id_size, int32_t value, bool force = false) {
+    // Skip calculation if value is zero and not forced
+    if (value == 0 && !force) {
+      return;  // No need to update total_size
+    }
+
+    // Calculate and directly add to total_size
+    if (value < 0) {
+      // Negative values are encoded as 10-byte varints in protobuf
+      total_size += field_id_size + 10;
+    } else {
+      // For non-negative values, use the standard varint size
+      total_size += field_id_size + varint(static_cast<uint32_t>(value));
+    }
+  }
+
+  /**
+   * @brief Calculates and adds the size of a uint32 field to the total message size
+   */
+  static inline void add_uint32_field(uint32_t &total_size, uint32_t field_id_size, uint32_t value,
+                                      bool force = false) {
+    // Skip calculation if value is zero and not forced
+    if (value == 0 && !force) {
+      return;  // No need to update total_size
+    }
+
+    // Calculate and directly add to total_size
+    total_size += field_id_size + varint(value);
+  }
+
+  /**
+   * @brief Calculates and adds the size of a boolean field to the total message size
+   */
+  static inline void add_bool_field(uint32_t &total_size, uint32_t field_id_size, bool value, bool force = false) {
+    // Skip calculation if value is false and not forced
+    if (!value && !force) {
+      return;  // No need to update total_size
+    }
+
+    // Boolean fields always use 1 byte when true
+    total_size += field_id_size + 1;
+  }
+
+  /**
+   * @brief Calculates and adds the size of a fixed field to the total message size
+   *
+   * Fixed fields always take exactly N bytes (4 for fixed32/float, 8 for fixed64/double).
+   *
+   * @tparam NumBytes The number of bytes for this fixed field (4 or 8)
+   * @param is_nonzero Whether the value is non-zero
+   */
+  template<uint32_t NumBytes>
+  static inline void add_fixed_field(uint32_t &total_size, uint32_t field_id_size, bool is_nonzero,
+                                     bool force = false) {
+    // Skip calculation if value is zero and not forced
+    if (!is_nonzero && !force) {
+      return;  // No need to update total_size
+    }
+
+    // Fixed fields always take exactly NumBytes
+    total_size += field_id_size + NumBytes;
+  }
+
+  /**
+   * @brief Calculates and adds the size of an enum field to the total message size
+   *
+   * Enum fields are encoded as uint32 varints.
+   */
+  static inline void add_enum_field(uint32_t &total_size, uint32_t field_id_size, uint32_t value, bool force = false) {
+    // Skip calculation if value is zero and not forced
+    if (value == 0 && !force) {
+      return;  // No need to update total_size
+    }
+
+    // Enums are encoded as uint32
+    total_size += field_id_size + varint(value);
+  }
+
+  /**
+   * @brief Calculates and adds the size of a sint32 field to the total message size
+   *
+   * Sint32 fields use ZigZag encoding, which is more efficient for negative values.
+   */
+  static inline void add_sint32_field(uint32_t &total_size, uint32_t field_id_size, int32_t value, bool force = false) {
+    // Skip calculation if value is zero and not forced
+    if (value == 0 && !force) {
+      return;  // No need to update total_size
+    }
+
+    // ZigZag encoding for sint32: (n << 1) ^ (n >> 31)
+    uint32_t zigzag = (static_cast<uint32_t>(value) << 1) ^ (static_cast<uint32_t>(value >> 31));
+    total_size += field_id_size + varint(zigzag);
+  }
+
+  /**
+   * @brief Calculates and adds the size of an int64 field to the total message size
+   */
+  static inline void add_int64_field(uint32_t &total_size, uint32_t field_id_size, int64_t value, bool force = false) {
+    // Skip calculation if value is zero and not forced
+    if (value == 0 && !force) {
+      return;  // No need to update total_size
+    }
+
+    // Calculate and directly add to total_size
+    total_size += field_id_size + varint(value);
+  }
+
+  /**
+   * @brief Calculates and adds the size of a uint64 field to the total message size
+   */
+  static inline void add_uint64_field(uint32_t &total_size, uint32_t field_id_size, uint64_t value,
+                                      bool force = false) {
+    // Skip calculation if value is zero and not forced
+    if (value == 0 && !force) {
+      return;  // No need to update total_size
+    }
+
+    // Calculate and directly add to total_size
+    total_size += field_id_size + varint(value);
+  }
+
+  /**
+   * @brief Calculates and adds the size of a sint64 field to the total message size
+   *
+   * Sint64 fields use ZigZag encoding, which is more efficient for negative values.
+   */
+  static inline void add_sint64_field(uint32_t &total_size, uint32_t field_id_size, int64_t value, bool force = false) {
+    // Skip calculation if value is zero and not forced
+    if (value == 0 && !force) {
+      return;  // No need to update total_size
+    }
+
+    // ZigZag encoding for sint64: (n << 1) ^ (n >> 63)
+    uint64_t zigzag = (static_cast<uint64_t>(value) << 1) ^ (static_cast<uint64_t>(value >> 63));
+    total_size += field_id_size + varint(zigzag);
+  }
+
+  /**
+   * @brief Calculates and adds the size of a string/bytes field to the total message size
+   */
+  static inline void add_string_field(uint32_t &total_size, uint32_t field_id_size, const std::string &str,
+                                      bool force = false) {
+    // Skip calculation if string is empty and not forced
+    if (str.empty() && !force) {
+      return;  // No need to update total_size
+    }
+
+    // Calculate and directly add to total_size
+    const uint32_t str_size = static_cast<uint32_t>(str.size());
+    total_size += field_id_size + varint(str_size) + str_size;
+  }
+
+  /**
+   * @brief Calculates and adds the size of a nested message field to the total message size
+   *
+   * This helper function directly updates the total_size reference if the nested size
+   * is greater than zero or force is true.
+   *
+   * @param nested_size The pre-calculated size of the nested message
+   */
+  static inline void add_message_field(uint32_t &total_size, uint32_t field_id_size, uint32_t nested_size,
+                                       bool force = false) {
+    // Skip calculation if nested message is empty and not forced
+    if (nested_size == 0 && !force) {
+      return;  // No need to update total_size
+    }
+
+    // Calculate and directly add to total_size
+    // Field ID + length varint + nested message content
+    total_size += field_id_size + varint(nested_size) + nested_size;
+  }
+
+  /**
+   * @brief Calculates and adds the size of a nested message field to the total message size
+   *
+   * This version takes a ProtoMessage object, calculates its size internally,
+   * and updates the total_size reference. This eliminates the need for a temporary variable
+   * at the call site.
+   *
+   * @param message The nested message object
+   */
+  static inline void add_message_object(uint32_t &total_size, uint32_t field_id_size, const ProtoMessage &message,
+                                        bool force = false) {
+    uint32_t nested_size = 0;
+    message.calculate_size(nested_size);
+
+    // Use the base implementation with the calculated nested_size
+    add_message_field(total_size, field_id_size, nested_size, force);
+  }
+
+  /**
+   * @brief Calculates and adds the sizes of all messages in a repeated field to the total message size
+   *
+   * This helper processes a vector of message objects, calculating the size for each message
+   * and adding it to the total size.
+   *
+   * @tparam MessageType The type of the nested messages in the vector
+   * @param messages Vector of message objects
+   */
+  template<typename MessageType>
+  static inline void add_repeated_message(uint32_t &total_size, uint32_t field_id_size,
+                                          const std::vector<MessageType> &messages) {
+    // Skip if the vector is empty
+    if (messages.empty()) {
+      return;
+    }
+
+    // For repeated fields, always use force=true
+    for (const auto &message : messages) {
+      add_message_object(total_size, field_id_size, message, true);
+    }
+  }
+};
+
+}  // namespace api
+}  // namespace esphome

esphome/components/api/api_server.cpp

@@ -24,6 +24,14 @@ static const char *const TAG = "api";
 // APIServer
 APIServer *global_api_server = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
+#ifndef USE_API_YAML_SERVICES
+// Global empty vector to avoid guard variables (saves 8 bytes)
+// This is initialized at program startup before any threads
+static const std::vector<UserServiceDescriptor *> empty_user_services{};
+
+const std::vector<UserServiceDescriptor *> &get_empty_user_services_instance() { return empty_user_services; }
+#endif
+
 APIServer::APIServer() {
   global_api_server = this;
   // Pre-allocate shared write buffer
@@ -255,7 +263,7 @@ void APIServer::handle_disconnect(APIConnection *conn) {}
 
 // Macro for entities without extra parameters
 #define API_DISPATCH_UPDATE(entity_type, entity_name) \
-  void APIServer::on_##entity_name##_update(entity_type *obj) { /* NOLINT(bugprone-macro-parentheses) */ \
+  void APIServer::on_##entity_name##_update(entity_type *obj) { \
     if (obj->is_internal()) \
       return; \
     for (auto &c : this->clients_) \
@@ -264,7 +272,7 @@ void APIServer::handle_disconnect(APIConnection *conn) {}
 
 // Macro for entities with extra parameters (but parameters not used in send)
 #define API_DISPATCH_UPDATE_IGNORE_PARAMS(entity_type, entity_name, ...) \
-  void APIServer::on_##entity_name##_update(entity_type *obj, __VA_ARGS__) { /* NOLINT(bugprone-macro-parentheses) */ \
+  void APIServer::on_##entity_name##_update(entity_type *obj, __VA_ARGS__) { \
     if (obj->is_internal()) \
       return; \
     for (auto &c : this->clients_) \
@@ -350,13 +358,7 @@ void APIServer::on_event(event::Event *obj, const std::string &event_type) {
 #endif
 
 #ifdef USE_UPDATE
-// Update is a special case - the method is called on_update, not on_update_update
-void APIServer::on_update(update::UpdateEntity *obj) {
-  if (obj->is_internal())
-    return;
-  for (auto &c : this->clients_)
-    c->send_update_state(obj);
-}
+API_DISPATCH_UPDATE(update::UpdateEntity, update)
 #endif
 
 #ifdef USE_ALARM_CONTROL_PANEL
@@ -467,8 +469,7 @@ void APIServer::on_shutdown() {
     if (!c->send_message(DisconnectRequest())) {
       // If we can't send the disconnect request directly (tx_buffer full),
       // schedule it at the front of the batch so it will be sent with priority
-      c->schedule_message_front_(nullptr, &APIConnection::try_send_disconnect_request, DisconnectRequest::MESSAGE_TYPE,
-                                 DisconnectRequest::ESTIMATED_SIZE);
+      c->schedule_message_front_(nullptr, &APIConnection::try_send_disconnect_request, DisconnectRequest::MESSAGE_TYPE);
     }
   }
 }

esphome/components/api/api_server.h

@@ -12,9 +12,7 @@
 #include "esphome/core/log.h"
 #include "list_entities.h"
 #include "subscribe_state.h"
-#ifdef USE_API_SERVICES
 #include "user_services.h"
-#endif
 
 #include <vector>
 
@@ -27,6 +25,11 @@ struct SavedNoisePsk {
 } PACKED;  // NOLINT
 #endif
 
+#ifndef USE_API_YAML_SERVICES
+// Forward declaration of helper function
+const std::vector<UserServiceDescriptor *> &get_empty_user_services_instance();
+#endif
+
 class APIServer : public Component, public Controller {
  public:
   APIServer();
@@ -109,9 +112,18 @@ class APIServer : public Component, public Controller {
   void on_media_player_update(media_player::MediaPlayer *obj) override;
 #endif
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call);
-#ifdef USE_API_SERVICES
-  void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
+  void register_user_service(UserServiceDescriptor *descriptor) {
+#ifdef USE_API_YAML_SERVICES
+    // Vector is pre-allocated when services are defined in YAML
+    this->user_services_.push_back(descriptor);
+#else
+    // Lazy allocate vector on first use for CustomAPIDevice
+    if (!this->user_services_) {
+      this->user_services_ = std::make_unique<std::vector<UserServiceDescriptor *>>();
+    }
+    this->user_services_->push_back(descriptor);
 #endif
+  }
 #ifdef USE_HOMEASSISTANT_TIME
   void request_time();
 #endif
@@ -140,9 +152,17 @@ class APIServer : public Component, public Controller {
   void get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                 std::function<void(std::string)> f);
   const std::vector<HomeAssistantStateSubscription> &get_state_subs() const;
-#ifdef USE_API_SERVICES
-  const std::vector<UserServiceDescriptor *> &get_user_services() const { return this->user_services_; }
+  const std::vector<UserServiceDescriptor *> &get_user_services() const {
+#ifdef USE_API_YAML_SERVICES
+    return this->user_services_;
+#else
+    if (this->user_services_) {
+      return *this->user_services_;
+    }
+    // Return reference to global empty instance (no guard needed)
+    return get_empty_user_services_instance();
 #endif
+  }
 
 #ifdef USE_API_CLIENT_CONNECTED_TRIGGER
   Trigger<std::string, std::string> *get_client_connected_trigger() const { return this->client_connected_trigger_; }
@@ -174,8 +194,14 @@ class APIServer : public Component, public Controller {
 #endif
   std::vector<uint8_t> shared_write_buffer_;  // Shared proto write buffer for all connections
   std::vector<HomeAssistantStateSubscription> state_subs_;
-#ifdef USE_API_SERVICES
+#ifdef USE_API_YAML_SERVICES
+  // When services are defined in YAML, we know at compile time that services will be registered
   std::vector<UserServiceDescriptor *> user_services_;
+#else
+  // Services can still be registered at runtime by CustomAPIDevice components even when not
+  // defined in YAML. Using unique_ptr allows lazy allocation, saving 12 bytes in the common
+  // case where no services (YAML or custom) are used.
+  std::unique_ptr<std::vector<UserServiceDescriptor *>> user_services_;
 #endif
 
   // Group smaller types together

esphome/components/api/custom_api_device.h

@@ -3,13 +3,10 @@
 #include <map>
 #include "api_server.h"
 #ifdef USE_API
-#ifdef USE_API_SERVICES
 #include "user_services.h"
-#endif
 namespace esphome {
 namespace api {
 
-#ifdef USE_API_SERVICES
 template<typename T, typename... Ts> class CustomAPIDeviceService : public UserServiceBase<Ts...> {
  public:
   CustomAPIDeviceService(const std::string &name, const std::array<std::string, sizeof...(Ts)> &arg_names, T *obj,
@@ -22,7 +19,6 @@ template<typename T, typename... Ts> class CustomAPIDeviceService : public UserS
   T *obj_;
   void (T::*callback_)(Ts...);
 };
-#endif  // USE_API_SERVICES
 
 class CustomAPIDevice {
  public:
@@ -50,14 +46,12 @@ class CustomAPIDevice {
    * @param name The name of the service to register.
    * @param arg_names The name of the arguments for the service, must match the arguments of the function.
    */
-#ifdef USE_API_SERVICES
   template<typename T, typename... Ts>
   void register_service(void (T::*callback)(Ts...), const std::string &name,
                         const std::array<std::string, sizeof...(Ts)> &arg_names) {
     auto *service = new CustomAPIDeviceService<T, Ts...>(name, arg_names, (T *) this, callback);  // NOLINT
     global_api_server->register_user_service(service);
   }
-#endif
 
   /** Register a custom native API service that will show up in Home Assistant.
    *
@@ -77,12 +71,10 @@ class CustomAPIDevice {
    * @param callback The member function to call when the service is triggered.
    * @param name The name of the arguments for the service, must match the arguments of the function.
    */
-#ifdef USE_API_SERVICES
   template<typename T> void register_service(void (T::*callback)(), const std::string &name) {
     auto *service = new CustomAPIDeviceService<T>(name, {}, (T *) this, callback);  // NOLINT
     global_api_server->register_user_service(service);
   }
-#endif
 
   /** Subscribe to the state (or attribute state) of an entity from Home Assistant.
    *

esphome/components/api/homeassistant_service.h

@@ -11,18 +11,6 @@ namespace esphome {
 namespace api {
 
 template<typename... X> class TemplatableStringValue : public TemplatableValue<std::string, X...> {
- private:
-  // Helper to convert value to string - handles the case where value is already a string
-  template<typename T> static std::string value_to_string(T &&val) { return to_string(std::forward<T>(val)); }
-
-  // Overloads for string types - needed because std::to_string doesn't support them
-  static std::string value_to_string(char *val) {
-    return val ? std::string(val) : std::string();
-  }  // For lambdas returning char* (e.g., itoa)
-  static std::string value_to_string(const char *val) { return std::string(val); }  // For lambdas returning .c_str()
-  static std::string value_to_string(const std::string &val) { return val; }
-  static std::string value_to_string(std::string &&val) { return std::move(val); }
-
  public:
   TemplatableStringValue() : TemplatableValue<std::string, X...>() {}
 
@@ -31,7 +19,7 @@ template<typename... X> class TemplatableStringValue : public TemplatableValue<s
 
   template<typename F, enable_if_t<is_invocable<F, X...>::value, int> = 0>
   TemplatableStringValue(F f)
-      : TemplatableValue<std::string, X...>([f](X... x) -> std::string { return value_to_string(f(x...)); }) {}
+      : TemplatableValue<std::string, X...>([f](X... x) -> std::string { return to_string(f(x...)); }) {}
 };
 
 template<typename... Ts> class TemplatableKeyValuePair {

esphome/components/api/list_entities.cpp

@@ -83,12 +83,10 @@ bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(
 
 ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(client) {}
 
-#ifdef USE_API_SERVICES
 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
   auto resp = service->encode_list_service_response();
   return this->client_->send_message(resp);
 }
-#endif
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/list_entities.h

@@ -14,7 +14,7 @@ class APIConnection;
 #define LIST_ENTITIES_HANDLER(entity_type, EntityClass, ResponseType) \
   bool ListEntitiesIterator::on_##entity_type(EntityClass *entity) { /* NOLINT(bugprone-macro-parentheses) */ \
     return this->client_->schedule_message_(entity, &APIConnection::try_send_##entity_type##_info, \
-                                            ResponseType::MESSAGE_TYPE, ResponseType::ESTIMATED_SIZE); \
+                                            ResponseType::MESSAGE_TYPE); \
   }
 
 class ListEntitiesIterator : public ComponentIterator {
@@ -44,9 +44,7 @@ class ListEntitiesIterator : public ComponentIterator {
 #ifdef USE_TEXT_SENSOR
   bool on_text_sensor(text_sensor::TextSensor *entity) override;
 #endif
-#ifdef USE_API_SERVICES
   bool on_service(UserServiceDescriptor *service) override;
-#endif
 #ifdef USE_CAMERA
   bool on_camera(camera::Camera *entity) override;
 #endif

esphome/components/api/proto.h

@@ -4,7 +4,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-#include <cassert>
 #include <vector>
 
 #ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
@@ -60,6 +59,7 @@ class ProtoVarInt {
   uint32_t as_uint32() const { return this->value_; }
   uint64_t as_uint64() const { return this->value_; }
   bool as_bool() const { return this->value_; }
+  template<typename T> T as_enum() const { return static_cast<T>(this->as_uint32()); }
   int32_t as_int32() const {
     // Not ZigZag encoded
     return static_cast<int32_t>(this->as_int64());
@@ -133,24 +133,15 @@ class ProtoVarInt {
   uint64_t value_;
 };
 
-// Forward declaration for decode_to_message and encode_to_writer
-class ProtoMessage;
-
 class ProtoLengthDelimited {
  public:
   explicit ProtoLengthDelimited(const uint8_t *value, size_t length) : value_(value), length_(length) {}
   std::string as_string() const { return std::string(reinterpret_cast<const char *>(this->value_), this->length_); }
-
-  /**
-   * Decode the length-delimited data into an existing ProtoMessage instance.
-   *
-   * This method allows decoding without templates, enabling use in contexts
-   * where the message type is not known at compile time. The ProtoMessage's
-   * decode() method will be called with the raw data and length.
-   *
-   * @param msg The ProtoMessage instance to decode into
-   */
-  void decode_to_message(ProtoMessage &msg) const;
+  template<class C> C as_message() const {
+    auto msg = C();
+    msg.decode(this->value_, this->length_);
+    return msg;
+  }
 
  protected:
   const uint8_t *const value_;
@@ -272,6 +263,9 @@ class ProtoWriteBuffer {
     this->write((value >> 48) & 0xFF);
     this->write((value >> 56) & 0xFF);
   }
+  template<typename T> void encode_enum(uint32_t field_id, T value, bool force = false) {
+    this->encode_uint32(field_id, static_cast<uint32_t>(value), force);
+  }
   void encode_float(uint32_t field_id, float value, bool force = false) {
     if (value == 0.0f && !force)
       return;
@@ -312,7 +306,18 @@ class ProtoWriteBuffer {
     }
     this->encode_uint64(field_id, uvalue, force);
   }
-  void encode_message(uint32_t field_id, const ProtoMessage &value, bool force = false);
+  template<class C> void encode_message(uint32_t field_id, const C &value, bool force = false) {
+    this->encode_field_raw(field_id, 2);  // type 2: Length-delimited message
+    size_t begin = this->buffer_->size();
+
+    value.encode(*this);
+
+    const uint32_t nested_length = this->buffer_->size() - begin;
+    // add size varint
+    std::vector<uint8_t> var;
+    ProtoVarInt(nested_length).encode(var);
+    this->buffer_->insert(this->buffer_->begin() + begin, var.begin(), var.end());
+  }
   std::vector<uint8_t> *get_buffer() const { return buffer_; }
 
  protected:
@@ -340,494 +345,6 @@ class ProtoMessage {
   virtual bool decode_64bit(uint32_t field_id, Proto64Bit value) { return false; }
 };
 
-class ProtoSize {
- public:
-  /**
-   * @brief ProtoSize class for Protocol Buffer serialization size calculation
-   *
-   * This class provides static methods to calculate the exact byte counts needed
-   * for encoding various Protocol Buffer field types. All methods are designed to be
-   * efficient for the common case where many fields have default values.
-   *
-   * Implements Protocol Buffer encoding size calculation according to:
-   * https://protobuf.dev/programming-guides/encoding/
-   *
-   * Key features:
-   * - Early-return optimization for zero/default values
-   * - Direct total_size updates to avoid unnecessary additions
-   * - Specialized handling for different field types according to protobuf spec
-   * - Templated helpers for repeated fields and messages
-   */
-
-  /**
-   * @brief Calculates the size in bytes needed to encode a uint32_t value as a varint
-   *
-   * @param value The uint32_t value to calculate size for
-   * @return The number of bytes needed to encode the value
-   */
-  static inline uint32_t varint(uint32_t value) {
-    // Optimized varint size calculation using leading zeros
-    // Each 7 bits requires one byte in the varint encoding
-    if (value < 128)
-      return 1;  // 7 bits, common case for small values
-
-    // For larger values, count bytes needed based on the position of the highest bit set
-    if (value < 16384) {
-      return 2;  // 14 bits
-    } else if (value < 2097152) {
-      return 3;  // 21 bits
-    } else if (value < 268435456) {
-      return 4;  // 28 bits
-    } else {
-      return 5;  // 32 bits (maximum for uint32_t)
-    }
-  }
-
-  /**
-   * @brief Calculates the size in bytes needed to encode a uint64_t value as a varint
-   *
-   * @param value The uint64_t value to calculate size for
-   * @return The number of bytes needed to encode the value
-   */
-  static inline uint32_t varint(uint64_t value) {
-    // Handle common case of values fitting in uint32_t (vast majority of use cases)
-    if (value <= UINT32_MAX) {
-      return varint(static_cast<uint32_t>(value));
-    }
-
-    // For larger values, determine size based on highest bit position
-    if (value < (1ULL << 35)) {
-      return 5;  // 35 bits
-    } else if (value < (1ULL << 42)) {
-      return 6;  // 42 bits
-    } else if (value < (1ULL << 49)) {
-      return 7;  // 49 bits
-    } else if (value < (1ULL << 56)) {
-      return 8;  // 56 bits
-    } else if (value < (1ULL << 63)) {
-      return 9;  // 63 bits
-    } else {
-      return 10;  // 64 bits (maximum for uint64_t)
-    }
-  }
-
-  /**
-   * @brief Calculates the size in bytes needed to encode an int32_t value as a varint
-   *
-   * Special handling is needed for negative values, which are sign-extended to 64 bits
-   * in Protocol Buffers, resulting in a 10-byte varint.
-   *
-   * @param value The int32_t value to calculate size for
-   * @return The number of bytes needed to encode the value
-   */
-  static inline uint32_t varint(int32_t value) {
-    // Negative values are sign-extended to 64 bits in protocol buffers,
-    // which always results in a 10-byte varint for negative int32
-    if (value < 0) {
-      return 10;  // Negative int32 is always 10 bytes long
-    }
-    // For non-negative values, use the uint32_t implementation
-    return varint(static_cast<uint32_t>(value));
-  }
-
-  /**
-   * @brief Calculates the size in bytes needed to encode an int64_t value as a varint
-   *
-   * @param value The int64_t value to calculate size for
-   * @return The number of bytes needed to encode the value
-   */
-  static inline uint32_t varint(int64_t value) {
-    // For int64_t, we convert to uint64_t and calculate the size
-    // This works because the bit pattern determines the encoding size,
-    // and we've handled negative int32 values as a special case above
-    return varint(static_cast<uint64_t>(value));
-  }
-
-  /**
-   * @brief Calculates the size in bytes needed to encode a field ID and wire type
-   *
-   * @param field_id The field identifier
-   * @param type The wire type value (from the WireType enum in the protobuf spec)
-   * @return The number of bytes needed to encode the field ID and wire type
-   */
-  static inline uint32_t field(uint32_t field_id, uint32_t type) {
-    uint32_t tag = (field_id << 3) | (type & 0b111);
-    return varint(tag);
-  }
-
-  /**
-   * @brief Common parameters for all add_*_field methods
-   *
-   * All add_*_field methods follow these common patterns:
-   *
-   * @param total_size Reference to the total message size to update
-   * @param field_id_size Pre-calculated size of the field ID in bytes
-   * @param value The value to calculate size for (type varies)
-   * @param force Whether to calculate size even if the value is default/zero/empty
-   *
-   * Each method follows this implementation pattern:
-   * 1. Skip calculation if value is default (0, false, empty) and not forced
-   * 2. Calculate the size based on the field's encoding rules
-   * 3. Add the field_id_size + calculated value size to total_size
-   */
-
-  /**
-   * @brief Calculates and adds the size of an int32 field to the total message size
-   */
-  static inline void add_int32_field(uint32_t &total_size, uint32_t field_id_size, int32_t value) {
-    // Skip calculation if value is zero
-    if (value == 0) {
-      return;  // No need to update total_size
-    }
-
-    // Calculate and directly add to total_size
-    if (value < 0) {
-      // Negative values are encoded as 10-byte varints in protobuf
-      total_size += field_id_size + 10;
-    } else {
-      // For non-negative values, use the standard varint size
-      total_size += field_id_size + varint(static_cast<uint32_t>(value));
-    }
-  }
-
-  /**
-   * @brief Calculates and adds the size of an int32 field to the total message size (repeated field version)
-   */
-  static inline void add_int32_field_repeated(uint32_t &total_size, uint32_t field_id_size, int32_t value) {
-    // Always calculate size for repeated fields
-    if (value < 0) {
-      // Negative values are encoded as 10-byte varints in protobuf
-      total_size += field_id_size + 10;
-    } else {
-      // For non-negative values, use the standard varint size
-      total_size += field_id_size + varint(static_cast<uint32_t>(value));
-    }
-  }
-
-  /**
-   * @brief Calculates and adds the size of a uint32 field to the total message size
-   */
-  static inline void add_uint32_field(uint32_t &total_size, uint32_t field_id_size, uint32_t value) {
-    // Skip calculation if value is zero
-    if (value == 0) {
-      return;  // No need to update total_size
-    }
-
-    // Calculate and directly add to total_size
-    total_size += field_id_size + varint(value);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a uint32 field to the total message size (repeated field version)
-   */
-  static inline void add_uint32_field_repeated(uint32_t &total_size, uint32_t field_id_size, uint32_t value) {
-    // Always calculate size for repeated fields
-    total_size += field_id_size + varint(value);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a boolean field to the total message size
-   */
-  static inline void add_bool_field(uint32_t &total_size, uint32_t field_id_size, bool value) {
-    // Skip calculation if value is false
-    if (!value) {
-      return;  // No need to update total_size
-    }
-
-    // Boolean fields always use 1 byte when true
-    total_size += field_id_size + 1;
-  }
-
-  /**
-   * @brief Calculates and adds the size of a boolean field to the total message size (repeated field version)
-   */
-  static inline void add_bool_field_repeated(uint32_t &total_size, uint32_t field_id_size, bool value) {
-    // Always calculate size for repeated fields
-    // Boolean fields always use 1 byte
-    total_size += field_id_size + 1;
-  }
-
-  /**
-   * @brief Calculates and adds the size of a fixed field to the total message size
-   *
-   * Fixed fields always take exactly N bytes (4 for fixed32/float, 8 for fixed64/double).
-   *
-   * @tparam NumBytes The number of bytes for this fixed field (4 or 8)
-   * @param is_nonzero Whether the value is non-zero
-   */
-  template<uint32_t NumBytes>
-  static inline void add_fixed_field(uint32_t &total_size, uint32_t field_id_size, bool is_nonzero) {
-    // Skip calculation if value is zero
-    if (!is_nonzero) {
-      return;  // No need to update total_size
-    }
-
-    // Fixed fields always take exactly NumBytes
-    total_size += field_id_size + NumBytes;
-  }
-
-  /**
-   * @brief Calculates and adds the size of an enum field to the total message size
-   *
-   * Enum fields are encoded as uint32 varints.
-   */
-  static inline void add_enum_field(uint32_t &total_size, uint32_t field_id_size, uint32_t value) {
-    // Skip calculation if value is zero
-    if (value == 0) {
-      return;  // No need to update total_size
-    }
-
-    // Enums are encoded as uint32
-    total_size += field_id_size + varint(value);
-  }
-
-  /**
-   * @brief Calculates and adds the size of an enum field to the total message size (repeated field version)
-   *
-   * Enum fields are encoded as uint32 varints.
-   */
-  static inline void add_enum_field_repeated(uint32_t &total_size, uint32_t field_id_size, uint32_t value) {
-    // Always calculate size for repeated fields
-    // Enums are encoded as uint32
-    total_size += field_id_size + varint(value);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a sint32 field to the total message size
-   *
-   * Sint32 fields use ZigZag encoding, which is more efficient for negative values.
-   */
-  static inline void add_sint32_field(uint32_t &total_size, uint32_t field_id_size, int32_t value) {
-    // Skip calculation if value is zero
-    if (value == 0) {
-      return;  // No need to update total_size
-    }
-
-    // ZigZag encoding for sint32: (n << 1) ^ (n >> 31)
-    uint32_t zigzag = (static_cast<uint32_t>(value) << 1) ^ (static_cast<uint32_t>(value >> 31));
-    total_size += field_id_size + varint(zigzag);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a sint32 field to the total message size (repeated field version)
-   *
-   * Sint32 fields use ZigZag encoding, which is more efficient for negative values.
-   */
-  static inline void add_sint32_field_repeated(uint32_t &total_size, uint32_t field_id_size, int32_t value) {
-    // Always calculate size for repeated fields
-    // ZigZag encoding for sint32: (n << 1) ^ (n >> 31)
-    uint32_t zigzag = (static_cast<uint32_t>(value) << 1) ^ (static_cast<uint32_t>(value >> 31));
-    total_size += field_id_size + varint(zigzag);
-  }
-
-  /**
-   * @brief Calculates and adds the size of an int64 field to the total message size
-   */
-  static inline void add_int64_field(uint32_t &total_size, uint32_t field_id_size, int64_t value) {
-    // Skip calculation if value is zero
-    if (value == 0) {
-      return;  // No need to update total_size
-    }
-
-    // Calculate and directly add to total_size
-    total_size += field_id_size + varint(value);
-  }
-
-  /**
-   * @brief Calculates and adds the size of an int64 field to the total message size (repeated field version)
-   */
-  static inline void add_int64_field_repeated(uint32_t &total_size, uint32_t field_id_size, int64_t value) {
-    // Always calculate size for repeated fields
-    total_size += field_id_size + varint(value);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a uint64 field to the total message size
-   */
-  static inline void add_uint64_field(uint32_t &total_size, uint32_t field_id_size, uint64_t value) {
-    // Skip calculation if value is zero
-    if (value == 0) {
-      return;  // No need to update total_size
-    }
-
-    // Calculate and directly add to total_size
-    total_size += field_id_size + varint(value);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a uint64 field to the total message size (repeated field version)
-   */
-  static inline void add_uint64_field_repeated(uint32_t &total_size, uint32_t field_id_size, uint64_t value) {
-    // Always calculate size for repeated fields
-    total_size += field_id_size + varint(value);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a sint64 field to the total message size
-   *
-   * Sint64 fields use ZigZag encoding, which is more efficient for negative values.
-   */
-  static inline void add_sint64_field(uint32_t &total_size, uint32_t field_id_size, int64_t value) {
-    // Skip calculation if value is zero
-    if (value == 0) {
-      return;  // No need to update total_size
-    }
-
-    // ZigZag encoding for sint64: (n << 1) ^ (n >> 63)
-    uint64_t zigzag = (static_cast<uint64_t>(value) << 1) ^ (static_cast<uint64_t>(value >> 63));
-    total_size += field_id_size + varint(zigzag);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a sint64 field to the total message size (repeated field version)
-   *
-   * Sint64 fields use ZigZag encoding, which is more efficient for negative values.
-   */
-  static inline void add_sint64_field_repeated(uint32_t &total_size, uint32_t field_id_size, int64_t value) {
-    // Always calculate size for repeated fields
-    // ZigZag encoding for sint64: (n << 1) ^ (n >> 63)
-    uint64_t zigzag = (static_cast<uint64_t>(value) << 1) ^ (static_cast<uint64_t>(value >> 63));
-    total_size += field_id_size + varint(zigzag);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a string/bytes field to the total message size
-   */
-  static inline void add_string_field(uint32_t &total_size, uint32_t field_id_size, const std::string &str) {
-    // Skip calculation if string is empty
-    if (str.empty()) {
-      return;  // No need to update total_size
-    }
-
-    // Calculate and directly add to total_size
-    const uint32_t str_size = static_cast<uint32_t>(str.size());
-    total_size += field_id_size + varint(str_size) + str_size;
-  }
-
-  /**
-   * @brief Calculates and adds the size of a string/bytes field to the total message size (repeated field version)
-   */
-  static inline void add_string_field_repeated(uint32_t &total_size, uint32_t field_id_size, const std::string &str) {
-    // Always calculate size for repeated fields
-    const uint32_t str_size = static_cast<uint32_t>(str.size());
-    total_size += field_id_size + varint(str_size) + str_size;
-  }
-
-  /**
-   * @brief Calculates and adds the size of a nested message field to the total message size
-   *
-   * This helper function directly updates the total_size reference if the nested size
-   * is greater than zero.
-   *
-   * @param nested_size The pre-calculated size of the nested message
-   */
-  static inline void add_message_field(uint32_t &total_size, uint32_t field_id_size, uint32_t nested_size) {
-    // Skip calculation if nested message is empty
-    if (nested_size == 0) {
-      return;  // No need to update total_size
-    }
-
-    // Calculate and directly add to total_size
-    // Field ID + length varint + nested message content
-    total_size += field_id_size + varint(nested_size) + nested_size;
-  }
-
-  /**
-   * @brief Calculates and adds the size of a nested message field to the total message size (repeated field version)
-   *
-   * @param nested_size The pre-calculated size of the nested message
-   */
-  static inline void add_message_field_repeated(uint32_t &total_size, uint32_t field_id_size, uint32_t nested_size) {
-    // Always calculate size for repeated fields
-    // Field ID + length varint + nested message content
-    total_size += field_id_size + varint(nested_size) + nested_size;
-  }
-
-  /**
-   * @brief Calculates and adds the size of a nested message field to the total message size
-   *
-   * This version takes a ProtoMessage object, calculates its size internally,
-   * and updates the total_size reference. This eliminates the need for a temporary variable
-   * at the call site.
-   *
-   * @param message The nested message object
-   */
-  static inline void add_message_object(uint32_t &total_size, uint32_t field_id_size, const ProtoMessage &message) {
-    uint32_t nested_size = 0;
-    message.calculate_size(nested_size);
-
-    // Use the base implementation with the calculated nested_size
-    add_message_field(total_size, field_id_size, nested_size);
-  }
-
-  /**
-   * @brief Calculates and adds the size of a nested message field to the total message size (repeated field version)
-   *
-   * @param message The nested message object
-   */
-  static inline void add_message_object_repeated(uint32_t &total_size, uint32_t field_id_size,
-                                                 const ProtoMessage &message) {
-    uint32_t nested_size = 0;
-    message.calculate_size(nested_size);
-
-    // Use the base implementation with the calculated nested_size
-    add_message_field_repeated(total_size, field_id_size, nested_size);
-  }
-
-  /**
-   * @brief Calculates and adds the sizes of all messages in a repeated field to the total message size
-   *
-   * This helper processes a vector of message objects, calculating the size for each message
-   * and adding it to the total size.
-   *
-   * @tparam MessageType The type of the nested messages in the vector
-   * @param messages Vector of message objects
-   */
-  template<typename MessageType>
-  static inline void add_repeated_message(uint32_t &total_size, uint32_t field_id_size,
-                                          const std::vector<MessageType> &messages) {
-    // Skip if the vector is empty
-    if (messages.empty()) {
-      return;
-    }
-
-    // Use the repeated field version for all messages
-    for (const auto &message : messages) {
-      add_message_object_repeated(total_size, field_id_size, message);
-    }
-  }
-};
-
-// Implementation of encode_message - must be after ProtoMessage is defined
-inline void ProtoWriteBuffer::encode_message(uint32_t field_id, const ProtoMessage &value, bool force) {
-  this->encode_field_raw(field_id, 2);  // type 2: Length-delimited message
-
-  // Calculate the message size first
-  uint32_t msg_length_bytes = 0;
-  value.calculate_size(msg_length_bytes);
-
-  // Calculate how many bytes the length varint needs
-  uint32_t varint_length_bytes = ProtoSize::varint(msg_length_bytes);
-
-  // Reserve exact space for the length varint
-  size_t begin = this->buffer_->size();
-  this->buffer_->resize(this->buffer_->size() + varint_length_bytes);
-
-  // Write the length varint directly
-  ProtoVarInt(msg_length_bytes).encode_to_buffer_unchecked(this->buffer_->data() + begin, varint_length_bytes);
-
-  // Now encode the message content - it will append to the buffer
-  value.encode(*this);
-
-  // Verify that the encoded size matches what we calculated
-  assert(this->buffer_->size() == begin + varint_length_bytes + msg_length_bytes);
-}
-
-// Implementation of decode_to_message - must be after ProtoMessage is defined
-inline void ProtoLengthDelimited::decode_to_message(ProtoMessage &msg) const {
-  msg.decode(this->value_, this->length_);
-}
-
 template<typename T> const char *proto_enum_to_string(T value);
 
 class ProtoService {
@@ -846,11 +363,11 @@ class ProtoService {
    * @return A ProtoWriteBuffer object with the reserved size.
    */
   virtual ProtoWriteBuffer create_buffer(uint32_t reserve_size) = 0;
-  virtual bool send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) = 0;
+  virtual bool send_buffer(ProtoWriteBuffer buffer, uint16_t message_type) = 0;
   virtual void read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) = 0;
 
   // Optimized method that pre-allocates buffer based on message size
-  bool send_message_(const ProtoMessage &msg, uint8_t message_type) {
+  bool send_message_(const ProtoMessage &msg, uint16_t message_type) {
     uint32_t msg_size = 0;
     msg.calculate_size(msg_size);
 

esphome/components/api/user_services.h

@@ -7,7 +7,6 @@
 #include "esphome/core/automation.h"
 #include "api_pb2.h"
 
-#ifdef USE_API_SERVICES
 namespace esphome {
 namespace api {
 
@@ -74,4 +73,3 @@ template<typename... Ts> class UserServiceTrigger : public UserServiceBase<Ts...
 
 }  // namespace api
 }  // namespace esphome
-#endif  // USE_API_SERVICES

esphome/components/as3935_spi/as3935_spi.h

@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/as3935/as3935.h"
 #include "esphome/components/spi/spi.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
 
 namespace esphome {
 namespace as3935_spi {

esphome/components/async_tcp/__init__.py

@@ -31,7 +31,7 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
     if CORE.is_esp32 or CORE.is_libretiny:
         # https://github.com/ESP32Async/AsyncTCP
-        cg.add_library("ESP32Async/AsyncTCP", "3.4.5")
+        cg.add_library("ESP32Async/AsyncTCP", "3.4.4")
     elif CORE.is_esp8266:
         # https://github.com/ESP32Async/ESPAsyncTCP
         cg.add_library("ESP32Async/ESPAsyncTCP", "2.0.0")

esphome/components/bluetooth_proxy/bluetooth_proxy.cpp

@@ -59,12 +59,10 @@ bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device)
 // This achieves ~97% WiFi MTU utilization while staying under the limit
 static constexpr size_t FLUSH_BATCH_SIZE = 16;
 
-namespace {
-// Batch buffer in anonymous namespace to avoid guard variable (saves 8 bytes)
+// Global batch buffer to avoid guard variable (saves 8 bytes)
 // This is initialized at program startup before any threads
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-std::vector<api::BluetoothLERawAdvertisement> batch_buffer;
-}  // namespace
+static std::vector<api::BluetoothLERawAdvertisement> batch_buffer;
 
 static std::vector<api::BluetoothLERawAdvertisement> &get_batch_buffer() { return batch_buffer; }
 

esphome/components/bme680_bsec/__init__.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import esp32, i2c
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_SAMPLE_RATE, CONF_TEMPERATURE_OFFSET, Framework
+from esphome.const import CONF_ID, CONF_SAMPLE_RATE, CONF_TEMPERATURE_OFFSET
 
 CODEOWNERS = ["@trvrnrth"]
 DEPENDENCIES = ["i2c"]
@@ -56,15 +56,7 @@ CONFIG_SCHEMA = cv.All(
             ): cv.positive_time_period_minutes,
         }
     ).extend(i2c.i2c_device_schema(0x76)),
-    cv.only_with_framework(
-        frameworks=Framework.ARDUINO,
-        suggestions={
-            Framework.ESP_IDF: (
-                "bme68x_bsec2_i2c",
-                "sensor/bme68x_bsec2",
-            )
-        },
-    ),
+    cv.only_with_arduino,
     cv.Any(
         cv.only_on_esp8266,
         cv.All(

esphome/components/const/__init__.py

@@ -2,7 +2,6 @@
 
 CODEOWNERS = ["@esphome/core"]
 
-CONF_BYTE_ORDER = "byte_order"
 CONF_DRAW_ROUNDING = "draw_rounding"
 CONF_ON_STATE_CHANGE = "on_state_change"
 CONF_REQUEST_HEADERS = "request_headers"

esphome/components/debug/debug_esp32.cpp

@@ -53,7 +53,6 @@ void DebugComponent::on_shutdown() {
   auto pref = global_preferences->make_preference(REBOOT_MAX_LEN, fnv1_hash(REBOOT_KEY + App.get_name()));
   if (component != nullptr) {
     strncpy(buffer, component->get_component_source(), REBOOT_MAX_LEN - 1);
-    buffer[REBOOT_MAX_LEN - 1] = '\0';
   }
   ESP_LOGD(TAG, "Storing reboot source: %s", buffer);
   pref.save(&buffer);
@@ -69,7 +68,6 @@ std::string DebugComponent::get_reset_reason_() {
       auto pref = global_preferences->make_preference(REBOOT_MAX_LEN, fnv1_hash(REBOOT_KEY + App.get_name()));
       char buffer[REBOOT_MAX_LEN]{};
       if (pref.load(&buffer)) {
-        buffer[REBOOT_MAX_LEN - 1] = '\0';
         reset_reason = "Reboot request from " + std::string(buffer);
       }
     }

esphome/components/deep_sleep/__init__.py

@@ -1,6 +1,6 @@
 from esphome import automation, pins
 import esphome.codegen as cg
-from esphome.components import esp32, time
+from esphome.components import time
 from esphome.components.esp32 import get_esp32_variant
 from esphome.components.esp32.const import (
     VARIANT_ESP32,
@@ -116,20 +116,12 @@ def validate_pin_number(value):
     return value
 
 
-def _validate_ex1_wakeup_mode(value):
-    if value == "ALL_LOW":
-        esp32.only_on_variant(supported=[VARIANT_ESP32], msg_prefix="ALL_LOW")(value)
-    if value == "ANY_LOW":
-        esp32.only_on_variant(
-            supported=[
-                VARIANT_ESP32S2,
-                VARIANT_ESP32S3,
-                VARIANT_ESP32C6,
-                VARIANT_ESP32H2,
-            ],
-            msg_prefix="ANY_LOW",
-        )(value)
-    return value
+def validate_config(config):
+    if get_esp32_variant() == VARIANT_ESP32C3 and CONF_ESP32_EXT1_WAKEUP in config:
+        raise cv.Invalid("ESP32-C3 does not support wakeup from touch.")
+    if get_esp32_variant() == VARIANT_ESP32C3 and CONF_TOUCH_WAKEUP in config:
+        raise cv.Invalid("ESP32-C3 does not support wakeup from ext1")
+    return config
 
 
 deep_sleep_ns = cg.esphome_ns.namespace("deep_sleep")
@@ -156,7 +148,6 @@ WAKEUP_PIN_MODES = {
 esp_sleep_ext1_wakeup_mode_t = cg.global_ns.enum("esp_sleep_ext1_wakeup_mode_t")
 Ext1Wakeup = deep_sleep_ns.struct("Ext1Wakeup")
 EXT1_WAKEUP_MODES = {
-    "ANY_LOW": esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ANY_LOW,
     "ALL_LOW": esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ALL_LOW,
     "ANY_HIGH": esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ANY_HIGH,
 }
@@ -196,28 +187,16 @@ CONFIG_SCHEMA = cv.All(
             ),
             cv.Optional(CONF_ESP32_EXT1_WAKEUP): cv.All(
                 cv.only_on_esp32,
-                esp32.only_on_variant(
-                    unsupported=[VARIANT_ESP32C3], msg_prefix="Wakeup from ext1"
-                ),
                 cv.Schema(
                     {
                         cv.Required(CONF_PINS): cv.ensure_list(
                             pins.internal_gpio_input_pin_schema, validate_pin_number
                         ),
-                        cv.Required(CONF_MODE): cv.All(
-                            cv.enum(EXT1_WAKEUP_MODES, upper=True),
-                            _validate_ex1_wakeup_mode,
-                        ),
+                        cv.Required(CONF_MODE): cv.enum(EXT1_WAKEUP_MODES, upper=True),
                     }
                 ),
             ),
-            cv.Optional(CONF_TOUCH_WAKEUP): cv.All(
-                cv.only_on_esp32,
-                esp32.only_on_variant(
-                    unsupported=[VARIANT_ESP32C3], msg_prefix="Wakeup from touch"
-                ),
-                cv.boolean,
-            ),
+            cv.Optional(CONF_TOUCH_WAKEUP): cv.All(cv.only_on_esp32, cv.boolean),
         }
     ).extend(cv.COMPONENT_SCHEMA),
     cv.only_on([PLATFORM_ESP32, PLATFORM_ESP8266]),

esphome/components/e131/e131_packet.cpp

@@ -4,7 +4,6 @@
 #include "esphome/components/network/ip_address.h"
 #include "esphome/core/log.h"
 #include "esphome/core/util.h"
-#include "esphome/core/helpers.h"
 
 #include <lwip/igmp.h>
 #include <lwip/init.h>
@@ -72,11 +71,7 @@ bool E131Component::join_igmp_groups_() {
     ip4_addr_t multicast_addr =
         network::IPAddress(239, 255, ((universe.first >> 8) & 0xff), ((universe.first >> 0) & 0xff));
 
-    err_t err;
-    {
-      LwIPLock lock;
-      err = igmp_joingroup(IP4_ADDR_ANY4, &multicast_addr);
-    }
+    auto err = igmp_joingroup(IP4_ADDR_ANY4, &multicast_addr);
 
     if (err) {
       ESP_LOGW(TAG, "IGMP join for %d universe of E1.31 failed. Multicast might not work.", universe.first);
@@ -109,7 +104,6 @@ void E131Component::leave_(int universe) {
   if (listen_method_ == E131_MULTICAST) {
     ip4_addr_t multicast_addr = network::IPAddress(239, 255, ((universe >> 8) & 0xff), ((universe >> 0) & 0xff));
 
-    LwIPLock lock;
     igmp_leavegroup(IP4_ADDR_ANY4, &multicast_addr);
   }
 

esphome/components/esp32/__init__.py

@@ -189,7 +189,7 @@ def get_download_types(storage_json):
     ]
 
 
-def only_on_variant(*, supported=None, unsupported=None, msg_prefix="This feature"):
+def only_on_variant(*, supported=None, unsupported=None):
     """Config validator for features only available on some ESP32 variants."""
     if supported is not None and not isinstance(supported, list):
         supported = [supported]
@@ -200,11 +200,11 @@ def only_on_variant(*, supported=None, unsupported=None, msg_prefix="This featur
         variant = get_esp32_variant()
         if supported is not None and variant not in supported:
             raise cv.Invalid(
-                f"{msg_prefix} is only available on {', '.join(supported)}"
+                f"This feature is only available on {', '.join(supported)}"
             )
         if unsupported is not None and variant in unsupported:
             raise cv.Invalid(
-                f"{msg_prefix} is not available on {', '.join(unsupported)}"
+                f"This feature is not available on {', '.join(unsupported)}"
             )
         return obj
 
@@ -707,7 +707,6 @@ async def to_code(config):
     cg.add_define("ESPHOME_VARIANT", VARIANT_FRIENDLY[config[CONF_VARIANT]])
 
     cg.add_platformio_option("lib_ldf_mode", "off")
-    cg.add_platformio_option("lib_compat_mode", "strict")
 
     framework_ver: cv.Version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
 

esphome/components/esp32/helpers.cpp

@@ -1,5 +1,4 @@
 #include "esphome/core/helpers.h"
-#include "esphome/core/defines.h"
 
 #ifdef USE_ESP32
 
@@ -31,45 +30,6 @@ void Mutex::unlock() { xSemaphoreGive(this->handle_); }
 IRAM_ATTR InterruptLock::InterruptLock() { portDISABLE_INTERRUPTS(); }
 IRAM_ATTR InterruptLock::~InterruptLock() { portENABLE_INTERRUPTS(); }
 
-#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
-#include "lwip/priv/tcpip_priv.h"
-#endif
-
-LwIPLock::LwIPLock() {
-#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
-  // When CONFIG_LWIP_TCPIP_CORE_LOCKING is enabled, lwIP uses a global mutex to protect
-  // its internal state. Any thread can take this lock to safely access lwIP APIs.
-  //
-  // sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER) returns true if the current thread
-  // already holds the lwIP core lock. This prevents recursive locking attempts and
-  // allows nested LwIPLock instances to work correctly.
-  //
-  // If we don't already hold the lock, acquire it. This will block until the lock
-  // is available if another thread currently holds it.
-  if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) {
-    LOCK_TCPIP_CORE();
-  }
-#endif
-}
-
-LwIPLock::~LwIPLock() {
-#ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
-  // Only release the lwIP core lock if this thread currently holds it.
-  //
-  // sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER) queries lwIP's internal lock
-  // ownership tracking. It returns true only if the current thread is registered
-  // as the lock holder.
-  //
-  // This check is essential because:
-  // 1. We may not have acquired the lock in the constructor (if we already held it)
-  // 2. The lock might have been released by other means between constructor and destructor
-  // 3. Calling UNLOCK_TCPIP_CORE() without holding the lock causes undefined behavior
-  if (sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) {
-    UNLOCK_TCPIP_CORE();
-  }
-#endif
-}
-
 void get_mac_address_raw(uint8_t *mac) {  // NOLINT(readability-non-const-parameter)
 #if defined(CONFIG_SOC_IEEE802154_SUPPORTED)
   // When CONFIG_SOC_IEEE802154_SUPPORTED is defined, esp_efuse_mac_get_default

esphome/components/esp32_camera/__init__.py

@@ -1,5 +1,3 @@
-import logging
-
 from esphome import automation, pins
 import esphome.codegen as cg
 from esphome.components import i2c
@@ -10,7 +8,6 @@ from esphome.const import (
     CONF_CONTRAST,
     CONF_DATA_PINS,
     CONF_FREQUENCY,
-    CONF_I2C,
     CONF_I2C_ID,
     CONF_ID,
     CONF_PIN,
@@ -23,9 +20,6 @@ from esphome.const import (
 )
 from esphome.core import CORE
 from esphome.core.entity_helpers import setup_entity
-import esphome.final_validate as fv
-
-_LOGGER = logging.getLogger(__name__)
 
 DEPENDENCIES = ["esp32"]
 
@@ -256,22 +250,6 @@ CONFIG_SCHEMA = cv.All(
     cv.has_exactly_one_key(CONF_I2C_PINS, CONF_I2C_ID),
 )
 
-
-def _final_validate(config):
-    if CONF_I2C_PINS not in config:
-        return
-    fconf = fv.full_config.get()
-    if fconf.get(CONF_I2C):
-        raise cv.Invalid(
-            "The `i2c_pins:` config option is incompatible with an dedicated `i2c:` block, use `i2c_id` instead"
-        )
-    _LOGGER.warning(
-        "The `i2c_pins:` config option is deprecated. Use `i2c_id:` with a dedicated `i2c:` definition instead."
-    )
-
-
-FINAL_VALIDATE_SCHEMA = _final_validate
-
 SETTERS = {
     # pin assignment
     CONF_DATA_PINS: "set_data_pins",
@@ -330,7 +308,7 @@ async def to_code(config):
     cg.add(var.set_frame_buffer_count(config[CONF_FRAME_BUFFER_COUNT]))
     cg.add(var.set_frame_size(config[CONF_RESOLUTION]))
 
-    cg.add_define("USE_CAMERA")
+    cg.add_define("USE_ESP32_CAMERA")
 
     if CORE.using_esp_idf:
         add_idf_component(name="espressif/esp32-camera", ref="2.0.15")

esphome/components/esp32_touch/esp32_touch_v1.cpp

@@ -16,8 +16,6 @@ namespace esp32_touch {
 
 static const char *const TAG = "esp32_touch";
 
-static const uint32_t SETUP_MODE_THRESHOLD = 0xFFFF;
-
 void ESP32TouchComponent::setup() {
   // Create queue for touch events
   // Queue size calculation: children * 4 allows for burst scenarios where ISR
@@ -46,11 +44,7 @@ void ESP32TouchComponent::setup() {
 
   // Configure each touch pad
   for (auto *child : this->children_) {
-    if (this->setup_mode_) {
-      touch_pad_config(child->get_touch_pad(), SETUP_MODE_THRESHOLD);
-    } else {
-      touch_pad_config(child->get_touch_pad(), child->get_threshold());
-    }
+    touch_pad_config(child->get_touch_pad(), child->get_threshold());
   }
 
   // Register ISR handler
@@ -115,13 +109,12 @@ void ESP32TouchComponent::loop() {
 
       // Only publish if state changed - this filters out repeated events
       if (new_state != child->last_state_) {
-        child->initial_state_published_ = true;
         child->last_state_ = new_state;
         child->publish_state(new_state);
         // Original ESP32: ISR only fires when touched, release is detected by timeout
         // Note: ESP32 v1 uses inverted logic - touched when value < threshold
-        ESP_LOGV(TAG, "Touch Pad '%s' state: %s (value: %" PRIu32 " < threshold: %" PRIu32 ")",
-                 child->get_name().c_str(), ONOFF(new_state), event.value, child->get_threshold());
+        ESP_LOGV(TAG, "Touch Pad '%s' state: ON (value: %" PRIu32 " < threshold: %" PRIu32 ")",
+                 child->get_name().c_str(), event.value, child->get_threshold());
       }
       break;  // Exit inner loop after processing matching pad
     }
@@ -182,9 +175,6 @@ void ESP32TouchComponent::on_shutdown() {
 void IRAM_ATTR ESP32TouchComponent::touch_isr_handler(void *arg) {
   ESP32TouchComponent *component = static_cast<ESP32TouchComponent *>(arg);
 
-  uint32_t mask = 0;
-  touch_ll_read_trigger_status_mask(&mask);
-  touch_ll_clear_trigger_status_mask();
   touch_pad_clear_status();
 
   // INTERRUPT BEHAVIOR: On ESP32 v1 hardware, the interrupt fires when ANY configured
@@ -211,8 +201,10 @@ void IRAM_ATTR ESP32TouchComponent::touch_isr_handler(void *arg) {
       value = touch_ll_read_raw_data(pad);
     }
 
-    // Skip pads that aren’t in the trigger mask
-    if (((mask >> pad) & 1) == 0) {
+    // Skip pads with 0 value - they haven't been measured in this cycle
+    // This is important: not all pads are measured every interrupt cycle,
+    // only those that the hardware has updated
+    if (value == 0) {
       continue;
     }
 

esphome/components/esp8266/__init__.py

@@ -180,7 +180,6 @@ async def to_code(config):
     cg.add(esp8266_ns.setup_preferences())
 
     cg.add_platformio_option("lib_ldf_mode", "off")
-    cg.add_platformio_option("lib_compat_mode", "strict")
 
     cg.add_platformio_option("board", config[CONF_BOARD])
     cg.add_build_flag("-DUSE_ESP8266")

esphome/components/esp8266/helpers.cpp

@@ -22,10 +22,6 @@ void Mutex::unlock() {}
 IRAM_ATTR InterruptLock::InterruptLock() { state_ = xt_rsil(15); }
 IRAM_ATTR InterruptLock::~InterruptLock() { xt_wsr_ps(state_); }
 
-// ESP8266 doesn't support lwIP core locking, so this is a no-op
-LwIPLock::LwIPLock() {}
-LwIPLock::~LwIPLock() {}
-
 void get_mac_address_raw(uint8_t *mac) {  // NOLINT(readability-non-const-parameter)
   wifi_get_macaddr(STATION_IF, mac);
 }

esphome/components/esp_ldo/__init__.py

@@ -20,16 +20,14 @@ adjusted_ids = set()
 
 CONFIG_SCHEMA = cv.All(
     cv.ensure_list(
-        cv.COMPONENT_SCHEMA.extend(
-            {
-                cv.GenerateID(): cv.declare_id(EspLdo),
-                cv.Required(CONF_VOLTAGE): cv.All(
-                    cv.voltage, cv.float_range(min=0.5, max=2.7)
-                ),
-                cv.Required(CONF_CHANNEL): cv.one_of(*CHANNELS, int=True),
-                cv.Optional(CONF_ADJUSTABLE, default=False): cv.boolean,
-            }
-        )
+        {
+            cv.GenerateID(): cv.declare_id(EspLdo),
+            cv.Required(CONF_VOLTAGE): cv.All(
+                cv.voltage, cv.float_range(min=0.5, max=2.7)
+            ),
+            cv.Required(CONF_CHANNEL): cv.one_of(*CHANNELS, int=True),
+            cv.Optional(CONF_ADJUSTABLE, default=False): cv.boolean,
+        }
     ),
     cv.only_with_esp_idf,
     only_on_variant(supported=[VARIANT_ESP32P4]),

esphome/components/esp_ldo/esp_ldo.h

@@ -17,9 +17,6 @@ class EspLdo : public Component {
   void set_adjustable(bool adjustable) { this->adjustable_ = adjustable; }
   void set_voltage(float voltage) { this->voltage_ = voltage; }
   void adjust_voltage(float voltage);
-  float get_setup_priority() const override {
-    return setup_priority::BUS;  // LDO setup should be done early
-  }
 
  protected:
   int channel_;

esphome/components/ethernet/ethernet_component.cpp

@@ -420,7 +420,6 @@ network::IPAddresses EthernetComponent::get_ip_addresses() {
 }
 
 network::IPAddress EthernetComponent::get_dns_address(uint8_t num) {
-  LwIPLock lock;
   const ip_addr_t *dns_ip = dns_getserver(num);
   return dns_ip;
 }
@@ -528,7 +527,6 @@ void EthernetComponent::start_connect_() {
   ESPHL_ERROR_CHECK(err, "DHCPC set IP info error");
 
   if (this->manual_ip_.has_value()) {
-    LwIPLock lock;
     if (this->manual_ip_->dns1.is_set()) {
       ip_addr_t d;
       d = this->manual_ip_->dns1;
@@ -561,13 +559,8 @@ bool EthernetComponent::is_connected() { return this->state_ == EthernetComponen
 void EthernetComponent::dump_connect_params_() {
   esp_netif_ip_info_t ip;
   esp_netif_get_ip_info(this->eth_netif_, &ip);
-  const ip_addr_t *dns_ip1;
-  const ip_addr_t *dns_ip2;
-  {
-    LwIPLock lock;
-    dns_ip1 = dns_getserver(0);
-    dns_ip2 = dns_getserver(1);
-  }
+  const ip_addr_t *dns_ip1 = dns_getserver(0);
+  const ip_addr_t *dns_ip2 = dns_getserver(1);
 
   ESP_LOGCONFIG(TAG,
                 "  IP Address: %s\n"

esphome/components/fan/fan.cpp

@@ -177,10 +177,6 @@ optional<FanRestoreState> Fan::restore_state_() {
   return {};
 }
 void Fan::save_state_() {
-  if (this->restore_mode_ == FanRestoreMode::NO_RESTORE) {
-    return;
-  }
-
   FanRestoreState state{};
   state.state = this->state;
   state.oscillating = this->oscillating;

esphome/components/fastled_clockless/light.py

@@ -2,13 +2,7 @@ from esphome import pins
 import esphome.codegen as cg
 from esphome.components import fastled_base
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_CHIPSET,
-    CONF_NUM_LEDS,
-    CONF_PIN,
-    CONF_RGB_ORDER,
-    Framework,
-)
+from esphome.const import CONF_CHIPSET, CONF_NUM_LEDS, CONF_PIN, CONF_RGB_ORDER
 
 AUTO_LOAD = ["fastled_base"]
 
@@ -54,22 +48,13 @@ CONFIG_SCHEMA = cv.All(
             cv.Required(CONF_PIN): pins.internal_gpio_output_pin_number,
         }
     ),
-    cv.only_with_framework(
-        frameworks=Framework.ARDUINO,
-        suggestions={
-            Framework.ESP_IDF: (
-                "esp32_rmt_led_strip",
-                "light/esp32_rmt_led_strip",
-            )
-        },
-    ),
+    _validate,
     cv.require_framework_version(
         esp8266_arduino=cv.Version(2, 7, 4),
         esp32_arduino=cv.Version(99, 0, 0),
         max_version=True,
         extra_message="Please see note on documentation for FastLED",
     ),
-    _validate,
 )
 
 

esphome/components/fastled_spi/light.py

@@ -9,7 +9,6 @@ from esphome.const import (
     CONF_DATA_RATE,
     CONF_NUM_LEDS,
     CONF_RGB_ORDER,
-    Framework,
 )
 
 AUTO_LOAD = ["fastled_base"]
@@ -34,15 +33,6 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_DATA_RATE): cv.frequency,
         }
     ),
-    cv.only_with_framework(
-        frameworks=Framework.ARDUINO,
-        suggestions={
-            Framework.ESP_IDF: (
-                "spi_led_strip",
-                "light/spi_led_strip",
-            )
-        },
-    ),
     cv.require_framework_version(
         esp8266_arduino=cv.Version(2, 7, 4),
         esp32_arduino=cv.Version(99, 0, 0),

esphome/components/font/__init__.py

@@ -15,7 +15,6 @@ from freetype import (
     FT_LOAD_RENDER,
     FT_LOAD_TARGET_MONO,
     Face,
-    FT_Exception,
     ft_pixel_mode_mono,
 )
 import requests
@@ -95,14 +94,7 @@ class FontCache(MutableMapping):
         return self.store[self._keytransform(item)]
 
     def __setitem__(self, key, value):
-        transformed = self._keytransform(key)
-        try:
-            self.store[transformed] = Face(str(value))
-        except FT_Exception as exc:
-            file = transformed.split(":", 1)
-            raise cv.Invalid(
-                f"{file[0].capitalize()} {file[1]} is not a valid font file"
-            ) from exc
+        self.store[self._keytransform(key)] = Face(str(value))
 
 
 FONT_CACHE = FontCache()

esphome/components/gl_r01_i2c/gl_r01_i2c.cpp

@@ -1,68 +0,0 @@
-#include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-#include "gl_r01_i2c.h"
-
-namespace esphome {
-namespace gl_r01_i2c {
-
-static const char *const TAG = "gl_r01_i2c";
-
-// Register definitions from datasheet
-static const uint8_t REG_VERSION = 0x00;
-static const uint8_t REG_DISTANCE = 0x02;
-static const uint8_t REG_TRIGGER = 0x10;
-static const uint8_t CMD_TRIGGER = 0xB0;
-static const uint8_t RESTART_CMD1 = 0x5A;
-static const uint8_t RESTART_CMD2 = 0xA5;
-static const uint8_t READ_DELAY = 40;  // minimum milliseconds from datasheet to safely read measurement result
-
-void GLR01I2CComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up GL-R01 I2C...");
-  // Verify sensor presence
-  if (!this->read_byte_16(REG_VERSION, &this->version_)) {
-    ESP_LOGE(TAG, "Failed to communicate with GL-R01 I2C sensor!");
-    this->mark_failed();
-    return;
-  }
-  ESP_LOGD(TAG, "Found GL-R01 I2C with version 0x%04X", this->version_);
-}
-
-void GLR01I2CComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "GL-R01 I2C:");
-  ESP_LOGCONFIG(TAG, " Firmware Version: 0x%04X", this->version_);
-  LOG_I2C_DEVICE(this);
-  LOG_SENSOR(" ", "Distance", this);
-}
-
-void GLR01I2CComponent::update() {
-  // Trigger a new measurement
-  if (!this->write_byte(REG_TRIGGER, CMD_TRIGGER)) {
-    ESP_LOGE(TAG, "Failed to trigger measurement!");
-    this->status_set_warning();
-    return;
-  }
-
-  // Schedule reading the result after the read delay
-  this->set_timeout(READ_DELAY, [this]() { this->read_distance_(); });
-}
-
-void GLR01I2CComponent::read_distance_() {
-  uint16_t distance = 0;
-  if (!this->read_byte_16(REG_DISTANCE, &distance)) {
-    ESP_LOGE(TAG, "Failed to read distance value!");
-    this->status_set_warning();
-    return;
-  }
-
-  if (distance == 0xFFFF) {
-    ESP_LOGW(TAG, "Invalid measurement received!");
-    this->status_set_warning();
-  } else {
-    ESP_LOGV(TAG, "Distance: %umm", distance);
-    this->publish_state(distance);
-    this->status_clear_warning();
-  }
-}
-
-}  // namespace gl_r01_i2c
-}  // namespace esphome

esphome/components/gl_r01_i2c/gl_r01_i2c.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace gl_r01_i2c {
-
-class GLR01I2CComponent : public sensor::Sensor, public i2c::I2CDevice, public PollingComponent {
- public:
-  void setup() override;
-  void dump_config() override;
-  void update() override;
-
- protected:
-  void read_distance_();
-  uint16_t version_{0};
-};
-
-}  // namespace gl_r01_i2c
-}  // namespace esphome

esphome/components/gl_r01_i2c/sensor.py

@@ -1,36 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c, sensor
-from esphome.const import (
-    CONF_ID,
-    DEVICE_CLASS_DISTANCE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_MILLIMETER,
-)
-
-CODEOWNERS = ["@pkejval"]
-DEPENDENCIES = ["i2c"]
-
-gl_r01_i2c_ns = cg.esphome_ns.namespace("gl_r01_i2c")
-GLR01I2CComponent = gl_r01_i2c_ns.class_(
-    "GLR01I2CComponent", i2c.I2CDevice, cg.PollingComponent
-)
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(
-        GLR01I2CComponent,
-        unit_of_measurement=UNIT_MILLIMETER,
-        accuracy_decimals=0,
-        device_class=DEVICE_CLASS_DISTANCE,
-        state_class=STATE_CLASS_MEASUREMENT,
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x74))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await sensor.register_sensor(var, config)
-    await i2c.register_i2c_device(var, config)

esphome/components/gpio/binary_sensor/__init__.py

@@ -1,22 +1,11 @@
-import logging
-
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_ALLOW_OTHER_USES,
-    CONF_ID,
-    CONF_NAME,
-    CONF_NUMBER,
-    CONF_PIN,
-)
-from esphome.core import CORE
+from esphome.const import CONF_PIN
 
 from .. import gpio_ns
 
-_LOGGER = logging.getLogger(__name__)
-
 GPIOBinarySensor = gpio_ns.class_(
     "GPIOBinarySensor", binary_sensor.BinarySensor, cg.Component
 )
@@ -35,21 +24,7 @@ CONFIG_SCHEMA = (
     .extend(
         {
             cv.Required(CONF_PIN): pins.gpio_input_pin_schema,
-            # Interrupts are disabled by default for bk72xx, ln882x, and rtl87xx platforms
-            # due to hardware limitations or lack of reliable interrupt support. This ensures
-            # stable operation on these platforms. Future maintainers should verify platform
-            # capabilities before changing this default behavior.
-            cv.SplitDefault(
-                CONF_USE_INTERRUPT,
-                bk72xx=False,
-                esp32=True,
-                esp8266=True,
-                host=True,
-                ln882x=False,
-                nrf52=True,
-                rp2040=True,
-                rtl87xx=False,
-            ): cv.boolean,
+            cv.Optional(CONF_USE_INTERRUPT, default=True): cv.boolean,
             cv.Optional(CONF_INTERRUPT_TYPE, default="ANY"): cv.enum(
                 INTERRUPT_TYPES, upper=True
             ),
@@ -66,34 +41,6 @@ async def to_code(config):
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))
 
-    # Check for ESP8266 GPIO16 interrupt limitation
-    # GPIO16 on ESP8266 is a special pin that doesn't support interrupts through
-    # the Arduino attachInterrupt() function. This is the only known GPIO pin
-    # across all supported platforms that has this limitation, so we handle it
-    # here instead of in the platform-specific code.
-    use_interrupt = config[CONF_USE_INTERRUPT]
-    if use_interrupt and CORE.is_esp8266 and config[CONF_PIN][CONF_NUMBER] == 16:
-        _LOGGER.warning(
-            "GPIO binary_sensor '%s': GPIO16 on ESP8266 doesn't support interrupts. "
-            "Falling back to polling mode (same as in ESPHome <2025.7). "
-            "The sensor will work exactly as before, but other pins have better "
-            "performance with interrupts.",
-            config.get(CONF_NAME, config[CONF_ID]),
-        )
-        use_interrupt = False
-
-    # Check if pin is shared with other components (allow_other_uses)
-    # When a pin is shared, interrupts can interfere with other components
-    # (e.g., duty_cycle sensor) that need to monitor the pin's state changes
-    if use_interrupt and config[CONF_PIN].get(CONF_ALLOW_OTHER_USES, False):
-        _LOGGER.info(
-            "GPIO binary_sensor '%s': Disabling interrupts because pin %s is shared with other components. "
-            "The sensor will use polling mode for compatibility with other pin uses.",
-            config.get(CONF_NAME, config[CONF_ID]),
-            config[CONF_PIN][CONF_NUMBER],
-        )
-        use_interrupt = False
-
-    cg.add(var.set_use_interrupt(use_interrupt))
-    if use_interrupt:
+    cg.add(var.set_use_interrupt(config[CONF_USE_INTERRUPT]))
+    if config[CONF_USE_INTERRUPT]:
         cg.add(var.set_interrupt_type(config[CONF_INTERRUPT_TYPE]))

esphome/components/gt911/touchscreen/gt911_touchscreen.cpp

@@ -8,8 +8,6 @@ namespace gt911 {
 
 static const char *const TAG = "gt911.touchscreen";
 
-static const uint8_t PRIMARY_ADDRESS = 0x5D;    // default I2C address for GT911
-static const uint8_t SECONDARY_ADDRESS = 0x14;  // secondary I2C address for GT911
 static const uint8_t GET_TOUCH_STATE[2] = {0x81, 0x4E};
 static const uint8_t CLEAR_TOUCH_STATE[3] = {0x81, 0x4E, 0x00};
 static const uint8_t GET_TOUCHES[2] = {0x81, 0x4F};
@@ -20,7 +18,8 @@ static const size_t MAX_BUTTONS = 4;  // max number of buttons scanned
 
 #define ERROR_CHECK(err) \
   if ((err) != i2c::ERROR_OK) { \
-    this->status_set_warning("Communication failure"); \
+    ESP_LOGE(TAG, "Failed to communicate!"); \
+    this->status_set_warning(); \
     return; \
   }
 
@@ -31,31 +30,31 @@ void GT911Touchscreen::setup() {
     this->reset_pin_->setup();
     this->reset_pin_->digital_write(false);
     if (this->interrupt_pin_ != nullptr) {
-      // temporarily set the interrupt pin to output to control address selection
+      // The interrupt pin is used as an input during reset to select the I2C address.
       this->interrupt_pin_->pin_mode(gpio::FLAG_OUTPUT);
+      this->interrupt_pin_->setup();
       this->interrupt_pin_->digital_write(false);
     }
     delay(2);
     this->reset_pin_->digital_write(true);
     delay(50);  // NOLINT
-  }
-  if (this->interrupt_pin_ != nullptr) {
-    // set pre-configured input mode
-    this->interrupt_pin_->setup();
+    if (this->interrupt_pin_ != nullptr) {
+      this->interrupt_pin_->pin_mode(gpio::FLAG_INPUT);
+      this->interrupt_pin_->setup();
+    }
   }
 
   // check the configuration of the int line.
   uint8_t data[4];
-  err = this->write(GET_SWITCHES, sizeof(GET_SWITCHES));
-  if (err != i2c::ERROR_OK && this->address_ == PRIMARY_ADDRESS) {
-    this->address_ = SECONDARY_ADDRESS;
-    err = this->write(GET_SWITCHES, sizeof(GET_SWITCHES));
-  }
+  err = this->write(GET_SWITCHES, 2);
   if (err == i2c::ERROR_OK) {
     err = this->read(data, 1);
     if (err == i2c::ERROR_OK) {
-      ESP_LOGD(TAG, "Read from switches at address 0x%02X: 0x%02X", this->address_, data[0]);
+      ESP_LOGD(TAG, "Read from switches: 0x%02X", data[0]);
       if (this->interrupt_pin_ != nullptr) {
+        // datasheet says NOT to use pullup/down on the int line.
+        this->interrupt_pin_->pin_mode(gpio::FLAG_INPUT);
+        this->interrupt_pin_->setup();
         this->attach_interrupt_(this->interrupt_pin_,
                                 (data[0] & 1) ? gpio::INTERRUPT_FALLING_EDGE : gpio::INTERRUPT_RISING_EDGE);
       }
@@ -64,7 +63,7 @@ void GT911Touchscreen::setup() {
   if (this->x_raw_max_ == 0 || this->y_raw_max_ == 0) {
     // no calibration? Attempt to read the max values from the touchscreen.
     if (err == i2c::ERROR_OK) {
-      err = this->write(GET_MAX_VALUES, sizeof(GET_MAX_VALUES));
+      err = this->write(GET_MAX_VALUES, 2);
       if (err == i2c::ERROR_OK) {
         err = this->read(data, sizeof(data));
         if (err == i2c::ERROR_OK) {
@@ -76,12 +75,15 @@ void GT911Touchscreen::setup() {
       }
     }
     if (err != i2c::ERROR_OK) {
-      this->mark_failed("Failed to read calibration");
+      ESP_LOGE(TAG, "Failed to read calibration values from touchscreen!");
+      this->mark_failed();
       return;
     }
   }
   if (err != i2c::ERROR_OK) {
-    this->mark_failed("Failed to communicate");
+    ESP_LOGE(TAG, "Failed to communicate!");
+    this->mark_failed();
+    return;
   }
 
   ESP_LOGCONFIG(TAG, "GT911 Touchscreen setup complete");
@@ -92,7 +94,7 @@ void GT911Touchscreen::update_touches() {
   uint8_t touch_state = 0;
   uint8_t data[MAX_TOUCHES + 1][8];  // 8 bytes each for each point, plus extra space for the key byte
 
-  err = this->write(GET_TOUCH_STATE, sizeof(GET_TOUCH_STATE));
+  err = this->write(GET_TOUCH_STATE, sizeof(GET_TOUCH_STATE), false);
   ERROR_CHECK(err);
   err = this->read(&touch_state, 1);
   ERROR_CHECK(err);
@@ -104,7 +106,7 @@ void GT911Touchscreen::update_touches() {
     return;
   }
 
-  err = this->write(GET_TOUCHES, sizeof(GET_TOUCHES));
+  err = this->write(GET_TOUCHES, sizeof(GET_TOUCHES), false);
   ERROR_CHECK(err);
   // num_of_touches is guaranteed to be 0..5. Also read the key data
   err = this->read(data[0], sizeof(data[0]) * num_of_touches + 1);
@@ -130,7 +132,6 @@ void GT911Touchscreen::dump_config() {
   ESP_LOGCONFIG(TAG, "GT911 Touchscreen:");
   LOG_I2C_DEVICE(this);
   LOG_PIN("  Interrupt Pin: ", this->interrupt_pin_);
-  LOG_PIN("  Reset Pin: ", this->reset_pin_);
 }
 
 }  // namespace gt911

esphome/components/host/__init__.py

@@ -45,4 +45,3 @@ async def to_code(config):
     cg.add_define("ESPHOME_BOARD", "host")
     cg.add_platformio_option("platform", "platformio/native")
     cg.add_platformio_option("lib_ldf_mode", "off")
-    cg.add_platformio_option("lib_compat_mode", "strict")

esphome/components/http_request/update/http_request_update.cpp

@@ -83,7 +83,7 @@ void HttpRequestUpdate::update_task(void *params) {
     container.reset();  // Release ownership of the container's shared_ptr
 
     valid = json::parse_json(response, [this_update](JsonObject root) -> bool {
-      if (!root["name"].is<const char *>() || !root["version"].is<const char *>() || !root["builds"].is<JsonArray>()) {
+      if (!root.containsKey("name") || !root.containsKey("version") || !root.containsKey("builds")) {
         ESP_LOGE(TAG, "Manifest does not contain required fields");
         return false;
       }
@@ -91,26 +91,26 @@ void HttpRequestUpdate::update_task(void *params) {
       this_update->update_info_.latest_version = root["version"].as<std::string>();
 
       for (auto build : root["builds"].as<JsonArray>()) {
-        if (!build["chipFamily"].is<const char *>()) {
+        if (!build.containsKey("chipFamily")) {
           ESP_LOGE(TAG, "Manifest does not contain required fields");
           return false;
         }
         if (build["chipFamily"] == ESPHOME_VARIANT) {
-          if (!build["ota"].is<JsonObject>()) {
+          if (!build.containsKey("ota")) {
             ESP_LOGE(TAG, "Manifest does not contain required fields");
             return false;
           }
-          JsonObject ota = build["ota"].as<JsonObject>();
-          if (!ota["path"].is<const char *>() || !ota["md5"].is<const char *>()) {
+          auto ota = build["ota"];
+          if (!ota.containsKey("path") || !ota.containsKey("md5")) {
             ESP_LOGE(TAG, "Manifest does not contain required fields");
             return false;
           }
           this_update->update_info_.firmware_url = ota["path"].as<std::string>();
           this_update->update_info_.md5 = ota["md5"].as<std::string>();
 
-          if (ota["summary"].is<const char *>())
+          if (ota.containsKey("summary"))
             this_update->update_info_.summary = ota["summary"].as<std::string>();
-          if (ota["release_url"].is<const char *>())
+          if (ota.containsKey("release_url"))
             this_update->update_info_.release_url = ota["release_url"].as<std::string>();
 
           return true;

esphome/components/hydreon_rgxx/sensor.py

@@ -111,8 +111,8 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_MOISTURE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_INTENSITY,
                 accuracy_decimals=0,
+                device_class=DEVICE_CLASS_PRECIPITATION_INTENSITY,
                 state_class=STATE_CLASS_MEASUREMENT,
-                icon="mdi:weather-rainy",
             ),
             cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_CELSIUS,

esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp

@@ -24,6 +24,9 @@ static const uint32_t READ_DURATION_MS = 16;
 static const size_t TASK_STACK_SIZE = 4096;
 static const ssize_t TASK_PRIORITY = 23;
 
+// Use an exponential moving average to correct a DC offset with weight factor 1/1000
+static const int32_t DC_OFFSET_MOVING_AVERAGE_COEFFICIENT_DENOMINATOR = 1000;
+
 static const char *const TAG = "i2s_audio.microphone";
 
 enum MicrophoneEventGroupBits : uint32_t {
@@ -379,57 +382,26 @@ void I2SAudioMicrophone::mic_task(void *params) {
 }
 
 void I2SAudioMicrophone::fix_dc_offset_(std::vector<uint8_t> &data) {
-  /**
-   * From https://www.musicdsp.org/en/latest/Filters/135-dc-filter.html:
-   *
-   *     y(n) = x(n) - x(n-1) + R * y(n-1)
-   *     R = 1 - (pi * 2 * frequency / samplerate)
-   *
-   * From https://en.wikipedia.org/wiki/Hearing_range:
-   *     The human range is commonly given as 20Hz up.
-   *
-   * From https://en.wikipedia.org/wiki/High-resolution_audio:
-   *     A reasonable upper bound for sample rate seems to be 96kHz.
-   *
-   * Calculate R value for 20Hz on a 96kHz sample rate:
-   *     R = 1 - (pi * 2 * 20 / 96000)
-   *     R = 0.9986910031
-   *
-   * Transform floating point to bit-shifting approximation:
-   *     output = input - prev_input + R * prev_output
-   *     output = input - prev_input + (prev_output - (prev_output >> S))
-   *
-   * Approximate bit-shift value S from R:
-   *     R = 1 - (1 >> S)
-   *     R = 1 - (1 / 2^S)
-   *     R = 1 - 2^-S
-   *     0.9986910031 = 1 - 2^-S
-   *     S = 9.57732 ~= 10
-   *
-   * Actual R from S:
-   *     R = 1 - 2^-10 = 0.9990234375
-   *
-   * Confirm this has effect outside human hearing on 96000kHz sample:
-   *     0.9990234375 = 1 - (pi * 2 * f / 96000)
-   *     f = 14.9208Hz
-   *
-   * Confirm this has effect outside human hearing on PDM 16kHz sample:
-   *     0.9990234375 = 1 - (pi * 2 * f / 16000)
-   *     f = 2.4868Hz
-   *
-   */
-  const uint8_t dc_filter_shift = 10;
   const size_t bytes_per_sample = this->audio_stream_info_.samples_to_bytes(1);
   const uint32_t total_samples = this->audio_stream_info_.bytes_to_samples(data.size());
+
+  if (total_samples == 0) {
+    return;
+  }
+
+  int64_t offset_accumulator = 0;
   for (uint32_t sample_index = 0; sample_index < total_samples; ++sample_index) {
     const uint32_t byte_index = sample_index * bytes_per_sample;
-    int32_t input = audio::unpack_audio_sample_to_q31(&data[byte_index], bytes_per_sample);
-    int32_t output = input - this->dc_offset_prev_input_ +
-                     (this->dc_offset_prev_output_ - (this->dc_offset_prev_output_ >> dc_filter_shift));
-    this->dc_offset_prev_input_ = input;
-    this->dc_offset_prev_output_ = output;
-    audio::pack_q31_as_audio_sample(output, &data[byte_index], bytes_per_sample);
+    int32_t sample = audio::unpack_audio_sample_to_q31(&data[byte_index], bytes_per_sample);
+    offset_accumulator += sample;
+    sample -= this->dc_offset_;
+    audio::pack_q31_as_audio_sample(sample, &data[byte_index], bytes_per_sample);
   }
+
+  const int32_t new_offset = offset_accumulator / total_samples;
+  this->dc_offset_ = new_offset / DC_OFFSET_MOVING_AVERAGE_COEFFICIENT_DENOMINATOR +
+                     (DC_OFFSET_MOVING_AVERAGE_COEFFICIENT_DENOMINATOR - 1) * this->dc_offset_ /
+                         DC_OFFSET_MOVING_AVERAGE_COEFFICIENT_DENOMINATOR;
 }
 
 size_t I2SAudioMicrophone::read_(uint8_t *buf, size_t len, TickType_t ticks_to_wait) {

esphome/components/i2s_audio/microphone/i2s_audio_microphone.h

@@ -82,8 +82,7 @@ class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, pub
 
   bool correct_dc_offset_;
   bool locked_driver_{false};
-  int32_t dc_offset_prev_input_{0};
-  int32_t dc_offset_prev_output_{0};
+  int32_t dc_offset_{0};
 };
 
 }  // namespace i2s_audio

esphome/components/i2s_audio/speaker/__init__.py

@@ -180,7 +180,7 @@ async def to_code(config):
     await speaker.register_speaker(var, config)
 
     if config[CONF_DAC_TYPE] == "internal":
-        cg.add(var.set_internal_dac_mode(config[CONF_MODE]))
+        cg.add(var.set_internal_dac_mode(config[CONF_CHANNEL]))
     else:
         cg.add(var.set_dout_pin(config[CONF_I2S_DOUT_PIN]))
         if use_legacy():

esphome/components/image/__init__.py

@@ -10,10 +10,8 @@ from PIL import Image, UnidentifiedImageError
 
 from esphome import core, external_files
 import esphome.codegen as cg
-from esphome.components.const import CONF_BYTE_ORDER
 import esphome.config_validation as cv
 from esphome.const import (
-    CONF_DEFAULTS,
     CONF_DITHER,
     CONF_FILE,
     CONF_ICON,
@@ -40,7 +38,6 @@ CONF_OPAQUE = "opaque"
 CONF_CHROMA_KEY = "chroma_key"
 CONF_ALPHA_CHANNEL = "alpha_channel"
 CONF_INVERT_ALPHA = "invert_alpha"
-CONF_IMAGES = "images"
 
 TRANSPARENCY_TYPES = (
     CONF_OPAQUE,
@@ -191,10 +188,6 @@ class ImageRGB565(ImageEncoder):
             dither,
             invert_alpha,
         )
-        self.big_endian = True
-
-    def set_big_endian(self, big_endian: bool) -> None:
-        self.big_endian = big_endian
 
     def convert(self, image, path):
         return image.convert("RGBA")
@@ -212,16 +205,10 @@ class ImageRGB565(ImageEncoder):
                 g = 1
                 b = 0
         rgb = (r << 11) | (g << 5) | b
-        if self.big_endian:
-            self.data[self.index] = rgb >> 8
-            self.index += 1
-            self.data[self.index] = rgb & 0xFF
-            self.index += 1
-        else:
-            self.data[self.index] = rgb & 0xFF
-            self.index += 1
-            self.data[self.index] = rgb >> 8
-            self.index += 1
+        self.data[self.index] = rgb >> 8
+        self.index += 1
+        self.data[self.index] = rgb & 0xFF
+        self.index += 1
         if self.transparency == CONF_ALPHA_CHANNEL:
             if self.invert_alpha:
                 a ^= 0xFF
@@ -377,7 +364,7 @@ def validate_file_shorthand(value):
     value = cv.string_strict(value)
     parts = value.strip().split(":")
     if len(parts) == 2 and parts[0] in MDI_SOURCES:
-        match = re.match(r"^[a-zA-Z0-9\-]+$", parts[1])
+        match = re.match(r"[a-zA-Z0-9\-]+", parts[1])
         if match is None:
             raise cv.Invalid(f"Could not parse mdi icon name from '{value}'.")
         return download_gh_svg(parts[1], parts[0])
@@ -447,29 +434,20 @@ def validate_type(image_types):
 
 
 def validate_settings(value):
-    """
-    Validate the settings for a single image configuration.
-    """
-    conf_type = value[CONF_TYPE]
-    type_class = IMAGE_TYPE[conf_type]
+    type = value[CONF_TYPE]
     transparency = value[CONF_TRANSPARENCY].lower()
-    if transparency not in type_class.allow_config:
+    allow_config = IMAGE_TYPE[type].allow_config
+    if transparency not in allow_config:
         raise cv.Invalid(
-            f"Image format '{conf_type}' cannot have transparency: {transparency}"
+            f"Image format '{type}' cannot have transparency: {transparency}"
         )
     invert_alpha = value.get(CONF_INVERT_ALPHA, False)
     if (
         invert_alpha
         and transparency != CONF_ALPHA_CHANNEL
-        and CONF_INVERT_ALPHA not in type_class.allow_config
+        and CONF_INVERT_ALPHA not in allow_config
     ):
         raise cv.Invalid("No alpha channel to invert")
-    if value.get(CONF_BYTE_ORDER) is not None and not callable(
-        getattr(type_class, "set_big_endian", None)
-    ):
-        raise cv.Invalid(
-            f"Image format '{conf_type}' does not support byte order configuration"
-        )
     if file := value.get(CONF_FILE):
         file = Path(file)
         if is_svg_file(file):
@@ -478,82 +456,31 @@ def validate_settings(value):
             try:
                 Image.open(file)
             except UnidentifiedImageError as exc:
-                raise cv.Invalid(
-                    f"File can't be opened as image: {file.absolute()}"
-                ) from exc
+                raise cv.Invalid(f"File can't be opened as image: {file}") from exc
     return value
 
 
-IMAGE_ID_SCHEMA = {
-    cv.Required(CONF_ID): cv.declare_id(Image_),
-    cv.Required(CONF_FILE): cv.Any(validate_file_shorthand, TYPED_FILE_SCHEMA),
-    cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
-}
-
-
-OPTIONS_SCHEMA = {
-    cv.Optional(CONF_RESIZE): cv.dimensions,
-    cv.Optional(CONF_DITHER, default="NONE"): cv.one_of(
-        "NONE", "FLOYDSTEINBERG", upper=True
-    ),
-    cv.Optional(CONF_INVERT_ALPHA, default=False): cv.boolean,
-    cv.Optional(CONF_BYTE_ORDER): cv.one_of("BIG_ENDIAN", "LITTLE_ENDIAN", upper=True),
-    cv.Optional(CONF_TRANSPARENCY, default=CONF_OPAQUE): validate_transparency(),
-    cv.Optional(CONF_TYPE): validate_type(IMAGE_TYPE),
-}
-
-OPTIONS = [key.schema for key in OPTIONS_SCHEMA]
-
-# image schema with no defaults, used with `CONF_IMAGES` in the config
-IMAGE_SCHEMA_NO_DEFAULTS = {
-    **IMAGE_ID_SCHEMA,
-    **{cv.Optional(key): OPTIONS_SCHEMA[key] for key in OPTIONS},
-}
-
 BASE_SCHEMA = cv.Schema(
     {
-        **IMAGE_ID_SCHEMA,
-        **OPTIONS_SCHEMA,
+        cv.Required(CONF_ID): cv.declare_id(Image_),
+        cv.Required(CONF_FILE): cv.Any(validate_file_shorthand, TYPED_FILE_SCHEMA),
+        cv.Optional(CONF_RESIZE): cv.dimensions,
+        cv.Optional(CONF_DITHER, default="NONE"): cv.one_of(
+            "NONE", "FLOYDSTEINBERG", upper=True
+        ),
+        cv.Optional(CONF_INVERT_ALPHA, default=False): cv.boolean,
+        cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
     }
 ).add_extra(validate_settings)
 
 IMAGE_SCHEMA = BASE_SCHEMA.extend(
     {
         cv.Required(CONF_TYPE): validate_type(IMAGE_TYPE),
+        cv.Optional(CONF_TRANSPARENCY, default=CONF_OPAQUE): validate_transparency(),
     }
 )
 
 
-def validate_defaults(value):
-    """
-    Validate the options for images with defaults
-    """
-    defaults = value[CONF_DEFAULTS]
-    result = []
-    for index, image in enumerate(value[CONF_IMAGES]):
-        type = image.get(CONF_TYPE, defaults.get(CONF_TYPE))
-        if type is None:
-            raise cv.Invalid(
-                "Type is required either in the image config or in the defaults",
-                path=[CONF_IMAGES, index],
-            )
-        type_class = IMAGE_TYPE[type]
-        # A default byte order should be simply ignored if the type does not support it
-        available_options = [*OPTIONS]
-        if (
-            not callable(getattr(type_class, "set_big_endian", None))
-            and CONF_BYTE_ORDER not in image
-        ):
-            available_options.remove(CONF_BYTE_ORDER)
-        config = {
-            **{key: image.get(key, defaults.get(key)) for key in available_options},
-            **{key.schema: image[key.schema] for key in IMAGE_ID_SCHEMA},
-        }
-        validate_settings(config)
-        result.append(config)
-    return result
-
-
 def typed_image_schema(image_type):
     """
     Construct a schema for a specific image type, allowing transparency options
@@ -596,33 +523,10 @@ def typed_image_schema(image_type):
 
 # The config schema can be a (possibly empty) single list of images,
 # or a dictionary of image types each with a list of images
-# or a dictionary with keys `defaults:` and `images:`
-
-
-def _config_schema(config):
-    if isinstance(config, list):
-        return cv.Schema([IMAGE_SCHEMA])(config)
-    if not isinstance(config, dict):
-        raise cv.Invalid(
-            "Badly formed image configuration, expected a list or a dictionary"
-        )
-    if CONF_DEFAULTS in config or CONF_IMAGES in config:
-        return validate_defaults(
-            cv.Schema(
-                {
-                    cv.Required(CONF_DEFAULTS): OPTIONS_SCHEMA,
-                    cv.Required(CONF_IMAGES): cv.ensure_list(IMAGE_SCHEMA_NO_DEFAULTS),
-                }
-            )(config)
-        )
-    if CONF_ID in config or CONF_FILE in config:
-        return cv.ensure_list(IMAGE_SCHEMA)([config])
-    return cv.Schema(
-        {cv.Optional(t.lower()): typed_image_schema(t) for t in IMAGE_TYPE}
-    )(config)
-
-
-CONFIG_SCHEMA = _config_schema
+CONFIG_SCHEMA = cv.Any(
+    cv.Schema({cv.Optional(t.lower()): typed_image_schema(t) for t in IMAGE_TYPE}),
+    cv.ensure_list(IMAGE_SCHEMA),
+)
 
 
 async def write_image(config, all_frames=False):
@@ -681,9 +585,6 @@ async def write_image(config, all_frames=False):
 
     total_rows = height * frame_count
     encoder = IMAGE_TYPE[type](width, total_rows, transparency, dither, invert_alpha)
-    if byte_order := config.get(CONF_BYTE_ORDER):
-        # Check for valid type has already been done in validate_settings
-        encoder.set_big_endian(byte_order == "BIG_ENDIAN")
     for frame_index in range(frame_count):
         image.seek(frame_index)
         pixels = encoder.convert(image.resize((width, height)), path).getdata()

esphome/components/json/__init__.py

@@ -12,6 +12,6 @@ CONFIG_SCHEMA = cv.All(
 
 @coroutine_with_priority(1.0)
 async def to_code(config):
-    cg.add_library("bblanchon/ArduinoJson", "7.4.2")
+    cg.add_library("bblanchon/ArduinoJson", "6.18.5")
     cg.add_define("USE_JSON")
     cg.add_global(json_ns.using)

esphome/components/json/json_util.cpp

@@ -1,76 +1,83 @@
 #include "json_util.h"
 #include "esphome/core/log.h"
 
-// ArduinoJson::Allocator is included via ArduinoJson.h in json_util.h
-
 namespace esphome {
 namespace json {
 
 static const char *const TAG = "json";
 
-// Build an allocator for the JSON Library using the RAMAllocator class
-struct SpiRamAllocator : ArduinoJson::Allocator {
-  void *allocate(size_t size) override { return this->allocator_.allocate(size); }
-
-  void deallocate(void *pointer) override {
-    // ArduinoJson's Allocator interface doesn't provide the size parameter in deallocate.
-    // RAMAllocator::deallocate() requires the size, which we don't have access to here.
-    // RAMAllocator::deallocate implementation just calls free() regardless of whether
-    // the memory was allocated with heap_caps_malloc or malloc.
-    // This is safe because ESP-IDF's heap implementation internally tracks the memory region
-    // and routes free() to the appropriate heap.
-    free(pointer);  // NOLINT(cppcoreguidelines-owning-memory,cppcoreguidelines-no-malloc)
-  }
-
-  void *reallocate(void *ptr, size_t new_size) override {
-    return this->allocator_.reallocate(static_cast<uint8_t *>(ptr), new_size);
-  }
-
- protected:
-  RAMAllocator<uint8_t> allocator_{RAMAllocator<uint8_t>(RAMAllocator<uint8_t>::NONE)};
-};
+static std::vector<char> global_json_build_buffer;  // NOLINT
+static const auto ALLOCATOR = RAMAllocator<uint8_t>(RAMAllocator<uint8_t>::ALLOC_INTERNAL);
 
 std::string build_json(const json_build_t &f) {
-  // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-  auto doc_allocator = SpiRamAllocator();
-  JsonDocument json_document(&doc_allocator);
-  if (json_document.overflowed()) {
-    ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
-    return "{}";
+  // Here we are allocating up to 5kb of memory,
+  // with the heap size minus 2kb to be safe if less than 5kb
+  // as we can not have a true dynamic sized document.
+  // The excess memory is freed below with `shrinkToFit()`
+  auto free_heap = ALLOCATOR.get_max_free_block_size();
+  size_t request_size = std::min(free_heap, (size_t) 512);
+  while (true) {
+    ESP_LOGV(TAG, "Attempting to allocate %zu bytes for JSON serialization", request_size);
+    DynamicJsonDocument json_document(request_size);
+    if (json_document.capacity() == 0) {
+      ESP_LOGE(TAG, "Could not allocate memory for document! Requested %zu bytes, largest free heap block: %zu bytes",
+               request_size, free_heap);
+      return "{}";
+    }
+    JsonObject root = json_document.to<JsonObject>();
+    f(root);
+    if (json_document.overflowed()) {
+      if (request_size == free_heap) {
+        ESP_LOGE(TAG, "Could not allocate memory for document! Overflowed largest free heap block: %zu bytes",
+                 free_heap);
+        return "{}";
+      }
+      request_size = std::min(request_size * 2, free_heap);
+      continue;
+    }
+    json_document.shrinkToFit();
+    ESP_LOGV(TAG, "Size after shrink %zu bytes", json_document.capacity());
+    std::string output;
+    serializeJson(json_document, output);
+    return output;
   }
-  JsonObject root = json_document.to<JsonObject>();
-  f(root);
-  if (json_document.overflowed()) {
-    ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
-    return "{}";
-  }
-  std::string output;
-  serializeJson(json_document, output);
-  return output;
-  // NOLINTEND(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
 bool parse_json(const std::string &data, const json_parse_t &f) {
-  // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-  auto doc_allocator = SpiRamAllocator();
-  JsonDocument json_document(&doc_allocator);
-  if (json_document.overflowed()) {
-    ESP_LOGE(TAG, "Could not allocate memory for JSON document!");
-    return false;
-  }
-  DeserializationError err = deserializeJson(json_document, data);
+  // Here we are allocating 1.5 times the data size,
+  // with the heap size minus 2kb to be safe if less than that
+  // as we can not have a true dynamic sized document.
+  // The excess memory is freed below with `shrinkToFit()`
+  auto free_heap = ALLOCATOR.get_max_free_block_size();
+  size_t request_size = std::min(free_heap, (size_t) (data.size() * 1.5));
+  while (true) {
+    DynamicJsonDocument json_document(request_size);
+    if (json_document.capacity() == 0) {
+      ESP_LOGE(TAG, "Could not allocate memory for document! Requested %zu bytes, free heap: %zu", request_size,
+               free_heap);
+      return false;
+    }
+    DeserializationError err = deserializeJson(json_document, data);
+    json_document.shrinkToFit();
 
-  JsonObject root = json_document.as<JsonObject>();
+    JsonObject root = json_document.as<JsonObject>();
 
-  if (err == DeserializationError::Ok) {
-    return f(root);
-  } else if (err == DeserializationError::NoMemory) {
-    ESP_LOGE(TAG, "Can not allocate more memory for deserialization. Consider making source string smaller");
-    return false;
-  }
-  ESP_LOGE(TAG, "Parse error: %s", err.c_str());
+    if (err == DeserializationError::Ok) {
+      return f(root);
+    } else if (err == DeserializationError::NoMemory) {
+      if (request_size * 2 >= free_heap) {
+        ESP_LOGE(TAG, "Can not allocate more memory for deserialization. Consider making source string smaller");
+        return false;
+      }
+      ESP_LOGV(TAG, "Increasing memory allocation.");
+      request_size *= 2;
+      continue;
+    } else {
+      ESP_LOGE(TAG, "Parse error: %s", err.c_str());
+      return false;
+    }
+  };
   return false;
-  // NOLINTEND(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
 }  // namespace json

esphome/components/ld2410/ld2410.cpp

@@ -178,8 +178,13 @@ static constexpr uint8_t NO_MAC[] = {0x08, 0x05, 0x04, 0x03, 0x02, 0x01};
 
 static inline int two_byte_to_int(char firstbyte, char secondbyte) { return (int16_t) (secondbyte << 8) + firstbyte; }
 
-static inline bool validate_header_footer(const uint8_t *header_footer, const uint8_t *buffer) {
-  return std::memcmp(header_footer, buffer, HEADER_FOOTER_SIZE) == 0;
+static bool validate_header_footer(const uint8_t *header_footer, const uint8_t *buffer) {
+  for (uint8_t i = 0; i < HEADER_FOOTER_SIZE; i++) {
+    if (header_footer[i] != buffer[i]) {
+      return false;  // Mismatch in header/footer
+    }
+  }
+  return true;  // Valid header/footer
 }
 
 void LD2410Component::dump_config() {
@@ -295,12 +300,14 @@ void LD2410Component::send_command_(uint8_t command, const uint8_t *command_valu
   if (command_value != nullptr) {
     len += command_value_len;
   }
-  // 2 length bytes (low, high) + 2 command bytes (low, high)
-  uint8_t len_cmd[] = {len, 0x00, command, 0x00};
+  uint8_t len_cmd[] = {lowbyte(len), highbyte(len), command, 0x00};
   this->write_array(len_cmd, sizeof(len_cmd));
+
   // command value bytes
   if (command_value != nullptr) {
-    this->write_array(command_value, command_value_len);
+    for (uint8_t i = 0; i < command_value_len; i++) {
+      this->write_byte(command_value[i]);
+    }
   }
   // frame footer bytes
   this->write_array(CMD_FRAME_FOOTER, sizeof(CMD_FRAME_FOOTER));
@@ -394,7 +401,7 @@ void LD2410Component::handle_periodic_data_() {
     /*
       Moving distance range: 18th byte
       Still distance range: 19th byte
-      Moving energy: 20~28th bytes
+      Moving enery: 20~28th bytes
     */
     for (std::vector<sensor::Sensor *>::size_type i = 0; i != this->gate_move_sensors_.size(); i++) {
       sensor::Sensor *s = this->gate_move_sensors_[i];
@@ -473,7 +480,7 @@ bool LD2410Component::handle_ack_data_() {
     ESP_LOGE(TAG, "Invalid status");
     return true;
   }
-  if (this->buffer_data_[8] || this->buffer_data_[9]) {
+  if (ld2410::two_byte_to_int(this->buffer_data_[8], this->buffer_data_[9]) != 0x00) {
     ESP_LOGW(TAG, "Invalid command: %02X, %02X", this->buffer_data_[8], this->buffer_data_[9]);
     return true;
   }
@@ -527,8 +534,8 @@ bool LD2410Component::handle_ack_data_() {
       const auto *light_function_str = find_str(LIGHT_FUNCTIONS_BY_UINT, this->light_function_);
       const auto *out_pin_level_str = find_str(OUT_PIN_LEVELS_BY_UINT, this->out_pin_level_);
       ESP_LOGV(TAG,
-               "Light function: %s\n"
-               "Light threshold: %u\n"
+               "Light function is: %s\n"
+               "Light threshold is: %u\n"
                "Out pin level: %s",
                light_function_str, this->light_threshold_, out_pin_level_str);
 #ifdef USE_SELECT
@@ -593,7 +600,7 @@ bool LD2410Component::handle_ack_data_() {
       break;
 
     case CMD_QUERY: {  // Query parameters response
-      if (this->buffer_data_[10] != HEADER)
+      if (this->buffer_data_[10] != 0xAA)
         return true;  // value head=0xAA
 #ifdef USE_NUMBER
       /*
@@ -649,11 +656,17 @@ void LD2410Component::readline_(int readch) {
   if (this->buffer_pos_ < 4) {
     return;  // Not enough data to process yet
   }
-  if (ld2410::validate_header_footer(DATA_FRAME_FOOTER, &this->buffer_data_[this->buffer_pos_ - 4])) {
+  if (this->buffer_data_[this->buffer_pos_ - 4] == DATA_FRAME_FOOTER[0] &&
+      this->buffer_data_[this->buffer_pos_ - 3] == DATA_FRAME_FOOTER[1] &&
+      this->buffer_data_[this->buffer_pos_ - 2] == DATA_FRAME_FOOTER[2] &&
+      this->buffer_data_[this->buffer_pos_ - 1] == DATA_FRAME_FOOTER[3]) {
     ESP_LOGV(TAG, "Handling Periodic Data: %s", format_hex_pretty(this->buffer_data_, this->buffer_pos_).c_str());
     this->handle_periodic_data_();
     this->buffer_pos_ = 0;  // Reset position index for next message
-  } else if (ld2410::validate_header_footer(CMD_FRAME_FOOTER, &this->buffer_data_[this->buffer_pos_ - 4])) {
+  } else if (this->buffer_data_[this->buffer_pos_ - 4] == CMD_FRAME_FOOTER[0] &&
+             this->buffer_data_[this->buffer_pos_ - 3] == CMD_FRAME_FOOTER[1] &&
+             this->buffer_data_[this->buffer_pos_ - 2] == CMD_FRAME_FOOTER[2] &&
+             this->buffer_data_[this->buffer_pos_ - 1] == CMD_FRAME_FOOTER[3]) {
     ESP_LOGV(TAG, "Handling Ack Data: %s", format_hex_pretty(this->buffer_data_, this->buffer_pos_).c_str());
     if (this->handle_ack_data_()) {
       this->buffer_pos_ = 0;  // Reset position index for next message
@@ -759,6 +772,7 @@ void LD2410Component::set_max_distances_timeout() {
                        0x00};
   this->set_config_mode_(true);
   this->send_command_(CMD_MAXDIST_DURATION, value, sizeof(value));
+  delay(50);  // NOLINT
   this->query_parameters_();
   this->set_timeout(200, [this]() { this->restart_and_read_all_info(); });
   this->set_config_mode_(false);
@@ -788,6 +802,7 @@ void LD2410Component::set_gate_threshold(uint8_t gate) {
                        0x01, 0x00, lowbyte(motion), highbyte(motion), 0x00, 0x00,
                        0x02, 0x00, lowbyte(still),  highbyte(still),  0x00, 0x00};
   this->send_command_(CMD_GATE_SENS, value, sizeof(value));
+  delay(50);  // NOLINT
   this->query_parameters_();
   this->set_config_mode_(false);
 }
@@ -818,6 +833,7 @@ void LD2410Component::set_light_out_control() {
   this->set_config_mode_(true);
   uint8_t value[4] = {this->light_function_, this->light_threshold_, this->out_pin_level_, 0x00};
   this->send_command_(CMD_SET_LIGHT_CONTROL, value, sizeof(value));
+  delay(50);  // NOLINT
   this->query_light_control_();
   this->set_timeout(200, [this]() { this->restart_and_read_all_info(); });
   this->set_config_mode_(false);

esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp

@@ -5,10 +5,10 @@
 namespace esphome {
 namespace ld2420 {
 
-static const char *const TAG = "ld2420.binary_sensor";
+static const char *const TAG = "LD2420.binary_sensor";
 
 void LD2420BinarySensor::dump_config() {
-  ESP_LOGCONFIG(TAG, "Binary Sensor:");
+  ESP_LOGCONFIG(TAG, "LD2420 BinarySensor:");
   LOG_BINARY_SENSOR("  ", "Presence", this->presence_bsensor_);
 }
 

esphome/components/ld2420/button/reconfig_buttons.cpp

@@ -2,7 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-static const char *const TAG = "ld2420.button";
+static const char *const TAG = "LD2420.button";
 
 namespace esphome {
 namespace ld2420 {

esphome/components/ld2420/ld2420.cpp

@@ -137,7 +137,7 @@ static const std::string OP_SIMPLE_MODE_STRING = "Simple";
 // Memory-efficient lookup tables
 struct StringToUint8 {
   const char *str;
-  const uint8_t value;
+  uint8_t value;
 };
 
 static constexpr StringToUint8 OP_MODE_BY_STR[] = {
@@ -155,9 +155,8 @@ static constexpr const char *ERR_MESSAGE[] = {
 // Helper function for lookups
 template<size_t N> uint8_t find_uint8(const StringToUint8 (&arr)[N], const std::string &str) {
   for (const auto &entry : arr) {
-    if (str == entry.str) {
+    if (str == entry.str)
       return entry.value;
-    }
   }
   return 0xFF;  // Not found
 }
@@ -327,8 +326,15 @@ void LD2420Component::revert_config_action() {
 
 void LD2420Component::loop() {
   // If there is a active send command do not process it here, the send command call will handle it.
-  while (!this->cmd_active_ && this->available()) {
-    this->readline_(this->read(), this->buffer_data_, MAX_LINE_LENGTH);
+  if (!this->get_cmd_active_()) {
+    if (!this->available())
+      return;
+    static uint8_t buffer[2048];
+    static uint8_t rx_data;
+    while (this->available()) {
+      rx_data = this->read();
+      this->readline_(rx_data, buffer, sizeof(buffer));
+    }
   }
 }
 
@@ -359,9 +365,8 @@ void LD2420Component::auto_calibrate_sensitivity() {
 
     // Store average and peak values
     this->gate_avg[gate] = sum / CALIBRATE_SAMPLES;
-    if (this->gate_peak[gate] < peak) {
+    if (this->gate_peak[gate] < peak)
       this->gate_peak[gate] = peak;
-    }
 
     uint32_t calculated_value =
         (static_cast<uint32_t>(this->gate_peak[gate]) + (move_factor * static_cast<uint32_t>(this->gate_peak[gate])));
@@ -398,9 +403,8 @@ void LD2420Component::set_operating_mode(const std::string &state) {
       }
     } else {
       // Set the current data back so we don't have new data that can be applied in error.
-      if (this->get_calibration_()) {
+      if (this->get_calibration_())
         memcpy(&this->new_config, &this->current_config, sizeof(this->current_config));
-      }
       this->set_calibration_(false);
     }
   } else {
@@ -410,32 +414,30 @@ void LD2420Component::set_operating_mode(const std::string &state) {
 }
 
 void LD2420Component::readline_(int rx_data, uint8_t *buffer, int len) {
-  if (rx_data < 0) {
-    return;  // No data available
-  }
-  if (this->buffer_pos_ < len - 1) {
-    buffer[this->buffer_pos_++] = rx_data;
-    buffer[this->buffer_pos_] = 0;
-  } else {
-    // We should never get here, but just in case...
-    ESP_LOGW(TAG, "Max command length exceeded; ignoring");
-    this->buffer_pos_ = 0;
-  }
-  if (this->buffer_pos_ < 4) {
-    return;  // Not enough data to process yet
-  }
-  if (memcmp(&buffer[this->buffer_pos_ - 4], &CMD_FRAME_FOOTER, sizeof(CMD_FRAME_FOOTER)) == 0) {
-    this->cmd_active_ = false;  // Set command state to inactive after response
-    this->handle_ack_data_(buffer, this->buffer_pos_);
-    this->buffer_pos_ = 0;
-  } else if ((buffer[this->buffer_pos_ - 2] == 0x0D && buffer[this->buffer_pos_ - 1] == 0x0A) &&
-             (this->get_mode_() == CMD_SYSTEM_MODE_SIMPLE)) {
-    this->handle_simple_mode_(buffer, this->buffer_pos_);
-    this->buffer_pos_ = 0;
-  } else if ((memcmp(&buffer[this->buffer_pos_ - 4], &ENERGY_FRAME_FOOTER, sizeof(ENERGY_FRAME_FOOTER)) == 0) &&
-             (this->get_mode_() == CMD_SYSTEM_MODE_ENERGY)) {
-    this->handle_energy_mode_(buffer, this->buffer_pos_);
-    this->buffer_pos_ = 0;
+  static int pos = 0;
+
+  if (rx_data >= 0) {
+    if (pos < len - 1) {
+      buffer[pos++] = rx_data;
+      buffer[pos] = 0;
+    } else {
+      pos = 0;
+    }
+    if (pos >= 4) {
+      if (memcmp(&buffer[pos - 4], &CMD_FRAME_FOOTER, sizeof(CMD_FRAME_FOOTER)) == 0) {
+        this->set_cmd_active_(false);  // Set command state to inactive after responce.
+        this->handle_ack_data_(buffer, pos);
+        pos = 0;
+      } else if ((buffer[pos - 2] == 0x0D && buffer[pos - 1] == 0x0A) &&
+                 (this->get_mode_() == CMD_SYSTEM_MODE_SIMPLE)) {
+        this->handle_simple_mode_(buffer, pos);
+        pos = 0;
+      } else if ((memcmp(&buffer[pos - 4], &ENERGY_FRAME_FOOTER, sizeof(ENERGY_FRAME_FOOTER)) == 0) &&
+                 (this->get_mode_() == CMD_SYSTEM_MODE_ENERGY)) {
+        this->handle_energy_mode_(buffer, pos);
+        pos = 0;
+      }
+    }
   }
 }
 
@@ -460,9 +462,8 @@ void LD2420Component::handle_energy_mode_(uint8_t *buffer, int len) {
 
   // Resonable refresh rate for home assistant database size health
   const int32_t current_millis = App.get_loop_component_start_time();
-  if (current_millis - this->last_periodic_millis < REFRESH_RATE_MS) {
+  if (current_millis - this->last_periodic_millis < REFRESH_RATE_MS)
     return;
-  }
   this->last_periodic_millis = current_millis;
   for (auto &listener : this->listeners_) {
     listener->on_distance(this->get_distance_());
@@ -505,16 +506,14 @@ void LD2420Component::handle_simple_mode_(const uint8_t *inbuf, int len) {
     }
   }
   outbuf[index] = '\0';
-  if (index > 1) {
+  if (index > 1)
     this->set_distance_(strtol(outbuf, &endptr, 10));
-  }
 
   if (this->get_mode_() == CMD_SYSTEM_MODE_SIMPLE) {
     // Resonable refresh rate for home assistant database size health
     const int32_t current_millis = App.get_loop_component_start_time();
-    if (current_millis - this->last_normal_periodic_millis < REFRESH_RATE_MS) {
+    if (current_millis - this->last_normal_periodic_millis < REFRESH_RATE_MS)
       return;
-    }
     this->last_normal_periodic_millis = current_millis;
     for (auto &listener : this->listeners_)
       listener->on_distance(this->get_distance_());
@@ -594,12 +593,11 @@ void LD2420Component::handle_ack_data_(uint8_t *buffer, int len) {
 int LD2420Component::send_cmd_from_array(CmdFrameT frame) {
   uint32_t start_millis = millis();
   uint8_t error = 0;
-  uint8_t ack_buffer[MAX_LINE_LENGTH];
-  uint8_t cmd_buffer[MAX_LINE_LENGTH];
+  uint8_t ack_buffer[64];
+  uint8_t cmd_buffer[64];
   this->cmd_reply_.ack = false;
-  if (frame.command != CMD_RESTART) {
-    this->cmd_active_ = true;
-  }  // Restart does not reply, thus no ack state required
+  if (frame.command != CMD_RESTART)
+    this->set_cmd_active_(true);  // Restart does not reply, thus no ack state required.
   uint8_t retry = 3;
   while (retry) {
     frame.length = 0;
@@ -621,7 +619,9 @@ int LD2420Component::send_cmd_from_array(CmdFrameT frame) {
 
     memcpy(cmd_buffer + frame.length, &frame.footer, sizeof(frame.footer));
     frame.length += sizeof(frame.footer);
-    this->write_array(cmd_buffer, frame.length);
+    for (uint16_t index = 0; index < frame.length; index++) {
+      this->write_byte(cmd_buffer[index]);
+    }
 
     error = 0;
     if (frame.command == CMD_RESTART) {
@@ -630,7 +630,7 @@ int LD2420Component::send_cmd_from_array(CmdFrameT frame) {
 
     while (!this->cmd_reply_.ack) {
       while (this->available()) {
-        this->readline_(this->read(), ack_buffer, sizeof(ack_buffer));
+        this->readline_(read(), ack_buffer, sizeof(ack_buffer));
       }
       delay_microseconds_safe(1450);
       // Wait on an Rx from the LD2420 for up to 3 1 second loops, otherwise it could trigger a WDT.
@@ -641,12 +641,10 @@ int LD2420Component::send_cmd_from_array(CmdFrameT frame) {
         break;
       }
     }
-    if (this->cmd_reply_.ack) {
+    if (this->cmd_reply_.ack)
       retry = 0;
-    }
-    if (this->cmd_reply_.error > 0) {
+    if (this->cmd_reply_.error > 0)
       this->handle_cmd_error(error);
-    }
   }
   return error;
 }
@@ -766,9 +764,8 @@ void LD2420Component::set_system_mode(uint16_t mode) {
   cmd_frame.data_length += sizeof(unknown_parm);
   cmd_frame.footer = CMD_FRAME_FOOTER;
   ESP_LOGV(TAG, "Sending write system mode command: %2X", cmd_frame.command);
-  if (this->send_cmd_from_array(cmd_frame) == 0) {
+  if (this->send_cmd_from_array(cmd_frame) == 0)
     this->set_mode_(mode);
-  }
 }
 
 void LD2420Component::get_firmware_version_() {
@@ -843,24 +840,18 @@ void LD2420Component::set_gate_threshold(uint8_t gate) {
 
 #ifdef USE_NUMBER
 void LD2420Component::init_gate_config_numbers() {
-  if (this->gate_timeout_number_ != nullptr) {
+  if (this->gate_timeout_number_ != nullptr)
     this->gate_timeout_number_->publish_state(static_cast<uint16_t>(this->current_config.timeout));
-  }
-  if (this->gate_select_number_ != nullptr) {
+  if (this->gate_select_number_ != nullptr)
     this->gate_select_number_->publish_state(0);
-  }
-  if (this->min_gate_distance_number_ != nullptr) {
+  if (this->min_gate_distance_number_ != nullptr)
     this->min_gate_distance_number_->publish_state(static_cast<uint16_t>(this->current_config.min_gate));
-  }
-  if (this->max_gate_distance_number_ != nullptr) {
+  if (this->max_gate_distance_number_ != nullptr)
     this->max_gate_distance_number_->publish_state(static_cast<uint16_t>(this->current_config.max_gate));
-  }
-  if (this->gate_move_sensitivity_factor_number_ != nullptr) {
+  if (this->gate_move_sensitivity_factor_number_ != nullptr)
     this->gate_move_sensitivity_factor_number_->publish_state(this->gate_move_sensitivity_factor);
-  }
-  if (this->gate_still_sensitivity_factor_number_ != nullptr) {
+  if (this->gate_still_sensitivity_factor_number_ != nullptr)
     this->gate_still_sensitivity_factor_number_->publish_state(this->gate_still_sensitivity_factor);
-  }
   for (uint8_t gate = 0; gate < TOTAL_GATES; gate++) {
     if (this->gate_still_threshold_numbers_[gate] != nullptr) {
       this->gate_still_threshold_numbers_[gate]->publish_state(

esphome/components/ld2420/ld2420.h

@@ -20,9 +20,8 @@
 namespace esphome {
 namespace ld2420 {
 
-static const uint8_t CALIBRATE_SAMPLES = 64;
-static const uint8_t MAX_LINE_LENGTH = 46;  // Max characters for serial buffer
 static const uint8_t TOTAL_GATES = 16;
+static const uint8_t CALIBRATE_SAMPLES = 64;
 
 enum OpMode : uint8_t {
   OP_NORMAL_MODE = 1,
@@ -119,10 +118,10 @@ class LD2420Component : public Component, public uart::UARTDevice {
 
   float gate_move_sensitivity_factor{0.5};
   float gate_still_sensitivity_factor{0.5};
-  int32_t last_periodic_millis{0};
-  int32_t report_periodic_millis{0};
-  int32_t monitor_periodic_millis{0};
-  int32_t last_normal_periodic_millis{0};
+  int32_t last_periodic_millis = millis();
+  int32_t report_periodic_millis = millis();
+  int32_t monitor_periodic_millis = millis();
+  int32_t last_normal_periodic_millis = millis();
   uint16_t radar_data[TOTAL_GATES][CALIBRATE_SAMPLES];
   uint16_t gate_avg[TOTAL_GATES];
   uint16_t gate_peak[TOTAL_GATES];
@@ -162,6 +161,8 @@ class LD2420Component : public Component, public uart::UARTDevice {
   void set_presence_(bool presence) { this->presence_ = presence; };
   uint16_t get_distance_() { return this->distance_; };
   void set_distance_(uint16_t distance) { this->distance_ = distance; };
+  bool get_cmd_active_() { return this->cmd_active_; };
+  void set_cmd_active_(bool active) { this->cmd_active_ = active; };
   void handle_simple_mode_(const uint8_t *inbuf, int len);
   void handle_energy_mode_(uint8_t *buffer, int len);
   void handle_ack_data_(uint8_t *buffer, int len);
@@ -180,11 +181,12 @@ class LD2420Component : public Component, public uart::UARTDevice {
   std::vector<number::Number *> gate_move_threshold_numbers_ = std::vector<number::Number *>(16);
 #endif
 
-  uint16_t distance_{0};
+  uint32_t max_distance_gate_;
+  uint32_t min_distance_gate_;
   uint16_t system_mode_;
   uint16_t gate_energy_[TOTAL_GATES];
-  uint8_t buffer_pos_{0};  // where to resume processing/populating buffer
-  uint8_t buffer_data_[MAX_LINE_LENGTH];
+  uint16_t distance_{0};
+  uint8_t config_checksum_{0};
   char firmware_ver_[8]{"v0.0.0"};
   bool cmd_active_{false};
   bool presence_{false};

esphome/components/ld2420/number/gate_config_number.cpp

@@ -2,7 +2,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
-static const char *const TAG = "ld2420.number";
+static const char *const TAG = "LD2420.number";
 
 namespace esphome {
 namespace ld2420 {

esphome/components/ld2420/select/operating_mode_select.cpp

@@ -5,7 +5,7 @@
 namespace esphome {
 namespace ld2420 {
 
-static const char *const TAG = "ld2420.select";
+static const char *const TAG = "LD2420.select";
 
 void LD2420Select::control(const std::string &value) {
   this->publish_state(value);

esphome/components/ld2420/sensor/ld2420_sensor.cpp

@@ -5,10 +5,10 @@
 namespace esphome {
 namespace ld2420 {
 
-static const char *const TAG = "ld2420.sensor";
+static const char *const TAG = "LD2420.sensor";
 
 void LD2420Sensor::dump_config() {
-  ESP_LOGCONFIG(TAG, "Sensor:");
+  ESP_LOGCONFIG(TAG, "LD2420 Sensor:");
   LOG_SENSOR("  ", "Distance", this->distance_sensor_);
 }
 

esphome/components/ld2420/text_sensor/text_sensor.cpp

@@ -5,10 +5,10 @@
 namespace esphome {
 namespace ld2420 {
 
-static const char *const TAG = "ld2420.text_sensor";
+static const char *const TAG = "LD2420.text_sensor";
 
 void LD2420TextSensor::dump_config() {
-  ESP_LOGCONFIG(TAG, "Text Sensor:");
+  ESP_LOGCONFIG(TAG, "LD2420 TextSensor:");
   LOG_TEXT_SENSOR("  ", "Firmware", this->fw_version_text_sensor_);
 }
 

esphome/components/ld2450/ld2450.cpp

@@ -477,11 +477,10 @@ void LD2450Component::handle_periodic_data_() {
     // X
     start = TARGET_X + index * 8;
     is_moving = false;
-    // tx is used for further calculations, so always needs to be populated
-    val = ld2450::decode_coordinate(this->buffer_data_[start], this->buffer_data_[start + 1]);
-    tx = val;
     sensor::Sensor *sx = this->move_x_sensors_[index];
     if (sx != nullptr) {
+      val = ld2450::decode_coordinate(this->buffer_data_[start], this->buffer_data_[start + 1]);
+      tx = val;
       if (this->cached_target_data_[index].x != val) {
         sx->publish_state(val);
         this->cached_target_data_[index].x = val;
@@ -489,11 +488,10 @@ void LD2450Component::handle_periodic_data_() {
     }
     // Y
     start = TARGET_Y + index * 8;
-    // ty is used for further calculations, so always needs to be populated
-    val = ld2450::decode_coordinate(this->buffer_data_[start], this->buffer_data_[start + 1]);
-    ty = val;
     sensor::Sensor *sy = this->move_y_sensors_[index];
     if (sy != nullptr) {
+      val = ld2450::decode_coordinate(this->buffer_data_[start], this->buffer_data_[start + 1]);
+      ty = val;
       if (this->cached_target_data_[index].y != val) {
         sy->publish_state(val);
         this->cached_target_data_[index].y = val;

esphome/components/libretiny/__init__.py

@@ -268,7 +268,6 @@ async def component_to_code(config):
 
     # disable library compatibility checks
     cg.add_platformio_option("lib_ldf_mode", "off")
-    cg.add_platformio_option("lib_compat_mode", "soft")
     # include <Arduino.h> in every file
     cg.add_platformio_option("build_src_flags", "-include Arduino.h")
     # dummy version code

esphome/components/libretiny/helpers.cpp

@@ -26,10 +26,6 @@ void Mutex::unlock() { xSemaphoreGive(this->handle_); }
 IRAM_ATTR InterruptLock::InterruptLock() { portDISABLE_INTERRUPTS(); }
 IRAM_ATTR InterruptLock::~InterruptLock() { portENABLE_INTERRUPTS(); }
 
-// LibreTiny doesn't support lwIP core locking, so this is a no-op
-LwIPLock::LwIPLock() {}
-LwIPLock::~LwIPLock() {}
-
 void get_mac_address_raw(uint8_t *mac) {  // NOLINT(readability-non-const-parameter)
   WiFi.macAddress(mac);
 }

esphome/components/light/light_json_schema.cpp

@@ -9,7 +9,6 @@ namespace light {
 // See https://www.home-assistant.io/integrations/light.mqtt/#json-schema for documentation on the schema
 
 void LightJSONSchema::dump_json(LightState &state, JsonObject root) {
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   if (state.supports_effects())
     root["effect"] = state.get_effect_name();
 
@@ -53,7 +52,7 @@ void LightJSONSchema::dump_json(LightState &state, JsonObject root) {
   if (values.get_color_mode() & ColorCapability::BRIGHTNESS)
     root["brightness"] = uint8_t(values.get_brightness() * 255);
 
-  JsonObject color = root["color"].to<JsonObject>();
+  JsonObject color = root.createNestedObject("color");
   if (values.get_color_mode() & ColorCapability::RGB) {
     color["r"] = uint8_t(values.get_color_brightness() * values.get_red() * 255);
     color["g"] = uint8_t(values.get_color_brightness() * values.get_green() * 255);
@@ -74,7 +73,7 @@ void LightJSONSchema::dump_json(LightState &state, JsonObject root) {
 }
 
 void LightJSONSchema::parse_color_json(LightState &state, LightCall &call, JsonObject root) {
-  if (root["state"].is<const char *>()) {
+  if (root.containsKey("state")) {
     auto val = parse_on_off(root["state"]);
     switch (val) {
       case PARSE_ON:
@@ -91,40 +90,40 @@ void LightJSONSchema::parse_color_json(LightState &state, LightCall &call, JsonO
     }
   }
 
-  if (root["brightness"].is<uint8_t>()) {
+  if (root.containsKey("brightness")) {
     call.set_brightness(float(root["brightness"]) / 255.0f);
   }
 
-  if (root["color"].is<JsonObject>()) {
+  if (root.containsKey("color")) {
     JsonObject color = root["color"];
     // HA also encodes brightness information in the r, g, b values, so extract that and set it as color brightness.
     float max_rgb = 0.0f;
-    if (color["r"].is<uint8_t>()) {
+    if (color.containsKey("r")) {
       float r = float(color["r"]) / 255.0f;
       max_rgb = fmaxf(max_rgb, r);
       call.set_red(r);
     }
-    if (color["g"].is<uint8_t>()) {
+    if (color.containsKey("g")) {
       float g = float(color["g"]) / 255.0f;
       max_rgb = fmaxf(max_rgb, g);
       call.set_green(g);
     }
-    if (color["b"].is<uint8_t>()) {
+    if (color.containsKey("b")) {
       float b = float(color["b"]) / 255.0f;
       max_rgb = fmaxf(max_rgb, b);
       call.set_blue(b);
     }
-    if (color["r"].is<uint8_t>() || color["g"].is<uint8_t>() || color["b"].is<uint8_t>()) {
+    if (color.containsKey("r") || color.containsKey("g") || color.containsKey("b")) {
       call.set_color_brightness(max_rgb);
     }
 
-    if (color["c"].is<uint8_t>()) {
+    if (color.containsKey("c")) {
       call.set_cold_white(float(color["c"]) / 255.0f);
     }
-    if (color["w"].is<uint8_t>()) {
+    if (color.containsKey("w")) {
       // the HA scheme is ambiguous here, the same key is used for white channel in RGBW and warm
       // white channel in RGBWW.
-      if (color["c"].is<uint8_t>()) {
+      if (color.containsKey("c")) {
         call.set_warm_white(float(color["w"]) / 255.0f);
       } else {
         call.set_white(float(color["w"]) / 255.0f);
@@ -132,11 +131,11 @@ void LightJSONSchema::parse_color_json(LightState &state, LightCall &call, JsonO
     }
   }
 
-  if (root["white_value"].is<uint8_t>()) {  // legacy API
+  if (root.containsKey("white_value")) {  // legacy API
     call.set_white(float(root["white_value"]) / 255.0f);
   }
 
-  if (root["color_temp"].is<uint16_t>()) {
+  if (root.containsKey("color_temp")) {
     call.set_color_temperature(float(root["color_temp"]));
   }
 }
@@ -144,17 +143,17 @@ void LightJSONSchema::parse_color_json(LightState &state, LightCall &call, JsonO
 void LightJSONSchema::parse_json(LightState &state, LightCall &call, JsonObject root) {
   LightJSONSchema::parse_color_json(state, call, root);
 
-  if (root["flash"].is<uint32_t>()) {
+  if (root.containsKey("flash")) {
     auto length = uint32_t(float(root["flash"]) * 1000);
     call.set_flash_length(length);
   }
 
-  if (root["transition"].is<uint16_t>()) {
+  if (root.containsKey("transition")) {
     auto length = uint32_t(float(root["transition"]) * 1000);
     call.set_transition_length(length);
   }
 
-  if (root["effect"].is<const char *>()) {
+  if (root.containsKey("effect")) {
     const char *effect = root["effect"];
     call.set_effect(effect);
   }

esphome/components/logger/__init__.py

@@ -183,7 +183,7 @@ def validate_local_no_higher_than_global(value):
 Logger = logger_ns.class_("Logger", cg.Component)
 LoggerMessageTrigger = logger_ns.class_(
     "LoggerMessageTrigger",
-    automation.Trigger.template(cg.uint8, cg.const_char_ptr, cg.const_char_ptr),
+    automation.Trigger.template(cg.int_, cg.const_char_ptr, cg.const_char_ptr),
 )
 
 CONF_ESP8266_STORE_LOG_STRINGS_IN_FLASH = "esp8266_store_log_strings_in_flash"
@@ -368,7 +368,7 @@ async def to_code(config):
         await automation.build_automation(
             trigger,
             [
-                (cg.uint8, "level"),
+                (cg.int_, "level"),
                 (cg.const_char_ptr, "tag"),
                 (cg.const_char_ptr, "message"),
             ],
@@ -400,7 +400,6 @@ CONF_LOGGER_LOG = "logger.log"
 LOGGER_LOG_ACTION_SCHEMA = cv.All(
     cv.maybe_simple_value(
         {
-            cv.GenerateID(CONF_LOGGER_ID): cv.use_id(Logger),
             cv.Required(CONF_FORMAT): cv.string,
             cv.Optional(CONF_ARGS, default=list): cv.ensure_list(cv.lambda_),
             cv.Optional(CONF_LEVEL, default="DEBUG"): cv.one_of(

esphome/components/logger/logger.cpp

@@ -90,25 +90,6 @@ void HOT Logger::log_vprintf_(uint8_t level, const char *tag, int line, const ch
 #ifdef USE_STORE_LOG_STR_IN_FLASH
 // Implementation for ESP8266 with flash string support.
 // Note: USE_STORE_LOG_STR_IN_FLASH is only defined for ESP8266.
-//
-// This function handles format strings stored in flash memory (PROGMEM) to save RAM.
-// The buffer is used in a special way to avoid allocating extra memory:
-//
-// Memory layout during execution:
-// Step 1: Copy format string from flash to buffer
-//         tx_buffer_: [format_string][null][.....................]
-//         tx_buffer_at_: ------------------^
-//         msg_start: saved here -----------^
-//
-// Step 2: format_log_to_buffer_with_terminator_ reads format string from beginning
-//         and writes formatted output starting at msg_start position
-//         tx_buffer_: [format_string][null][formatted_message][null]
-//         tx_buffer_at_: -------------------------------------^
-//
-// Step 3: Output the formatted message (starting at msg_start)
-//         write_msg_ and callbacks receive: this->tx_buffer_ + msg_start
-//         which points to: [formatted_message][null]
-//
 void Logger::log_vprintf_(uint8_t level, const char *tag, int line, const __FlashStringHelper *format,
                           va_list args) {  // NOLINT
   if (level > this->level_for(tag) || global_recursion_guard_)
@@ -140,8 +121,7 @@ void Logger::log_vprintf_(uint8_t level, const char *tag, int line, const __Flas
   if (this->baud_rate_ > 0) {
     this->write_msg_(this->tx_buffer_ + msg_start);
   }
-  size_t msg_length =
-      this->tx_buffer_at_ - msg_start;  // Don't subtract 1 - tx_buffer_at_ is already at the null terminator position
+  size_t msg_length = this->tx_buffer_at_ - msg_start - 1;  // -1 to exclude null terminator
   this->log_callback_.call(level, tag, this->tx_buffer_ + msg_start, msg_length);
 
   global_recursion_guard_ = false;

esphome/components/lps22/lps22.cpp

@@ -1,75 +0,0 @@
-#include "lps22.h"
-
-namespace esphome {
-namespace lps22 {
-
-static constexpr const char *const TAG = "lps22";
-
-static constexpr uint8_t WHO_AM_I = 0x0F;
-static constexpr uint8_t LPS22HB_ID = 0xB1;
-static constexpr uint8_t LPS22HH_ID = 0xB3;
-static constexpr uint8_t CTRL_REG2 = 0x11;
-static constexpr uint8_t CTRL_REG2_ONE_SHOT_MASK = 0b1;
-static constexpr uint8_t STATUS = 0x27;
-static constexpr uint8_t STATUS_T_DA_MASK = 0b10;
-static constexpr uint8_t STATUS_P_DA_MASK = 0b01;
-static constexpr uint8_t TEMP_L = 0x2b;
-static constexpr uint8_t PRES_OUT_XL = 0x28;
-static constexpr uint8_t REF_P_XL = 0x28;
-static constexpr uint8_t READ_ATTEMPTS = 10;
-static constexpr uint8_t READ_INTERVAL = 5;
-static constexpr float PRESSURE_SCALE = 1.0f / 4096.0f;
-static constexpr float TEMPERATURE_SCALE = 0.01f;
-
-void LPS22Component::setup() {
-  uint8_t value = 0x00;
-  this->read_register(WHO_AM_I, &value, 1);
-  if (value != LPS22HB_ID && value != LPS22HH_ID) {
-    ESP_LOGW(TAG, "device IDs as %02x, which isn't a known LPS22HB or LPS22HH ID", value);
-    this->mark_failed();
-  }
-}
-
-void LPS22Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "LPS22:");
-  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
-  LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
-  LOG_I2C_DEVICE(this);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-void LPS22Component::update() {
-  uint8_t value = 0x00;
-  this->read_register(CTRL_REG2, &value, 1);
-  value |= CTRL_REG2_ONE_SHOT_MASK;
-  this->write_register(CTRL_REG2, &value, 1);
-  this->set_retry(READ_INTERVAL, READ_ATTEMPTS, [this](uint8_t _) { return this->try_read_(); });
-}
-
-RetryResult LPS22Component::try_read_() {
-  uint8_t value = 0x00;
-  this->read_register(STATUS, &value, 1);
-  const uint8_t expected_status_mask = STATUS_T_DA_MASK | STATUS_P_DA_MASK;
-  if ((value & expected_status_mask) != expected_status_mask) {
-    ESP_LOGD(TAG, "STATUS not ready: %x", value);
-    return RetryResult::RETRY;
-  }
-
-  if (this->temperature_sensor_ != nullptr) {
-    uint8_t t_buf[2]{0};
-    this->read_register(TEMP_L, t_buf, 2);
-    int16_t encoded = static_cast<int16_t>(encode_uint16(t_buf[1], t_buf[0]));
-    float temp = TEMPERATURE_SCALE * static_cast<float>(encoded);
-    this->temperature_sensor_->publish_state(temp);
-  }
-  if (this->pressure_sensor_ != nullptr) {
-    uint8_t p_buf[3]{0};
-    this->read_register(PRES_OUT_XL, p_buf, 3);
-    uint32_t p_lsb = encode_uint24(p_buf[2], p_buf[1], p_buf[0]);
-    this->pressure_sensor_->publish_state(PRESSURE_SCALE * static_cast<float>(p_lsb));
-  }
-  return RetryResult::DONE;
-}
-
-}  // namespace lps22
-}  // namespace esphome

esphome/components/lps22/lps22.h

@@ -1,27 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace lps22 {
-
-class LPS22Component : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
- public:
-  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
-  void set_pressure_sensor(sensor::Sensor *pressure_sensor) { this->pressure_sensor_ = pressure_sensor; }
-
-  void setup() override;
-  void update() override;
-  void dump_config() override;
-
- protected:
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *pressure_sensor_{nullptr};
-
-  RetryResult try_read_();
-};
-
-}  // namespace lps22
-}  // namespace esphome

esphome/components/lps22/sensor.py

@@ -1,58 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c, sensor
-from esphome.const import (
-    CONF_ID,
-    CONF_TEMPERATURE,
-    CONF_PRESSURE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-    UNIT_HECTOPASCAL,
-    ICON_THERMOMETER,
-    DEVICE_CLASS_TEMPERATURE,
-    DEVICE_CLASS_PRESSURE,
-)
-
-CODEOWNERS = ["@nagisa"]
-DEPENDENCIES = ["i2c"]
-
-lps22 = cg.esphome_ns.namespace("lps22")
-
-LPS22Component = lps22.class_("LPS22Component", cg.PollingComponent, i2c.I2CDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(LPS22Component),
-            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                icon=ICON_THERMOMETER,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HECTOPASCAL,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_PRESSURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x5D))  # can also be 0x5C
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-
-    if temperature_config := config.get(CONF_TEMPERATURE):
-        sens = await sensor.new_sensor(temperature_config)
-        cg.add(var.set_temperature_sensor(sens))
-
-    if pressure_config := config.get(CONF_PRESSURE):
-        sens = await sensor.new_sensor(pressure_config)
-        cg.add(var.set_pressure_sensor(sens))

esphome/components/lvgl/types.py

@@ -192,7 +192,7 @@ class WidgetType:
 
 class NumberType(WidgetType):
     def get_max(self, config: dict):
-        return int(config.get(CONF_MAX_VALUE, 100))
+        return int(config[CONF_MAX_VALUE] or 100)
 
     def get_min(self, config: dict):
-        return int(config.get(CONF_MIN_VALUE, 0))
+        return int(config[CONF_MIN_VALUE] or 0)

esphome/components/lvgl/widgets/meter.py

@@ -14,7 +14,6 @@ from esphome.const import (
     CONF_VALUE,
     CONF_WIDTH,
 )
-from esphome.cpp_generator import IntLiteral
 
 from ..automation import action_to_code
 from ..defines import (
@@ -30,9 +29,9 @@ from ..defines import (
 )
 from ..helpers import add_lv_use, lvgl_components_required
 from ..lv_validation import (
+    angle,
     get_end_value,
     get_start_value,
-    lv_angle,
     lv_bool,
     lv_color,
     lv_float,
@@ -163,7 +162,7 @@ SCALE_SCHEMA = cv.Schema(
         cv.Optional(CONF_RANGE_FROM, default=0.0): cv.float_,
         cv.Optional(CONF_RANGE_TO, default=100.0): cv.float_,
         cv.Optional(CONF_ANGLE_RANGE, default=270): cv.int_range(0, 360),
-        cv.Optional(CONF_ROTATION): lv_angle,
+        cv.Optional(CONF_ROTATION): angle,
         cv.Optional(CONF_INDICATORS): cv.ensure_list(INDICATOR_SCHEMA),
     }
 )
@@ -188,9 +187,7 @@ class MeterType(WidgetType):
         for scale_conf in config.get(CONF_SCALES, ()):
             rotation = 90 + (360 - scale_conf[CONF_ANGLE_RANGE]) / 2
             if CONF_ROTATION in scale_conf:
-                rotation = await lv_angle.process(scale_conf[CONF_ROTATION])
-                if isinstance(rotation, IntLiteral):
-                    rotation = int(str(rotation)) // 10
+                rotation = scale_conf[CONF_ROTATION] // 10
             with LocalVariable(
                 "meter_var", "lv_meter_scale_t", lv_expr.meter_add_scale(var)
             ) as meter_var:
@@ -208,20 +205,21 @@ class MeterType(WidgetType):
                         var,
                         meter_var,
                         ticks[CONF_COUNT],
-                        await size.process(ticks[CONF_WIDTH]),
-                        await size.process(ticks[CONF_LENGTH]),
+                        ticks[CONF_WIDTH],
+                        ticks[CONF_LENGTH],
                         color,
                     )
                     if CONF_MAJOR in ticks:
                         major = ticks[CONF_MAJOR]
+                        color = await lv_color.process(major[CONF_COLOR])
                         lv.meter_set_scale_major_ticks(
                             var,
                             meter_var,
                             major[CONF_STRIDE],
-                            await size.process(major[CONF_WIDTH]),
-                            await size.process(major[CONF_LENGTH]),
-                            await lv_color.process(major[CONF_COLOR]),
-                            await size.process(major[CONF_LABEL_GAP]),
+                            major[CONF_WIDTH],
+                            major[CONF_LENGTH],
+                            color,
+                            major[CONF_LABEL_GAP],
                         )
                 for indicator in scale_conf.get(CONF_INDICATORS, ()):
                     (t, v) = next(iter(indicator.items()))
@@ -235,11 +233,7 @@ class MeterType(WidgetType):
                         lv_assign(
                             ivar,
                             lv_expr.meter_add_needle_line(
-                                var,
-                                meter_var,
-                                await size.process(v[CONF_WIDTH]),
-                                color,
-                                await size.process(v[CONF_R_MOD]),
+                                var, meter_var, v[CONF_WIDTH], color, v[CONF_R_MOD]
                             ),
                         )
                     if t == CONF_ARC:
@@ -247,11 +241,7 @@ class MeterType(WidgetType):
                         lv_assign(
                             ivar,
                             lv_expr.meter_add_arc(
-                                var,
-                                meter_var,
-                                await size.process(v[CONF_WIDTH]),
-                                color,
-                                await size.process(v[CONF_R_MOD]),
+                                var, meter_var, v[CONF_WIDTH], color, v[CONF_R_MOD]
                             ),
                         )
                     if t == CONF_TICK_STYLE:
@@ -267,7 +257,7 @@ class MeterType(WidgetType):
                                 color_start,
                                 color_end,
                                 v[CONF_LOCAL],
-                                await size.process(v[CONF_WIDTH]),
+                                v[CONF_WIDTH],
                             ),
                         )
                     if t == CONF_IMAGE:

esphome/components/lvgl/widgets/tileview.py

@@ -15,7 +15,7 @@ from ..defines import (
     TILE_DIRECTIONS,
     literal,
 )
-from ..lv_validation import animated, lv_int, lv_pct
+from ..lv_validation import animated, lv_int
 from ..lvcode import lv, lv_assign, lv_expr, lv_obj, lv_Pvariable
 from ..schemas import container_schema
 from ..types import LV_EVENT, LvType, ObjUpdateAction, lv_obj_t, lv_obj_t_ptr
@@ -41,8 +41,8 @@ TILEVIEW_SCHEMA = cv.Schema(
             container_schema(
                 obj_spec,
                 {
-                    cv.Required(CONF_ROW): cv.positive_int,
-                    cv.Required(CONF_COLUMN): cv.positive_int,
+                    cv.Required(CONF_ROW): lv_int,
+                    cv.Required(CONF_COLUMN): lv_int,
                     cv.GenerateID(): cv.declare_id(lv_tile_t),
                     cv.Optional(CONF_DIR, default="ALL"): TILE_DIRECTIONS.several_of,
                 },
@@ -63,29 +63,21 @@ class TileviewType(WidgetType):
         )
 
     async def to_code(self, w: Widget, config: dict):
-        tiles = config[CONF_TILES]
-        for tile_conf in tiles:
+        for tile_conf in config.get(CONF_TILES, ()):
             w_id = tile_conf[CONF_ID]
             tile_obj = lv_Pvariable(lv_obj_t, w_id)
             tile = Widget.create(w_id, tile_obj, tile_spec, tile_conf)
             dirs = tile_conf[CONF_DIR]
             if isinstance(dirs, list):
                 dirs = "|".join(dirs)
-            row_pos = tile_conf[CONF_ROW]
-            col_pos = tile_conf[CONF_COLUMN]
             lv_assign(
                 tile_obj,
-                lv_expr.tileview_add_tile(w.obj, col_pos, row_pos, literal(dirs)),
+                lv_expr.tileview_add_tile(
+                    w.obj, tile_conf[CONF_COLUMN], tile_conf[CONF_ROW], literal(dirs)
+                ),
             )
-            # Bugfix for LVGL 8.x
-            lv_obj.set_pos(tile_obj, lv_pct(col_pos * 100), lv_pct(row_pos * 100))
             await set_obj_properties(tile, tile_conf)
             await add_widgets(tile, tile_conf)
-        if tiles:
-            # Set the first tile as active
-            lv_obj.set_tile_id(
-                w.obj, tiles[0][CONF_COLUMN], tiles[0][CONF_ROW], literal("LV_ANIM_OFF")
-            )
 
 
 tileview_spec = TileviewType()

esphome/components/mqtt/mqtt_alarm_control_panel.cpp

@@ -55,8 +55,7 @@ void MQTTAlarmControlPanelComponent::dump_config() {
 }
 
 void MQTTAlarmControlPanelComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-  JsonArray supported_features = root[MQTT_SUPPORTED_FEATURES].to<JsonArray>();
+  JsonArray supported_features = root.createNestedArray(MQTT_SUPPORTED_FEATURES);
   const uint32_t acp_supported_features = this->alarm_control_panel_->get_supported_features();
   if (acp_supported_features & ACP_FEAT_ARM_AWAY) {
     supported_features.add("arm_away");

esphome/components/mqtt/mqtt_backend_esp32.cpp

@@ -153,15 +153,11 @@ void MQTTBackendESP32::mqtt_event_handler_(const Event &event) {
     case MQTT_EVENT_DATA: {
       static std::string topic;
       if (!event.topic.empty()) {
-        // When a single message arrives as multiple chunks, the topic will be empty
-        // on any but the first message, leading to event.topic being an empty string.
-        // To ensure handlers get the correct topic, cache the last seen topic to
-        // simulate always receiving the topic from underlying library
         topic = event.topic;
       }
       ESP_LOGV(TAG, "MQTT_EVENT_DATA %s", topic.c_str());
-      this->on_message_.call(topic.c_str(), event.data.data(), event.data.size(), event.current_data_offset,
-                             event.total_data_len);
+      this->on_message_.call(!event.topic.empty() ? topic.c_str() : nullptr, event.data.data(), event.data.size(),
+                             event.current_data_offset, event.total_data_len);
     } break;
     case MQTT_EVENT_ERROR:
       ESP_LOGE(TAG, "MQTT_EVENT_ERROR");

esphome/components/mqtt/mqtt_binary_sensor.cpp

@@ -30,7 +30,6 @@ MQTTBinarySensorComponent::MQTTBinarySensorComponent(binary_sensor::BinarySensor
 }
 
 void MQTTBinarySensorComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   if (!this->binary_sensor_->get_device_class().empty())
     root[MQTT_DEVICE_CLASS] = this->binary_sensor_->get_device_class();
   if (this->binary_sensor_->is_status_binary_sensor())

esphome/components/mqtt/mqtt_button.cpp

@@ -31,12 +31,9 @@ void MQTTButtonComponent::dump_config() {
 }
 
 void MQTTButtonComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   config.state_topic = false;
-  if (!this->button_->get_device_class().empty()) {
+  if (!this->button_->get_device_class().empty())
     root[MQTT_DEVICE_CLASS] = this->button_->get_device_class();
-  }
-  // NOLINTEND(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
 std::string MQTTButtonComponent::component_type() const { return "button"; }

esphome/components/mqtt/mqtt_client.cpp

@@ -92,7 +92,6 @@ void MQTTClientComponent::send_device_info_() {
   std::string topic = "esphome/discover/";
   topic.append(App.get_name());
 
-  // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   this->publish_json(
       topic,
       [](JsonObject root) {
@@ -148,7 +147,6 @@ void MQTTClientComponent::send_device_info_() {
 #endif
       },
       2, this->discovery_info_.retain);
-  // NOLINTEND(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
 void MQTTClientComponent::dump_config() {
@@ -193,17 +191,13 @@ void MQTTClientComponent::start_dnslookup_() {
   this->dns_resolve_error_ = false;
   this->dns_resolved_ = false;
   ip_addr_t addr;
-  err_t err;
-  {
-    LwIPLock lock;
 #if USE_NETWORK_IPV6
-    err = dns_gethostbyname_addrtype(this->credentials_.address.c_str(), &addr, MQTTClientComponent::dns_found_callback,
-                                     this, LWIP_DNS_ADDRTYPE_IPV6_IPV4);
+  err_t err = dns_gethostbyname_addrtype(this->credentials_.address.c_str(), &addr,
+                                         MQTTClientComponent::dns_found_callback, this, LWIP_DNS_ADDRTYPE_IPV6_IPV4);
 #else
-    err = dns_gethostbyname_addrtype(this->credentials_.address.c_str(), &addr, MQTTClientComponent::dns_found_callback,
-                                     this, LWIP_DNS_ADDRTYPE_IPV4);
+  err_t err = dns_gethostbyname_addrtype(this->credentials_.address.c_str(), &addr,
+                                         MQTTClientComponent::dns_found_callback, this, LWIP_DNS_ADDRTYPE_IPV4);
 #endif /* USE_NETWORK_IPV6 */
-  }
   switch (err) {
     case ERR_OK: {
       // Got IP immediately

esphome/components/mqtt/mqtt_climate.cpp

@@ -14,7 +14,6 @@ static const char *const TAG = "mqtt.climate";
 using namespace esphome::climate;
 
 void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   auto traits = this->device_->get_traits();
   // current_temperature_topic
   if (traits.get_supports_current_temperature()) {
@@ -29,7 +28,7 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
   // mode_state_topic
   root[MQTT_MODE_STATE_TOPIC] = this->get_mode_state_topic();
   // modes
-  JsonArray modes = root[MQTT_MODES].to<JsonArray>();
+  JsonArray modes = root.createNestedArray(MQTT_MODES);
   // sort array for nice UI in HA
   if (traits.supports_mode(CLIMATE_MODE_AUTO))
     modes.add("auto");
@@ -90,7 +89,7 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
     // preset_mode_state_topic
     root[MQTT_PRESET_MODE_STATE_TOPIC] = this->get_preset_state_topic();
     // presets
-    JsonArray presets = root["preset_modes"].to<JsonArray>();
+    JsonArray presets = root.createNestedArray("preset_modes");
     if (traits.supports_preset(CLIMATE_PRESET_HOME))
       presets.add("home");
     if (traits.supports_preset(CLIMATE_PRESET_AWAY))
@@ -120,7 +119,7 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
     // fan_mode_state_topic
     root[MQTT_FAN_MODE_STATE_TOPIC] = this->get_fan_mode_state_topic();
     // fan_modes
-    JsonArray fan_modes = root["fan_modes"].to<JsonArray>();
+    JsonArray fan_modes = root.createNestedArray("fan_modes");
     if (traits.supports_fan_mode(CLIMATE_FAN_ON))
       fan_modes.add("on");
     if (traits.supports_fan_mode(CLIMATE_FAN_OFF))
@@ -151,7 +150,7 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
     // swing_mode_state_topic
     root[MQTT_SWING_MODE_STATE_TOPIC] = this->get_swing_mode_state_topic();
     // swing_modes
-    JsonArray swing_modes = root["swing_modes"].to<JsonArray>();
+    JsonArray swing_modes = root.createNestedArray("swing_modes");
     if (traits.supports_swing_mode(CLIMATE_SWING_OFF))
       swing_modes.add("off");
     if (traits.supports_swing_mode(CLIMATE_SWING_BOTH))
@@ -164,7 +163,6 @@ void MQTTClimateComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCo
 
   config.state_topic = false;
   config.command_topic = false;
-  // NOLINTEND(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 void MQTTClimateComponent::setup() {
   auto traits = this->device_->get_traits();

esphome/components/mqtt/mqtt_component.cpp

@@ -70,7 +70,6 @@ bool MQTTComponent::send_discovery_() {
 
   ESP_LOGV(TAG, "'%s': Sending discovery", this->friendly_name().c_str());
 
-  // NOLINTBEGIN(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   return global_mqtt_client->publish_json(
       this->get_discovery_topic_(discovery_info),
       [this](JsonObject root) {
@@ -156,7 +155,7 @@ bool MQTTComponent::send_discovery_() {
         }
         std::string node_area = App.get_area();
 
-        JsonObject device_info = root[MQTT_DEVICE].to<JsonObject>();
+        JsonObject device_info = root.createNestedObject(MQTT_DEVICE);
         const auto mac = get_mac_address();
         device_info[MQTT_DEVICE_IDENTIFIERS] = mac;
         device_info[MQTT_DEVICE_NAME] = node_friendly_name;
@@ -193,7 +192,6 @@ bool MQTTComponent::send_discovery_() {
         device_info[MQTT_DEVICE_CONNECTIONS][0][1] = mac;
       },
       this->qos_, discovery_info.retain);
-  // NOLINTEND(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
 uint8_t MQTTComponent::get_qos() const { return this->qos_; }

esphome/components/mqtt/mqtt_cover.cpp

@@ -67,7 +67,6 @@ void MQTTCoverComponent::dump_config() {
   }
 }
 void MQTTCoverComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   if (!this->cover_->get_device_class().empty())
     root[MQTT_DEVICE_CLASS] = this->cover_->get_device_class();
 

esphome/components/mqtt/mqtt_date.cpp

@@ -20,13 +20,13 @@ MQTTDateComponent::MQTTDateComponent(DateEntity *date) : date_(date) {}
 void MQTTDateComponent::setup() {
   this->subscribe_json(this->get_command_topic_(), [this](const std::string &topic, JsonObject root) {
     auto call = this->date_->make_call();
-    if (root["year"].is<uint16_t>()) {
+    if (root.containsKey("year")) {
       call.set_year(root["year"]);
     }
-    if (root["month"].is<uint8_t>()) {
+    if (root.containsKey("month")) {
       call.set_month(root["month"]);
     }
-    if (root["day"].is<uint8_t>()) {
+    if (root.containsKey("day")) {
       call.set_day(root["day"]);
     }
     call.perform();
@@ -55,7 +55,6 @@ bool MQTTDateComponent::send_initial_state() {
 }
 bool MQTTDateComponent::publish_state(uint16_t year, uint8_t month, uint8_t day) {
   return this->publish_json(this->get_state_topic_(), [year, month, day](JsonObject root) {
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
     root["year"] = year;
     root["month"] = month;
     root["day"] = day;

esphome/components/mqtt/mqtt_datetime.cpp

@@ -20,22 +20,22 @@ MQTTDateTimeComponent::MQTTDateTimeComponent(DateTimeEntity *datetime) : datetim
 void MQTTDateTimeComponent::setup() {
   this->subscribe_json(this->get_command_topic_(), [this](const std::string &topic, JsonObject root) {
     auto call = this->datetime_->make_call();
-    if (root["year"].is<uint16_t>()) {
+    if (root.containsKey("year")) {
       call.set_year(root["year"]);
     }
-    if (root["month"].is<uint8_t>()) {
+    if (root.containsKey("month")) {
       call.set_month(root["month"]);
     }
-    if (root["day"].is<uint8_t>()) {
+    if (root.containsKey("day")) {
       call.set_day(root["day"]);
     }
-    if (root["hour"].is<uint8_t>()) {
+    if (root.containsKey("hour")) {
       call.set_hour(root["hour"]);
     }
-    if (root["minute"].is<uint8_t>()) {
+    if (root.containsKey("minute")) {
       call.set_minute(root["minute"]);
     }
-    if (root["second"].is<uint8_t>()) {
+    if (root.containsKey("second")) {
       call.set_second(root["second"]);
     }
     call.perform();
@@ -68,7 +68,6 @@ bool MQTTDateTimeComponent::send_initial_state() {
 bool MQTTDateTimeComponent::publish_state(uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute,
                                           uint8_t second) {
   return this->publish_json(this->get_state_topic_(), [year, month, day, hour, minute, second](JsonObject root) {
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
     root["year"] = year;
     root["month"] = month;
     root["day"] = day;

esphome/components/mqtt/mqtt_event.cpp

@@ -16,8 +16,7 @@ using namespace esphome::event;
 MQTTEventComponent::MQTTEventComponent(event::Event *event) : event_(event) {}
 
 void MQTTEventComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-  JsonArray event_types = root[MQTT_EVENT_TYPES].to<JsonArray>();
+  JsonArray event_types = root.createNestedArray(MQTT_EVENT_TYPES);
   for (const auto &event_type : this->event_->get_event_types())
     event_types.add(event_type);
 
@@ -41,10 +40,8 @@ void MQTTEventComponent::dump_config() {
 }
 
 bool MQTTEventComponent::publish_event_(const std::string &event_type) {
-  return this->publish_json(this->get_state_topic_(), [event_type](JsonObject root) {
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-    root[MQTT_EVENT_TYPE] = event_type;
-  });
+  return this->publish_json(this->get_state_topic_(),
+                            [event_type](JsonObject root) { root[MQTT_EVENT_TYPE] = event_type; });
 }
 
 std::string MQTTEventComponent::component_type() const { return "event"; }

esphome/components/mqtt/mqtt_fan.cpp

@@ -143,7 +143,6 @@ void MQTTFanComponent::dump_config() {
 bool MQTTFanComponent::send_initial_state() { return this->publish_state(); }
 
 void MQTTFanComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   if (this->state_->get_traits().supports_direction()) {
     root[MQTT_DIRECTION_COMMAND_TOPIC] = this->get_direction_command_topic();
     root[MQTT_DIRECTION_STATE_TOPIC] = this->get_direction_state_topic();

esphome/components/mqtt/mqtt_light.cpp

@@ -32,21 +32,17 @@ void MQTTJSONLightComponent::setup() {
 MQTTJSONLightComponent::MQTTJSONLightComponent(LightState *state) : state_(state) {}
 
 bool MQTTJSONLightComponent::publish_state_() {
-  return this->publish_json(this->get_state_topic_(), [this](JsonObject root) {
-    // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-    LightJSONSchema::dump_json(*this->state_, root);
-  });
+  return this->publish_json(this->get_state_topic_(),
+                            [this](JsonObject root) { LightJSONSchema::dump_json(*this->state_, root); });
 }
 LightState *MQTTJSONLightComponent::get_state() const { return this->state_; }
 
 void MQTTJSONLightComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   root["schema"] = "json";
   auto traits = this->state_->get_traits();
 
   root[MQTT_COLOR_MODE] = true;
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-  JsonArray color_modes = root["supported_color_modes"].to<JsonArray>();
+  JsonArray color_modes = root.createNestedArray("supported_color_modes");
   if (traits.supports_color_mode(ColorMode::ON_OFF))
     color_modes.add("onoff");
   if (traits.supports_color_mode(ColorMode::BRIGHTNESS))
@@ -71,7 +67,7 @@ void MQTTJSONLightComponent::send_discovery(JsonObject root, mqtt::SendDiscovery
 
   if (this->state_->supports_effects()) {
     root["effect"] = true;
-    JsonArray effect_list = root[MQTT_EFFECT_LIST].to<JsonArray>();
+    JsonArray effect_list = root.createNestedArray(MQTT_EFFECT_LIST);
     for (auto *effect : this->state_->get_effects())
       effect_list.add(effect->get_name());
     effect_list.add("None");

esphome/components/mqtt/mqtt_lock.cpp

@@ -38,10 +38,8 @@ void MQTTLockComponent::dump_config() {
 std::string MQTTLockComponent::component_type() const { return "lock"; }
 const EntityBase *MQTTLockComponent::get_entity() const { return this->lock_; }
 void MQTTLockComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-  if (this->lock_->traits.get_assumed_state()) {
+  if (this->lock_->traits.get_assumed_state())
     root[MQTT_OPTIMISTIC] = true;
-  }
   if (this->lock_->traits.get_supports_open())
     root[MQTT_PAYLOAD_OPEN] = "OPEN";
 }

esphome/components/mqtt/mqtt_number.cpp

@@ -40,7 +40,6 @@ const EntityBase *MQTTNumberComponent::get_entity() const { return this->number_
 void MQTTNumberComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
   const auto &traits = number_->traits;
   // https://www.home-assistant.io/integrations/number.mqtt/
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
   root[MQTT_MIN] = traits.get_min_value();
   root[MQTT_MAX] = traits.get_max_value();
   root[MQTT_STEP] = traits.get_step();

esphome/components/mqtt/mqtt_select.cpp

@@ -35,8 +35,7 @@ const EntityBase *MQTTSelectComponent::get_entity() const { return this->select_
 void MQTTSelectComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
   const auto &traits = select_->traits;
   // https://www.home-assistant.io/integrations/select.mqtt/
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-  JsonArray options = root[MQTT_OPTIONS].to<JsonArray>();
+  JsonArray options = root.createNestedArray(MQTT_OPTIONS);
   for (const auto &option : traits.get_options())
     options.add(option);
 

esphome/components/mqtt/mqtt_sensor.cpp

@@ -44,10 +44,8 @@ void MQTTSensorComponent::set_expire_after(uint32_t expire_after) { this->expire
 void MQTTSensorComponent::disable_expire_after() { this->expire_after_ = 0; }
 
 void MQTTSensorComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
-  // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks) false positive with ArduinoJson
-  if (!this->sensor_->get_device_class().empty()) {
+  if (!this->sensor_->get_device_class().empty())
     root[MQTT_DEVICE_CLASS] = this->sensor_->get_device_class();
-  }
 
   if (!this->sensor_->get_unit_of_measurement().empty())
     root[MQTT_UNIT_OF_MEASUREMENT] = this->sensor_->get_unit_of_measurement();