From d42f39dcb4a7d3fa4fddd366eaafa0c0e0f908f0 Mon Sep 17 00:00:00 2001 From: lly Date: Fri, 25 Dec 2020 16:04:22 +0800 Subject: [PATCH 1/2] ble_mesh: stack: Update mesh max conn macro when using bluedroid --- .../bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h b/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h index cc3d2b7bfc..25068554d0 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h +++ b/components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h @@ -22,7 +22,7 @@ extern "C" { /* BLE Mesh Max Connection Count */ #ifdef CONFIG_BT_BLUEDROID_ENABLED -#define BLE_MESH_MAX_CONN MIN(CONFIG_BT_ACL_CONNECTIONS, CONFIG_BTDM_CTRL_BLE_MAX_CONN) +#define BLE_MESH_MAX_CONN CONFIG_BT_ACL_CONNECTIONS #endif #ifdef CONFIG_BT_NIMBLE_ENABLED From 7134ef67cf2632e9ac62c73159711536511973d8 Mon Sep 17 00:00:00 2001 From: lly Date: Fri, 25 Dec 2020 16:08:26 +0800 Subject: [PATCH 2/2] ble_mesh: stack: Fix compile warning with BIT macro --- components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h b/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h index 4edc5a6559..d57efa904e 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h +++ b/components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h @@ -15,7 +15,7 @@ #define _BLE_MESH_UTIL_H_ #include -#include "soc/soc.h" +#include "esp_bit_defs.h" #include "mesh_types.h" #ifdef __cplusplus