samples: Bluetooth: Audio: Change names to <profile>_<role>
Modify the BAP and PBP samples to start with the profile name (BAP or PBP) and the role of the sample. Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen
David Leach
parent
38d201e063
commit
1bcc3d8efa
106 changed files with 156 additions and 167 deletions
|
|
@ -3,16 +3,16 @@
|
|||
cmake_minimum_required(VERSION 3.20.0)
|
||||
|
||||
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
project(broadcast_audio_sink_self_tets)
|
||||
project(bap_broadcast_sink_self_tets)
|
||||
|
||||
set(broadcast_audio_sink_path ${ZEPHYR_BASE}/samples/bluetooth/broadcast_audio_sink)
|
||||
set(bap_broadcast_sink_path ${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink)
|
||||
|
||||
target_sources(app PRIVATE
|
||||
${broadcast_audio_sink_path}/src/main.c
|
||||
${bap_broadcast_sink_path}/src/main.c
|
||||
)
|
||||
|
||||
target_sources(app PRIVATE
|
||||
src/broadcast_audio_sink_test.c
|
||||
src/broadcast_sink_test.c
|
||||
src/test_main.c
|
||||
)
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Copyright (c) 2023 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
source "${ZEPHYR_BASE}/samples/bluetooth/broadcast_audio_sink/Kconfig"
|
||||
source "${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/Kconfig"
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright (c) 2023 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
source "${ZEPHYR_BASE}/samples/bluetooth/unicast_audio_client/Kconfig.sysbuild"
|
||||
source "${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/Kconfig.sysbuild"
|
||||
|
||||
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
|
||||
int
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
# Please build using the sample configuration file:
|
||||
# ${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/prj.conf
|
||||
|
|
@ -59,7 +59,7 @@ static void test_broadcast_sink_sample_tick(bs_time_t HW_device_time)
|
|||
|
||||
static const struct bst_test_instance test_sample[] = {
|
||||
{
|
||||
.test_id = "broadcast_audio_sink",
|
||||
.test_id = "bap_broadcast_sink",
|
||||
.test_descr = "Test based on the broadcast audio sink sample. "
|
||||
"It expects to be connected to a compatible broadcast audio source, "
|
||||
"waits for " STR(WAIT_TIME) " seconds, and checks how "
|
||||
|
|
@ -67,8 +67,7 @@ static const struct bst_test_instance test_sample[] = {
|
|||
.test_pre_init_f = test_broadcast_sink_sample_init,
|
||||
.test_tick_f = test_broadcast_sink_sample_tick,
|
||||
},
|
||||
BSTEST_END_MARKER
|
||||
};
|
||||
BSTEST_END_MARKER};
|
||||
|
||||
struct bst_test_list *test_broadcast_sink_test_install(struct bst_test_list *tests)
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright (c) 2023 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
include(${ZEPHYR_BASE}/samples/bluetooth/broadcast_audio_sink/sysbuild.cmake)
|
||||
include(${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake)
|
||||
|
||||
native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP})
|
||||
|
|
@ -16,12 +16,12 @@ EXECUTE_TIMEOUT=200
|
|||
|
||||
cd ${BSIM_OUT_PATH}/bin
|
||||
|
||||
Execute ./bs_${BOARD_TS}_samples_bluetooth_broadcast_audio_source_prj_conf \
|
||||
Execute ./bs_${BOARD_TS}_samples_bluetooth_bap_broadcast_source_prj_conf \
|
||||
-v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=1
|
||||
|
||||
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_samples_broadcast_audio_sink_prj_conf \
|
||||
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_samples_bap_broadcast_sink_prj_conf \
|
||||
-v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=1 \
|
||||
-testid=broadcast_audio_sink
|
||||
-testid=bap_broadcast_sink
|
||||
|
||||
Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
|
||||
-D=2 -sim_length=120e6 $@
|
||||
|
|
@ -3,9 +3,9 @@
|
|||
cmake_minimum_required(VERSION 3.20.0)
|
||||
|
||||
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
project(unicast_audio_client_self_tets)
|
||||
project(bap_unicast_client_self_tets)
|
||||
|
||||
set(unicast_client_path ${ZEPHYR_BASE}/samples/bluetooth/unicast_audio_client)
|
||||
set(unicast_client_path ${ZEPHYR_BASE}/samples/bluetooth/bap_unicast_client)
|
||||
|
||||
target_sources(app PRIVATE
|
||||
${unicast_client_path}/src/main.c
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Copyright (c) 2023 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
source "${ZEPHYR_BASE}/samples/bluetooth/broadcast_audio_sink/Kconfig.sysbuild"
|
||||
source "${ZEPHYR_BASE}/samples/bluetooth/bap_unicast_client/Kconfig.sysbuild"
|
||||
|
||||
config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX
|
||||
int
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright (c) 2023 Nordic Semiconductor ASA
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
include(${ZEPHYR_BASE}/samples/bluetooth/unicast_audio_client/sysbuild.cmake)
|
||||
include(${ZEPHYR_BASE}/samples/bluetooth/bap_unicast_client/sysbuild.cmake)
|
||||
|
||||
native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP})
|
||||
|
|
@ -16,10 +16,10 @@ EXECUTE_TIMEOUT=100
|
|||
|
||||
cd ${BSIM_OUT_PATH}/bin
|
||||
|
||||
Execute ./bs_${BOARD_TS}_samples_bluetooth_unicast_audio_server_prj_conf \
|
||||
Execute ./bs_${BOARD_TS}_samples_bluetooth_bap_unicast_server_prj_conf \
|
||||
-v=${verbosity_level} -s=${simulation_id} -d=0 -RealEncryption=1
|
||||
|
||||
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_samples_unicast_audio_client_prj_conf \
|
||||
Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_audio_samples_bap_unicast_client_prj_conf \
|
||||
-v=${verbosity_level} -s=${simulation_id} -d=1 -RealEncryption=1 \
|
||||
-testid=unicast_client
|
||||
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
# Please build using the sample configuration file:
|
||||
# ${ZEPHYR_BASE}/samples/bluetooth/broadcast_audio_sink/prj.conf
|
||||
|
|
@ -12,23 +12,23 @@ set -ue
|
|||
source ${ZEPHYR_BASE}/tests/bsim/compile.source
|
||||
|
||||
if [ "${BOARD_TS}" == "nrf5340bsim_nrf5340_cpuapp" ]; then
|
||||
app=samples/bluetooth/unicast_audio_server sysbuild=1 compile
|
||||
app=samples/bluetooth/broadcast_audio_source sysbuild=1 compile
|
||||
app=tests/bsim/bluetooth/audio_samples/unicast_audio_client sysbuild=1 compile
|
||||
app=tests/bsim/bluetooth/audio_samples/broadcast_audio_sink sysbuild=1 \
|
||||
conf_file=${ZEPHYR_BASE}/samples/bluetooth/broadcast_audio_sink/prj.conf \
|
||||
app=samples/bluetooth/bap_unicast_server sysbuild=1 compile
|
||||
app=samples/bluetooth/bap_broadcast_source sysbuild=1 compile
|
||||
app=tests/bsim/bluetooth/audio_samples/bap_unicast_client sysbuild=1 compile
|
||||
app=tests/bsim/bluetooth/audio_samples/bap_broadcast_sink sysbuild=1 \
|
||||
conf_file=${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/prj.conf \
|
||||
exe_name=bs_${BOARD_TS}_${app}_prj_conf sysbuild=1 compile
|
||||
else
|
||||
app=samples/bluetooth/unicast_audio_server conf_overlay=overlay-bt_ll_sw_split.conf \
|
||||
app=samples/bluetooth/bap_unicast_server conf_overlay=overlay-bt_ll_sw_split.conf \
|
||||
exe_name=bs_${BOARD_TS}_${app}_prj_conf sysbuild=1 compile
|
||||
app=samples/bluetooth/broadcast_audio_source conf_overlay=overlay-bt_ll_sw_split.conf \
|
||||
app=samples/bluetooth/bap_broadcast_source conf_overlay=overlay-bt_ll_sw_split.conf \
|
||||
exe_name=bs_${BOARD_TS}_${app}_prj_conf sysbuild=1 compile
|
||||
app=tests/bsim/bluetooth/audio_samples/unicast_audio_client \
|
||||
conf_overlay=${ZEPHYR_BASE}/samples/bluetooth/unicast_audio_client/overlay-bt_ll_sw_split.conf \
|
||||
app=tests/bsim/bluetooth/audio_samples/bap_unicast_client \
|
||||
conf_overlay=${ZEPHYR_BASE}/samples/bluetooth/bap_unicast_client/overlay-bt_ll_sw_split.conf \
|
||||
exe_name=bs_${BOARD_TS}_${app}_prj_conf sysbuild=1 compile
|
||||
app=tests/bsim/bluetooth/audio_samples/broadcast_audio_sink \
|
||||
conf_file=${ZEPHYR_BASE}/samples/bluetooth/broadcast_audio_sink/prj.conf \
|
||||
conf_overlay=${ZEPHYR_BASE}/samples/bluetooth/broadcast_audio_sink/overlay-bt_ll_sw_split.conf \
|
||||
app=tests/bsim/bluetooth/audio_samples/bap_broadcast_sink \
|
||||
conf_file=${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/prj.conf \
|
||||
conf_overlay=${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/overlay-bt_ll_sw_split.conf \
|
||||
exe_name=bs_${BOARD_TS}_${app}_prj_conf sysbuild=1 compile
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue