Merge branch 'feat/allow_connect_during_scan_v5.2' into 'release/v5.2'

feat(nimble): Add support to allow connection during scanning (v5.2)

See merge request espressif/esp-idf!32844
This commit is contained in:
Rahul Tank
2024-08-20 17:11:46 +08:00
13 changed files with 65 additions and 31 deletions
+6
View File
@@ -926,6 +926,12 @@ config BT_NIMBLE_HIGH_DUTY_ADV_ITVL
help
This enable BLE high duty advertising interval feature
config BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN
bool "Allow Connections with scanning in progress"
depends on BT_NIMBLE_ENABLED && (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3)
help
This enables support for user to initiate a new connection with scan in progress
config BT_NIMBLE_HOST_QUEUE_CONG_CHECK
bool "BLE queue congestion check"
depends on BT_NIMBLE_ENABLED
@@ -1833,6 +1833,14 @@
#endif
#endif
#ifndef MYNEWT_VAL_BLE_HOST_ALLOW_CONNECT_WITH_SCAN
#ifdef CONFIG_BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN
#define MYNEWT_VAL_BLE_HOST_ALLOW_CONNECT_WITH_SCAN CONFIG_BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN
#else
#define MYNEWT_VAL_BLE_HOST_ALLOW_CONNECT_WITH_SCAN (0)
#endif
#endif
#if CONFIG_BT_CONTROLLER_DISABLED && CONFIG_BT_NIMBLE_TRANSPORT_UART
#ifndef MYNEWT_VAL_BLE_TRANSPORT_UART_PORT
#define MYNEWT_VAL_BLE_TRANSPORT_UART_PORT CONFIG_BT_NIMBLE_TRANSPORT_UART_PORT