diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.h index 8ef5a5d501..292c398017 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.h @@ -52,6 +52,10 @@ extern "C" { #endif +#if !defined(NDEBUG) && !defined(DEBUG_NRF_USER) +#define DEBUG_NRF_USER +#endif + #if defined(DEBUG_NRF) || defined(DEBUG_NRF_USER) /** @brief Function for handling assertions. diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/util/nrf_assert.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/util/nrf_assert.h index 2ec647c87b..67c945aa1c 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/util/nrf_assert.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/util/nrf_assert.h @@ -76,6 +76,10 @@ extern "C" { void assert_nrf_callback(uint16_t line_num, const uint8_t *file_name); //lint -restore +#if !defined(NDEBUG) && !defined(DEBUG_NRF_USER) +#define DEBUG_NRF_USER +#endif + #if (defined(DEBUG_NRF) || defined(DEBUG_NRF_USER)) #define NRF_ASSERT_PRESENT 1 #else diff --git a/targets/targets.json b/targets/targets.json index 619fd42df2..0025d90d9c 100755 --- a/targets/targets.json +++ b/targets/targets.json @@ -3524,8 +3524,7 @@ "CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"", "NO_SYSTICK", - "MBED_TICKLESS", - "DEBUG_NRF_USER" + "MBED_TICKLESS" ], "MERGE_BOOTLOADER": false, "extra_labels": [