diff --git a/boards/common/nrf52/Makefile.dep b/boards/common/nrf52/Makefile.dep index b9f6fc79e55878a6e77dab26356150b72af5067b..6f369896e79dc294e8a146a4f6bb982316f4c11c 100644 --- a/boards/common/nrf52/Makefile.dep +++ b/boards/common/nrf52/Makefile.dep @@ -1,3 +1,5 @@ +include $(RIOTCPU)/nrf52/Makefile.dep + ifneq (,$(filter skald,$(USEMODULE))) USEMODULE += nrfble endif diff --git a/boards/common/nrf52/include/cfg_timer_default.h b/boards/common/nrf52/include/cfg_timer_default.h index 43f61d1a6a9837f32d89165f27aba24b4ed4b569..8dd673806f289a211b86bb25f1d4fd2145610d9a 100644 --- a/boards/common/nrf52/include/cfg_timer_default.h +++ b/boards/common/nrf52/include/cfg_timer_default.h @@ -36,10 +36,17 @@ static const timer_conf_t timer_config[] = { .channels = 3, .bitmode = TIMER_BITMODE_BITMODE_32Bit, .irqn = TIMER1_IRQn + }, + { + .dev = NRF_TIMER2, + .channels = 3, + .bitmode = TIMER_BITMODE_BITMODE_08Bit, + .irqn = TIMER2_IRQn } }; #define TIMER_0_ISR isr_timer1 +#define TIMER_1_ISR isr_timer2 #define TIMER_NUMOF (sizeof(timer_config) / sizeof(timer_config[0])) /** @} */ diff --git a/boards/nrf52840dk/Makefile.dep b/boards/nrf52840dk/Makefile.dep index 68628f406a1a5367ae7c1252e6fae6a01d925792..f75b7b047ca5755d92ded1637f5ff55806844627 100644 --- a/boards/nrf52840dk/Makefile.dep +++ b/boards/nrf52840dk/Makefile.dep @@ -1 +1,7 @@ include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.dep + +ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE))) + ifeq (,$(filter nrfmin,$(USEMODULE))) + USEMODULE += nrf802154 + endif +endif diff --git a/boards/nrf52840dk/Makefile.features b/boards/nrf52840dk/Makefile.features index b99cfa472a13eaf6b79ba38718a4f2fea3563259..4ab48c7cbc2ee092b5a24e524e994f601dbf4736 100644 --- a/boards/nrf52840dk/Makefile.features +++ b/boards/nrf52840dk/Makefile.features @@ -1 +1,5 @@ include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.features + +# Various other features (if any) +FEATURES_PROVIDED += radio_nrf802154 +FEATURES_PROVIDED += periph_pwm