From d08c845c65cef5fbb7e1367a22df917fab2f8c0c Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 17 Oct 2026 06:36:49 -1000 Subject: [PATCH] [components] Create I2C devices with new_i2c_component (#20909) --- esphome/components/ade7880/sensor.py | 4 +--- esphome/components/ads1115/__init__.py | 5 +---- esphome/components/ags10/sensor.py | 5 +---- esphome/components/aht10/sensor.py | 5 +---- esphome/components/aic3204/audio_dac.py | 6 ++---- esphome/components/am2315c/sensor.py | 5 +---- esphome/components/am2320/sensor.py | 5 +---- esphome/components/apds9930/sensor.py | 5 +---- esphome/components/apds9960/__init__.py | 5 +---- esphome/components/as5600/__init__.py | 5 +---- esphome/components/as7341/sensor.py | 5 +---- esphome/components/as734x/__init__.py | 5 +---- esphome/components/at581x/__init__.py | 4 +--- esphome/components/bh1745/__init__.py | 5 +---- esphome/components/bm8563/time.py | 6 ++---- esphome/components/bme680/sensor.py | 5 +---- esphome/components/bme680_bsec/__init__.py | 4 +--- esphome/components/bmi160/sensor.py | 5 +---- esphome/components/bmp085/sensor.py | 5 +---- esphome/components/bq25186/__init__.py | 4 +--- esphome/components/bq27220/sensor.py | 5 +---- esphome/components/bq76972/__init__.py | 5 +---- esphome/components/ccs811/sensor.py | 5 +---- esphome/components/dht12/sensor.py | 5 +---- esphome/components/dps310/sensor.py | 5 +---- esphome/components/ds248x/__init__.py | 6 ++---- esphome/components/ds3231/__init__.py | 5 +---- esphome/components/ee895/sensor.py | 5 +---- esphome/components/emc2101/__init__.py | 6 ++---- esphome/components/ens210/sensor.py | 5 +---- esphome/components/es7210/audio_adc.py | 6 ++---- esphome/components/es7243e/audio_adc.py | 6 ++---- esphome/components/es8156/audio_dac.py | 4 +--- esphome/components/es8311/audio_dac.py | 6 ++---- esphome/components/es8388/audio_dac.py | 5 +---- esphome/components/es9038q2m_katana/audio_dac.py | 6 ++---- esphome/components/ezo_pmp/__init__.py | 4 +--- esphome/components/fusb302b/__init__.py | 5 +---- esphome/components/gdk101/__init__.py | 5 +---- esphome/components/gp8403/__init__.py | 6 ++---- esphome/components/grove_gas_mc_v2/sensor.py | 5 +---- esphome/components/grove_tb6612fng/__init__.py | 4 +--- esphome/components/hdc1080/sensor.py | 5 +---- esphome/components/hdc2010/sensor.py | 5 +---- esphome/components/hdc2080/sensor.py | 5 +---- esphome/components/hdc302x/sensor.py | 5 +---- esphome/components/hm3301/sensor.py | 5 +---- esphome/components/hmc5883l/sensor.py | 5 +---- esphome/components/honeywell_hih_i2c/sensor.py | 5 +---- esphome/components/honeywellabp2_i2c/sensor.py | 5 +---- esphome/components/hte501/sensor.py | 5 +---- esphome/components/htu21d/sensor.py | 5 +---- esphome/components/htu31d/sensor.py | 5 +---- esphome/components/husb238/__init__.py | 5 +---- esphome/components/hyt271/sensor.py | 5 +---- esphome/components/i2c_device/__init__.py | 4 +--- esphome/components/ina219/sensor.py | 5 +---- esphome/components/ina226/sensor.py | 5 +---- esphome/components/ina3221/sensor.py | 5 +---- esphome/components/kmeteriso/sensor.py | 5 +---- esphome/components/lc709203f/sensor.py | 5 +---- esphome/components/lp5562/__init__.py | 5 +---- esphome/components/lps22/sensor.py | 5 +---- esphome/components/ltr390/sensor.py | 5 +---- esphome/components/ltr501/sensor.py | 5 +---- esphome/components/ltr_als_ps/sensor.py | 5 +---- esphome/components/m5stack_8angle/__init__.py | 5 +---- esphome/components/max17043/sensor.py | 4 +--- esphome/components/max17048/sensor.py | 5 +---- esphome/components/max44009/sensor.py | 5 +---- esphome/components/max6956/__init__.py | 4 +--- esphome/components/max9611/sensor.py | 5 +---- esphome/components/mcp23016/__init__.py | 4 +--- esphome/components/mcp4461/__init__.py | 7 ++----- esphome/components/mcp4725/output.py | 4 +--- esphome/components/mcp4728/__init__.py | 5 +---- esphome/components/mcp47a1/output.py | 4 +--- esphome/components/mics_4514/sensor.py | 5 +---- esphome/components/mlx90393/sensor.py | 5 +---- esphome/components/mlx90614/sensor.py | 5 +---- esphome/components/mmc5603/sensor.py | 5 +---- esphome/components/mmc5983/sensor.py | 5 +---- esphome/components/mpl3115a2/sensor.py | 5 +---- esphome/components/mpu6050/sensor.py | 5 +---- esphome/components/mpu6886/sensor.py | 5 +---- esphome/components/ms5611/sensor.py | 5 +---- esphome/components/ms8607/sensor.py | 5 +---- esphome/components/msa3xx/__init__.py | 5 +---- esphome/components/nau7802/sensor.py | 4 +--- esphome/components/npi19/sensor.py | 5 +---- esphome/components/pca6416a/__init__.py | 4 +--- esphome/components/pca9505/__init__.py | 4 +--- esphome/components/pcf8574/__init__.py | 4 +--- esphome/components/pcm5122/audio_dac.py | 4 +--- esphome/components/pi4ioe5v6408/__init__.py | 4 +--- esphome/components/pm2005/sensor.py | 5 +---- esphome/components/pmsa003i/sensor.py | 5 +---- esphome/components/pmwcs3/sensor.py | 5 +---- esphome/components/qmc5883l/sensor.py | 5 +---- esphome/components/qmp6988/sensor.py | 5 +---- esphome/components/rx8111/time.py | 5 +---- esphome/components/rx8130/time.py | 5 +---- esphome/components/scd30/sensor.py | 5 +---- esphome/components/scd4x/sensor.py | 4 +--- esphome/components/sen5x/sensor.py | 4 +--- esphome/components/sen6x/sensor.py | 4 +--- esphome/components/sfa30/sensor.py | 5 +---- esphome/components/sfa40/sensor.py | 4 +--- esphome/components/sgp30/sensor.py | 5 +---- esphome/components/sgp4x/sensor.py | 5 +---- esphome/components/sht3xd/sensor.py | 5 +---- esphome/components/sht4x/sensor.py | 5 +---- esphome/components/shtcx/sensor.py | 5 +---- esphome/components/sps30/sensor.py | 4 +--- esphome/components/stcc4/sensor.py | 5 +---- esphome/components/sx1509/__init__.py | 4 +--- esphome/components/sy6970/__init__.py | 7 ++----- esphome/components/tas2780/audio_dac.py | 6 ++---- esphome/components/tas58xx/audio_dac.py | 4 +--- esphome/components/tca8418/__init__.py | 6 ++---- esphome/components/tca9548a/__init__.py | 4 +--- esphome/components/tca9555/__init__.py | 4 +--- esphome/components/tcs34725/sensor.py | 5 +---- esphome/components/tem3200/sensor.py | 5 +---- esphome/components/tfluna/__init__.py | 5 +---- esphome/components/tlc59208f/__init__.py | 5 +---- esphome/components/tsl2591/sensor.py | 5 +---- esphome/components/ttp229_lsf/__init__.py | 5 +---- esphome/components/veml7700/sensor.py | 5 +---- esphome/components/waveshare_io_ch32v003/__init__.py | 4 +--- esphome/components/xdb401/sensor.py | 5 +---- esphome/components/xgzp68xx/sensor.py | 5 +---- esphome/components/xl9535/__init__.py | 4 +--- tests/unit_tests/components/test_pcf8574.py | 4 +--- 134 files changed, 147 insertions(+), 507 deletions(-) diff --git a/esphome/components/ade7880/sensor.py b/esphome/components/ade7880/sensor.py index 93c279e2359..541d37603e1 100644 --- a/esphome/components/ade7880/sensor.py +++ b/esphome/components/ade7880/sensor.py @@ -282,9 +282,7 @@ async def power_channel(config: ConfigType) -> MockObj: async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if irq0_pin := config.get(CONF_IRQ0_PIN): pin = await cg.gpio_pin_expression(irq0_pin) diff --git a/esphome/components/ads1115/__init__.py b/esphome/components/ads1115/__init__.py index 1b8405322fa..7358c88db7c 100644 --- a/esphome/components/ads1115/__init__.py +++ b/esphome/components/ads1115/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType DEPENDENCIES = ["i2c"] @@ -27,8 +26,6 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_continuous_mode(config[CONF_CONTINUOUS_MODE])) diff --git a/esphome/components/ags10/sensor.py b/esphome/components/ags10/sensor.py index 8fd18671f81..407245407a2 100644 --- a/esphome/components/ags10/sensor.py +++ b/esphome/components/ags10/sensor.py @@ -4,7 +4,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_ADDRESS, - CONF_ID, CONF_MODE, CONF_TVOC, CONF_VALUE, @@ -58,9 +57,7 @@ FINAL_VALIDATE_SCHEMA = i2c.final_validate_device_schema("ags10", max_frequency= async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TVOC, var.set_tvoc) diff --git a/esphome/components/aht10/sensor.py b/esphome/components/aht10/sensor.py index 974e7d4df4c..6065d702bde 100644 --- a/esphome/components/aht10/sensor.py +++ b/esphome/components/aht10/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, CONF_VARIANT, DEVICE_CLASS_HUMIDITY, @@ -49,9 +48,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_variant(config[CONF_VARIANT])) sensors = sensor.sub_sensors(config) diff --git a/esphome/components/aic3204/audio_dac.py b/esphome/components/aic3204/audio_dac.py index b4942fe3908..52cd24b2021 100644 --- a/esphome/components/aic3204/audio_dac.py +++ b/esphome/components/aic3204/audio_dac.py @@ -3,7 +3,7 @@ import esphome.codegen as cg from esphome.components import i2c from esphome.components.audio_dac import AudioDac import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_MODE +from esphome.const import CONF_MODE from esphome.types import ConfigType CODEOWNERS = ["@kbx81"] @@ -41,6 +41,4 @@ 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 i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/am2315c/sensor.py b/esphome/components/am2315c/sensor.py index 39ded956c3f..9e9da3a34ce 100644 --- a/esphome/components/am2315c/sensor.py +++ b/esphome/components/am2315c/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -42,9 +41,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/am2320/sensor.py b/esphome/components/am2320/sensor.py index 30a1b1d8a34..b70ac70e6b2 100644 --- a/esphome/components/am2320/sensor.py +++ b/esphome/components/am2320/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -44,9 +43,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/apds9930/sensor.py b/esphome/components/apds9930/sensor.py index 2b169271c68..9895985438d 100644 --- a/esphome/components/apds9930/sensor.py +++ b/esphome/components/apds9930/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor from esphome.components.const import UNIT_COUNTS import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_ILLUMINANCE, DEVICE_CLASS_ILLUMINANCE, STATE_CLASS_MEASUREMENT, @@ -59,9 +58,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_led_drive(config[CONF_LED_DRIVE])) cg.add(var.set_proximity_gain(config[CONF_PROXIMITY_GAIN])) cg.add(var.set_ambient_gain(config[CONF_AMBIENT_LIGHT_GAIN])) diff --git a/esphome/components/apds9960/__init__.py b/esphome/components/apds9960/__init__.py index 8c19eec5ca1..e32984970f5 100644 --- a/esphome/components/apds9960/__init__.py +++ b/esphome/components/apds9960/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType DEPENDENCIES = ["i2c"] @@ -60,9 +59,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_led_drive(config[CONF_LED_DRIVE])) cg.add(var.set_proximity_gain(config[CONF_PROXIMITY_GAIN])) cg.add(var.set_ambient_gain(config[CONF_AMBIENT_LIGHT_GAIN])) diff --git a/esphome/components/as5600/__init__.py b/esphome/components/as5600/__init__.py index 3cc5ed5cc1a..d695e34235f 100644 --- a/esphome/components/as5600/__init__.py +++ b/esphome/components/as5600/__init__.py @@ -9,7 +9,6 @@ from esphome.const import ( CONF_DIR_PIN, CONF_DIRECTION, CONF_HYSTERESIS, - CONF_ID, CONF_POWER_MODE, CONF_RANGE, CONF_WATCHDOG, @@ -209,9 +208,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_direction(config[CONF_DIRECTION])) cg.add(var.set_watchdog(config[CONF_WATCHDOG])) diff --git a/esphome/components/as7341/sensor.py b/esphome/components/as7341/sensor.py index 3afab8422f9..65307def3d0 100644 --- a/esphome/components/as7341/sensor.py +++ b/esphome/components/as7341/sensor.py @@ -5,7 +5,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_CLEAR, CONF_GAIN, - CONF_ID, DEVICE_CLASS_EMPTY, ICON_BRIGHTNESS_5, STATE_CLASS_MEASUREMENT, @@ -97,9 +96,7 @@ SENSORS = { async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_gain(config[CONF_GAIN])) cg.add(var.set_atime(config[CONF_ATIME])) diff --git a/esphome/components/as734x/__init__.py b/esphome/components/as734x/__init__.py index 61eeaa5a35b..dc45ddd1308 100644 --- a/esphome/components/as734x/__init__.py +++ b/esphome/components/as734x/__init__.py @@ -5,7 +5,6 @@ from esphome.const import ( CONF_CALIBRATION, CONF_GAIN, CONF_GLASS_ATTENUATION_FACTOR, - CONF_ID, CONF_TYPE, CONF_UPDATE_INTERVAL, ) @@ -166,9 +165,7 @@ def _per_band( async def to_code(config: ConfigType) -> None: chip = config[CONF_TYPE] cg.add_define("USE_AS7341" if chip == "AS7341" else "USE_AS7343") - var = cg.new_Pvariable(config[CONF_ID], cg.RawExpression(f"&as734x::{chip}_CHIP")) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config, cg.RawExpression(f"&as734x::{chip}_CHIP")) cg.add(var.set_gain(config[CONF_GAIN])) cg.add(var.set_atime(config[CONF_ATIME])) cg.add(var.set_astep(config[CONF_ASTEP])) diff --git a/esphome/components/at581x/__init__.py b/esphome/components/at581x/__init__.py index fd1a8002921..2ba284bd223 100644 --- a/esphome/components/at581x/__init__.py +++ b/esphome/components/at581x/__init__.py @@ -73,9 +73,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 i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) # Actions diff --git a/esphome/components/bh1745/__init__.py b/esphome/components/bh1745/__init__.py index a922340df71..daba7af4753 100644 --- a/esphome/components/bh1745/__init__.py +++ b/esphome/components/bh1745/__init__.py @@ -6,7 +6,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_GAIN, CONF_GLASS_ATTENUATION_FACTOR, - CONF_ID, CONF_INTEGRATION_TIME, ) from esphome.types import ConfigType @@ -62,9 +61,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_adc_gain(config[CONF_GAIN])) cg.add(var.set_measurement_time(config[CONF_INTEGRATION_TIME])) diff --git a/esphome/components/bm8563/time.py b/esphome/components/bm8563/time.py index c28976eb872..6bbacf307a2 100644 --- a/esphome/components/bm8563/time.py +++ b/esphome/components/bm8563/time.py @@ -2,7 +2,7 @@ from esphome import automation import esphome.codegen as cg from esphome.components import i2c, time import esphome.config_validation as cv -from esphome.const import CONF_DURATION, CONF_ID +from esphome.const import CONF_DURATION from esphome.types import ConfigType DEPENDENCIES = ["i2c"] @@ -50,7 +50,5 @@ 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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) await time.register_time(var, config) diff --git a/esphome/components/bme680/sensor.py b/esphome/components/bme680/sensor.py index 73f48526be6..8883659e979 100644 --- a/esphome/components/bme680/sensor.py +++ b/esphome/components/bme680/sensor.py @@ -7,7 +7,6 @@ from esphome.const import ( CONF_GAS_RESISTANCE, CONF_HEATER, CONF_HUMIDITY, - CONF_ID, CONF_IIR_FILTER, CONF_OVERSAMPLING, CONF_PRESSURE, @@ -115,9 +114,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) if await sensors(CONF_TEMPERATURE, var.set_temperature_sensor): diff --git a/esphome/components/bme680_bsec/__init__.py b/esphome/components/bme680_bsec/__init__.py index 55fd1c975f5..1562b4f33b4 100644 --- a/esphome/components/bme680_bsec/__init__.py +++ b/esphome/components/bme680_bsec/__init__.py @@ -73,9 +73,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_device_id(str(config[CONF_ID]))) cg.add(var.set_temperature_offset(config[CONF_TEMPERATURE_OFFSET])) diff --git a/esphome/components/bmi160/sensor.py b/esphome/components/bmi160/sensor.py index 9ad1b19fa0e..845a37e91f5 100644 --- a/esphome/components/bmi160/sensor.py +++ b/esphome/components/bmi160/sensor.py @@ -8,7 +8,6 @@ from esphome.const import ( CONF_GYROSCOPE_X, CONF_GYROSCOPE_Y, CONF_GYROSCOPE_Z, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_TEMPERATURE, ICON_ACCELERATION_X, @@ -84,9 +83,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_ACCELERATION_X, var.set_accel_x_sensor) diff --git a/esphome/components/bmp085/sensor.py b/esphome/components/bmp085/sensor.py index 5eb8dae7314..898faff8531 100644 --- a/esphome/components/bmp085/sensor.py +++ b/esphome/components/bmp085/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PRESSURE, CONF_TEMPERATURE, DEVICE_CLASS_PRESSURE, @@ -44,9 +43,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature) diff --git a/esphome/components/bq25186/__init__.py b/esphome/components/bq25186/__init__.py index 03a100d9297..26799b8ce51 100644 --- a/esphome/components/bq25186/__init__.py +++ b/esphome/components/bq25186/__init__.py @@ -338,9 +338,7 @@ CONFIGURE_ACTION_SCHEMA = automation.maybe_simple_id( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if config[CONF_CONFIGURE_ON_BOOT]: cg.add(var.set_setup_registers(cg.ArrayInitializer(*pack_registers(config)))) diff --git a/esphome/components/bq27220/sensor.py b/esphome/components/bq27220/sensor.py index a3fcec22432..418632b2c67 100644 --- a/esphome/components/bq27220/sensor.py +++ b/esphome/components/bq27220/sensor.py @@ -5,7 +5,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_BATTERY_LEVEL, CONF_CURRENT, - CONF_ID, CONF_TEMPERATURE, CONF_VOLTAGE, DEVICE_CLASS_BATTERY, @@ -108,9 +107,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_VOLTAGE, var.set_voltage_sensor) diff --git a/esphome/components/bq76972/__init__.py b/esphome/components/bq76972/__init__.py index 5ccf043c250..672d6428d26 100644 --- a/esphome/components/bq76972/__init__.py +++ b/esphome/components/bq76972/__init__.py @@ -4,7 +4,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_ADDRESS, - CONF_ID, DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_VOLTAGE, STATE_CLASS_MEASUREMENT, @@ -75,9 +74,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_crc_mode(config[CONF_CRC_ENABLED])) cg.add(var.set_reg_disable(config[CONF_REG_DISABLED])) diff --git a/esphome/components/ccs811/sensor.py b/esphome/components/ccs811/sensor.py index 95e51c825a8..80948a6b433 100644 --- a/esphome/components/ccs811/sensor.py +++ b/esphome/components/ccs811/sensor.py @@ -5,7 +5,6 @@ from esphome.const import ( CONF_BASELINE, CONF_ECO2, CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, CONF_TVOC, CONF_VERSION, @@ -61,9 +60,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_ECO2, var.set_co2) diff --git a/esphome/components/dht12/sensor.py b/esphome/components/dht12/sensor.py index 88877b2dc26..677b158633a 100644 --- a/esphome/components/dht12/sensor.py +++ b/esphome/components/dht12/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -42,9 +41,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/dps310/sensor.py b/esphome/components/dps310/sensor.py index e3827b484c4..7d6ab7b66c2 100644 --- a/esphome/components/dps310/sensor.py +++ b/esphome/components/dps310/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PRESSURE, CONF_TEMPERATURE, DEVICE_CLASS_PRESSURE, @@ -50,9 +49,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/ds248x/__init__.py b/esphome/components/ds248x/__init__.py index 3a2cb34747a..02faa806f7a 100644 --- a/esphome/components/ds248x/__init__.py +++ b/esphome/components/ds248x/__init__.py @@ -2,7 +2,7 @@ from esphome import pins import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_SLEEP_PIN, CONF_TYPE +from esphome.const import CONF_SLEEP_PIN, CONF_TYPE from esphome.types import ConfigType CODEOWNERS = ["@tomwellnitz"] @@ -86,9 +86,7 @@ def get_channel_count(config: ConfigType) -> int: async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_active_pullup(config[CONF_ACTIVE_PULLUP])) cg.add(var.set_channel_count(get_channel_count(config))) diff --git a/esphome/components/ds3231/__init__.py b/esphome/components/ds3231/__init__.py index 262c951e80f..b3e496a883c 100644 --- a/esphome/components/ds3231/__init__.py +++ b/esphome/components/ds3231/__init__.py @@ -2,7 +2,6 @@ from esphome import automation import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@linkedupbits"] @@ -23,9 +22,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) automation.register_apply_action( diff --git a/esphome/components/ee895/sensor.py b/esphome/components/ee895/sensor.py index a7110bd6d2e..fb0f8c59551 100644 --- a/esphome/components/ee895/sensor.py +++ b/esphome/components/ee895/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_CO2, - CONF_ID, CONF_PRESSURE, CONF_TEMPERATURE, DEVICE_CLASS_PRESSURE, @@ -53,9 +52,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/emc2101/__init__.py b/esphome/components/emc2101/__init__.py index 024ff3c8937..19661dbb584 100644 --- a/esphome/components/emc2101/__init__.py +++ b/esphome/components/emc2101/__init__.py @@ -2,7 +2,7 @@ import esphome.codegen as cg from esphome.components import i2c from esphome.components.const import CONF_CONVERSION_RATE import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_INVERTED, CONF_RESOLUTION +from esphome.const import CONF_INVERTED, CONF_RESOLUTION from esphome.types import ConfigType CODEOWNERS = ["@ellull"] @@ -71,9 +71,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if pwm_config := config.get(CONF_PWM): cg.add(var.set_dac_mode(False)) diff --git a/esphome/components/ens210/sensor.py b/esphome/components/ens210/sensor.py index cb49986f7c5..a390b24eccb 100644 --- a/esphome/components/ens210/sensor.py +++ b/esphome/components/ens210/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -46,9 +45,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/es7210/audio_adc.py b/esphome/components/es7210/audio_adc.py index c2dd40b3e86..09f575629d6 100644 --- a/esphome/components/es7210/audio_adc.py +++ b/esphome/components/es7210/audio_adc.py @@ -3,7 +3,7 @@ from esphome.components import esp32, i2c from esphome.components.audio_adc import AudioAdc from esphome.components.esp32.const import VARIANT_ESP32, VARIANT_ESP32S2 import esphome.config_validation as cv -from esphome.const import CONF_BITS_PER_SAMPLE, CONF_ID, CONF_MIC_GAIN, CONF_SAMPLE_RATE +from esphome.const import CONF_BITS_PER_SAMPLE, CONF_MIC_GAIN, CONF_SAMPLE_RATE from esphome.core import CORE from esphome.types import ConfigType @@ -66,9 +66,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_bits_per_sample(config[CONF_BITS_PER_SAMPLE])) if channel_gains := config.get(CONF_CHANNEL_GAINS): diff --git a/esphome/components/es7243e/audio_adc.py b/esphome/components/es7243e/audio_adc.py index 49161339822..c354ffcc6fb 100644 --- a/esphome/components/es7243e/audio_adc.py +++ b/esphome/components/es7243e/audio_adc.py @@ -2,7 +2,7 @@ import esphome.codegen as cg from esphome.components import i2c from esphome.components.audio_adc import AudioAdc import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_MIC_GAIN +from esphome.const import CONF_MIC_GAIN from esphome.types import ConfigType CODEOWNERS = ["@kbx81"] @@ -28,8 +28,6 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_mic_gain(config[CONF_MIC_GAIN])) diff --git a/esphome/components/es8156/audio_dac.py b/esphome/components/es8156/audio_dac.py index ebba75e70dd..e00f67571e6 100644 --- a/esphome/components/es8156/audio_dac.py +++ b/esphome/components/es8156/audio_dac.py @@ -48,6 +48,4 @@ 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 i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/es8311/audio_dac.py b/esphome/components/es8311/audio_dac.py index 036ee93bd3e..785c91fe1c8 100644 --- a/esphome/components/es8311/audio_dac.py +++ b/esphome/components/es8311/audio_dac.py @@ -2,7 +2,7 @@ import esphome.codegen as cg from esphome.components import i2c from esphome.components.audio_dac import AudioDac import esphome.config_validation as cv -from esphome.const import CONF_BITS_PER_SAMPLE, CONF_ID, CONF_MIC_GAIN, CONF_SAMPLE_RATE +from esphome.const import CONF_BITS_PER_SAMPLE, CONF_MIC_GAIN, CONF_SAMPLE_RATE from esphome.types import ConfigType CODEOWNERS = ["@kroimon", "@kahrendt"] @@ -58,9 +58,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_bits_per_sample(config[CONF_BITS_PER_SAMPLE])) cg.add(var.set_mic_gain(config[CONF_MIC_GAIN])) diff --git a/esphome/components/es8388/audio_dac.py b/esphome/components/es8388/audio_dac.py index 2616cbfa536..ac1cc9f8177 100644 --- a/esphome/components/es8388/audio_dac.py +++ b/esphome/components/es8388/audio_dac.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c from esphome.components.audio_dac import AudioDac import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@P4uLT"] @@ -22,6 +21,4 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/es9038q2m_katana/audio_dac.py b/esphome/components/es9038q2m_katana/audio_dac.py index 0568e5e202a..5f2a5ab557e 100644 --- a/esphome/components/es9038q2m_katana/audio_dac.py +++ b/esphome/components/es9038q2m_katana/audio_dac.py @@ -1,7 +1,7 @@ import esphome.codegen as cg from esphome.components import audio_dac, i2c import esphome.config_validation as cv -from esphome.const import CONF_BITS_PER_SAMPLE, CONF_ID, CONF_SAMPLE_RATE +from esphome.const import CONF_BITS_PER_SAMPLE, CONF_SAMPLE_RATE from esphome.types import ConfigType CONF_DEEMPHASIS = "deemphasis" @@ -73,9 +73,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_filter_shape(config[CONF_FILTER_SHAPE])) cg.add( diff --git a/esphome/components/ezo_pmp/__init__.py b/esphome/components/ezo_pmp/__init__.py index aed071e8cf5..9d2c90529c0 100644 --- a/esphome/components/ezo_pmp/__init__.py +++ b/esphome/components/ezo_pmp/__init__.py @@ -34,9 +34,7 @@ CONFIG_SCHEMA = ( 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) + await i2c.new_i2c_component(config) EZO_PMP_NO_ARGS_ACTION_SCHEMA = maybe_simple_id( diff --git a/esphome/components/fusb302b/__init__.py b/esphome/components/fusb302b/__init__.py index c9dd24463b4..26bf49b28e3 100644 --- a/esphome/components/fusb302b/__init__.py +++ b/esphome/components/fusb302b/__init__.py @@ -4,7 +4,6 @@ from esphome.components import i2c, sensor, text_sensor import esphome.config_validation as cv from esphome.const import ( CONF_CURRENT, - CONF_ID, CONF_INTERRUPT_PIN, CONF_ON_CONNECT, CONF_ON_DISCONNECT, @@ -99,9 +98,7 @@ _CALLBACK_AUTOMATIONS = ( async def to_code(config: ConfigType) -> None: interrupt_pin = await cg.gpio_pin_expression(config[CONF_INTERRUPT_PIN]) - var = cg.new_Pvariable(config[CONF_ID], interrupt_pin) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config, interrupt_pin) cg.add(var.set_request_voltage(config[CONF_REQUEST_VOLTAGE])) sensors = sensor.sub_sensors(config) diff --git a/esphome/components/gdk101/__init__.py b/esphome/components/gdk101/__init__.py index e0ede6136dc..4463da8e685 100644 --- a/esphome/components/gdk101/__init__.py +++ b/esphome/components/gdk101/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@Szewcson"] @@ -29,6 +28,4 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/gp8403/__init__.py b/esphome/components/gp8403/__init__.py index 59bab37d255..d19228fea74 100644 --- a/esphome/components/gp8403/__init__.py +++ b/esphome/components/gp8403/__init__.py @@ -1,7 +1,7 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_MODEL, CONF_VOLTAGE +from esphome.const import CONF_MODEL, CONF_VOLTAGE from esphome.types import ConfigType CODEOWNERS = ["@jesserockz", "@sebydocky"] @@ -35,8 +35,6 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_model(config[CONF_MODEL])) cg.add(var.set_voltage(config[CONF_VOLTAGE])) diff --git a/esphome/components/grove_gas_mc_v2/sensor.py b/esphome/components/grove_gas_mc_v2/sensor.py index da687c4cd34..3378d94bf41 100644 --- a/esphome/components/grove_gas_mc_v2/sensor.py +++ b/esphome/components/grove_gas_mc_v2/sensor.py @@ -4,7 +4,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_CARBON_MONOXIDE, CONF_ETHANOL, - CONF_ID, CONF_NITROGEN_DIOXIDE, CONF_TVOC, DEVICE_CLASS_CARBON_MONOXIDE, @@ -68,9 +67,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) for key in [CONF_TVOC, CONF_CARBON_MONOXIDE, CONF_NITROGEN_DIOXIDE, CONF_ETHANOL]: if sensor_config := config.get(key): diff --git a/esphome/components/grove_tb6612fng/__init__.py b/esphome/components/grove_tb6612fng/__init__.py index 0874613c5cf..501071f42b9 100644 --- a/esphome/components/grove_tb6612fng/__init__.py +++ b/esphome/components/grove_tb6612fng/__init__.py @@ -38,9 +38,7 @@ CONFIG_SCHEMA = ( 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) + await i2c.new_i2c_component(config) automation.register_apply_action( diff --git a/esphome/components/hdc1080/sensor.py b/esphome/components/hdc1080/sensor.py index c35488c96c3..4f5dc69a6c9 100644 --- a/esphome/components/hdc1080/sensor.py +++ b/esphome/components/hdc1080/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -44,9 +43,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature) diff --git a/esphome/components/hdc2010/sensor.py b/esphome/components/hdc2010/sensor.py index 9837b9af333..93b469d20d8 100644 --- a/esphome/components/hdc2010/sensor.py +++ b/esphome/components/hdc2010/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -44,9 +43,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/hdc2080/sensor.py b/esphome/components/hdc2080/sensor.py index 63625bbf948..3e511f6a880 100644 --- a/esphome/components/hdc2080/sensor.py +++ b/esphome/components/hdc2080/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -45,9 +44,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature) diff --git a/esphome/components/hdc302x/sensor.py b/esphome/components/hdc302x/sensor.py index 604730f971a..94239ce0310 100644 --- a/esphome/components/hdc302x/sensor.py +++ b/esphome/components/hdc302x/sensor.py @@ -8,7 +8,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_DURATION, CONF_HUMIDITY, - CONF_ID, CONF_POWER, CONF_POWER_MODE, CONF_TEMPERATURE, @@ -59,9 +58,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temp_sensor) diff --git a/esphome/components/hm3301/sensor.py b/esphome/components/hm3301/sensor.py index d5e15f7c620..a8eefa4865a 100644 --- a/esphome/components/hm3301/sensor.py +++ b/esphome/components/hm3301/sensor.py @@ -6,7 +6,6 @@ from esphome.components.aqi import AQI_CALCULATION_TYPE, CONF_CALCULATION_TYPE from esphome.components.const import CONF_AQI import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PM_1_0, CONF_PM_2_5, CONF_PM_10_0, @@ -89,9 +88,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_PM_1_0, var.set_pm_1_0_sensor) diff --git a/esphome/components/hmc5883l/sensor.py b/esphome/components/hmc5883l/sensor.py index 229d6c8b623..72d9148b62e 100644 --- a/esphome/components/hmc5883l/sensor.py +++ b/esphome/components/hmc5883l/sensor.py @@ -10,7 +10,6 @@ from esphome.const import ( CONF_FIELD_STRENGTH_Y, CONF_FIELD_STRENGTH_Z, CONF_HEADING, - CONF_ID, CONF_OVERSAMPLING, CONF_RANGE, CONF_UPDATE_INTERVAL, @@ -129,9 +128,7 @@ def auto_data_rate(config: ConfigType) -> MockObj: async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_oversampling(config[CONF_OVERSAMPLING])) cg.add(var.set_datarate(auto_data_rate(config))) diff --git a/esphome/components/honeywell_hih_i2c/sensor.py b/esphome/components/honeywell_hih_i2c/sensor.py index 8ab2cd16b8b..d06e19747f0 100644 --- a/esphome/components/honeywell_hih_i2c/sensor.py +++ b/esphome/components/honeywell_hih_i2c/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -44,9 +43,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/honeywellabp2_i2c/sensor.py b/esphome/components/honeywellabp2_i2c/sensor.py index 7f41fe21939..2d0f212d812 100644 --- a/esphome/components/honeywellabp2_i2c/sensor.py +++ b/esphome/components/honeywellabp2_i2c/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PRESSURE, CONF_TEMPERATURE, DEVICE_CLASS_PRESSURE, @@ -56,9 +55,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) if await sensors(CONF_PRESSURE, var.set_pressure_sensor): diff --git a/esphome/components/hte501/sensor.py b/esphome/components/hte501/sensor.py index 80d59862959..8218dc32cbc 100644 --- a/esphome/components/hte501/sensor.py +++ b/esphome/components/hte501/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -46,9 +45,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/htu21d/sensor.py b/esphome/components/htu21d/sensor.py index bde4b244b4a..6f8d95f63c8 100644 --- a/esphome/components/htu21d/sensor.py +++ b/esphome/components/htu21d/sensor.py @@ -5,7 +5,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_HEATER, CONF_HUMIDITY, - CONF_ID, CONF_LEVEL, CONF_MODEL, CONF_STATUS, @@ -61,9 +60,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature) diff --git a/esphome/components/htu31d/sensor.py b/esphome/components/htu31d/sensor.py index 41cc54686a4..5fed7143ed0 100644 --- a/esphome/components/htu31d/sensor.py +++ b/esphome/components/htu31d/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -44,9 +43,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature) diff --git a/esphome/components/husb238/__init__.py b/esphome/components/husb238/__init__.py index 92bf8c998ff..e0e4b576eb7 100644 --- a/esphome/components/husb238/__init__.py +++ b/esphome/components/husb238/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@latonita"] @@ -28,6 +27,4 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/hyt271/sensor.py b/esphome/components/hyt271/sensor.py index 1fe5d9e14aa..1f13d16bfbc 100644 --- a/esphome/components/hyt271/sensor.py +++ b/esphome/components/hyt271/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -44,9 +43,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature) diff --git a/esphome/components/i2c_device/__init__.py b/esphome/components/i2c_device/__init__.py index a118cb3f172..a79b158b2fb 100644 --- a/esphome/components/i2c_device/__init__.py +++ b/esphome/components/i2c_device/__init__.py @@ -23,6 +23,4 @@ CONFIG_SCHEMA = cv.Schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/ina219/sensor.py b/esphome/components/ina219/sensor.py index 0a81adc785e..98246b2a819 100644 --- a/esphome/components/ina219/sensor.py +++ b/esphome/components/ina219/sensor.py @@ -4,7 +4,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_BUS_VOLTAGE, CONF_CURRENT, - CONF_ID, CONF_MAX_CURRENT, CONF_MAX_VOLTAGE, CONF_POWER, @@ -72,9 +71,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_shunt_resistance_ohm(config[CONF_SHUNT_RESISTANCE])) cg.add(var.set_max_current_a(config[CONF_MAX_CURRENT])) diff --git a/esphome/components/ina226/sensor.py b/esphome/components/ina226/sensor.py index 53427fc63e1..40e2e41ffed 100644 --- a/esphome/components/ina226/sensor.py +++ b/esphome/components/ina226/sensor.py @@ -7,7 +7,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_BUS_VOLTAGE, CONF_CURRENT, - CONF_ID, CONF_MAX_CURRENT, CONF_POWER, CONF_SHUNT_RESISTANCE, @@ -115,9 +114,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_shunt_resistance_ohm(config[CONF_SHUNT_RESISTANCE])) cg.add(var.set_max_current_a(config[CONF_MAX_CURRENT])) diff --git a/esphome/components/ina3221/sensor.py b/esphome/components/ina3221/sensor.py index e872b73b09f..69e66a3382d 100644 --- a/esphome/components/ina3221/sensor.py +++ b/esphome/components/ina3221/sensor.py @@ -7,7 +7,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_BUS_VOLTAGE, CONF_CURRENT, - CONF_ID, CONF_POWER, CONF_SHUNT_RESISTANCE, CONF_SHUNT_VOLTAGE, @@ -199,9 +198,7 @@ def alert_limit_register(current_a: float, shunt_ohm: float) -> int: async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) bus_us, shunt_us = adc_times_us(config) register = ( diff --git a/esphome/components/kmeteriso/sensor.py b/esphome/components/kmeteriso/sensor.py index 5b7087362f9..d0637d27873 100644 --- a/esphome/components/kmeteriso/sensor.py +++ b/esphome/components/kmeteriso/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_INTERNAL_TEMPERATURE, CONF_TEMPERATURE, DEVICE_CLASS_TEMPERATURE, @@ -44,9 +43,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/lc709203f/sensor.py b/esphome/components/lc709203f/sensor.py index 67e5942a43b..8ebb14d2ca7 100644 --- a/esphome/components/lc709203f/sensor.py +++ b/esphome/components/lc709203f/sensor.py @@ -5,7 +5,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_BATTERY_LEVEL, CONF_BATTERY_VOLTAGE, - CONF_ID, CONF_SIZE, CONF_TEMPERATURE, CONF_VOLTAGE, @@ -72,9 +71,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_pack_size(config.get(CONF_SIZE))) cg.add(var.set_pack_voltage(BATTERY_VOLTAGE_OPTIONS[config[CONF_VOLTAGE]])) diff --git a/esphome/components/lp5562/__init__.py b/esphome/components/lp5562/__init__.py index 4a5b77f36bb..f6c9956d70f 100644 --- a/esphome/components/lp5562/__init__.py +++ b/esphome/components/lp5562/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@DennisGaida"] @@ -27,8 +26,6 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if config[CONF_LOGARITHMIC_DIMMING]: cg.add(var.set_logarithmic_dimming(True)) diff --git a/esphome/components/lps22/sensor.py b/esphome/components/lps22/sensor.py index f219639eeea..8590ec5fbeb 100644 --- a/esphome/components/lps22/sensor.py +++ b/esphome/components/lps22/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PRESSURE, CONF_TEMPERATURE, DEVICE_CLASS_PRESSURE, @@ -46,9 +45,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/ltr390/sensor.py b/esphome/components/ltr390/sensor.py index 6c25729beec..69ee5020c48 100644 --- a/esphome/components/ltr390/sensor.py +++ b/esphome/components/ltr390/sensor.py @@ -5,7 +5,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_AMBIENT_LIGHT, CONF_GAIN, - CONF_ID, CONF_LIGHT, CONF_RESOLUTION, DEVICE_CLASS_EMPTY, @@ -119,9 +118,7 @@ TYPES = { async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_wfac_value(config[CONF_WINDOW_CORRECTION_FACTOR])) diff --git a/esphome/components/ltr501/sensor.py b/esphome/components/ltr501/sensor.py index 51378e4cddf..ca9416f924f 100644 --- a/esphome/components/ltr501/sensor.py +++ b/esphome/components/ltr501/sensor.py @@ -13,7 +13,6 @@ from esphome.const import ( CONF_FULL_SPECTRUM_COUNTS, CONF_GAIN, CONF_GLASS_ATTENUATION_FACTOR, - CONF_ID, CONF_INTEGRATION_TIME, CONF_NAME, CONF_REPEAT, @@ -225,9 +224,7 @@ _CALLBACK_AUTOMATIONS = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_AMBIENT_LIGHT, var.set_ambient_light_sensor) diff --git a/esphome/components/ltr_als_ps/sensor.py b/esphome/components/ltr_als_ps/sensor.py index 223528581e9..5ebaed1f249 100644 --- a/esphome/components/ltr_als_ps/sensor.py +++ b/esphome/components/ltr_als_ps/sensor.py @@ -13,7 +13,6 @@ from esphome.const import ( CONF_FULL_SPECTRUM_COUNTS, CONF_GAIN, CONF_GLASS_ATTENUATION_FACTOR, - CONF_ID, CONF_INTEGRATION_TIME, CONF_NAME, CONF_REPEAT, @@ -215,9 +214,7 @@ _CALLBACK_AUTOMATIONS = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_AMBIENT_LIGHT, var.set_ambient_light_sensor) diff --git a/esphome/components/m5stack_8angle/__init__.py b/esphome/components/m5stack_8angle/__init__.py index 96b9782e811..ef686174659 100644 --- a/esphome/components/m5stack_8angle/__init__.py +++ b/esphome/components/m5stack_8angle/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType DEPENDENCIES = ["i2c"] @@ -29,6 +28,4 @@ CONFIG_SCHEMA = cv.Schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/max17043/sensor.py b/esphome/components/max17043/sensor.py index 1b621057c67..4fdc6fda544 100644 --- a/esphome/components/max17043/sensor.py +++ b/esphome/components/max17043/sensor.py @@ -49,9 +49,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_BATTERY_VOLTAGE, var.set_voltage_sensor) diff --git a/esphome/components/max17048/sensor.py b/esphome/components/max17048/sensor.py index 30cd0ec59f0..40f676c9fe1 100644 --- a/esphome/components/max17048/sensor.py +++ b/esphome/components/max17048/sensor.py @@ -4,7 +4,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_BATTERY_LEVEL, CONF_BATTERY_VOLTAGE, - CONF_ID, CONF_RATE, DEVICE_CLASS_BATTERY, DEVICE_CLASS_VOLTAGE, @@ -56,9 +55,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_BATTERY_VOLTAGE, var.set_battery_voltage_sensor) diff --git a/esphome/components/max44009/sensor.py b/esphome/components/max44009/sensor.py index 09b480335ec..a74dc8242ac 100644 --- a/esphome/components/max44009/sensor.py +++ b/esphome/components/max44009/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_MODE, DEVICE_CLASS_ILLUMINANCE, STATE_CLASS_MEASUREMENT, @@ -44,9 +43,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) await sensor.register_sensor(var, config) cg.add(var.set_mode(config[CONF_MODE])) diff --git a/esphome/components/max6956/__init__.py b/esphome/components/max6956/__init__.py index b5d5041c968..6dd9dc0b09f 100644 --- a/esphome/components/max6956/__init__.py +++ b/esphome/components/max6956/__init__.py @@ -51,9 +51,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_brightness_mode(config[CONF_BRIGHTNESS_MODE])) cg.add(var.set_brightness_global(config[CONF_BRIGHTNESS_GLOBAL])) diff --git a/esphome/components/max9611/sensor.py b/esphome/components/max9611/sensor.py index e6309b21ccb..e1f705cdbab 100644 --- a/esphome/components/max9611/sensor.py +++ b/esphome/components/max9611/sensor.py @@ -4,7 +4,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_CURRENT, CONF_GAIN, - CONF_ID, CONF_POWER, CONF_SHUNT_RESISTANCE, CONF_TEMPERATURE, @@ -72,9 +71,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_current_resistor(config[CONF_SHUNT_RESISTANCE])) cg.add(var.set_gain(config[CONF_GAIN])) sensors = sensor.sub_sensors(config) diff --git a/esphome/components/mcp23016/__init__.py b/esphome/components/mcp23016/__init__.py index 7dddf4b0422..ab77bc5a5b3 100644 --- a/esphome/components/mcp23016/__init__.py +++ b/esphome/components/mcp23016/__init__.py @@ -37,9 +37,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if interrupt_pin := config.get(CONF_INTERRUPT_PIN): cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin))) diff --git a/esphome/components/mcp4461/__init__.py b/esphome/components/mcp4461/__init__.py index d5465098f29..8f12212b481 100644 --- a/esphome/components/mcp4461/__init__.py +++ b/esphome/components/mcp4461/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@p1ngb4ck"] @@ -33,12 +32,10 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable( - config[CONF_ID], + await i2c.new_i2c_component( + config, config[CONF_DISABLE_WIPER_0], config[CONF_DISABLE_WIPER_1], config[CONF_DISABLE_WIPER_2], config[CONF_DISABLE_WIPER_3], ) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) diff --git a/esphome/components/mcp4725/output.py b/esphome/components/mcp4725/output.py index 0c1224a1a7f..5dda2145b15 100644 --- a/esphome/components/mcp4725/output.py +++ b/esphome/components/mcp4725/output.py @@ -21,7 +21,5 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) await output.register_output(var, config) diff --git a/esphome/components/mcp4728/__init__.py b/esphome/components/mcp4728/__init__.py index 7156b4aa7fe..54678204bc3 100644 --- a/esphome/components/mcp4728/__init__.py +++ b/esphome/components/mcp4728/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@berfenger"] @@ -27,6 +26,4 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID], config[CONF_STORE_IN_EEPROM]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config, config[CONF_STORE_IN_EEPROM]) diff --git a/esphome/components/mcp47a1/output.py b/esphome/components/mcp47a1/output.py index 91bb3b47dbb..2386ac12abb 100644 --- a/esphome/components/mcp47a1/output.py +++ b/esphome/components/mcp47a1/output.py @@ -22,7 +22,5 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) await output.register_output(var, config) diff --git a/esphome/components/mics_4514/sensor.py b/esphome/components/mics_4514/sensor.py index 3ba560c781a..1dee96e5abc 100644 --- a/esphome/components/mics_4514/sensor.py +++ b/esphome/components/mics_4514/sensor.py @@ -6,7 +6,6 @@ from esphome.const import ( CONF_CARBON_MONOXIDE, CONF_ETHANOL, CONF_HYDROGEN, - CONF_ID, CONF_METHANE, CONF_NITROGEN_DIOXIDE, DEVICE_CLASS_CARBON_MONOXIDE, @@ -58,9 +57,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) for sensor_type in SENSORS: if sensor_config := config.get(sensor_type): diff --git a/esphome/components/mlx90393/sensor.py b/esphome/components/mlx90393/sensor.py index 4ff42c7d9c7..d6a777e7d88 100644 --- a/esphome/components/mlx90393/sensor.py +++ b/esphome/components/mlx90393/sensor.py @@ -5,7 +5,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_FILTER, CONF_GAIN, - CONF_ID, CONF_OVERSAMPLING, CONF_RESOLUTION, CONF_TEMPERATURE, @@ -129,9 +128,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_gain(GAIN[config[CONF_GAIN]])) cg.add(var.set_oversampling(config[CONF_OVERSAMPLING])) diff --git a/esphome/components/mlx90614/sensor.py b/esphome/components/mlx90614/sensor.py index e818ea708d0..8a4c4e90eff 100644 --- a/esphome/components/mlx90614/sensor.py +++ b/esphome/components/mlx90614/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, DEVICE_CLASS_TEMPERATURE, STATE_CLASS_MEASUREMENT, UNIT_CELSIUS, @@ -49,9 +48,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_AMBIENT, var.set_ambient_sensor) diff --git a/esphome/components/mmc5603/sensor.py b/esphome/components/mmc5603/sensor.py index 70c70877b75..874b774829e 100644 --- a/esphome/components/mmc5603/sensor.py +++ b/esphome/components/mmc5603/sensor.py @@ -7,7 +7,6 @@ from esphome.const import ( CONF_FIELD_STRENGTH_Y, CONF_FIELD_STRENGTH_Z, CONF_HEADING, - CONF_ID, CONF_UPDATE_INTERVAL, ICON_MAGNET, ICON_SCREEN_ROTATION, @@ -77,9 +76,7 @@ def auto_data_rate(config: ConfigType) -> MockObj: async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_datarate(auto_data_rate(config))) sensors = sensor.sub_sensors(config) diff --git a/esphome/components/mmc5983/sensor.py b/esphome/components/mmc5983/sensor.py index 48c532b0c67..4ed73664bf7 100644 --- a/esphome/components/mmc5983/sensor.py +++ b/esphome/components/mmc5983/sensor.py @@ -5,7 +5,6 @@ from esphome.const import ( CONF_FIELD_STRENGTH_X, CONF_FIELD_STRENGTH_Y, CONF_FIELD_STRENGTH_Z, - CONF_ID, ICON_MAGNET, STATE_CLASS_MEASUREMENT, UNIT_MICROTESLA, @@ -41,9 +40,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_FIELD_STRENGTH_X, var.set_x_sensor) diff --git a/esphome/components/mpl3115a2/sensor.py b/esphome/components/mpl3115a2/sensor.py index 8235e2d6183..c97b8df2b32 100644 --- a/esphome/components/mpl3115a2/sensor.py +++ b/esphome/components/mpl3115a2/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_ALTITUDE, - CONF_ID, CONF_PRESSURE, CONF_TEMPERATURE, DEVICE_CLASS_PRESSURE, @@ -60,9 +59,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_PRESSURE, var.set_pressure) diff --git a/esphome/components/mpu6050/sensor.py b/esphome/components/mpu6050/sensor.py index bd3de2d32cd..093ededcd64 100644 --- a/esphome/components/mpu6050/sensor.py +++ b/esphome/components/mpu6050/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_TEMPERATURE, ICON_BRIEFCASE_DOWNLOAD, @@ -66,9 +65,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_ACCEL_X, var.set_accel_x_sensor) diff --git a/esphome/components/mpu6886/sensor.py b/esphome/components/mpu6886/sensor.py index 878540d5160..aa60ad962de 100644 --- a/esphome/components/mpu6886/sensor.py +++ b/esphome/components/mpu6886/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_TEMPERATURE, ICON_BRIEFCASE_DOWNLOAD, @@ -67,9 +66,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_ACCEL_X, var.set_accel_x_sensor) diff --git a/esphome/components/ms5611/sensor.py b/esphome/components/ms5611/sensor.py index bf6d4528e68..d6f7012985d 100644 --- a/esphome/components/ms5611/sensor.py +++ b/esphome/components/ms5611/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PRESSURE, CONF_TEMPERATURE, DEVICE_CLASS_PRESSURE, @@ -46,9 +45,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/ms8607/sensor.py b/esphome/components/ms8607/sensor.py index 13377394beb..83609916ef4 100644 --- a/esphome/components/ms8607/sensor.py +++ b/esphome/components/ms8607/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_PRESSURE, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, @@ -64,9 +63,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/msa3xx/__init__.py b/esphome/components/msa3xx/__init__.py index 3c491ffc898..4623e1d66ff 100644 --- a/esphome/components/msa3xx/__init__.py +++ b/esphome/components/msa3xx/__init__.py @@ -4,7 +4,6 @@ from esphome.components import i2c import esphome.config_validation as cv from esphome.const import ( CONF_CALIBRATION, - CONF_ID, CONF_MIRROR_X, CONF_MIRROR_Y, CONF_OFFSET_X, @@ -121,9 +120,7 @@ MSA_SENSOR_SCHEMA = cv.Schema( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_model(config[CONF_TYPE])) cg.add(var.set_range(MSA_RANGES[config[CONF_RANGE]])) diff --git a/esphome/components/nau7802/sensor.py b/esphome/components/nau7802/sensor.py index 2647d40441a..ac46a9fb786 100644 --- a/esphome/components/nau7802/sensor.py +++ b/esphome/components/nau7802/sensor.py @@ -82,9 +82,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) await sensor.register_sensor(var, config) cg.add(var.set_samples_per_second(config[CONF_SAMPLES_PER_SECOND])) diff --git a/esphome/components/npi19/sensor.py b/esphome/components/npi19/sensor.py index 14dcd72384d..e3521383736 100644 --- a/esphome/components/npi19/sensor.py +++ b/esphome/components/npi19/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_TEMPERATURE, STATE_CLASS_MEASUREMENT, @@ -40,9 +39,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/pca6416a/__init__.py b/esphome/components/pca6416a/__init__.py index 69d8935977c..33f8af9d528 100644 --- a/esphome/components/pca6416a/__init__.py +++ b/esphome/components/pca6416a/__init__.py @@ -41,9 +41,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if interrupt_pin := config.get(CONF_INTERRUPT_PIN): cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin))) diff --git a/esphome/components/pca9505/__init__.py b/esphome/components/pca9505/__init__.py index d50e8205a17..4e3acb94e6e 100644 --- a/esphome/components/pca9505/__init__.py +++ b/esphome/components/pca9505/__init__.py @@ -41,9 +41,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if interrupt_pin := config.get(CONF_INTERRUPT_PIN): cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin))) diff --git a/esphome/components/pcf8574/__init__.py b/esphome/components/pcf8574/__init__.py index 5ede39d7145..f1db7c29748 100644 --- a/esphome/components/pcf8574/__init__.py +++ b/esphome/components/pcf8574/__init__.py @@ -44,9 +44,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_pcf8575(config[CONF_PCF8575])) if (reset := config[CONF_RESET]) != DEFAULT_RESET: cg.add(var.set_reset(reset)) diff --git a/esphome/components/pcm5122/audio_dac.py b/esphome/components/pcm5122/audio_dac.py index 5091efabeac..cb50b101c13 100644 --- a/esphome/components/pcm5122/audio_dac.py +++ b/esphome/components/pcm5122/audio_dac.py @@ -133,9 +133,7 @@ async def pcm5122_pin_to_code(config: ConfigType) -> MockObj: async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_bits_per_sample(config[CONF_BITS_PER_SAMPLE])) cg.add(var.set_analog_gain(config[CONF_ANALOG_GAIN])) diff --git a/esphome/components/pi4ioe5v6408/__init__.py b/esphome/components/pi4ioe5v6408/__init__.py index cd901cb448d..4128114b3cc 100644 --- a/esphome/components/pi4ioe5v6408/__init__.py +++ b/esphome/components/pi4ioe5v6408/__init__.py @@ -46,9 +46,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_reset(config[CONF_RESET])) if interrupt_pin := config.get(CONF_INTERRUPT_PIN): diff --git a/esphome/components/pm2005/sensor.py b/esphome/components/pm2005/sensor.py index 0e36992141b..76ca2b6862b 100644 --- a/esphome/components/pm2005/sensor.py +++ b/esphome/components/pm2005/sensor.py @@ -4,7 +4,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PM_1_0, CONF_PM_2_5, CONF_PM_10_0, @@ -65,9 +64,7 @@ CONFIG_SCHEMA = cv.All( 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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_sensor_type(config[CONF_TYPE])) diff --git a/esphome/components/pmsa003i/sensor.py b/esphome/components/pmsa003i/sensor.py index 14f27f89ccd..04e3b1a70af 100644 --- a/esphome/components/pmsa003i/sensor.py +++ b/esphome/components/pmsa003i/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PM_1_0, CONF_PM_2_5, CONF_PM_10_0, @@ -116,9 +115,7 @@ TYPES = { async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_standard_units(config[CONF_STANDARD_UNITS])) diff --git a/esphome/components/pmwcs3/sensor.py b/esphome/components/pmwcs3/sensor.py index 61f89afa41b..5420317716b 100644 --- a/esphome/components/pmwcs3/sensor.py +++ b/esphome/components/pmwcs3/sensor.py @@ -5,7 +5,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_ADDRESS, CONF_EC, - CONF_ID, CONF_TEMPERATURE, ICON_THERMOMETER, STATE_CLASS_MEASUREMENT, @@ -63,9 +62,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_E25, var.set_e25_sensor) diff --git a/esphome/components/qmc5883l/sensor.py b/esphome/components/qmc5883l/sensor.py index 06091c4f1ca..deba7eab7e0 100644 --- a/esphome/components/qmc5883l/sensor.py +++ b/esphome/components/qmc5883l/sensor.py @@ -13,7 +13,6 @@ from esphome.const import ( CONF_FIELD_STRENGTH_Y, CONF_FIELD_STRENGTH_Z, CONF_HEADING, - CONF_ID, CONF_OVERSAMPLING, CONF_RANGE, CONF_TEMPERATURE, @@ -143,9 +142,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_oversampling(config[CONF_OVERSAMPLING])) cg.add(var.set_datarate(config[CONF_DATA_RATE])) diff --git a/esphome/components/qmp6988/sensor.py b/esphome/components/qmp6988/sensor.py index 955e7026062..b357f03ea31 100644 --- a/esphome/components/qmp6988/sensor.py +++ b/esphome/components/qmp6988/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_IIR_FILTER, CONF_OVERSAMPLING, CONF_PRESSURE, @@ -78,9 +77,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if CONF_TEMPERATURE in config: conf = config[CONF_TEMPERATURE] diff --git a/esphome/components/rx8111/time.py b/esphome/components/rx8111/time.py index 0b166807a22..fc6a1cca0d5 100644 --- a/esphome/components/rx8111/time.py +++ b/esphome/components/rx8111/time.py @@ -4,7 +4,6 @@ from esphome import automation import esphome.codegen as cg from esphome.components import i2c, time import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@techdregs"] @@ -30,7 +29,5 @@ 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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) await time.register_time(var, config) diff --git a/esphome/components/rx8130/time.py b/esphome/components/rx8130/time.py index 2082c487593..964141596fd 100644 --- a/esphome/components/rx8130/time.py +++ b/esphome/components/rx8130/time.py @@ -2,7 +2,6 @@ from esphome import automation import esphome.codegen as cg from esphome.components import i2c, time import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@beormund"] @@ -34,7 +33,5 @@ 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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) await time.register_time(var, config) diff --git a/esphome/components/scd30/sensor.py b/esphome/components/scd30/sensor.py index f3f4ede8c93..3c39f3e7c21 100644 --- a/esphome/components/scd30/sensor.py +++ b/esphome/components/scd30/sensor.py @@ -8,7 +8,6 @@ from esphome.const import ( CONF_AUTOMATIC_SELF_CALIBRATION, CONF_CO2, CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, CONF_TEMPERATURE_OFFSET, CONF_UPDATE_INTERVAL, @@ -79,9 +78,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_automatic_self_calibration(config[CONF_AUTOMATIC_SELF_CALIBRATION])) if CONF_ALTITUDE_COMPENSATION in config: diff --git a/esphome/components/scd4x/sensor.py b/esphome/components/scd4x/sensor.py index e78ae2a6b22..12a07a3f63a 100644 --- a/esphome/components/scd4x/sensor.py +++ b/esphome/components/scd4x/sensor.py @@ -101,9 +101,7 @@ SETTING_MAP = { async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) for key, funcName in SETTING_MAP.items(): if key in config: diff --git a/esphome/components/sen5x/sensor.py b/esphome/components/sen5x/sensor.py index d45bb2c7916..b3fde64f820 100644 --- a/esphome/components/sen5x/sensor.py +++ b/esphome/components/sen5x/sensor.py @@ -219,9 +219,7 @@ SETTING_MAP = { async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) for key, funcName in SETTING_MAP.items(): if cfg := config.get(key): diff --git a/esphome/components/sen6x/sensor.py b/esphome/components/sen6x/sensor.py index a5c46801887..9893ef80233 100644 --- a/esphome/components/sen6x/sensor.py +++ b/esphome/components/sen6x/sensor.py @@ -183,9 +183,7 @@ SENSOR_MAP = { async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if CONF_TYPE in config: cg.add(var.set_type(config[CONF_TYPE])) diff --git a/esphome/components/sfa30/sensor.py b/esphome/components/sfa30/sensor.py index b8039af9e3e..8a07b79e149 100644 --- a/esphome/components/sfa30/sensor.py +++ b/esphome/components/sfa30/sensor.py @@ -4,7 +4,6 @@ import esphome.config_validation as cv from esphome.const import ( CONF_FORMALDEHYDE, CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_GAS, DEVICE_CLASS_HUMIDITY, @@ -68,9 +67,7 @@ SENSOR_MAP = { async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) for key, funcName in SENSOR_MAP.items(): if sensor_config := config.get(key): diff --git a/esphome/components/sfa40/sensor.py b/esphome/components/sfa40/sensor.py index 701660eb8fe..ca5f72de6dd 100644 --- a/esphome/components/sfa40/sensor.py +++ b/esphome/components/sfa40/sensor.py @@ -68,9 +68,7 @@ SENSOR_MAP = { 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) + var = await i2c.new_i2c_component(config) cg.add(var.set_wait_for_ready(config[CONF_WAIT_FOR_READY])) for key, func_name in SENSOR_MAP.items(): diff --git a/esphome/components/sgp30/sensor.py b/esphome/components/sgp30/sensor.py index b56df3fb2e1..5d4c43fccae 100644 --- a/esphome/components/sgp30/sensor.py +++ b/esphome/components/sgp30/sensor.py @@ -6,7 +6,6 @@ from esphome.const import ( CONF_BASELINE, CONF_COMPENSATION, CONF_ECO2, - CONF_ID, CONF_STORE_BASELINE, CONF_TEMPERATURE_SOURCE, CONF_TVOC, @@ -83,9 +82,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_ECO2, var.set_eco2_sensor) diff --git a/esphome/components/sgp4x/sensor.py b/esphome/components/sgp4x/sensor.py index bf8fbe1a975..866445f2464 100644 --- a/esphome/components/sgp4x/sensor.py +++ b/esphome/components/sgp4x/sensor.py @@ -11,7 +11,6 @@ from esphome.const import ( CONF_COMPENSATION, CONF_GAIN_FACTOR, CONF_GATING_MAX_DURATION_MINUTES, - CONF_ID, CONF_INDEX_OFFSET, CONF_LEARNING_TIME_GAIN_HOURS, CONF_LEARNING_TIME_OFFSET_HOURS, @@ -100,9 +99,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if CONF_COMPENSATION in config: compensation_config = config[CONF_COMPENSATION] diff --git a/esphome/components/sht3xd/sensor.py b/esphome/components/sht3xd/sensor.py index baee146a22d..8d1aa5d7b4e 100644 --- a/esphome/components/sht3xd/sensor.py +++ b/esphome/components/sht3xd/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensirion_common, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -50,9 +49,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_heater_enabled(config[CONF_HEATER_ENABLED])) diff --git a/esphome/components/sht4x/sensor.py b/esphome/components/sht4x/sensor.py index d491d94ba14..48c652224ab 100644 --- a/esphome/components/sht4x/sensor.py +++ b/esphome/components/sht4x/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensirion_common, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -84,9 +83,7 @@ TYPES = { async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_precision_value(config[CONF_PRECISION])) cg.add(var.set_heater_power_value(config[CONF_HEATER_POWER])) diff --git a/esphome/components/shtcx/sensor.py b/esphome/components/shtcx/sensor.py index d6ca2b131bd..41d3e72b247 100644 --- a/esphome/components/shtcx/sensor.py +++ b/esphome/components/shtcx/sensor.py @@ -3,7 +3,6 @@ from esphome.components import i2c, sensirion_common, sensor import esphome.config_validation as cv from esphome.const import ( CONF_HUMIDITY, - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, @@ -47,9 +46,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/sps30/sensor.py b/esphome/components/sps30/sensor.py index b8a4e080213..d86d5b7ecf5 100644 --- a/esphome/components/sps30/sensor.py +++ b/esphome/components/sps30/sensor.py @@ -117,9 +117,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_PM_1_0, var.set_pm_1_0_sensor) diff --git a/esphome/components/stcc4/sensor.py b/esphome/components/stcc4/sensor.py index 4385164384a..b103aa39534 100644 --- a/esphome/components/stcc4/sensor.py +++ b/esphome/components/stcc4/sensor.py @@ -7,7 +7,6 @@ from esphome.const import ( CONF_AMBIENT_PRESSURE_COMPENSATION_SOURCE, CONF_CO2, CONF_HUMIDITY, - CONF_ID, CONF_MEASUREMENT_MODE, CONF_TEMPERATURE, CONF_TEMPERATURE_SOURCE, @@ -101,9 +100,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_CO2, var.set_co2_sensor) diff --git a/esphome/components/sx1509/__init__.py b/esphome/components/sx1509/__init__.py index f96479498d6..c44c52a6fc6 100644 --- a/esphome/components/sx1509/__init__.py +++ b/esphome/components/sx1509/__init__.py @@ -90,9 +90,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if conf := config.get(CONF_KEYPAD): cg.add(var.set_rows_cols(conf[CONF_KEY_ROWS], conf[CONF_KEY_COLUMNS])) if ( diff --git a/esphome/components/sy6970/__init__.py b/esphome/components/sy6970/__init__.py index 7ed2b4fe869..23aaceb6a3c 100644 --- a/esphome/components/sy6970/__init__.py +++ b/esphome/components/sy6970/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@linkedupbits"] @@ -61,8 +60,8 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable( - config[CONF_ID], + await i2c.new_i2c_component( + config, config[CONF_ENABLE_STATUS_LED], config[CONF_INPUT_CURRENT_LIMIT], config[CONF_CHARGE_VOLTAGE], @@ -72,5 +71,3 @@ async def to_code(config: ConfigType) -> None: config[CONF_ENABLE_ADC], config[CONF_I2C_WATCHDOG_TIMEOUT], ) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) diff --git a/esphome/components/tas2780/audio_dac.py b/esphome/components/tas2780/audio_dac.py index 9fbee8cc297..407ae55604e 100644 --- a/esphome/components/tas2780/audio_dac.py +++ b/esphome/components/tas2780/audio_dac.py @@ -4,7 +4,7 @@ import esphome.codegen as cg from esphome.components import i2c from esphome.components.audio_dac import AudioDac import esphome.config_validation as cv -from esphome.const import CONF_CHANNEL, CONF_ID, CONF_POWER_MODE +from esphome.const import CONF_CHANNEL, CONF_POWER_MODE from esphome.types import ConfigType DEPENDENCIES = ["i2c"] @@ -97,9 +97,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_amp_level(config[CONF_AMP_LEVEL])) cg.add(var.set_power_mode(config[CONF_POWER_MODE])) diff --git a/esphome/components/tas58xx/audio_dac.py b/esphome/components/tas58xx/audio_dac.py index 94d37832eb4..332d994d5e9 100644 --- a/esphome/components/tas58xx/audio_dac.py +++ b/esphome/components/tas58xx/audio_dac.py @@ -168,9 +168,7 @@ for _name, _call in ( async def to_code(config: ConfigType) -> None: model = MODELS[config[CONF_MODEL]] cg.add_define(f"USE_TAS58XX_{config[CONF_MODEL].upper()}") - var = cg.new_Pvariable(config[CONF_ID], cg.RawExpression(f"&{model.model_info}")) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config, cg.RawExpression(f"&{model.model_info}")) cg.add(var.set_analog_gain(config[CONF_ANALOG_GAIN])) cg.add(var.set_dac_mode(config[CONF_DAC_MODE])) diff --git a/esphome/components/tca8418/__init__.py b/esphome/components/tca8418/__init__.py index 67b38dc21ee..ee9decd6680 100644 --- a/esphome/components/tca8418/__init__.py +++ b/esphome/components/tca8418/__init__.py @@ -5,7 +5,7 @@ import esphome.codegen as cg from esphome.components import gpio_expander, i2c, key_provider from esphome.components.const import CONF_COLUMNS, CONF_KEYS, CONF_ROWS import esphome.config_validation as cv -from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_ON_KEY +from esphome.const import CONF_INTERRUPT_PIN, CONF_ON_KEY from esphome.types import ConfigType _LOGGER = logging.getLogger(__name__) @@ -131,9 +131,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if (rows := config.get(CONF_ROWS)) is not None: columns = config[CONF_COLUMNS] diff --git a/esphome/components/tca9548a/__init__.py b/esphome/components/tca9548a/__init__.py index 368e34f3250..c28ceb015ea 100644 --- a/esphome/components/tca9548a/__init__.py +++ b/esphome/components/tca9548a/__init__.py @@ -78,9 +78,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) root_bus_id = _root_bus_id(config[CONF_I2C_ID]) if (frequency := config.get(CONF_FREQUENCY)) is not None: await _add_frequency(root_bus_id, int(frequency)) diff --git a/esphome/components/tca9555/__init__.py b/esphome/components/tca9555/__init__.py index a039872e164..0554f9a569d 100644 --- a/esphome/components/tca9555/__init__.py +++ b/esphome/components/tca9555/__init__.py @@ -40,9 +40,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) if interrupt_pin := config.get(CONF_INTERRUPT_PIN): cg.add(var.set_interrupt_pin(await cg.gpio_pin_expression(interrupt_pin))) diff --git a/esphome/components/tcs34725/sensor.py b/esphome/components/tcs34725/sensor.py index de327f0eba7..12fc3475740 100644 --- a/esphome/components/tcs34725/sensor.py +++ b/esphome/components/tcs34725/sensor.py @@ -11,7 +11,6 @@ from esphome.const import ( CONF_COLOR_TEMPERATURE, CONF_GAIN, CONF_GLASS_ATTENUATION_FACTOR, - CONF_ID, CONF_ILLUMINANCE, CONF_INTEGRATION_TIME, DEVICE_CLASS_ILLUMINANCE, @@ -102,9 +101,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_integration_time(config[CONF_INTEGRATION_TIME])) cg.add(var.set_gain(config[CONF_GAIN])) diff --git a/esphome/components/tem3200/sensor.py b/esphome/components/tem3200/sensor.py index 2b1839c529f..7eb35ad5337 100644 --- a/esphome/components/tem3200/sensor.py +++ b/esphome/components/tem3200/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_TEMPERATURE, DEVICE_CLASS_TEMPERATURE, STATE_CLASS_MEASUREMENT, @@ -42,9 +41,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/tfluna/__init__.py b/esphome/components/tfluna/__init__.py index 6914894ba78..7bd7e0f5c94 100644 --- a/esphome/components/tfluna/__init__.py +++ b/esphome/components/tfluna/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType CODEOWNERS = ["@candrews"] @@ -30,6 +29,4 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/tlc59208f/__init__.py b/esphome/components/tlc59208f/__init__.py index 5d719e40ba2..c87478715f3 100644 --- a/esphome/components/tlc59208f/__init__.py +++ b/esphome/components/tlc59208f/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType DEPENDENCIES = ["i2c"] @@ -23,6 +22,4 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/tsl2591/sensor.py b/esphome/components/tsl2591/sensor.py index ee6ebaeb75c..7f4e9e43db8 100644 --- a/esphome/components/tsl2591/sensor.py +++ b/esphome/components/tsl2591/sensor.py @@ -31,7 +31,6 @@ from esphome.const import ( CONF_FULL_SPECTRUM, CONF_GAIN, CONF_GLASS_ATTENUATION_FACTOR, - CONF_ID, CONF_INFRARED, CONF_INTEGRATION_TIME, CONF_NAME, @@ -136,9 +135,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_FULL_SPECTRUM, var.set_full_spectrum_sensor) diff --git a/esphome/components/ttp229_lsf/__init__.py b/esphome/components/ttp229_lsf/__init__.py index e89b177a3ee..1d802ec5c67 100644 --- a/esphome/components/ttp229_lsf/__init__.py +++ b/esphome/components/ttp229_lsf/__init__.py @@ -1,7 +1,6 @@ import esphome.codegen as cg from esphome.components import i2c import esphome.config_validation as cv -from esphome.const import CONF_ID from esphome.types import ConfigType DEPENDENCIES = ["i2c"] @@ -28,6 +27,4 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) diff --git a/esphome/components/veml7700/sensor.py b/esphome/components/veml7700/sensor.py index 9ed98fc4dfd..01e71aef26b 100644 --- a/esphome/components/veml7700/sensor.py +++ b/esphome/components/veml7700/sensor.py @@ -13,7 +13,6 @@ from esphome.const import ( CONF_FULL_SPECTRUM_COUNTS, CONF_GAIN, CONF_GLASS_ATTENUATION_FACTOR, - CONF_ID, CONF_INFRARED, CONF_INTEGRATION_TIME, CONF_NAME, @@ -156,9 +155,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 i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_AMBIENT_LIGHT, var.set_ambient_light_sensor) diff --git a/esphome/components/waveshare_io_ch32v003/__init__.py b/esphome/components/waveshare_io_ch32v003/__init__.py index 5e53d30149b..0b89ca8b561 100644 --- a/esphome/components/waveshare_io_ch32v003/__init__.py +++ b/esphome/components/waveshare_io_ch32v003/__init__.py @@ -45,9 +45,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) def validate_mode(value: ConfigType) -> ConfigType: diff --git a/esphome/components/xdb401/sensor.py b/esphome/components/xdb401/sensor.py index df274ac09b3..d18122b70f8 100644 --- a/esphome/components/xdb401/sensor.py +++ b/esphome/components/xdb401/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_PRESSURE, CONF_TEMPERATURE, DEVICE_CLASS_PRESSURE, @@ -50,9 +49,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) cg.add(var.set_pressure_range_bar(config[CONF_PRESSURE_RANGE_BAR])) diff --git a/esphome/components/xgzp68xx/sensor.py b/esphome/components/xgzp68xx/sensor.py index b67b2d8a9b4..778fb48647f 100644 --- a/esphome/components/xgzp68xx/sensor.py +++ b/esphome/components/xgzp68xx/sensor.py @@ -2,7 +2,6 @@ import esphome.codegen as cg from esphome.components import i2c, sensor import esphome.config_validation as cv from esphome.const import ( - CONF_ID, CONF_OVERSAMPLING, CONF_PRESSURE, CONF_TEMPERATURE, @@ -67,9 +66,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + var = await i2c.new_i2c_component(config) sensors = sensor.sub_sensors(config) await sensors(CONF_TEMPERATURE, var.set_temperature_sensor) diff --git a/esphome/components/xl9535/__init__.py b/esphome/components/xl9535/__init__.py index 1c6548bb5fe..85330357d2d 100644 --- a/esphome/components/xl9535/__init__.py +++ b/esphome/components/xl9535/__init__.py @@ -33,9 +33,7 @@ CONFIG_SCHEMA = ( async def to_code(config: ConfigType) -> None: - var = cg.new_Pvariable(config[CONF_ID]) - await cg.register_component(var, config) - await i2c.register_i2c_device(var, config) + await i2c.new_i2c_component(config) def validate_mode(mode: ConfigType) -> ConfigType: diff --git a/tests/unit_tests/components/test_pcf8574.py b/tests/unit_tests/components/test_pcf8574.py index 43751815358..e5b6519700d 100644 --- a/tests/unit_tests/components/test_pcf8574.py +++ b/tests/unit_tests/components/test_pcf8574.py @@ -22,9 +22,7 @@ async def test_reset_configuration(options: dict, expected: bool) -> None: assert config[CONF_RESET] is expected var = Mock() with ( - patch.object(pcf8574.cg, "new_Pvariable", return_value=var), - patch.object(pcf8574.cg, "register_component", new_callable=AsyncMock), - patch.object(pcf8574.i2c, "register_i2c_device", new_callable=AsyncMock), + patch.object(pcf8574.i2c, "new_i2c_component", AsyncMock(return_value=var)), patch.object(pcf8574.cg, "add"), ): await pcf8574.to_code(config)