Merge branch 'bugfix/ble_mesh_sensor_server_model_not_start_on_esp32s3' into 'master'

ble_mesh: stack: Add sdkconfig.defaults.esp32s3 for esp32s3.

Closes IDFGH-5301

See merge request espressif/esp-idf!13705

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32s3

@@ -0,0 +1,19 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_PROVISIONER=y
+CONFIG_BLE_MESH_PBA_SAME_TIME=1
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_ADV_BUF_COUNT=100
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_CFG_CLI=y
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y

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

@@ -4,6 +4,7 @@ menu "Example Configuration"
         prompt "Board selection for BLE Mesh"
         default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
         default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
+        default BLE_MESH_ESP32S3_DEV if IDF_TARGET_ESP32S3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
@@ -19,6 +20,10 @@ menu "Example Configuration"
             bool "ESP32C3-DevKitC"
             depends on IDF_TARGET_ESP32C3
 
+        config BLE_MESH_ESP32S3_DEV
+            bool "ESP32S3-DevKitC"
+            depends on IDF_TARGET_ESP32S3
+
     endchoice
 
 endmenu

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

@@ -31,6 +31,10 @@
 #define LED_R GPIO_NUM_8
 #define LED_G GPIO_NUM_8
 #define LED_B GPIO_NUM_8
