Merge remote-tracking branch 'upstream/dev' into integration

esphome/components/microphone/__init__.py

@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_GAIN_FACTOR,
     CONF_ID,
     CONF_MICROPHONE,
+    CONF_ON_DATA,
     CONF_TRIGGER_ID,
 )
 from esphome.core import CORE
@@ -19,8 +20,6 @@ CODEOWNERS = ["@jesserockz", "@kahrendt"]
 
 IS_PLATFORM_COMPONENT = True
 
-CONF_ON_DATA = "on_data"
-
 microphone_ns = cg.esphome_ns.namespace("microphone")
 
 Microphone = microphone_ns.class_("Microphone")

esphome/components/sml/__init__.py

@@ -4,7 +4,7 @@ from esphome import automation
 import esphome.codegen as cg
 from esphome.components import uart
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_TRIGGER_ID
+from esphome.const import CONF_ID, CONF_ON_DATA, CONF_TRIGGER_ID
 
 CODEOWNERS = ["@alengwenus"]
 
@@ -17,7 +17,6 @@ MULTI_CONF = True
 CONF_SML_ID = "sml_id"
 CONF_OBIS_CODE = "obis_code"
 CONF_SERVER_ID = "server_id"
-CONF_ON_DATA = "on_data"
 
 sml_ns = cg.esphome_ns.namespace("sml")
 

esphome/const.py

@@ -679,6 +679,7 @@ CONF_ON_CLIENT_CONNECTED = "on_client_connected"
 CONF_ON_CLIENT_DISCONNECTED = "on_client_disconnected"
 CONF_ON_CONNECT = "on_connect"
 CONF_ON_CONTROL = "on_control"
+CONF_ON_DATA = "on_data"
 CONF_ON_DIRECTION_SET = "on_direction_set"
 CONF_ON_DISCONNECT = "on_disconnect"
 CONF_ON_DOUBLE_CLICK = "on_double_click"

requirements.txt

@@ -12,7 +12,7 @@ platformio==6.1.18  # When updating platformio, also update /docker/Dockerfile
 esptool==5.1.0
 click==8.1.7
 esphome-dashboard==20251013.0
-aioesphomeapi==43.3.0
+aioesphomeapi==43.5.0
 zeroconf==0.148.0
 puremagic==1.30
 ruamel.yaml==0.18.17 # dashboard_import