Merge pull request #11793 from Jason2866/patch-8

me-no-dev · web-flow · commit 44aba4f9490f · 2025-09-04T09:02:38.000+03:00
Add header check for esp_bt.h in esp32-hal-misc.c
diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c
@@ -308,7 +308,7 @@ void initArduino() {
   if (err) {
     log_e("Failed to initialize NVS! Error: %u", err);
   }
-#if (defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)) && SOC_BT_SUPPORTED
+#if (defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)) && SOC_BT_SUPPORTED && __has_include("esp_bt.h")
   if (!btInUse()) {
     esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
   }

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ void initArduino() {`
`308`	`308`	`if (err) {`
`309`	`309`	`log_e("Failed to initialize NVS! Error: %u", err);`
`310`	`310`	`}`
`311`		`-#if (defined(CONFIG_BLUEDROID_ENABLED) \|\| defined(CONFIG_NIMBLE_ENABLED)) && SOC_BT_SUPPORTED`
	`311`	`+#if (defined(CONFIG_BLUEDROID_ENABLED) \|\| defined(CONFIG_NIMBLE_ENABLED)) && SOC_BT_SUPPORTED && __has_include("esp_bt.h")`
`312`	`312`	`if (!btInUse()) {`
`313`	`313`	`esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);`
`314`	`314`	`}`