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

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-26 18:19:51 -05:00
parent 7e52eb5ee3 38c9cbd92d
commit d4026f9333
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
esphome/components/esp32_ble_server/__init__.py
View File

@@ -513,17 +513,25 @@ async def to_code_characteristic(service_var, char_conf):
on_write_conf, on_write_conf,
) )
if CONF_VALUE in char_conf: if CONF_VALUE in char_conf:
action_conf = { # Check if the value is templated (Lambda)
CONF_ID: char_conf[CONF_ID], value_data = char_conf[CONF_VALUE].get(CONF_DATA)
CONF_VALUE: char_conf[CONF_VALUE], if isinstance(value_data, cv.Lambda):
} # Templated value - need the full action infrastructure
value_action = await ble_server_characteristic_set_value( action_conf = {
action_conf, CONF_ID: char_conf[CONF_ID],
char_conf[CONF_CHAR_VALUE_ACTION_ID_], CONF_VALUE: char_conf[CONF_VALUE],
cg.TemplateArguments(), }
{}, value_action = await ble_server_characteristic_set_value(
) action_conf,
cg.add(value_action.play()) char_conf[CONF_CHAR_VALUE_ACTION_ID_],
cg.TemplateArguments(),
{},
)
cg.add(value_action.play())
else:
# Static value - just set it directly without action infrastructure
value = await parse_value(char_conf[CONF_VALUE], {})
cg.add(char_var.set_value(value))
for descriptor_conf in char_conf[CONF_DESCRIPTORS]: for descriptor_conf in char_conf[CONF_DESCRIPTORS]:
await to_code_descriptor(descriptor_conf, char_var) await to_code_descriptor(descriptor_conf, char_var)

1
esphome/core/defines.h
View File

@@ -160,7 +160,6 @@
#define USE_ESP32_BLE_SERVER #define USE_ESP32_BLE_SERVER
#define USE_ESP32_BLE_UUID #define USE_ESP32_BLE_UUID
#define USE_ESP32_BLE_ADVERTISING #define USE_ESP32_BLE_ADVERTISING
// BLE Server automations - conditionally compiled
#define USE_ESP32_BLE_SERVER_SET_VALUE_ACTION #define USE_ESP32_BLE_SERVER_SET_VALUE_ACTION
#define USE_ESP32_BLE_SERVER_DESCRIPTOR_SET_VALUE_ACTION #define USE_ESP32_BLE_SERVER_DESCRIPTOR_SET_VALUE_ACTION
#define USE_ESP32_BLE_SERVER_NOTIFY_ACTION #define USE_ESP32_BLE_SERVER_NOTIFY_ACTION