sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

Fix generated files and revert entity config to device_id

Browse Source
This commit is contained in:
Daniel Vikström
2025-05-06 03:05:00 +02:00
parent cef023283b
commit 79bbc475f4
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
esphome/components/api/api_pb2.cpp
View File

@@ -2565,6 +2565,10 @@ bool ListEntitiesSensorResponse::decode_varint(uint32_t field_id, ProtoVarInt va
this->entity_category = value.as_enum<enums::EntityCategory>(); this->entity_category = value.as_enum<enums::EntityCategory>();
return true; return true;
} }
case 14: {
this->device_uid = value.as_uint32();
return true;
}
default: default:
return false; return false;
} }
@@ -2595,10 +2599,6 @@ bool ListEntitiesSensorResponse::decode_length(uint32_t field_id, ProtoLengthDel
this->device_class = value.as_string(); this->device_class = value.as_string();
return true; return true;
} }
case 14: {
this->device_uid = value.as_uint32();
return true;
}
default: default:
return false; return false;
} }
@@ -4853,6 +4853,10 @@ bool ListEntitiesSelectResponse::decode_varint(uint32_t field_id, ProtoVarInt va
this->entity_category = value.as_enum<enums::EntityCategory>(); this->entity_category = value.as_enum<enums::EntityCategory>();
return true; return true;
} }
case 9: {
this->device_uid = value.as_uint32();
return true;
}
default: default:
return false; return false;
} }
@@ -4879,10 +4883,6 @@ bool ListEntitiesSelectResponse::decode_length(uint32_t field_id, ProtoLengthDel
this->options.push_back(value.as_string()); this->options.push_back(value.as_string());
return true; return true;
} }
case 9: {
this->device_uid = value.as_uint32();
return true;
}
default: default:
return false; return false;
} }

6
esphome/config_validation.py
View File

@@ -21,7 +21,7 @@ from esphome.const import (
CONF_COMMAND_RETAIN, CONF_COMMAND_RETAIN,
CONF_COMMAND_TOPIC, CONF_COMMAND_TOPIC,
CONF_DAY, CONF_DAY,
CONF_DEVICE_UID, CONF_DEVICE_ID,
CONF_DISABLED_BY_DEFAULT, CONF_DISABLED_BY_DEFAULT,
CONF_DISCOVERY, CONF_DISCOVERY,
CONF_ENTITY_CATEGORY, CONF_ENTITY_CATEGORY,
@@ -348,7 +348,7 @@ def icon(value):
) )
def sub_device_uid(value): def sub_device_id(value):
devices_ns = cg.esphome_ns.namespace("devices") devices_ns = cg.esphome_ns.namespace("devices")
SubDevice = devices_ns.class_("SubDevice") SubDevice = devices_ns.class_("SubDevice")
validator = use_id(SubDevice) validator = use_id(SubDevice)
@@ -1832,7 +1832,7 @@ ENTITY_BASE_SCHEMA = Schema(
Optional(CONF_DISABLED_BY_DEFAULT, default=False): boolean, Optional(CONF_DISABLED_BY_DEFAULT, default=False): boolean,
Optional(CONF_ICON): icon, Optional(CONF_ICON): icon,
Optional(CONF_ENTITY_CATEGORY): entity_category, Optional(CONF_ENTITY_CATEGORY): entity_category,
Optional(CONF_DEVICE_UID): sub_device_uid, Optional(CONF_DEVICE_ID): sub_device_id,
} }
) )

2
esphome/const.py
View File

@@ -216,7 +216,7 @@ CONF_DEST = "dest"
CONF_DEVICE = "device" CONF_DEVICE = "device"
CONF_DEVICE_CLASS = "device_class" CONF_DEVICE_CLASS = "device_class"
CONF_DEVICE_FACTOR = "device_factor" CONF_DEVICE_FACTOR = "device_factor"
CONF_DEVICE_UID = "device_uid" CONF_DEVICE_ID = "device_id"
CONF_DIELECTRIC_CONSTANT = "dielectric_constant" CONF_DIELECTRIC_CONSTANT = "dielectric_constant"
CONF_DIMENSIONS = "dimensions" CONF_DIMENSIONS = "dimensions"
CONF_DIO_PIN = "dio_pin" CONF_DIO_PIN = "dio_pin"

2
tests/components/device/common.yaml
View File

@@ -8,4 +8,4 @@ binary_sensor:
- platform: template - platform: template
name: Other device sensor name: Other device sensor
device_uid: other_device device_id: other_device