Skip to content

Commit 82ac7d1

Browse files
authored
Merge pull request #3865 from chenyingchun0312/master
Add some config for nrf52832
2 parents d272c9a + 10a9c12 commit 82ac7d1

File tree

2 files changed

+29
-5
lines changed

2 files changed

+29
-5
lines changed

bsp/nrf5x/nrf52832/board/Kconfig

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,15 @@ menu "On-chip Peripheral Drivers"
2626
bool "Enable GPIO"
2727
select RT_USING_PIN
2828
default y
29+
config BSP_USING_SAADC
30+
bool "Enable SAADC"
31+
select RT_USING_ADC
32+
default n
33+
if BSP_USING_SAADC
34+
config NRFX_SAADC_ENABLED
35+
int
36+
default 1
37+
endif
2938
menuconfig BSP_USING_PWM
3039
bool "Enable PWM"
3140
select RT_USING_PWM
@@ -44,19 +53,19 @@ menu "On-chip Peripheral Drivers"
4453
config BSP_USING_PWM0_CH0
4554
int "PWM0 channel 0 pin number set"
4655
range 0 47
47-
default 13
56+
default 17
4857
config BSP_USING_PWM0_CH1
4958
int "PWM0 channel 1 pin number set"
5059
range 0 47
51-
default 14
60+
default 18
5261
config BSP_USING_PWM0_CH2
5362
int "PWM0 channel 2 pin number set"
5463
range 0 47
55-
default 15
64+
default 19
5665
config BSP_USING_PWM0_CH3
5766
int "PWM0 channel 3 pin number set"
5867
range 0 47
59-
default 16
68+
default 20
6069
endif
6170
config BSP_USING_PWM1
6271
bool "Enable PWM1 bus"
@@ -289,6 +298,21 @@ endif
289298
range 0x1000 0x1000
290299
default 0x1000
291300
endmenu
301+
config BSP_USING_WDT
302+
bool "Enable WDT"
303+
select RT_USING_WDT
304+
default n
305+
if BSP_USING_WDT
306+
config NRFX_WDT_ENABLED
307+
int
308+
default 1
309+
config NRFX_WDT0_ENABLED
310+
int
311+
default 1
312+
config NRFX_WDT_CONFIG_NO_IRQ
313+
int
314+
default 1
315+
endif
292316
endmenu
293317

294318
endmenu

bsp/nrf5x/nrf52832/board/sdk_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2903,7 +2903,7 @@
29032903
// <e> NRFX_QSPI_ENABLED - nrfx_qspi - QSPI peripheral driver
29042904
//==========================================================
29052905
#ifndef NRFX_QSPI_ENABLED
2906-
#define NRFX_QSPI_ENABLED 1
2906+
#define NRFX_QSPI_ENABLED 0
29072907
#endif
29082908
// <o> NRFX_QSPI_CONFIG_SCK_DELAY - tSHSL, tWHSL and tSHWL in number of 16 MHz periods (62.5 ns). <0-255>
29092909

0 commit comments

Comments
 (0)