ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only enable DEBUG_NRF_USER when NDEBUG is not set

pull/7228/head
Andrew Leech 2018-02-23 14:39:26 +11:00 committed by adbridge
parent 2615631a4b
commit 5759e17a85
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_11/libraries/util/nrf_assert.h
View File

@ -52,6 +52,10 @@
extern "C" { extern "C" {
#endif #endif
#if !defined(NDEBUG) && !defined(DEBUG_NRF_USER)
#define DEBUG_NRF_USER
#endif
#if defined(DEBUG_NRF) || defined(DEBUG_NRF_USER) #if defined(DEBUG_NRF) || defined(DEBUG_NRF_USER)
/** @brief Function for handling assertions. /** @brief Function for handling assertions.

4
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/libraries/util/nrf_assert.h
View File

@ -76,6 +76,10 @@ extern "C" {
void assert_nrf_callback(uint16_t line_num, const uint8_t *file_name); void assert_nrf_callback(uint16_t line_num, const uint8_t *file_name);
//lint -restore //lint -restore
#if !defined(NDEBUG) && !defined(DEBUG_NRF_USER)
#define DEBUG_NRF_USER
#endif
#if (defined(DEBUG_NRF) || defined(DEBUG_NRF_USER)) #if (defined(DEBUG_NRF) || defined(DEBUG_NRF_USER))
#define NRF_ASSERT_PRESENT 1 #define NRF_ASSERT_PRESENT 1
#else #else

3
targets/targets.json
View File

@ -3524,8 +3524,7 @@
"CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL",
"CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\"",
"NO_SYSTICK", "NO_SYSTICK",
"MBED_TICKLESS", "MBED_TICKLESS"
"DEBUG_NRF_USER"
], ],
"MERGE_BOOTLOADER": false, "MERGE_BOOTLOADER": false,
"extra_labels": [ "extra_labels": [