TactilityProject · KenVanHoeylandt · Aug 25, 2026 · Aug 23, 2026 · Aug 24, 2026 · Aug 24, 2026
diff --git a/Devices/btt-panda-touch/bigtreetech,panda-touch.dts b/Devices/btt-panda-touch/bigtreetech,panda-touch.dts
@@ -22,7 +22,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/cyd-4848s040c/cyd,4848s040c.dts b/Devices/cyd-4848s040c/cyd,4848s040c.dts
@@ -22,7 +22,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/cyd-8048s043c/cyd,8048s043c.dts b/Devices/cyd-8048s043c/cyd,8048s043c.dts
@@ -23,7 +23,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/elecrow-crowpanel-advance-28/elecrow,crowpanel-advance-28.dts b/Devices/elecrow-crowpanel-advance-28/elecrow,crowpanel-advance-28.dts
@@ -24,7 +24,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/elecrow-crowpanel-advance-35/elecrow,crowpanel-advance-35.dts b/Devices/elecrow-crowpanel-advance-35/elecrow,crowpanel-advance-35.dts
@@ -24,7 +24,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/elecrow-crowpanel-advance-50/elecrow,crowpanel-advance-50.dts b/Devices/elecrow-crowpanel-advance-50/elecrow,crowpanel-advance-50.dts
@@ -24,7 +24,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/elecrow-crowpanel-basic-50/elecrow,crowpanel-basic-50.dts b/Devices/elecrow-crowpanel-basic-50/elecrow,crowpanel-basic-50.dts
@@ -24,7 +24,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/es3c28p/es3c28p.dts b/Devices/es3c28p/es3c28p.dts
@@ -28,7 +28,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/guition-jc1060p470ciwy/guition,jc1060p470ciwy.dts b/Devices/guition-jc1060p470ciwy/guition,jc1060p470ciwy.dts
@@ -34,7 +34,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/guition-jc8048w550c/guition,jc8048w550c.dts b/Devices/guition-jc8048w550c/guition,jc8048w550c.dts
@@ -25,7 +25,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/heltec-wifi-lora-32-v3/heltec,wifi-lora-32-v3.dts b/Devices/heltec-wifi-lora-32-v3/heltec,wifi-lora-32-v3.dts
@@ -22,7 +22,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/lilygo-tdeck-plus/lilygo,tdeck-plus.dts b/Devices/lilygo-tdeck-plus/lilygo,tdeck-plus.dts
@@ -52,7 +52,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/lilygo-tdeck/lilygo,tdeck.dts b/Devices/lilygo-tdeck/lilygo,tdeck.dts
@@ -50,7 +50,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/lilygo-tdisplay-s3/lilygo,tdisplay-s3.dts b/Devices/lilygo-tdisplay-s3/lilygo,tdisplay-s3.dts
@@ -23,7 +23,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/lilygo-tdongle-s3/lilygo,tdongle-s3.dts b/Devices/lilygo-tdongle-s3/lilygo,tdongle-s3.dts
@@ -23,7 +23,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/lilygo-thmi/lilygo,thmi.dts b/Devices/lilygo-thmi/lilygo,thmi.dts
@@ -27,7 +27,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/lilygo-tlora-pager/lilygo,tlora-pager.dts b/Devices/lilygo-tlora-pager/lilygo,tlora-pager.dts
@@ -31,7 +31,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/m5stack-cardputer-adv/m5stack,cardputer-adv.dts b/Devices/m5stack-cardputer-adv/m5stack,cardputer-adv.dts
@@ -31,7 +31,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/m5stack-cardputer/m5stack,cardputer.dts b/Devices/m5stack-cardputer/m5stack,cardputer.dts
@@ -32,7 +32,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/m5stack-cores3/m5stack,cores3.dts b/Devices/m5stack-cores3/m5stack,cores3.dts
@@ -35,7 +35,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/m5stack-papers3/m5stack,papers3.dts b/Devices/m5stack-papers3/m5stack,papers3.dts
@@ -27,7 +27,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/m5stack-stackchan/m5stack,stackchan.dts b/Devices/m5stack-stackchan/m5stack,stackchan.dts
@@ -35,7 +35,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/m5stack-sticks3/m5stack,sticks3.dts b/Devices/m5stack-sticks3/m5stack,sticks3.dts
@@ -28,7 +28,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/m5stack-tab5/m5stack,tab5.dts b/Devices/m5stack-tab5/m5stack,tab5.dts
@@ -33,7 +33,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/tulip-4r11/tulip-4r11.dts b/Devices/tulip-4r11/tulip-4r11.dts
@@ -28,7 +28,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/unphone/unphone.dts b/Devices/unphone/unphone.dts
@@ -26,7 +26,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/waveshare-esp32-s3-geek/waveshare,esp32-s3-geek.dts b/Devices/waveshare-esp32-s3-geek/waveshare,esp32-s3-geek.dts
@@ -25,7 +25,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/waveshare-s3-lcd-13/waveshare,s3-lcd-13.dts b/Devices/waveshare-s3-lcd-13/waveshare,s3-lcd-13.dts
@@ -24,7 +24,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/waveshare-s3-touch-lcd-128/waveshare,s3-touch-lcd-128.dts b/Devices/waveshare-s3-touch-lcd-128/waveshare,s3-touch-lcd-128.dts
@@ -25,7 +25,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/waveshare-s3-touch-lcd-147/waveshare,s3-touch-lcd-147.dts b/Devices/waveshare-s3-touch-lcd-147/waveshare,s3-touch-lcd-147.dts
@@ -25,7 +25,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/waveshare-s3-touch-lcd-43/waveshare,s3-touch-lcd-43.dts b/Devices/waveshare-s3-touch-lcd-43/waveshare,s3-touch-lcd-43.dts
@@ -24,7 +24,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Devices/wireless-tag-wt32-sc01-plus/wireless-tag,wt32-sc01-plus.dts b/Devices/wireless-tag-wt32-sc01-plus/wireless-tag,wt32-sc01-plus.dts
@@ -24,7 +24,6 @@
 
 	ble0 {
 		compatible = "espressif,esp32-ble";
-		status = "disabled";
 	};
 
 	gpio0 {

diff --git a/Documentation/ideas.md b/Documentation/ideas.md
@@ -28,7 +28,7 @@
 - Improve Setup: Show "Step done" screen
 - Improve Setup: Add keyboard/keypad navigation explanation
 - display.h API: get_backlight does not change ref counting, but it should
-- bluetooth: various getters for child devices do not change ref counting, but they should
+- bluetooth: various getters for child devices do not change ref counting, but they should (e.g. bluetooth_hid_device_get_device())
 - Improve kernel_init.cpp (and other modules): create driver_ensure_added() and driver_ensure_destructed()
 - Drivers/audio-codec-module is not a module. Move it somewhere else. Or make it an actual module.
 - LilyGO T-Dongle S3: 1 button control, stop auto-launching web server

diff --git a/Platforms/platform-esp32/private/bluetooth/esp32_ble_internal.h b/Platforms/platform-esp32/private/bluetooth/esp32_ble_internal.h
@@ -30,27 +30,26 @@
 #include <bluetooth/esp32_ble_midi.h>
 #include <bluetooth/esp32_ble_hid.h>
 
-#define BLE_MAX_CALLBACKS 8
-
-struct BleCallbackEntry {
-    BtEventCallback fn;
-    void*           ctx;
-};
-
 struct BleCtx {
     // Mutexes
     SemaphoreHandle_t radio_mutex;  // guards radio state transitions
-    SemaphoreHandle_t cb_mutex;     // guards callbacks array
+    // Guards GAP/GATT advertising & profile-switch calls (on_sync()'s advertising decision vs.
+    // hid/spp/midi's _start()/_stop()). Deliberately separate from radio_mutex: radio_mutex can
+    // be held for the duration of nimble_port_stop(), which blocks waiting for the NimBLE host
+    // task to exit its run loop - taking that same mutex from code that can run ON the host task
+    // (on_sync()) would deadlock disable against it. Nothing held under gap_mutex ever waits on
+    // host-task progress, so it's safe to take from the host task itself.
+    SemaphoreHandle_t gap_mutex;
 
     // Radio / scan state (atomic — read from multiple tasks)
     std::atomic<BtRadioState> radio_state;
     std::atomic<bool>         scan_active;
     // Set by Tactility HID host to prevent simultaneous central connection during name resolution
     std::atomic<bool>         hid_host_active;
 
-    // Event callbacks (guarded by cb_mutex)
-    BleCallbackEntry callbacks[BLE_MAX_CALLBACKS];
-    size_t           callback_count;
+    // Event subscriptions (guarded by subscriptionsMutex)
+    Mutex subscriptionsMutex;
+    BtEventSubscription* subscriptions;
 
     // Connection handles + active flags (atomic — accessed from multiple tasks)
     std::atomic<uint16_t> spp_conn_handle;
@@ -98,7 +97,7 @@ struct BleCtx {
     ble_addr_t        scan_addrs[64];
     size_t            scan_count;
 
-    // Device reference (passed to BtEventCallback)
+    // Device reference (passed to subscribers via BtEvent delivery)
     struct Device* device;
 
     // Child devices (created by esp32_ble_start_device, destroyed by stop_device)
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ @@
     	ble0 {
     		compatible = "espressif,esp32-ble";
-    		status = "disabled";
     	};
     	gpio0 {
@@ Expand Down @@