[ld2450] Use the sub_* helpers for optional child entities (#19775)

esphome/components/ld2450/binary_sensor.py

@@ -41,13 +41,8 @@ CONFIG_SCHEMA = {
 
 
 async def to_code(config: ConfigType) -> None:
-    ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
-    if has_target_config := config.get(CONF_HAS_TARGET):
-        sens = await binary_sensor.new_binary_sensor(has_target_config)
-        cg.add(ld2450_component.set_target_binary_sensor(sens))
-    if has_moving_target_config := config.get(CONF_HAS_MOVING_TARGET):
-        sens = await binary_sensor.new_binary_sensor(has_moving_target_config)
-        cg.add(ld2450_component.set_moving_target_binary_sensor(sens))
-    if has_still_target_config := config.get(CONF_HAS_STILL_TARGET):
-        sens = await binary_sensor.new_binary_sensor(has_still_target_config)
-        cg.add(ld2450_component.set_still_target_binary_sensor(sens))
+    hub = await cg.get_variable(config[CONF_LD2450_ID])
+    binary_sensors = binary_sensor.sub_binary_sensors(config)
+    await binary_sensors(CONF_HAS_TARGET, hub.set_target_binary_sensor)
+    await binary_sensors(CONF_HAS_MOVING_TARGET, hub.set_moving_target_binary_sensor)
+    await binary_sensors(CONF_HAS_STILL_TARGET, hub.set_still_target_binary_sensor)

esphome/components/ld2450/button/__init__.py

@@ -37,12 +37,7 @@ CONFIG_SCHEMA = {
 
 
 async def to_code(config: ConfigType) -> None:
-    ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
-    if factory_reset_config := config.get(CONF_FACTORY_RESET):
-        b = await button.new_button(factory_reset_config)
-        await cg.register_parented(b, config[CONF_LD2450_ID])
-        cg.add(ld2450_component.set_factory_reset_button(b))
-    if restart_config := config.get(CONF_RESTART):
-        b = await button.new_button(restart_config)
-        await cg.register_parented(b, config[CONF_LD2450_ID])
-        cg.add(ld2450_component.set_restart_button(b))
+    hub = await cg.get_variable(config[CONF_LD2450_ID])
+    buttons = button.sub_buttons(config, parent=hub)
+    await buttons(CONF_FACTORY_RESET, hub.set_factory_reset_button)
+    await buttons(CONF_RESTART, hub.set_restart_button)

esphome/components/ld2450/number/__init__.py

@@ -80,16 +80,15 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 
 
 async def to_code(config: ConfigType) -> None:
-    ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
-    if presence_timeout_config := config.get(CONF_PRESENCE_TIMEOUT):
-        n = await number.new_number(
-            presence_timeout_config,
-            min_value=0,
-            max_value=3600,
-            step=1,
-        )
-        await cg.register_parented(n, config[CONF_LD2450_ID])
-        cg.add(ld2450_component.set_presence_timeout_number(n))
+    hub = await cg.get_variable(config[CONF_LD2450_ID])
+    numbers = number.sub_numbers(config, parent=hub)
+    await numbers(
+        CONF_PRESENCE_TIMEOUT,
+        hub.set_presence_timeout_number,
+        min_value=0,
+        max_value=3600,
+        step=1,
+    )
     for zone_num in range(MAX_ZONES):
         if zone_conf := config.get(f"zone_{zone_num + 1}"):
             zone_x1_config = zone_conf.get(CONF_X1)
@@ -97,27 +96,27 @@ async def to_code(config: ConfigType) -> None:
             await number.register_number(
                 x1, zone_x1_config, min_value=-4860, max_value=4860, step=1
             )
-            await cg.register_parented(x1, config[CONF_LD2450_ID])
+            await cg.register_parented(x1, hub)
 
             zone_y1_config = zone_conf.get(CONF_Y1)
             y1 = cg.new_Pvariable(zone_y1_config[CONF_ID], zone_num)
             await number.register_number(
                 y1, zone_y1_config, min_value=0, max_value=7560, step=1
             )
-            await cg.register_parented(y1, config[CONF_LD2450_ID])
+            await cg.register_parented(y1, hub)
 
             zone_x2_config = zone_conf.get(CONF_X2)
             x2 = cg.new_Pvariable(zone_x2_config[CONF_ID], zone_num)
             await number.register_number(
                 x2, zone_x2_config, min_value=-4860, max_value=4860, step=1
             )
-            await cg.register_parented(x2, config[CONF_LD2450_ID])
+            await cg.register_parented(x2, hub)
 
             zone_y2_config = zone_conf.get(CONF_Y2)
             y2 = cg.new_Pvariable(zone_y2_config[CONF_ID], zone_num)
             await number.register_number(
                 y2, zone_y2_config, min_value=0, max_value=7560, step=1
             )
-            await cg.register_parented(y2, config[CONF_LD2450_ID])
+            await cg.register_parented(y2, hub)
 
-            cg.add(ld2450_component.set_zone_numbers(zone_num, x1, y1, x2, y2))
+            cg.add(hub.set_zone_numbers(zone_num, x1, y1, x2, y2))

esphome/components/ld2450/select/__init__.py

@@ -33,31 +33,28 @@ CONFIG_SCHEMA = {
 
 
 async def to_code(config: ConfigType) -> None:
-    ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
-    if baud_rate_config := config.get(CONF_BAUD_RATE):
-        s = await select.new_select(
-            baud_rate_config,
-            options=[
-                "9600",
-                "19200",
-                "38400",
-                "57600",
-                "115200",
-                "230400",
-                "256000",
-                "460800",
-            ],
-        )
-        await cg.register_parented(s, config[CONF_LD2450_ID])
-        cg.add(ld2450_component.set_baud_rate_select(s))
-    if zone_type_config := config.get(CONF_ZONE_TYPE):
-        s = await select.new_select(
-            zone_type_config,
-            options=[
-                "Disabled",
-                "Detection",
-                "Filter",
-            ],
-        )
-        await cg.register_parented(s, config[CONF_LD2450_ID])
-        cg.add(ld2450_component.set_zone_type_select(s))
+    hub = await cg.get_variable(config[CONF_LD2450_ID])
+    selects = select.sub_selects(config, parent=hub)
+    await selects(
+        CONF_BAUD_RATE,
+        hub.set_baud_rate_select,
+        options=[
+            "9600",
+            "19200",
+            "38400",
+            "57600",
+            "115200",
+            "230400",
+            "256000",
+            "460800",
+        ],
+    )
+    await selects(
+        CONF_ZONE_TYPE,
+        hub.set_zone_type_select,
+        options=[
+            "Disabled",
+            "Detection",
+            "Filter",
+        ],
+    )

esphome/components/ld2450/sensor.py

@@ -228,47 +228,40 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 
 
 async def to_code(config: ConfigType) -> None:
-    ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
+    hub = await cg.get_variable(config[CONF_LD2450_ID])
 
-    if target_count_config := config.get(CONF_TARGET_COUNT):
-        sens = await sensor.new_sensor(target_count_config)
-        cg.add(ld2450_component.set_target_count_sensor(sens))
-
-    if still_target_count_config := config.get(CONF_STILL_TARGET_COUNT):
-        sens = await sensor.new_sensor(still_target_count_config)
-        cg.add(ld2450_component.set_still_target_count_sensor(sens))
-
-    if moving_target_count_config := config.get(CONF_MOVING_TARGET_COUNT):
-        sens = await sensor.new_sensor(moving_target_count_config)
-        cg.add(ld2450_component.set_moving_target_count_sensor(sens))
+    sensors = sensor.sub_sensors(config)
+    await sensors(CONF_TARGET_COUNT, hub.set_target_count_sensor)
+    await sensors(CONF_STILL_TARGET_COUNT, hub.set_still_target_count_sensor)
+    await sensors(CONF_MOVING_TARGET_COUNT, hub.set_moving_target_count_sensor)
     for n in range(MAX_TARGETS):
         if target_conf := config.get(f"target_{n + 1}"):
             if x_config := target_conf.get(CONF_X):
                 sens = await sensor.new_sensor(x_config)
-                cg.add(ld2450_component.set_move_x_sensor(n, sens))
+                cg.add(hub.set_move_x_sensor(n, sens))
             if y_config := target_conf.get(CONF_Y):
                 sens = await sensor.new_sensor(y_config)
-                cg.add(ld2450_component.set_move_y_sensor(n, sens))
+                cg.add(hub.set_move_y_sensor(n, sens))
             if speed_config := target_conf.get(CONF_SPEED):
                 sens = await sensor.new_sensor(speed_config)
-                cg.add(ld2450_component.set_move_speed_sensor(n, sens))
+                cg.add(hub.set_move_speed_sensor(n, sens))
             if angle_config := target_conf.get(CONF_ANGLE):
                 sens = await sensor.new_sensor(angle_config)
-                cg.add(ld2450_component.set_move_angle_sensor(n, sens))
+                cg.add(hub.set_move_angle_sensor(n, sens))
             if distance_config := target_conf.get(CONF_DISTANCE):
                 sens = await sensor.new_sensor(distance_config)
-                cg.add(ld2450_component.set_move_distance_sensor(n, sens))
+                cg.add(hub.set_move_distance_sensor(n, sens))
             if resolution_config := target_conf.get(CONF_RESOLUTION):
                 sens = await sensor.new_sensor(resolution_config)
-                cg.add(ld2450_component.set_move_resolution_sensor(n, sens))
+                cg.add(hub.set_move_resolution_sensor(n, sens))
     for n in range(MAX_ZONES):
         if zone_config := config.get(f"zone_{n + 1}"):
             if target_count_config := zone_config.get(CONF_TARGET_COUNT):
                 sens = await sensor.new_sensor(target_count_config)
-                cg.add(ld2450_component.set_zone_target_count_sensor(n, sens))
+                cg.add(hub.set_zone_target_count_sensor(n, sens))
             if still_target_count_config := zone_config.get(CONF_STILL_TARGET_COUNT):
                 sens = await sensor.new_sensor(still_target_count_config)
-                cg.add(ld2450_component.set_zone_still_target_count_sensor(n, sens))
+                cg.add(hub.set_zone_still_target_count_sensor(n, sens))
             if moving_target_count_config := zone_config.get(CONF_MOVING_TARGET_COUNT):
                 sens = await sensor.new_sensor(moving_target_count_config)
-                cg.add(ld2450_component.set_zone_moving_target_count_sensor(n, sens))
+                cg.add(hub.set_zone_moving_target_count_sensor(n, sens))

esphome/components/ld2450/switch/__init__.py

@@ -37,12 +37,7 @@ CONFIG_SCHEMA = {
 
 
 async def to_code(config: ConfigType) -> None:
-    ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
-    if bluetooth_config := config.get(CONF_BLUETOOTH):
-        s = await switch.new_switch(bluetooth_config)
-        await cg.register_parented(s, config[CONF_LD2450_ID])
-        cg.add(ld2450_component.set_bluetooth_switch(s))
-    if multi_target_config := config.get(CONF_MULTI_TARGET):
-        s = await switch.new_switch(multi_target_config)
-        await cg.register_parented(s, config[CONF_LD2450_ID])
-        cg.add(ld2450_component.set_multi_target_switch(s))
+    hub = await cg.get_variable(config[CONF_LD2450_ID])
+    switches = switch.sub_switches(config, parent=hub)
+    await switches(CONF_BLUETOOTH, hub.set_bluetooth_switch)
+    await switches(CONF_MULTI_TARGET, hub.set_multi_target_switch)

esphome/components/ld2450/text_sensor.py

@@ -51,16 +51,13 @@ CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
 
 
 async def to_code(config: ConfigType) -> None:
-    ld2450_component = await cg.get_variable(config[CONF_LD2450_ID])
-    if version_config := config.get(CONF_VERSION):
-        sens = await text_sensor.new_text_sensor(version_config)
-        cg.add(ld2450_component.set_version_text_sensor(sens))
-    if mac_address_config := config.get(CONF_MAC_ADDRESS):
-        sens = await text_sensor.new_text_sensor(mac_address_config)
-        cg.add(ld2450_component.set_mac_text_sensor(sens))
+    hub = await cg.get_variable(config[CONF_LD2450_ID])
+    text_sensors = text_sensor.sub_text_sensors(config)
+    await text_sensors(CONF_VERSION, hub.set_version_text_sensor)
+    await text_sensors(CONF_MAC_ADDRESS, hub.set_mac_text_sensor)
     for n in range(MAX_TARGETS):
         if (direction_conf := config.get(f"target_{n + 1}")) and (
             direction_config := direction_conf.get(CONF_DIRECTION)
         ):
             sens = await text_sensor.new_text_sensor(direction_config)
-            cg.add(ld2450_component.set_direction_text_sensor(n, sens))
+            cg.add(hub.set_direction_text_sensor(n, sens))