Only enable DEBUG_NRF_USER when NDEBUG is not set

pull/6022/head
Andrew Leech 2018-02-23 14:39:26 +11:00
parent f49070c876
commit 244b7a5c69
3 changed files with 9 additions and 2 deletions

View File

@ -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.

View File

@ -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

View File

@ -3450,8 +3450,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": [