From a9c16417927d71aeeb1983c366468b134e8800a3 Mon Sep 17 00:00:00 2001 From: wangjialiang Date: Tue, 16 Jan 2024 12:18:08 +0800 Subject: [PATCH] ci(ble/mesh): cleanup BLE Mesh examples sdkconfig --- .../aligenie_demo/sdkconfig.defaults | 18 ++---- .../aligenie_demo/sdkconfig.defaults.esp32 | 7 +++ .../aligenie_demo/sdkconfig.defaults.esp32c3 | 5 +- .../aligenie_demo/sdkconfig.defaults.esp32c6 | 4 +- .../aligenie_demo/sdkconfig.defaults.esp32h2 | 4 +- .../aligenie_demo/sdkconfig.defaults.esp32s3 | 14 ++--- .../df_client/sdkconfig.defaults | 7 --- .../df_client/sdkconfig.defaults.esp32 | 7 +++ .../df_client/sdkconfig.defaults.esp32c3 | 14 +---- .../df_client/sdkconfig.defaults.esp32c6 | 14 +---- .../df_client/sdkconfig.defaults.esp32h2 | 24 +------- .../df_client/sdkconfig.defaults.esp32s3 | 14 +---- .../df_server/sdkconfig.defaults | 6 -- .../df_server/sdkconfig.defaults.esp32 | 7 +++ .../df_server/sdkconfig.defaults.esp32c3 | 13 +---- .../df_server/sdkconfig.defaults.esp32c6 | 13 +---- .../df_server/sdkconfig.defaults.esp32h2 | 13 +---- .../df_server/sdkconfig.defaults.esp32s3 | 13 +---- .../fast_prov_client/sdkconfig.ci.bluedroid | 14 ----- .../sdkconfig.ci.bluedroid_deinit | 14 ----- .../fast_prov_client/sdkconfig.ci.model | 14 ----- .../fast_prov_client/sdkconfig.ci.nimble | 13 ----- .../sdkconfig.ci.nimble_deinit | 13 ----- .../fast_prov_client/sdkconfig.defaults | 9 +-- .../fast_prov_client/sdkconfig.defaults.esp32 | 7 +++ .../sdkconfig.defaults.esp32c3 | 16 +----- .../sdkconfig.defaults.esp32c6 | 15 +---- .../sdkconfig.defaults.esp32h2 | 15 +---- .../sdkconfig.defaults.esp32s3 | 16 +----- .../fast_prov_server/sdkconfig.ci.adv_scan | 13 ----- .../fast_prov_server/sdkconfig.ci.bluedroid | 14 ----- .../sdkconfig.ci.bluedroid_deinit | 14 ----- .../fast_prov_server/sdkconfig.ci.iram | 16 ------ .../fast_prov_server/sdkconfig.ci.iram.esp32 | 7 +++ .../fast_prov_server/sdkconfig.ci.model | 14 ----- .../fast_prov_server/sdkconfig.ci.nimble | 12 ---- .../sdkconfig.ci.nimble_deinit | 11 ---- .../fast_prov_server/sdkconfig.ci.psram | 17 ------ .../fast_prov_server/sdkconfig.ci.psram.esp32 | 6 ++ .../sdkconfig.ci.psram.esp32s3 | 6 ++ .../fast_prov_server/sdkconfig.defaults | 8 --- .../fast_prov_server/sdkconfig.defaults.esp32 | 7 +++ .../sdkconfig.defaults.esp32c3 | 22 +------- .../sdkconfig.defaults.esp32c6 | 21 +------ .../sdkconfig.defaults.esp32h2 | 21 +------ .../sdkconfig.defaults.esp32s3 | 22 +------- .../onoff_client/sdkconfig.ci.bluedroid | 16 ------ .../sdkconfig.ci.bluedroid_deinit | 16 ------ .../onoff_client/sdkconfig.ci.model | 16 ------ .../onoff_client/sdkconfig.ci.nimble | 12 ---- .../onoff_client/sdkconfig.ci.nimble_deinit | 12 ---- .../onoff_client/sdkconfig.ci.proxy00 | 13 ----- .../onoff_client/sdkconfig.ci.proxy01 | 13 ----- .../onoff_client/sdkconfig.ci.proxy02 | 13 ----- .../onoff_client/sdkconfig.ci.proxy03 | 14 ----- .../onoff_client/sdkconfig.ci.proxy04 | 14 ----- .../onoff_client/sdkconfig.ci.proxy05 | 13 ----- .../onoff_client/sdkconfig.defaults | 9 +-- .../onoff_client/sdkconfig.defaults.esp32 | 7 +++ .../onoff_client/sdkconfig.defaults.esp32c3 | 14 +---- .../onoff_client/sdkconfig.defaults.esp32c6 | 13 +---- .../onoff_client/sdkconfig.defaults.esp32h2 | 23 +------- .../onoff_client/sdkconfig.defaults.esp32s3 | 14 +---- .../onoff_server/sdkconfig.ci.adv | 12 ---- .../onoff_server/sdkconfig.ci.bluedroid | 13 ----- .../sdkconfig.ci.bluedroid_deinit | 13 ----- .../onoff_server/sdkconfig.ci.bluedroid_log | 12 ---- .../onoff_server/sdkconfig.ci.model | 13 ----- .../onoff_server/sdkconfig.ci.nimble | 11 ---- .../onoff_server/sdkconfig.ci.nimble_deinit | 11 ---- .../onoff_server/sdkconfig.ci.nimble_log | 10 ---- .../onoff_server/sdkconfig.ci.scan | 12 ---- .../onoff_server/sdkconfig.defaults | 9 +-- .../onoff_server/sdkconfig.defaults.esp32 | 7 +++ .../onoff_server/sdkconfig.defaults.esp32c3 | 13 +---- .../onoff_server/sdkconfig.defaults.esp32c6 | 12 +--- .../onoff_server/sdkconfig.defaults.esp32h2 | 12 +--- .../onoff_server/sdkconfig.defaults.esp32s3 | 13 +---- .../esp_ble_mesh/provisioner/sdkconfig.ci.adv | 13 ----- .../provisioner/sdkconfig.ci.bluedroid | 14 ----- .../provisioner/sdkconfig.ci.bluedroid_deinit | 14 ----- .../provisioner/sdkconfig.ci.model | 14 ----- .../provisioner/sdkconfig.ci.nimble | 13 ----- .../provisioner/sdkconfig.ci.nimble_deinit | 13 ----- .../provisioner/sdkconfig.ci.nvs00 | 13 ----- .../provisioner/sdkconfig.ci.nvs01 | 13 ----- .../esp_ble_mesh/provisioner/sdkconfig.ci.pba | 13 ----- .../esp_ble_mesh/provisioner/sdkconfig.ci.pbg | 14 ----- .../provisioner/sdkconfig.ci.proxy00 | 13 ----- .../provisioner/sdkconfig.ci.proxy01 | 13 ----- .../provisioner/sdkconfig.ci.proxy02 | 14 ----- .../provisioner/sdkconfig.ci.proxy03 | 13 ----- .../provisioner/sdkconfig.ci.rx_hb | 14 ----- .../provisioner/sdkconfig.ci.scan | 13 ----- .../provisioner/sdkconfig.defaults | 6 -- .../provisioner/sdkconfig.defaults.esp32 | 8 +++ .../provisioner/sdkconfig.defaults.esp32c3 | 14 +---- .../provisioner/sdkconfig.defaults.esp32c6 | 13 +---- .../provisioner/sdkconfig.defaults.esp32h2 | 13 +---- .../provisioner/sdkconfig.defaults.esp32s3 | 14 +---- .../rpr_client/sdkconfig.defaults | 6 -- .../rpr_client/sdkconfig.defaults.esp32 | 7 +++ .../rpr_client/sdkconfig.defaults.esp32c3 | 14 +---- .../rpr_client/sdkconfig.defaults.esp32c6 | 14 +---- .../rpr_client/sdkconfig.defaults.esp32h2 | 14 +---- .../rpr_client/sdkconfig.defaults.esp32s3 | 14 +---- .../rpr_server/sdkconfig.defaults | 6 -- .../rpr_server/sdkconfig.defaults.esp32 | 8 +++ .../rpr_server/sdkconfig.defaults.esp32c3 | 13 +---- .../rpr_server/sdkconfig.defaults.esp32c6 | 13 +---- .../rpr_server/sdkconfig.defaults.esp32h2 | 13 +---- .../rpr_server/sdkconfig.defaults.esp32s3 | 13 +---- .../unprov_dev/sdkconfig.defaults | 6 -- .../unprov_dev/sdkconfig.defaults.esp32 | 7 +++ .../unprov_dev/sdkconfig.defaults.esp32c3 | 13 +---- .../unprov_dev/sdkconfig.defaults.esp32c6 | 13 +---- .../unprov_dev/sdkconfig.defaults.esp32h2 | 13 +---- .../unprov_dev/sdkconfig.defaults.esp32s3 | 13 +---- .../sensor_client/sdkconfig.ci.bluedroid | 14 ----- .../sdkconfig.ci.bluedroid_deinit | 14 ----- .../sensor_client/sdkconfig.ci.model | 14 ----- .../sensor_client/sdkconfig.ci.nimble | 13 ----- .../sensor_client/sdkconfig.ci.nimble_deinit | 13 ----- .../sensor_client/sdkconfig.defaults | 6 -- .../sensor_client/sdkconfig.defaults.esp32 | 7 +++ .../sensor_client/sdkconfig.defaults.esp32c3 | 14 +---- .../sensor_client/sdkconfig.defaults.esp32c6 | 13 +---- .../sensor_client/sdkconfig.defaults.esp32h2 | 13 +---- .../sensor_client/sdkconfig.defaults.esp32s3 | 14 +---- .../sensor_server/sdkconfig.ci.bluedroid | 13 ----- .../sdkconfig.ci.bluedroid_deinit | 13 ----- .../sensor_server/sdkconfig.ci.model | 13 ----- .../sensor_server/sdkconfig.ci.nimble | 11 ---- .../sensor_server/sdkconfig.ci.nimble_deinit | 11 ---- .../sensor_server/sdkconfig.defaults | 6 -- .../sensor_server/sdkconfig.defaults.esp32 | 7 +++ .../sensor_server/sdkconfig.defaults.esp32c3 | 13 +---- .../sensor_server/sdkconfig.defaults.esp32c6 | 12 +--- .../sensor_server/sdkconfig.defaults.esp32h2 | 12 +--- .../sensor_server/sdkconfig.defaults.esp32s3 | 13 +---- .../vendor_client/sdkconfig.ci.bluedroid | 13 ----- .../sdkconfig.ci.bluedroid_deinit | 13 ----- .../vendor_client/sdkconfig.ci.model | 13 ----- .../vendor_client/sdkconfig.ci.nimble | 12 ---- .../vendor_client/sdkconfig.ci.nimble_deinit | 12 ---- .../vendor_client/sdkconfig.defaults | 17 ------ .../vendor_client/sdkconfig.defaults.esp32 | 18 ++++++ .../vendor_client/sdkconfig.defaults.esp32c3 | 13 +---- .../vendor_client/sdkconfig.defaults.esp32c6 | 12 +--- .../vendor_client/sdkconfig.defaults.esp32h2 | 12 +--- .../vendor_client/sdkconfig.defaults.esp32s3 | 13 +---- .../vendor_server/sdkconfig.ci.bluedroid | 13 ----- .../sdkconfig.ci.bluedroid_deinit | 13 ----- .../vendor_server/sdkconfig.ci.model | 13 ----- .../vendor_server/sdkconfig.ci.nimble | 11 ---- .../vendor_server/sdkconfig.ci.nimble_deinit | 11 ---- .../vendor_server/sdkconfig.defaults | 17 ------ .../vendor_server/sdkconfig.defaults.esp32 | 17 ++++++ .../vendor_server/sdkconfig.defaults.esp32c3 | 13 +---- .../vendor_server/sdkconfig.defaults.esp32c6 | 12 +--- .../vendor_server/sdkconfig.defaults.esp32h2 | 12 +--- .../vendor_server/sdkconfig.defaults.esp32s3 | 13 +---- .../wifi_coexist/main/Kconfig.projbuild | 4 -- .../wifi_coexist/sdkconfig.ci.bluedroid | 16 ------ .../sdkconfig.ci.bluedroid_deinit | 17 ------ .../wifi_coexist/sdkconfig.ci.model | 17 ------ .../wifi_coexist/sdkconfig.ci.nimble | 15 ----- .../wifi_coexist/sdkconfig.ci.nimble_deinit | 15 ----- .../wifi_coexist/sdkconfig.defaults | 10 ---- .../wifi_coexist/sdkconfig.defaults.esp32 | 10 ++++ .../wifi_coexist/sdkconfig.defaults.esp32c3 | 56 +------------------ .../wifi_coexist/sdkconfig.defaults.esp32c6 | 55 +----------------- .../wifi_coexist/sdkconfig.defaults.esp32s3 | 53 +----------------- tools/ci/ignore_build_warnings.txt | 11 ---- 174 files changed, 273 insertions(+), 2019 deletions(-) create mode 100644 examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram.esp32s3 create mode 100644 examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32 create mode 100644 examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32 diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults index 4f3962cee8a..482ee36c2c0 100644 --- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults @@ -1,3 +1,9 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_BT_ENABLED=y +CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y +CONFIG_BT_BTU_TASK_STACK_SIZE=4512 + # # Partition Table # @@ -10,18 +16,6 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -# Override some defaults so BT stack is enabled -# by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - # Override some defaults of ESP BLE Mesh CONFIG_BLE_MESH=y CONFIG_BLE_MESH_NODE=y diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c3 index d3839e13987..99bf1733876 100644 --- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c3 @@ -1,13 +1,10 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n -CONFIG_BT_LE_50_FEATURE_SUPPORT=n # # light driver config diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c6 index f7ba44afe52..e43c2e08ce5 100644 --- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c6 @@ -1,9 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32h2 index c116c6ab48d..294d9d0bc0a 100644 --- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32h2 @@ -1,9 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32s3 index 4903b7161d3..bf85472e61d 100644 --- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32s3 @@ -1,14 +1,10 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32s3" +CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y +CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n # # light driver config diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults index c3310f37bf0..630e6cec5fd 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults @@ -1,13 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32c3 index b64e6068ee9..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32c3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32c6 index 953de2c3d8d..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32c6 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32c6" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32h2 index 264e1ca692b..8b353ed4028 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32h2 @@ -1,27 +1,7 @@ -# ESP32H2-specific ##Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32h2" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n - -# 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=3 -CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=3 -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_SELF_TEST=y -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_SINGLE_APP_LARGE=y - -# end of ESP32H2-specific diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32s3 index b64e6068ee9..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/sdkconfig.defaults.esp32s3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults index b8552a6969f..776613cfdb8 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32c3 index ad04a937e2e..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32c3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32c6 index d34bbf4ea3f..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32c6 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32c6" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32h2 index d34bbf4ea3f..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32h2 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32h2" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32s3 index ad04a937e2e..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/sdkconfig.defaults.esp32s3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.bluedroid index 3446dcfce17..8c6af90e139 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.bluedroid @@ -1,15 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.bluedroid_deinit index 26ecbb1cd16..999acea35b3 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.bluedroid_deinit @@ -1,16 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.model index 7f8e2109001..dbb81b500c4 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.model @@ -1,19 +1,5 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y CONFIG_BLE_MESH_HEALTH_SRV=n -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y CONFIG_BLE_MESH_GENERIC_SERVER=n CONFIG_BLE_MESH_SENSOR_SERVER=n CONFIG_BLE_MESH_TIME_SCENE_SERVER=n diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.nimble index 1dd50c20d34..25112f64c19 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.nimble @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.nimble_deinit index 99ea8824895..53a3b6f07c4 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.ci.nimble_deinit @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults index 87249841a35..b8ba2a9b89f 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults @@ -1,13 +1,8 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y # Override some defaults of ESP BLE Mesh CONFIG_BLE_MESH=y @@ -19,5 +14,3 @@ 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 - -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32c3 index 2f10e5e0416..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32c3 @@ -1,19 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32c6 index 65d06b5bcd3..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32c6 @@ -1,20 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32h2 index 65d06b5bcd3..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32h2 @@ -1,20 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32s3 index 2f10e5e0416..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/sdkconfig.defaults.esp32s3 @@ -1,19 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.adv_scan b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.adv_scan index 059ba29f132..f790140a906 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.adv_scan +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.adv_scan @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_SUPPORT_BLE_ADV=y CONFIG_BLE_MESH_SUPPORT_BLE_SCAN=y -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.bluedroid index 258e2975558..8c6af90e139 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.bluedroid @@ -1,15 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.bluedroid_deinit index 5b4b5207194..999acea35b3 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.bluedroid_deinit @@ -1,16 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram index af1eb81b7f2..69af4ecc5e3 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram @@ -1,20 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y -CONFIG_BLE_MESH_CFG_CLI=y - CONFIG_FREERTOS_UNICORE=y -CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y CONFIG_BLE_MESH_MEM_ALLOC_MODE_IRAM_8BIT=y CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC=y CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC_IRAM_8BIT=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram.esp32 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram.esp32 new file mode 100644 index 00000000000..17676704118 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram.esp32 @@ -0,0 +1,7 @@ +CONFIG_IDF_TARGET="esp32" +CONFIG_FREERTOS_UNICORE=y +CONFIG_BLE_MESH_MEM_ALLOC_MODE_IRAM_8BIT=y +CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC=y +CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC_IRAM_8BIT=y + +CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.model index 2bf125087ac..b02b6ad8f40 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.model @@ -1,18 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y CONFIG_BLE_MESH_HEALTH_SRV=n CONFIG_BLE_MESH_SENSOR_SERVER=n CONFIG_BLE_MESH_TIME_SCENE_SERVER=n diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.nimble index 4d1dbabd3d2..25112f64c19 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.nimble @@ -1,14 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.nimble_deinit index 3958d947f6d..9ce8b8c74fd 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.nimble_deinit @@ -1,15 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram index 78d1506e63a..d6fc453d87d 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram @@ -1,20 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y -CONFIG_BLE_MESH_CFG_CLI=y - -CONFIG_SPIRAM=y -CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y CONFIG_BLE_MESH_MEM_ALLOC_MODE_EXTERNAL=y CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC=y CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC_EXTERNAL=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram.esp32 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram.esp32 new file mode 100644 index 00000000000..b0388e8cc5b --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram.esp32 @@ -0,0 +1,6 @@ +CONFIG_IDF_TARGET="esp32" +CONFIG_SPIRAM=y +CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y +CONFIG_BLE_MESH_MEM_ALLOC_MODE_EXTERNAL=y +CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC=y +CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC_EXTERNAL=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram.esp32s3 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram.esp32s3 new file mode 100644 index 00000000000..4d045908db7 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram.esp32s3 @@ -0,0 +1,6 @@ +CONFIG_IDF_TARGET="esp32s3" +CONFIG_SPIRAM=y +CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y +CONFIG_BLE_MESH_MEM_ALLOC_MODE_EXTERNAL=y +CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC=y +CONFIG_BLE_MESH_FREERTOS_STATIC_ALLOC_EXTERNAL=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults index bd458f2c8fa..b080c43f767 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 @@ -26,5 +20,3 @@ CONFIG_BLE_MESH_CFG_CLI=y CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y - -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32c3 index a75be7d093e..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32c3 @@ -1,25 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32c6 index b6a06a69431..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32c6 @@ -1,26 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n - -# 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 diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32h2 index b6a06a69431..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32h2 @@ -1,26 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n - -# 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 diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32s3 index a75be7d093e..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.defaults.esp32s3 @@ -1,25 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.bluedroid index aa612ad44cc..8c6af90e139 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.bluedroid @@ -1,17 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -#| Proxy | PB-GATT | Proxy Server | Proxy Client | -#| Enable | Enable | Enable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.bluedroid_deinit index df52f586429..999acea35b3 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.bluedroid_deinit @@ -1,18 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -#| Proxy | PB-GATT | Proxy Server | Proxy Client | -#| Enable | Enable | Enable | Disable | -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.model index 1ac269eca35..dbb81b500c4 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.model @@ -1,21 +1,5 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -#| Proxy | PB-GATT | Proxy Server | Proxy Client | -#| Enable | Enable | Enable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y CONFIG_BLE_MESH_HEALTH_SRV=n -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y CONFIG_BLE_MESH_GENERIC_SERVER=n CONFIG_BLE_MESH_SENSOR_SERVER=n CONFIG_BLE_MESH_TIME_SCENE_SERVER=n diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.nimble index 2f74b1e125e..25112f64c19 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.nimble @@ -1,14 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.nimble_deinit index d522a61f235..53a3b6f07c4 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.nimble_deinit @@ -1,15 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy00 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy00 index 0306b4b7d5a..a17ddae2e94 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy00 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy00 @@ -1,17 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Server | Proxy Client | #| Enable | Disable | Disable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y CONFIG_BLE_MESH_PB_GATT=n CONFIG_BLE_MESH_GATT_PROXY_SERVER=n -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy01 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy01 index 8026cd781e0..87497845097 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy01 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy01 @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Server | Proxy Client | #| Enable | Disable | Enable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y CONFIG_BLE_MESH_PB_GATT=n -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy02 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy02 index e0b1fd1845f..5e933963ede 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy02 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy02 @@ -1,18 +1,5 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Server | Proxy Client | #| Enable | Disable | Disable | Enable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y CONFIG_BLE_MESH_PB_GATT=n CONFIG_BLE_MESH_GATT_PROXY_SERVER=n CONFIG_BLE_MESH_GATT_PROXY_CLIENT=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy03 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy03 index 52afa53cec3..e942f196dce 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy03 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy03 @@ -1,17 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Server | Proxy Client | #| Enable | Enable | Disable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_GATT_PROXY_SERVER=n -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy04 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy04 index d684ff9862d..42682c8306d 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy04 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy04 @@ -1,18 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Server | Proxy Client | #| Enable | Enable | Disable | Enable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_GATT_PROXY_SERVER=n CONFIG_BLE_MESH_GATT_PROXY_CLIENT=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy05 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy05 index 4a6fe20ada1..6dbe996d984 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy05 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.ci.proxy05 @@ -1,18 +1,5 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Server | Proxy Client | #| Disable | Disable | Disable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y CONFIG_BLE_MESH_PB_GATT=n CONFIG_BLE_MESH_GATT_PROXY_SERVER=n CONFIG_BLE_MESH_PROXY=n -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults index e4e550f41e9..2b76f131b4d 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults @@ -1,14 +1,9 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y # Override some defaults of ESP BLE Mesh CONFIG_BLE_MESH=y @@ -17,5 +12,3 @@ 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 - -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32c3 index b64e6068ee9..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32c3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32c6 index acfc8840e0d..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32c6 @@ -1,18 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32h2 index 7757ba4f3b4..8b353ed4028 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32h2 @@ -1,28 +1,7 @@ -# ESP32H2-specific ##Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n - -# 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=3 -CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=3 -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_SELF_TEST=y -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_SINGLE_APP_LARGE=y - -# end of ESP32H2-specific diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32s3 index b64e6068ee9..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/sdkconfig.defaults.esp32s3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.adv b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.adv index 1bf27c1522f..5d6d50eba37 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.adv +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.adv @@ -1,15 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_SUPPORT_BLE_ADV=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_FRIEND=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid index c736cd05d2d..e082cd87ec5 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_FRIEND=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid_deinit index 95b60ec2261..65619012689 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid_deinit @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_FRIEND=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid_log b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid_log index 923b5f9b6d8..0c73808d892 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid_log +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.bluedroid_log @@ -1,15 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_FRIEND=y CONFIG_BLE_MESH_SETTINGS=y CONFIG_BLE_MESH_NO_LOG=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.model index ae8d322da8b..02ddc9b0817 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.model @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_FRIEND=y CONFIG_BLE_MESH_SETTINGS=y CONFIG_BLE_MESH_HEALTH_SRV=n diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble index e1acf0abbd9..efa2a605732 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble @@ -1,14 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_LOW_POWER=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble_deinit index ca37fb965e1..080113e4cf7 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble_deinit @@ -1,15 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_LOW_POWER=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble_log b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble_log index 8400f85f6f5..b4b76be9633 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble_log +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.nimble_log @@ -1,14 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_LOW_POWER=y CONFIG_BLE_MESH_SETTINGS=y CONFIG_BLE_MESH_NO_LOG=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.scan b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.scan index b9852e7177f..15ab778247e 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.scan +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.ci.scan @@ -1,15 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_SUPPORT_BLE_SCAN=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_FRIEND=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults index 43e38d4b068..4ff051cb4cf 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults @@ -1,14 +1,9 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y # Override some defaults of ESP BLE Mesh CONFIG_BLE_MESH=y @@ -16,5 +11,3 @@ 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_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32c3 index ad04a937e2e..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32c3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32c6 index 5e225b42382..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32c6 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32h2 index 5e225b42382..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32h2 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32s3 index ad04a937e2e..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/sdkconfig.defaults.esp32s3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.adv b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.adv index 9ceb4e4f3f1..8d273bc8ec3 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.adv +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.adv @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_SUPPORT_BLE_ADV=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.bluedroid index dd93ffde76a..222e96588b2 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.bluedroid @@ -1,17 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Client | #| Enable | Enable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.bluedroid_deinit index f780fc321a2..6e23b8a7771 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.bluedroid_deinit @@ -1,18 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Client | #| Enable | Enable | Disable | -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.model index ef549d46ccc..9194c34df9a 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.model @@ -1,21 +1,7 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Client | #| Enable | Enable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y CONFIG_BLE_MESH_HEALTH_SRV=n -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y CONFIG_BLE_MESH_GENERIC_SERVER=n CONFIG_BLE_MESH_SENSOR_SERVER=n CONFIG_BLE_MESH_TIME_SCENE_SERVER=n diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nimble index 1dd50c20d34..25112f64c19 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nimble @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nimble_deinit index 99ea8824895..53a3b6f07c4 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nimble_deinit @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nvs00 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nvs00 index d16d737c311..33f11dfb401 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nvs00 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nvs00 @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y CONFIG_BLE_MESH_USE_MULTIPLE_NAMESPACE=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nvs01 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nvs01 index aeaf1a1c259..cbcc7a1e148 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nvs01 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.nvs01 @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y CONFIG_BLE_MESH_USE_MULTIPLE_NAMESPACE=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.pba b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.pba index 685bcee14b8..8c6af90e139 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.pba +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.pba @@ -1,14 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.pbg b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.pbg index 1affba55038..78f41d88abb 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.pbg +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.pbg @@ -1,16 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y CONFIG_BLE_MESH_PB_ADV=n -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy00 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy00 index c6a69d29c7b..2ab3dfea074 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy00 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy00 @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Client | #| Enable | Disable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y CONFIG_BLE_MESH_PB_GATT=n -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy01 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy01 index 4bde6347ad5..498c302dd9d 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy01 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy01 @@ -1,17 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Client | #| Enable | Disable | Enable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y CONFIG_BLE_MESH_PB_GATT=n CONFIG_BLE_MESH_GATT_PROXY_CLIENT=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy02 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy02 index 3dc7a3e5a2e..f003f739b15 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy02 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy02 @@ -1,17 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Client | #| Enable | Enable | Enable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_GATT_PROXY_CLIENT=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy03 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy03 index 940a0366127..22b2c6de7e3 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy03 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.proxy03 @@ -1,17 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - #| Proxy | PB-GATT | Proxy Client | #| Disable | Disable | Disable | -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y CONFIG_BLE_MESH_PB_GATT=n CONFIG_BLE_MESH_PROXY=n -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.rx_hb b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.rx_hb index 6845ae9fff6..888d839f864 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.rx_hb +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.rx_hb @@ -1,16 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y CONFIG_BLE_MESH_PROVISIONER_RECV_HB=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.scan b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.scan index c3be443fdc0..c2e67a375f7 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.scan +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.ci.scan @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_SUPPORT_BLE_SCAN=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults index 70e2c3a1074..1036dbadaa2 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..204ffb94a4b --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32 @@ -0,0 +1,8 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32c3 index 5897d737c00..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32c3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32c6 index 0ad62c2f04f..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32c6 @@ -1,18 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32h2 index 0ad62c2f04f..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32h2 @@ -1,18 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32s3 index 5897d737c00..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/provisioner/sdkconfig.defaults.esp32s3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults index 499c5f40529..7b26e196545 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32c3 index 5897d737c00..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32c3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32c6 index 953de2c3d8d..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32c6 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32c6" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32h2 index 953de2c3d8d..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32h2 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32h2" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32s3 index 5897d737c00..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/sdkconfig.defaults.esp32s3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults index 92b956ae451..1290ff2ba8a 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..204ffb94a4b --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32 @@ -0,0 +1,8 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32c3 index ad04a937e2e..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32c3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32c6 index d34bbf4ea3f..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32c6 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32c6" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32h2 index d34bbf4ea3f..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32h2 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32h2" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32s3 index ad04a937e2e..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/sdkconfig.defaults.esp32s3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults index 64b47333651..4ff051cb4cf 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32c3 index ad04a937e2e..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32c3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32c6 index d34bbf4ea3f..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32c6 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32c6" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32h2 index d34bbf4ea3f..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32h2 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 +CONFIG_IDF_TARGET="esp32h2" +CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32s3 index ad04a937e2e..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/sdkconfig.defaults.esp32s3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.bluedroid index 39b4a78f907..8c6af90e139 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.bluedroid @@ -1,15 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_SENSOR_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.bluedroid_deinit index 2fd37d966d8..999acea35b3 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.bluedroid_deinit @@ -1,16 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_SENSOR_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.model index 24d6f50d7aa..dbb81b500c4 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.model @@ -1,19 +1,5 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y CONFIG_BLE_MESH_HEALTH_SRV=n -CONFIG_BLE_MESH_SENSOR_CLI=y CONFIG_BLE_MESH_GENERIC_SERVER=n CONFIG_BLE_MESH_SENSOR_SERVER=n CONFIG_BLE_MESH_TIME_SCENE_SERVER=n diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.nimble index e5706f2f49f..25112f64c19 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.nimble @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_SENSOR_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.nimble_deinit index e8233fc10ed..53a3b6f07c4 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.ci.nimble_deinit @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_BLE_MESH_SENSOR_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults index 35516e8fa32..8e066b081cf 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32c3 index e5b1db984ed..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32c3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32c6 index 6502ad92ce4..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32c6 @@ -1,18 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32h2 index 6502ad92ce4..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32h2 @@ -1,18 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32s3 index e5b1db984ed..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/sdkconfig.defaults.esp32s3 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -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 +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.bluedroid index d6186213f89..8c6af90e139 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.bluedroid @@ -1,14 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.bluedroid_deinit index 0e53d4a8be5..999acea35b3 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.bluedroid_deinit @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.model index 8fc10dd3fe8..221cc5aa891 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.model @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y CONFIG_BLE_MESH_HEALTH_SRV=n CONFIG_BLE_MESH_GENERIC_SERVER=n diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.nimble index b31c469bd78..25112f64c19 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.nimble @@ -1,13 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.nimble_deinit index 2b6d438c58f..53a3b6f07c4 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.ci.nimble_deinit @@ -1,14 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults index 64b47333651..4ff051cb4cf 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..78ae7523ca3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32 @@ -0,0 +1,7 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32c3 index ad04a937e2e..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32c3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32c6 index 5e225b42382..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32c6 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32h2 index 5e225b42382..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32h2 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32s3 index ad04a937e2e..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/sdkconfig.defaults.esp32s3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.bluedroid index c4d2b16d127..8c6af90e139 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.bluedroid @@ -1,14 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.bluedroid_deinit index c91a2b447c2..999acea35b3 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.bluedroid_deinit @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.model index c42678910f8..dbb81b500c4 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.model @@ -1,17 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y CONFIG_BLE_MESH_HEALTH_SRV=n CONFIG_BLE_MESH_GENERIC_SERVER=n CONFIG_BLE_MESH_SENSOR_SERVER=n diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.nimble index 72a9a758d21..25112f64c19 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.nimble @@ -1,14 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.nimble_deinit index 52aec071898..53a3b6f07c4 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.ci.nimble_deinit @@ -1,15 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_PROVISIONER=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y -CONFIG_BLE_MESH_CFG_CLI=y diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults index dce152c118c..1248763ac6b 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y @@ -17,14 +11,3 @@ 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 - -# -# Serial flasher config -# -CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B=y -CONFIG_ESPTOOLPY_MONITOR_BAUD=921600 - -# -# ESP32-specific -# -CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600 diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..6b7a672a6bd --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32 @@ -0,0 +1,18 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y + +# +# Serial flasher config +# +CONFIG_ESPTOOLPY_MONITOR_BAUD=921600 + +# +# ESP32-specific +# +CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600 diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32c3 index 9c507652638..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32c3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32c6 index 52d72b3c2e2..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32c6 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32h2 index 52d72b3c2e2..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32h2 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32s3 index 9c507652638..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/sdkconfig.defaults.esp32s3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.bluedroid index d6186213f89..8c6af90e139 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.bluedroid @@ -1,14 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.bluedroid_deinit index 0e53d4a8be5..999acea35b3 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.bluedroid_deinit @@ -1,15 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.model index 9d21c3ed023..dbb81b500c4 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.model @@ -1,16 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y CONFIG_BLE_MESH_HEALTH_SRV=n CONFIG_BLE_MESH_GENERIC_SERVER=n diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.nimble index b31c469bd78..25112f64c19 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.nimble @@ -1,13 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.nimble_deinit index 2b6d438c58f..53a3b6f07c4 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.ci.nimble_deinit @@ -1,14 +1,3 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_NODE=y -CONFIG_BLE_MESH_PB_GATT=y CONFIG_BLE_MESH_SETTINGS=y diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults index 54f6e7e334e..4ff051cb4cf 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y @@ -17,14 +11,3 @@ 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 - -# -# Serial flasher config -# -CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B=y -CONFIG_ESPTOOLPY_MONITOR_BAUD=921600 - -# -# ESP32-specific -# -CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600 diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..a496f9f5156 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32 @@ -0,0 +1,17 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y + +# +# Serial flasher config +# +CONFIG_ESPTOOLPY_MONITOR_BAUD=921600 + +# +# ESP32-specific +# +CONFIG_ESP_CONSOLE_UART_BAUDRATE=921600 diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32c3 index ad04a937e2e..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32c3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32c6 index 5e225b42382..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32c6 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32h2 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32h2 index 5e225b42382..0e4bf338bdc 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32h2 +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32h2 @@ -1,17 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32h2" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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 diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32s3 index ad04a937e2e..7484622fbdc 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/sdkconfig.defaults.esp32s3 @@ -1,16 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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 -CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=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_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/main/Kconfig.projbuild b/examples/bluetooth/esp_ble_mesh/wifi_coexist/main/Kconfig.projbuild index 65e081f5fc0..9569e087713 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/main/Kconfig.projbuild +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/main/Kconfig.projbuild @@ -29,10 +29,6 @@ menu "Example Configuration" bool "ESP32C6-DevKitC" depends on IDF_TARGET_ESP32C6 - config BLE_MESH_ESP32H2_DEV - bool "ESP32C6-DevKitC" - depends on IDF_TARGET_ESP32H2 - endchoice endmenu diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.bluedroid index e732b01c0a8..61a3953836c 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.bluedroid @@ -1,17 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_FAST_PROV=y CONFIG_BLE_MESH_PB_GATT=y -CONFIG_BLE_MESH_CFG_CLI=y - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.bluedroid_deinit b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.bluedroid_deinit index a3365c5e8ea..96dc1144677 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.bluedroid_deinit +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.bluedroid_deinit @@ -1,18 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y -CONFIG_BLE_MESH_CFG_CLI=y - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.model b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.model index 7b4020b83ba..d2be49959f0 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.model +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.model @@ -1,21 +1,4 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y -CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y -CONFIG_BT_BTU_TASK_STACK_SIZE=4512 - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y -CONFIG_BLE_MESH_CFG_CLI=y CONFIG_BLE_MESH_HEALTH_SRV=n CONFIG_BLE_MESH_SENSOR_SERVER=n CONFIG_BLE_MESH_TIME_SCENE_SERVER=n CONFIG_BLE_MESH_LIGHTING_SERVER=n - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.nimble b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.nimble index 0c39b84bbb8..f49256fb286 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.nimble +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.nimble @@ -1,16 +1 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y -CONFIG_BLE_MESH_CFG_CLI=y - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.nimble_deinit b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.nimble_deinit index 66c125883b5..2493d24468f 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.nimble_deinit +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.ci.nimble_deinit @@ -1,17 +1,2 @@ -CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_NIMBLE_ENABLED=y - -CONFIG_BLE_MESH=y CONFIG_BLE_MESH_DEINIT=n -CONFIG_BLE_MESH_FAST_PROV=y -CONFIG_BLE_MESH_PB_GATT=y -CONFIG_BLE_MESH_CFG_CLI=y - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults index 22cc1bd25ac..413998ce98a 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults @@ -1,12 +1,6 @@ # Override some defaults so BT stack is enabled # by default in this example CONFIG_BT_ENABLED=y -CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y -CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n -CONFIG_BTDM_CTRL_MODE_BTDM=n -CONFIG_CTRL_BTDM_MODEM_SLEEP=n -CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y -CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_BT_BTU_TASK_STACK_SIZE=4512 @@ -24,9 +18,6 @@ CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10 CONFIG_BLE_MESH_TRACE_LEVEL_ERROR=y CONFIG_BLE_MESH_CFG_CLI=y -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240 - CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16 @@ -48,7 +39,6 @@ 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 diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32 b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32 new file mode 100644 index 00000000000..4f74c2948e5 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32 @@ -0,0 +1,10 @@ +# Override some defaults so BT stack is enabled +# by default in this example +CONFIG_IDF_TARGET="esp32" +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODEM_SLEEP=n +CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE=y +CONFIG_BTDM_BLE_MESH_SCAN_DUPL_EN=y + +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240 diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32c3 index fc40b75b253..154ee689359 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32c3 +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32c3 @@ -1,59 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c3" 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_ESP_DEFAULT_CPU_FREQ_MHZ_240=y -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240 - -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 - -CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16 -CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64 -CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64 -CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y -CONFIG_ESP_WIFI_TX_BA_WIN=32 -CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y -CONFIG_ESP_WIFI_RX_BA_WIN=32 - -CONFIG_FREERTOS_UNICORE=n -CONFIG_FREERTOS_HZ=1000 - -CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT_EN=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_ESP_WIFI_RX_IRAM_OPT=n - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32c6 b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32c6 index 7b05fb98466..e226e8fccf2 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32c6 +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32c6 @@ -1,60 +1,7 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32c6" CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=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 CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_BT_LE_50_FEATURE_SUPPORT=n - -# 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_ESP_DEFAULT_CPU_FREQ_MHZ_240=y -CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240 - -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 - -CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16 -CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64 -CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64 -CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y -CONFIG_ESP_WIFI_TX_BA_WIN=32 -CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y -CONFIG_ESP_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_ESP_WIFI_RX_IRAM_OPT=n - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32s3 index fc40b75b253..f9ae78fe57b 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32s3 +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults.esp32s3 @@ -1,59 +1,10 @@ # Override some defaults so BT stack is enabled # by default in this example -CONFIG_BT_ENABLED=y +CONFIG_IDF_TARGET="esp32s3" 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_BT_BLE_50_FEATURES_SUPPORTED=n CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240 - -CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096 - -CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16 -CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64 -CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64 -CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y -CONFIG_ESP_WIFI_TX_BA_WIN=32 -CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y -CONFIG_ESP_WIFI_RX_BA_WIN=32 - -CONFIG_FREERTOS_UNICORE=n -CONFIG_FREERTOS_HZ=1000 - -CONFIG_ESP_INT_WDT=n -CONFIG_ESP_TASK_WDT_EN=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_ESP_WIFI_RX_IRAM_OPT=n - -CONFIG_PARTITION_TABLE_CUSTOM=y -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y diff --git a/tools/ci/ignore_build_warnings.txt b/tools/ci/ignore_build_warnings.txt index 1b92e59888e..5c208435de2 100644 --- a/tools/ci/ignore_build_warnings.txt +++ b/tools/ci/ignore_build_warnings.txt @@ -15,34 +15,23 @@ CryptographyDeprecationWarning Warning: \d+/\d+ app partitions are too small for binary CMake Deprecation Warning at main/lib/tinyxml2/CMakeLists\.txt:11 \(cmake_policy\) The smallest .+ partition is nearly full \(\d+% free space left\)! -warning: unknown kconfig symbol 'BT_CTRL_COEX_PARAMETERS_ENABLE' assigned to* -warning: unknown kconfig symbol 'BT_CTRL_COEX_USE_HOOKS' assigned to* warning: unknown kconfig symbol 'BT_LE_50_FEATURE_SUPPORT' assigned to* warning: unknown kconfig symbol 'BT_LE_MAX_EXT_ADV_INSTANCES' assigned to* -warning: unknown kconfig symbol 'BTDM_BLE_MESH_SCAN_DUPL_EN' assigned to* warning: unknown kconfig symbol 'BTDM_CTRL_MODE_BLE_ONLY' assigned to* warning: unknown kconfig symbol 'BTDM_CTRL_MODE_BR_EDR_ONLY' assigned to* warning: unknown kconfig symbol 'BTDM_CTRL_MODE_BTDM' assigned to* -warning: unknown kconfig symbol 'BTDM_SCAN_DUPL_TYPE_DATA_DEVICE' assigned to* warning: unknown kconfig symbol 'CTRL_BTDM_MODEM_SLEEP' assigned to* -warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_240' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/wifi_coexist/ warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_80' assigned to 'y' in .*/examples/system/deep_sleep/* warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_80' assigned to 'y' in .*/examples/system/light_sleep/* -warning: unknown kconfig symbol 'ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram -warning: unknown kconfig symbol 'ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/fast_provisioninging/fast_prov_server/sdkconfig.ci.iram warning: unknown kconfig symbol 'ESP32_REV_MIN_3' assigned to 'y' in .*/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa warning: unknown kconfig symbol 'ESP32_REV_MIN' assigned to '3' in .*/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa warning: unknown kconfig symbol 'ESP32H4_RTC_CLK_CAL_CYCLES' assigned to '576' in .*/examples/bluetooth/nimble/blecent/sdkconfig.defaults.esp32h4 warning: unknown kconfig symbol 'ESP32H4_RTC_CLK_SRC_EXT_CRYS' assigned to 'y' in .*/examples/bluetooth/nimble/blecent/sdkconfig.defaults.esp32h4 -warning: unknown kconfig symbol 'ESPTOOLPY_MONITOR_BAUD_921600B' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/vendor_models/* -warning: unknown kconfig symbol 'LWIP_ETHARP_TRUST_IP_MAC' assigned to 'n' in .*/examples/bluetooth/esp_ble_mesh/* warning: unknown kconfig symbol 'LWIP_ETHARP_TRUST_IP_MAC' assigned to 'n' in .*/examples/wifi/iperf/* warning: unknown kconfig symbol 'LWIP_ETHARP_TRUST_IP_MAC' assigned to 'n' in .*/idf-app-test/apps/iperf/* -warning: unknown kconfig symbol 'SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram warning: unknown kconfig symbol 'SPIRAM_FETCH_INSTRUCTIONS' assigned to 'y' in .*/components/spi_flash/test_apps/mspi_test/sdkconfig.ci.psram warning: unknown kconfig symbol 'SPIRAM_IGNORE_NOTFOUND' assigned to 'y' in .*/examples/network/simple_sniffer/sdkconfig.ci.mem warning: unknown kconfig symbol 'SPIRAM_RODATA' assigned to 'y' in .*/components/spi_flash/test_apps/mspi_test/sdkconfig.ci.psram -warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/examples/network/simple_sniffer/sdkconfig.ci.mem warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/examples/protocols/http2_request/sdkconfig.ci warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/examples/protocols/https_mbedtls/sdkconfig.ci