+#elif defined(CONFIG_BLE_MESH_ESP32S3_DEV)
+#define LED_R GPIO_NUM_47
+#define LED_G GPIO_NUM_47
+#define LED_B GPIO_NUM_47
 #endif
 
 struct _led_state {

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/sdkconfig.defaults.esp32s3

@@ -0,0 +1,26 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_FAST_PROV=y
+CONFIG_BLE_MESH_MAX_PROV_NODES=6
+CONFIG_BLE_MESH_PBA_SAME_TIME=3
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_CRPL=60
+CONFIG_BLE_MESH_MSG_CACHE_SIZE=60
+CONFIG_BLE_MESH_ADV_BUF_COUNT=200
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_TRACE_LEVEL_ERROR=y
+CONFIG_BLE_MESH_CFG_CLI=y
+
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

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

@@ -4,6 +4,7 @@ menu "Example Configuration"
         prompt "Board selection for BLE Mesh"
         default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
         default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
+        default BLE_MESH_ESP32S3_DEV if IDF_TARGET_ESP32S3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
@@ -19,6 +20,10 @@ menu "Example Configuration"
             bool "ESP32C3-DevKitC"
             depends on IDF_TARGET_ESP32C3
 
+        config BLE_MESH_ESP32S3_DEV
+            bool "ESP32S3-DevKitC"
+            depends on IDF_TARGET_ESP32S3
+
     endchoice
 
 endmenu

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

@@ -24,6 +24,10 @@
 #define LED_R GPIO_NUM_8
 #define LED_G GPIO_NUM_8
 #define LED_B GPIO_NUM_8
+#elif defined(CONFIG_BLE_MESH_ESP32S3_DEV)
+#define LED_R GPIO_NUM_47
+#define LED_G GPIO_NUM_47
+#define LED_B GPIO_NUM_47
 #endif
 
 #define LED_ON  1

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3

@@ -0,0 +1,17 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y

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

@@ -4,6 +4,7 @@ menu "Example Configuration"
         prompt "Board selection for BLE Mesh"
         default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
         default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
+        default BLE_MESH_ESP32S3_DEV if IDF_TARGET_ESP32S3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
@@ -19,6 +20,10 @@ menu "Example Configuration"
             bool "ESP32C3-DevKitC"
             depends on IDF_TARGET_ESP32C3
 
+        config BLE_MESH_ESP32S3_DEV
+            bool "ESP32S3-DevKitC"
+            depends on IDF_TARGET_ESP32S3
+
     endchoice
 
 endmenu

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

@@ -23,6 +23,10 @@
 #define LED_R GPIO_NUM_8
 #define LED_G GPIO_NUM_8
 #define LED_B GPIO_NUM_8
+#elif defined(CONFIG_BLE_MESH_ESP32S3_DEV)
+#define LED_R GPIO_NUM_47
+#define LED_G GPIO_NUM_47
+#define LED_B GPIO_NUM_47
 #endif
 
 #define LED_ON  1

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3

@@ -0,0 +1,16 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10

examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32s3

@@ -0,0 +1,17 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_PROVISIONER=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_CFG_CLI=y
+CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32s3

@@ -0,0 +1,17 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_PROVISIONER=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_CFG_CLI=y
+CONFIG_BLE_MESH_SENSOR_CLI=y

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

@@ -4,6 +4,7 @@ menu "Example Configuration"
         prompt "Board selection for BLE Mesh"
         default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
         default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
+        default BLE_MESH_ESP32S3_DEV if IDF_TARGET_ESP32S3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
@@ -19,6 +20,10 @@ menu "Example Configuration"
             bool "ESP32C3-DevKitC"
             depends on IDF_TARGET_ESP32C3
 
+        config BLE_MESH_ESP32S3_DEV
+            bool "ESP32S3-DevKitC"
+            depends on IDF_TARGET_ESP32S3
+
     endchoice
 
 endmenu

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

@@ -23,6 +23,10 @@
 #define LED_R GPIO_NUM_8
 #define LED_G GPIO_NUM_8
 #define LED_B GPIO_NUM_8
+#elif defined(CONFIG_BLE_MESH_ESP32S3_DEV)
+#define LED_R GPIO_NUM_47
+#define LED_G GPIO_NUM_47
+#define LED_B GPIO_NUM_47
 #endif
 
 #define LED_ON  1

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32s3

@@ -0,0 +1,16 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32s3

@@ -0,0 +1,16 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_PROVISIONER=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_CFG_CLI=y

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

@@ -4,6 +4,7 @@ menu "Example Configuration"
         prompt "Board selection for BLE Mesh"
         default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
         default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
+        default BLE_MESH_ESP32S3_DEV if IDF_TARGET_ESP32S3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
@@ -19,6 +20,10 @@ menu "Example Configuration"
             bool "ESP32C3-DevKitC"
             depends on IDF_TARGET_ESP32C3
 
+        config BLE_MESH_ESP32S3_DEV
+            bool "ESP32S3-DevKitC"
+            depends on IDF_TARGET_ESP32S3
+
     endchoice
 
 endmenu

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

@@ -23,6 +23,10 @@
 #define LED_R GPIO_NUM_8
 #define LED_G GPIO_NUM_8
 #define LED_B GPIO_NUM_8
+#elif defined(CONFIG_BLE_MESH_ESP32S3_DEV)
+#define LED_R GPIO_NUM_47
+#define LED_G GPIO_NUM_47
+#define LED_B GPIO_NUM_47
 #endif
 
 #define LED_ON  1

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32s3

@@ -0,0 +1,16 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_NODE=y
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10

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

@@ -4,6 +4,7 @@ menu "Example Configuration"
         prompt "Board selection for BLE Mesh"
         default BLE_MESH_ESP_WROOM_32 if IDF_TARGET_ESP32
         default BLE_MESH_ESP32C3_DEV if IDF_TARGET_ESP32C3
+        default BLE_MESH_ESP32S3_DEV if IDF_TARGET_ESP32S3
         help
             Select this option to choose the board for BLE Mesh. The default is ESP32-WROOM-32
 
@@ -19,6 +20,10 @@ menu "Example Configuration"
             bool "ESP32C3-DevKitC"
             depends on IDF_TARGET_ESP32C3
 
+        config BLE_MESH_ESP32S3_DEV
+            bool "ESP32S3-DevKitC"
+            depends on IDF_TARGET_ESP32S3
+
     endchoice
 
 endmenu

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

@@ -31,6 +31,10 @@
 #define LED_R GPIO_NUM_8
 #define LED_G GPIO_NUM_8
 #define LED_B GPIO_NUM_8
+#elif defined(CONFIG_BLE_MESH_ESP32S3_DEV)
+#define LED_R GPIO_NUM_47
+#define LED_G GPIO_NUM_47
+#define LED_B GPIO_NUM_47
 #endif
 
 struct _led_state {

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32s3

@@ -0,0 +1,61 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_CTRL_ESP32S3=y
+CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
+CONFIG_BT_CTRL_COEX_PARAMETERS_ENABLE=y
+CONFIG_BT_CTRL_COEX_USE_HOOKS=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+
+# Override some defaults of ESP BLE Mesh
+CONFIG_BLE_MESH=y
+CONFIG_BLE_MESH_FAST_PROV=y
+CONFIG_BLE_MESH_MAX_PROV_NODES=6
+CONFIG_BLE_MESH_PBA_SAME_TIME=3
+CONFIG_BLE_MESH_PB_GATT=y
+CONFIG_BLE_MESH_CRPL=60
+CONFIG_BLE_MESH_MSG_CACHE_SIZE=60
+CONFIG_BLE_MESH_ADV_BUF_COUNT=200
+CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10
+CONFIG_BLE_MESH_TRACE_LEVEL_ERROR=y
+CONFIG_BLE_MESH_CFG_CLI=y
+
+CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_MEMMAP_SMP=y
+
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096
+
+CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=16
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=64
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=64
+CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
+CONFIG_ESP32_WIFI_TX_BA_WIN=32
+CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
+CONFIG_ESP32_WIFI_RX_BA_WIN=32
+
+CONFIG_FREERTOS_UNICORE=n
+CONFIG_FREERTOS_HZ=1000
+
+CONFIG_ESP_INT_WDT=n
+CONFIG_ESP_TASK_WDT=n
+
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=65534
+CONFIG_LWIP_TCP_WND_DEFAULT=65534
+CONFIG_LWIP_TCP_RECVMBOX_SIZE=64
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
+CONFIG_LWIP_ETHARP_TRUST_IP_MAC=n
+
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+CONFIG_LWIP_IRAM_OPTIMIZATION=n
+
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y