|
54 | 54 |
|
55 | 55 | # if defined(ESP_PLATFORM) && defined(CONFIG_ENABLE_ARDUINO_DEPENDS) |
56 | 56 | # include "esp32-hal-bt.h" |
| 57 | +# if __has_include("esp32-hal-bt-mem.h") |
| 58 | +# include "esp32-hal-bt-mem.h" |
| 59 | +# endif |
57 | 60 | # endif |
58 | 61 |
|
59 | 62 | # include "NimBLELog.h" |
@@ -909,7 +912,8 @@ bool NimBLEDevice::init(const std::string& deviceName) { |
909 | 912 | bt_cfg.mode = ESP_BT_MODE_BLE; |
910 | 913 | bt_cfg.ble_max_conn = MYNEWT_VAL(BLE_MAX_CONNECTIONS); |
911 | 914 | # elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) |
912 | | - bt_cfg.ble_max_act = MYNEWT_VAL(BLE_MAX_CONNECTIONS) + MYNEWT_VAL(BLE_ROLE_BROADCASTER) + MYNEWT_VAL(BLE_ROLE_OBSERVER); |
| 915 | + bt_cfg.ble_max_act = |
| 916 | + MYNEWT_VAL(BLE_MAX_CONNECTIONS) + MYNEWT_VAL(BLE_ROLE_BROADCASTER) + MYNEWT_VAL(BLE_ROLE_OBSERVER); |
913 | 917 | # else |
914 | 918 | bt_cfg.nimble_max_connections = MYNEWT_VAL(BLE_MAX_CONNECTIONS); |
915 | 919 | # endif |
@@ -1290,13 +1294,13 @@ bool NimBLEDevice::injectConfirmPasskey(const NimBLEConnInfo& peerInfo, bool acc |
1290 | 1294 | * @param [in] deviceName The name to set. |
1291 | 1295 | */ |
1292 | 1296 | bool NimBLEDevice::setDeviceName(const std::string& deviceName) { |
1293 | | -#if !defined(MYNEWT_VAL_BLE_GATTS) || MYNEWT_VAL(BLE_GATTS) > 0 |
| 1297 | +# if !defined(MYNEWT_VAL_BLE_GATTS) || MYNEWT_VAL(BLE_GATTS) > 0 |
1294 | 1298 | int rc = ble_svc_gap_device_name_set(deviceName.c_str()); |
1295 | 1299 | if (rc != 0) { |
1296 | 1300 | NIMBLE_LOGE(LOG_TAG, "Device name not set - too long"); |
1297 | 1301 | return false; |
1298 | 1302 | } |
1299 | | -#endif |
| 1303 | +# endif |
1300 | 1304 | return true; |
1301 | 1305 | } // setDeviceName |
1302 | 1306 |
|
@@ -1348,10 +1352,4 @@ int NimBLEDeviceCallbacks::onStoreStatus(struct ble_store_status_event* event, v |
1348 | 1352 | return ble_store_util_status_rr(event, arg); |
1349 | 1353 | } |
1350 | 1354 |
|
1351 | | -# if defined(CONFIG_ENABLE_ARDUINO_DEPENDS) && SOC_BT_SUPPORTED |
1352 | | -bool btInUse(void) { |
1353 | | - return true; |
1354 | | -} |
1355 | | -# endif |
1356 | | - |
1357 | 1355 | #endif // CONFIG_BT_NIMBLE_ENABLED |
0 commit comments