ble_mesh: example: Fix esp32c3 and esp32s3 partition table overflow issue

2023-01-10 14:06:21 +08:00
parent d173dec1b7
commit 3cf4cabf38
19 changed files with 20 additions and 1 deletions
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_system.c
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_system.c
@@ -16,7 +16,6 @@
 #include "esp_system.h"
 #include "esp_sleep.h"
 #include "driver/rtc_io.h"
-#include "soc/rtc_cntl_reg.h"
 #include "argtable3/argtable3.h"

 #include "freertos/FreeRTOS.h"
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32c3
@@ -22,4 +22,6 @@ CONFIG_BLE_MESH_TEST_AUTO_ENTER_NETWORK=y
 CONFIG_BLE_MESH_WAIT_FOR_PROV_MAX_DEV_NUM=80
 CONFIG_BLE_MESH_MAX_PROV_NODES=80

+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # end of ESP32C3-specific
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32s3
@@ -22,4 +22,6 @@ CONFIG_BLE_MESH_TEST_AUTO_ENTER_NETWORK=y
 CONFIG_BLE_MESH_WAIT_FOR_PROV_MAX_DEV_NUM=80
 CONFIG_BLE_MESH_MAX_PROV_NODES=80

+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # end of ESP32S3-specific
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32c3
@@ -5,6 +5,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32s3
@@ -5,6 +5,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32c3
@@ -6,6 +6,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3
@@ -6,6 +6,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32c3
@@ -6,6 +6,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3
@@ -6,6 +6,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32c3
@@ -5,6 +5,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32s3
@@ -5,6 +5,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32c3
@@ -5,6 +5,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32s3
@@ -5,6 +5,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32c3
@@ -6,6 +6,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32s3
@@ -6,6 +6,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32c3
@@ -5,6 +5,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32s3
@@ -5,6 +5,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32c3
@@ -6,6 +6,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32s3
@@ -6,6 +6,7 @@ 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
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y

 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y