sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-02 18:12:20 +01:00
Code Issues Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-21 13:33:05 +02:00
parent 153a6440dc
commit 63de88dd57
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
esphome/components/api/api_connection.h
View File

@@ -301,9 +301,6 @@ class APIConnection : public APIServerConnection {
response.icon = entity->get_icon(); response.icon = entity->get_icon();
response.disabled_by_default = entity->is_disabled_by_default(); response.disabled_by_default = entity->is_disabled_by_default();
response.entity_category = static_cast<enums::EntityCategory>(entity->get_entity_category()); response.entity_category = static_cast<enums::EntityCategory>(entity->get_entity_category());
#ifdef USE_SUB_DEVICE
response.device_id = entity->get_device_id();
#endif
} }
// Helper function to fill common entity state fields // Helper function to fill common entity state fields

8
esphome/core/config.py
View File

@@ -462,10 +462,8 @@ async def to_code(config):
cg.add(dev.set_device_id(fnv1a_32bit_hash(str(dev_conf[CONF_ID])))) cg.add(dev.set_device_id(fnv1a_32bit_hash(str(dev_conf[CONF_ID]))))
cg.add(dev.set_name(dev_conf[CONF_NAME])) cg.add(dev.set_name(dev_conf[CONF_NAME]))
if CONF_AREA_ID in dev_conf: if CONF_AREA_ID in dev_conf:
# The area_id in dev_conf is the ID reference from cv.use_id # Get the area variable and use its area_id
# We need to get the same hash that was used when creating the area area = await cg.get_variable(dev_conf[CONF_AREA_ID])
area_id_str = str(dev_conf[CONF_AREA_ID].id) cg.add(dev.set_area_id(area.get_area_id()))
area_id = fnv1a_32bit_hash(area_id_str)
cg.add(dev.set_area_id(area_id))
cg.add(cg.App.register_sub_device(dev)) cg.add(cg.App.register_sub_device(dev))
cg.add_define("USE_SUB_DEVICE") cg.add_define("USE_SUB_DEVICE")