aboutsummaryrefslogtreecommitdiffstats
path: root/testhal/NRF51/NRF51822/ADC
diff options
context:
space:
mode:
Diffstat (limited to 'testhal/NRF51/NRF51822/ADC')
-rw-r--r--testhal/NRF51/NRF51822/ADC/Makefile6
-rw-r--r--testhal/NRF51/NRF51822/ADC/chconf.h1
-rw-r--r--testhal/NRF51/NRF51822/ADC/mcuconf.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/testhal/NRF51/NRF51822/ADC/Makefile b/testhal/NRF51/NRF51822/ADC/Makefile
index 69d6e90..9024eb1 100644
--- a/testhal/NRF51/NRF51822/ADC/Makefile
+++ b/testhal/NRF51/NRF51822/ADC/Makefile
@@ -87,7 +87,7 @@ CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib
include $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_nrf51.mk
# HAL-OSAL files (optional).
include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS_CONTRIB)/os/hal/ports/NRF51/NRF51822/platform.mk
+include $(CHIBIOS_CONTRIB)/os/hal/ports/NRF5/NRF51822/platform.mk
include $(CHIBIOS_CONTRIB)/os/hal/boards/WVSHARE_BLE400/board.mk
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
# RTOS files (optional).
@@ -136,11 +136,11 @@ TCSRC =
TCPPSRC =
# List ASM source files here
-ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
+ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
- $(CHIBIOS)/os/various
+ $(CHIBIOS)/os/various $(CHIBIOS)/os/license
#
# Project, sources and paths
diff --git a/testhal/NRF51/NRF51822/ADC/chconf.h b/testhal/NRF51/NRF51822/ADC/chconf.h
index 71b3bb4..790132e 100644
--- a/testhal/NRF51/NRF51822/ADC/chconf.h
+++ b/testhal/NRF51/NRF51822/ADC/chconf.h
@@ -29,6 +29,7 @@
#define _CHCONF_H_
#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_5_0_
/*===========================================================================*/
/**
diff --git a/testhal/NRF51/NRF51822/ADC/mcuconf.h b/testhal/NRF51/NRF51822/ADC/mcuconf.h
index 123261a..e43ff4b 100644
--- a/testhal/NRF51/NRF51822/ADC/mcuconf.h
+++ b/testhal/NRF51/NRF51822/ADC/mcuconf.h
@@ -20,6 +20,6 @@
/*
* NRF51 driver system settings.
*/
-#define NRF51_ADC_USE_ADC1 TRUE
+#define NRF5_ADC_USE_ADC1 TRUE
#endif /* _MCUCONF_H_ */