sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-29 22:24:26 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into idf_webserver_ota

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-29 19:19:32 -05:00
parent ca203bff9b 7f8dd4b254
commit 22d1a18d22
30 changed files with 870 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/web_server/__init__.py
View File

@@ -197,6 +197,7 @@ async def add_entity_config(entity, config):
sorting_weight = config.get(CONF_SORTING_WEIGHT, 50)
sorting_group_hash = hash(config.get(CONF_SORTING_GROUP_ID))
cg.add_define("USE_WEBSERVER_SORTING")
cg.add(
web_server.add_entity_config(
entity,
@@ -284,4 +285,5 @@ async def to_code(config):
cg.add_define("USE_WEBSERVER_LOCAL")
if (sorting_group_config := config.get(CONF_SORTING_GROUPS)) is not None:
cg.add_define("USE_WEBSERVER_SORTING")
add_sorting_groups(var, sorting_group_config)