diff --git a/esphome/components/ld2410/binary_sensor.py b/esphome/components/ld2410/binary_sensor.py index 4e35f67fb..fb5b5cabf 100644 --- a/esphome/components/ld2410/binary_sensor.py +++ b/esphome/components/ld2410/binary_sensor.py @@ -5,6 +5,7 @@ from esphome.const import ( CONF_HAS_MOVING_TARGET, CONF_HAS_STILL_TARGET, CONF_HAS_TARGET, + CONF_ID, DEVICE_CLASS_MOTION, DEVICE_CLASS_OCCUPANCY, DEVICE_CLASS_PRESENCE, @@ -19,6 +20,7 @@ DEPENDENCIES = ["ld2410"] CONF_OUT_PIN_PRESENCE_STATUS = "out_pin_presence_status" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component), cv.Optional(CONF_HAS_TARGET): binary_sensor.binary_sensor_schema( device_class=DEVICE_CLASS_OCCUPANCY, diff --git a/esphome/components/ld2410/button/__init__.py b/esphome/components/ld2410/button/__init__.py index 1cd56082c..fa6f31ee2 100644 --- a/esphome/components/ld2410/button/__init__.py +++ b/esphome/components/ld2410/button/__init__.py @@ -3,6 +3,7 @@ from esphome.components import button import esphome.config_validation as cv from esphome.const import ( CONF_FACTORY_RESET, + CONF_ID, CONF_RESTART, DEVICE_CLASS_RESTART, ENTITY_CATEGORY_CONFIG, @@ -21,6 +22,7 @@ RestartButton = ld2410_ns.class_("RestartButton", button.Button) CONF_QUERY_PARAMS = "query_params" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component), cv.Optional(CONF_FACTORY_RESET): button.button_schema( FactoryResetButton, diff --git a/esphome/components/ld2410/number/__init__.py b/esphome/components/ld2410/number/__init__.py index ffa4e7e14..01dbcc785 100644 --- a/esphome/components/ld2410/number/__init__.py +++ b/esphome/components/ld2410/number/__init__.py @@ -31,6 +31,7 @@ TIMEOUT_GROUP = "timeout" CONFIG_SCHEMA = cv.Schema( { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component), cv.Inclusive(CONF_TIMEOUT, TIMEOUT_GROUP): number.number_schema( MaxDistanceTimeoutNumber, diff --git a/esphome/components/ld2410/select/__init__.py b/esphome/components/ld2410/select/__init__.py index 686afdef1..9c4f654aa 100644 --- a/esphome/components/ld2410/select/__init__.py +++ b/esphome/components/ld2410/select/__init__.py @@ -3,6 +3,7 @@ from esphome.components import select import esphome.config_validation as cv from esphome.const import ( CONF_BAUD_RATE, + CONF_ID, ENTITY_CATEGORY_CONFIG, ICON_LIGHTBULB, ICON_RULER, @@ -22,6 +23,7 @@ CONF_OUT_PIN_LEVEL = "out_pin_level" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component), cv.Optional(CONF_DISTANCE_RESOLUTION): select.select_schema( DistanceResolutionSelect, diff --git a/esphome/components/ld2410/sensor.py b/esphome/components/ld2410/sensor.py index 3bd34963b..459018e26 100644 --- a/esphome/components/ld2410/sensor.py +++ b/esphome/components/ld2410/sensor.py @@ -2,6 +2,7 @@ import esphome.codegen as cg from esphome.components import sensor import esphome.config_validation as cv from esphome.const import ( + CONF_ID, CONF_LIGHT, CONF_MOVING_DISTANCE, DEVICE_CLASS_DISTANCE, @@ -28,6 +29,7 @@ CONF_STILL_ENERGY = "still_energy" CONFIG_SCHEMA = cv.Schema( { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component), cv.Optional(CONF_MOVING_DISTANCE): sensor.sensor_schema( device_class=DEVICE_CLASS_DISTANCE, diff --git a/esphome/components/ld2410/switch/__init__.py b/esphome/components/ld2410/switch/__init__.py index 71b8a40a2..4276b28a7 100644 --- a/esphome/components/ld2410/switch/__init__.py +++ b/esphome/components/ld2410/switch/__init__.py @@ -3,6 +3,7 @@ from esphome.components import switch import esphome.config_validation as cv from esphome.const import ( CONF_BLUETOOTH, + CONF_ID, DEVICE_CLASS_SWITCH, ENTITY_CATEGORY_CONFIG, ICON_BLUETOOTH, @@ -17,6 +18,7 @@ EngineeringModeSwitch = ld2410_ns.class_("EngineeringModeSwitch", switch.Switch) CONF_ENGINEERING_MODE = "engineering_mode" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component), cv.Optional(CONF_ENGINEERING_MODE): switch.switch_schema( EngineeringModeSwitch, diff --git a/esphome/components/ld2410/text_sensor.py b/esphome/components/ld2410/text_sensor.py index 5a021d916..a34c8ec0d 100644 --- a/esphome/components/ld2410/text_sensor.py +++ b/esphome/components/ld2410/text_sensor.py @@ -2,6 +2,7 @@ import esphome.codegen as cg from esphome.components import text_sensor import esphome.config_validation as cv from esphome.const import ( + CONF_ID, CONF_MAC_ADDRESS, CONF_VERSION, ENTITY_CATEGORY_DIAGNOSTIC, @@ -14,6 +15,7 @@ from . import CONF_LD2410_ID, LD2410Component DEPENDENCIES = ["ld2410"] CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2410_ID): cv.use_id(LD2410Component), cv.Optional(CONF_VERSION): text_sensor.text_sensor_schema( entity_category=ENTITY_CATEGORY_DIAGNOSTIC, icon=ICON_CHIP diff --git a/esphome/components/ld2412/binary_sensor.py b/esphome/components/ld2412/binary_sensor.py index aa1b0d2cd..98fa5965c 100644 --- a/esphome/components/ld2412/binary_sensor.py +++ b/esphome/components/ld2412/binary_sensor.py @@ -5,6 +5,7 @@ from esphome.const import ( CONF_HAS_MOVING_TARGET, CONF_HAS_STILL_TARGET, CONF_HAS_TARGET, + CONF_ID, DEVICE_CLASS_MOTION, DEVICE_CLASS_OCCUPANCY, DEVICE_CLASS_RUNNING, @@ -20,6 +21,7 @@ DEPENDENCIES = ["ld2412"] CONF_DYNAMIC_BACKGROUND_CORRECTION_STATUS = "dynamic_background_correction_status" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component), cv.Optional( CONF_DYNAMIC_BACKGROUND_CORRECTION_STATUS diff --git a/esphome/components/ld2412/button/__init__.py b/esphome/components/ld2412/button/__init__.py index e78cad4b8..e0ca28526 100644 --- a/esphome/components/ld2412/button/__init__.py +++ b/esphome/components/ld2412/button/__init__.py @@ -3,6 +3,7 @@ from esphome.components import button import esphome.config_validation as cv from esphome.const import ( CONF_FACTORY_RESET, + CONF_ID, CONF_RESTART, DEVICE_CLASS_RESTART, ENTITY_CATEGORY_CONFIG, @@ -26,6 +27,7 @@ CONF_QUERY_PARAMS = "query_params" CONF_START_DYNAMIC_BACKGROUND_CORRECTION = "start_dynamic_background_correction" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component), cv.Optional(CONF_FACTORY_RESET): button.button_schema( FactoryResetButton, diff --git a/esphome/components/ld2412/number/__init__.py b/esphome/components/ld2412/number/__init__.py index 5b0d6d874..b6e1c8d03 100644 --- a/esphome/components/ld2412/number/__init__.py +++ b/esphome/components/ld2412/number/__init__.py @@ -31,6 +31,7 @@ TIMEOUT_GROUP = "timeout" CONFIG_SCHEMA = cv.Schema( { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component), cv.Optional(CONF_LIGHT_THRESHOLD): number.number_schema( LightThresholdNumber, diff --git a/esphome/components/ld2412/select/__init__.py b/esphome/components/ld2412/select/__init__.py index d71ce460d..a54cd700e 100644 --- a/esphome/components/ld2412/select/__init__.py +++ b/esphome/components/ld2412/select/__init__.py @@ -3,6 +3,7 @@ from esphome.components import select import esphome.config_validation as cv from esphome.const import ( CONF_BAUD_RATE, + CONF_ID, ENTITY_CATEGORY_CONFIG, ICON_LIGHTBULB, ICON_RULER, @@ -22,6 +23,7 @@ CONF_OUT_PIN_LEVEL = "out_pin_level" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component), cv.Optional(CONF_BAUD_RATE): select.select_schema( BaudRateSelect, diff --git a/esphome/components/ld2412/sensor.py b/esphome/components/ld2412/sensor.py index 0bfbd9bf1..f562afe0e 100644 --- a/esphome/components/ld2412/sensor.py +++ b/esphome/components/ld2412/sensor.py @@ -2,6 +2,7 @@ import esphome.codegen as cg from esphome.components import sensor import esphome.config_validation as cv from esphome.const import ( + CONF_ID, CONF_LIGHT, CONF_MOVING_DISTANCE, DEVICE_CLASS_DISTANCE, @@ -28,6 +29,7 @@ CONF_STILL_ENERGY = "still_energy" CONFIG_SCHEMA = cv.Schema( { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component), cv.Optional(CONF_DETECTION_DISTANCE): sensor.sensor_schema( device_class=DEVICE_CLASS_DISTANCE, diff --git a/esphome/components/ld2412/switch/__init__.py b/esphome/components/ld2412/switch/__init__.py index df994687e..7a87e9e48 100644 --- a/esphome/components/ld2412/switch/__init__.py +++ b/esphome/components/ld2412/switch/__init__.py @@ -3,6 +3,7 @@ from esphome.components import switch import esphome.config_validation as cv from esphome.const import ( CONF_BLUETOOTH, + CONF_ID, DEVICE_CLASS_SWITCH, ENTITY_CATEGORY_CONFIG, ICON_BLUETOOTH, @@ -17,6 +18,7 @@ EngineeringModeSwitch = LD2412_ns.class_("EngineeringModeSwitch", switch.Switch) CONF_ENGINEERING_MODE = "engineering_mode" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component), cv.Optional(CONF_BLUETOOTH): switch.switch_schema( BluetoothSwitch, diff --git a/esphome/components/ld2412/text_sensor.py b/esphome/components/ld2412/text_sensor.py index 107449493..22fba5193 100644 --- a/esphome/components/ld2412/text_sensor.py +++ b/esphome/components/ld2412/text_sensor.py @@ -2,6 +2,7 @@ import esphome.codegen as cg from esphome.components import text_sensor import esphome.config_validation as cv from esphome.const import ( + CONF_ID, CONF_MAC_ADDRESS, CONF_VERSION, ENTITY_CATEGORY_DIAGNOSTIC, @@ -14,6 +15,7 @@ from . import CONF_LD2412_ID, LD2412Component DEPENDENCIES = ["ld2412"] CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2412_ID): cv.use_id(LD2412Component), cv.Optional(CONF_VERSION): text_sensor.text_sensor_schema( entity_category=ENTITY_CATEGORY_DIAGNOSTIC, icon=ICON_CHIP diff --git a/esphome/components/ld2450/binary_sensor.py b/esphome/components/ld2450/binary_sensor.py index 37f722b0f..89e629253 100644 --- a/esphome/components/ld2450/binary_sensor.py +++ b/esphome/components/ld2450/binary_sensor.py @@ -5,6 +5,7 @@ from esphome.const import ( CONF_HAS_MOVING_TARGET, CONF_HAS_STILL_TARGET, CONF_HAS_TARGET, + CONF_ID, DEVICE_CLASS_MOTION, DEVICE_CLASS_OCCUPANCY, ) @@ -18,6 +19,7 @@ ICON_SHIELD_ACCOUNT = "mdi:shield-account" ICON_TARGET_ACCOUNT = "mdi:target-account" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component), cv.Optional(CONF_HAS_TARGET): binary_sensor.binary_sensor_schema( device_class=DEVICE_CLASS_OCCUPANCY, diff --git a/esphome/components/ld2450/button/__init__.py b/esphome/components/ld2450/button/__init__.py index 429aa5938..682487d75 100644 --- a/esphome/components/ld2450/button/__init__.py +++ b/esphome/components/ld2450/button/__init__.py @@ -3,6 +3,7 @@ from esphome.components import button import esphome.config_validation as cv from esphome.const import ( CONF_FACTORY_RESET, + CONF_ID, CONF_RESTART, DEVICE_CLASS_RESTART, ENTITY_CATEGORY_CONFIG, @@ -17,6 +18,7 @@ FactoryResetButton = ld2450_ns.class_("FactoryResetButton", button.Button) RestartButton = ld2450_ns.class_("RestartButton", button.Button) CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component), cv.Optional(CONF_FACTORY_RESET): button.button_schema( FactoryResetButton, diff --git a/esphome/components/ld2450/number/__init__.py b/esphome/components/ld2450/number/__init__.py index d2098f613..799c0703f 100644 --- a/esphome/components/ld2450/number/__init__.py +++ b/esphome/components/ld2450/number/__init__.py @@ -28,6 +28,7 @@ ZoneCoordinateNumber = ld2450_ns.class_("ZoneCoordinateNumber", number.Number) CONFIG_SCHEMA = cv.Schema( { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component), cv.Required(CONF_PRESENCE_TIMEOUT): number.number_schema( PresenceTimeoutNumber, diff --git a/esphome/components/ld2450/select/__init__.py b/esphome/components/ld2450/select/__init__.py index 25dd81963..4f237dc94 100644 --- a/esphome/components/ld2450/select/__init__.py +++ b/esphome/components/ld2450/select/__init__.py @@ -1,7 +1,12 @@ import esphome.codegen as cg from esphome.components import select import esphome.config_validation as cv -from esphome.const import CONF_BAUD_RATE, ENTITY_CATEGORY_CONFIG, ICON_THERMOMETER +from esphome.const import ( + CONF_BAUD_RATE, + CONF_ID, + ENTITY_CATEGORY_CONFIG, + ICON_THERMOMETER, +) from .. import CONF_LD2450_ID, LD2450Component, ld2450_ns @@ -11,6 +16,7 @@ BaudRateSelect = ld2450_ns.class_("BaudRateSelect", select.Select) ZoneTypeSelect = ld2450_ns.class_("ZoneTypeSelect", select.Select) CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component), cv.Optional(CONF_BAUD_RATE): select.select_schema( BaudRateSelect, diff --git a/esphome/components/ld2450/sensor.py b/esphome/components/ld2450/sensor.py index 4a3597d58..3dee8bf47 100644 --- a/esphome/components/ld2450/sensor.py +++ b/esphome/components/ld2450/sensor.py @@ -4,6 +4,7 @@ import esphome.config_validation as cv from esphome.const import ( CONF_ANGLE, CONF_DISTANCE, + CONF_ID, CONF_RESOLUTION, CONF_SPEED, CONF_X, @@ -40,6 +41,7 @@ UNIT_MILLIMETER_PER_SECOND = "mm/s" CONFIG_SCHEMA = cv.Schema( { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component), cv.Optional(CONF_TARGET_COUNT): sensor.sensor_schema( accuracy_decimals=0, diff --git a/esphome/components/ld2450/switch/__init__.py b/esphome/components/ld2450/switch/__init__.py index 2d76b7578..0c0c92377 100644 --- a/esphome/components/ld2450/switch/__init__.py +++ b/esphome/components/ld2450/switch/__init__.py @@ -3,6 +3,7 @@ from esphome.components import switch import esphome.config_validation as cv from esphome.const import ( CONF_BLUETOOTH, + CONF_ID, DEVICE_CLASS_SWITCH, ENTITY_CATEGORY_CONFIG, ICON_BLUETOOTH, @@ -17,6 +18,7 @@ MultiTargetSwitch = ld2450_ns.class_("MultiTargetSwitch", switch.Switch) CONF_MULTI_TARGET = "multi_target" CONFIG_SCHEMA = { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component), cv.Optional(CONF_BLUETOOTH): switch.switch_schema( BluetoothSwitch, diff --git a/esphome/components/ld2450/text_sensor.py b/esphome/components/ld2450/text_sensor.py index 89b6939a2..4e5d7d419 100644 --- a/esphome/components/ld2450/text_sensor.py +++ b/esphome/components/ld2450/text_sensor.py @@ -3,6 +3,7 @@ from esphome.components import text_sensor import esphome.config_validation as cv from esphome.const import ( CONF_DIRECTION, + CONF_ID, CONF_MAC_ADDRESS, CONF_VERSION, ENTITY_CATEGORY_DIAGNOSTIC, @@ -20,6 +21,7 @@ MAX_TARGETS = 3 CONFIG_SCHEMA = cv.Schema( { + cv.GenerateID(CONF_ID): cv.declare_id(cg.EntityBase), cv.GenerateID(CONF_LD2450_ID): cv.use_id(LD2450Component), cv.Optional(CONF_VERSION): text_sensor.text_sensor_schema( entity_category=ENTITY_CATEGORY_DIAGNOSTIC, diff --git a/tests/components/ld2410/common.yaml b/tests/components/ld2410/common.yaml index 7d168bf7e..71b1ffd04 100644 --- a/tests/components/ld2410/common.yaml +++ b/tests/components/ld2410/common.yaml @@ -3,6 +3,7 @@ ld2410: binary_sensor: - platform: ld2410 + id: ld2410_binary has_target: name: presence has_moving_target: @@ -14,6 +15,7 @@ binary_sensor: button: - platform: ld2410 + id: ld2410_button factory_reset: name: factory reset restart: @@ -23,6 +25,7 @@ button: number: - platform: ld2410 + id: ld2410_number light_threshold: name: light threshold timeout: @@ -79,6 +82,7 @@ number: select: - platform: ld2410 + id: ld2410_select distance_resolution: name: distance resolution baud_rate: @@ -90,6 +94,7 @@ select: sensor: - platform: ld2410 + id: ld2410_sensor light: name: light moving_distance: @@ -150,6 +155,7 @@ sensor: switch: - platform: ld2410 + id: ld2410_switch engineering_mode: name: control ld2410 engineering mode bluetooth: @@ -157,6 +163,7 @@ switch: text_sensor: - platform: ld2410 + id: ld2410_textsensor version: name: presenece sensor version mac_address: diff --git a/tests/components/ld2412/common.yaml b/tests/components/ld2412/common.yaml index 18c4612ff..c5bda688d 100644 --- a/tests/components/ld2412/common.yaml +++ b/tests/components/ld2412/common.yaml @@ -3,6 +3,7 @@ ld2412: binary_sensor: - platform: ld2412 + id: ld2412_binary dynamic_background_correction_status: name: Dynamic Background Correction Status has_target: @@ -14,6 +15,7 @@ binary_sensor: button: - platform: ld2412 + id: ld2412_button factory_reset: name: Factory reset restart: @@ -25,6 +27,7 @@ button: number: - platform: ld2412 + id: ld2412_number light_threshold: name: Light Threshold timeout: @@ -106,6 +109,7 @@ number: select: - platform: ld2412 + id: ld2412_select light_function: name: Light Function out_pin_level: @@ -129,6 +133,7 @@ select: sensor: - platform: ld2412 + id: ld2412_sensor light: name: Light moving_distance: @@ -214,6 +219,7 @@ sensor: switch: - platform: ld2412 + id: ld2412_switch bluetooth: name: Bluetooth engineering_mode: @@ -221,6 +227,7 @@ switch: text_sensor: - platform: ld2412 + id: ld2412_textsensor version: name: Firmware version mac_address: diff --git a/tests/components/ld2450/common.yaml b/tests/components/ld2450/common.yaml index 9dcefffd0..cfa3c922f 100644 --- a/tests/components/ld2450/common.yaml +++ b/tests/components/ld2450/common.yaml @@ -3,6 +3,7 @@ ld2450: button: - platform: ld2450 + id: ld2450_button ld2450_id: ld2450_radar factory_reset: name: LD2450 Factory Reset @@ -13,6 +14,7 @@ button: sensor: - platform: ld2450 + id: ld2450_sensor ld2450_id: ld2450_radar target_count: name: Presence Target Count @@ -83,6 +85,7 @@ sensor: binary_sensor: - platform: ld2450 + id: ld2450_binary ld2450_id: ld2450_radar has_target: name: Presence @@ -93,6 +96,7 @@ binary_sensor: switch: - platform: ld2450 + id: ld2450_switch ld2450_id: ld2450_radar bluetooth: name: Bluetooth @@ -101,6 +105,7 @@ switch: text_sensor: - platform: ld2450 + id: ld2450_textsensor ld2450_id: ld2450_radar version: name: LD2450 Firmware @@ -118,6 +123,7 @@ text_sensor: number: - platform: ld2450 + id: ld2450_number ld2450_id: ld2450_radar presence_timeout: name: Timeout @@ -151,6 +157,7 @@ number: select: - platform: ld2450 + id: ld2450_select ld2450_id: ld2450_radar baud_rate: name: Baud Rate