summaryrefslogtreecommitdiff
path: root/bsp
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2020-12-03 08:01:30 +0800
committerGitHub <[email protected]>2020-12-03 08:01:30 +0800
commit3c361e6eadbf2405d2fc07d3c1b77ef5d840836d (patch)
tree160a1cf0cac87cb2e35822319d8625af061a8b7c /bsp
parent08c723670a40348c2f0b78fcb09045cc8649963a (diff)
parente4964f6692cfaea84b1bae425211151541ec3fa8 (diff)
Merge pull request #4101 from guohp1128/master
#define ADC_NAME adc updated to header file.
Diffstat (limited to 'bsp')
-rw-r--r--bsp/nrf5x/libraries/drivers/drv_adc.c2
-rw-r--r--bsp/nrf5x/libraries/drivers/drv_adc.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/bsp/nrf5x/libraries/drivers/drv_adc.c b/bsp/nrf5x/libraries/drivers/drv_adc.c
index 1f02fdddd6..8b136a3598 100644
--- a/bsp/nrf5x/libraries/drivers/drv_adc.c
+++ b/bsp/nrf5x/libraries/drivers/drv_adc.c
@@ -12,8 +12,6 @@
#ifdef RT_USING_ADC
-#define ADC_NAME "adc"
-
struct rt_adc_device nrf5x_adc_device;
drv_nrfx_saadc_result_t results;
diff --git a/bsp/nrf5x/libraries/drivers/drv_adc.h b/bsp/nrf5x/libraries/drivers/drv_adc.h
index 908ac87489..b65a981982 100644
--- a/bsp/nrf5x/libraries/drivers/drv_adc.h
+++ b/bsp/nrf5x/libraries/drivers/drv_adc.h
@@ -16,6 +16,8 @@
#include <hal/nrf_saadc.h>
#include <drivers/include/nrfx_saadc.h>
+#define ADC_NAME "adc"
+
/*
previous definition in application