mirror of
https://github.com/espressif/esp-idf.git
synced 2026-04-27 19:13:21 +00:00
Merge branch 'fix/disabel_ble50_by_default_for_blemesh' into 'master'
fix(ble_mesh): disabled ble50 by default for ble_mesh See merge request espressif/esp-idf!47571
This commit is contained in:
@@ -4,6 +4,9 @@ CONFIG_BT_ENABLED=y
|
|||||||
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Partition Table
|
# Partition Table
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ CONFIG_BT_ENABLED=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_PB_GATT=y
|
CONFIG_BLE_MESH_PB_GATT=y
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_NODE=y
|
CONFIG_BLE_MESH_NODE=y
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ CONFIG_BT_ENABLED=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_PROVISIONER=y
|
CONFIG_BLE_MESH_PROVISIONER=y
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
CONFIG_BT_ENABLED=y
|
CONFIG_BT_ENABLED=y
|
||||||
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
|
|||||||
@@ -3,6 +3,10 @@
|
|||||||
CONFIG_BT_ENABLED=y
|
CONFIG_BT_ENABLED=y
|
||||||
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
|
|||||||
@@ -2,6 +2,10 @@
|
|||||||
# by default in this example
|
# by default in this example
|
||||||
CONFIG_BT_ENABLED=y
|
CONFIG_BT_ENABLED=y
|
||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ CONFIG_BT_ENABLED=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_PROVISIONER=y
|
CONFIG_BLE_MESH_PROVISIONER=y
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_NODE=y
|
CONFIG_BLE_MESH_NODE=y
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_NODE=y
|
CONFIG_BLE_MESH_NODE=y
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ CONFIG_BT_ENABLED=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_PROVISIONER=y
|
CONFIG_BLE_MESH_PROVISIONER=y
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_NODE=y
|
CONFIG_BLE_MESH_NODE=y
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ CONFIG_BT_ENABLED=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_PROVISIONER=y
|
CONFIG_BLE_MESH_PROVISIONER=y
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
|||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_NODE=y
|
CONFIG_BLE_MESH_NODE=y
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ CONFIG_BT_ENABLED=y
|
|||||||
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
|
||||||
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
CONFIG_BT_BTU_TASK_STACK_SIZE=4512
|
||||||
|
|
||||||
|
CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
|
||||||
|
CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
|
||||||
|
|
||||||
# Override some defaults of ESP BLE Mesh
|
# Override some defaults of ESP BLE Mesh
|
||||||
CONFIG_BLE_MESH=y
|
CONFIG_BLE_MESH=y
|
||||||
CONFIG_BLE_MESH_FAST_PROV=y
|
CONFIG_BLE_MESH_FAST_PROV=y
|
||||||
|
|||||||
Reference in New Issue
Block a user