From 54382e3356ed3453e2b4d7034c6eb58949401a3a Mon Sep 17 00:00:00 2001 From: Ole Odendahl Date: Sun, 18 Dec 2022 21:23:10 +0100 Subject: [PATCH] Removed log level config from board definition. Moved prst lib log level config to application layer with prst lib default fallback behaviour. --- .../nrf-connect/prstlib/boards/arm/bparasite_nrf52833/Kconfig | 4 ---- .../nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig | 4 ---- code/nrf-connect/prstlib/include/prstlib/macros.h | 4 ++++ code/nrf-connect/samples/zigbee/Kconfig | 4 ++++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/Kconfig b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/Kconfig index 05586ab..a0c83d3 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/Kconfig +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52833/Kconfig @@ -7,7 +7,3 @@ config BOARD_ENABLE_DCDC default y endif # BOARD_BPARASITE_NRF52833 - -config PRSTLIB_DEFAULT_LOG_LEVEL - int "Logging level in core prst library." - default 2 \ No newline at end of file diff --git a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig index 45ac075..4ce925f 100644 --- a/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig +++ b/code/nrf-connect/prstlib/boards/arm/bparasite_nrf52840/Kconfig @@ -12,7 +12,3 @@ config BOARD_ENABLE_DCDC_HV default y endif # BOARD_BPARASITE_NRF52840 - -config PRSTLIB_DEFAULT_LOG_LEVEL - int "Logging level in core prst library." - default 2 \ No newline at end of file diff --git a/code/nrf-connect/prstlib/include/prstlib/macros.h b/code/nrf-connect/prstlib/include/prstlib/macros.h index dc3f82f..694d7e6 100644 --- a/code/nrf-connect/prstlib/include/prstlib/macros.h +++ b/code/nrf-connect/prstlib/include/prstlib/macros.h @@ -21,4 +21,8 @@ #define UNUSED_OK(expr) (void)expr; +#ifndef CONFIG_PRSTLIB_DEFAULT_LOG_LEVEL +#define CONFIG_PRSTLIB_DEFAULT_LOG_LEVEL LOG_LEVEL_WRN +#endif + #endif // _PRST_MACROS_H_ \ No newline at end of file diff --git a/code/nrf-connect/samples/zigbee/Kconfig b/code/nrf-connect/samples/zigbee/Kconfig index 2dd871a..f23bfef 100644 --- a/code/nrf-connect/samples/zigbee/Kconfig +++ b/code/nrf-connect/samples/zigbee/Kconfig @@ -8,6 +8,10 @@ config PRST_ZB_PARENT_POLL_INTERVAL_SEC int "Interval for when b-parasite polls its parent for data (in seconds)" default 60 +config PRSTLIB_DEFAULT_LOG_LEVEL + int "Logging level in core prst library. (0: NONE, 2: WARN, 4: DEBUG) See Zephyr logging for more." + default 2 + config PRST_ZB_BUILD_DATE string "Zigbee app init basic date code. Can be used as build revision. (1 byte)" default "20221214"