From f14a4680b193f8c6a77aeb591ca5b544680dfdb0 Mon Sep 17 00:00:00 2001 From: Astha Verma Date: Mon, 20 Apr 2026 14:35:02 +0530 Subject: [PATCH 1/2] fix(nimble): Preserve device name across ble_svc_gap_init re-call --- 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 44a5bbb58c2..35fa77cea37 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit 44a5bbb58c22b3b6ad2b7773fc96b3a371fa22e6 +Subproject commit 35fa77cea377b3696a3b59f1b69d1495688ca458 From b46aad39dee1aa9b1488989c0207964f642c2340 Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Wed, 15 Apr 2026 21:05:28 +0530 Subject: [PATCH 2/2] fix(nimble): Move ble_log_init/deinit to esp_nimble_init/deinit --- components/bt/host/nimble/nimble | 2 +- components/bt/host/nimble/port/include/esp_nimble_cfg.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index 35fa77cea37..081879d9538 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit 35fa77cea377b3696a3b59f1b69d1495688ca458 +Subproject commit 081879d9538eaa7906a2cddd9ce86d76249bcefd 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 494c358a221..54c854d66e2 100644 --- a/components/bt/host/nimble/port/include/esp_nimble_cfg.h +++ b/components/bt/host/nimble/port/include/esp_nimble_cfg.h @@ -15,8 +15,12 @@ * attempt to use these macros without including this header will result in a * compiler error. */ +#ifndef MYNEWT_VAL #define MYNEWT_VAL(_name) MYNEWT_VAL_ ## _name +#endif +#ifndef MYNEWT_VAL_CHOICE #define MYNEWT_VAL_CHOICE(_name, _val) MYNEWT_VAL_ ## _name ## __ ## _val +#endif #ifndef IRAM_ATTR_64MCPU #define IRAM_ATTR_64MCPU IRAM_ATTR