Skip to content

Commit 9aeb497

Browse files
Adam Wojasinskicarlescufi
authored andcommitted
modules: hal_nordic: nrfx_config: Align to updates in nrfx 3.1.0
Align config files to templates introduced with nrfx 3.1.0 release Signed-off-by: Adam Wojasinski <[email protected]>
1 parent 6f201f0 commit 9aeb497

File tree

9 files changed

+76
-32
lines changed

9 files changed

+76
-32
lines changed

modules/hal_nordic/nrfx/nrfx_config_nrf51.h

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,57 @@
280280
#define NRFX_PPI_CONFIG_LOG_LEVEL 3
281281
#endif
282282

283+
/**
284+
* @brief NRFX_PRS_ENABLED
285+
*
286+
* Boolean. Accepted values 0 and 1.
287+
*/
288+
#ifndef NRFX_PRS_ENABLED
289+
#define NRFX_PRS_ENABLED 0
290+
#endif
291+
292+
/**
293+
* @brief NRFX_PRS_CONFIG_LOG_ENABLED
294+
*
295+
* Boolean. Accepted values 0 and 1.
296+
*/
297+
#ifndef NRFX_PRS_CONFIG_LOG_ENABLED
298+
#define NRFX_PRS_CONFIG_LOG_ENABLED 0
299+
#endif
300+
301+
/**
302+
* @brief NRFX_PRS_CONFIG_LOG_LEVEL
303+
*
304+
* Integer value.
305+
* Supported values:
306+
* - Off = 0
307+
* - Error = 1
308+
* - Warning = 2
309+
* - Info = 3
310+
* - Debug = 4
311+
*/
312+
#ifndef NRFX_PRS_CONFIG_LOG_LEVEL
313+
#define NRFX_PRS_CONFIG_LOG_LEVEL 3
314+
#endif
315+
316+
/**
317+
* @brief NRFX_PRS_BOX_0_ENABLED
318+
*
319+
* Boolean. Accepted values 0 and 1.
320+
*/
321+
#ifndef NRFX_PRS_BOX_0_ENABLED
322+
#define NRFX_PRS_BOX_0_ENABLED 0
323+
#endif
324+
325+
/**
326+
* @brief NRFX_PRS_BOX_1_ENABLED
327+
*
328+
* Boolean. Accepted values 0 and 1.
329+
*/
330+
#ifndef NRFX_PRS_BOX_1_ENABLED
331+
#define NRFX_PRS_BOX_1_ENABLED 0
332+
#endif
333+
283334
/**
284335
* @brief NRFX_QDEC_ENABLED
285336
*

modules/hal_nordic/nrfx/nrfx_config_nrf52805.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
*
3636
* Integer value.
3737
* Supported values:
38-
* - RC = 0
39-
* - XTAL = 1
40-
* - Synth = 2
38+
* - RC = 0
39+
* - XTAL = 1
40+
* - Synth = 2
4141
* - External Low Swing = 131073
4242
* - External Full Swing = 196609
4343
*/

modules/hal_nordic/nrfx/nrfx_config_nrf52810.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
*
3636
* Integer value.
3737
* Supported values:
38-
* - RC = 0
39-
* - XTAL = 1
40-
* - Synth = 2
38+
* - RC = 0
39+
* - XTAL = 1
40+
* - Synth = 2
4141
* - External Low Swing = 131073
4242
* - External Full Swing = 196609
4343
*/

modules/hal_nordic/nrfx/nrfx_config_nrf52811.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
*
3636
* Integer value.
3737
* Supported values:
38-
* - RC = 0
39-
* - XTAL = 1
40-
* - Synth = 2
38+
* - RC = 0
39+
* - XTAL = 1
40+
* - Synth = 2
4141
* - External Low Swing = 131073
4242
* - External Full Swing = 196609
4343
*/

modules/hal_nordic/nrfx/nrfx_config_nrf52820.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
*
3636
* Integer value.
3737
* Supported values:
38-
* - RC = 0
39-
* - XTAL = 1
40-
* - Synth = 2
38+
* - RC = 0
39+
* - XTAL = 1
40+
* - Synth = 2
4141
* - External Low Swing = 131073
4242
* - External Full Swing = 196609
4343
*/

modules/hal_nordic/nrfx/nrfx_config_nrf52832.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
*
3636
* Integer value.
3737
* Supported values:
38-
* - RC = 0
39-
* - XTAL = 1
40-
* - Synth = 2
38+
* - RC = 0
39+
* - XTAL = 1
40+
* - Synth = 2
4141
* - External Low Swing = 131073
4242
* - External Full Swing = 196609
4343
*/
@@ -626,14 +626,7 @@
626626
* @brief NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE - EGU instance used by the nRF52 Anomaly 109
627627
* workaround for PWM.
628628
*
629-
* Integer value.
630-
* Supported values:
631-
* - EGU0 = 0
632-
* - EGU1 = 1
633-
* - EGU2 = 2
634-
* - EGU3 = 3
635-
* - EGU4 = 4
636-
* - EGU5 = 5
629+
* Integer value. Minimum: 0 Maximum: 5
637630
*/
638631
#ifndef NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE
639632
#define NRFX_PWM_NRF52_ANOMALY_109_EGU_INSTANCE 5

modules/hal_nordic/nrfx/nrfx_config_nrf52833.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
*
3636
* Integer value.
3737
* Supported values:
38-
* - RC = 0
39-
* - XTAL = 1
40-
* - Synth = 2
38+
* - RC = 0
39+
* - XTAL = 1
40+
* - Synth = 2
4141
* - External Low Swing = 131073
4242
* - External Full Swing = 196609
4343
*/

modules/hal_nordic/nrfx/nrfx_config_nrf52840.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
*
3636
* Integer value.
3737
* Supported values:
38-
* - RC = 0
39-
* - XTAL = 1
40-
* - Synth = 2
38+
* - RC = 0
39+
* - XTAL = 1
40+
* - Synth = 2
4141
* - External Low Swing = 131073
4242
* - External Full Swing = 196609
4343
*/

modules/hal_nordic/nrfx/nrfx_config_nrf91.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
*
110110
* Integer value.
111111
* Supported values:
112-
* - RC = 1
113-
* - XTAL = 2
112+
* - RC = 1
113+
* - XTAL = 2
114114
*/
115115
#ifndef NRFX_CLOCK_CONFIG_LF_SRC
116116
#define NRFX_CLOCK_CONFIG_LF_SRC 2
@@ -278,7 +278,7 @@
278278
* Integer value. Minimum: 0 Maximum: 7
279279
*/
280280
#ifndef NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY
281-
#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY 3
281+
#define NRFX_GPIOTE_DEFAULT_CONFIG_IRQ_PRIORITY NRFX_DEFAULT_IRQ_PRIORITY
282282
#endif
283283

284284
/**

0 commit comments

Comments
 (0)