github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-10-19 04:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[components] Set referenced components with cg.add_variable and register_parented (a-l) (#21021)

Browse Source
This commit is contained in:
J. Nick Koston
2026-10-18 17:43:05 +00:00
committed by GitHub
parent 619728b686
commit deea006b39
53 changed files with 93 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/absolute_humidity/sensor.py
+2 -5
View File
@@ -44,10 +44,7 @@ async def to_code(config: ConfigType) -> None:
var = await sensor.new_sensor(config)
await cg.register_component(var, config)
temperature_sensor = await cg.get_variable(config[CONF_TEMPERATURE])
cg.add(var.set_temperature_sensor(temperature_sensor))
humidity_sensor = await cg.get_variable(config[CONF_HUMIDITY])
cg.add(var.set_humidity_sensor(humidity_sensor))
await cg.add_variable(var.set_temperature_sensor, config[CONF_TEMPERATURE])
await cg.add_variable(var.set_humidity_sensor, config[CONF_HUMIDITY])
cg.add(var.set_equation(config[CONF_EQUATION]))
esphome/components/analog_threshold/binary_sensor.py
+1 -2
View File
@@ -37,8 +37,7 @@ async def to_code(config: ConfigType) -> None:
var = await binary_sensor.new_binary_sensor(config)
await cg.register_component(var, config)
sens = await cg.get_variable(config[CONF_SENSOR_ID])
cg.add(var.set_sensor(sens))
await cg.add_variable(var.set_sensor, config[CONF_SENSOR_ID])
if isinstance(config[CONF_THRESHOLD], dict):
lower = await cg.templatable(config[CONF_THRESHOLD][CONF_LOWER], [], cg.float_)
esphome/components/aqi/sensor.py
+2 -5
View File
@@ -53,11 +53,8 @@ async def to_code(config: ConfigType) -> None:
var = await sensor.new_sensor(config)
await cg.register_component(var, config)
pm_2_5_sensor = await cg.get_variable(config[CONF_PM_2_5])
cg.add(var.set_pm_2_5_sensor(pm_2_5_sensor))
pm_10_0_sensor = await cg.get_variable(config[CONF_PM_10_0])
cg.add(var.set_pm_10_0_sensor(pm_10_0_sensor))
await cg.add_variable(var.set_pm_2_5_sensor, config[CONF_PM_2_5])
await cg.add_variable(var.set_pm_10_0_sensor, config[CONF_PM_10_0])
cg.add(var.set_aqi_calculation_type(config[CONF_CALCULATION_TYPE]))
cg.add(var.set_extended_range(config.get(CONF_EXTENDED_RANGE, False)))
esphome/components/bang_bang/climate.py
+2 -6
View File
@@ -46,12 +46,8 @@ async def to_code(config: ConfigType) -> None:
var = await climate.new_climate(config)
await cg.register_component(var, config)
sens = await cg.get_variable(config[CONF_SENSOR])
cg.add(var.set_sensor(sens))
if CONF_HUMIDITY_SENSOR in config:
sens = await cg.get_variable(config[CONF_HUMIDITY_SENSOR])
cg.add(var.set_humidity_sensor(sens))
await cg.add_variable(var.set_sensor, config[CONF_SENSOR])
await cg.add_variable(var.set_humidity_sensor, config.get(CONF_HUMIDITY_SENSOR))
normal_config = BangBangClimateTargetTempConfig(
config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
esphome/components/bedjet/__init__.py
+1 -3
View File
@@ -44,8 +44,6 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
await ble_client.register_ble_node(var, config)
if time_id := config.get(CONF_TIME_ID):
time_ = await cg.get_variable(time_id)
cg.add(var.set_time_id(time_))
await cg.add_variable(var.set_time_id, config.get(CONF_TIME_ID))
if (receive_timeout := config.get(CONF_RECEIVE_TIMEOUT)) is not None:
cg.add(var.set_status_timeout(receive_timeout))
esphome/components/binary/fan/__init__.py
+3 -10
View File
@@ -25,13 +25,6 @@ async def to_code(config: ConfigType) -> None:
var = await fan.new_fan(config)
await cg.register_component(var, config)
output_ = await cg.get_variable(config[CONF_OUTPUT])
cg.add(var.set_output(output_))
if oscillation_output_id := config.get(CONF_OSCILLATION_OUTPUT):
oscillation_output = await cg.get_variable(oscillation_output_id)
cg.add(var.set_oscillating(oscillation_output))
if direction_output_id := config.get(CONF_DIRECTION_OUTPUT):
direction_output = await cg.get_variable(direction_output_id)
cg.add(var.set_direction(direction_output))
await cg.add_variable(var.set_output, config[CONF_OUTPUT])
await cg.add_variable(var.set_oscillating, config.get(CONF_OSCILLATION_OUTPUT))
await cg.add_variable(var.set_direction, config.get(CONF_DIRECTION_OUTPUT))
esphome/components/binary/light/__init__.py
+1 -2
View File
@@ -20,5 +20,4 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
await light.register_light(var, config)
out = await cg.get_variable(config[CONF_OUTPUT])
cg.add(var.set_output(out))
await cg.add_variable(var.set_output, config[CONF_OUTPUT])
esphome/components/bk72xx_ble_tracker/__init__.py
+1 -2
View File
@@ -144,8 +144,7 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
parent = await cg.get_variable(config[CONF_BK72XX_BLE_ID])
cg.add(var.set_parent(parent))
await cg.register_parented(var, config[CONF_BK72XX_BLE_ID])
# The tracker registers itself as a controller scan listener in setup();
# request the codegen-sized StaticVector slot for it.
bk72xx_ble.request_scan_listener_slot()
esphome/components/bp1658cj/output.py
+1 -2
View File
@@ -24,6 +24,5 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await output.register_output(var, config)
parent = await cg.get_variable(config[CONF_BP1658CJ_ID])
cg.add(var.set_parent(parent))
await cg.register_parented(var, config[CONF_BP1658CJ_ID])
cg.add(var.set_channel(config[CONF_CHANNEL]))
esphome/components/bp5758d/output.py
+1 -2
View File
@@ -25,7 +25,6 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await output.register_output(var, config)
parent = await cg.get_variable(config[CONF_BP5758D_ID])
cg.add(var.set_parent(parent))
await cg.register_parented(var, config[CONF_BP5758D_ID])
cg.add(var.set_channel(config[CONF_CHANNEL]))
cg.add(var.set_current(config[CONF_CURRENT]))
esphome/components/ccs811/sensor.py
+2 -6
View File
@@ -72,9 +72,5 @@ async def to_code(config: ConfigType) -> None:
if (baseline := config.get(CONF_BASELINE)) is not None:
cg.add(var.set_baseline(baseline))
if temperature_id := config.get(CONF_TEMPERATURE):
sens = await cg.get_variable(temperature_id)
cg.add(var.set_temperature(sens))
if humidity_id := config.get(CONF_HUMIDITY):
sens = await cg.get_variable(humidity_id)
cg.add(var.set_humidity(sens))
await cg.add_variable(var.set_temperature, config.get(CONF_TEMPERATURE))
await cg.add_variable(var.set_humidity, config.get(CONF_HUMIDITY))
esphome/components/cd74hc4067/sensor.py
+1 -2
View File
@@ -53,5 +53,4 @@ async def to_code(config: ConfigType) -> None:
await cg.register_component(var, config)
cg.add(var.set_pin(config[CONF_NUMBER]))
sens = await cg.get_variable(config[CONF_SENSOR])
cg.add(var.set_source(sens))
await cg.add_variable(var.set_source, config[CONF_SENSOR])
esphome/components/climate_ir/__init__.py
+2 -6
View File
@@ -74,12 +74,8 @@ async def register_climate_ir(var: MockObj, config: ConfigType) -> None:
cg.add(var.set_supports_heat_cool(False))
if remote_base.CONF_RECEIVER_ID in config:
await remote_base.register_listener(var, config)
if sensor_id := config.get(CONF_SENSOR):
sens = await cg.get_variable(sensor_id)
cg.add(var.set_sensor(sens))
if sensor_id := config.get(CONF_HUMIDITY_SENSOR):
sens = await cg.get_variable(sensor_id)
cg.add(var.set_humidity_sensor(sens))
await cg.add_variable(var.set_sensor, config.get(CONF_SENSOR))
await cg.add_variable(var.set_humidity_sensor, config.get(CONF_HUMIDITY_SENSOR))
async def new_climate_ir(config: ConfigType, *args: SafeExpType) -> MockObj:
esphome/components/color_temperature/light.py
+2 -5
View File
@@ -33,11 +33,8 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
await light.register_light(var, config)
color_temperature = await cg.get_variable(config[CONF_COLOR_TEMPERATURE])
cg.add(var.set_color_temperature(color_temperature))
brightness = await cg.get_variable(config[CONF_BRIGHTNESS])
cg.add(var.set_brightness(brightness))
await cg.add_variable(var.set_color_temperature, config[CONF_COLOR_TEMPERATURE])
await cg.add_variable(var.set_brightness, config[CONF_BRIGHTNESS])
cg.add(var.set_cold_white_temperature(config[CONF_COLD_WHITE_COLOR_TEMPERATURE]))
cg.add(var.set_warm_white_temperature(config[CONF_WARM_WHITE_COLOR_TEMPERATURE]))
esphome/components/copy/binary_sensor/__init__.py
+1 -2
View File
@@ -38,5 +38,4 @@ async def to_code(config: ConfigType) -> None:
var = await binary_sensor.new_binary_sensor(config)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/button/__init__.py
+1 -2
View File
@@ -38,5 +38,4 @@ async def to_code(config: ConfigType) -> None:
await button.register_button(var, config)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/cover/__init__.py
+1 -2
View File
@@ -36,5 +36,4 @@ async def to_code(config: ConfigType) -> None:
var = await cover.new_cover(config)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/fan/__init__.py
+1 -2
View File
@@ -30,5 +30,4 @@ async def to_code(config: ConfigType) -> None:
var = await fan.new_fan(config)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/lock/__init__.py
+1 -2
View File
@@ -30,5 +30,4 @@ async def to_code(config: ConfigType) -> None:
var = await lock.new_lock(config)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/number/__init__.py
+1 -2
View File
@@ -38,5 +38,4 @@ async def to_code(config: ConfigType) -> None:
var = await number.new_number(config, min_value=0, max_value=0, step=0)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/select/__init__.py
+1 -2
View File
@@ -31,5 +31,4 @@ async def to_code(config: ConfigType) -> None:
await select.register_select(var, config, options=[])
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/sensor/__init__.py
+1 -2
View File
@@ -42,5 +42,4 @@ async def to_code(config: ConfigType) -> None:
var = await sensor.new_sensor(config)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/switch/__init__.py
+1 -2
View File
@@ -36,5 +36,4 @@ async def to_code(config: ConfigType) -> None:
var = await switch.new_switch(config)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/text/__init__.py
+1 -2
View File
@@ -31,5 +31,4 @@ async def to_code(config: ConfigType) -> None:
var = await text.new_text(config)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/copy/text_sensor/__init__.py
+1 -2
View File
@@ -30,5 +30,4 @@ async def to_code(config: ConfigType) -> None:
var = await text_sensor.new_text_sensor(config)
await cg.register_component(var, config)
source = await cg.get_variable(config[CONF_SOURCE_ID])
cg.add(var.set_source(source))
await cg.add_variable(var.set_source, config[CONF_SOURCE_ID])
esphome/components/counter/sensor.py
+2 -4
View File
@@ -55,10 +55,8 @@ async def to_code(config):
)
await cg.register_component(var, config)
await sensor.register_sensor(var, config)
if (source := config.get(CONF_SENSOR)) is not None:
cg.add(var.count_updates_from(await cg.get_variable(source)))
if (source := config.get(CONF_BINARY_SENSOR)) is not None:
cg.add(var.count_true_from(await cg.get_variable(source)))
await cg.add_variable(var.count_updates_from, config.get(CONF_SENSOR))
await cg.add_variable(var.count_true_from, config.get(CONF_BINARY_SENSOR))
automation.register_apply_action(
esphome/components/ct_clamp/sensor.py
+1 -2
View File
@@ -41,6 +41,5 @@ async def to_code(config: ConfigType) -> None:
var = await sensor.new_sensor(config)
await cg.register_component(var, config)
sens = await cg.get_variable(config[CONF_SENSOR])
cg.add(var.set_source(sens))
await cg.add_variable(var.set_source, config[CONF_SENSOR])
cg.add(var.set_sample_duration(config[CONF_SAMPLE_DURATION]))
esphome/components/current_based/cover.py
+2 -4
View File
@@ -77,8 +77,7 @@ async def to_code(config: ConfigType) -> None:
)
# OPEN
bin = await cg.get_variable(config[CONF_OPEN_SENSOR])
cg.add(var.set_open_sensor(bin))
await cg.add_variable(var.set_open_sensor, config[CONF_OPEN_SENSOR])
cg.add(
var.set_open_moving_current_threshold(
config[CONF_OPEN_MOVING_CURRENT_THRESHOLD]
@@ -97,8 +96,7 @@ async def to_code(config: ConfigType) -> None:
)
# CLOSE
bin = await cg.get_variable(config[CONF_CLOSE_SENSOR])
cg.add(var.set_close_sensor(bin))
await cg.add_variable(var.set_close_sensor, config[CONF_CLOSE_SENSOR])
cg.add(
var.set_close_moving_current_threshold(
config[CONF_CLOSE_MOVING_CURRENT_THRESHOLD]
esphome/components/cwww/light.py
+2 -4
View File
@@ -36,13 +36,11 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
await light.register_light(var, config)
cwhite = await cg.get_variable(config[CONF_COLD_WHITE])
cg.add(var.set_cold_white(cwhite))
await cg.add_variable(var.set_cold_white, config[CONF_COLD_WHITE])
if cold_white_color_temperature := config.get(CONF_COLD_WHITE_COLOR_TEMPERATURE):
cg.add(var.set_cold_white_temperature(cold_white_color_temperature))
wwhite = await cg.get_variable(config[CONF_WARM_WHITE])
cg.add(var.set_warm_white(wwhite))
await cg.add_variable(var.set_warm_white, config[CONF_WARM_WHITE])
if warm_white_color_temperature := config.get(CONF_WARM_WHITE_COLOR_TEMPERATURE):
cg.add(var.set_warm_white_temperature(warm_white_color_temperature))
esphome/components/datetime/__init__.py
+1 -3
View File
@@ -148,9 +148,7 @@ async def setup_datetime_core_(var: MockObj, config: ConfigType) -> None:
forward=[automation.parent_ref(var).state_as_esptime()],
)
if CONF_TIME_ID in config:
rtc = await cg.get_variable(config[CONF_TIME_ID])
cg.add(var.set_rtc(rtc))
await cg.add_variable(var.set_rtc, config.get(CONF_TIME_ID))
for conf in config.get(CONF_ON_TIME, []):
trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
esphome/components/deep_sleep/__init__.py
+1 -2
View File
@@ -491,8 +491,7 @@ async def deep_sleep_enter_to_code(
until = config[CONF_UNTIL]
cg.add(var.set_until(until[CONF_HOUR], until[CONF_MINUTE], until[CONF_SECOND]))
time_ = await cg.get_variable(config[CONF_TIME_ID])
cg.add(var.set_time(time_))
await cg.add_variable(var.set_time, config[CONF_TIME_ID])
return var
esphome/components/dew_point/sensor.py
+2 -5
View File
@@ -40,8 +40,5 @@ async def to_code(config: ConfigType) -> None:
var = await sensor.new_sensor(config)
await cg.register_component(var, config)
temperature_sensor = await cg.get_variable(config[CONF_TEMPERATURE])
cg.add(var.set_temperature_sensor(temperature_sensor))
humidity_sensor = await cg.get_variable(config[CONF_HUMIDITY])
cg.add(var.set_humidity_sensor(humidity_sensor))
await cg.add_variable(var.set_temperature_sensor, config[CONF_TEMPERATURE])
await cg.add_variable(var.set_humidity_sensor, config[CONF_HUMIDITY])
esphome/components/display_menu_base/__init__.py
+3 -6
View File
@@ -280,15 +280,12 @@ async def menu_item_to_code(menu, config, parent):
if CONF_IMMEDIATE_EDIT in config:
cg.add(item.set_immediate_edit(config[CONF_IMMEDIATE_EDIT]))
if config[CONF_TYPE] == CONF_SELECT:
var = await cg.get_variable(config[CONF_SELECT])
cg.add(item.set_select_variable(var))
await cg.add_variable(item.set_select_variable, config[CONF_SELECT])
if config[CONF_TYPE] == CONF_NUMBER:
var = await cg.get_variable(config[CONF_NUMBER])
cg.add(item.set_number_variable(var))
await cg.add_variable(item.set_number_variable, config[CONF_NUMBER])
cg.add(item.set_format(config[CONF_FORMAT]))
if config[CONF_TYPE] == CONF_SWITCH:
var = await cg.get_variable(config[CONF_SWITCH])
cg.add(item.set_switch_variable(var))
await cg.add_variable(item.set_switch_variable, config[CONF_SWITCH])
cg.add(item.set_on_text(config[CONF_ON_TEXT]))
cg.add(item.set_off_text(config[CONF_OFF_TEXT]))
await _build_item_automations(item, config)
esphome/components/duty_time/sensor.py
+1 -3
View File
@@ -57,9 +57,7 @@ async def to_code(config: ConfigType) -> None:
var = await sensor.new_sensor(config)
await cg.register_component(var, config)
cg.add(var.set_restore(config[CONF_RESTORE]))
if CONF_SENSOR in config:
sens = await cg.get_variable(config[CONF_SENSOR])
cg.add(var.set_sensor(sens))
await cg.add_variable(var.set_sensor, config.get(CONF_SENSOR))
if CONF_LAMBDA in config:
lambda_ = await cg.process_lambda(config[CONF_LAMBDA], [], return_type=cg.bool_)
cg.add(var.set_lambda(lambda_))
esphome/components/ecocomfort2/__init__.py
+1 -2
View File
@@ -53,8 +53,7 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
await ble_client.register_ble_node(var, config)
if (time_id := config.get(CONF_TIME_ID)) is not None:
cg.add(var.set_time(await cg.get_variable(time_id)))
await cg.add_variable(var.set_time, config.get(CONF_TIME_ID))
def _final_validate(config: ConfigType) -> ConfigType:
esphome/components/endstop/cover.py
+2 -4
View File
@@ -43,15 +43,13 @@ async def to_code(config: ConfigType) -> None:
var.get_stop_trigger(), [], config[CONF_STOP_ACTION]
)
bin = await cg.get_variable(config[CONF_OPEN_ENDSTOP])
cg.add(var.set_open_endstop(bin))
await cg.add_variable(var.set_open_endstop, config[CONF_OPEN_ENDSTOP])
cg.add(var.set_open_duration(config[CONF_OPEN_DURATION]))
await automation.build_automation(
var.get_open_trigger(), [], config[CONF_OPEN_ACTION]
)
bin = await cg.get_variable(config[CONF_CLOSE_ENDSTOP])
cg.add(var.set_close_endstop(bin))
await cg.add_variable(var.set_close_endstop, config[CONF_CLOSE_ENDSTOP])
cg.add(var.set_close_duration(config[CONF_CLOSE_DURATION]))
await automation.build_automation(
var.get_close_trigger(), [], config[CONF_CLOSE_ACTION]
esphome/components/ens160_base/__init__.py
+4 -4
View File
@@ -70,9 +70,9 @@ async def to_code_base(config: ConfigType) -> MockObj:
await sensors(CONF_AQI, var.set_aqi)
if compensation_config := config.get(CONF_COMPENSATION):
sens = await cg.get_variable(compensation_config[CONF_TEMPERATURE])
cg.add(var.set_temperature(sens))
sens = await cg.get_variable(compensation_config[CONF_HUMIDITY])
cg.add(var.set_humidity(sens))
await cg.add_variable(
var.set_temperature, compensation_config[CONF_TEMPERATURE]
)
await cg.add_variable(var.set_humidity, compensation_config[CONF_HUMIDITY])
return var
esphome/components/esp32_camera/__init__.py
+1 -2
View File
@@ -376,8 +376,7 @@ async def to_code(config: ConfigType) -> None:
extclk = config[CONF_EXTERNAL_CLOCK]
cg.add(var.set_external_clock(extclk[CONF_PIN], extclk[CONF_FREQUENCY]))
if i2c_id := config.get(CONF_I2C_ID):
i2c_hub = await cg.get_variable(i2c_id)
cg.add(var.set_i2c_id(i2c_hub))
await cg.add_variable(var.set_i2c_id, i2c_id)
else:
i2c_pins = config[CONF_I2C_PINS]
cg.add(var.set_i2c_pins(i2c_pins[CONF_SDA], i2c_pins[CONF_SCL]))
esphome/components/esp32_hosted/update/__init__.py
+1 -2
View File
@@ -104,8 +104,7 @@ async def to_code(config: dict[str, Any]) -> None:
cg.add(var.set_firmware_data(prog_arr))
cg.add(var.set_firmware_size(len(firmware_data)))
else:
http_request_var = await cg.get_variable(config[CONF_HTTP_REQUEST_ID])
cg.add(var.set_http_request_parent(http_request_var))
await cg.add_variable(var.set_http_request_parent, config[CONF_HTTP_REQUEST_ID])
cg.add(var.set_source_url(config[CONF_SOURCE]))
cg.add_define("USE_ESP32_HOSTED_HTTP_UPDATE")
esphome/components/feedback/cover.py
+10 -18
View File
@@ -129,30 +129,22 @@ async def to_code(config: ConfigType) -> None:
var.get_open_trigger(), [], config[CONF_OPEN_ACTION]
)
cg.add(var.set_open_duration(config[CONF_OPEN_DURATION]))
if CONF_OPEN_ENDSTOP in config:
bin = await cg.get_variable(config[CONF_OPEN_ENDSTOP])
cg.add(var.set_open_endstop(bin))
if CONF_OPEN_SENSOR in config:
bin = await cg.get_variable(config[CONF_OPEN_SENSOR])
cg.add(var.set_open_sensor(bin))
if CONF_OPEN_OBSTACLE_SENSOR in config:
bin = await cg.get_variable(config[CONF_OPEN_OBSTACLE_SENSOR])
cg.add(var.set_open_obstacle_sensor(bin))
await cg.add_variable(var.set_open_endstop, config.get(CONF_OPEN_ENDSTOP))
await cg.add_variable(var.set_open_sensor, config.get(CONF_OPEN_SENSOR))
await cg.add_variable(
var.set_open_obstacle_sensor, config.get(CONF_OPEN_OBSTACLE_SENSOR)
)
# CLOSE
await automation.build_automation(
var.get_close_trigger(), [], config[CONF_CLOSE_ACTION]
)
cg.add(var.set_close_duration(config[CONF_CLOSE_DURATION]))
if CONF_CLOSE_ENDSTOP in config:
bin = await cg.get_variable(config[CONF_CLOSE_ENDSTOP])
cg.add(var.set_close_endstop(bin))
if CONF_CLOSE_SENSOR in config:
bin = await cg.get_variable(config[CONF_CLOSE_SENSOR])
cg.add(var.set_close_sensor(bin))
if CONF_CLOSE_OBSTACLE_SENSOR in config:
bin = await cg.get_variable(config[CONF_CLOSE_OBSTACLE_SENSOR])
cg.add(var.set_close_obstacle_sensor(bin))
await cg.add_variable(var.set_close_endstop, config.get(CONF_CLOSE_ENDSTOP))
await cg.add_variable(var.set_close_sensor, config.get(CONF_CLOSE_SENSOR))
await cg.add_variable(
var.set_close_obstacle_sensor, config.get(CONF_CLOSE_OBSTACLE_SENSOR)
)
# OTHER
if CONF_MAX_DURATION in config:
esphome/components/filter_lifetime/sensor.py
+4 -4
View File
@@ -72,15 +72,15 @@ async def to_code(config: ConfigType) -> None:
if (is_on := config.get(CONF_IS_ON)) is not None:
cg.add(var.set_is_on_lambda(await cg.templatable(is_on, [], bool)))
elif (is_on_sensor := config.get(CONF_IS_ON_SENSOR)) is not None:
cg.add(var.set_is_on_sensor(await cg.get_variable(is_on_sensor)))
await cg.add_variable(var.set_is_on_sensor, config.get(CONF_IS_ON_SENSOR))
if (current_speed := config.get(CONF_CURRENT_SPEED)) is not None:
cg.add(
var.set_current_speed_lambda(await cg.templatable(current_speed, [], float))
)
elif (speed_sensor := config.get(CONF_CURRENT_SPEED_SENSOR)) is not None:
cg.add(var.set_current_speed_sensor(await cg.get_variable(speed_sensor)))
await cg.add_variable(
var.set_current_speed_sensor, config.get(CONF_CURRENT_SPEED_SENSOR)
)
sensors = sensor.sub_sensors(config)
await sensors(CONF_RUNTIME_HOURS, var.set_runtime_hours_sensor)
esphome/components/gp2y1010au0f/sensor.py
+2 -4
View File
@@ -49,8 +49,7 @@ async def to_code(config: ConfigType) -> None:
await cg.register_component(var, config)
# the ADC sensor to read voltage from
adc_sensor = await cg.get_variable(config[CONF_SENSOR])
cg.add(var.set_adc_source(adc_sensor))
await cg.add_variable(var.set_adc_source, config[CONF_SENSOR])
cg.add(
var.set_voltage_refs(
config[CONF_ADC_VOLTAGE_OFFSET], config[CONF_ADC_VOLTAGE_MULTIPLIER]
@@ -58,5 +57,4 @@ async def to_code(config: ConfigType) -> None:
)
# the binary output to control the module's internal IR LED
led_output = await cg.get_variable(config[CONF_OUTPUT])
cg.add(var.set_led_output(led_output))
await cg.add_variable(var.set_led_output, config[CONF_OUTPUT])
esphome/components/graph/__init__.py
+4 -11
View File
@@ -169,8 +169,7 @@ async def to_code(config: ConfigType) -> None:
# Trace options
for trace in config[CONF_TRACES]:
tr = cg.new_Pvariable(trace[CONF_ID], GraphTrace())
sens = await cg.get_variable(trace[CONF_SENSOR])
cg.add(tr.set_sensor(sens))
await cg.add_variable(tr.set_sensor, trace[CONF_SENSOR])
if CONF_NAME in trace:
cg.add(tr.set_name(trace[CONF_NAME]))
else:
@@ -179,9 +178,7 @@ async def to_code(config: ConfigType) -> None:
cg.add(tr.set_line_thickness(trace[CONF_LINE_THICKNESS]))
if CONF_LINE_TYPE in trace:
cg.add(tr.set_line_type(trace[CONF_LINE_TYPE]))
if CONF_COLOR in trace:
c = await cg.get_variable(trace[CONF_COLOR])
cg.add(tr.set_line_color(c))
await cg.add_variable(tr.set_line_color, trace.get(CONF_COLOR))
if CONF_CONTINUOUS in trace:
cg.add(tr.set_continuous(trace[CONF_CONTINUOUS]))
cg.add(var.add_trace(tr))
@@ -189,12 +186,8 @@ async def to_code(config: ConfigType) -> None:
if CONF_LEGEND in config:
lgd = config[CONF_LEGEND]
legend = cg.new_Pvariable(lgd[CONF_ID], GraphLegend())
if CONF_NAME_FONT in lgd:
font = await cg.get_variable(lgd[CONF_NAME_FONT])
cg.add(legend.set_name_font(font))
if CONF_VALUE_FONT in lgd:
font = await cg.get_variable(lgd[CONF_VALUE_FONT])
cg.add(legend.set_value_font(font))
await cg.add_variable(legend.set_name_font, lgd.get(CONF_NAME_FONT))
await cg.add_variable(legend.set_value_font, lgd.get(CONF_VALUE_FONT))
if CONF_WIDTH in lgd:
cg.add(legend.set_width(lgd[CONF_WIDTH]))
if CONF_HEIGHT in lgd:
esphome/components/graphical_display_menu/__init__.py
+4 -13
View File
@@ -55,12 +55,8 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
if display_config := config.get(CONF_DISPLAY):
drawing_display = await cg.get_variable(display_config)
cg.add(var.set_display(drawing_display))
menu_font = await cg.get_variable(config[CONF_FONT])
cg.add(var.set_font(menu_font))
await cg.add_variable(var.set_display, config.get(CONF_DISPLAY))
await cg.add_variable(var.set_font, config[CONF_FONT])
if (menu_item_value_config := config.get(CONF_MENU_ITEM_VALUE, None)) is not None:
if isinstance(menu_item_value_config, core.Lambda):
@@ -73,13 +69,8 @@ async def to_code(config: ConfigType) -> None:
else:
cg.add(var.set_menu_item_value(menu_item_value_config))
if foreground_color_config := config.get(CONF_FOREGROUND_COLOR):
foreground_color = await cg.get_variable(foreground_color_config)
cg.add(var.set_foreground_color(foreground_color))
if background_color_config := config.get(CONF_BACKGROUND_COLOR):
background_color = await cg.get_variable(background_color_config)
cg.add(var.set_background_color(background_color))
await cg.add_variable(var.set_foreground_color, config.get(CONF_FOREGROUND_COLOR))
await cg.add_variable(var.set_background_color, config.get(CONF_BACKGROUND_COLOR))
for conf in config.get(CONF_ON_REDRAW, []):
await automation.build_callback_automation(
esphome/components/hbridge/light/__init__.py
+2 -4
View File
@@ -28,7 +28,5 @@ async def to_code(config: ConfigType) -> None:
await cg.register_component(var, config)
await light.register_light(var, config)
hside = await cg.get_variable(config[CONF_PIN_A])
cg.add(var.set_pina_pin(hside))
lside = await cg.get_variable(config[CONF_PIN_B])
cg.add(var.set_pinb_pin(lside))
await cg.add_variable(var.set_pina_pin, config[CONF_PIN_A])
await cg.add_variable(var.set_pinb_pin, config[CONF_PIN_B])
esphome/components/http_request/update/__init__.py
+2 -4
View File
@@ -32,10 +32,8 @@ CONFIG_SCHEMA = (
async def to_code(config: ConfigType) -> None:
var = await update.new_update(config)
ota_parent = await cg.get_variable(config[CONF_OTA_ID])
cg.add(var.set_ota_parent(ota_parent))
request_parent = await cg.get_variable(config[CONF_HTTP_REQUEST_ID])
cg.add(var.set_request_parent(request_parent))
await cg.add_variable(var.set_ota_parent, config[CONF_OTA_ID])
await cg.add_variable(var.set_request_parent, config[CONF_HTTP_REQUEST_ID])
cg.add(var.set_source_url(config[CONF_SOURCE]))
esphome/components/i2c/__init__.py
+1 -2
View File
@@ -390,8 +390,7 @@ async def register_i2c_device(var: MockObj, config: ConfigType) -> None:
This is a coroutine, you need to await it with an 'await' expression!
"""
parent = await cg.get_variable(config[CONF_I2C_ID])
cg.add(var.set_i2c_bus(parent))
await cg.add_variable(var.set_i2c_bus, config[CONF_I2C_ID])
cg.add(var.set_i2c_address(config[CONF_ADDRESS]))
esphome/components/improv_ble/__init__.py
+2 -7
View File
@@ -135,13 +135,8 @@ async def to_code(config: ConfigType) -> None:
cg.add(var.set_wifi_timeout(config[CONF_WIFI_TIMEOUT]))
if CONF_AUTHORIZER in config and config[CONF_AUTHORIZER] is not None:
activator = await cg.get_variable(config[CONF_AUTHORIZER])
cg.add(var.set_authorizer(activator))
if CONF_STATUS_INDICATOR in config:
status_indicator = await cg.get_variable(config[CONF_STATUS_INDICATOR])
cg.add(var.set_status_indicator(status_indicator))
await cg.add_variable(var.set_authorizer, config.get(CONF_AUTHORIZER))
await cg.add_variable(var.set_status_indicator, config.get(CONF_STATUS_INDICATOR))
if any(config.get(entry.conf_key) for entry in _CALLBACK_AUTOMATIONS):
cg.add_define("USE_IMPROV_BLE_STATE_CALLBACK")
esphome/components/improv_serial/__init__.py
+1 -1
View File
@@ -68,5 +68,5 @@ async def to_code(config: ConfigType) -> None:
await improv_base.setup_improv_core(var, config)
cg.add_define("USE_IMPROV_SERIAL")
if (uart_id := config.get(CONF_UART_ID)) is not None:
cg.add(var.set_uart(await cg.get_variable(uart_id)))
await cg.add_variable(var.set_uart, uart_id)
cg.add_define("USE_IMPROV_SERIAL_UART")
esphome/components/integration/sensor.py
+1 -2
View File
@@ -93,8 +93,7 @@ async def to_code(config: ConfigType) -> None:
await cg.register_component(var, config)
await sensor.register_sensor(var, config)
sens = await cg.get_variable(config[CONF_SENSOR])
cg.add(var.set_sensor(sens))
await cg.add_variable(var.set_sensor, config[CONF_SENSOR])
cg.add(var.set_time(config[CONF_TIME_UNIT]))
cg.add(var.set_method(config[CONF_INTEGRATION_METHOD]))
cg.add(var.set_restore(config[CONF_RESTORE]))
esphome/components/key_collector/__init__.py
+1 -2
View File
@@ -93,8 +93,7 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
for source_conf in config.get(CONF_SOURCE_ID, ()):
source = await cg.get_variable(source_conf)
cg.add(var.add_provider(source))
await cg.add_variable(var.add_provider, source_conf)
if CONF_MIN_LENGTH in config:
cg.add(var.set_min_length(config[CONF_MIN_LENGTH]))
if CONF_MAX_LENGTH in config:
esphome/components/lcd_menu/__init__.py
+1 -2
View File
@@ -61,8 +61,7 @@ FINAL_VALIDATE_SCHEMA = cv.All(
async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
disp = await cg.get_variable(config[CONF_DISPLAY_ID])
cg.add(var.set_display(disp))
await cg.add_variable(var.set_display, config[CONF_DISPLAY_ID])
cg.add(var.set_dimensions(config[CONF_DIMENSIONS][0], config[CONF_DIMENSIONS][1]))
await display_menu_to_code(var, config)
cg.add(var.set_mark_selected(config[CONF_MARK_SELECTED]))
esphome/components/ln882h_ble_tracker/__init__.py
+1 -2
View File
@@ -126,8 +126,7 @@ async def to_code(config: ConfigType) -> None:
var = cg.new_Pvariable(config[CONF_ID])
await cg.register_component(var, config)
parent = await cg.get_variable(config[CONF_LN882H_BLE_ID])
cg.add(var.set_parent(parent))
await cg.register_parented(var, config[CONF_LN882H_BLE_ID])
# The tracker registers itself as a controller scan listener in setup();
# request the codegen-sized StaticVector slot for it.
ln882h_ble.request_scan_listener_slot()