samples: Bluetooth: Use SDC for Direction Finding Peripheral AoA

Use SoftDevice Controller as default for Direction Finding
Peripheral AoA sample.

This change applies the same fix from #17954.

Signed-off-by: Ryan Chu <[email protected]>

Author: ryanjh

samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52820.conf

@@ -4,17 +4,10 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_BT_CTLR=y
-CONFIG_BT_LL_SW_SPLIT=y
-
 # Enable Direction Finding Feature including AoA and AoD
 CONFIG_BT_CTLR_DF=y
 
 CONFIG_BT_CTLR_DF_CTE_TX=y
 CONFIG_BT_CTLR_DF_CONN_CTE_TX=y
 CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=y
 CONFIG_BT_CTLR_DF_CONN_CTE_RSP=y
-
-# Ensure that there are enough control procedure contexts to queue and execute all procedures
-CONFIG_BT_CTLR_ADVANCED_FEATURES=y
-CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6

samples/bluetooth/direction_finding_peripheral/boards/nrf52833dk_nrf52833.conf

@@ -4,17 +4,10 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-CONFIG_BT_CTLR=y
-CONFIG_BT_LL_SW_SPLIT=y
-
 # Enable Direction Finding Feature including AoA and AoD
 CONFIG_BT_CTLR_DF=y
 
 CONFIG_BT_CTLR_DF_CTE_TX=y
 CONFIG_BT_CTLR_DF_CONN_CTE_TX=y
 CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=y
 CONFIG_BT_CTLR_DF_CONN_CTE_RSP=y
-
-# Ensure that there are enough control procedure contexts to queue and execute all procedures
-CONFIG_BT_CTLR_ADVANCED_FEATURES=y
-CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6

samples/bluetooth/direction_finding_peripheral/overlay-bt_ll_sw_split.conf

@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2022 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+CONFIG_BT_CTLR=y
+CONFIG_BT_LL_SW_SPLIT=y
+
+# Enable Direction Finding Feature including AoA and AoD
+CONFIG_BT_CTLR_DF=y
+
+CONFIG_BT_CTLR_DF_CTE_TX=y
+CONFIG_BT_CTLR_DF_CONN_CTE_TX=y
+CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=y
+CONFIG_BT_CTLR_DF_CONN_CTE_RSP=y
+
+# Ensure that there are enough control procedure contexts to queue and execute all procedures
+CONFIG_BT_CTLR_ADVANCED_FEATURES=y
+CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6

samples/bluetooth/direction_finding_peripheral/sample.yaml

@@ -2,22 +2,66 @@ sample:
   name: Direction Finding Peripheral
   description: Sample application showing peripheral role of Direction Finding in connected mode
 tests:
-  sample.bluetooth.direction_finding_peripheral_nrf:
+  sample.bluetooth.direction_finding_peripheral.aoa.sdc.nrf52_nrf53:
     sysbuild: true
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
     build_only: true
-    platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp
+    platform_allow:
+      - nrf52833dk/nrf52833
+      - nrf52833dk/nrf52820
+      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth sysbuild
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
       - nrf5340dk/nrf5340/cpuapp
-  sample.bluetooth.direction_finding_peripheral_nrf.aod:
+  sample.bluetooth.direction_finding_peripheral.aoa.bt_ll_sw_split.nrf52:
+    sysbuild: false
+    build_only: true
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf;overlay-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
+    platform_allow:
+      - nrf52833dk/nrf52833
+      - nrf52833dk/nrf52820
+    tags: bluetooth
+    integration_platforms:
+      - nrf52833dk/nrf52833
+      - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_peripheral.aoa.bt_ll_sw_split.nrf53:
     sysbuild: true
-    extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
     build_only: true
-    platform_allow: nrf52833dk/nrf52833 nrf52833dk/nrf52820 nrf5340dk/nrf5340/cpuapp
+    extra_args:
+      - OVERLAY_CONFIG="overlay-aoa.conf"
+      - ipc_radio_OVERLAY_CONFIG="../../overlay-bt_ll_sw_split.conf"
+      - ipc_radio_SNIPPET="bt-ll-sw-split"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
     tags: bluetooth sysbuild
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp
+  sample.bluetooth.direction_finding_peripheral.all.bt_ll_sw_split.nrf52:
+    sysbuild: false
+    build_only: true
+    extra_args:
+      - OVERLAY_CONFIG="overlay-bt_ll_sw_split.conf"
+      - SNIPPET="bt-ll-sw-split"
+    platform_allow:
+      - nrf52833dk/nrf52833
+      - nrf52833dk/nrf52820
+    tags: bluetooth
     integration_platforms:
       - nrf52833dk/nrf52833
       - nrf52833dk/nrf52820
+  sample.bluetooth.direction_finding_peripheral.all.bt_ll_sw_split.nrf53:
+    sysbuild: true
+    build_only: true
+    extra_args:
+      - ipc_radio_OVERLAY_CONFIG="../../overlay-bt_ll_sw_split.conf"
+      - ipc_radio_SNIPPET="bt-ll-sw-split"
+    platform_allow:
+      - nrf5340dk/nrf5340/cpuapp
+    tags: bluetooth sysbuild
+    integration_platforms:
       - nrf5340dk/nrf5340/cpuapp

samples/bluetooth/direction_finding_peripheral/sysbuild.cmake

@@ -16,9 +16,6 @@ CONFIG_BT_MAX_CONN=16
 # CONFIG_BT_BUF_ACL_TX_SIZE=251
 # CONFIG_BT_BUF_CMD_TX_SIZE=255
 
-CONFIG_BT_CTLR=y
-CONFIG_BT_LL_SW_SPLIT=y
-
 # Enable Direction Finding Feature including AoA and AoD
 CONFIG_BT_CTLR_DF=y
 
@@ -27,9 +24,8 @@ CONFIG_BT_CTLR_DF_CONN_CTE_TX=y
 CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=y
 CONFIG_BT_CTLR_DF_CONN_CTE_RSP=y
 
-# Ensure that there are enough control procedure contexts to queue and execute all procedures
-CONFIG_BT_CTLR_ADVANCED_FEATURES=y
-CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
+CONFIG_LOG=y
 
 CONFIG_IPC_RADIO_BT=y
 CONFIG_IPC_RADIO_BT_HCI_IPC=y
+CONFIG_IPC_RADIO_LOG_LEVEL_ERR=y