Merge pull request #10858 from tannewt/fix_esp32s3_startup

tannewt · web-flow · commit aff6e32dad5e · 2026-02-26T13:17:57.000-08:00
Fix S3 startup due to ble_gap_adv_active crash
diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c
@@ -733,7 +733,7 @@ void common_hal_bleio_adapter_stop_advertising(bleio_adapter_obj_t *self) {
 }
 
 bool common_hal_bleio_adapter_get_advertising(bleio_adapter_obj_t *self) {
-    return ble_gap_adv_active();
+    return common_hal_bleio_adapter_get_enabled(self) && ble_gap_adv_active();
 }
 
 bool common_hal_bleio_adapter_get_connected(bleio_adapter_obj_t *self) {

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ void common_hal_bleio_adapter_stop_advertising(bleio_adapter_obj_t *self) {`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`bool common_hal_bleio_adapter_get_advertising(bleio_adapter_obj_t *self) {`
`736`		`- return ble_gap_adv_active();`
	`736`	`+ return common_hal_bleio_adapter_get_enabled(self) && ble_gap_adv_active();`
`737`	`737`	`}`
`738`	`738`
`739`	`739`	`bool common_hal_bleio_adapter_get_connected(bleio_adapter_obj_t *self) {`