espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ble_mesh_build_error_c3_merge_master_v4.2' into 'release/v4.2'

Browse Source 
Bugfix/ble mesh build error merge master (v4.2)

See merge request espressif/esp-idf!12038
This commit is contained in:
Island
2021-01-18 19:10:21 +08:00
parent b24ccd8a20 c44dc1f262
commit e36282787e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h
View File

@@ -15,6 +15,7 @@
#define _BLE_MESH_UTIL_H_ #define _BLE_MESH_UTIL_H_
#include <stddef.h> #include <stddef.h>
#include "esp_bit_defs.h"
#include "mesh_types.h" #include "mesh_types.h"
#ifdef __cplusplus #ifdef __cplusplus

2
components/bt/esp_ble_mesh/mesh_core/include/mesh_bearer_adapt.h
View File

@@ -22,7 +22,7 @@ extern "C" {
/* BLE Mesh Max Connection Count */ /* BLE Mesh Max Connection Count */
#ifdef CONFIG_BT_BLUEDROID_ENABLED #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 #endif
#ifdef CONFIG_BT_NIMBLE_ENABLED #ifdef CONFIG_BT_NIMBLE_ENABLED