alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

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

See merge request espressif/esp-idf!12039
This commit is contained in:
Island 2021-01-18 19:10:01 +08:00
commit 173a5fc131
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
#define _BLE_MESH_UTIL_H_
#include <stddef.h>
#include "soc/soc.h"
#include "esp_bit_defs.h"
#include "mesh_types.h"
#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 */
#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