From 1145aec2b86d7ee08060caad86f72bd370f19e69 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 23 Mar 2025 13:31:40 +0100 Subject: [PATCH 01/13] Fix error: simple_ble_start enable controller failed 259 --- cores/esp32/esp32-hal-misc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index 50e2973d27a..1ca7f279580 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/cores/esp32/esp32-hal-misc.c @@ -305,11 +305,11 @@ void initArduino() { if (err) { log_e("Failed to initialize NVS! Error: %u", err); } -#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED - if (!btInUse()) { - esp_bt_controller_mem_release(ESP_BT_MODE_BTDM); - } -#endif +//#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED +// if (!btInUse()) { +// esp_bt_controller_mem_release(ESP_BT_MODE_BTDM); +// } +//#endif init(); initVariant(); } From a35bf59557992a79aebfd8eeeaab0577f95b7956 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:21:37 +0100 Subject: [PATCH 02/13] reemove duplicate `btInUse` define --- cores/esp32/esp32-hal-bt.c | 11 ----------- cores/esp32/esp32-hal-misc.c | 10 +++++----- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c index 5f1148bd492..43c9fbe98f7 100644 --- a/cores/esp32/esp32-hal-bt.c +++ b/cores/esp32/esp32-hal-bt.c @@ -17,17 +17,6 @@ #if SOC_BT_SUPPORTED #ifdef CONFIG_BT_ENABLED -#if CONFIG_IDF_TARGET_ESP32 -bool btInUse() { - return true; -} -#else -// user may want to change it to free resources -__attribute__((weak)) bool btInUse() { - return true; -} -#endif - #include "esp_bt.h" #ifdef CONFIG_BTDM_CONTROLLER_MODE_BTDM diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index 1ca7f279580..50e2973d27a 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/cores/esp32/esp32-hal-misc.c @@ -305,11 +305,11 @@ void initArduino() { if (err) { log_e("Failed to initialize NVS! Error: %u", err); } -//#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED -// if (!btInUse()) { -// esp_bt_controller_mem_release(ESP_BT_MODE_BTDM); -// } -//#endif +#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED + if (!btInUse()) { + esp_bt_controller_mem_release(ESP_BT_MODE_BTDM); + } +#endif init(); initVariant(); } From 46fafa2f341d09b8ecf52d4719af3386c7acfd65 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:51:19 +0100 Subject: [PATCH 03/13] fix BT mem release logic --- cores/esp32/esp32-hal-misc.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index 50e2973d27a..477ee7421b5 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/cores/esp32/esp32-hal-misc.c @@ -27,6 +27,15 @@ #include "esp_private/startup_internal.h" #if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED #include "esp_bt.h" +#if CONFIG_IDF_TARGET_ESP32 +bool btInUse() { + return true; +} +#else +bool btInUse() { + return false; +} +#endif #endif //CONFIG_BT_ENABLED #include #include "soc/rtc.h" @@ -243,19 +252,6 @@ bool verifyRollbackLater() { } #endif -#ifdef CONFIG_BT_ENABLED -#if CONFIG_IDF_TARGET_ESP32 -//overwritten in esp32-hal-bt.c -bool btInUse() __attribute__((weak)); -bool btInUse() { - return false; -} -#else -//from esp32-hal-bt.c -extern bool btInUse(); -#endif -#endif - #if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM ESP_SYSTEM_INIT_FN(init_psram_new, CORE, BIT(0), 99) { psramInit(); From 519ef78255239b444b07b0ad26a9dab96a505f58 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 3 Apr 2025 18:01:35 +0200 Subject: [PATCH 04/13] use bt only when enabled --- cores/esp32/esp32-hal-bt.c | 159 ++++++++++++++++------------------- cores/esp32/esp32-hal-misc.c | 2 + 2 files changed, 73 insertions(+), 88 deletions(-) diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c index 43c9fbe98f7..e528bd85de9 100644 --- a/cores/esp32/esp32-hal-bt.c +++ b/cores/esp32/esp32-hal-bt.c @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at - +// // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software @@ -12,112 +12,95 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "esp32-hal-bt.h" - -#if SOC_BT_SUPPORTED -#ifdef CONFIG_BT_ENABLED +#include "sdkconfig.h" +#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED #include "esp_bt.h" +#include "esp_bt_main.h" +#include "esp_bt_device.h" +#include "esp32-hal-bt.h" +#include "esp_log.h" -#ifdef CONFIG_BTDM_CONTROLLER_MODE_BTDM -#define BT_MODE ESP_BT_MODE_BTDM -#elif defined(CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY) -#define BT_MODE ESP_BT_MODE_CLASSIC_BT -#else -#define BT_MODE ESP_BT_MODE_BLE -#endif +static const char* TAG = "arduino-bt"; +static bool _bt_initialized = false; +static bool _bt_enabled = false; -bool btStarted() { - return (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED); +// Diese Implementierung überschreibt die schwache (weak) Version in esp32-hal-misc.c +bool btInUse() { + return _bt_initialized && _bt_enabled; } bool btStart() { - return btStartMode(BT_MODE); -} + esp_err_t err; -bool btStartMode(bt_mode mode) { - esp_bt_mode_t esp_bt_mode; - esp_bt_controller_config_t cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); -#if CONFIG_IDF_TARGET_ESP32 - switch (mode) { - case BT_MODE_BLE: esp_bt_mode = ESP_BT_MODE_BLE; break; - case BT_MODE_CLASSIC_BT: esp_bt_mode = ESP_BT_MODE_CLASSIC_BT; break; - case BT_MODE_BTDM: esp_bt_mode = ESP_BT_MODE_BTDM; break; - default: esp_bt_mode = BT_MODE; break; - } - // esp_bt_controller_enable(MODE) This mode must be equal as the mode in “cfg” of esp_bt_controller_init(). - cfg.mode = esp_bt_mode; - if (cfg.mode == ESP_BT_MODE_CLASSIC_BT) { - esp_bt_controller_mem_release(ESP_BT_MODE_BLE); - } -#else - // other esp variants dont support BT-classic / DM. - esp_bt_mode = BT_MODE; -#endif + if(_bt_enabled) { + return true; + } - if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED) { - return true; - } - esp_err_t ret; - if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) { - if ((ret = esp_bt_controller_init(&cfg)) != ESP_OK) { - log_e("initialize controller failed: %s", esp_err_to_name(ret)); - return false; + if(!_bt_initialized) { + esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); + + err = esp_bt_controller_init(&bt_cfg); + if(err != ESP_OK) { + ESP_LOGE(TAG, "BT controller initialize failed: %s", esp_err_to_name(err)); + return false; + } + + _bt_initialized = true; + } + + err = esp_bt_controller_enable(ESP_BT_MODE_BTDM); + if(err != ESP_OK) { + ESP_LOGE(TAG, "BT controller enable failed: %s", esp_err_to_name(err)); + return false; + } + + err = esp_bluedroid_init(); + if(err != ESP_OK) { + ESP_LOGE(TAG, "Bluedroid initialize failed: %s", esp_err_to_name(err)); + esp_bt_controller_disable(); + return false; } - while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) {} - } - if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED) { - if ((ret = esp_bt_controller_enable(esp_bt_mode)) != ESP_OK) { - log_e("BT Enable mode=%d failed %s", BT_MODE, esp_err_to_name(ret)); - return false; + + err = esp_bluedroid_enable(); + if(err != ESP_OK) { + ESP_LOGE(TAG, "Bluedroid enable failed: %s", esp_err_to_name(err)); + esp_bluedroid_deinit(); + esp_bt_controller_disable(); + return false; } - } - if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED) { + + _bt_enabled = true; return true; - } - log_e("BT Start failed"); - return false; } bool btStop() { - if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) { - return true; - } - if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED) { - if (esp_bt_controller_disable()) { - log_e("BT Disable failed"); - return false; - } - while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED); - } - if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED) { - if (esp_bt_controller_deinit()) { - log_e("BT deint failed"); - return false; + esp_err_t err; + + if(!_bt_enabled) { + return true; } - vTaskDelay(1); - if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_IDLE) { - return false; + + err = esp_bluedroid_disable(); + if(err != ESP_OK) { + ESP_LOGE(TAG, "Bluedroid disable failed: %s", esp_err_to_name(err)); + return false; } - return true; - } - log_e("BT Stop failed"); - return false; -} -#else // CONFIG_BT_ENABLED -bool btStarted() { - return false; -} + err = esp_bluedroid_deinit(); + if(err != ESP_OK) { + ESP_LOGE(TAG, "Bluedroid deinitialize failed: %s", esp_err_to_name(err)); + return false; + } -bool btStart() { - return false; -} + err = esp_bt_controller_disable(); + if(err != ESP_OK) { + ESP_LOGE(TAG, "BT controller disable failed: %s", esp_err_to_name(err)); + return false; + } -bool btStop() { - return false; + _bt_enabled = false; + return true; } -#endif /* CONFIG_BT_ENABLED */ - -#endif /* SOC_BT_SUPPORTED */ +#endif diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index 477ee7421b5..5280e52caf6 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/cores/esp32/esp32-hal-misc.c @@ -28,10 +28,12 @@ #if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED #include "esp_bt.h" #if CONFIG_IDF_TARGET_ESP32 +bool btInUse() __attribute__((weak)); bool btInUse() { return true; } #else +bool btInUse() __attribute__((weak)); bool btInUse() { return false; } From 554567e19120f7e07775b32235e7b4b933428c9b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 3 Apr 2025 18:12:08 +0200 Subject: [PATCH 05/13] log_e --- cores/esp32/esp32-hal-bt.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c index e528bd85de9..b1c0f2ddac8 100644 --- a/cores/esp32/esp32-hal-bt.c +++ b/cores/esp32/esp32-hal-bt.c @@ -19,9 +19,8 @@ #include "esp_bt_main.h" #include "esp_bt_device.h" #include "esp32-hal-bt.h" -#include "esp_log.h" +#include "esp32-hal-log.h" -static const char* TAG = "arduino-bt"; static bool _bt_initialized = false; static bool _bt_enabled = false; @@ -42,7 +41,7 @@ bool btStart() { err = esp_bt_controller_init(&bt_cfg); if(err != ESP_OK) { - ESP_LOGE(TAG, "BT controller initialize failed: %s", esp_err_to_name(err)); + log_e("BT controller initialize failed: %s", esp_err_to_name(err)); return false; } @@ -51,20 +50,20 @@ bool btStart() { err = esp_bt_controller_enable(ESP_BT_MODE_BTDM); if(err != ESP_OK) { - ESP_LOGE(TAG, "BT controller enable failed: %s", esp_err_to_name(err)); + log_e("BT controller enable failed: %s", esp_err_to_name(err)); return false; } err = esp_bluedroid_init(); if(err != ESP_OK) { - ESP_LOGE(TAG, "Bluedroid initialize failed: %s", esp_err_to_name(err)); + log_e("Bluedroid initialize failed: %s", esp_err_to_name(err)); esp_bt_controller_disable(); return false; } err = esp_bluedroid_enable(); if(err != ESP_OK) { - ESP_LOGE(TAG, "Bluedroid enable failed: %s", esp_err_to_name(err)); + log_e("Bluedroid enable failed: %s", esp_err_to_name(err)); esp_bluedroid_deinit(); esp_bt_controller_disable(); return false; @@ -83,19 +82,19 @@ bool btStop() { err = esp_bluedroid_disable(); if(err != ESP_OK) { - ESP_LOGE(TAG, "Bluedroid disable failed: %s", esp_err_to_name(err)); + log_e("Bluedroid disable failed: %s", esp_err_to_name(err)); return false; } err = esp_bluedroid_deinit(); if(err != ESP_OK) { - ESP_LOGE(TAG, "Bluedroid deinitialize failed: %s", esp_err_to_name(err)); + log_e("Bluedroid deinitialize failed: %s", esp_err_to_name(err)); return false; } err = esp_bt_controller_disable(); if(err != ESP_OK) { - ESP_LOGE(TAG, "BT controller disable failed: %s", esp_err_to_name(err)); + log_e("BT controller disable failed: %s", esp_err_to_name(err)); return false; } From 800112448b68d6b45770f5de06f4fecf864ffdca Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 3 Apr 2025 18:17:46 +0200 Subject: [PATCH 06/13] Update esp32-hal-bt.c --- cores/esp32/esp32-hal-bt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c index b1c0f2ddac8..5590a30d45c 100644 --- a/cores/esp32/esp32-hal-bt.c +++ b/cores/esp32/esp32-hal-bt.c @@ -3,7 +3,7 @@ // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// + // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software @@ -24,7 +24,6 @@ static bool _bt_initialized = false; static bool _bt_enabled = false; -// Diese Implementierung überschreibt die schwache (weak) Version in esp32-hal-misc.c bool btInUse() { return _bt_initialized && _bt_enabled; } From 52d45ef926ea884f966ed947b4043b5b331979da Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 4 Apr 2025 11:48:06 +0200 Subject: [PATCH 07/13] use bluedroid --- cores/esp32/esp32-hal-bt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c index 5590a30d45c..9a664fe7cd3 100644 --- a/cores/esp32/esp32-hal-bt.c +++ b/cores/esp32/esp32-hal-bt.c @@ -13,7 +13,7 @@ // limitations under the License. #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED +#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED #include "esp_bt.h" #include "esp_bt_main.h" From 3724a95e6dd9fb194199561df65bff9237cf6272 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 4 Apr 2025 11:50:32 +0200 Subject: [PATCH 08/13] SOC_BT_SUPPORTED --- libraries/BLE/src/BLEDevice.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/BLE/src/BLEDevice.cpp b/libraries/BLE/src/BLEDevice.cpp index 186b36d6a33..887b4838773 100644 --- a/libraries/BLE/src/BLEDevice.cpp +++ b/libraries/BLE/src/BLEDevice.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -651,4 +651,4 @@ void BLEDevice::setCustomGattsHandler(gatts_event_handler handler) { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ From 7fa49f7b0ee00757c8b434182862fb1e65650b67 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 4 Apr 2025 11:54:54 +0200 Subject: [PATCH 09/13] CONFIG_SOC_BT_SUPPORTED --- libraries/BLE/examples/Beacon_Scanner/ci.json | 2 +- libraries/BLE/examples/Client/ci.json | 2 +- libraries/BLE/examples/EddystoneTLM_Beacon/ci.json | 2 +- libraries/BLE/examples/EddystoneURL_Beacon/ci.json | 2 +- libraries/BLE/examples/Notify/ci.json | 2 +- libraries/BLE/examples/Scan/ci.json | 2 +- libraries/BLE/examples/Server/ci.json | 2 +- libraries/BLE/examples/Server_multiconnect/ci.json | 2 +- libraries/BLE/examples/UART/ci.json | 2 +- libraries/BLE/examples/Write/ci.json | 2 +- libraries/BLE/examples/iBeacon/ci.json | 2 +- libraries/BLE/src/BLE2901.cpp | 4 ++-- libraries/BLE/src/BLE2901.h | 4 ++-- libraries/BLE/src/BLE2902.cpp | 4 ++-- libraries/BLE/src/BLE2902.h | 4 ++-- libraries/BLE/src/BLE2904.cpp | 4 ++-- libraries/BLE/src/BLE2904.h | 4 ++-- libraries/BLE/src/BLEAddress.cpp | 4 ++-- libraries/BLE/src/BLEAddress.h | 4 ++-- libraries/BLE/src/BLEAdvertisedDevice.cpp | 4 ++-- libraries/BLE/src/BLEAdvertisedDevice.h | 4 ++-- libraries/BLE/src/BLEAdvertising.cpp | 4 ++-- libraries/BLE/src/BLEAdvertising.h | 4 ++-- libraries/BLE/src/BLEBeacon.cpp | 4 ++-- libraries/BLE/src/BLEBeacon.h | 4 ++-- libraries/BLE/src/BLECharacteristic.cpp | 4 ++-- libraries/BLE/src/BLECharacteristic.h | 4 ++-- libraries/BLE/src/BLECharacteristicMap.cpp | 4 ++-- libraries/BLE/src/BLEClient.cpp | 4 ++-- libraries/BLE/src/BLEClient.h | 4 ++-- libraries/BLE/src/BLEDescriptor.cpp | 4 ++-- libraries/BLE/src/BLEDescriptor.h | 4 ++-- libraries/BLE/src/BLEDescriptorMap.cpp | 4 ++-- libraries/BLE/src/BLEDevice.h | 4 ++-- libraries/BLE/src/BLEEddystoneTLM.cpp | 4 ++-- libraries/BLE/src/BLEEddystoneTLM.h | 4 ++-- libraries/BLE/src/BLEEddystoneURL.cpp | 4 ++-- libraries/BLE/src/BLEEddystoneURL.h | 4 ++-- libraries/BLE/src/BLEExceptions.h | 4 ++-- libraries/BLE/src/BLEHIDDevice.cpp | 4 ++-- libraries/BLE/src/BLEHIDDevice.h | 4 ++-- libraries/BLE/src/BLERemoteCharacteristic.cpp | 4 ++-- libraries/BLE/src/BLERemoteCharacteristic.h | 4 ++-- libraries/BLE/src/BLERemoteDescriptor.cpp | 4 ++-- libraries/BLE/src/BLERemoteDescriptor.h | 4 ++-- libraries/BLE/src/BLERemoteService.cpp | 4 ++-- libraries/BLE/src/BLERemoteService.h | 4 ++-- libraries/BLE/src/BLEScan.cpp | 4 ++-- libraries/BLE/src/BLEScan.h | 4 ++-- libraries/BLE/src/BLESecurity.cpp | 4 ++-- libraries/BLE/src/BLESecurity.h | 4 ++-- libraries/BLE/src/BLEServer.cpp | 4 ++-- libraries/BLE/src/BLEServer.h | 4 ++-- libraries/BLE/src/BLEService.cpp | 4 ++-- libraries/BLE/src/BLEService.h | 4 ++-- libraries/BLE/src/BLEServiceMap.cpp | 4 ++-- libraries/BLE/src/BLEUUID.cpp | 4 ++-- libraries/BLE/src/BLEUUID.h | 4 ++-- libraries/BLE/src/BLEUtils.cpp | 4 ++-- libraries/BLE/src/BLEUtils.h | 4 ++-- libraries/BLE/src/BLEValue.cpp | 4 ++-- libraries/BLE/src/BLEValue.h | 4 ++-- 62 files changed, 113 insertions(+), 113 deletions(-) diff --git a/libraries/BLE/examples/Beacon_Scanner/ci.json b/libraries/BLE/examples/Beacon_Scanner/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/Beacon_Scanner/ci.json +++ b/libraries/BLE/examples/Beacon_Scanner/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/Client/ci.json b/libraries/BLE/examples/Client/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/Client/ci.json +++ b/libraries/BLE/examples/Client/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json b/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json +++ b/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/EddystoneURL_Beacon/ci.json b/libraries/BLE/examples/EddystoneURL_Beacon/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/EddystoneURL_Beacon/ci.json +++ b/libraries/BLE/examples/EddystoneURL_Beacon/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/Notify/ci.json b/libraries/BLE/examples/Notify/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/Notify/ci.json +++ b/libraries/BLE/examples/Notify/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/Scan/ci.json b/libraries/BLE/examples/Scan/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/Scan/ci.json +++ b/libraries/BLE/examples/Scan/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/Server/ci.json b/libraries/BLE/examples/Server/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/Server/ci.json +++ b/libraries/BLE/examples/Server/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/Server_multiconnect/ci.json b/libraries/BLE/examples/Server_multiconnect/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/Server_multiconnect/ci.json +++ b/libraries/BLE/examples/Server_multiconnect/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/UART/ci.json b/libraries/BLE/examples/UART/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/UART/ci.json +++ b/libraries/BLE/examples/UART/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/Write/ci.json b/libraries/BLE/examples/Write/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/Write/ci.json +++ b/libraries/BLE/examples/Write/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/iBeacon/ci.json b/libraries/BLE/examples/iBeacon/ci.json index abe13a7ebbb..31fdf3aea69 100644 --- a/libraries/BLE/examples/iBeacon/ci.json +++ b/libraries/BLE/examples/iBeacon/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BLE_SUPPORTED=y" + "CONFIG_SOC_BT_SUPPORTED=y" ] } diff --git a/libraries/BLE/src/BLE2901.cpp b/libraries/BLE/src/BLE2901.cpp index e929262b023..8a8bd6b7e5d 100644 --- a/libraries/BLE/src/BLE2901.cpp +++ b/libraries/BLE/src/BLE2901.cpp @@ -16,7 +16,7 @@ */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -37,4 +37,4 @@ void BLE2901::setDescription(String userDesc) { } #endif -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLE2901.h b/libraries/BLE/src/BLE2901.h index f5ad7c94add..a054368676c 100644 --- a/libraries/BLE/src/BLE2901.h +++ b/libraries/BLE/src/BLE2901.h @@ -19,7 +19,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLE2901_H_ #define COMPONENTS_CPP_UTILS_BLE2901_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -33,5 +33,5 @@ class BLE2901 : public BLEDescriptor { }; // BLE2901 #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLE2901_H_ */ diff --git a/libraries/BLE/src/BLE2902.cpp b/libraries/BLE/src/BLE2902.cpp index 90cdf088ff2..493abb680e8 100644 --- a/libraries/BLE/src/BLE2902.cpp +++ b/libraries/BLE/src/BLE2902.cpp @@ -10,7 +10,7 @@ * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.client_characteristic_configuration.xml */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -67,4 +67,4 @@ void BLE2902::setNotifications(bool flag) { } // setNotifications #endif -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLE2902.h b/libraries/BLE/src/BLE2902.h index 74a477f3151..85ebfc4f383 100644 --- a/libraries/BLE/src/BLE2902.h +++ b/libraries/BLE/src/BLE2902.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLE2902_H_ #define COMPONENTS_CPP_UTILS_BLE2902_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -34,5 +34,5 @@ class BLE2902 : public BLEDescriptor { }; // BLE2902 #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLE2902_H_ */ diff --git a/libraries/BLE/src/BLE2904.cpp b/libraries/BLE/src/BLE2904.cpp index aeed11ebad1..18eb3608f86 100644 --- a/libraries/BLE/src/BLE2904.cpp +++ b/libraries/BLE/src/BLE2904.cpp @@ -10,7 +10,7 @@ * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.characteristic_presentation_format.xml */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -69,4 +69,4 @@ void BLE2904::setUnit(uint16_t unit) { } // setUnit #endif -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLE2904.h b/libraries/BLE/src/BLE2904.h index 3ba66da0dc8..34f8e88a787 100644 --- a/libraries/BLE/src/BLE2904.h +++ b/libraries/BLE/src/BLE2904.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLE2904_H_ #define COMPONENTS_CPP_UTILS_BLE2904_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -74,5 +74,5 @@ class BLE2904 : public BLEDescriptor { }; // BLE2904 #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLE2904_H_ */ diff --git a/libraries/BLE/src/BLEAddress.cpp b/libraries/BLE/src/BLEAddress.cpp index b91ef3cc4de..d257f841601 100644 --- a/libraries/BLE/src/BLEAddress.cpp +++ b/libraries/BLE/src/BLEAddress.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -117,4 +117,4 @@ String BLEAddress::toString() { } // toString #endif -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEAddress.h b/libraries/BLE/src/BLEAddress.h index f1c8aa9b632..3d397f915e1 100644 --- a/libraries/BLE/src/BLEAddress.h +++ b/libraries/BLE/src/BLEAddress.h @@ -9,7 +9,7 @@ #define COMPONENTS_CPP_UTILS_BLEADDRESS_H_ #include "soc/soc_caps.h" #include "WString.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -40,5 +40,5 @@ class BLEAddress { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEADDRESS_H_ */ diff --git a/libraries/BLE/src/BLEAdvertisedDevice.cpp b/libraries/BLE/src/BLEAdvertisedDevice.cpp index 8752d24a199..ea41e3c0053 100644 --- a/libraries/BLE/src/BLEAdvertisedDevice.cpp +++ b/libraries/BLE/src/BLEAdvertisedDevice.cpp @@ -12,7 +12,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) #include @@ -596,4 +596,4 @@ size_t BLEAdvertisedDevice::getPayloadLength() { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEAdvertisedDevice.h b/libraries/BLE/src/BLEAdvertisedDevice.h index 700e5704034..2093a7ab5c0 100644 --- a/libraries/BLE/src/BLEAdvertisedDevice.h +++ b/libraries/BLE/src/BLEAdvertisedDevice.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ #define COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -148,5 +148,5 @@ class BLEExtAdvertisingCallbacks { #endif // SOC_BLE_50_SUPPORTED #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ */ diff --git a/libraries/BLE/src/BLEAdvertising.cpp b/libraries/BLE/src/BLEAdvertising.cpp index 2d71c4d7478..c4da1aa1fb3 100644 --- a/libraries/BLE/src/BLEAdvertising.cpp +++ b/libraries/BLE/src/BLEAdvertising.cpp @@ -17,7 +17,7 @@ * */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -802,4 +802,4 @@ void BLEMultiAdvertising::setDuration(uint8_t instance, int duration, int max_ev #endif // SOC_BLE_50_SUPPORTED #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEAdvertising.h b/libraries/BLE/src/BLEAdvertising.h index 9da70a3d9ca..efa8800aae4 100644 --- a/libraries/BLE/src/BLEAdvertising.h +++ b/libraries/BLE/src/BLEAdvertising.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ #define COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -113,5 +113,5 @@ class BLEMultiAdvertising { #endif // SOC_BLE_50_SUPPORTED #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ */ diff --git a/libraries/BLE/src/BLEBeacon.cpp b/libraries/BLE/src/BLEBeacon.cpp index 43366a7b2d9..90c6738bb38 100644 --- a/libraries/BLE/src/BLEBeacon.cpp +++ b/libraries/BLE/src/BLEBeacon.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -81,4 +81,4 @@ void BLEBeacon::setSignalPower(int8_t signalPower) { } // setSignalPower #endif -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEBeacon.h b/libraries/BLE/src/BLEBeacon.h index dcc41aafeb4..ad4624411a9 100644 --- a/libraries/BLE/src/BLEBeacon.h +++ b/libraries/BLE/src/BLEBeacon.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEBEACON_H_ #define COMPONENTS_CPP_UTILS_BLEBEACON_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "BLEUUID.h" /** @@ -44,5 +44,5 @@ class BLEBeacon { void setSignalPower(int8_t signalPower); }; // BLEBeacon -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEBEACON_H_ */ diff --git a/libraries/BLE/src/BLECharacteristic.cpp b/libraries/BLE/src/BLECharacteristic.cpp index b03d524a6a5..c24772417eb 100644 --- a/libraries/BLE/src/BLECharacteristic.cpp +++ b/libraries/BLE/src/BLECharacteristic.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -796,4 +796,4 @@ void BLECharacteristicCallbacks::onStatus(BLECharacteristic *pCharacteristic, St } // onStatus #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLECharacteristic.h b/libraries/BLE/src/BLECharacteristic.h index 29f105868fd..37dde154f60 100644 --- a/libraries/BLE/src/BLECharacteristic.h +++ b/libraries/BLE/src/BLECharacteristic.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ #define COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -185,5 +185,5 @@ class BLECharacteristicCallbacks { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ */ diff --git a/libraries/BLE/src/BLECharacteristicMap.cpp b/libraries/BLE/src/BLECharacteristicMap.cpp index 6f2c0bb1154..7ba585c3805 100644 --- a/libraries/BLE/src/BLECharacteristicMap.cpp +++ b/libraries/BLE/src/BLECharacteristicMap.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -131,4 +131,4 @@ String BLECharacteristicMap::toString() { } // toString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEClient.cpp b/libraries/BLE/src/BLEClient.cpp index 29fa0fbc140..9100c19611a 100644 --- a/libraries/BLE/src/BLEClient.cpp +++ b/libraries/BLE/src/BLEClient.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -583,4 +583,4 @@ String BLEClient::toString() { } // toString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEClient.h b/libraries/BLE/src/BLEClient.h index ddb932fcd95..b01ccb1f92f 100644 --- a/libraries/BLE/src/BLEClient.h +++ b/libraries/BLE/src/BLEClient.h @@ -9,7 +9,7 @@ #define MAIN_BLEDEVICE_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -99,5 +99,5 @@ class BLEClientCallbacks { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* MAIN_BLEDEVICE_H_ */ diff --git a/libraries/BLE/src/BLEDescriptor.cpp b/libraries/BLE/src/BLEDescriptor.cpp index 69a93e57201..a6f5b8d6368 100644 --- a/libraries/BLE/src/BLEDescriptor.cpp +++ b/libraries/BLE/src/BLEDescriptor.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -269,4 +269,4 @@ void BLEDescriptorCallbacks::onWrite(BLEDescriptor *pDescriptor) { } // onWrite #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEDescriptor.h b/libraries/BLE/src/BLEDescriptor.h index e155a1f2971..11c28845429 100644 --- a/libraries/BLE/src/BLEDescriptor.h +++ b/libraries/BLE/src/BLEDescriptor.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ #define COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -74,5 +74,5 @@ class BLEDescriptorCallbacks { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ */ diff --git a/libraries/BLE/src/BLEDescriptorMap.cpp b/libraries/BLE/src/BLEDescriptorMap.cpp index 732fb62cdcf..f6ce490dfa9 100644 --- a/libraries/BLE/src/BLEDescriptorMap.cpp +++ b/libraries/BLE/src/BLEDescriptorMap.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -143,4 +143,4 @@ BLEDescriptor *BLEDescriptorMap::getNext() { } // getNext #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEDevice.h b/libraries/BLE/src/BLEDevice.h index 01bf143c101..fbffe30f7b1 100644 --- a/libraries/BLE/src/BLEDevice.h +++ b/libraries/BLE/src/BLEDevice.h @@ -8,7 +8,7 @@ #ifndef MAIN_BLEDevice_H_ #define MAIN_BLEDevice_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -94,5 +94,5 @@ class BLEDevice { }; // class BLE #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* MAIN_BLEDevice_H_ */ diff --git a/libraries/BLE/src/BLEEddystoneTLM.cpp b/libraries/BLE/src/BLEEddystoneTLM.cpp index 1a301f09011..c5b515b4f36 100644 --- a/libraries/BLE/src/BLEEddystoneTLM.cpp +++ b/libraries/BLE/src/BLEEddystoneTLM.cpp @@ -10,7 +10,7 @@ * */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -177,4 +177,4 @@ void BLEEddystoneTLM::setTime(uint32_t tmil) { } // setTime #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEEddystoneTLM.h b/libraries/BLE/src/BLEEddystoneTLM.h index 3981af4a4a9..3378443892c 100644 --- a/libraries/BLE/src/BLEEddystoneTLM.h +++ b/libraries/BLE/src/BLEEddystoneTLM.h @@ -8,7 +8,7 @@ #ifndef _BLEEddystoneTLM_H_ #define _BLEEddystoneTLM_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "BLEUUID.h" #include @@ -57,5 +57,5 @@ class BLEEddystoneTLM { } __attribute__((packed)) m_eddystoneData; }; // BLEEddystoneTLM -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* _BLEEddystoneTLM_H_ */ diff --git a/libraries/BLE/src/BLEEddystoneURL.cpp b/libraries/BLE/src/BLEEddystoneURL.cpp index ddee8af0b30..8f2a834a91b 100644 --- a/libraries/BLE/src/BLEEddystoneURL.cpp +++ b/libraries/BLE/src/BLEEddystoneURL.cpp @@ -7,7 +7,7 @@ * By: Tomas Pilny */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -290,4 +290,4 @@ void BLEEddystoneURL::_initHeadder() { } #endif -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEEddystoneURL.h b/libraries/BLE/src/BLEEddystoneURL.h index 92668eb6855..0157fbf3579 100644 --- a/libraries/BLE/src/BLEEddystoneURL.h +++ b/libraries/BLE/src/BLEEddystoneURL.h @@ -11,7 +11,7 @@ #ifndef _BLEEddystoneURL_H_ #define _BLEEddystoneURL_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "BLEUUID.h" #include @@ -57,5 +57,5 @@ class BLEEddystoneURL { char BLEHeadder[12]; }; // BLEEddystoneURL -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* _BLEEddystoneURL_H_ */ diff --git a/libraries/BLE/src/BLEExceptions.h b/libraries/BLE/src/BLEExceptions.h index 15b4ef93d84..3604a131cf6 100644 --- a/libraries/BLE/src/BLEExceptions.h +++ b/libraries/BLE/src/BLEExceptions.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEEXCEPTIONS_H_ #define COMPONENTS_CPP_UTILS_BLEEXCEPTIONS_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" @@ -30,5 +30,5 @@ class BLEUuidNotFoundException : public std::exception { } }; -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEEXCEPTIONS_H_ */ diff --git a/libraries/BLE/src/BLEHIDDevice.cpp b/libraries/BLE/src/BLEHIDDevice.cpp index 0873aa1049f..e3b19fba7e3 100644 --- a/libraries/BLE/src/BLEHIDDevice.cpp +++ b/libraries/BLE/src/BLEHIDDevice.cpp @@ -5,7 +5,7 @@ * Author: chegewara */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -253,4 +253,4 @@ BLEService *BLEHIDDevice::batteryService() { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEHIDDevice.h b/libraries/BLE/src/BLEHIDDevice.h index a92a23c21d5..26da4fa5503 100644 --- a/libraries/BLE/src/BLEHIDDevice.h +++ b/libraries/BLE/src/BLEHIDDevice.h @@ -9,7 +9,7 @@ #define _BLEHIDDEVICE_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -76,5 +76,5 @@ class BLEHIDDevice { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* _BLEHIDDEVICE_H_ */ diff --git a/libraries/BLE/src/BLERemoteCharacteristic.cpp b/libraries/BLE/src/BLERemoteCharacteristic.cpp index 60d5108c1fc..ac3511557f2 100644 --- a/libraries/BLE/src/BLERemoteCharacteristic.cpp +++ b/libraries/BLE/src/BLERemoteCharacteristic.cpp @@ -8,7 +8,7 @@ #include "BLERemoteCharacteristic.h" #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -598,4 +598,4 @@ void BLERemoteCharacteristic::setAuth(esp_gatt_auth_req_t auth) { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLERemoteCharacteristic.h b/libraries/BLE/src/BLERemoteCharacteristic.h index dc63a3bc1a6..d3b7c6bce1b 100644 --- a/libraries/BLE/src/BLERemoteCharacteristic.h +++ b/libraries/BLE/src/BLERemoteCharacteristic.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ #define COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -86,5 +86,5 @@ class BLERemoteCharacteristic { }; // BLERemoteCharacteristic #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ */ diff --git a/libraries/BLE/src/BLERemoteDescriptor.cpp b/libraries/BLE/src/BLERemoteDescriptor.cpp index b6d654cf9ec..4293f706416 100644 --- a/libraries/BLE/src/BLERemoteDescriptor.cpp +++ b/libraries/BLE/src/BLERemoteDescriptor.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -209,4 +209,4 @@ void BLERemoteDescriptor::setAuth(esp_gatt_auth_req_t auth) { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLERemoteDescriptor.h b/libraries/BLE/src/BLERemoteDescriptor.h index 94b11f1490a..d8ba97053b3 100644 --- a/libraries/BLE/src/BLERemoteDescriptor.h +++ b/libraries/BLE/src/BLERemoteDescriptor.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ #define COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -53,5 +53,5 @@ class BLERemoteDescriptor { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ */ diff --git a/libraries/BLE/src/BLERemoteService.cpp b/libraries/BLE/src/BLERemoteService.cpp index e4cc31dbb33..9b8b4453dc0 100644 --- a/libraries/BLE/src/BLERemoteService.cpp +++ b/libraries/BLE/src/BLERemoteService.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -331,4 +331,4 @@ String BLERemoteService::toString() { } // toString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLERemoteService.h b/libraries/BLE/src/BLERemoteService.h index 49845a0a1e8..412ad5cb962 100644 --- a/libraries/BLE/src/BLERemoteService.h +++ b/libraries/BLE/src/BLERemoteService.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ #define COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -81,5 +81,5 @@ class BLERemoteService { }; // BLERemoteService #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ */ diff --git a/libraries/BLE/src/BLEScan.cpp b/libraries/BLE/src/BLEScan.cpp index 0a99b46c61d..636cda99a1e 100644 --- a/libraries/BLE/src/BLEScan.cpp +++ b/libraries/BLE/src/BLEScan.cpp @@ -8,7 +8,7 @@ * add BLE5 support */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -498,4 +498,4 @@ void BLEScan::clearResults() { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEScan.h b/libraries/BLE/src/BLEScan.h index 080e3b803b2..ea182915ae9 100644 --- a/libraries/BLE/src/BLEScan.h +++ b/libraries/BLE/src/BLEScan.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESCAN_H_ #define COMPONENTS_CPP_UTILS_BLESCAN_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -117,5 +117,5 @@ class BLEPeriodicScanCallbacks { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLESCAN_H_ */ diff --git a/libraries/BLE/src/BLESecurity.cpp b/libraries/BLE/src/BLESecurity.cpp index 34fc3e69e9e..f92c8334b15 100644 --- a/libraries/BLE/src/BLESecurity.cpp +++ b/libraries/BLE/src/BLESecurity.cpp @@ -6,7 +6,7 @@ */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "BLESecurity.h" #include "sdkconfig.h" @@ -92,4 +92,4 @@ char *BLESecurity::esp_key_type_to_str(esp_ble_key_type_t key_type) { } // esp_key_type_to_str #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLESecurity.h b/libraries/BLE/src/BLESecurity.h index 2e3a44b42d1..e9bc406107a 100644 --- a/libraries/BLE/src/BLESecurity.h +++ b/libraries/BLE/src/BLESecurity.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESECURITY_H_ #define COMPONENTS_CPP_UTILS_BLESECURITY_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -72,5 +72,5 @@ class BLESecurityCallbacks { }; // BLESecurityCallbacks #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif // COMPONENTS_CPP_UTILS_BLESECURITY_H_ diff --git a/libraries/BLE/src/BLEServer.cpp b/libraries/BLE/src/BLEServer.cpp index a338cf61451..5394a9b99c3 100644 --- a/libraries/BLE/src/BLEServer.cpp +++ b/libraries/BLE/src/BLEServer.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -424,4 +424,4 @@ void BLEServer::disconnect(uint16_t connId) { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEServer.h b/libraries/BLE/src/BLEServer.h index aa10f2210fa..4a8e11b9aaf 100644 --- a/libraries/BLE/src/BLEServer.h +++ b/libraries/BLE/src/BLEServer.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESERVER_H_ #define COMPONENTS_CPP_UTILS_BLESERVER_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -147,5 +147,5 @@ class BLEServerCallbacks { }; // BLEServerCallbacks #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLESERVER_H_ */ diff --git a/libraries/BLE/src/BLEService.cpp b/libraries/BLE/src/BLEService.cpp index 58c5d4eb9c3..a90ddb5d6ec 100644 --- a/libraries/BLE/src/BLEService.cpp +++ b/libraries/BLE/src/BLEService.cpp @@ -8,7 +8,7 @@ // A service is identified by a UUID. A service is also the container for one or more characteristics. #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -391,4 +391,4 @@ BLEServer *BLEService::getServer() { } // getServer #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEService.h b/libraries/BLE/src/BLEService.h index 61f867b2a02..b4178c11f08 100644 --- a/libraries/BLE/src/BLEService.h +++ b/libraries/BLE/src/BLEService.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESERVICE_H_ #define COMPONENTS_CPP_UTILS_BLESERVICE_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -95,5 +95,5 @@ class BLEService { }; // BLEService #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLESERVICE_H_ */ diff --git a/libraries/BLE/src/BLEServiceMap.cpp b/libraries/BLE/src/BLEServiceMap.cpp index 30a9db499f1..d4cccfb8ce0 100644 --- a/libraries/BLE/src/BLEServiceMap.cpp +++ b/libraries/BLE/src/BLEServiceMap.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -134,4 +134,4 @@ int BLEServiceMap::getRegisteredServiceCount() { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEUUID.cpp b/libraries/BLE/src/BLEUUID.cpp index 8074ea82f8f..60e5ba87d85 100644 --- a/libraries/BLE/src/BLEUUID.cpp +++ b/libraries/BLE/src/BLEUUID.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -386,4 +386,4 @@ String BLEUUID::toString() { } // toString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEUUID.h b/libraries/BLE/src/BLEUUID.h index 1be013942e3..4c983134d18 100644 --- a/libraries/BLE/src/BLEUUID.h +++ b/libraries/BLE/src/BLEUUID.h @@ -9,7 +9,7 @@ #define COMPONENTS_CPP_UTILS_BLEUUID_H_ #include "soc/soc_caps.h" #include "WString.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if CONFIG_BLUEDROID_ENABLED @@ -40,5 +40,5 @@ class BLEUUID { }; // BLEUUID #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEUUID_H_ */ diff --git a/libraries/BLE/src/BLEUtils.cpp b/libraries/BLE/src/BLEUtils.cpp index 05e1e32deed..0f0bea32a51 100644 --- a/libraries/BLE/src/BLEUtils.cpp +++ b/libraries/BLE/src/BLEUtils.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -1818,4 +1818,4 @@ const char *BLEUtils::searchEventTypeToString(esp_gap_search_evt_t searchEvt) { } // searchEventTypeToString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEUtils.h b/libraries/BLE/src/BLEUtils.h index 7c6f58d284b..0392f8f23aa 100644 --- a/libraries/BLE/src/BLEUtils.h +++ b/libraries/BLE/src/BLEUtils.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEUTILS_H_ #define COMPONENTS_CPP_UTILS_BLEUTILS_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -55,5 +55,5 @@ class BLEUtils { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEUTILS_H_ */ diff --git a/libraries/BLE/src/BLEValue.cpp b/libraries/BLE/src/BLEValue.cpp index 26811c985ac..821630a3d00 100644 --- a/libraries/BLE/src/BLEValue.cpp +++ b/libraries/BLE/src/BLEValue.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -121,4 +121,4 @@ void BLEValue::setValue(uint8_t *pData, size_t length) { } // setValue #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ diff --git a/libraries/BLE/src/BLEValue.h b/libraries/BLE/src/BLEValue.h index f9c91bdcd4e..6b3b0993c22 100644 --- a/libraries/BLE/src/BLEValue.h +++ b/libraries/BLE/src/BLEValue.h @@ -9,7 +9,7 @@ #define COMPONENTS_CPP_UTILS_BLEVALUE_H_ #include "soc/soc_caps.h" #include "WString.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -38,5 +38,5 @@ class BLEValue { String m_value; }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEVALUE_H_ */ From 403974d9728ff45b7839afca19a193e13fa151e0 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:11:41 +0200 Subject: [PATCH 10/13] more safe guards --- cores/esp32/esp32-hal-bt.c | 3 ++- cores/esp32/esp32-hal-misc.c | 7 ++++--- libraries/BLE/src/BLEDevice.cpp | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c index 9a664fe7cd3..693edda5bd8 100644 --- a/cores/esp32/esp32-hal-bt.c +++ b/cores/esp32/esp32-hal-bt.c @@ -13,7 +13,8 @@ // limitations under the License. #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED +#include "soc/soc_caps.h" +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED #include "esp_bt.h" #include "esp_bt_main.h" diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index 5280e52caf6..1fbfda39ec1 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/cores/esp32/esp32-hal-misc.c @@ -13,6 +13,7 @@ // limitations under the License. #include "sdkconfig.h" +#include "soc/soc_caps.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "esp_attr.h" @@ -25,7 +26,7 @@ #include "esp_ota_ops.h" #endif //CONFIG_APP_ROLLBACK_ENABLE #include "esp_private/startup_internal.h" -#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED #include "esp_bt.h" #if CONFIG_IDF_TARGET_ESP32 bool btInUse() __attribute__((weak)); @@ -38,7 +39,7 @@ bool btInUse() { return false; } #endif -#endif //CONFIG_BT_ENABLED +#endif //CONFIG_BLUEDROID_ENABLED #include #include "soc/rtc.h" #if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) && !defined(CONFIG_IDF_TARGET_ESP32P4) @@ -303,7 +304,7 @@ void initArduino() { if (err) { log_e("Failed to initialize NVS! Error: %u", err); } -#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED +#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED if (!btInUse()) { esp_bt_controller_mem_release(ESP_BT_MODE_BTDM); } diff --git a/libraries/BLE/src/BLEDevice.cpp b/libraries/BLE/src/BLEDevice.cpp index 887b4838773..6f6b543ce06 100644 --- a/libraries/BLE/src/BLEDevice.cpp +++ b/libraries/BLE/src/BLEDevice.cpp @@ -8,7 +8,7 @@ #if SOC_BT_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) #include #include #include From 64b51f9d442cf571d27e5f7198d342292e07d516 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:31:34 +0200 Subject: [PATCH 11/13] less changes --- cores/esp32/esp32-hal-bt.c | 2 +- cores/esp32/esp32-hal-bt.h | 4 ++-- cores/esp32/esp32-hal-misc.c | 4 ++-- libraries/BLE/examples/Beacon_Scanner/ci.json | 2 +- libraries/BLE/examples/Client/ci.json | 2 +- libraries/BLE/examples/EddystoneTLM_Beacon/ci.json | 2 +- libraries/BLE/examples/EddystoneURL_Beacon/ci.json | 2 +- libraries/BLE/examples/Notify/ci.json | 2 +- libraries/BLE/examples/Scan/ci.json | 2 +- libraries/BLE/examples/Server/ci.json | 2 +- libraries/BLE/examples/Server_multiconnect/ci.json | 2 +- libraries/BLE/examples/UART/ci.json | 2 +- libraries/BLE/examples/Write/ci.json | 2 +- libraries/BLE/examples/iBeacon/ci.json | 2 +- libraries/BLE/src/BLE2901.cpp | 4 ++-- libraries/BLE/src/BLE2901.h | 4 ++-- libraries/BLE/src/BLE2902.cpp | 4 ++-- libraries/BLE/src/BLE2902.h | 4 ++-- libraries/BLE/src/BLE2904.cpp | 4 ++-- libraries/BLE/src/BLE2904.h | 4 ++-- libraries/BLE/src/BLEAddress.cpp | 4 ++-- libraries/BLE/src/BLEAddress.h | 4 ++-- libraries/BLE/src/BLEAdvertisedDevice.cpp | 4 ++-- libraries/BLE/src/BLEAdvertisedDevice.h | 4 ++-- libraries/BLE/src/BLEAdvertising.cpp | 4 ++-- libraries/BLE/src/BLEAdvertising.h | 4 ++-- libraries/BLE/src/BLEBeacon.cpp | 4 ++-- libraries/BLE/src/BLEBeacon.h | 4 ++-- libraries/BLE/src/BLECharacteristic.cpp | 4 ++-- libraries/BLE/src/BLECharacteristic.h | 4 ++-- libraries/BLE/src/BLECharacteristicMap.cpp | 4 ++-- libraries/BLE/src/BLEClient.cpp | 4 ++-- libraries/BLE/src/BLEClient.h | 4 ++-- libraries/BLE/src/BLEDescriptor.cpp | 4 ++-- libraries/BLE/src/BLEDescriptor.h | 4 ++-- libraries/BLE/src/BLEDescriptorMap.cpp | 4 ++-- libraries/BLE/src/BLEDevice.cpp | 4 ++-- libraries/BLE/src/BLEDevice.h | 4 ++-- libraries/BLE/src/BLEEddystoneTLM.cpp | 4 ++-- libraries/BLE/src/BLEEddystoneTLM.h | 4 ++-- libraries/BLE/src/BLEEddystoneURL.cpp | 4 ++-- libraries/BLE/src/BLEEddystoneURL.h | 4 ++-- libraries/BLE/src/BLEExceptions.h | 4 ++-- libraries/BLE/src/BLEHIDDevice.cpp | 4 ++-- libraries/BLE/src/BLEHIDDevice.h | 4 ++-- libraries/BLE/src/BLERemoteCharacteristic.cpp | 4 ++-- libraries/BLE/src/BLERemoteCharacteristic.h | 4 ++-- libraries/BLE/src/BLERemoteDescriptor.cpp | 4 ++-- libraries/BLE/src/BLERemoteDescriptor.h | 4 ++-- libraries/BLE/src/BLERemoteService.cpp | 4 ++-- libraries/BLE/src/BLERemoteService.h | 4 ++-- libraries/BLE/src/BLEScan.cpp | 4 ++-- libraries/BLE/src/BLEScan.h | 4 ++-- libraries/BLE/src/BLESecurity.cpp | 4 ++-- libraries/BLE/src/BLESecurity.h | 4 ++-- libraries/BLE/src/BLEServer.cpp | 4 ++-- libraries/BLE/src/BLEServer.h | 4 ++-- libraries/BLE/src/BLEService.cpp | 4 ++-- libraries/BLE/src/BLEService.h | 4 ++-- libraries/BLE/src/BLEServiceMap.cpp | 4 ++-- libraries/BLE/src/BLEUUID.cpp | 4 ++-- libraries/BLE/src/BLEUUID.h | 4 ++-- libraries/BLE/src/BLEUtils.cpp | 4 ++-- libraries/BLE/src/BLEUtils.h | 4 ++-- libraries/BLE/src/BLEValue.cpp | 4 ++-- libraries/BLE/src/BLEValue.h | 4 ++-- 66 files changed, 120 insertions(+), 120 deletions(-) diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c index 693edda5bd8..f7ee8721019 100644 --- a/cores/esp32/esp32-hal-bt.c +++ b/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" diff --git a/cores/esp32/esp32-hal-bt.h b/cores/esp32/esp32-hal-bt.h index 8ab03eea904..13754b726a5 100644 --- a/cores/esp32/esp32-hal-bt.h +++ b/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_ */ diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index 1fbfda39ec1..235eb9c3eaa 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/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); } diff --git a/libraries/BLE/examples/Beacon_Scanner/ci.json b/libraries/BLE/examples/Beacon_Scanner/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/Beacon_Scanner/ci.json +++ b/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" ] } diff --git a/libraries/BLE/examples/Client/ci.json b/libraries/BLE/examples/Client/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/Client/ci.json +++ b/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" ] } diff --git a/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json b/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json +++ b/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" ] } diff --git a/libraries/BLE/examples/EddystoneURL_Beacon/ci.json b/libraries/BLE/examples/EddystoneURL_Beacon/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/EddystoneURL_Beacon/ci.json +++ b/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" ] } diff --git a/libraries/BLE/examples/Notify/ci.json b/libraries/BLE/examples/Notify/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/Notify/ci.json +++ b/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" ] } diff --git a/libraries/BLE/examples/Scan/ci.json b/libraries/BLE/examples/Scan/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/Scan/ci.json +++ b/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" ] } diff --git a/libraries/BLE/examples/Server/ci.json b/libraries/BLE/examples/Server/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/Server/ci.json +++ b/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" ] } diff --git a/libraries/BLE/examples/Server_multiconnect/ci.json b/libraries/BLE/examples/Server_multiconnect/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/Server_multiconnect/ci.json +++ b/libraries/BLE/examples/Server_multiconnect/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BT_SUPPORTED=y" + "CONFIG_SOC_BLE_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/UART/ci.json b/libraries/BLE/examples/UART/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/UART/ci.json +++ b/libraries/BLE/examples/UART/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BT_SUPPORTED=y" + "CONFIG_SOC_BLE_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/Write/ci.json b/libraries/BLE/examples/Write/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/Write/ci.json +++ b/libraries/BLE/examples/Write/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BT_SUPPORTED=y" + "CONFIG_SOC_BLE_SUPPORTED=y" ] } diff --git a/libraries/BLE/examples/iBeacon/ci.json b/libraries/BLE/examples/iBeacon/ci.json index 31fdf3aea69..abe13a7ebbb 100644 --- a/libraries/BLE/examples/iBeacon/ci.json +++ b/libraries/BLE/examples/iBeacon/ci.json @@ -1,6 +1,6 @@ { "fqbn_append": "PartitionScheme=huge_app", "requires": [ - "CONFIG_SOC_BT_SUPPORTED=y" + "CONFIG_SOC_BLE_SUPPORTED=y" ] } diff --git a/libraries/BLE/src/BLE2901.cpp b/libraries/BLE/src/BLE2901.cpp index 8a8bd6b7e5d..e929262b023 100644 --- a/libraries/BLE/src/BLE2901.cpp +++ b/libraries/BLE/src/BLE2901.cpp @@ -16,7 +16,7 @@ */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -37,4 +37,4 @@ void BLE2901::setDescription(String userDesc) { } #endif -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLE2901.h b/libraries/BLE/src/BLE2901.h index a054368676c..f5ad7c94add 100644 --- a/libraries/BLE/src/BLE2901.h +++ b/libraries/BLE/src/BLE2901.h @@ -19,7 +19,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLE2901_H_ #define COMPONENTS_CPP_UTILS_BLE2901_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -33,5 +33,5 @@ class BLE2901 : public BLEDescriptor { }; // BLE2901 #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLE2901_H_ */ diff --git a/libraries/BLE/src/BLE2902.cpp b/libraries/BLE/src/BLE2902.cpp index 493abb680e8..90cdf088ff2 100644 --- a/libraries/BLE/src/BLE2902.cpp +++ b/libraries/BLE/src/BLE2902.cpp @@ -10,7 +10,7 @@ * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.client_characteristic_configuration.xml */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -67,4 +67,4 @@ void BLE2902::setNotifications(bool flag) { } // setNotifications #endif -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLE2902.h b/libraries/BLE/src/BLE2902.h index 85ebfc4f383..74a477f3151 100644 --- a/libraries/BLE/src/BLE2902.h +++ b/libraries/BLE/src/BLE2902.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLE2902_H_ #define COMPONENTS_CPP_UTILS_BLE2902_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -34,5 +34,5 @@ class BLE2902 : public BLEDescriptor { }; // BLE2902 #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLE2902_H_ */ diff --git a/libraries/BLE/src/BLE2904.cpp b/libraries/BLE/src/BLE2904.cpp index 18eb3608f86..aeed11ebad1 100644 --- a/libraries/BLE/src/BLE2904.cpp +++ b/libraries/BLE/src/BLE2904.cpp @@ -10,7 +10,7 @@ * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.characteristic_presentation_format.xml */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -69,4 +69,4 @@ void BLE2904::setUnit(uint16_t unit) { } // setUnit #endif -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLE2904.h b/libraries/BLE/src/BLE2904.h index 34f8e88a787..3ba66da0dc8 100644 --- a/libraries/BLE/src/BLE2904.h +++ b/libraries/BLE/src/BLE2904.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLE2904_H_ #define COMPONENTS_CPP_UTILS_BLE2904_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -74,5 +74,5 @@ class BLE2904 : public BLEDescriptor { }; // BLE2904 #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLE2904_H_ */ diff --git a/libraries/BLE/src/BLEAddress.cpp b/libraries/BLE/src/BLEAddress.cpp index d257f841601..b91ef3cc4de 100644 --- a/libraries/BLE/src/BLEAddress.cpp +++ b/libraries/BLE/src/BLEAddress.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -117,4 +117,4 @@ String BLEAddress::toString() { } // toString #endif -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEAddress.h b/libraries/BLE/src/BLEAddress.h index 3d397f915e1..f1c8aa9b632 100644 --- a/libraries/BLE/src/BLEAddress.h +++ b/libraries/BLE/src/BLEAddress.h @@ -9,7 +9,7 @@ #define COMPONENTS_CPP_UTILS_BLEADDRESS_H_ #include "soc/soc_caps.h" #include "WString.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -40,5 +40,5 @@ class BLEAddress { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEADDRESS_H_ */ diff --git a/libraries/BLE/src/BLEAdvertisedDevice.cpp b/libraries/BLE/src/BLEAdvertisedDevice.cpp index ea41e3c0053..8752d24a199 100644 --- a/libraries/BLE/src/BLEAdvertisedDevice.cpp +++ b/libraries/BLE/src/BLEAdvertisedDevice.cpp @@ -12,7 +12,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) #include @@ -596,4 +596,4 @@ size_t BLEAdvertisedDevice::getPayloadLength() { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEAdvertisedDevice.h b/libraries/BLE/src/BLEAdvertisedDevice.h index 2093a7ab5c0..700e5704034 100644 --- a/libraries/BLE/src/BLEAdvertisedDevice.h +++ b/libraries/BLE/src/BLEAdvertisedDevice.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ #define COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -148,5 +148,5 @@ class BLEExtAdvertisingCallbacks { #endif // SOC_BLE_50_SUPPORTED #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ */ diff --git a/libraries/BLE/src/BLEAdvertising.cpp b/libraries/BLE/src/BLEAdvertising.cpp index c4da1aa1fb3..2d71c4d7478 100644 --- a/libraries/BLE/src/BLEAdvertising.cpp +++ b/libraries/BLE/src/BLEAdvertising.cpp @@ -17,7 +17,7 @@ * */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -802,4 +802,4 @@ void BLEMultiAdvertising::setDuration(uint8_t instance, int duration, int max_ev #endif // SOC_BLE_50_SUPPORTED #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEAdvertising.h b/libraries/BLE/src/BLEAdvertising.h index efa8800aae4..9da70a3d9ca 100644 --- a/libraries/BLE/src/BLEAdvertising.h +++ b/libraries/BLE/src/BLEAdvertising.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ #define COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -113,5 +113,5 @@ class BLEMultiAdvertising { #endif // SOC_BLE_50_SUPPORTED #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ */ diff --git a/libraries/BLE/src/BLEBeacon.cpp b/libraries/BLE/src/BLEBeacon.cpp index 90c6738bb38..43366a7b2d9 100644 --- a/libraries/BLE/src/BLEBeacon.cpp +++ b/libraries/BLE/src/BLEBeacon.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -81,4 +81,4 @@ void BLEBeacon::setSignalPower(int8_t signalPower) { } // setSignalPower #endif -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEBeacon.h b/libraries/BLE/src/BLEBeacon.h index ad4624411a9..dcc41aafeb4 100644 --- a/libraries/BLE/src/BLEBeacon.h +++ b/libraries/BLE/src/BLEBeacon.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEBEACON_H_ #define COMPONENTS_CPP_UTILS_BLEBEACON_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "BLEUUID.h" /** @@ -44,5 +44,5 @@ class BLEBeacon { void setSignalPower(int8_t signalPower); }; // BLEBeacon -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEBEACON_H_ */ diff --git a/libraries/BLE/src/BLECharacteristic.cpp b/libraries/BLE/src/BLECharacteristic.cpp index c24772417eb..b03d524a6a5 100644 --- a/libraries/BLE/src/BLECharacteristic.cpp +++ b/libraries/BLE/src/BLECharacteristic.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -796,4 +796,4 @@ void BLECharacteristicCallbacks::onStatus(BLECharacteristic *pCharacteristic, St } // onStatus #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLECharacteristic.h b/libraries/BLE/src/BLECharacteristic.h index 37dde154f60..29f105868fd 100644 --- a/libraries/BLE/src/BLECharacteristic.h +++ b/libraries/BLE/src/BLECharacteristic.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ #define COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -185,5 +185,5 @@ class BLECharacteristicCallbacks { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ */ diff --git a/libraries/BLE/src/BLECharacteristicMap.cpp b/libraries/BLE/src/BLECharacteristicMap.cpp index 7ba585c3805..6f2c0bb1154 100644 --- a/libraries/BLE/src/BLECharacteristicMap.cpp +++ b/libraries/BLE/src/BLECharacteristicMap.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -131,4 +131,4 @@ String BLECharacteristicMap::toString() { } // toString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEClient.cpp b/libraries/BLE/src/BLEClient.cpp index 9100c19611a..29fa0fbc140 100644 --- a/libraries/BLE/src/BLEClient.cpp +++ b/libraries/BLE/src/BLEClient.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -583,4 +583,4 @@ String BLEClient::toString() { } // toString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEClient.h b/libraries/BLE/src/BLEClient.h index b01ccb1f92f..ddb932fcd95 100644 --- a/libraries/BLE/src/BLEClient.h +++ b/libraries/BLE/src/BLEClient.h @@ -9,7 +9,7 @@ #define MAIN_BLEDEVICE_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -99,5 +99,5 @@ class BLEClientCallbacks { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* MAIN_BLEDEVICE_H_ */ diff --git a/libraries/BLE/src/BLEDescriptor.cpp b/libraries/BLE/src/BLEDescriptor.cpp index a6f5b8d6368..69a93e57201 100644 --- a/libraries/BLE/src/BLEDescriptor.cpp +++ b/libraries/BLE/src/BLEDescriptor.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -269,4 +269,4 @@ void BLEDescriptorCallbacks::onWrite(BLEDescriptor *pDescriptor) { } // onWrite #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEDescriptor.h b/libraries/BLE/src/BLEDescriptor.h index 11c28845429..e155a1f2971 100644 --- a/libraries/BLE/src/BLEDescriptor.h +++ b/libraries/BLE/src/BLEDescriptor.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ #define COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -74,5 +74,5 @@ class BLEDescriptorCallbacks { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ */ diff --git a/libraries/BLE/src/BLEDescriptorMap.cpp b/libraries/BLE/src/BLEDescriptorMap.cpp index f6ce490dfa9..732fb62cdcf 100644 --- a/libraries/BLE/src/BLEDescriptorMap.cpp +++ b/libraries/BLE/src/BLEDescriptorMap.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -143,4 +143,4 @@ BLEDescriptor *BLEDescriptorMap::getNext() { } // getNext #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEDevice.cpp b/libraries/BLE/src/BLEDevice.cpp index 6f6b543ce06..4cbd8ae436b 100644 --- a/libraries/BLE/src/BLEDevice.cpp +++ b/libraries/BLE/src/BLEDevice.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) @@ -651,4 +651,4 @@ void BLEDevice::setCustomGattsHandler(gatts_event_handler handler) { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEDevice.h b/libraries/BLE/src/BLEDevice.h index fbffe30f7b1..01bf143c101 100644 --- a/libraries/BLE/src/BLEDevice.h +++ b/libraries/BLE/src/BLEDevice.h @@ -8,7 +8,7 @@ #ifndef MAIN_BLEDevice_H_ #define MAIN_BLEDevice_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -94,5 +94,5 @@ class BLEDevice { }; // class BLE #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* MAIN_BLEDevice_H_ */ diff --git a/libraries/BLE/src/BLEEddystoneTLM.cpp b/libraries/BLE/src/BLEEddystoneTLM.cpp index c5b515b4f36..1a301f09011 100644 --- a/libraries/BLE/src/BLEEddystoneTLM.cpp +++ b/libraries/BLE/src/BLEEddystoneTLM.cpp @@ -10,7 +10,7 @@ * */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -177,4 +177,4 @@ void BLEEddystoneTLM::setTime(uint32_t tmil) { } // setTime #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEEddystoneTLM.h b/libraries/BLE/src/BLEEddystoneTLM.h index 3378443892c..3981af4a4a9 100644 --- a/libraries/BLE/src/BLEEddystoneTLM.h +++ b/libraries/BLE/src/BLEEddystoneTLM.h @@ -8,7 +8,7 @@ #ifndef _BLEEddystoneTLM_H_ #define _BLEEddystoneTLM_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "BLEUUID.h" #include @@ -57,5 +57,5 @@ class BLEEddystoneTLM { } __attribute__((packed)) m_eddystoneData; }; // BLEEddystoneTLM -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* _BLEEddystoneTLM_H_ */ diff --git a/libraries/BLE/src/BLEEddystoneURL.cpp b/libraries/BLE/src/BLEEddystoneURL.cpp index 8f2a834a91b..ddee8af0b30 100644 --- a/libraries/BLE/src/BLEEddystoneURL.cpp +++ b/libraries/BLE/src/BLEEddystoneURL.cpp @@ -7,7 +7,7 @@ * By: Tomas Pilny */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -290,4 +290,4 @@ void BLEEddystoneURL::_initHeadder() { } #endif -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEEddystoneURL.h b/libraries/BLE/src/BLEEddystoneURL.h index 0157fbf3579..92668eb6855 100644 --- a/libraries/BLE/src/BLEEddystoneURL.h +++ b/libraries/BLE/src/BLEEddystoneURL.h @@ -11,7 +11,7 @@ #ifndef _BLEEddystoneURL_H_ #define _BLEEddystoneURL_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "BLEUUID.h" #include @@ -57,5 +57,5 @@ class BLEEddystoneURL { char BLEHeadder[12]; }; // BLEEddystoneURL -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* _BLEEddystoneURL_H_ */ diff --git a/libraries/BLE/src/BLEExceptions.h b/libraries/BLE/src/BLEExceptions.h index 3604a131cf6..15b4ef93d84 100644 --- a/libraries/BLE/src/BLEExceptions.h +++ b/libraries/BLE/src/BLEExceptions.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEEXCEPTIONS_H_ #define COMPONENTS_CPP_UTILS_BLEEXCEPTIONS_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" @@ -30,5 +30,5 @@ class BLEUuidNotFoundException : public std::exception { } }; -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEEXCEPTIONS_H_ */ diff --git a/libraries/BLE/src/BLEHIDDevice.cpp b/libraries/BLE/src/BLEHIDDevice.cpp index e3b19fba7e3..0873aa1049f 100644 --- a/libraries/BLE/src/BLEHIDDevice.cpp +++ b/libraries/BLE/src/BLEHIDDevice.cpp @@ -5,7 +5,7 @@ * Author: chegewara */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -253,4 +253,4 @@ BLEService *BLEHIDDevice::batteryService() { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEHIDDevice.h b/libraries/BLE/src/BLEHIDDevice.h index 26da4fa5503..a92a23c21d5 100644 --- a/libraries/BLE/src/BLEHIDDevice.h +++ b/libraries/BLE/src/BLEHIDDevice.h @@ -9,7 +9,7 @@ #define _BLEHIDDEVICE_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -76,5 +76,5 @@ class BLEHIDDevice { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* _BLEHIDDEVICE_H_ */ diff --git a/libraries/BLE/src/BLERemoteCharacteristic.cpp b/libraries/BLE/src/BLERemoteCharacteristic.cpp index ac3511557f2..60d5108c1fc 100644 --- a/libraries/BLE/src/BLERemoteCharacteristic.cpp +++ b/libraries/BLE/src/BLERemoteCharacteristic.cpp @@ -8,7 +8,7 @@ #include "BLERemoteCharacteristic.h" #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -598,4 +598,4 @@ void BLERemoteCharacteristic::setAuth(esp_gatt_auth_req_t auth) { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLERemoteCharacteristic.h b/libraries/BLE/src/BLERemoteCharacteristic.h index d3b7c6bce1b..dc63a3bc1a6 100644 --- a/libraries/BLE/src/BLERemoteCharacteristic.h +++ b/libraries/BLE/src/BLERemoteCharacteristic.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ #define COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -86,5 +86,5 @@ class BLERemoteCharacteristic { }; // BLERemoteCharacteristic #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ */ diff --git a/libraries/BLE/src/BLERemoteDescriptor.cpp b/libraries/BLE/src/BLERemoteDescriptor.cpp index 4293f706416..b6d654cf9ec 100644 --- a/libraries/BLE/src/BLERemoteDescriptor.cpp +++ b/libraries/BLE/src/BLERemoteDescriptor.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -209,4 +209,4 @@ void BLERemoteDescriptor::setAuth(esp_gatt_auth_req_t auth) { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLERemoteDescriptor.h b/libraries/BLE/src/BLERemoteDescriptor.h index d8ba97053b3..94b11f1490a 100644 --- a/libraries/BLE/src/BLERemoteDescriptor.h +++ b/libraries/BLE/src/BLERemoteDescriptor.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ #define COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -53,5 +53,5 @@ class BLERemoteDescriptor { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ */ diff --git a/libraries/BLE/src/BLERemoteService.cpp b/libraries/BLE/src/BLERemoteService.cpp index 9b8b4453dc0..e4cc31dbb33 100644 --- a/libraries/BLE/src/BLERemoteService.cpp +++ b/libraries/BLE/src/BLERemoteService.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -331,4 +331,4 @@ String BLERemoteService::toString() { } // toString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLERemoteService.h b/libraries/BLE/src/BLERemoteService.h index 412ad5cb962..49845a0a1e8 100644 --- a/libraries/BLE/src/BLERemoteService.h +++ b/libraries/BLE/src/BLERemoteService.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ #define COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -81,5 +81,5 @@ class BLERemoteService { }; // BLERemoteService #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ */ diff --git a/libraries/BLE/src/BLEScan.cpp b/libraries/BLE/src/BLEScan.cpp index 636cda99a1e..0a99b46c61d 100644 --- a/libraries/BLE/src/BLEScan.cpp +++ b/libraries/BLE/src/BLEScan.cpp @@ -8,7 +8,7 @@ * add BLE5 support */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -498,4 +498,4 @@ void BLEScan::clearResults() { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEScan.h b/libraries/BLE/src/BLEScan.h index ea182915ae9..080e3b803b2 100644 --- a/libraries/BLE/src/BLEScan.h +++ b/libraries/BLE/src/BLEScan.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESCAN_H_ #define COMPONENTS_CPP_UTILS_BLESCAN_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -117,5 +117,5 @@ class BLEPeriodicScanCallbacks { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLESCAN_H_ */ diff --git a/libraries/BLE/src/BLESecurity.cpp b/libraries/BLE/src/BLESecurity.cpp index f92c8334b15..34fc3e69e9e 100644 --- a/libraries/BLE/src/BLESecurity.cpp +++ b/libraries/BLE/src/BLESecurity.cpp @@ -6,7 +6,7 @@ */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "BLESecurity.h" #include "sdkconfig.h" @@ -92,4 +92,4 @@ char *BLESecurity::esp_key_type_to_str(esp_ble_key_type_t key_type) { } // esp_key_type_to_str #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLESecurity.h b/libraries/BLE/src/BLESecurity.h index e9bc406107a..2e3a44b42d1 100644 --- a/libraries/BLE/src/BLESecurity.h +++ b/libraries/BLE/src/BLESecurity.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESECURITY_H_ #define COMPONENTS_CPP_UTILS_BLESECURITY_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -72,5 +72,5 @@ class BLESecurityCallbacks { }; // BLESecurityCallbacks #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif // COMPONENTS_CPP_UTILS_BLESECURITY_H_ diff --git a/libraries/BLE/src/BLEServer.cpp b/libraries/BLE/src/BLEServer.cpp index 5394a9b99c3..a338cf61451 100644 --- a/libraries/BLE/src/BLEServer.cpp +++ b/libraries/BLE/src/BLEServer.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -424,4 +424,4 @@ void BLEServer::disconnect(uint16_t connId) { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEServer.h b/libraries/BLE/src/BLEServer.h index 4a8e11b9aaf..aa10f2210fa 100644 --- a/libraries/BLE/src/BLEServer.h +++ b/libraries/BLE/src/BLEServer.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESERVER_H_ #define COMPONENTS_CPP_UTILS_BLESERVER_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -147,5 +147,5 @@ class BLEServerCallbacks { }; // BLEServerCallbacks #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLESERVER_H_ */ diff --git a/libraries/BLE/src/BLEService.cpp b/libraries/BLE/src/BLEService.cpp index a90ddb5d6ec..58c5d4eb9c3 100644 --- a/libraries/BLE/src/BLEService.cpp +++ b/libraries/BLE/src/BLEService.cpp @@ -8,7 +8,7 @@ // A service is identified by a UUID. A service is also the container for one or more characteristics. #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -391,4 +391,4 @@ BLEServer *BLEService::getServer() { } // getServer #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEService.h b/libraries/BLE/src/BLEService.h index b4178c11f08..61f867b2a02 100644 --- a/libraries/BLE/src/BLEService.h +++ b/libraries/BLE/src/BLEService.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESERVICE_H_ #define COMPONENTS_CPP_UTILS_BLESERVICE_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -95,5 +95,5 @@ class BLEService { }; // BLEService #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLESERVICE_H_ */ diff --git a/libraries/BLE/src/BLEServiceMap.cpp b/libraries/BLE/src/BLEServiceMap.cpp index d4cccfb8ce0..30a9db499f1 100644 --- a/libraries/BLE/src/BLEServiceMap.cpp +++ b/libraries/BLE/src/BLEServiceMap.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -134,4 +134,4 @@ int BLEServiceMap::getRegisteredServiceCount() { } #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEUUID.cpp b/libraries/BLE/src/BLEUUID.cpp index 60e5ba87d85..8074ea82f8f 100644 --- a/libraries/BLE/src/BLEUUID.cpp +++ b/libraries/BLE/src/BLEUUID.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -386,4 +386,4 @@ String BLEUUID::toString() { } // toString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEUUID.h b/libraries/BLE/src/BLEUUID.h index 4c983134d18..1be013942e3 100644 --- a/libraries/BLE/src/BLEUUID.h +++ b/libraries/BLE/src/BLEUUID.h @@ -9,7 +9,7 @@ #define COMPONENTS_CPP_UTILS_BLEUUID_H_ #include "soc/soc_caps.h" #include "WString.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if CONFIG_BLUEDROID_ENABLED @@ -40,5 +40,5 @@ class BLEUUID { }; // BLEUUID #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEUUID_H_ */ diff --git a/libraries/BLE/src/BLEUtils.cpp b/libraries/BLE/src/BLEUtils.cpp index 0f0bea32a51..05e1e32deed 100644 --- a/libraries/BLE/src/BLEUtils.cpp +++ b/libraries/BLE/src/BLEUtils.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -1818,4 +1818,4 @@ const char *BLEUtils::searchEventTypeToString(esp_gap_search_evt_t searchEvt) { } // searchEventTypeToString #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEUtils.h b/libraries/BLE/src/BLEUtils.h index 0392f8f23aa..7c6f58d284b 100644 --- a/libraries/BLE/src/BLEUtils.h +++ b/libraries/BLE/src/BLEUtils.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEUTILS_H_ #define COMPONENTS_CPP_UTILS_BLEUTILS_H_ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -55,5 +55,5 @@ class BLEUtils { }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEUTILS_H_ */ diff --git a/libraries/BLE/src/BLEValue.cpp b/libraries/BLE/src/BLEValue.cpp index 821630a3d00..26811c985ac 100644 --- a/libraries/BLE/src/BLEValue.cpp +++ b/libraries/BLE/src/BLEValue.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "soc/soc_caps.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -121,4 +121,4 @@ void BLEValue::setValue(uint8_t *pData, size_t length) { } // setValue #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEValue.h b/libraries/BLE/src/BLEValue.h index 6b3b0993c22..f9c91bdcd4e 100644 --- a/libraries/BLE/src/BLEValue.h +++ b/libraries/BLE/src/BLEValue.h @@ -9,7 +9,7 @@ #define COMPONENTS_CPP_UTILS_BLEVALUE_H_ #include "soc/soc_caps.h" #include "WString.h" -#if SOC_BT_SUPPORTED +#if SOC_BLE_SUPPORTED #include "sdkconfig.h" #if defined(CONFIG_BLUEDROID_ENABLED) @@ -38,5 +38,5 @@ class BLEValue { String m_value; }; #endif /* CONFIG_BLUEDROID_ENABLED */ -#endif /* SOC_BT_SUPPORTED */ +#endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEVALUE_H_ */ From d99740f72a87c968ef4c5b359dfdc2d32ea825eb Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 4 Apr 2025 12:59:37 +0200 Subject: [PATCH 12/13] guard SimpleBLE --- cores/esp32/esp32-hal-bt.c | 4 ++-- cores/esp32/esp32-hal-bt.h | 4 ++-- cores/esp32/esp32-hal-misc.c | 4 ++-- libraries/SimpleBLE/src/SimpleBLE.cpp | 6 ++---- libraries/SimpleBLE/src/SimpleBLE.h | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c index f7ee8721019..1b1a8f400fe 100644 --- a/cores/esp32/esp32-hal-bt.c +++ b/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_BLE_SUPPORTED +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED #include "esp_bt.h" #include "esp_bt_main.h" @@ -102,4 +102,4 @@ bool btStop() { return true; } -#endif +#endif /* CONFIG_BT_ENABLED CONFIG_BLUEDROID_ENABLED SOC_BT_SUPPORTED */ diff --git a/cores/esp32/esp32-hal-bt.h b/cores/esp32/esp32-hal-bt.h index 13754b726a5..8ab03eea904 100644 --- a/cores/esp32/esp32-hal-bt.h +++ b/cores/esp32/esp32-hal-bt.h @@ -16,7 +16,7 @@ #define _ESP32_ESP32_HAL_BT_H_ #include "soc/soc_caps.h" -#if SOC_BLE_SUPPORTED +#if SOC_BT_SUPPORTED #include "esp32-hal.h" @@ -40,6 +40,6 @@ bool btStop(); } #endif -#endif /* SOC_BLE_SUPPORTED */ +#endif /* SOC_BT_SUPPORTED */ #endif /* _ESP32_ESP32_HAL_BT_H_ */ diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c index 235eb9c3eaa..1fbfda39ec1 100644 --- a/cores/esp32/esp32-hal-misc.c +++ b/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_BLE_SUPPORTED +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_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_BLE_SUPPORTED +#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED if (!btInUse()) { esp_bt_controller_mem_release(ESP_BT_MODE_BTDM); } diff --git a/libraries/SimpleBLE/src/SimpleBLE.cpp b/libraries/SimpleBLE/src/SimpleBLE.cpp index 3c4ed915c05..336b5314976 100644 --- a/libraries/SimpleBLE/src/SimpleBLE.cpp +++ b/libraries/SimpleBLE/src/SimpleBLE.cpp @@ -12,11 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "sdkconfig.h" - -#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) - #include "SimpleBLE.h" +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED + #include "esp32-hal-log.h" #include "esp_bt.h" diff --git a/libraries/SimpleBLE/src/SimpleBLE.h b/libraries/SimpleBLE/src/SimpleBLE.h index 23c1cdb593f..1f16e54a185 100644 --- a/libraries/SimpleBLE/src/SimpleBLE.h +++ b/libraries/SimpleBLE/src/SimpleBLE.h @@ -16,8 +16,8 @@ #define _SIMPLE_BLE_H_ #include "sdkconfig.h" - -#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) +#include "soc/soc_caps.h" +#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED #include #include From f7f5f69b1658f18e124c6d210f9af7807b897659 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 4 Apr 2025 13:42:30 +0200 Subject: [PATCH 13/13] remove old refactored code --- cores/esp32/esp32-hal-bt.h | 2 -- libraries/BluetoothSerial/src/BluetoothSerial.cpp | 6 +++--- libraries/SimpleBLE/src/SimpleBLE.cpp | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cores/esp32/esp32-hal-bt.h b/cores/esp32/esp32-hal-bt.h index 8ab03eea904..76232add271 100644 --- a/cores/esp32/esp32-hal-bt.h +++ b/cores/esp32/esp32-hal-bt.h @@ -31,9 +31,7 @@ typedef enum { BT_MODE_BTDM } bt_mode; -bool btStarted(); bool btStart(); -bool btStartMode(bt_mode mode); bool btStop(); #ifdef __cplusplus diff --git a/libraries/BluetoothSerial/src/BluetoothSerial.cpp b/libraries/BluetoothSerial/src/BluetoothSerial.cpp index 3d00504c1b1..f9654ed96fb 100644 --- a/libraries/BluetoothSerial/src/BluetoothSerial.cpp +++ b/libraries/BluetoothSerial/src/BluetoothSerial.cpp @@ -660,7 +660,7 @@ static bool _init_bt(const char *deviceName, bt_mode mode) { } } - if (!btStarted() && !btStartMode(mode)) { + if (!btStart()) { log_e("initialize controller failed"); return false; } @@ -729,7 +729,7 @@ static bool _init_bt(const char *deviceName, bt_mode mode) { } static bool _stop_bt() { - if (btStarted()) { + if (btStart()) { if (_spp_client) { esp_spp_disconnect(_spp_client); } @@ -1115,7 +1115,7 @@ bool BluetoothSerial::isReady(bool checkMaster, int timeout) { log_e("Master mode is not active. Call begin(localName, true) to enable Master mode"); return false; } - if (!btStarted()) { + if (!btStart()) { log_e("BT is not initialized. Call begin() first"); return false; } diff --git a/libraries/SimpleBLE/src/SimpleBLE.cpp b/libraries/SimpleBLE/src/SimpleBLE.cpp index 336b5314976..9b38e937490 100644 --- a/libraries/SimpleBLE/src/SimpleBLE.cpp +++ b/libraries/SimpleBLE/src/SimpleBLE.cpp @@ -60,7 +60,7 @@ static void _on_gap(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) } static bool _init_gap(const char *name) { - if (!btStarted() && !btStart()) { + if (!btStart()) { log_e("btStart failed"); return false; } @@ -93,7 +93,7 @@ static bool _init_gap(const char *name) { } static bool _stop_gap() { - if (btStarted()) { + if (btStart()) { esp_bluedroid_disable(); esp_bluedroid_deinit(); btStop();