diff --git a/scripts/ci/check_compliance.py b/scripts/ci/check_compliance.py index a4582a7a48b..bc65892c85a 100755 --- a/scripts/ci/check_compliance.py +++ b/scripts/ci/check_compliance.py @@ -604,6 +604,8 @@ flagged. "BOOT_UPGRADE_ONLY", # Used in example adjusting MCUboot config, but # symbol is defined in MCUboot itself. "BOOT_SERIAL_IMG_GRP_HASH", # Used in documentation + "BTTESTER_LOG_LEVEL", # Used in tests/bluetooth/tester + "BTTESTER_LOG_LEVEL_DBG", # Used in tests/bluetooth/tester "CDC_ACM_PORT_NAME_", "CLOCK_STM32_SYSCLK_SRC_", "CMU", diff --git a/tests/bluetooth/tester/Kconfig b/tests/bluetooth/tester/Kconfig new file mode 100644 index 00000000000..5768a740441 --- /dev/null +++ b/tests/bluetooth/tester/Kconfig @@ -0,0 +1,14 @@ +# Config options for tester app + +# Copyright (c) 2023 Codecoup +# SPDX-License-Identifier: Apache-2.0 + +menu "Bttester configuration" + +module = BTTESTER +module-str = bttester +source "subsys/logging/Kconfig.template.log_config" + +endmenu + +source "Kconfig.zephyr" diff --git a/tests/bluetooth/tester/boards/nrf52840dk_nrf52840.conf b/tests/bluetooth/tester/boards/nrf52840dk_nrf52840.conf index 6a3275c344b..22321dfddd4 100644 --- a/tests/bluetooth/tester/boards/nrf52840dk_nrf52840.conf +++ b/tests/bluetooth/tester/boards/nrf52840dk_nrf52840.conf @@ -18,5 +18,6 @@ CONFIG_LOG_BACKEND_SHOW_COLOR=n CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024 CONFIG_LOG_DEFAULT_LEVEL=3 +CONFIG_BTTESTER_LOG_LEVEL_DBG=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/tests/bluetooth/tester/boards/nrf5340dk_nrf5340_cpuapp.conf b/tests/bluetooth/tester/boards/nrf5340dk_nrf5340_cpuapp.conf index 6a3275c344b..22321dfddd4 100644 --- a/tests/bluetooth/tester/boards/nrf5340dk_nrf5340_cpuapp.conf +++ b/tests/bluetooth/tester/boards/nrf5340dk_nrf5340_cpuapp.conf @@ -18,5 +18,6 @@ CONFIG_LOG_BACKEND_SHOW_COLOR=n CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024 CONFIG_LOG_DEFAULT_LEVEL=3 +CONFIG_BTTESTER_LOG_LEVEL_DBG=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/tests/bluetooth/tester/src/btp.c b/tests/bluetooth/tester/src/btp.c index eab5ed283d8..813f4ffa3ad 100644 --- a/tests/bluetooth/tester/src/btp.c +++ b/tests/bluetooth/tester/src/btp.c @@ -20,7 +20,7 @@ #include #define LOG_MODULE_NAME bttester -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); #include "btp/btp.h" diff --git a/tests/bluetooth/tester/src/btp_bap.c b/tests/bluetooth/tester/src/btp_bap.c index 73ab3679435..28868b50b93 100644 --- a/tests/bluetooth/tester/src/btp_bap.c +++ b/tests/bluetooth/tester/src/btp_bap.c @@ -21,7 +21,7 @@ #include #include #define LOG_MODULE_NAME bttester_bap -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); #include "btp/btp.h" #define DEFAULT_CONTEXT BT_AUDIO_CONTEXT_TYPE_CONVERSATIONAL | BT_AUDIO_CONTEXT_TYPE_MEDIA diff --git a/tests/bluetooth/tester/src/btp_core.c b/tests/bluetooth/tester/src/btp_core.c index 8656d105493..5076d7c4a1b 100644 --- a/tests/bluetooth/tester/src/btp_core.c +++ b/tests/bluetooth/tester/src/btp_core.c @@ -24,7 +24,7 @@ #include #define LOG_MODULE_NAME bttester_core -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); #include "btp/btp.h" diff --git a/tests/bluetooth/tester/src/btp_gap.c b/tests/bluetooth/tester/src/btp_gap.c index e7a3973b05f..3fc01e371f6 100644 --- a/tests/bluetooth/tester/src/btp_gap.c +++ b/tests/bluetooth/tester/src/btp_gap.c @@ -23,7 +23,7 @@ #include #define LOG_MODULE_NAME bttester_gap -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); #include "btp/btp.h" diff --git a/tests/bluetooth/tester/src/btp_gatt.c b/tests/bluetooth/tester/src/btp_gatt.c index 42a22ec4dcc..aa8367b6fb9 100644 --- a/tests/bluetooth/tester/src/btp_gatt.c +++ b/tests/bluetooth/tester/src/btp_gatt.c @@ -25,7 +25,7 @@ #include #define LOG_MODULE_NAME bttester_gatt -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); #include "btp/btp.h" diff --git a/tests/bluetooth/tester/src/btp_ias.c b/tests/bluetooth/tester/src/btp_ias.c index bf07fe04b21..d8750948858 100644 --- a/tests/bluetooth/tester/src/btp_ias.c +++ b/tests/bluetooth/tester/src/btp_ias.c @@ -13,7 +13,7 @@ #include #define LOG_MODULE_NAME bttester_ias -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); static bool initialized; diff --git a/tests/bluetooth/tester/src/btp_l2cap.c b/tests/bluetooth/tester/src/btp_l2cap.c index 61953b2c95e..c93afe08400 100644 --- a/tests/bluetooth/tester/src/btp_l2cap.c +++ b/tests/bluetooth/tester/src/btp_l2cap.c @@ -15,7 +15,7 @@ #include #define LOG_MODULE_NAME bttester_l2cap -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); #include "btp/btp.h" diff --git a/tests/bluetooth/tester/src/btp_mesh.c b/tests/bluetooth/tester/src/btp_mesh.c index 5571cfd2156..9af4867a84a 100644 --- a/tests/bluetooth/tester/src/btp_mesh.c +++ b/tests/bluetooth/tester/src/btp_mesh.c @@ -16,7 +16,7 @@ #include #define LOG_MODULE_NAME bttester_mesh -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); #include "btp/btp.h" diff --git a/tests/bluetooth/tester/src/btp_vcp.c b/tests/bluetooth/tester/src/btp_vcp.c index dc1aaf03a40..70cdecf7eb0 100644 --- a/tests/bluetooth/tester/src/btp_vcp.c +++ b/tests/bluetooth/tester/src/btp_vcp.c @@ -19,7 +19,7 @@ #include #define LOG_MODULE_NAME bttester_vcp -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); #include "btp/btp.h" diff --git a/tests/bluetooth/tester/src/main.c b/tests/bluetooth/tester/src/main.c index 679bca1e14e..3aba47f85b8 100644 --- a/tests/bluetooth/tester/src/main.c +++ b/tests/bluetooth/tester/src/main.c @@ -12,7 +12,7 @@ #include #define LOG_MODULE_NAME bttester_main -LOG_MODULE_REGISTER(LOG_MODULE_NAME); +LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_BTTESTER_LOG_LEVEL); #include "btp/btp.h"