From ea3a586709a9cc814ff77ec5754af6e4b8cbc1d1 Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Thu, 11 Nov 2021 11:30:14 +0800 Subject: [PATCH 1/2] Fix the issue of device name len limited --- .../bluedroid/common/include/common/bluedroid_user_config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h b/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h index d95b2de98a..d652ead5fb 100644 --- a/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h +++ b/components/bt/host/bluedroid/common/include/common/bluedroid_user_config.h @@ -148,8 +148,6 @@ #define UC_BT_SMP_SLAVE_CON_PARAMS_UPD_ENABLE FALSE #endif -#if CONFIG_BT_CTRL_ESP32 - //Device Nane Maximum Length #ifdef CONFIG_BT_MAX_DEVICE_NAME_LEN #define UC_MAX_LOC_BD_NAME_LEN CONFIG_BT_MAX_DEVICE_NAME_LEN @@ -157,6 +155,8 @@ #define UC_MAX_LOC_BD_NAME_LEN 64 #endif +#if CONFIG_IDF_TARGET_ESP32 + //BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP #ifdef CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP #define UC_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP CONFIG_BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP From 5a7ae2d8c8284e35ca6c7232c38b0e3e38644f7a Mon Sep 17 00:00:00 2001 From: Yang Zhao Date: Fri, 19 Nov 2021 16:06:59 +0800 Subject: [PATCH 2/2] 1.It is abnormal when getting the deep sleep state bit. So we need to check the state again and run the "ble_master_soft_rst()" if neesed. 2.fix HCI_Read_Clock error 3.fix HCI_Create_Connection_Cancel error 4.fix ASSERT_WARN during epr --- components/bt/controller/lib_esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index 1c6d248b62..edbb3cb0c0 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit 1c6d248b6296473a353047700922534b09d9203f +Subproject commit edbb3cb0c000716fc8ff71a7a2e2d7e21b4fc881