From 6b980e526a5952350189e411964d14f45f582f7c Mon Sep 17 00:00:00 2001 From: zwl Date: Thu, 13 Oct 2022 11:47:33 +0800 Subject: [PATCH] Fixed occasional crash during scanning --- components/bt/controller/esp32c2/bt.c | 3 ++- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/bt/controller/esp32c2/bt.c b/components/bt/controller/esp32c2/bt.c index 01a9154f0e..f2bc8fcea0 100644 --- a/components/bt/controller/esp32c2/bt.c +++ b/components/bt/controller/esp32c2/bt.c @@ -61,6 +61,7 @@ #define EXT_FUNC_VERSION 0x20220125 #define EXT_FUNC_MAGIC_VALUE 0xA5A5A5A5 +#define BT_ASSERT_PRINT ets_printf #ifdef CONFIG_BT_BLUEDROID_ENABLED /* ACL_DATA_MBUF_LEADINGSPCAE: The leadingspace in user info header for ACL data */ @@ -226,7 +227,7 @@ static void IRAM_ATTR esp_reset_rpa_moudle(void) static void IRAM_ATTR osi_assert_wrapper(const uint32_t ln, const char *fn, uint32_t param1, uint32_t param2) { - ESP_LOGE(NIMBLE_PORT_LOG_TAG, "BLE assert: line %d in function %s, param: 0x%x, 0x%x", ln, fn, param1, param2); + BT_ASSERT_PRINT("BLE assert: line %d in function %s, param: 0x%x, 0x%x", ln, fn, param1, param2); assert(0); } diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index 47b2342221..19b5232cf1 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit 47b2342221589d36905ecda1e63cf5267d02edcb +Subproject commit 19b5232cf119412b5ad406c32c445956957bcb82