From 378216daf11c92eab47ab8a11753c56f5b627668 Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Wed, 7 May 2025 14:40:37 +0530 Subject: [PATCH 1/4] fix(nimble): Add configurable option to select ext adv v2 command --- components/bt/host/nimble/Kconfig.in | 7 +++++++ components/bt/host/nimble/nimble | 2 +- components/bt/host/nimble/port/include/esp_nimble_cfg.h | 8 ++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in index f86f974a76..c29a08e0e7 100644 --- a/components/bt/host/nimble/Kconfig.in +++ b/components/bt/host/nimble/Kconfig.in @@ -600,6 +600,13 @@ if BT_NIMBLE_50_FEATURE_SUPPORT will be supported from BLE 5.0 onwards. if BT_NIMBLE_EXT_ADV + config BT_NIMBLE_EXT_ADV_V2 + bool "Enable support for extended adv v2" + default n + depends on BT_NIMBLE_EXT_ADV + help + Enable this option to use Extended Adv V2 command instead of V1. + config BT_NIMBLE_MAX_EXT_ADV_INSTANCES int "Maximum number of extended advertising instances." range 0 4 diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index 5c6b832167..0cc70adeba 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit 5c6b832167da95453701efeec3d383e71dd4b00a +Subproject commit 0cc70adebae819b31074cce04d59adf7283bcd7f diff --git a/components/bt/host/nimble/port/include/esp_nimble_cfg.h b/components/bt/host/nimble/port/include/esp_nimble_cfg.h index 90025e49a5..f5c802cee9 100644 --- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h +++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h @@ -98,6 +98,14 @@ #define MYNEWT_VAL_BLE_EXT_ADV (CONFIG_BT_NIMBLE_EXT_ADV) #endif +#ifndef MYNEWT_VAL_BLE_EXT_ADV_V2 +#ifdef CONFIG_BT_NIMBLE_EXT_ADV_V2 +#define MYNEWT_VAL_BLE_EXT_ADV_V2 (CONFIG_BT_NIMBLE_EXT_ADV_V2) +#else +#define MYNEWT_VAL_BLE_EXT_ADV_V2 (0) +#endif +#endif + #ifndef CONFIG_BT_NIMBLE_EXT_ADV_MAX_SIZE #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31) #else From 577563840ace118a6c8639247f67f001c1a1e5fd Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Wed, 7 May 2025 17:14:32 +0530 Subject: [PATCH 2/4] fix(nimble): Add support for anonymous address type for whitelist --- components/bt/host/nimble/nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index 0cc70adeba..6fb5ece270 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit 0cc70adebae819b31074cce04d59adf7283bcd7f +Subproject commit 6fb5ece2706550ce8027b68cb7bbf3b24f65050c From 3e97fa00a241d2002f8511cce430638711ac007b Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Mon, 12 May 2025 11:41:22 +0530 Subject: [PATCH 3/4] fix(nimble): Extend support for allow connect during scan for more chips --- components/bt/host/nimble/Kconfig.in | 3 +-- components/bt/host/nimble/nimble | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/bt/host/nimble/Kconfig.in b/components/bt/host/nimble/Kconfig.in index c29a08e0e7..765b4d56dc 100644 --- a/components/bt/host/nimble/Kconfig.in +++ b/components/bt/host/nimble/Kconfig.in @@ -1101,8 +1101,7 @@ config BT_NIMBLE_HIGH_DUTY_ADV_ITVL config BT_NIMBLE_HOST_ALLOW_CONNECT_WITH_SCAN bool "Allow Connections with scanning in progress" - depends on BT_NIMBLE_ENABLED - depends on (!SOC_ESP_NIMBLE_CONTROLLER || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32H2) + depends on BT_NIMBLE_ENABLED && !(IDF_TARGET_ESP32C2) help This enables support for user to initiate a new connection with scan in progress diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index 6fb5ece270..1fdde6f555 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit 6fb5ece2706550ce8027b68cb7bbf3b24f65050c +Subproject commit 1fdde6f555b6e9f14a38e6c7eb755a88149c18e7 From e17ed5d738b20a0c95fe9b5c9a4b152570836b32 Mon Sep 17 00:00:00 2001 From: Sumeet Singh Date: Mon, 21 Apr 2025 17:45:26 +0530 Subject: [PATCH 4/4] fix(nimble): Fixed async race condition with HCI outstanding packets counter --- components/bt/host/nimble/nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index 1fdde6f555..f5136d2b35 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit 1fdde6f555b6e9f14a38e6c7eb755a88149c18e7 +Subproject commit f5136d2b35e3bafce3e276daaba8f55b8c695aab