Merge branch 'bugfix/ble_mesh_build_error_c3_merge_master' into 'master'

Bugfix/ble mesh build error c3 merge master

See merge request espressif/esp-idf!11844

components/bt/esp_ble_mesh/mesh_common/include/mesh_util.h

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

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

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/Kconfig.projbuild

@@ -2,15 +2,23 @@ menu "Example Configuration"
 
     choice BLE_MESH_EXAMPLE_BOARD
         prompt "Board selection for BLE Mesh"
-        default BLE_MESH_ESP_WROOM_32
+        default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
+        default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
         config BLE_MESH_ESP_WROOM_32
             bool "ESP32-WROOM-32"
+            depends on IDF_TARGET_ESP32
 
         config BLE_MESH_ESP_WROVER
             bool "ESP32-WROVER"
+            depends on IDF_TARGET_ESP32
+
+        config BLE_MESH_ESP32C3_DEV
+            bool "ESP32C3-DevKitC"
+            depends on IDF_TARGET_ESP32C3
+
     endchoice
 
 endmenu

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/board.h

@@ -27,6 +27,10 @@
 #define LED_R GPIO_NUM_0
 #define LED_G GPIO_NUM_2
 #define LED_B GPIO_NUM_4
+#elif defined(CONFIG_BLE_MESH_ESP32C3_DEV)
+#define LED_R GPIO_NUM_8
+#define LED_G GPIO_NUM_8
+#define LED_B GPIO_NUM_8
 #endif
 
 struct _led_state {

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/Kconfig.projbuild

@@ -2,15 +2,23 @@ menu "Example Configuration"
 
     choice BLE_MESH_EXAMPLE_BOARD
         prompt "Board selection for BLE Mesh"
-        default BLE_MESH_ESP_WROOM_32
+        default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
+        default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
         config BLE_MESH_ESP_WROOM_32
             bool "ESP32-WROOM-32"
+            depends on IDF_TARGET_ESP32
 
         config BLE_MESH_ESP_WROVER
             bool "ESP32-WROVER"
+            depends on IDF_TARGET_ESP32
+
+        config BLE_MESH_ESP32C3_DEV
+            bool "ESP32C3-DevKitC"
+            depends on IDF_TARGET_ESP32C3
+
     endchoice
 
 endmenu

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/board.h

@@ -20,6 +20,10 @@
 #define LED_R GPIO_NUM_0
 #define LED_G GPIO_NUM_2
 #define LED_B GPIO_NUM_4
+#elif defined(CONFIG_BLE_MESH_ESP32C3_DEV)
+#define LED_R GPIO_NUM_8
+#define LED_G GPIO_NUM_8
+#define LED_B GPIO_NUM_8
 #endif
 
 #define LED_ON  1

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/Kconfig.projbuild

@@ -2,15 +2,23 @@ menu "Example Configuration"
 
     choice BLE_MESH_EXAMPLE_BOARD
         prompt "Board selection for BLE Mesh"
-        default BLE_MESH_ESP_WROOM_32
+        default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
+        default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
         config BLE_MESH_ESP_WROOM_32
             bool "ESP32-WROOM-32"
+            depends on IDF_TARGET_ESP32
 
         config BLE_MESH_ESP_WROVER
             bool "ESP32-WROVER"
+            depends on IDF_TARGET_ESP32
+
+        config BLE_MESH_ESP32C3_DEV
+            bool "ESP32C3-DevKitC"
+            depends on IDF_TARGET_ESP32C3
+
     endchoice
 
 endmenu

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/board.h

@@ -19,6 +19,10 @@
 #define LED_R GPIO_NUM_0
 #define LED_G GPIO_NUM_2
 #define LED_B GPIO_NUM_4
+#elif defined(CONFIG_BLE_MESH_ESP32C3_DEV)
+#define LED_R GPIO_NUM_8
+#define LED_G GPIO_NUM_8
+#define LED_B GPIO_NUM_8
 #endif
 
 #define LED_ON  1

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/Kconfig.projbuild

@@ -2,15 +2,23 @@ menu "Example Configuration"
 
     choice BLE_MESH_EXAMPLE_BOARD
         prompt "Board selection for BLE Mesh"
-        default BLE_MESH_ESP_WROOM_32
+        default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
+        default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
         config BLE_MESH_ESP_WROOM_32
             bool "ESP32-WROOM-32"
+            depends on IDF_TARGET_ESP32
 
         config BLE_MESH_ESP_WROVER
             bool "ESP32-WROVER"
+            depends on IDF_TARGET_ESP32
+
+        config BLE_MESH_ESP32C3_DEV
+            bool "ESP32C3-DevKitC"
+            depends on IDF_TARGET_ESP32C3
+
     endchoice
 
 endmenu

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/board.h

@@ -19,6 +19,10 @@
 #define LED_R GPIO_NUM_0
 #define LED_G GPIO_NUM_2
 #define LED_B GPIO_NUM_4
+#elif defined(CONFIG_BLE_MESH_ESP32C3_DEV)
+#define LED_R GPIO_NUM_8
+#define LED_G GPIO_NUM_8
+#define LED_B GPIO_NUM_8
 #endif
 
 #define LED_ON  1

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/Kconfig.projbuild

@@ -2,15 +2,23 @@ menu "Example Configuration"
 
     choice BLE_MESH_EXAMPLE_BOARD
         prompt "Board selection for BLE Mesh"
-        default BLE_MESH_ESP_WROOM_32
+        default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
+        default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
         config BLE_MESH_ESP_WROOM_32
             bool "ESP32-WROOM-32"
+            depends on IDF_TARGET_ESP32
 
         config BLE_MESH_ESP_WROVER
             bool "ESP32-WROVER"
+            depends on IDF_TARGET_ESP32
+
+        config BLE_MESH_ESP32C3_DEV
+            bool "ESP32C3-DevKitC"
+            depends on IDF_TARGET_ESP32C3
+
     endchoice
 
 endmenu

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/board.h

@@ -19,6 +19,10 @@
 #define LED_R GPIO_NUM_0
 #define LED_G GPIO_NUM_2
 #define LED_B GPIO_NUM_4
+#elif defined(CONFIG_BLE_MESH_ESP32C3_DEV)
+#define LED_R GPIO_NUM_8
+#define LED_G GPIO_NUM_8
+#define LED_B GPIO_NUM_8
 #endif
 
 #define LED_ON  1

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/Kconfig.projbuild

@@ -2,15 +2,23 @@ menu "Example Configuration"
 
     choice BLE_MESH_EXAMPLE_BOARD
         prompt "Board selection for BLE Mesh"
-        default BLE_MESH_ESP_WROOM_32
+        default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
+        default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
         config BLE_MESH_ESP_WROOM_32
             bool "ESP32-WROOM-32"
+            depends on IDF_TARGET_ESP32
 
         config BLE_MESH_ESP_WROVER
             bool "ESP32-WROVER"
+            depends on IDF_TARGET_ESP32
+
+        config BLE_MESH_ESP32C3_DEV
+            bool "ESP32C3-DevKitC"
+            depends on IDF_TARGET_ESP32C3
+
     endchoice
 
 endmenu

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/board.h

@@ -27,6 +27,10 @@
 #define LED_R GPIO_NUM_0
 #define LED_G GPIO_NUM_2
 #define LED_B GPIO_NUM_4
+#elif defined(CONFIG_BLE_MESH_ESP32C3_DEV)
+#define LED_R GPIO_NUM_8
+#define LED_G GPIO_NUM_8
+#define LED_B GPIO_NUM_8
 #endif
 
 struct _led_state {