Merge branch 'feature/ble_mesh_example_support_duplicate_scan' into 'master'

ble_mesh: stack: Supporting duplicate scan on esp32c6 and esp32h2

See merge request espressif/esp-idf!24683

components/bt/esp_ble_mesh/Kconfig.in

@@ -13,6 +13,8 @@ if BLE_MESH
         select BTDM_BLE_MESH_SCAN_DUPL_EN if IDF_TARGET_ESP32
         select BT_CTRL_BLE_SCAN_DUPL if IDF_TARGET_ESP32C3
         select BT_CTRL_BLE_MESH_SCAN_DUPL_EN if IDF_TARGET_ESP32C3
+        select BT_LE_SCAN_DUPL if IDF_TARGET_ESP32C6
+        select BT_LE_SCAN_DUPL if IDF_TARGET_ESP32H2
         default y
         help
             Enable this option to allow using specific duplicate scan filter

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

@@ -2,7 +2,7 @@
 ##Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

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

@@ -2,7 +2,7 @@
 ##Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32c6

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32h2

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/sdkconfig.defaults.esp32c6

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/sdkconfig.defaults.esp32h2

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

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

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

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

@@ -2,7 +2,7 @@
 ##Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

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

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

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

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

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

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

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

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32c6

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32h2

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32c6

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32h2

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32c6

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32h2

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32c6

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32h2

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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

examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/sdkconfig.defaults.esp32c6

@@ -1,7 +1,7 @@
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
-CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_LE_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