From b0367f5f2f6519e9e7594b4d79192a916b275004 Mon Sep 17 00:00:00 2001 From: luoxu Date: Wed, 24 Jul 2024 14:57:53 +0800 Subject: [PATCH] feat(ble_mesh): disable some models by default --- components/bt/esp_ble_mesh/Kconfig.in | 8 ++++---- .../esp_ble_mesh/aligenie_demo/sdkconfig.defaults | 2 ++ .../directed_forwarding/df_server/sdkconfig.defaults | 1 + .../fast_provisioning/fast_prov_server/sdkconfig.defaults | 1 + .../onoff_models/onoff_server/sdkconfig.defaults | 1 + .../remote_provisioning/rpr_server/sdkconfig.defaults | 1 + .../remote_provisioning/unprov_dev/sdkconfig.defaults | 1 + .../sensor_models/sensor_server/sdkconfig.defaults | 1 + .../esp_ble_mesh/wifi_coexist/sdkconfig.defaults | 1 + 9 files changed, 13 insertions(+), 4 deletions(-) diff --git a/components/bt/esp_ble_mesh/Kconfig.in b/components/bt/esp_ble_mesh/Kconfig.in index 216ab39ac6..17d23ba94e 100644 --- a/components/bt/esp_ble_mesh/Kconfig.in +++ b/components/bt/esp_ble_mesh/Kconfig.in @@ -1441,25 +1441,25 @@ if BLE_MESH config BLE_MESH_GENERIC_SERVER bool "Generic server models" - default y + default n help Enable support for Generic server models. config BLE_MESH_SENSOR_SERVER bool "Sensor server models" - default y + default n help Enable support for Sensor server models. config BLE_MESH_TIME_SCENE_SERVER bool "Time and Scenes server models" - default y + default n help Enable support for Time and Scenes server models. config BLE_MESH_LIGHTING_SERVER bool "Lighting server models" - default y + default n help Enable support for Lighting server models. diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults index 482ee36c2c..bbf11d1fa4 100644 --- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults @@ -29,6 +29,8 @@ CONFIG_BLE_MESH_MODEL_KEY_COUNT=5 CONFIG_BLE_MESH_MODEL_GROUP_COUNT=5 CONFIG_BLE_MESH_MSG_CACHE_SIZE=20 CONFIG_BLE_MESH_ADV_BUF_COUNT=256 +CONFIG_BLE_MESH_GENERIC_SERVER=y +CONFIG_BLE_MESH_LIGHTING_SERVER=y # # light driver config 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 776613cfdb..04abb249e0 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 @@ -13,4 +13,5 @@ CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10 CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10 CONFIG_BLE_MESH_SELF_TEST=y CONFIG_BLE_MESH_TEST_USE_WHITE_LIST=y +CONFIG_BLE_MESH_GENERIC_SERVER=y CONFIG_BLE_MESH_DF_SRV=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 b080c43f76..29196ae712 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 @@ -16,6 +16,7 @@ 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_GENERIC_SERVER=y CONFIG_BLE_MESH_CFG_CLI=y CONFIG_PARTITION_TABLE_CUSTOM=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 4ff051cb4c..c553f8d9f7 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 @@ -11,3 +11,4 @@ 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_SERVER=y 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 1290ff2ba8..7228ebfeb8 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 @@ -11,4 +11,5 @@ 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_SERVER=y CONFIG_BLE_MESH_RPR_SRV=y 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 4ff051cb4c..c553f8d9f7 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 @@ -11,3 +11,4 @@ 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_SERVER=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 4ff051cb4c..45a0656668 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 @@ -11,3 +11,4 @@ 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_SENSOR_SERVER=y diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults index 413998ce98..007c2045ce 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/sdkconfig.defaults @@ -17,6 +17,7 @@ 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_BLE_MESH_GENERIC_SERVER=y CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=4096