less changes

Author: Jason2866

cores/esp32/esp32-hal-bt.c

@@ -14,7 +14,7 @@
 
 #include "sdkconfig.h"
 #include "soc/soc_caps.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BLE_SUPPORTED
 
 #include "esp_bt.h"
 #include "esp_bt_main.h"

cores/esp32/esp32-hal-bt.h

@@ -16,7 +16,7 @@
 #define _ESP32_ESP32_HAL_BT_H_
 
 #include "soc/soc_caps.h"
-#if SOC_BT_SUPPORTED
+#if SOC_BLE_SUPPORTED
 
 #include "esp32-hal.h"
 
@@ -40,6 +40,6 @@ bool btStop();
 }
 #endif
 
-#endif /* SOC_BT_SUPPORTED */
+#endif /* SOC_BLE_SUPPORTED */
 
 #endif /* _ESP32_ESP32_HAL_BT_H_ */

cores/esp32/esp32-hal-misc.c

@@ -26,7 +26,7 @@
 #include "esp_ota_ops.h"
 #endif  //CONFIG_APP_ROLLBACK_ENABLE
 #include "esp_private/startup_internal.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BLE_SUPPORTED
 #include "esp_bt.h"
 #if CONFIG_IDF_TARGET_ESP32
 bool btInUse() __attribute__((weak));
@@ -304,7 +304,7 @@ void initArduino() {
   if (err) {
     log_e("Failed to initialize NVS! Error: %u", err);
   }
-#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
+#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BLE_SUPPORTED
   if (!btInUse()) {
     esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
   }

libraries/BLE/examples/Beacon_Scanner/ci.json

@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=huge_app",
   "requires": [
-    "CONFIG_SOC_BT_SUPPORTED=y"
+    "CONFIG_SOC_BLE_SUPPORTED=y"
   ]
 }

libraries/BLE/examples/Client/ci.json

@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=huge_app",
   "requires": [
-    "CONFIG_SOC_BT_SUPPORTED=y"
+    "CONFIG_SOC_BLE_SUPPORTED=y"
   ]
 }

libraries/BLE/examples/EddystoneTLM_Beacon/ci.json

@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=huge_app",
   "requires": [
-    "CONFIG_SOC_BT_SUPPORTED=y"
+    "CONFIG_SOC_BLE_SUPPORTED=y"
   ]
 }

libraries/BLE/examples/EddystoneURL_Beacon/ci.json

@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=huge_app",
   "requires": [
-    "CONFIG_SOC_BT_SUPPORTED=y"
+    "CONFIG_SOC_BLE_SUPPORTED=y"
   ]
 }

libraries/BLE/examples/Notify/ci.json

@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=huge_app",
   "requires": [
-    "CONFIG_SOC_BT_SUPPORTED=y"
+    "CONFIG_SOC_BLE_SUPPORTED=y"
   ]
 }

libraries/BLE/examples/Scan/ci.json

@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=huge_app",
   "requires": [
-    "CONFIG_SOC_BT_SUPPORTED=y"
+    "CONFIG_SOC_BLE_SUPPORTED=y"
   ]
 }

libraries/BLE/examples/Server/ci.json

@@ -1,6 +1,6 @@
 {
   "fqbn_append": "PartitionScheme=huge_app",
   "requires": [
-    "CONFIG_SOC_BT_SUPPORTED=y"
+    "CONFIG_SOC_BLE_SUPPORTED=y"
   ]
 }