From f835011e2f4b311dec857727225710898ae5b2bf Mon Sep 17 00:00:00 2001 From: lly Date: Wed, 24 Jun 2020 17:26:34 +0800 Subject: [PATCH 1/2] ble_mesh: stack: Fix compile error when only proxy enabled Also remove some redundant CONFIG_BLE_MESH_PROXY checks, because when the following options are satisfied, the CONFIG_BLE_MESH_PROXY option will be selected mandatorily. --- components/bt/esp_ble_mesh/mesh_core/main.c | 29 ++++++++++----------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/components/bt/esp_ble_mesh/mesh_core/main.c b/components/bt/esp_ble_mesh/mesh_core/main.c index 64710ddc1..978a0aa24 100644 --- a/components/bt/esp_ble_mesh/mesh_core/main.c +++ b/components/bt/esp_ble_mesh/mesh_core/main.c @@ -336,17 +336,16 @@ int bt_mesh_init(const struct bt_mesh_prov *prov, bt_mesh_gatt_init(); } - if (IS_ENABLED(CONFIG_BLE_MESH_PROXY)) { - if ((IS_ENABLED(CONFIG_BLE_MESH_NODE) && - IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) || - IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER)) { - bt_mesh_proxy_init(); - } - if ((IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) && - IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) || - IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_CLIENT)) { - bt_mesh_proxy_prov_client_init(); - } + if ((IS_ENABLED(CONFIG_BLE_MESH_NODE) && + IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) || + IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER)) { + bt_mesh_proxy_init(); + } + + if ((IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) && + IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) || + IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_CLIENT)) { + bt_mesh_proxy_prov_client_init(); } if (IS_ENABLED(CONFIG_BLE_MESH_PROV)) { @@ -444,10 +443,10 @@ int bt_mesh_deinit(struct bt_mesh_deinit_param *param) bt_mesh_beacon_deinit(); - if (IS_ENABLED(CONFIG_BLE_MESH_PROXY)) { - if (IS_ENABLED(CONFIG_BLE_MESH_NODE)) { - bt_mesh_proxy_deinit(); - } + if ((IS_ENABLED(CONFIG_BLE_MESH_NODE) && + IS_ENABLED(CONFIG_BLE_MESH_PB_GATT)) || + IS_ENABLED(CONFIG_BLE_MESH_GATT_PROXY_SERVER)) { + bt_mesh_proxy_deinit(); } if ((IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) && From 7a939c148ca5d85655ac11db8f38abb988378781 Mon Sep 17 00:00:00 2001 From: lly Date: Wed, 24 Jun 2020 18:45:28 +0800 Subject: [PATCH 2/2] ble_mesh: ci: Add different proxy configurations --- .../onoff_client/sdkconfig.ci.bluedroid | 2 ++ .../onoff_client/sdkconfig.ci.proxy00 | 17 +++++++++++++++++ .../onoff_client/sdkconfig.ci.proxy01 | 16 ++++++++++++++++ .../onoff_client/sdkconfig.ci.proxy02 | 18 ++++++++++++++++++ .../onoff_client/sdkconfig.ci.proxy03 | 17 +++++++++++++++++ .../onoff_client/sdkconfig.ci.proxy04 | 18 ++++++++++++++++++ .../onoff_client/sdkconfig.ci.proxy05 | 18 ++++++++++++++++++ .../sdkconfig.ci.bluedroid | 2 ++ .../ble_mesh_provisioner/sdkconfig.ci.proxy00 | 16 ++++++++++++++++ .../ble_mesh_provisioner/sdkconfig.ci.proxy01 | 17 +++++++++++++++++ .../ble_mesh_provisioner/sdkconfig.ci.proxy02 | 17 +++++++++++++++++ .../ble_mesh_provisioner/sdkconfig.ci.proxy03 | 17 +++++++++++++++++ 12 files changed, 175 insertions(+) create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy00 create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy01 create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy02 create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy03 create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy04 create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy05 create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy00 create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy01 create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy02 create mode 100644 examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy03 diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.bluedroid index e9b0c0b0f..ef14cf978 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.bluedroid @@ -8,6 +8,8 @@ CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y CONFIG_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 diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy00 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy00 new file mode 100644 index 000000000..ffe217d40 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy00 @@ -0,0 +1,17 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y +CONFIG_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/ble_mesh_node/onoff_client/sdkconfig.ci.proxy01 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy01 new file mode 100644 index 000000000..219a495d4 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy01 @@ -0,0 +1,16 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y +CONFIG_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/ble_mesh_node/onoff_client/sdkconfig.ci.proxy02 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy02 new file mode 100644 index 000000000..e212fccea --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy02 @@ -0,0 +1,18 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y +CONFIG_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/ble_mesh_node/onoff_client/sdkconfig.ci.proxy03 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy03 new file mode 100644 index 000000000..63b2e21f9 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy03 @@ -0,0 +1,17 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y +CONFIG_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/ble_mesh_node/onoff_client/sdkconfig.ci.proxy04 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy04 new file mode 100644 index 000000000..5f243c626 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy04 @@ -0,0 +1,18 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y +CONFIG_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/ble_mesh_node/onoff_client/sdkconfig.ci.proxy05 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy05 new file mode 100644 index 000000000..714f8f3f0 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.ci.proxy05 @@ -0,0 +1,18 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=y +CONFIG_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/ble_mesh_provisioner/sdkconfig.ci.bluedroid b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.bluedroid index 935a2823f..f961bd803 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.bluedroid +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.bluedroid @@ -7,6 +7,8 @@ CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y CONFIG_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 diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy00 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy00 new file mode 100644 index 000000000..da5fd368f --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy00 @@ -0,0 +1,16 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_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/ble_mesh_provisioner/sdkconfig.ci.proxy01 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy01 new file mode 100644 index 000000000..9b55d0576 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy01 @@ -0,0 +1,17 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_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/ble_mesh_provisioner/sdkconfig.ci.proxy02 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy02 new file mode 100644 index 000000000..a3bf24757 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy02 @@ -0,0 +1,17 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_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/ble_mesh_provisioner/sdkconfig.ci.proxy03 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy03 new file mode 100644 index 000000000..5fec5b9c6 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.ci.proxy03 @@ -0,0 +1,17 @@ +CONFIG_BT_ENABLED=y +CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y +CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CONTROLLER_MODE_BTDM=n +CONFIG_BTDM_CONTROLLER_MODEM_SLEEP=n +CONFIG_SCAN_DUPLICATE_BY_ADV_DATA_AND_DEVICE_ADDR=y +CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=y +CONFIG_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