ble_mesh: Miscellaneous modifications

1. Add an API to get provisioned node count
2. Update several ble mesh documents
3. Fix some bugs which have been merged

examples/bluetooth/esp_ble_mesh/README.md

@@ -1,72 +1,76 @@
-# ESP BLE Mesh Examples
+# ESP-BLE-MESH Examples
 
-[ESP BLE Mesh]($IDF_PATH/components/bt/esp_ble_mesh/) is the official BLE Mesh stack of Espressif Systems. We will provide long-term support for new features, performance optimization, etc.
+[ESP-BLE-MESH]($IDF_PATH/components/bt/esp_ble_mesh/) is the official Bluetooth® Mesh stack of Espressif Systems. We will provide long-term support for new features, performance optimization, etc.
 
-Please help note that breaking changes may be introduced into ESP BLE Mesh on [minor IDF versions](https://docs.espressif.com/projects/esp-idf/en/latest/versions.html).
+Please help note that breaking changes may be introduced into ESP-BLE-MESH on [minor IDF versions](https://docs.espressif.com/projects/esp-idf/en/latest/versions.html).
 
-Note: To use examples in this directory, you need to have Bluetooth enabled in configuration and Bluedroid selected as the host stack. ESP BLE Mesh will support NimBLE host soon, and currently the integration of NimBLE host with ESP BLE Mesh stack is under development.
+Note: To use examples in this directory, you need to have Bluetooth enabled in configuration, and either Bluedroid or NimBLE can be selected as the host stack.
 
 # Example Layout
 
-This directory includes examples to demonstrate BLE Mesh functionality based on Zephyr (https://github.com/zephyrproject-rtos/zephyr) Mesh stack.
-
-## ble_mesh_client_model
-
-This example shows how ESP32 acts as a BLE Mesh Node with Generic OnOff Client & Server Models in the Primary Element.
-
-See the [README.md](./ble_mesh_client_model/README.md) file in the example [ble_mesh_client_model](./ble_mesh_client_model/).
+This directory includes examples to demonstrate ESP-BLE-MESH functionality based on [Zephyr Bluetooth Mesh stack](https://github.com/zephyrproject-rtos/zephyr/tree/master/subsys/bluetooth/mesh).
 
 ## ble_mesh_console
 
-This example demonstrates how ESP BLE Mesh uses Console for message transmitting/receiving tests.
+This example demonstrates how ESP-BLE-MESH uses Console for message transmitting/receiving tests.
 
-### ble_mesh_node
+#### ble_mesh_node
 
 This example shows how ESP32 acts as a BLE Mesh Node and sends vendor messages for testing.
 
-See the [README.md](./ble_mesh_console/ble_mesh_node/README.md) file in the example [ble_mesh_node](./ble_mesh_console/ble_mesh_node/).
+See [ble_mesh_node](ble_mesh_console/ble_mesh_node) folder for more details.
 
-### ble_mesh_provisioner
+#### ble_mesh_provisioner
 
 This example shows how ESP32 acts as a BLE Mesh Provisioner and sends vendor messages for testing.
 
-See the [README.md](./ble_mesh_console/ble_mesh_provisioner/README.md) file in the example [ble_mesh_provisioner](./ble_mesh_console/ble_mesh_provisioner/).
+See [ble_mesh_provisioner](ble_mesh_console/ble_mesh_provisioner) folder for more details.
 
 ## ble_mesh_fast_provision
 
-This example illustrates the solution of ESP BLE Mesh Fast Provisioning.
+This example illustrates the solution of ESP-BLE-MESH Fast Provisioning.
 
-### ble_mesh_fast_prov_client
+#### ble_mesh_fast_prov_client
 
-This example shows how ESP32, acting as a BLE Mesh Fast Provisioning Client, provisions other unprovisioned devices and then control the nodes.
+This example shows how ESP32, acting as a BLE Mesh Fast Provisioning Client, provisions other unprovisioned devices and then controls the nodes.
 
-See the [README.md](./ble_mesh_fast_provision/ble_mesh_fast_prov_client/README.md) file in the example [ble_mesh_fast_prov_client](./ble_mesh_fast_provision/ble_mesh_fast_prov_client/).
+See [ble_mesh_fast_prov_client](ble_mesh_fast_provision/ble_mesh_fast_prov_client) folder for more details.
 
-### ble_mesh_fast_prov_server
+#### ble_mesh_fast_prov_server
 
 This example illustrates the process that:
-1. Firstly as a BLE Mesh Fast Provisioning Server, ESP32 is provisioned into a Node;
-2. and then provisions other unprovisioned devices as a Temporary Provisioner.
+1. ESP32 as a BLE Mesh Fast Provisioning Server is provisioned into a node;
+2. ESP32 as a Temporary Provisioner provisions other unprovisioned devices.
 
-See the [README.md](./ble_mesh_fast_provision/ble_mesh_fast_prov_server/README.md) file in the example [ble_mesh_fast_prov_server](./ble_mesh_fast_provision/ble_mesh_fast_prov_server/).
+See [ble_mesh_fast_prov_server](ble_mesh_fast_provision/ble_mesh_fast_prov_server) folder for more details.
 
 ## ble_mesh_node
 
-This example shows how ESP32 acts as a BLE Mesh Node with only Generic OnOff Server Model in the Primary Element.
+This example demonstrates how ESP32 acts as a BLE Mesh node with Generic OnOff Server model or Generic OnOff Client model on board.
 
-See the [README.md](./ble_mesh_node/README.md) file in the example [ble_mesh_node](./ble_mesh_node/).
+#### onoff_client
+
+This example shows how ESP32 acts as a BLE Mesh Node with Generic OnOff Client model in the Primary Element.
+
+See [onoff_client](ble_mesh_node/onoff_client) folder for more details.
+
+#### onoff_server
+
+This example shows how ESP32 acts as a BLE Mesh Node with only Generic OnOff Server model in the Primary Element.
+
+See [onoff_server](ble_mesh_node/onoff_server) folder for more details.
 
 ## ble_mesh_provisioner
 
 This example shows how ESP32 acts as a BLE Mesh Provisioner and provisions other unprovisioned devices.
 
-See the [README.md](./ble_mesh_provisioner/README.md) file in the example [ble_mesh_provisioner](./ble_mesh_provisioner/).
+See [ble_mesh_provisioner](ble_mesh_provisioner) folder for more details.
 
 ## ble_mesh_wifi_coexist
 
 This example shows how ESP32 acts as a BLE Mesh Fast Provisioning Server and coexists with Wi-Fi iperf functionality.
 
-See the [README.md](./ble_mesh_wifi_coexist/README.md) file in the example [ble_mesh_wifi_coexist](./ble_mesh_wifi_coexist/).
+See [ble_mesh_wifi_coexist](ble_mesh_wifi_coexist) folder for more details.
 
 # More
 

examples/bluetooth/esp_ble_mesh/ble_mesh_console/ble_mesh_node/sdkconfig.defaults

@@ -5,41 +5,19 @@ CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
 CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
 CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
 CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
-CONFIG_GATTS_ENABLE=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
-CONFIG_BLE_MESH=y
-CONFIG_BLE_MESH_HCI_5_0=y
-CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
-CONFIG_BLE_MESH_NODE=y
-CONFIG_BLE_MESH_PROV=y
-CONFIG_BLE_MESH_NET_BUF_POOL_USAGE=y
-CONFIG_BLE_MESH_PROXY=y
-CONFIG_BLE_MESH_PB_GATT=y
-CONFIG_BLE_MESH_GATT_PROXY_SERVER=y
-CONFIG_BLE_MESH_NODE_ID_TIMEOUT=60
-CONFIG_BLE_MESH_PROXY_FILTER_SIZE=1
-CONFIG_BLE_MESH_SUBNET_COUNT=1
-CONFIG_BLE_MESH_APP_KEY_COUNT=1
-CONFIG_BLE_MESH_MODEL_KEY_COUNT=1
-CONFIG_BLE_MESH_MODEL_GROUP_COUNT=1
-CONFIG_BLE_MESH_LABEL_COUNT=1
-CONFIG_BLE_MESH_CRPL=10
-CONFIG_BLE_MESH_MSG_CACHE_SIZE=10
-CONFIG_BLE_MESH_ADV_BUF_COUNT=60
-CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=6
-CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=1
-CONFIG_BLE_MESH_RX_SDU_MAX=384
-CONFIG_BLE_MESH_TX_SEG_MAX=32
-CONFIG_BLE_MESH_RELAY=y
-CONFIG_BLE_MESH_LOW_POWER=
-CONFIG_BLE_MESH_FRIEND=
-CONFIG_BLE_MESH_CFG_CLI=y
 CONFIG_BTU_TASK_STACK_SIZE=4512
+
+# 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_CFG_CLI=y
+
+CONFIG_CONSOLE_UART_BAUDRATE=921600
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_MONITOR_BAUD_921600B=y

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

@@ -5,38 +5,17 @@ CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
 CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
 CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
-CONFIG_BLE_SCAN_DUPLICATE=y
-CONFIG_SCAN_DUPLICATE_TYPE=2
 CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
-CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_MESH_DUPLICATE_SCAN_CACHE_SIZE=200
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
+CONFIG_BTU_TASK_STACK_SIZE=4512
+
+# Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
-CONFIG_BLE_MESH_HCI_5_0=y
-CONFIG_BLE_MESH_USE_DUPLICATE_SCAN=y
-CONFIG_BLE_MESH_PROV=y
 CONFIG_BLE_MESH_PROVISIONER=y
-CONFIG_BLE_MESH_WAIT_FOR_PROV_MAX_DEV_NUM=20
-CONFIG_BLE_MESH_MAX_PROV_NODES=20
+CONFIG_BLE_MESH_PB_GATT=y
 CONFIG_BLE_MESH_PBA_SAME_TIME=10
 CONFIG_BLE_MESH_PBG_SAME_TIME=3
-CONFIG_BLE_MESH_PROVISIONER_SUBNET_COUNT=3
-CONFIG_BLE_MESH_PROVISIONER_APP_KEY_COUNT=9
-CONFIG_BLE_MESH_PB_ADV=y
-CONFIG_BLE_MESH_NET_BUF_POOL_USAGE=y
-CONFIG_BLE_MESH_PB_GATT=y
-CONFIG_BLE_MESH_GATT_PROXY_SERVER=y
-CONFIG_BLE_MESH_RELAY=y
-CONFIG_BLE_MESH_LOW_POWER=
-CONFIG_BLE_MESH_FRIEND=
-CONFIG_BLE_MESH_MSG_CACHE_SIZE=10
-CONFIG_BLE_MESH_ADV_BUF_COUNT=60
-CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=6
-CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=1
-CONFIG_BLE_MESH_RX_SDU_MAX=384
-CONFIG_BLE_MESH_TX_SEG_MAX=32
-CONFIG_BTU_TASK_STACK_SIZE=4512
+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_BLE_MESH_GENERIC_ONOFF_CLI=y

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_client/sdkconfig.defaults

@@ -7,22 +7,15 @@ CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
 CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLUEDROID_ENABLED=y
-CONFIG_BLE_SMP_ENABLE=n
 CONFIG_BTU_TASK_STACK_SIZE=4512
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
 CONFIG_BLE_MESH_PROVISIONER=y
-CONFIG_BLE_MESH_PROV=y
 CONFIG_BLE_MESH_PBA_SAME_TIME=1
 CONFIG_BLE_MESH_PB_GATT=y
-CONFIG_BLE_MESH_CRPL=10
 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_TX_SEG_MAX=32
-CONFIG_BLE_MESH_TRACE_LEVEL_WARNING=y
 CONFIG_BLE_MESH_CFG_CLI=y
 CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/ble_mesh_fast_prov_server/sdkconfig.defaults

@@ -7,10 +7,7 @@ CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
 CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLUEDROID_ENABLED=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
-CONFIG_BLE_SMP_ENABLE=n
 CONFIG_BTU_TASK_STACK_SIZE=4512
 
 # Override some defaults of ESP BLE Mesh
@@ -18,13 +15,11 @@ 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_PBG_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_TX_SEG_MAX=32
 CONFIG_BLE_MESH_TRACE_LEVEL_ERROR=y
 CONFIG_BLE_MESH_CFG_CLI=y

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

@@ -7,10 +7,7 @@ CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
 CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLUEDROID_ENABLED=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
-CONFIG_BLE_SMP_ENABLE=n
 CONFIG_BTU_TASK_STACK_SIZE=4512
 
 # Override some defaults of ESP BLE Mesh
@@ -19,6 +16,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_TX_SEG_MAX=32
-CONFIG_BLE_MESH_TRACE_LEVEL_WARNING=y
 CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y

examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/ble_mesh_demo_main.c

@@ -208,6 +208,7 @@ static void example_ble_mesh_provisioning_cb(esp_ble_mesh_prov_cb_event_t event,
 static void example_ble_mesh_generic_server_cb(esp_ble_mesh_generic_server_cb_event_t event,
                                                esp_ble_mesh_generic_server_cb_param_t *param)
 {
+    esp_ble_mesh_gen_onoff_srv_t *srv;
     ESP_LOGI(TAG, "event 0x%02x, opcode 0x%04x, src 0x%04x, dst 0x%04x",
         event, param->ctx.recv_op, param->ctx.addr, param->ctx.recv_dst);
 
@@ -223,6 +224,8 @@ static void example_ble_mesh_generic_server_cb(esp_ble_mesh_generic_server_cb_ev
     case ESP_BLE_MESH_GENERIC_SERVER_RECV_GET_MSG_EVT:
         ESP_LOGI(TAG, "ESP_BLE_MESH_GENERIC_SERVER_RECV_GET_MSG_EVT");
         if (param->ctx.recv_op == ESP_BLE_MESH_MODEL_OP_GEN_ONOFF_GET) {
+            srv = param->model->user_data;
+            ESP_LOGI(TAG, "onoff 0x%02x", srv->state.onoff);
             example_handle_gen_onoff_msg(param->model, &param->ctx, NULL);
         }
         break;

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

@@ -7,10 +7,7 @@ CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
 CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLUEDROID_ENABLED=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
-CONFIG_BLE_SMP_ENABLE=n
 CONFIG_BTU_TASK_STACK_SIZE=4512
 
 # Override some defaults of ESP BLE Mesh
@@ -18,6 +15,4 @@ 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_TX_SEG_MAX=32
-CONFIG_BLE_MESH_TRACE_LEVEL_WARNING=y
+CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10

examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/main/ble_mesh_demo_main.c

@@ -303,9 +303,6 @@ static void example_ble_mesh_provisioning_cb(esp_ble_mesh_prov_cb_event_t event,
         break;
     case ESP_BLE_MESH_PROVISIONER_SET_DEV_UUID_MATCH_COMP_EVT:
         ESP_LOGI(TAG, "ESP_BLE_MESH_PROVISIONER_SET_DEV_UUID_MATCH_COMP_EVT, err_code %d", param->provisioner_set_dev_uuid_match_comp.err_code);
-        if( param->provisioner_set_dev_uuid_match_comp.err_code != 0){
-            
-        }
         break;
     case ESP_BLE_MESH_PROVISIONER_SET_NODE_NAME_COMP_EVT: {
         ESP_LOGI(TAG, "ESP_BLE_MESH_PROVISIONER_SET_NODE_NAME_COMP_EVT, err_code %d", param->provisioner_set_node_name_comp.err_code);

examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults

@@ -7,10 +7,6 @@ CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
 CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLUEDROID_ENABLED=y
-CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
-CONFIG_BLE_SMP_ENABLE=n
 CONFIG_BTU_TASK_STACK_SIZE=4512
 
 # Override some defaults of ESP BLE Mesh
@@ -19,6 +15,5 @@ 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_TX_SEG_MAX=32
 CONFIG_BLE_MESH_CFG_CLI=y
 CONFIG_BLE_MESH_GENERIC_ONOFF_CLI=y

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults

@@ -7,10 +7,7 @@ CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n
 CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y
 CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y
-CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=y
-CONFIG_BLUEDROID_ENABLED=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
-CONFIG_BLE_SMP_ENABLE=n
 CONFIG_BTU_TASK_STACK_SIZE=4512
 
 # Override some defaults of ESP BLE Mesh
@@ -18,14 +15,12 @@ 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_PBG_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_TX_SEG_MAX=32
 CONFIG_BLE_MESH_TRACE_LEVEL_ERROR=y
 CONFIG_BLE_MESH_CFG_CLI=y