From 1bcc3d8efa111616aff636af5bf2ae50d3fa28a7 Mon Sep 17 00:00:00 2001 From: Emil Gydesen Date: Wed, 29 May 2024 12:47:12 +0200 Subject: [PATCH] samples: Bluetooth: Audio: Change names to _ 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 --- MAINTAINERS.yml | 5 +- doc/_scripts/redirects.py | 7 + doc/releases/release-notes-3.7.rst | 8 ++ .../CMakeLists.txt | 2 +- .../Kconfig | 0 .../README.rst | 6 +- .../prj.conf | 0 .../sample.yaml | 2 +- .../src/main.c | 0 .../CMakeLists.txt | 2 +- .../Kconfig | 0 .../Kconfig.sysbuild | 0 .../README.rst | 12 +- .../boards/nrf52833dk_nrf52833.conf | 0 .../boards/nrf52833dk_nrf52833.overlay | 0 .../boards/nrf52840dongle_nrf52840.conf | 0 .../boards/nrf52840dongle_nrf52840.overlay | 0 .../nrf5340_audio_dk_nrf5340_cpuapp.conf | 0 .../boards/nrf5340dk_nrf5340_cpuapp.conf | 0 .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 0 .../overlay-bt_ll_sw_split.conf | 0 .../prj.conf | 0 .../sample.yaml | 4 +- .../src/main.c | 0 .../sysbuild.cmake | 0 .../CMakeLists.txt | 2 +- .../Kconfig | 0 .../Kconfig.sysbuild | 0 .../README.rst | 12 +- .../boards/nrf52833dk_nrf52833.conf | 0 .../boards/nrf52833dk_nrf52833.overlay | 0 .../boards/nrf52840dongle_nrf52840.conf | 0 .../boards/nrf52840dongle_nrf52840.overlay | 0 .../nrf5340_audio_dk_nrf5340_cpuapp.conf | 0 .../boards/nrf5340dk_nrf5340_cpuapp.conf | 0 .../boards/nrf5340dk_nrf5340_cpuapp.overlay | 0 .../overlay-bt_ll_sw_split.conf | 0 .../prj.conf | 0 .../sample.yaml | 4 +- .../src/main.c | 126 +++++++----------- .../sysbuild.cmake | 0 .../CMakeLists.txt | 2 +- .../Kconfig.sysbuild | 0 .../README.rst | 14 +- .../boards/native_sim.conf | 0 .../boards/nrf52_bsim.conf | 0 .../nrf5340_audio_dk_nrf5340_cpuapp.conf | 0 .../boards/nrf5340bsim_nrf5340_cpuapp.conf | 0 .../boards/nrf5340bsim_nrf5340_cpunet.conf | 0 .../boards/nrf5340dk_nrf5340_cpuapp.conf | 0 .../overlay-bt_ll_sw_split.conf | 0 .../prj.conf | 0 .../sample.yaml | 0 .../src/main.c | 0 .../sysbuild.cmake | 0 .../CMakeLists.txt | 2 +- .../Kconfig.sysbuild | 0 .../README.rst | 14 +- .../boards/native_sim.conf | 0 .../boards/nrf52_bsim.conf | 0 .../nrf5340_audio_dk_nrf5340_cpuapp.conf | 0 .../boards/nrf5340bsim_nrf5340_cpuapp.conf | 0 .../boards/nrf5340bsim_nrf5340_cpunet.conf | 0 .../boards/nrf5340dk_nrf5340_cpuapp.conf | 0 .../overlay-bt_ll_sw_split.conf | 0 .../prj.conf | 0 .../sample.yaml | 0 .../src/main.c | 0 .../sysbuild.cmake | 0 .../CMakeLists.txt | 0 .../Kconfig.sysbuild | 0 .../README.rst | 10 +- .../overlay-bt_ll_sw_split.conf | 0 .../prj.conf | 0 .../sample.yaml | 4 +- .../src/main.c | 0 .../sysbuild.cmake | 0 .../CMakeLists.txt | 2 +- .../Kconfig.sysbuild | 0 .../README.rst | 10 +- .../overlay-bt_ll_sw_split.conf | 0 .../prj.conf | 0 .../sample.yaml | 4 +- .../src/main.c | 0 .../sysbuild.cmake | 0 scripts/footprint/plan.txt | 4 +- .../CMakeLists.txt | 8 +- .../Kconfig | 2 +- .../Kconfig.sysbuild | 2 +- .../audio_samples/bap_broadcast_sink/prj.conf | 2 + .../src/broadcast_sink_test.c} | 5 +- .../src/test_main.c | 0 .../sysbuild.cmake | 2 +- .../tests_scripts/broadcast_audio.sh | 6 +- .../CMakeLists.txt | 4 +- .../Kconfig.sysbuild | 2 +- .../boards/nrf52_bsim.conf | 0 .../boards/nrf5340bsim_nrf5340_cpuapp.conf | 0 .../boards/nrf5340bsim_nrf5340_cpunet.conf | 0 .../prj.conf | 0 .../src/test_main.c | 0 .../src/unicast_client_sample_test.c | 0 .../sysbuild.cmake | 2 +- .../tests_scripts/unicast_client.sh | 4 +- .../broadcast_audio_sink/prj.conf | 2 - tests/bsim/bluetooth/audio_samples/compile.sh | 24 ++-- 106 files changed, 156 insertions(+), 167 deletions(-) rename samples/bluetooth/{public_broadcast_source => bap_broadcast_assistant}/CMakeLists.txt (88%) rename samples/bluetooth/{broadcast_audio_assistant => bap_broadcast_assistant}/Kconfig (100%) rename samples/bluetooth/{broadcast_audio_assistant => bap_broadcast_assistant}/README.rst (89%) rename samples/bluetooth/{broadcast_audio_assistant => bap_broadcast_assistant}/prj.conf (100%) rename samples/bluetooth/{broadcast_audio_assistant => bap_broadcast_assistant}/sample.yaml (85%) rename samples/bluetooth/{broadcast_audio_assistant => bap_broadcast_assistant}/src/main.c (100%) rename samples/bluetooth/{unicast_audio_client => bap_broadcast_sink}/CMakeLists.txt (89%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/Kconfig (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/Kconfig.sysbuild (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/README.rst (86%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/boards/nrf52833dk_nrf52833.conf (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/boards/nrf52833dk_nrf52833.overlay (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/boards/nrf52840dongle_nrf52840.conf (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/boards/nrf52840dongle_nrf52840.overlay (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/boards/nrf5340dk_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/boards/nrf5340dk_nrf5340_cpuapp.overlay (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/overlay-bt_ll_sw_split.conf (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/prj.conf (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/sample.yaml (87%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/src/main.c (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_broadcast_sink}/sysbuild.cmake (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/CMakeLists.txt (89%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/Kconfig (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/Kconfig.sysbuild (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/README.rst (85%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/boards/nrf52833dk_nrf52833.conf (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/boards/nrf52833dk_nrf52833.overlay (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/boards/nrf52840dongle_nrf52840.conf (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/boards/nrf52840dongle_nrf52840.overlay (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/boards/nrf5340dk_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/boards/nrf5340dk_nrf5340_cpuapp.overlay (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/overlay-bt_ll_sw_split.conf (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/prj.conf (100%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/sample.yaml (88%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/src/main.c (84%) rename samples/bluetooth/{broadcast_audio_source => bap_broadcast_source}/sysbuild.cmake (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_client}/CMakeLists.txt (89%) rename samples/bluetooth/{public_broadcast_source => bap_unicast_client}/Kconfig.sysbuild (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/README.rst (84%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/boards/native_sim.conf (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/boards/nrf52_bsim.conf (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/boards/nrf5340bsim_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/boards/nrf5340bsim_nrf5340_cpunet.conf (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/boards/nrf5340dk_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/overlay-bt_ll_sw_split.conf (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/prj.conf (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/sample.yaml (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_client}/src/main.c (100%) rename samples/bluetooth/{public_broadcast_sink => bap_unicast_client}/sysbuild.cmake (100%) rename samples/bluetooth/{broadcast_audio_sink => bap_unicast_server}/CMakeLists.txt (89%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_server}/Kconfig.sysbuild (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/README.rst (84%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/boards/native_sim.conf (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/boards/nrf52_bsim.conf (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/boards/nrf5340bsim_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/boards/nrf5340bsim_nrf5340_cpunet.conf (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/boards/nrf5340dk_nrf5340_cpuapp.conf (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/overlay-bt_ll_sw_split.conf (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/prj.conf (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/sample.yaml (100%) rename samples/bluetooth/{unicast_audio_server => bap_unicast_server}/src/main.c (100%) rename samples/bluetooth/{unicast_audio_client => bap_unicast_server}/sysbuild.cmake (100%) rename samples/bluetooth/{public_broadcast_sink => pbp_public_broadcast_sink}/CMakeLists.txt (100%) rename samples/bluetooth/{public_broadcast_sink => pbp_public_broadcast_sink}/Kconfig.sysbuild (100%) rename samples/bluetooth/{public_broadcast_sink => pbp_public_broadcast_sink}/README.rst (86%) rename samples/bluetooth/{public_broadcast_sink => pbp_public_broadcast_sink}/overlay-bt_ll_sw_split.conf (100%) rename samples/bluetooth/{public_broadcast_sink => pbp_public_broadcast_sink}/prj.conf (100%) rename samples/bluetooth/{public_broadcast_sink => pbp_public_broadcast_sink}/sample.yaml (86%) rename samples/bluetooth/{public_broadcast_sink => pbp_public_broadcast_sink}/src/main.c (100%) rename samples/bluetooth/{unicast_audio_server => pbp_public_broadcast_sink}/sysbuild.cmake (100%) rename samples/bluetooth/{broadcast_audio_assistant => pbp_public_broadcast_source}/CMakeLists.txt (86%) rename samples/bluetooth/{unicast_audio_server => pbp_public_broadcast_source}/Kconfig.sysbuild (100%) rename samples/bluetooth/{public_broadcast_source => pbp_public_broadcast_source}/README.rst (86%) rename samples/bluetooth/{public_broadcast_source => pbp_public_broadcast_source}/overlay-bt_ll_sw_split.conf (100%) rename samples/bluetooth/{public_broadcast_source => pbp_public_broadcast_source}/prj.conf (100%) rename samples/bluetooth/{public_broadcast_source => pbp_public_broadcast_source}/sample.yaml (85%) rename samples/bluetooth/{public_broadcast_source => pbp_public_broadcast_source}/src/main.c (100%) rename samples/bluetooth/{public_broadcast_source => pbp_public_broadcast_source}/sysbuild.cmake (100%) rename tests/bsim/bluetooth/audio_samples/{broadcast_audio_sink => bap_broadcast_sink}/CMakeLists.txt (66%) rename tests/bsim/bluetooth/audio_samples/{broadcast_audio_sink => bap_broadcast_sink}/Kconfig (54%) rename tests/bsim/bluetooth/audio_samples/{broadcast_audio_sink => bap_broadcast_sink}/Kconfig.sysbuild (80%) create mode 100644 tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/prj.conf rename tests/bsim/bluetooth/audio_samples/{broadcast_audio_sink/src/broadcast_audio_sink_test.c => bap_broadcast_sink/src/broadcast_sink_test.c} (97%) rename tests/bsim/bluetooth/audio_samples/{broadcast_audio_sink => bap_broadcast_sink}/src/test_main.c (100%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_broadcast_sink}/sysbuild.cmake (66%) rename tests/bsim/bluetooth/audio_samples/{broadcast_audio_sink => bap_broadcast_sink}/tests_scripts/broadcast_audio.sh (81%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_unicast_client}/CMakeLists.txt (79%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_unicast_client}/Kconfig.sysbuild (80%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_unicast_client}/boards/nrf52_bsim.conf (100%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_unicast_client}/boards/nrf5340bsim_nrf5340_cpuapp.conf (100%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_unicast_client}/boards/nrf5340bsim_nrf5340_cpunet.conf (100%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_unicast_client}/prj.conf (100%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_unicast_client}/src/test_main.c (100%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_unicast_client}/src/unicast_client_sample_test.c (100%) rename tests/bsim/bluetooth/audio_samples/{broadcast_audio_sink => bap_unicast_client}/sysbuild.cmake (66%) rename tests/bsim/bluetooth/audio_samples/{unicast_audio_client => bap_unicast_client}/tests_scripts/unicast_client.sh (84%) delete mode 100644 tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/prj.conf diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index a3b14c60a38..5b53ea79532 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -446,11 +446,10 @@ Bluetooth Audio: - tests/bluetooth/shell/audio.conf - tests/bluetooth/tester/overlay-le-audio.conf - doc/connectivity/bluetooth/api/audio/ - - samples/bluetooth/broadcast_audio*/ + - samples/bluetooth/bap*/ - samples/bluetooth/hap*/ - - samples/bluetooth/public_broadcast*/ + - samples/bluetooth/pbp*/ - samples/bluetooth/tmap*/ - - samples/bluetooth/unicast_audio*/ labels: - "area: Bluetooth Audio" - "area: Bluetooth" diff --git a/doc/_scripts/redirects.py b/doc/_scripts/redirects.py index 91586470fea..aa4bd4fdebf 100644 --- a/doc/_scripts/redirects.py +++ b/doc/_scripts/redirects.py @@ -200,6 +200,13 @@ REDIRECTS = [ ('reference/usermode/syscalls', 'kernel/usermode/syscalls'), ('reference/util/index', 'kernel/util/index'), ('samples/application_development/with_mcuboot/README', 'samples/sysbuild/with_mcuboot/README'), + ('samples/bluetooth/broadcast_audio_assistant/README', 'samples/bluetooth/bap_broadcast_assistant/README'), + ('samples/bluetooth/broadcast_audio_sink/README', 'samples/bluetooth/bap_broadcast_sink/README'), + ('samples/bluetooth/broadcast_audio_source/README', 'samples/bluetooth/bap_broadcast_source/README'), + ('samples/bluetooth/public_broadcast_sink/README', 'samples/bluetooth/pbp_public_broadcast_sink/README'), + ('samples/bluetooth/public_broadcast_source/README', 'samples/bluetooth/pbp_public_broadcast_source/README'), + ('samples/bluetooth/unicast_audio_client/README', 'samples/bluetooth/bap_unicast_client/README'), + ('samples/bluetooth/unicast_audio_server/README', 'samples/bluetooth/bap_unicast_server/README'), ('samples/drivers/adc/README', 'samples/drivers/adc/adc_dt/README'), ('samples/drivers/kscan_touch', 'samples/subsys/input/input'), ('samples/drivers/led_apa102/README', 'samples/drivers/led_strip/README'), diff --git a/doc/releases/release-notes-3.7.rst b/doc/releases/release-notes-3.7.rst index c206accd7fb..61d6afa8b28 100644 --- a/doc/releases/release-notes-3.7.rst +++ b/doc/releases/release-notes-3.7.rst @@ -105,6 +105,14 @@ Bluetooth * Removed ``err`` from :c:struct:`bt_bap_broadcast_assistant_cb.recv_state_removed` as it was redundant. + * The broadcast_audio_assistant sample has been renamed to bap_broadcast_assistant. + The broadcast_audio_sink sample has been renamed to bap_broadcast_sink. + The broadcast_audio_source sample has been renamed to bap_broadcast_source. + The unicast_audio_client sample has been renamed to bap_unicast_client. + The unicast_audio_server sample has been renamed to bap_unicast_server. + The public_broadcast_sink sample has been renamed to pbp_public_broadcast_sink. + The public_broadcast_source sample has been renamed to pbp_public_broadcast_source. + * Host * Added Nordic UART Service (NUS), enabled by the :kconfig:option:`CONFIG_BT_ZEPHYR_NUS`. diff --git a/samples/bluetooth/public_broadcast_source/CMakeLists.txt b/samples/bluetooth/bap_broadcast_assistant/CMakeLists.txt similarity index 88% rename from samples/bluetooth/public_broadcast_source/CMakeLists.txt rename to samples/bluetooth/bap_broadcast_assistant/CMakeLists.txt index 6331703e2d8..2bc27704691 100644 --- a/samples/bluetooth/public_broadcast_source/CMakeLists.txt +++ b/samples/bluetooth/bap_broadcast_assistant/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(public_broadcast_source) +project(bap_broadcast_assistant) target_sources(app PRIVATE src/main.c diff --git a/samples/bluetooth/broadcast_audio_assistant/Kconfig b/samples/bluetooth/bap_broadcast_assistant/Kconfig similarity index 100% rename from samples/bluetooth/broadcast_audio_assistant/Kconfig rename to samples/bluetooth/bap_broadcast_assistant/Kconfig diff --git a/samples/bluetooth/broadcast_audio_assistant/README.rst b/samples/bluetooth/bap_broadcast_assistant/README.rst similarity index 89% rename from samples/bluetooth/broadcast_audio_assistant/README.rst rename to samples/bluetooth/bap_broadcast_assistant/README.rst index e0a7ec5a012..bf472b8a031 100644 --- a/samples/bluetooth/broadcast_audio_assistant/README.rst +++ b/samples/bluetooth/bap_broadcast_assistant/README.rst @@ -1,4 +1,4 @@ -.. zephyr:code-sample:: bluetooth_broadcast_audio_assistant +.. zephyr:code-sample:: bluetooth_bap_broadcast_assistant :name: Bluetooth: Broadcast Audio Assistant :relevant-api: bt_bap @@ -19,7 +19,7 @@ a set of LE Audio Broadcast capable earbuds) and a source (e.g. the Broadcast Au Source sample). This sample can be found under -:zephyr_file:`samples/bluetooth/broadcast_audio_assistant` in the Zephyr tree. +:zephyr_file:`samples/bluetooth/bap_broadcast_assistant` in the Zephyr tree. Check the :ref:`bluetooth samples section ` for general information. @@ -51,6 +51,6 @@ Building for an nrf52840dk -------------------------- .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/broadcast_audio_assistant/ + :zephyr-app: samples/bluetooth/bap_broadcast_assistant/ :board: nrf52840dk/nrf52840 :goals: build diff --git a/samples/bluetooth/broadcast_audio_assistant/prj.conf b/samples/bluetooth/bap_broadcast_assistant/prj.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_assistant/prj.conf rename to samples/bluetooth/bap_broadcast_assistant/prj.conf diff --git a/samples/bluetooth/broadcast_audio_assistant/sample.yaml b/samples/bluetooth/bap_broadcast_assistant/sample.yaml similarity index 85% rename from samples/bluetooth/broadcast_audio_assistant/sample.yaml rename to samples/bluetooth/bap_broadcast_assistant/sample.yaml index cc36702ac4d..771cf6c5cb5 100644 --- a/samples/bluetooth/broadcast_audio_assistant/sample.yaml +++ b/samples/bluetooth/bap_broadcast_assistant/sample.yaml @@ -2,7 +2,7 @@ sample: description: Bluetooth Low Energy Broadcast Assistant sample name: Bluetooth Low Energy Broadcast Assistant sample tests: - sample.bluetooth.broadcast_audio_assistant: + sample.bluetooth.bap_broadcast_assistant: harness: bluetooth platform_allow: - nrf52840dk/nrf52840 diff --git a/samples/bluetooth/broadcast_audio_assistant/src/main.c b/samples/bluetooth/bap_broadcast_assistant/src/main.c similarity index 100% rename from samples/bluetooth/broadcast_audio_assistant/src/main.c rename to samples/bluetooth/bap_broadcast_assistant/src/main.c diff --git a/samples/bluetooth/unicast_audio_client/CMakeLists.txt b/samples/bluetooth/bap_broadcast_sink/CMakeLists.txt similarity index 89% rename from samples/bluetooth/unicast_audio_client/CMakeLists.txt rename to samples/bluetooth/bap_broadcast_sink/CMakeLists.txt index 633ce9502e2..66649d87a33 100644 --- a/samples/bluetooth/unicast_audio_client/CMakeLists.txt +++ b/samples/bluetooth/bap_broadcast_sink/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(unicast_audio_client) +project(bap_unicast_server) target_sources(app PRIVATE src/main.c diff --git a/samples/bluetooth/broadcast_audio_sink/Kconfig b/samples/bluetooth/bap_broadcast_sink/Kconfig similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/Kconfig rename to samples/bluetooth/bap_broadcast_sink/Kconfig diff --git a/samples/bluetooth/broadcast_audio_sink/Kconfig.sysbuild b/samples/bluetooth/bap_broadcast_sink/Kconfig.sysbuild similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/Kconfig.sysbuild rename to samples/bluetooth/bap_broadcast_sink/Kconfig.sysbuild diff --git a/samples/bluetooth/broadcast_audio_sink/README.rst b/samples/bluetooth/bap_broadcast_sink/README.rst similarity index 86% rename from samples/bluetooth/broadcast_audio_sink/README.rst rename to samples/bluetooth/bap_broadcast_sink/README.rst index 5c837c1652c..39ca9a483e7 100644 --- a/samples/bluetooth/broadcast_audio_sink/README.rst +++ b/samples/bluetooth/bap_broadcast_sink/README.rst @@ -1,4 +1,4 @@ -.. zephyr:code-sample:: bluetooth_broadcast_audio_sink +.. zephyr:code-sample:: bluetooth_bap_broadcast_sink :name: Bluetooth: Broadcast Audio Sink :relevant-api: bluetooth @@ -12,7 +12,7 @@ Starts by scanning for LE Audio broadcast sources and then synchronizes to the first found and listens to it until the source is (potentially) stopped. This sample can be found under -:zephyr_file:`samples/bluetooth/broadcast_audio_sink` in the Zephyr tree. +:zephyr_file:`samples/bluetooth/bap_broadcast_sink` in the Zephyr tree. Check the :ref:`bluetooth samples section ` for general information. @@ -40,7 +40,7 @@ You can build both the application core image and an appropriate controller imag core with: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/broadcast_audio_sink/ + :zephyr-app: samples/bluetooth/bap_broadcast_sink/ :board: nrf5340dk/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -48,7 +48,7 @@ core with: If you prefer to only build the application core image, you can do so by doing instead: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/broadcast_audio_sink/ + :zephyr-app: samples/bluetooth/bap_broadcast_sink/ :board: nrf5340dk/nrf5340/cpuapp :goals: build @@ -62,7 +62,7 @@ Building for a simulated nrf5340bsim Similarly to how you would for real HW, you can do: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/broadcast_audio_sink/ + :zephyr-app: samples/bluetooth/bap_broadcast_sink/ :board: nrf5340bsim/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -74,7 +74,7 @@ Building for a simulated nrf52_bsim ----------------------------------- .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/broadcast_audio_sink/ + :zephyr-app: samples/bluetooth/bap_broadcast_sink/ :board: nrf52_bsim :goals: build :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/broadcast_audio_sink/boards/nrf52833dk_nrf52833.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/boards/nrf52833dk_nrf52833.conf rename to samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.conf diff --git a/samples/bluetooth/broadcast_audio_sink/boards/nrf52833dk_nrf52833.overlay b/samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.overlay similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/boards/nrf52833dk_nrf52833.overlay rename to samples/bluetooth/bap_broadcast_sink/boards/nrf52833dk_nrf52833.overlay diff --git a/samples/bluetooth/broadcast_audio_sink/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/boards/nrf52840dongle_nrf52840.conf rename to samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.conf diff --git a/samples/bluetooth/broadcast_audio_sink/boards/nrf52840dongle_nrf52840.overlay b/samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.overlay similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/boards/nrf52840dongle_nrf52840.overlay rename to samples/bluetooth/bap_broadcast_sink/boards/nrf52840dongle_nrf52840.overlay diff --git a/samples/bluetooth/broadcast_audio_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_broadcast_sink/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/broadcast_audio_sink/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/boards/nrf5340dk_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/broadcast_audio_sink/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/boards/nrf5340dk_nrf5340_cpuapp.overlay rename to samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.overlay diff --git a/samples/bluetooth/broadcast_audio_sink/overlay-bt_ll_sw_split.conf b/samples/bluetooth/bap_broadcast_sink/overlay-bt_ll_sw_split.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/overlay-bt_ll_sw_split.conf rename to samples/bluetooth/bap_broadcast_sink/overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/broadcast_audio_sink/prj.conf b/samples/bluetooth/bap_broadcast_sink/prj.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/prj.conf rename to samples/bluetooth/bap_broadcast_sink/prj.conf diff --git a/samples/bluetooth/broadcast_audio_sink/sample.yaml b/samples/bluetooth/bap_broadcast_sink/sample.yaml similarity index 87% rename from samples/bluetooth/broadcast_audio_sink/sample.yaml rename to samples/bluetooth/bap_broadcast_sink/sample.yaml index ef88ecc4bb2..b6360768f0a 100644 --- a/samples/bluetooth/broadcast_audio_sink/sample.yaml +++ b/samples/bluetooth/bap_broadcast_sink/sample.yaml @@ -2,7 +2,7 @@ sample: description: Bluetooth Low Energy Audio Broadcast Sink sample name: Bluetooth Low Energy Audio Broadcast Sink sample tests: - sample.bluetooth.broadcast_audio_sink: + sample.bluetooth.bap_broadcast_sink: harness: bluetooth platform_allow: - qemu_cortex_m3 @@ -14,7 +14,7 @@ tests: - nrf5340dk/nrf5340/cpuapp tags: bluetooth sysbuild: true - sample.bluetooth.broadcast_audio_sink.bt_ll_sw_split: + sample.bluetooth.bap_broadcast_sink.bt_ll_sw_split: harness: bluetooth platform_allow: - nrf52_bsim diff --git a/samples/bluetooth/broadcast_audio_sink/src/main.c b/samples/bluetooth/bap_broadcast_sink/src/main.c similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/src/main.c rename to samples/bluetooth/bap_broadcast_sink/src/main.c diff --git a/samples/bluetooth/broadcast_audio_sink/sysbuild.cmake b/samples/bluetooth/bap_broadcast_sink/sysbuild.cmake similarity index 100% rename from samples/bluetooth/broadcast_audio_sink/sysbuild.cmake rename to samples/bluetooth/bap_broadcast_sink/sysbuild.cmake diff --git a/samples/bluetooth/broadcast_audio_source/CMakeLists.txt b/samples/bluetooth/bap_broadcast_source/CMakeLists.txt similarity index 89% rename from samples/bluetooth/broadcast_audio_source/CMakeLists.txt rename to samples/bluetooth/bap_broadcast_source/CMakeLists.txt index 2b20af75d56..66649d87a33 100644 --- a/samples/bluetooth/broadcast_audio_source/CMakeLists.txt +++ b/samples/bluetooth/bap_broadcast_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(unicast_audio_server) +project(bap_unicast_server) target_sources(app PRIVATE src/main.c diff --git a/samples/bluetooth/broadcast_audio_source/Kconfig b/samples/bluetooth/bap_broadcast_source/Kconfig similarity index 100% rename from samples/bluetooth/broadcast_audio_source/Kconfig rename to samples/bluetooth/bap_broadcast_source/Kconfig diff --git a/samples/bluetooth/broadcast_audio_source/Kconfig.sysbuild b/samples/bluetooth/bap_broadcast_source/Kconfig.sysbuild similarity index 100% rename from samples/bluetooth/broadcast_audio_source/Kconfig.sysbuild rename to samples/bluetooth/bap_broadcast_source/Kconfig.sysbuild diff --git a/samples/bluetooth/broadcast_audio_source/README.rst b/samples/bluetooth/bap_broadcast_source/README.rst similarity index 85% rename from samples/bluetooth/broadcast_audio_source/README.rst rename to samples/bluetooth/bap_broadcast_source/README.rst index 67b576d4046..b4a3ac72265 100644 --- a/samples/bluetooth/broadcast_audio_source/README.rst +++ b/samples/bluetooth/bap_broadcast_source/README.rst @@ -1,4 +1,4 @@ -.. zephyr:code-sample:: bluetooth_broadcast_audio_source +.. zephyr:code-sample:: bluetooth_bap_broadcast_source :name: Bluetooth: Broadcast Audio Source :relevant-api: bluetooth @@ -15,7 +15,7 @@ broadcast audio source endpoint (BASE) and finally the BIGinfo together with The broadcast source will reset every 30 seconds to show the full API. This sample can be found under -:zephyr_file:`samples/bluetooth/broadcast_audio_source` in the Zephyr tree. +:zephyr_file:`samples/bluetooth/bap_broadcast_source` in the Zephyr tree. Check the :ref:`bluetooth samples section ` for general information. @@ -39,7 +39,7 @@ You can build both the application core image and an appropriate controller imag core with: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/broadcast_audio_source/ + :zephyr-app: samples/bluetooth/bap_broadcast_source/ :board: nrf5340dk/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -47,7 +47,7 @@ core with: If you prefer to only build the application core image, you can do so by doing instead: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/broadcast_audio_source/ + :zephyr-app: samples/bluetooth/bap_broadcast_source/ :board: nrf5340dk/nrf5340/cpuapp :goals: build @@ -61,7 +61,7 @@ Building for a simulated nrf5340bsim Similarly to how you would for real HW, you can do: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/broadcast_audio_source/ + :zephyr-app: samples/bluetooth/bap_broadcast_source/ :board: nrf5340bsim/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -73,7 +73,7 @@ Building for a simulated nrf52_bsim ----------------------------------- .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/broadcast_audio_source/ + :zephyr-app: samples/bluetooth/bap_broadcast_source/ :board: nrf52_bsim :goals: build :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf52833dk_nrf52833.conf b/samples/bluetooth/bap_broadcast_source/boards/nrf52833dk_nrf52833.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_source/boards/nrf52833dk_nrf52833.conf rename to samples/bluetooth/bap_broadcast_source/boards/nrf52833dk_nrf52833.conf diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf52833dk_nrf52833.overlay b/samples/bluetooth/bap_broadcast_source/boards/nrf52833dk_nrf52833.overlay similarity index 100% rename from samples/bluetooth/broadcast_audio_source/boards/nrf52833dk_nrf52833.overlay rename to samples/bluetooth/bap_broadcast_source/boards/nrf52833dk_nrf52833.overlay diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/bap_broadcast_source/boards/nrf52840dongle_nrf52840.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_source/boards/nrf52840dongle_nrf52840.conf rename to samples/bluetooth/bap_broadcast_source/boards/nrf52840dongle_nrf52840.conf diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf52840dongle_nrf52840.overlay b/samples/bluetooth/bap_broadcast_source/boards/nrf52840dongle_nrf52840.overlay similarity index 100% rename from samples/bluetooth/broadcast_audio_source/boards/nrf52840dongle_nrf52840.overlay rename to samples/bluetooth/bap_broadcast_source/boards/nrf52840dongle_nrf52840.overlay diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_source/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_source/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_broadcast_source/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_source/boards/nrf5340dk_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_source/boards/nrf5340dk_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_broadcast_source/boards/nrf5340dk_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/broadcast_audio_source/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/bluetooth/bap_broadcast_source/boards/nrf5340dk_nrf5340_cpuapp.overlay similarity index 100% rename from samples/bluetooth/broadcast_audio_source/boards/nrf5340dk_nrf5340_cpuapp.overlay rename to samples/bluetooth/bap_broadcast_source/boards/nrf5340dk_nrf5340_cpuapp.overlay diff --git a/samples/bluetooth/broadcast_audio_source/overlay-bt_ll_sw_split.conf b/samples/bluetooth/bap_broadcast_source/overlay-bt_ll_sw_split.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_source/overlay-bt_ll_sw_split.conf rename to samples/bluetooth/bap_broadcast_source/overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/broadcast_audio_source/prj.conf b/samples/bluetooth/bap_broadcast_source/prj.conf similarity index 100% rename from samples/bluetooth/broadcast_audio_source/prj.conf rename to samples/bluetooth/bap_broadcast_source/prj.conf diff --git a/samples/bluetooth/broadcast_audio_source/sample.yaml b/samples/bluetooth/bap_broadcast_source/sample.yaml similarity index 88% rename from samples/bluetooth/broadcast_audio_source/sample.yaml rename to samples/bluetooth/bap_broadcast_source/sample.yaml index 047323dd3c7..27262103b29 100644 --- a/samples/bluetooth/broadcast_audio_source/sample.yaml +++ b/samples/bluetooth/bap_broadcast_source/sample.yaml @@ -2,7 +2,7 @@ sample: description: Bluetooth Low Energy Broadcast Audio Source sample name: Bluetooth Low Energy Broadcast Audio Source sample tests: - sample.bluetooth.broadcast_audio_source: + sample.bluetooth.bap_broadcast_source: harness: bluetooth platform_allow: - qemu_cortex_m3 @@ -14,7 +14,7 @@ tests: - nrf5340dk/nrf5340/cpuapp tags: bluetooth sysbuild: true - sample.bluetooth.broadcast_audio_source.bt_ll_sw_split: + sample.bluetooth.bap_broadcast_source.bt_ll_sw_split: harness: bluetooth platform_allow: - nrf52_bsim diff --git a/samples/bluetooth/broadcast_audio_source/src/main.c b/samples/bluetooth/bap_broadcast_source/src/main.c similarity index 84% rename from samples/bluetooth/broadcast_audio_source/src/main.c rename to samples/bluetooth/bap_broadcast_source/src/main.c index 322cb7bbb94..fc3befa01d3 100644 --- a/samples/bluetooth/broadcast_audio_source/src/main.c +++ b/samples/bluetooth/bap_broadcast_source/src/main.c @@ -22,14 +22,13 @@ BUILD_ASSERT(strlen(CONFIG_BROADCAST_CODE) <= BT_AUDIO_BROADCAST_CODE_SIZE, * And, for 10 ms ISO interval, can use 90 ms minus 10 ms ==> 80 ms advertising * interval. */ -#define BT_LE_EXT_ADV_CUSTOM \ - BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, 0x0080, 0x0080, NULL) +#define BT_LE_EXT_ADV_CUSTOM BT_LE_ADV_PARAM(BT_LE_ADV_OPT_EXT_ADV, 0x0080, 0x0080, NULL) /* When BROADCAST_ENQUEUE_COUNT > 1 we can enqueue enough buffers to ensure that * the controller is never idle */ #define BROADCAST_ENQUEUE_COUNT 3U -#define TOTAL_BUF_NEEDED (BROADCAST_ENQUEUE_COUNT * CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT) +#define TOTAL_BUF_NEEDED (BROADCAST_ENQUEUE_COUNT * CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT) BUILD_ASSERT(CONFIG_BT_ISO_TX_BUF_COUNT >= TOTAL_BUF_NEEDED, "CONFIG_BT_ISO_TX_BUF_COUNT should be at least " @@ -41,7 +40,7 @@ static struct bt_bap_lc3_preset preset_active = BT_BAP_LC3_BROADCAST_PRESET_16_2 BT_AUDIO_LOCATION_FRONT_LEFT | BT_AUDIO_LOCATION_FRONT_RIGHT, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED); -#define BROADCAST_SAMPLE_RATE 16000 +#define BROADCAST_SAMPLE_RATE 16000 #elif defined(CONFIG_BAP_BROADCAST_24_2_1) @@ -49,14 +48,14 @@ static struct bt_bap_lc3_preset preset_active = BT_BAP_LC3_BROADCAST_PRESET_24_2 BT_AUDIO_LOCATION_FRONT_LEFT | BT_AUDIO_LOCATION_FRONT_RIGHT, BT_AUDIO_CONTEXT_TYPE_UNSPECIFIED); -#define BROADCAST_SAMPLE_RATE 24000 +#define BROADCAST_SAMPLE_RATE 24000 #endif #if defined(CONFIG_BAP_BROADCAST_16_2_1) -#define MAX_SAMPLE_RATE 16000 +#define MAX_SAMPLE_RATE 16000 #elif defined(CONFIG_BAP_BROADCAST_24_2_1) -#define MAX_SAMPLE_RATE 24000 +#define MAX_SAMPLE_RATE 24000 #endif #define MAX_FRAME_DURATION_US 10000 #define MAX_NUM_SAMPLES ((MAX_FRAME_DURATION_US * MAX_SAMPLE_RATE) / USEC_PER_SEC) @@ -70,12 +69,12 @@ static struct bt_bap_lc3_preset preset_active = BT_BAP_LC3_BROADCAST_PRESET_24_2 #include /* USB Audio Data is downsampled from 48kHz to match broadcast preset when receiving data */ -#define USB_SAMPLE_RATE 48000 -#define USB_DOWNSAMPLE_RATE BROADCAST_SAMPLE_RATE -#define USB_FRAME_DURATION_US 1000 -#define USB_NUM_SAMPLES ((USB_FRAME_DURATION_US * USB_DOWNSAMPLE_RATE) / USEC_PER_SEC) -#define USB_BYTES_PER_SAMPLE 2 -#define USB_CHANNELS 2 +#define USB_SAMPLE_RATE 48000 +#define USB_DOWNSAMPLE_RATE BROADCAST_SAMPLE_RATE +#define USB_FRAME_DURATION_US 1000 +#define USB_NUM_SAMPLES ((USB_FRAME_DURATION_US * USB_DOWNSAMPLE_RATE) / USEC_PER_SEC) +#define USB_BYTES_PER_SAMPLE 2 +#define USB_CHANNELS 2 #define RING_BUF_USB_FRAMES 20 #define AUDIO_RING_BUF_BYTES (USB_NUM_SAMPLES * USB_BYTES_PER_SAMPLE * RING_BUF_USB_FRAMES) @@ -84,7 +83,7 @@ static struct bt_bap_lc3_preset preset_active = BT_BAP_LC3_BROADCAST_PRESET_24_2 #include #define AUDIO_VOLUME (INT16_MAX - 3000) /* codec does clipping above INT16_MAX - 3000 */ -#define AUDIO_TONE_FREQUENCY_HZ 400 +#define AUDIO_TONE_FREQUENCY_HZ 400 /** * Use the math lib to generate a sine-wave using 16 bit samples into a buffer. @@ -128,9 +127,7 @@ static struct broadcast_source_stream { } streams[CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT]; static struct bt_bap_broadcast_source *broadcast_source; -NET_BUF_POOL_FIXED_DEFINE(tx_pool, - TOTAL_BUF_NEEDED, - BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU), +NET_BUF_POOL_FIXED_DEFINE(tx_pool, TOTAL_BUF_NEEDED, BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU), CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL); static int16_t send_pcm_data[MAX_NUM_SAMPLES]; @@ -140,7 +137,7 @@ static bool stopping; static K_SEM_DEFINE(sem_started, 0U, ARRAY_SIZE(streams)); static K_SEM_DEFINE(sem_stopped, 0U, ARRAY_SIZE(streams)); -#define BROADCAST_SOURCE_LIFETIME 120U /* seconds */ +#define BROADCAST_SOURCE_LIFETIME 120U /* seconds */ #if defined(CONFIG_LIBLC3) static int freq_hz; @@ -163,8 +160,7 @@ static void send_data(struct broadcast_source_stream *source_stream) buf = net_buf_alloc(&tx_pool, K_FOREVER); if (buf == NULL) { - printk("Could not allocate buffer when sending on %p\n", - stream); + printk("Could not allocate buffer when sending on %p\n", stream); return; } @@ -179,8 +175,8 @@ static void send_data(struct broadcast_source_stream *source_stream) } #if defined(CONFIG_USB_DEVICE_AUDIO) - uint32_t size = ring_buf_get(&source_stream->audio_ring_buf, - (uint8_t *)send_pcm_data, sizeof(send_pcm_data)); + uint32_t size = ring_buf_get(&source_stream->audio_ring_buf, (uint8_t *)send_pcm_data, + sizeof(send_pcm_data)); if (size < sizeof(send_pcm_data)) { const size_t padding_size = sizeof(send_pcm_data) - size; @@ -190,8 +186,8 @@ static void send_data(struct broadcast_source_stream *source_stream) } #endif - ret = lc3_encode(source_stream->lc3_encoder, LC3_PCM_FORMAT_S16, - send_pcm_data, 1, octets_per_frame, lc3_encoded_buffer); + ret = lc3_encode(source_stream->lc3_encoder, LC3_PCM_FORMAT_S16, send_pcm_data, 1, + octets_per_frame, lc3_encoded_buffer); if (ret == -1) { printk("LC3 encoder failed - wrong parameters?: %d", ret); net_buf_unref(buf); @@ -264,8 +260,8 @@ static void init_lc3_thread(void *arg1, void *arg2, void *arg3) /* Create the encoder instance. This shall complete before stream_started() is called. */ for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) { printk("Initializing lc3 encoder for stream %zu\n", i); - streams[i].lc3_encoder = lc3_setup_encoder(frame_duration_us, freq_hz, - 0, &streams[i].lc3_encoder_mem); + streams[i].lc3_encoder = lc3_setup_encoder(frame_duration_us, freq_hz, 0, + &streams[i].lc3_encoder_mem); if (streams[i].lc3_encoder == NULL) { printk("ERROR: Failed to setup LC3 encoder - wrong parameters?\n"); @@ -282,16 +278,14 @@ static void init_lc3_thread(void *arg1, void *arg2, void *arg3) } } -#define LC3_ENCODER_STACK_SIZE 4 * 4096 -#define LC3_ENCODER_PRIORITY 5 +#define LC3_ENCODER_STACK_SIZE 4 * 4096 +#define LC3_ENCODER_PRIORITY 5 -K_THREAD_DEFINE(encoder, LC3_ENCODER_STACK_SIZE, init_lc3_thread, - NULL, NULL, NULL, LC3_ENCODER_PRIORITY, 0, -1); +K_THREAD_DEFINE(encoder, LC3_ENCODER_STACK_SIZE, init_lc3_thread, NULL, NULL, NULL, + LC3_ENCODER_PRIORITY, 0, -1); #if defined(CONFIG_USB_DEVICE_AUDIO) -static void data_received(const struct device *dev, - struct net_buf *buffer, - size_t size) +static void data_received(const struct device *dev, struct net_buf *buffer, size_t size) { static int count; int16_t *pcm; @@ -322,13 +316,13 @@ static void data_received(const struct device *dev, } for (size_t i = 0U; i < MIN(ARRAY_SIZE(streams), 2); i++) { - const uint32_t size_put = ring_buf_put(&(streams[i].audio_ring_buf), - (uint8_t *)(usb_pcm_data[i]), nsamples * USB_BYTES_PER_SAMPLE); + const uint32_t size_put = + ring_buf_put(&(streams[i].audio_ring_buf), (uint8_t *)(usb_pcm_data[i]), + nsamples * USB_BYTES_PER_SAMPLE); if (size_put < nsamples * USB_BYTES_PER_SAMPLE) { - printk("Not enough room for samples in %s buffer: %u < %u, total capacity: %u\n", - i == 0 ? "left" : "right", - size_put, - nsamples * USB_BYTES_PER_SAMPLE, + printk("Not enough room for samples in %s buffer: %u < %u, total capacity: " + "%u\n", + i == 0 ? "left" : "right", size_put, nsamples * USB_BYTES_PER_SAMPLE, ring_buf_capacity_get(&(streams[i].audio_ring_buf))); } } @@ -341,9 +335,7 @@ static void data_received(const struct device *dev, net_buf_unref(buffer); } -static const struct usb_audio_ops ops = { - .data_received_cb = data_received -}; +static const struct usb_audio_ops ops = {.data_received_cb = data_received}; #endif /* defined(CONFIG_USB_DEVICE_AUDIO) */ #endif /* defined(CONFIG_LIBLC3) */ @@ -376,10 +368,7 @@ static void stream_sent_cb(struct bt_bap_stream *stream) } static struct bt_bap_stream_ops stream_ops = { - .started = stream_started_cb, - .stopped = stream_stopped_cb, - .sent = stream_sent_cb -}; + .started = stream_started_cb, .stopped = stream_stopped_cb, .sent = stream_sent_cb}; static int setup_broadcast_source(struct bt_bap_broadcast_source **source) { @@ -390,9 +379,9 @@ static int setup_broadcast_source(struct bt_bap_broadcast_source **source) struct bt_bap_broadcast_source_param create_param = {0}; const size_t streams_per_subgroup = ARRAY_SIZE(stream_params) / ARRAY_SIZE(subgroup_param); uint8_t left[] = {BT_AUDIO_CODEC_DATA(BT_AUDIO_CODEC_CFG_CHAN_ALLOC, - BT_BYTES_LIST_LE32(BT_AUDIO_LOCATION_FRONT_LEFT))}; + BT_BYTES_LIST_LE32(BT_AUDIO_LOCATION_FRONT_LEFT))}; uint8_t right[] = {BT_AUDIO_CODEC_DATA(BT_AUDIO_CODEC_CFG_CHAN_ALLOC, - BT_BYTES_LIST_LE32(BT_AUDIO_LOCATION_FRONT_RIGHT))}; + BT_BYTES_LIST_LE32(BT_AUDIO_LOCATION_FRONT_RIGHT))}; int err; for (size_t i = 0U; i < ARRAY_SIZE(subgroup_param); i++) { @@ -420,8 +409,7 @@ static int setup_broadcast_source(struct bt_bap_broadcast_source **source) } printk("Creating broadcast source with %zu subgroups with %zu streams\n", - ARRAY_SIZE(subgroup_param), - ARRAY_SIZE(subgroup_param) * streams_per_subgroup); + ARRAY_SIZE(subgroup_param), ARRAY_SIZE(subgroup_param) * streams_per_subgroup); err = bt_bap_broadcast_source_create(&create_param, source); if (err != 0) { @@ -465,11 +453,10 @@ int main(void) (void)memset(streams, 0, sizeof(streams)); for (size_t i = 0U; i < ARRAY_SIZE(streams); i++) { - ring_buf_init(&(streams[i].audio_ring_buf), - sizeof(streams[i]._ring_buffer_memory), + ring_buf_init(&(streams[i].audio_ring_buf), sizeof(streams[i]._ring_buffer_memory), streams[i]._ring_buffer_memory); printk("Initialized ring buf %zu: capacity: %u\n", i, - ring_buf_capacity_get(&(streams[i].audio_ring_buf))); + ring_buf_capacity_get(&(streams[i].audio_ring_buf))); } usb_audio_register(hs_dev, &ops); @@ -486,8 +473,7 @@ int main(void) while (true) { /* Broadcast Audio Streaming Endpoint advertising data */ - NET_BUF_SIMPLE_DEFINE(ad_buf, - BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE); + NET_BUF_SIMPLE_DEFINE(ad_buf, BT_UUID_SIZE_16 + BT_AUDIO_BROADCAST_ID_SIZE); NET_BUF_SIMPLE_DEFINE(base_buf, 128); struct bt_data ext_ad[2]; struct bt_data per_ad; @@ -496,16 +482,14 @@ int main(void) /* Create a connectable advertising set */ err = bt_le_ext_adv_create(BT_LE_EXT_ADV_CUSTOM, NULL, &adv); if (err != 0) { - printk("Unable to create extended advertising set: %d\n", - err); + printk("Unable to create extended advertising set: %d\n", err); return 0; } /* Set periodic advertising parameters */ err = bt_le_per_adv_set_param(adv, BT_LE_PER_ADV_DEFAULT); if (err) { - printk("Failed to set periodic advertising parameters" - " (err %d)\n", err); + printk("Failed to set periodic advertising parameters (err %d)\n", err); return 0; } @@ -532,8 +516,7 @@ int main(void) sizeof(CONFIG_BT_DEVICE_NAME) - 1); err = bt_le_ext_adv_set_data(adv, ext_ad, 2, NULL, 0); if (err != 0) { - printk("Failed to set extended advertising data: %d\n", - err); + printk("Failed to set extended advertising data: %d\n", err); return 0; } @@ -549,24 +532,21 @@ int main(void) per_ad.data = base_buf.data; err = bt_le_per_adv_set_data(adv, &per_ad, 1); if (err != 0) { - printk("Failed to set periodic advertising data: %d\n", - err); + printk("Failed to set periodic advertising data: %d\n", err); return 0; } /* Start extended advertising */ err = bt_le_ext_adv_start(adv, BT_LE_EXT_ADV_START_DEFAULT); if (err) { - printk("Failed to start extended advertising: %d\n", - err); + printk("Failed to start extended advertising: %d\n", err); return 0; } /* Enable Periodic Advertising */ err = bt_le_per_adv_start(adv); if (err) { - printk("Failed to enable periodic advertising: %d\n", - err); + printk("Failed to enable periodic advertising: %d\n", err); return 0; } @@ -595,8 +575,7 @@ int main(void) /* Never stop streaming when using USB Audio as input */ k_sleep(K_FOREVER); #endif /* defined(CONFIG_LIBLC3) && defined(CONFIG_USB_DEVICE_AUDIO) */ - printk("Waiting %u seconds before stopped\n", - BROADCAST_SOURCE_LIFETIME); + printk("Waiting %u seconds before stopped\n", BROADCAST_SOURCE_LIFETIME); k_sleep(K_SECONDS(BROADCAST_SOURCE_LIFETIME)); printk("Stopping broadcast source\n"); stopping = true; @@ -624,22 +603,19 @@ int main(void) err = bt_le_per_adv_stop(adv); if (err) { - printk("Failed to stop periodic advertising (err %d)\n", - err); + printk("Failed to stop periodic advertising (err %d)\n", err); return 0; } err = bt_le_ext_adv_stop(adv); if (err) { - printk("Failed to stop extended advertising (err %d)\n", - err); + printk("Failed to stop extended advertising (err %d)\n", err); return 0; } err = bt_le_ext_adv_delete(adv); if (err) { - printk("Failed to delete extended advertising (err %d)\n", - err); + printk("Failed to delete extended advertising (err %d)\n", err); return 0; } } diff --git a/samples/bluetooth/broadcast_audio_source/sysbuild.cmake b/samples/bluetooth/bap_broadcast_source/sysbuild.cmake similarity index 100% rename from samples/bluetooth/broadcast_audio_source/sysbuild.cmake rename to samples/bluetooth/bap_broadcast_source/sysbuild.cmake diff --git a/samples/bluetooth/unicast_audio_server/CMakeLists.txt b/samples/bluetooth/bap_unicast_client/CMakeLists.txt similarity index 89% rename from samples/bluetooth/unicast_audio_server/CMakeLists.txt rename to samples/bluetooth/bap_unicast_client/CMakeLists.txt index 2b20af75d56..4d9f15c0a60 100644 --- a/samples/bluetooth/unicast_audio_server/CMakeLists.txt +++ b/samples/bluetooth/bap_unicast_client/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(unicast_audio_server) +project(bap_unicast_client) target_sources(app PRIVATE src/main.c diff --git a/samples/bluetooth/public_broadcast_source/Kconfig.sysbuild b/samples/bluetooth/bap_unicast_client/Kconfig.sysbuild similarity index 100% rename from samples/bluetooth/public_broadcast_source/Kconfig.sysbuild rename to samples/bluetooth/bap_unicast_client/Kconfig.sysbuild diff --git a/samples/bluetooth/unicast_audio_client/README.rst b/samples/bluetooth/bap_unicast_client/README.rst similarity index 84% rename from samples/bluetooth/unicast_audio_client/README.rst rename to samples/bluetooth/bap_unicast_client/README.rst index 67087dfdfcc..f38cecd8dc2 100644 --- a/samples/bluetooth/unicast_audio_client/README.rst +++ b/samples/bluetooth/bap_unicast_client/README.rst @@ -1,4 +1,4 @@ -.. _bluetooth_unicast_audio_client: +.. _bluetooth_bap_unicast_client: Bluetooth: Unicast Audio Client ############################### @@ -10,7 +10,7 @@ Application demonstrating the LE Audio unicast client functionality. Scans for a connects to a LE Audio unicast server and establishes an audio stream. This sample can be found under -:zephyr_file:`samples/bluetooth/unicast_audio_client` in the Zephyr tree. +:zephyr_file:`samples/bluetooth/bap_unicast_client` in the Zephyr tree. Check the :ref:`bluetooth samples section ` for general information. @@ -31,7 +31,7 @@ Building for an nrf52840dk -------------------------- .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_client/ + :zephyr-app: samples/bluetooth/bap_unicast_client/ :board: nrf52840dk/nrf52840 :goals: build :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf @@ -43,7 +43,7 @@ You can build both the application core image and an appropriate controller imag core with: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_client/ + :zephyr-app: samples/bluetooth/bap_unicast_client/ :board: nrf5340dk/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -51,7 +51,7 @@ core with: If you prefer to only build the application core image, you can do so by doing instead: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_server/ + :zephyr-app: samples/bluetooth/bap_unicast_server/ :board: nrf5340dk/nrf5340/cpuapp :goals: build @@ -65,7 +65,7 @@ Building for a simulated nrf52_bsim Similarly to how you would for real HW, you can do: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_client/ + :zephyr-app: samples/bluetooth/bap_unicast_client/ :board: nrf52_bsim :goals: build :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf @@ -77,7 +77,7 @@ Building for a simulated nrf5340bsim ------------------------------------ .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_client/ + :zephyr-app: samples/bluetooth/bap_unicast_client/ :board: nrf5340bsim/nrf5340/cpuapp :goals: build :west-args: --sysbuild diff --git a/samples/bluetooth/unicast_audio_client/boards/native_sim.conf b/samples/bluetooth/bap_unicast_client/boards/native_sim.conf similarity index 100% rename from samples/bluetooth/unicast_audio_client/boards/native_sim.conf rename to samples/bluetooth/bap_unicast_client/boards/native_sim.conf diff --git a/samples/bluetooth/unicast_audio_client/boards/nrf52_bsim.conf b/samples/bluetooth/bap_unicast_client/boards/nrf52_bsim.conf similarity index 100% rename from samples/bluetooth/unicast_audio_client/boards/nrf52_bsim.conf rename to samples/bluetooth/bap_unicast_client/boards/nrf52_bsim.conf diff --git a/samples/bluetooth/unicast_audio_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/unicast_audio_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_unicast_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/unicast_audio_client/boards/nrf5340bsim_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/unicast_audio_client/boards/nrf5340bsim_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/unicast_audio_client/boards/nrf5340bsim_nrf5340_cpunet.conf b/samples/bluetooth/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpunet.conf similarity index 100% rename from samples/bluetooth/unicast_audio_client/boards/nrf5340bsim_nrf5340_cpunet.conf rename to samples/bluetooth/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpunet.conf diff --git a/samples/bluetooth/unicast_audio_client/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_client/boards/nrf5340dk_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/unicast_audio_client/boards/nrf5340dk_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_unicast_client/boards/nrf5340dk_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/unicast_audio_client/overlay-bt_ll_sw_split.conf b/samples/bluetooth/bap_unicast_client/overlay-bt_ll_sw_split.conf similarity index 100% rename from samples/bluetooth/unicast_audio_client/overlay-bt_ll_sw_split.conf rename to samples/bluetooth/bap_unicast_client/overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/unicast_audio_client/prj.conf b/samples/bluetooth/bap_unicast_client/prj.conf similarity index 100% rename from samples/bluetooth/unicast_audio_client/prj.conf rename to samples/bluetooth/bap_unicast_client/prj.conf diff --git a/samples/bluetooth/unicast_audio_client/sample.yaml b/samples/bluetooth/bap_unicast_client/sample.yaml similarity index 100% rename from samples/bluetooth/unicast_audio_client/sample.yaml rename to samples/bluetooth/bap_unicast_client/sample.yaml diff --git a/samples/bluetooth/unicast_audio_client/src/main.c b/samples/bluetooth/bap_unicast_client/src/main.c similarity index 100% rename from samples/bluetooth/unicast_audio_client/src/main.c rename to samples/bluetooth/bap_unicast_client/src/main.c diff --git a/samples/bluetooth/public_broadcast_sink/sysbuild.cmake b/samples/bluetooth/bap_unicast_client/sysbuild.cmake similarity index 100% rename from samples/bluetooth/public_broadcast_sink/sysbuild.cmake rename to samples/bluetooth/bap_unicast_client/sysbuild.cmake diff --git a/samples/bluetooth/broadcast_audio_sink/CMakeLists.txt b/samples/bluetooth/bap_unicast_server/CMakeLists.txt similarity index 89% rename from samples/bluetooth/broadcast_audio_sink/CMakeLists.txt rename to samples/bluetooth/bap_unicast_server/CMakeLists.txt index 2b20af75d56..66649d87a33 100644 --- a/samples/bluetooth/broadcast_audio_sink/CMakeLists.txt +++ b/samples/bluetooth/bap_unicast_server/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(unicast_audio_server) +project(bap_unicast_server) target_sources(app PRIVATE src/main.c diff --git a/samples/bluetooth/unicast_audio_client/Kconfig.sysbuild b/samples/bluetooth/bap_unicast_server/Kconfig.sysbuild similarity index 100% rename from samples/bluetooth/unicast_audio_client/Kconfig.sysbuild rename to samples/bluetooth/bap_unicast_server/Kconfig.sysbuild diff --git a/samples/bluetooth/unicast_audio_server/README.rst b/samples/bluetooth/bap_unicast_server/README.rst similarity index 84% rename from samples/bluetooth/unicast_audio_server/README.rst rename to samples/bluetooth/bap_unicast_server/README.rst index b3f40dfa820..d7f3b8b2776 100644 --- a/samples/bluetooth/unicast_audio_server/README.rst +++ b/samples/bluetooth/bap_unicast_server/README.rst @@ -1,4 +1,4 @@ -.. _bluetooth_unicast_audio_server: +.. _bluetooth_bap_unicast_server: Bluetooth: Unicast Audio Server ############################### @@ -10,7 +10,7 @@ Application demonstrating the LE Audio unicast server functionality. Starts advertising and awaits connection from a LE Audio unicast client. This sample can be found under -:zephyr_file:`samples/bluetooth/unicast_audio_server` in the Zephyr tree. +:zephyr_file:`samples/bluetooth/bap_unicast_server` in the Zephyr tree. Check the :ref:`bluetooth samples section ` for general information. @@ -31,7 +31,7 @@ Building for an nrf52840dk -------------------------- .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_server/ + :zephyr-app: samples/bluetooth/bap_unicast_server/ :board: nrf52840dk/nrf52840 :goals: build :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf @@ -43,7 +43,7 @@ You can build both the application core image and an appropriate controller imag core with: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_server/ + :zephyr-app: samples/bluetooth/bap_unicast_server/ :board: nrf5340dk/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -51,7 +51,7 @@ core with: If you prefer to only build the application core image, you can do so by doing instead: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_server/ + :zephyr-app: samples/bluetooth/bap_unicast_server/ :board: nrf5340dk/nrf5340/cpuapp :goals: build @@ -65,7 +65,7 @@ Building for a simulated nrf52_bsim Similarly to how you would for real HW, you can do: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_server/ + :zephyr-app: samples/bluetooth/bap_unicast_server/ :board: nrf52_bsim :goals: build :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf @@ -77,7 +77,7 @@ Building for a simulated nrf5340bsim ------------------------------------ .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/unicast_audio_server/ + :zephyr-app: samples/bluetooth/bap_unicast_server/ :board: nrf5340bsim/nrf5340/cpuapp :goals: build :west-args: --sysbuild diff --git a/samples/bluetooth/unicast_audio_server/boards/native_sim.conf b/samples/bluetooth/bap_unicast_server/boards/native_sim.conf similarity index 100% rename from samples/bluetooth/unicast_audio_server/boards/native_sim.conf rename to samples/bluetooth/bap_unicast_server/boards/native_sim.conf diff --git a/samples/bluetooth/unicast_audio_server/boards/nrf52_bsim.conf b/samples/bluetooth/bap_unicast_server/boards/nrf52_bsim.conf similarity index 100% rename from samples/bluetooth/unicast_audio_server/boards/nrf52_bsim.conf rename to samples/bluetooth/bap_unicast_server/boards/nrf52_bsim.conf diff --git a/samples/bluetooth/unicast_audio_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/unicast_audio_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_unicast_server/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/unicast_audio_server/boards/nrf5340bsim_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/unicast_audio_server/boards/nrf5340bsim_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/unicast_audio_server/boards/nrf5340bsim_nrf5340_cpunet.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpunet.conf similarity index 100% rename from samples/bluetooth/unicast_audio_server/boards/nrf5340bsim_nrf5340_cpunet.conf rename to samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpunet.conf diff --git a/samples/bluetooth/unicast_audio_server/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf similarity index 100% rename from samples/bluetooth/unicast_audio_server/boards/nrf5340dk_nrf5340_cpuapp.conf rename to samples/bluetooth/bap_unicast_server/boards/nrf5340dk_nrf5340_cpuapp.conf diff --git a/samples/bluetooth/unicast_audio_server/overlay-bt_ll_sw_split.conf b/samples/bluetooth/bap_unicast_server/overlay-bt_ll_sw_split.conf similarity index 100% rename from samples/bluetooth/unicast_audio_server/overlay-bt_ll_sw_split.conf rename to samples/bluetooth/bap_unicast_server/overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/unicast_audio_server/prj.conf b/samples/bluetooth/bap_unicast_server/prj.conf similarity index 100% rename from samples/bluetooth/unicast_audio_server/prj.conf rename to samples/bluetooth/bap_unicast_server/prj.conf diff --git a/samples/bluetooth/unicast_audio_server/sample.yaml b/samples/bluetooth/bap_unicast_server/sample.yaml similarity index 100% rename from samples/bluetooth/unicast_audio_server/sample.yaml rename to samples/bluetooth/bap_unicast_server/sample.yaml diff --git a/samples/bluetooth/unicast_audio_server/src/main.c b/samples/bluetooth/bap_unicast_server/src/main.c similarity index 100% rename from samples/bluetooth/unicast_audio_server/src/main.c rename to samples/bluetooth/bap_unicast_server/src/main.c diff --git a/samples/bluetooth/unicast_audio_client/sysbuild.cmake b/samples/bluetooth/bap_unicast_server/sysbuild.cmake similarity index 100% rename from samples/bluetooth/unicast_audio_client/sysbuild.cmake rename to samples/bluetooth/bap_unicast_server/sysbuild.cmake diff --git a/samples/bluetooth/public_broadcast_sink/CMakeLists.txt b/samples/bluetooth/pbp_public_broadcast_sink/CMakeLists.txt similarity index 100% rename from samples/bluetooth/public_broadcast_sink/CMakeLists.txt rename to samples/bluetooth/pbp_public_broadcast_sink/CMakeLists.txt diff --git a/samples/bluetooth/public_broadcast_sink/Kconfig.sysbuild b/samples/bluetooth/pbp_public_broadcast_sink/Kconfig.sysbuild similarity index 100% rename from samples/bluetooth/public_broadcast_sink/Kconfig.sysbuild rename to samples/bluetooth/pbp_public_broadcast_sink/Kconfig.sysbuild diff --git a/samples/bluetooth/public_broadcast_sink/README.rst b/samples/bluetooth/pbp_public_broadcast_sink/README.rst similarity index 86% rename from samples/bluetooth/public_broadcast_sink/README.rst rename to samples/bluetooth/pbp_public_broadcast_sink/README.rst index 6be21803d94..4e4ecaaa38d 100644 --- a/samples/bluetooth/public_broadcast_sink/README.rst +++ b/samples/bluetooth/pbp_public_broadcast_sink/README.rst @@ -13,7 +13,7 @@ the first found source which defines a Public Broadcast Announcement including a High Quality Public Broadcast Audio Stream configuration. This sample can be found under -:zephyr_file:`samples/bluetooth/public_broadcast_sink` in the Zephyr tree. +:zephyr_file:`samples/bluetooth/pbp_public_broadcast_sink` in the Zephyr tree. Check the :ref:`bluetooth samples section ` for general information. @@ -37,7 +37,7 @@ You can build both the application core image and an appropriate controller imag core with: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/public_broadcast_sink/ + :zephyr-app: samples/bluetooth/pbp_public_broadcast_sink/ :board: nrf5340dk/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -45,7 +45,7 @@ core with: If you prefer to only build the application core image, you can do so by doing instead: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/public_broadcast_sink/ + :zephyr-app: samples/bluetooth/pbp_public_broadcast_sink/ :board: nrf5340dk/nrf5340/cpuapp :goals: build @@ -59,7 +59,7 @@ Building for a simulated nrf5340bsim Similarly to how you would for real HW, you can do: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/public_broadcast_sink/ + :zephyr-app: samples/bluetooth/pbp_public_broadcast_sink/ :board: nrf5340bsim/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -71,7 +71,7 @@ Building for a simulated nrf52_bsim ----------------------------------- .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/public_broadcast_sink/ + :zephyr-app: samples/bluetooth/pbp_public_broadcast_sink/ :board: nrf52_bsim :goals: build :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/public_broadcast_sink/overlay-bt_ll_sw_split.conf b/samples/bluetooth/pbp_public_broadcast_sink/overlay-bt_ll_sw_split.conf similarity index 100% rename from samples/bluetooth/public_broadcast_sink/overlay-bt_ll_sw_split.conf rename to samples/bluetooth/pbp_public_broadcast_sink/overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/public_broadcast_sink/prj.conf b/samples/bluetooth/pbp_public_broadcast_sink/prj.conf similarity index 100% rename from samples/bluetooth/public_broadcast_sink/prj.conf rename to samples/bluetooth/pbp_public_broadcast_sink/prj.conf diff --git a/samples/bluetooth/public_broadcast_sink/sample.yaml b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml similarity index 86% rename from samples/bluetooth/public_broadcast_sink/sample.yaml rename to samples/bluetooth/pbp_public_broadcast_sink/sample.yaml index cf437a73703..2c4d31fd4b9 100644 --- a/samples/bluetooth/public_broadcast_sink/sample.yaml +++ b/samples/bluetooth/pbp_public_broadcast_sink/sample.yaml @@ -2,7 +2,7 @@ sample: description: Bluetooth Low Energy Audio PBP Broadcast Sink sample name: Bluetooth Low Energy Audio PBP Broadcast Sink sample tests: - sample.bluetooth.public_broadcast_sink: + sample.bluetooth.pbp_public_broadcast_sink: harness: bluetooth platform_allow: - qemu_cortex_m3 @@ -14,7 +14,7 @@ tests: - nrf5340dk/nrf5340/cpuapp tags: bluetooth sysbuild: true - sample.bluetooth.public_broadcast_sink.bt_ll_sw_split: + sample.bluetooth.pbp_public_broadcast_sink.bt_ll_sw_split: harness: bluetooth platform_allow: - nrf52_bsim diff --git a/samples/bluetooth/public_broadcast_sink/src/main.c b/samples/bluetooth/pbp_public_broadcast_sink/src/main.c similarity index 100% rename from samples/bluetooth/public_broadcast_sink/src/main.c rename to samples/bluetooth/pbp_public_broadcast_sink/src/main.c diff --git a/samples/bluetooth/unicast_audio_server/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake similarity index 100% rename from samples/bluetooth/unicast_audio_server/sysbuild.cmake rename to samples/bluetooth/pbp_public_broadcast_sink/sysbuild.cmake diff --git a/samples/bluetooth/broadcast_audio_assistant/CMakeLists.txt b/samples/bluetooth/pbp_public_broadcast_source/CMakeLists.txt similarity index 86% rename from samples/bluetooth/broadcast_audio_assistant/CMakeLists.txt rename to samples/bluetooth/pbp_public_broadcast_source/CMakeLists.txt index 770ad7912f3..7bd57f8e86d 100644 --- a/samples/bluetooth/broadcast_audio_assistant/CMakeLists.txt +++ b/samples/bluetooth/pbp_public_broadcast_source/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(broadcast_audio_assistant) +project(pbp_public_broadcast_source) target_sources(app PRIVATE src/main.c diff --git a/samples/bluetooth/unicast_audio_server/Kconfig.sysbuild b/samples/bluetooth/pbp_public_broadcast_source/Kconfig.sysbuild similarity index 100% rename from samples/bluetooth/unicast_audio_server/Kconfig.sysbuild rename to samples/bluetooth/pbp_public_broadcast_source/Kconfig.sysbuild diff --git a/samples/bluetooth/public_broadcast_source/README.rst b/samples/bluetooth/pbp_public_broadcast_source/README.rst similarity index 86% rename from samples/bluetooth/public_broadcast_source/README.rst rename to samples/bluetooth/pbp_public_broadcast_source/README.rst index 7d7a5852198..80856f43a24 100644 --- a/samples/bluetooth/public_broadcast_source/README.rst +++ b/samples/bluetooth/pbp_public_broadcast_source/README.rst @@ -13,7 +13,7 @@ The advertised broadcast audio stream quality will cycle between high and standa every 15 seconds. This sample can be found under -:zephyr_file:`samples/bluetooth/public_broadcast_source` in the Zephyr tree. +:zephyr_file:`samples/bluetooth/pbp_public_broadcast_source` in the Zephyr tree. Check the :ref:`bluetooth samples section ` for general information. @@ -37,7 +37,7 @@ You can build both the application core image and an appropriate controller imag core with: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/public_broadcast_source/ + :zephyr-app: samples/bluetooth/pbp_public_broadcast_source/ :board: nrf5340dk/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -45,7 +45,7 @@ core with: If you prefer to only build the application core image, you can do so by doing instead: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/public_broadcast_source/ + :zephyr-app: samples/bluetooth/pbp_public_broadcast_source/ :board: nrf5340dk/nrf5340/cpuapp :goals: build @@ -59,7 +59,7 @@ Building for a simulated nrf5340bsim Similarly to how you would for real HW, you can do: .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/public_broadcast_source/ + :zephyr-app: samples/bluetooth/pbp_public_broadcast_source/ :board: nrf5340bsim/nrf5340/cpuapp :goals: build :west-args: --sysbuild @@ -71,7 +71,7 @@ Building for a simulated nrf52_bsim ----------------------------------- .. zephyr-app-commands:: - :zephyr-app: samples/bluetooth/public_broadcast_source/ + :zephyr-app: samples/bluetooth/pbp_public_broadcast_source/ :board: nrf52_bsim :goals: build :gen-args: -DOVERLAY_CONFIG=overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/public_broadcast_source/overlay-bt_ll_sw_split.conf b/samples/bluetooth/pbp_public_broadcast_source/overlay-bt_ll_sw_split.conf similarity index 100% rename from samples/bluetooth/public_broadcast_source/overlay-bt_ll_sw_split.conf rename to samples/bluetooth/pbp_public_broadcast_source/overlay-bt_ll_sw_split.conf diff --git a/samples/bluetooth/public_broadcast_source/prj.conf b/samples/bluetooth/pbp_public_broadcast_source/prj.conf similarity index 100% rename from samples/bluetooth/public_broadcast_source/prj.conf rename to samples/bluetooth/pbp_public_broadcast_source/prj.conf diff --git a/samples/bluetooth/public_broadcast_source/sample.yaml b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml similarity index 85% rename from samples/bluetooth/public_broadcast_source/sample.yaml rename to samples/bluetooth/pbp_public_broadcast_source/sample.yaml index d40c0485557..31809027f29 100644 --- a/samples/bluetooth/public_broadcast_source/sample.yaml +++ b/samples/bluetooth/pbp_public_broadcast_source/sample.yaml @@ -2,7 +2,7 @@ sample: description: Bluetooth Low Energy Public Broadcast Source sample name: Bluetooth Low Energy Public Broadcast Source sample tests: - sample.bluetooth.public_broadcast_source: + sample.bluetooth.pbp_public_broadcast_source: harness: bluetooth platform_allow: - qemu_cortex_m3 @@ -14,7 +14,7 @@ tests: - nrf5340dk/nrf5340/cpuapp tags: bluetooth sysbuild: true - sample.bluetooth.public_broadcast_source.bt_ll_sw_split: + sample.bluetooth.pbp_public_broadcast_source.bt_ll_sw_split: harness: bluetooth platform_allow: - nrf52_bsim diff --git a/samples/bluetooth/public_broadcast_source/src/main.c b/samples/bluetooth/pbp_public_broadcast_source/src/main.c similarity index 100% rename from samples/bluetooth/public_broadcast_source/src/main.c rename to samples/bluetooth/pbp_public_broadcast_source/src/main.c diff --git a/samples/bluetooth/public_broadcast_source/sysbuild.cmake b/samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake similarity index 100% rename from samples/bluetooth/public_broadcast_source/sysbuild.cmake rename to samples/bluetooth/pbp_public_broadcast_source/sysbuild.cmake diff --git a/scripts/footprint/plan.txt b/scripts/footprint/plan.txt index 8e3f5b1b089..bef204c017b 100644 --- a/scripts/footprint/plan.txt +++ b/scripts/footprint/plan.txt @@ -19,8 +19,8 @@ bt_peripheral,default,nrf52840dk/nrf52840,samples/bluetooth/peripheral, bt_central_hr,default,nrf52840dk/nrf52840,samples/bluetooth/central_hr, bt_mesh_demo,default,bbc_microbit,samples/bluetooth/mesh_demo, bt_hap_ha,default,nrf5340dk/nrf5340_cpuapp,samples/bluetooth/hap_ha, -bt_unicast_audio_client,default,nrf5340dk/nrf5340/cpuapp,samples/bluetooth/unicast_audio_client, -bt_unicast_audio_server,default,nrf5340dk/nrf5340/cpuapp,samples/bluetooth/unicast_audio_server, +bt_bap_unicast_client,default,nrf5340dk/nrf5340/cpuapp,samples/bluetooth/bap_unicast_client, +bt_bap_unicast_server,default,nrf5340dk/nrf5340/cpuapp,samples/bluetooth/bap_unicast_server, bt_tmap_central,default,nrf5340dk/nrf5340/cpuapp,samples/bluetooth/tmap_central, bt_tmap_peripheral,default,nrf5340dk/nrf5340/cpuapp,samples/bluetooth/tmap_peripheral, bt_tmap_bms,default,nrf5340dk/nrf5340/cpuapp,samples/bluetooth/tmap_bms, diff --git a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/CMakeLists.txt b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/CMakeLists.txt similarity index 66% rename from tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/CMakeLists.txt rename to tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/CMakeLists.txt index 8a2c3e86803..c30094a9c83 100644 --- a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/CMakeLists.txt +++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/CMakeLists.txt @@ -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 ) diff --git a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/Kconfig similarity index 54% rename from tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig rename to tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/Kconfig index fadad0e4456..040286af18c 100644 --- a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig +++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/Kconfig @@ -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" diff --git a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig.sysbuild b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/Kconfig.sysbuild similarity index 80% rename from tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig.sysbuild rename to tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/Kconfig.sysbuild index ff68acec605..b6f4d0678e8 100644 --- a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/Kconfig.sysbuild +++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/Kconfig.sysbuild @@ -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_broadcast_sink/Kconfig.sysbuild" config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX int diff --git a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/prj.conf b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/prj.conf new file mode 100644 index 00000000000..7d46d272547 --- /dev/null +++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/prj.conf @@ -0,0 +1,2 @@ +# Please build using the sample configuration file: +# ${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/prj.conf diff --git a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/src/broadcast_audio_sink_test.c b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/src/broadcast_sink_test.c similarity index 97% rename from tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/src/broadcast_audio_sink_test.c rename to tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/src/broadcast_sink_test.c index 0f5427e6494..27be2325c5c 100644 --- a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/src/broadcast_audio_sink_test.c +++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/src/broadcast_sink_test.c @@ -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) { diff --git a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/src/test_main.c b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/src/test_main.c similarity index 100% rename from tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/src/test_main.c rename to tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/src/test_main.c diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/sysbuild.cmake b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/sysbuild.cmake similarity index 66% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/sysbuild.cmake rename to tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/sysbuild.cmake index 85b85b7cb63..a80c8988467 100644 --- a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/sysbuild.cmake +++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/sysbuild.cmake @@ -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_broadcast_sink/sysbuild.cmake) native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP}) diff --git a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/tests_scripts/broadcast_audio.sh b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio.sh similarity index 81% rename from tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/tests_scripts/broadcast_audio.sh rename to tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio.sh index 3a0cb45f9d4..bb7230ca53e 100755 --- a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/tests_scripts/broadcast_audio.sh +++ b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/tests_scripts/broadcast_audio.sh @@ -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 $@ diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/CMakeLists.txt b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/CMakeLists.txt similarity index 79% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/CMakeLists.txt rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/CMakeLists.txt index 1afb5029b33..d91b6e05f69 100644 --- a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/CMakeLists.txt +++ b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/CMakeLists.txt @@ -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 diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/Kconfig.sysbuild b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/Kconfig.sysbuild similarity index 80% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/Kconfig.sysbuild rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/Kconfig.sysbuild index 209d7f1cc73..6db98670507 100644 --- a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/Kconfig.sysbuild +++ b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/Kconfig.sysbuild @@ -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_unicast_client/Kconfig.sysbuild" config NATIVE_SIMULATOR_PRIMARY_MCU_INDEX int diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/boards/nrf52_bsim.conf b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf52_bsim.conf similarity index 100% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/boards/nrf52_bsim.conf rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf52_bsim.conf diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf similarity index 100% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/boards/nrf5340bsim_nrf5340_cpuapp.conf rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/boards/nrf5340bsim_nrf5340_cpunet.conf b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpunet.conf similarity index 100% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/boards/nrf5340bsim_nrf5340_cpunet.conf rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpunet.conf diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/prj.conf b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/prj.conf similarity index 100% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/prj.conf rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/prj.conf diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/src/test_main.c b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/test_main.c similarity index 100% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/src/test_main.c rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/test_main.c diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/src/unicast_client_sample_test.c b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c similarity index 100% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/src/unicast_client_sample_test.c rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/src/unicast_client_sample_test.c diff --git a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/sysbuild.cmake b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/sysbuild.cmake similarity index 66% rename from tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/sysbuild.cmake rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/sysbuild.cmake index 2bf2920a476..fd73290975a 100644 --- a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/sysbuild.cmake +++ b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/sysbuild.cmake @@ -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_unicast_client/sysbuild.cmake) native_simulator_set_primary_mcu_index(${DEFAULT_IMAGE} ${NET_APP}) diff --git a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/tests_scripts/unicast_client.sh b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/tests_scripts/unicast_client.sh similarity index 84% rename from tests/bsim/bluetooth/audio_samples/unicast_audio_client/tests_scripts/unicast_client.sh rename to tests/bsim/bluetooth/audio_samples/bap_unicast_client/tests_scripts/unicast_client.sh index 065551b7e85..54415bc6dd3 100755 --- a/tests/bsim/bluetooth/audio_samples/unicast_audio_client/tests_scripts/unicast_client.sh +++ b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/tests_scripts/unicast_client.sh @@ -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 diff --git a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/prj.conf b/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/prj.conf deleted file mode 100644 index 36e53c8cabe..00000000000 --- a/tests/bsim/bluetooth/audio_samples/broadcast_audio_sink/prj.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Please build using the sample configuration file: -# ${ZEPHYR_BASE}/samples/bluetooth/broadcast_audio_sink/prj.conf diff --git a/tests/bsim/bluetooth/audio_samples/compile.sh b/tests/bsim/bluetooth/audio_samples/compile.sh index e12dd326516..ffff8928847 100755 --- a/tests/bsim/bluetooth/audio_samples/compile.sh +++ b/tests/bsim/bluetooth/audio_samples/compile.sh @@ -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