mirror of
https://github.com/esphome/esphome.git
synced 2026-10-06 10:56:43 +00:00
Move BTstack pool ownership into rp2040_ble and count connection slots like esp32_ble
This commit is contained in:
@@ -1,15 +0,0 @@
|
||||
esphome:
|
||||
name: poolwrap-rp2-default
|
||||
|
||||
rp2:
|
||||
board: rpipicow
|
||||
|
||||
wifi:
|
||||
ssid: MySSID
|
||||
password: password1
|
||||
|
||||
api:
|
||||
|
||||
rp2_ble_tracker:
|
||||
|
||||
bluetooth_proxy:
|
||||
@@ -1,16 +0,0 @@
|
||||
esphome:
|
||||
name: poolwrap-rp2-single
|
||||
|
||||
rp2:
|
||||
board: rpipicow
|
||||
|
||||
wifi:
|
||||
ssid: MySSID
|
||||
password: password1
|
||||
|
||||
api:
|
||||
|
||||
rp2_ble_tracker:
|
||||
|
||||
bluetooth_proxy:
|
||||
connection_slots: 1
|
||||
@@ -1,16 +0,0 @@
|
||||
esphome:
|
||||
name: poolwrap-rp2-two
|
||||
|
||||
rp2:
|
||||
board: rpipicow
|
||||
|
||||
wifi:
|
||||
ssid: MySSID
|
||||
password: password1
|
||||
|
||||
api:
|
||||
|
||||
rp2_ble_tracker:
|
||||
|
||||
bluetooth_proxy:
|
||||
connection_slots: 2
|
||||
@@ -1,48 +0,0 @@
|
||||
"""The rp2 BTstack pool overrides: multi-slot builds emit the --wrap flags
|
||||
that swap the prebuilt single-client pools for the codegen-sized ones;
|
||||
single-slot builds emit none and stay byte-identical to previous releases."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Callable
|
||||
from pathlib import Path
|
||||
|
||||
from esphome.components import bluetooth_connection
|
||||
from esphome.core import CORE
|
||||
|
||||
from ..helpers import get_define_value
|
||||
|
||||
WRAP_FLAGS = tuple(
|
||||
f"-Wl,--wrap={symbol}" for symbol in bluetooth_connection._RP2_BTSTACK_POOL_SYMBOLS
|
||||
)
|
||||
|
||||
|
||||
def test_default_slots_emit_the_pool_wrap(
|
||||
generate_main: Callable[[str | Path], str],
|
||||
component_config_path: Callable[[str], Path],
|
||||
) -> None:
|
||||
generate_main(component_config_path("rp2_proxy_default.yaml"))
|
||||
assert all(flag in CORE.build_flags for flag in WRAP_FLAGS)
|
||||
assert get_define_value("ESPHOME_BLE_GATT_CLIENT_COUNT") == "3"
|
||||
assert get_define_value("BLUETOOTH_PROXY_MAX_CONNECTIONS") == "3"
|
||||
|
||||
|
||||
def test_two_slots_emit_the_pool_wrap(
|
||||
generate_main: Callable[[str | Path], str],
|
||||
component_config_path: Callable[[str], Path],
|
||||
) -> None:
|
||||
# Two slots: the wrap pools are smaller than the cap, sized from the count.
|
||||
generate_main(component_config_path("rp2_proxy_two_slots.yaml"))
|
||||
assert all(flag in CORE.build_flags for flag in WRAP_FLAGS)
|
||||
assert get_define_value("ESPHOME_BLE_GATT_CLIENT_COUNT") == "2"
|
||||
assert get_define_value("BLUETOOTH_PROXY_MAX_CONNECTIONS") == "2"
|
||||
|
||||
|
||||
def test_single_slot_keeps_the_prebuilt_pools(
|
||||
generate_main: Callable[[str | Path], str],
|
||||
component_config_path: Callable[[str], Path],
|
||||
) -> None:
|
||||
generate_main(component_config_path("rp2_proxy_single_slot.yaml"))
|
||||
assert not any(flag in CORE.build_flags for flag in WRAP_FLAGS)
|
||||
assert get_define_value("ESPHOME_BLE_GATT_CLIENT_COUNT") == "1"
|
||||
assert get_define_value("BLUETOOTH_PROXY_MAX_CONNECTIONS") == "1"
|
||||
Reference in New Issue
Block a user