From ec9a207f42c7869d64daa1c49c95a68e3ef23681 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 17 Oct 2026 15:15:21 -1000 Subject: [PATCH] [components] Create UART devices with new_uart_component (#20919) --- esphome/components/apc1/sensor.py | 5 +---- esphome/components/bl0906/sensor.py | 4 +--- esphome/components/bl0939/sensor.py | 5 +---- esphome/components/bl0940/sensor.py | 5 +---- esphome/components/bl0942/sensor.py | 5 +---- esphome/components/cm1106/sensor.py | 5 +---- esphome/components/cse7761/sensor.py | 5 +---- esphome/components/cse7766/sensor.py | 5 +---- esphome/components/daly_bms/__init__.py | 6 ++---- esphome/components/dfplayer/__init__.py | 6 ++---- esphome/components/dfrobot_sen0395/__init__.py | 4 +--- esphome/components/dfrobot_sen0609/__init__.py | 4 +--- esphome/components/gcja5/sensor.py | 5 +---- esphome/components/gps/__init__.py | 4 +--- esphome/components/hc8/sensor.py | 4 +--- esphome/components/hlk_fm22x/__init__.py | 5 +---- esphome/components/hlw8032/sensor.py | 5 +---- esphome/components/hydreon_rgxx/sensor.py | 5 +---- esphome/components/kamstrup_kmp/sensor.py | 5 +---- esphome/components/ld2410/__init__.py | 4 +--- esphome/components/ld2410s/__init__.py | 5 +---- esphome/components/ld2412/__init__.py | 6 ++---- esphome/components/ld2420/__init__.py | 5 +---- esphome/components/ld2450/__init__.py | 6 ++---- esphome/components/ld2460/__init__.py | 6 ++---- esphome/components/ld6002b/__init__.py | 6 ++---- esphome/components/mhz19/sensor.py | 4 +--- esphome/components/micronova/__init__.py | 5 +---- esphome/components/mitsubishi_cn105/__init__.py | 4 +--- esphome/components/mk2pvrouter/__init__.py | 6 ++---- esphome/components/pipsolar/__init__.py | 5 +---- esphome/components/pm1006/sensor.py | 5 +---- esphome/components/pmsx003/sensor.py | 5 +---- esphome/components/pylontech/__init__.py | 5 +---- esphome/components/pzem004t/sensor.py | 5 +---- esphome/components/rd03d/__init__.py | 6 ++---- esphome/components/rdm6300/__init__.py | 6 ++---- esphome/components/rf_bridge/__init__.py | 5 +---- esphome/components/sds011/sensor.py | 5 +---- esphome/components/seeed_mr60bha2/__init__.py | 5 +---- esphome/components/seeed_mr60fda2/__init__.py | 5 +---- esphome/components/senseair/sensor.py | 4 +--- esphome/components/serial_proxy/__init__.py | 6 ++---- esphome/components/sim800l/__init__.py | 6 ++---- esphome/components/sm300d2/sensor.py | 5 +---- esphome/components/sml/__init__.py | 6 ++---- esphome/components/smt100/sensor.py | 5 +---- esphome/components/sun_gtil2/__init__.py | 5 +---- esphome/components/systa_bus/__init__.py | 5 +---- esphome/components/t6615/sensor.py | 5 +---- esphome/components/teleinfo/__init__.py | 5 +---- esphome/components/tmc22xx/__init__.py | 4 +--- esphome/components/tuya/__init__.py | 6 ++---- esphome/components/uart_tcp/__init__.py | 4 +--- esphome/components/ufm01/__init__.py | 4 +--- esphome/components/uponor_smatrix/__init__.py | 6 ++---- esphome/components/vbus/__init__.py | 5 +---- esphome/components/zwave_proxy/__init__.py | 6 ++---- 58 files changed, 73 insertions(+), 220 deletions(-) diff --git a/esphome/components/apc1/sensor.py b/esphome/components/apc1/sensor.py index b64a49903f2..f3f7e0203f9 100644 --- a/esphome/components/apc1/sensor.py +++ b/esphome/components/apc1/sensor.py @@ -7,7 +7,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_ECO2, CONF_HUMIDITY, - CONF_ID, CONF_PM_0_3UM, CONF_PM_0_5UM, CONF_PM_1_0, @@ -165,9 +164,7 @@ FINAL_VALIDATE_SCHEMA = final_validate async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_PM_1_0, var.set_pm_1_0_sensor) diff --git a/esphome/components/bl0906/sensor.py b/esphome/components/bl0906/sensor.py index 25c50555dbc..d8e2f092c06 100644 --- a/esphome/components/bl0906/sensor.py +++ b/esphome/components/bl0906/sensor.py @@ -147,9 +147,7 @@ automation.register_apply_action( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_FREQUENCY, var.set_frequency_sensor) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/bl0939/sensor.py b/esphome/components/bl0939/sensor.py index 5e33759dea4..45a2e6e983d 100644 --- a/esphome/components/bl0939/sensor.py +++ b/esphome/components/bl0939/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import sensor, uart import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_INTERNAL_TEMPERATURE, CONF_MODE, CONF_VOLTAGE, @@ -112,9 +111,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) if (mode := config[CONF_MODE]) != DEFAULT_MODE: cg.add(var.set_mode(mode)) diff --git a/esphome/components/bl0940/sensor.py b/esphome/components/bl0940/sensor.py index 1cf7e8e6e38..962abf636d1 100644 --- a/esphome/components/bl0940/sensor.py +++ b/esphome/components/bl0940/sensor.py @@ -5,7 +5,6 @@ from esphome.const import ( CONF_CURRENT, CONF_ENERGY, CONF_EXTERNAL_TEMPERATURE, - CONF_ID, CONF_INTERNAL_TEMPERATURE, CONF_POWER, CONF_REFERENCE_VOLTAGE, @@ -227,9 +226,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_VOLTAGE, var.set_voltage_sensor) diff --git a/esphome/components/bl0942/sensor.py b/esphome/components/bl0942/sensor.py index 397471cf7a9..a5e6ffb64db 100644 --- a/esphome/components/bl0942/sensor.py +++ b/esphome/components/bl0942/sensor.py @@ -6,7 +6,6 @@ from esphome.const import ( CONF_CURRENT, CONF_ENERGY, CONF_FREQUENCY, - CONF_ID, CONF_LINE_FREQUENCY, CONF_POWER, CONF_RESET, @@ -97,9 +96,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_VOLTAGE, var.set_voltage_sensor) diff --git a/esphome/components/cm1106/sensor.py b/esphome/components/cm1106/sensor.py index fa179f9667d..43c1f44d3d1 100644 --- a/esphome/components/cm1106/sensor.py +++ b/esphome/components/cm1106/sensor.py @@ -10,7 +10,6 @@ from esphome.const import ( CONF_BASELINE, CONF_CO2, CONF_CYCLE, - CONF_ID, DEVICE_CLASS_CARBON_DIOXIDE, ICON_MOLECULE_CO2, STATE_CLASS_MEASUREMENT, @@ -68,9 +67,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: """Code generation entry point.""" - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_CO2, var.set_co2_sensor) diff --git a/esphome/components/cse7761/sensor.py b/esphome/components/cse7761/sensor.py index 1618cb43962..17c23242f7f 100644 --- a/esphome/components/cse7761/sensor.py +++ b/esphome/components/cse7761/sensor.py @@ -3,7 +3,6 @@ from esphome.components import sensor, uart import esphome.config_validation as cv from esphome.const import ( CONF_FREQUENCY, - CONF_ID, CONF_VOLTAGE, DEVICE_CLASS_CURRENT, DEVICE_CLASS_ENERGY, @@ -121,9 +120,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID], config[CONF_CURRENT_INPUT]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config, config[CONF_CURRENT_INPUT]) sensors = sensor.sub_sensors(config) await sensors(CONF_VOLTAGE, var.set_voltage_sensor) diff --git a/esphome/components/cse7766/sensor.py b/esphome/components/cse7766/sensor.py index 86b6965e3a2..d5162230db0 100644 --- a/esphome/components/cse7766/sensor.py +++ b/esphome/components/cse7766/sensor.py @@ -5,7 +5,6 @@ from esphome.const import ( CONF_APPARENT_POWER, CONF_CURRENT, CONF_ENERGY, - CONF_ID, CONF_POWER, CONF_POWER_FACTOR, CONF_REACTIVE_POWER, @@ -94,9 +93,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_VOLTAGE, var.set_voltage_sensor) diff --git a/esphome/components/daly_bms/__init__.py b/esphome/components/daly_bms/__init__.py index 01d0eef857f..e2234985d43 100644 --- a/esphome/components/daly_bms/__init__.py +++ b/esphome/components/daly_bms/__init__.py @@ -1,7 +1,7 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ADDRESS, CONF_ID +from esphome.const import CONF_ADDRESS from esphome.types import ConfigType CODEOWNERS = ["@s1lvi0"] @@ -37,7 +37,5 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) cg.add(var.set_address(config[CONF_ADDRESS])) diff --git a/esphome/components/dfplayer/__init__.py b/esphome/components/dfplayer/__init__.py index 69b745df9cf..719a76ff07d 100644 --- a/esphome/components/dfplayer/__init__.py +++ b/esphome/components/dfplayer/__init__.py @@ -5,7 +5,7 @@ import esphome.codegen as cg from esphome.components import uart from esphome.components.const import CONF_LOOP import esphome.config_validation as cv -from esphome.const import CONF_DEVICE, CONF_FILE, CONF_ID, CONF_VOLUME +from esphome.const import CONF_DEVICE, CONF_FILE, CONF_VOLUME DEPENDENCIES = ["uart"] CODEOWNERS = ["@glmnet"] @@ -51,9 +51,7 @@ _CALLBACK_AUTOMATIONS = ( async def to_code(config): - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS) diff --git a/esphome/components/dfrobot_sen0395/__init__.py b/esphome/components/dfrobot_sen0395/__init__.py index d4e7aed91d8..801c2654a01 100644 --- a/esphome/components/dfrobot_sen0395/__init__.py +++ b/esphome/components/dfrobot_sen0395/__init__.py @@ -42,9 +42,7 @@ CONFIG_SCHEMA = cv.All( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) automation.register_apply_action( diff --git a/esphome/components/dfrobot_sen0609/__init__.py b/esphome/components/dfrobot_sen0609/__init__.py index 76ca362949a..d588d70efd1 100644 --- a/esphome/components/dfrobot_sen0609/__init__.py +++ b/esphome/components/dfrobot_sen0609/__init__.py @@ -79,7 +79,5 @@ def final_validate_mode(keys: dict[str, str]) -> Callable[[ConfigType], None]: async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID], RUN_MODES[config[CONF_MODE]]) cg.add_define("USE_LINE_READER") - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config, RUN_MODES[config[CONF_MODE]]) diff --git a/esphome/components/gcja5/sensor.py b/esphome/components/gcja5/sensor.py index 49907443ff9..85110dafc25 100644 --- a/esphome/components/gcja5/sensor.py +++ b/esphome/components/gcja5/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import sensor, uart import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PM_1_0, CONF_PM_2_5, CONF_PM_10_0, @@ -113,9 +112,7 @@ TYPES = { async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) for key, funcName in TYPES.items(): if key in config: diff --git a/esphome/components/gps/__init__.py b/esphome/components/gps/__init__.py index cc77dff496b..be1b13b70e9 100644 --- a/esphome/components/gps/__init__.py +++ b/esphome/components/gps/__init__.py @@ -96,9 +96,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema("gps", require_rx=True async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) # Pre-create all sensor variables so automations that reference # sibling sensors don't deadlock waiting for unregistered IDs. diff --git a/esphome/components/hc8/sensor.py b/esphome/components/hc8/sensor.py index 10074fbf10f..7ef0ce14c50 100644 --- a/esphome/components/hc8/sensor.py +++ b/esphome/components/hc8/sensor.py @@ -51,9 +51,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_CO2, var.set_co2_sensor) diff --git a/esphome/components/hlk_fm22x/__init__.py b/esphome/components/hlk_fm22x/__init__.py index 72d3cc2ada3..a013fe884d3 100644 --- a/esphome/components/hlk_fm22x/__init__.py +++ b/esphome/components/hlk_fm22x/__init__.py @@ -4,7 +4,6 @@ from esphome.components import uart import esphome.config_validation as cv from esphome.const import ( CONF_DIRECTION, - CONF_ID, CONF_NAME, CONF_ON_ENROLLMENT_DONE, CONF_ON_ENROLLMENT_FAILED, @@ -90,9 +89,7 @@ _CALLBACK_AUTOMATIONS = ( async def to_code(config): - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS) diff --git a/esphome/components/hlw8032/sensor.py b/esphome/components/hlw8032/sensor.py index f2a8ffb2161..09cfe7320b4 100644 --- a/esphome/components/hlw8032/sensor.py +++ b/esphome/components/hlw8032/sensor.py @@ -5,7 +5,6 @@ from esphome.const import ( CONF_APPARENT_POWER, CONF_CURRENT, CONF_CURRENT_RESISTOR, - CONF_ID, CONF_POWER, CONF_POWER_FACTOR, CONF_VOLTAGE, @@ -75,9 +74,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_VOLTAGE, var.set_voltage_sensor) diff --git a/esphome/components/hydreon_rgxx/sensor.py b/esphome/components/hydreon_rgxx/sensor.py index 222a5308ae1..eeab5303922 100644 --- a/esphome/components/hydreon_rgxx/sensor.py +++ b/esphome/components/hydreon_rgxx/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import sensor, uart import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_MODEL, CONF_MOISTURE, CONF_RESOLUTION, @@ -140,10 +139,8 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) cg.add_define("USE_LINE_READER") - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) cg.add_define( "HYDREON_RGXX_PROTOCOL_LIST(F, sep)", diff --git a/esphome/components/kamstrup_kmp/sensor.py b/esphome/components/kamstrup_kmp/sensor.py index f6c236b72df..ae00f86e264 100644 --- a/esphome/components/kamstrup_kmp/sensor.py +++ b/esphome/components/kamstrup_kmp/sensor.py @@ -5,7 +5,6 @@ from esphome.const import ( CONF_COMMAND, CONF_CUSTOM, CONF_FLOW, - CONF_ID, CONF_POWER, CONF_VOLUME, DEVICE_CLASS_EMPTY, @@ -113,9 +112,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) # Standard sensors for key in [ diff --git a/esphome/components/ld2410/__init__.py b/esphome/components/ld2410/__init__.py index e2728aa73c7..a03d87d9168 100644 --- a/esphome/components/ld2410/__init__.py +++ b/esphome/components/ld2410/__init__.py @@ -72,9 +72,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) CALIBRATION_ACTION_SCHEMA = maybe_simple_id( diff --git a/esphome/components/ld2410s/__init__.py b/esphome/components/ld2410s/__init__.py index ecc90455d1c..f4e09cc1867 100644 --- a/esphome/components/ld2410s/__init__.py +++ b/esphome/components/ld2410s/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType AUTO_LOAD = ["ld24xx"] @@ -37,6 +36,4 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/ld2412/__init__.py b/esphome/components/ld2412/__init__.py index fd63f78c3d4..9a1772e780d 100644 --- a/esphome/components/ld2412/__init__.py +++ b/esphome/components/ld2412/__init__.py @@ -1,7 +1,7 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_THROTTLE +from esphome.const import CONF_THROTTLE from esphome.types import ConfigType AUTO_LOAD = ["ld24xx"] @@ -43,6 +43,4 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/ld2420/__init__.py b/esphome/components/ld2420/__init__.py index 87a54d278a7..b92e84d5965 100644 --- a/esphome/components/ld2420/__init__.py +++ b/esphome/components/ld2420/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@descipher"] @@ -36,6 +35,4 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/ld2450/__init__.py b/esphome/components/ld2450/__init__.py index 066ace871f8..dfca220b6a7 100644 --- a/esphome/components/ld2450/__init__.py +++ b/esphome/components/ld2450/__init__.py @@ -3,7 +3,7 @@ import esphome.codegen as cg from esphome.components import uart from esphome.config_helpers import filter_source_files_from_defines import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_ON_DATA, CONF_THROTTLE +from esphome.const import CONF_ON_DATA, CONF_THROTTLE from esphome.types import ConfigType AUTO_LOAD = ["ld24xx"] @@ -63,7 +63,5 @@ FILTER_SOURCE_FILES = filter_source_files_from_defines( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS) diff --git a/esphome/components/ld2460/__init__.py b/esphome/components/ld2460/__init__.py index 88c3a173efe..84cba297190 100644 --- a/esphome/components/ld2460/__init__.py +++ b/esphome/components/ld2460/__init__.py @@ -2,7 +2,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_ON_DATA +from esphome.const import CONF_ON_DATA from esphome.types import ConfigType AUTO_LOAD = ["ld24xx"] @@ -41,7 +41,5 @@ _CALLBACK_AUTOMATIONS = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS) diff --git a/esphome/components/ld6002b/__init__.py b/esphome/components/ld6002b/__init__.py index c7529f93149..48017a8f00e 100644 --- a/esphome/components/ld6002b/__init__.py +++ b/esphome/components/ld6002b/__init__.py @@ -2,7 +2,7 @@ from esphome import pins import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_WAKEUP_PIN +from esphome.const import CONF_WAKEUP_PIN from esphome.types import ConfigType from .const import CONF_AUTO_WAKE, CONF_WAKEUP_PULSE @@ -62,9 +62,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) if wakeup_pin_config := config.get(CONF_WAKEUP_PIN): pin = await cg.gpio_pin_expression(wakeup_pin_config) diff --git a/esphome/components/mhz19/sensor.py b/esphome/components/mhz19/sensor.py index 4daeef5059c..5c5b24f6f48 100644 --- a/esphome/components/mhz19/sensor.py +++ b/esphome/components/mhz19/sensor.py @@ -73,9 +73,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_CO2, var.set_co2_sensor) diff --git a/esphome/components/micronova/__init__.py b/esphome/components/micronova/__init__.py index ff06d0b913d..3745b1084ba 100644 --- a/esphome/components/micronova/__init__.py +++ b/esphome/components/micronova/__init__.py @@ -4,7 +4,6 @@ from esphome import pins import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.core import CORE, coroutine_with_priority from esphome.coroutine import CoroPriority from esphome.cpp_generator import MockObj @@ -106,9 +105,7 @@ async def to_code_micronova_listener( async def to_code(config: ConfigType) -> None: enable_rx_pin = await cg.gpio_pin_expression(config[CONF_ENABLE_RX_PIN]) - var = cg.new_Pvariable(config[CONF_ID], enable_rx_pin) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config, enable_rx_pin) CORE.add_job(_final_step) diff --git a/esphome/components/mitsubishi_cn105/__init__.py b/esphome/components/mitsubishi_cn105/__init__.py index 442869eec53..ba51bd3a806 100644 --- a/esphome/components/mitsubishi_cn105/__init__.py +++ b/esphome/components/mitsubishi_cn105/__init__.py @@ -90,9 +90,7 @@ async def register_mitsubishi_cn105_device(var: MockObj, config: ConfigType) -> async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) cg.add( var.set_telemetry_request_min_interval( config[CONF_TELEMETRY_REQUEST_MIN_INTERVAL] diff --git a/esphome/components/mk2pvrouter/__init__.py b/esphome/components/mk2pvrouter/__init__.py index 7df1f7104f5..3d84c40c9ed 100644 --- a/esphome/components/mk2pvrouter/__init__.py +++ b/esphome/components/mk2pvrouter/__init__.py @@ -1,7 +1,7 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_TAG +from esphome.const import CONF_TAG from esphome.cpp_generator import MockObj from esphome.types import ConfigType @@ -65,6 +65,4 @@ async def register_mk2pvrouter_listener(mk2pvrouter: MockObj, var: MockObj) -> N async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/pipsolar/__init__.py b/esphome/components/pipsolar/__init__.py index 54337b0b130..77b97b24719 100644 --- a/esphome/components/pipsolar/__init__.py +++ b/esphome/components/pipsolar/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType DEPENDENCIES = ["uart"] @@ -29,6 +28,4 @@ CONFIG_SCHEMA = cv.All( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/pm1006/sensor.py b/esphome/components/pm1006/sensor.py index 98c64066761..fc1bec8296b 100644 --- a/esphome/components/pm1006/sensor.py +++ b/esphome/components/pm1006/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import sensor, uart import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PM_2_5, CONF_UPDATE_INTERVAL, DEVICE_CLASS_PM25, @@ -58,9 +57,7 @@ FINAL_VALIDATE_SCHEMA = validate_interval_uart async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_PM_2_5, var.set_pm_2_5_sensor) diff --git a/esphome/components/pmsx003/sensor.py b/esphome/components/pmsx003/sensor.py index 723b99a5040..55f0c0678b2 100644 --- a/esphome/components/pmsx003/sensor.py +++ b/esphome/components/pmsx003/sensor.py @@ -6,7 +6,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_FORMALDEHYDE, CONF_HUMIDITY, - CONF_ID, CONF_PM_0_3UM, CONF_PM_0_5UM, CONF_PM_1_0, @@ -328,9 +327,7 @@ FINAL_VALIDATE_SCHEMA = final_validate async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) cg.add(var.set_type(config[CONF_TYPE])) diff --git a/esphome/components/pylontech/__init__.py b/esphome/components/pylontech/__init__.py index e15f8f04c82..3fc194da057 100644 --- a/esphome/components/pylontech/__init__.py +++ b/esphome/components/pylontech/__init__.py @@ -6,7 +6,6 @@ import esphome.codegen as cg from esphome.components import uart from esphome.components.const import CONF_ENABLED import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.core import CORE from esphome.cpp_generator import MockObj from esphome.types import ConfigType @@ -108,7 +107,5 @@ automation.register_apply_action( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) cg.add_define("USE_LINE_READER") - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/pzem004t/sensor.py b/esphome/components/pzem004t/sensor.py index 2b19cf84985..9a2b73ea4cc 100644 --- a/esphome/components/pzem004t/sensor.py +++ b/esphome/components/pzem004t/sensor.py @@ -4,7 +4,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_CURRENT, CONF_ENERGY, - CONF_ID, CONF_POWER, CONF_VOLTAGE, DEVICE_CLASS_CURRENT, @@ -65,9 +64,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_VOLTAGE, var.set_voltage_sensor) diff --git a/esphome/components/rd03d/__init__.py b/esphome/components/rd03d/__init__.py index 96bf4ffd743..ff2eaebad59 100644 --- a/esphome/components/rd03d/__init__.py +++ b/esphome/components/rd03d/__init__.py @@ -1,7 +1,7 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_THROTTLE +from esphome.const import CONF_THROTTLE from esphome.types import ConfigType CODEOWNERS = ["@jasstrong"] @@ -41,9 +41,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) if CONF_TRACKING_MODE in config: cg.add(var.set_tracking_mode(config[CONF_TRACKING_MODE])) diff --git a/esphome/components/rdm6300/__init__.py b/esphome/components/rdm6300/__init__.py index 86eb2cd7380..18d8e551f95 100644 --- a/esphome/components/rdm6300/__init__.py +++ b/esphome/components/rdm6300/__init__.py @@ -2,7 +2,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_ON_TAG, CONF_TRIGGER_ID +from esphome.const import CONF_ON_TAG, CONF_TRIGGER_ID from esphome.types import ConfigType DEPENDENCIES = ["uart"] @@ -37,9 +37,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) for conf in config.get(CONF_ON_TAG, []): trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID]) diff --git a/esphome/components/rf_bridge/__init__.py b/esphome/components/rf_bridge/__init__.py index e967335c180..e970df9faa8 100644 --- a/esphome/components/rf_bridge/__init__.py +++ b/esphome/components/rf_bridge/__init__.py @@ -6,7 +6,6 @@ from esphome.const import ( CONF_CODE, CONF_DURATION, CONF_HIGH, - CONF_ID, CONF_LENGTH, CONF_LOW, CONF_PROTOCOL, @@ -70,9 +69,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config): - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS) diff --git a/esphome/components/sds011/sensor.py b/esphome/components/sds011/sensor.py index fe1481df9a5..93a2b9b0212 100644 --- a/esphome/components/sds011/sensor.py +++ b/esphome/components/sds011/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import sensor, uart import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PM_2_5, CONF_PM_10_0, CONF_RX_ONLY, @@ -85,9 +84,7 @@ async def to_code(config: ConfigType) -> None: # Pop update_interval before register_component so it doesn't generate # a set_update_interval call — sds011 handles this via set_update_interval_min update_interval = config.pop(CONF_UPDATE_INTERVAL, None) - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) if update_interval is not None: cg.add(var.set_update_interval_min(update_interval)) diff --git a/esphome/components/seeed_mr60bha2/__init__.py b/esphome/components/seeed_mr60bha2/__init__.py index 7a85567510a..bf91e4b1e27 100644 --- a/esphome/components/seeed_mr60bha2/__init__.py +++ b/esphome/components/seeed_mr60bha2/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@limengdu"] @@ -38,6 +37,4 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/seeed_mr60fda2/__init__.py b/esphome/components/seeed_mr60fda2/__init__.py index cc227415831..081581683a2 100644 --- a/esphome/components/seeed_mr60fda2/__init__.py +++ b/esphome/components/seeed_mr60fda2/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@limengdu"] @@ -39,6 +38,4 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/senseair/sensor.py b/esphome/components/senseair/sensor.py index 2494e9a6d1f..5222d56a106 100644 --- a/esphome/components/senseair/sensor.py +++ b/esphome/components/senseair/sensor.py @@ -49,9 +49,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_CO2, var.set_co2_sensor) diff --git a/esphome/components/serial_proxy/__init__.py b/esphome/components/serial_proxy/__init__.py index 6c3327e556f..35b65f6bae3 100644 --- a/esphome/components/serial_proxy/__init__.py +++ b/esphome/components/serial_proxy/__init__.py @@ -19,7 +19,7 @@ import esphome.codegen as cg from esphome.components import uart from esphome.components.usb_uart import is_usb_uart_channel import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_NAME, CONF_UART_ID +from esphome.const import CONF_NAME, CONF_UART_ID from esphome.core import CORE, coroutine_with_priority from esphome.coroutine import CoroPriority import esphome.final_validate as fv @@ -94,9 +94,7 @@ async def _add_serial_proxy_count_define() -> None: async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) cg.add(cg.App.register_serial_proxy(var)) cg.add(var.set_name(config[CONF_NAME])) cg.add(var.set_port_type(config[CONF_PORT_TYPE])) diff --git a/esphome/components/sim800l/__init__.py b/esphome/components/sim800l/__init__.py index efc742610d9..2500e4684bf 100644 --- a/esphome/components/sim800l/__init__.py +++ b/esphome/components/sim800l/__init__.py @@ -2,7 +2,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_MESSAGE +from esphome.const import CONF_MESSAGE DEPENDENCIES = ["uart"] CODEOWNERS = ["@glmnet"] @@ -66,10 +66,8 @@ _CALLBACK_AUTOMATIONS = ( async def to_code(config): - var = cg.new_Pvariable(config[CONF_ID]) cg.add_define("USE_LINE_READER") - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS) diff --git a/esphome/components/sm300d2/sensor.py b/esphome/components/sm300d2/sensor.py index 4245283ab48..b63db068e63 100644 --- a/esphome/components/sm300d2/sensor.py +++ b/esphome/components/sm300d2/sensor.py @@ -5,7 +5,6 @@ from esphome.const import ( CONF_CO2, CONF_FORMALDEHYDE, CONF_HUMIDITY, - CONF_ID, CONF_PM_2_5, CONF_PM_10_0, CONF_TEMPERATURE, @@ -95,9 +94,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_CO2, var.set_co2_sensor) diff --git a/esphome/components/sml/__init__.py b/esphome/components/sml/__init__.py index 35ca231f023..587cb13662b 100644 --- a/esphome/components/sml/__init__.py +++ b/esphome/components/sml/__init__.py @@ -5,7 +5,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_ON_DATA +from esphome.const import CONF_ON_DATA from esphome.types import ConfigType CODEOWNERS = ["@alengwenus"] @@ -50,9 +50,7 @@ _CALLBACK_AUTOMATIONS = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS) diff --git a/esphome/components/smt100/sensor.py b/esphome/components/smt100/sensor.py index fba10eab9ae..115434ee9ac 100644 --- a/esphome/components/smt100/sensor.py +++ b/esphome/components/smt100/sensor.py @@ -4,7 +4,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_COUNTS, CONF_DIELECTRIC_CONSTANT, - CONF_ID, CONF_MOISTURE, CONF_PERMITTIVITY, CONF_TEMPERATURE, @@ -79,10 +78,8 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) cg.add_define("USE_LINE_READER") - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_COUNTS, var.set_counts_sensor) diff --git a/esphome/components/sun_gtil2/__init__.py b/esphome/components/sun_gtil2/__init__.py index 61643cf4883..b66f7075bea 100644 --- a/esphome/components/sun_gtil2/__init__.py +++ b/esphome/components/sun_gtil2/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@Mat931"] @@ -27,6 +26,4 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/systa_bus/__init__.py b/esphome/components/systa_bus/__init__.py index ae44017112b..ee193c4d3a2 100644 --- a/esphome/components/systa_bus/__init__.py +++ b/esphome/components/systa_bus/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.cpp_generator import MockObj from esphome.types import ConfigType @@ -39,6 +38,4 @@ async def register_systa_bus_listener(systa_bus: MockObj, var: MockObj) -> None: async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/t6615/sensor.py b/esphome/components/t6615/sensor.py index 4b055516e79..42223b373ab 100644 --- a/esphome/components/t6615/sensor.py +++ b/esphome/components/t6615/sensor.py @@ -3,7 +3,6 @@ from esphome.components import sensor, uart import esphome.config_validation as cv from esphome.const import ( CONF_CO2, - CONF_ID, DEVICE_CLASS_CARBON_DIOXIDE, STATE_CLASS_MEASUREMENT, UNIT_PARTS_PER_MILLION, @@ -44,9 +43,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_CO2, var.set_co2_sensor) diff --git a/esphome/components/teleinfo/__init__.py b/esphome/components/teleinfo/__init__.py index 5a6a01f6695..1353b6a912f 100644 --- a/esphome/components/teleinfo/__init__.py +++ b/esphome/components/teleinfo/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@0hax", "@FredM67"] @@ -53,6 +52,4 @@ FINAL_VALIDATE_SCHEMA = _final_validate async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID], config[CONF_HISTORICAL_MODE]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config, config[CONF_HISTORICAL_MODE]) diff --git a/esphome/components/tmc22xx/__init__.py b/esphome/components/tmc22xx/__init__.py index ce06cb82e3c..a3ac518d8eb 100644 --- a/esphome/components/tmc22xx/__init__.py +++ b/esphome/components/tmc22xx/__init__.py @@ -162,9 +162,7 @@ def final_validate(config: ConfigType) -> ConfigType: async def new_tmc22xx(config: ConfigType) -> cg.Pvariable: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) await stepper.register_stepper(var, config) cg.add(var.set_address(config[CONF_ADDRESS])) diff --git a/esphome/components/tuya/__init__.py b/esphome/components/tuya/__init__.py index c05db51cdf9..51db405512c 100644 --- a/esphome/components/tuya/__init__.py +++ b/esphome/components/tuya/__init__.py @@ -2,7 +2,7 @@ from esphome import automation, pins import esphome.codegen as cg from esphome.components import time, uart import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_SENSOR_DATAPOINT, CONF_TIME_ID +from esphome.const import CONF_SENSOR_DATAPOINT, CONF_TIME_ID from esphome.cpp_generator import MockObj from esphome.types import ConfigType @@ -83,9 +83,7 @@ CONFIG_SCHEMA = cv.All( async def to_code(config): - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) if (time_id := config.get(CONF_TIME_ID)) is not None: time_ = await cg.get_variable(time_id) cg.add(var.set_time_id(time_)) diff --git a/esphome/components/uart_tcp/__init__.py b/esphome/components/uart_tcp/__init__.py index c7eba4a26a5..4a69029e6f7 100644 --- a/esphome/components/uart_tcp/__init__.py +++ b/esphome/components/uart_tcp/__init__.py @@ -116,9 +116,7 @@ FINAL_VALIDATE_SCHEMA = _final_validate async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) if config[CONF_ROLE] == "server": socket.require_tcp_listener() cg.add(var.set_server(True)) diff --git a/esphome/components/ufm01/__init__.py b/esphome/components/ufm01/__init__.py index 1846958e591..ced3e3d0af5 100644 --- a/esphome/components/ufm01/__init__.py +++ b/esphome/components/ufm01/__init__.py @@ -66,9 +66,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) if _get_data().clear_action_used: cg.add_define("USE_UFM01_CLEAR_ACCUMULATED_FLOW_ACTION") diff --git a/esphome/components/uponor_smatrix/__init__.py b/esphome/components/uponor_smatrix/__init__.py index 5dc32259ea2..e23f4157a7e 100644 --- a/esphome/components/uponor_smatrix/__init__.py +++ b/esphome/components/uponor_smatrix/__init__.py @@ -1,7 +1,7 @@ import esphome.codegen as cg from esphome.components import time, uart import esphome.config_validation as cv -from esphome.const import CONF_ADDRESS, CONF_ID, CONF_TIME_ID +from esphome.const import CONF_ADDRESS, CONF_TIME_ID from esphome.cpp_generator import MockObj from esphome.types import ConfigType @@ -66,9 +66,7 @@ UPONOR_SMATRIX_DEVICE_SCHEMA = cv.Schema( async def to_code(config: ConfigType) -> None: cg.add_global(uponor_smatrix_ns.using) - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + var = await uart.new_uart_component(config) if time_id := config.get(CONF_TIME_ID): time_ = await cg.get_variable(time_id) diff --git a/esphome/components/vbus/__init__.py b/esphome/components/vbus/__init__.py index 533acfbbb92..92709915ad4 100644 --- a/esphome/components/vbus/__init__.py +++ b/esphome/components/vbus/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import uart import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@ssieb"] @@ -40,6 +39,4 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) diff --git a/esphome/components/zwave_proxy/__init__.py b/esphome/components/zwave_proxy/__init__.py index e451fe79f4d..7ed4ec4b59e 100644 --- a/esphome/components/zwave_proxy/__init__.py +++ b/esphome/components/zwave_proxy/__init__.py @@ -2,7 +2,7 @@ import esphome.codegen as cg from esphome.components import uart from esphome.components.wifi import DOMAIN as WIFI_DOMAIN import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_POWER_SAVE_MODE, CONF_WIFI +from esphome.const import CONF_POWER_SAVE_MODE, CONF_WIFI import esphome.final_validate as fv from esphome.types import ConfigType @@ -38,7 +38,5 @@ FINAL_VALIDATE_SCHEMA = final_validate async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await uart.register_uart_device(var, config) + await uart.new_uart_component(config) cg.add_define("USE_ZWAVE_PROXY")