From cb01d097afb7396ab62938098b06304e549a2a8d Mon Sep 17 00:00:00 2001 From: Pawel Dunaj Date: Mon, 24 Sep 2018 14:27:52 +0200 Subject: [PATCH] ext: hal: nordic: Enable building of NRFX QDEC Allow project to use Nordic's NRFX QDEC driver. This closes issue #9364 Jira:DESK-259 Signed-off-by: Pawel Dunaj --- ext/hal/nordic/CMakeLists.txt | 1 + ext/hal/nordic/Kconfig | 5 ++++- ext/hal/nordic/nrfx_config_nrf51.h | 4 ++-- ext/hal/nordic/nrfx_config_nrf52810.h | 4 ++-- ext/hal/nordic/nrfx_config_nrf52832.h | 4 ++-- ext/hal/nordic/nrfx_config_nrf52840.h | 4 ++-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ext/hal/nordic/CMakeLists.txt b/ext/hal/nordic/CMakeLists.txt index 5b411cf2d09..b3cbb58430e 100644 --- a/ext/hal/nordic/CMakeLists.txt +++ b/ext/hal/nordic/CMakeLists.txt @@ -24,6 +24,7 @@ if(CONFIG_HAS_NRFX) zephyr_sources_ifdef(CONFIG_NRFX_CLOCK nrfx/drivers/src/nrfx_clock.c) zephyr_sources_ifdef(CONFIG_NRFX_NFCT nrfx/drivers/src/nrfx_nfct.c) zephyr_sources_ifdef(CONFIG_NRFX_PWM nrfx/drivers/src/nrfx_pwm.c) + zephyr_sources_ifdef(CONFIG_NRFX_QDEC nrfx/drivers/src/nrfx_qdec.c) zephyr_sources_ifdef(CONFIG_NRFX_RTC nrfx/drivers/src/nrfx_rtc.c) zephyr_sources_ifdef(CONFIG_NRFX_SAADC nrfx/drivers/src/nrfx_saadc.c) zephyr_sources_ifdef(CONFIG_NRFX_SPI nrfx/drivers/src/nrfx_spi.c) diff --git a/ext/hal/nordic/Kconfig b/ext/hal/nordic/Kconfig index 877c3139b16..3f11c514a88 100644 --- a/ext/hal/nordic/Kconfig +++ b/ext/hal/nordic/Kconfig @@ -9,7 +9,7 @@ config HAS_NORDIC_DRIVERS config HAS_NRFX bool - + config NRFX_ADC bool @@ -23,6 +23,9 @@ config NRFX_NFCT config NRFX_PWM bool +config NRFX_QDEC + bool + config NRFX_SAADC bool diff --git a/ext/hal/nordic/nrfx_config_nrf51.h b/ext/hal/nordic/nrfx_config_nrf51.h index dd7b8c35e34..a9a2200b75a 100644 --- a/ext/hal/nordic/nrfx_config_nrf51.h +++ b/ext/hal/nordic/nrfx_config_nrf51.h @@ -551,8 +551,8 @@ // NRFX_QDEC_ENABLED - nrfx_qdec - QDEC peripheral driver //========================================================== -#ifndef NRFX_QDEC_ENABLED -#define NRFX_QDEC_ENABLED 0 +#ifdef CONFIG_NRFX_QDEC +#define NRFX_QDEC_ENABLED 1 #endif // NRFX_QDEC_CONFIG_REPORTPER - Report period diff --git a/ext/hal/nordic/nrfx_config_nrf52810.h b/ext/hal/nordic/nrfx_config_nrf52810.h index f13f5959e7f..6c47c8e09ab 100644 --- a/ext/hal/nordic/nrfx_config_nrf52810.h +++ b/ext/hal/nordic/nrfx_config_nrf52810.h @@ -787,8 +787,8 @@ // NRFX_QDEC_ENABLED - nrfx_qdec - QDEC peripheral driver //========================================================== -#ifndef NRFX_QDEC_ENABLED -#define NRFX_QDEC_ENABLED 0 +#ifdef CONFIG_NRFX_QDEC +#define NRFX_QDEC_ENABLED 1 #endif // NRFX_QDEC_CONFIG_REPORTPER - Report period diff --git a/ext/hal/nordic/nrfx_config_nrf52832.h b/ext/hal/nordic/nrfx_config_nrf52832.h index 9c3881b101c..de99ed3a0f7 100644 --- a/ext/hal/nordic/nrfx_config_nrf52832.h +++ b/ext/hal/nordic/nrfx_config_nrf52832.h @@ -1228,8 +1228,8 @@ // NRFX_QDEC_ENABLED - nrfx_qdec - QDEC peripheral driver //========================================================== -#ifndef NRFX_QDEC_ENABLED -#define NRFX_QDEC_ENABLED 0 +#ifdef CONFIG_NRFX_QDEC +#define NRFX_QDEC_ENABLED 1 #endif // NRFX_QDEC_CONFIG_REPORTPER - Report period diff --git a/ext/hal/nordic/nrfx_config_nrf52840.h b/ext/hal/nordic/nrfx_config_nrf52840.h index bb694f5ff94..8d4c00b065f 100644 --- a/ext/hal/nordic/nrfx_config_nrf52840.h +++ b/ext/hal/nordic/nrfx_config_nrf52840.h @@ -1207,8 +1207,8 @@ // NRFX_QDEC_ENABLED - nrfx_qdec - QDEC peripheral driver //========================================================== -#ifndef NRFX_QDEC_ENABLED -#define NRFX_QDEC_ENABLED 0 +#ifdef CONFIG_NRFX_QDEC +#define NRFX_QDEC_ENABLED 1 #endif // NRFX_QDEC_CONFIG_REPORTPER - Report period