Merge branch 'esp32-gatt-backend' into neutral-ble-client

esphome/components/ble_device_base/ble_gatt_client.h

@@ -112,6 +112,8 @@ class GattClientListener {
 // - connect: addr_type is a BLE_ADDR_TYPE_* constant (ble_device.h).
 // - gatt_disconnect: also cancels a connect in progress (named to coexist
 //   with a platform stack's own void disconnect() on one backend class).
+//   Nonzero means nothing to tear down and no completion will follow; an
+//   accepted teardown (0) always reaches a terminal on_connection_state.
 // - notify_characteristic: local registration only; the CCCD write is the
 //   API client's responsibility (a plain write_descriptor).
 // - get_service_table/release_services: backend-owned transient storage,

tests/component_tests/bluetooth_proxy/test_platform_gates.py

@@ -261,9 +261,14 @@ def test_defines_h_mirrors_the_rp2_slot_cap() -> None:
     assert int(match.group(1)) == cap, (
         f"defines.h rp2 arm carries {match.group(1)}, expected {cap}"
     )
-    # The static-analysis client count scales with the same cap.
-    match = re.search(r"#define ESPHOME_BLE_GATT_CLIENT_COUNT (\d+)", defines)
-    assert match is not None, "ESPHOME_BLE_GATT_CLIENT_COUNT missing from defines.h"
+    # The static-analysis client count scales with the same cap. Scoped to
+    # the USE_RP2 block: the esp32 arm carries its own count.
+    rp2_block = re.search(r"#ifdef USE_RP2\n((?:#define [^\n]*\n)+)", defines)
+    assert rp2_block is not None, "no USE_RP2 platform block in defines.h"
+    match = re.search(
+        r"#define ESPHOME_BLE_GATT_CLIENT_COUNT (\d+)", rp2_block.group(1)
+    )
+    assert match is not None, "ESPHOME_BLE_GATT_CLIENT_COUNT missing from rp2 block"
     assert int(match.group(1)) == cap, (
-        f"ESPHOME_BLE_GATT_CLIENT_COUNT is {match.group(1)}, expected {cap}"
+        f"rp2 ESPHOME_BLE_GATT_CLIENT_COUNT is {match.group(1)}, expected {cap}"
     )