diff options
| author | Konstantin Oblaukhov <oblaukhov.konstantin@gmail.com> | 2018-09-29 18:08:56 +0700 |
|---|---|---|
| committer | Konstantin K. Oblaukhov <oblaukhov.konstantin@gmail.com> | 2018-11-20 09:52:42 +0700 |
| commit | 0e6f501f80d590a7f79b3b4b3f4ec278df57ad40 (patch) | |
| tree | f795d5584ff5aa805fd2a1a81d224076788a4253 /os/hal | |
| parent | f4d6d909898e777efaa2d479095e41cd2045621d (diff) | |
| download | ChibiOS-Contrib-0e6f501f80d590a7f79b3b4b3f4ec278df57ad40.tar.gz ChibiOS-Contrib-0e6f501f80d590a7f79b3b4b3f4ec278df57ad40.tar.bz2 ChibiOS-Contrib-0e6f501f80d590a7f79b3b4b3f4ec278df57ad40.zip | |
Update all NRF5x makefiles and chconf.h.
Add missing halconf_community.h
Diffstat (limited to 'os/hal')
| -rw-r--r-- | os/hal/boards/MICROBIT/board.mk | 4 | ||||
| -rw-r--r-- | os/hal/boards/NRF51-DK/board.mk | 4 | ||||
| -rw-r--r-- | os/hal/boards/NRF52-DK/board.mk | 3 | ||||
| -rw-r--r-- | os/hal/boards/OSHCHIP_V1.0/board.mk | 4 | ||||
| -rw-r--r-- | os/hal/boards/WVSHARE_BLE400/board.mk | 4 | ||||
| -rw-r--r-- | os/hal/ports/NRF5/LLD/GPIOv1/hal_pal_lld.h | 5 |
6 files changed, 24 insertions, 0 deletions
diff --git a/os/hal/boards/MICROBIT/board.mk b/os/hal/boards/MICROBIT/board.mk index 3595b1a..8e26ae6 100644 --- a/os/hal/boards/MICROBIT/board.mk +++ b/os/hal/boards/MICROBIT/board.mk @@ -3,3 +3,7 @@ BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/MICROBIT/board.c # Required include directories BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/MICROBIT + +# Shared variables +ALLCSRC += $(BOARDSRC) +ALLINC += $(BOARDINC) diff --git a/os/hal/boards/NRF51-DK/board.mk b/os/hal/boards/NRF51-DK/board.mk index 631927b..3e3e465 100644 --- a/os/hal/boards/NRF51-DK/board.mk +++ b/os/hal/boards/NRF51-DK/board.mk @@ -9,3 +9,7 @@ JLINK_DEVICE = nrf51422 JLINK_PRE_FLASH = w4 4001e504 1 JLINK_ERASE_ALL = w4 4001e504 2\nw4 4001e50c 1\nsleep 100 JLINK_PIN_RESET = w4 40000544 1 + +# Shared variables +ALLCSRC += $(BOARDSRC) +ALLINC += $(BOARDINC) diff --git a/os/hal/boards/NRF52-DK/board.mk b/os/hal/boards/NRF52-DK/board.mk index 4310291..b296d27 100644 --- a/os/hal/boards/NRF52-DK/board.mk +++ b/os/hal/boards/NRF52-DK/board.mk @@ -10,3 +10,6 @@ JLINK_PRE_FLASH = w4 4001e504 1 #JLINK_ERASE_ALL = w4 4001e504 2\nw4 4001e50c 1\nsleep 100 JLINK_PIN_RESET = w4 40000544 1 +# Shared variables +ALLCSRC += $(BOARDSRC) +ALLINC += $(BOARDINC) diff --git a/os/hal/boards/OSHCHIP_V1.0/board.mk b/os/hal/boards/OSHCHIP_V1.0/board.mk index 08afdbd..de1c59d 100644 --- a/os/hal/boards/OSHCHIP_V1.0/board.mk +++ b/os/hal/boards/OSHCHIP_V1.0/board.mk @@ -3,3 +3,7 @@ BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/OSHCHIP_V1.0/board.c # Required include directories BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/OSHCHIP_V1.0 + +# Shared variables +ALLCSRC += $(BOARDSRC) +ALLINC += $(BOARDINC) diff --git a/os/hal/boards/WVSHARE_BLE400/board.mk b/os/hal/boards/WVSHARE_BLE400/board.mk index ade4201..684efeb 100644 --- a/os/hal/boards/WVSHARE_BLE400/board.mk +++ b/os/hal/boards/WVSHARE_BLE400/board.mk @@ -3,3 +3,7 @@ BOARDSRC = ${CHIBIOS_CONTRIB}/os/hal/boards/WVSHARE_BLE400/board.c # Required include directories BOARDINC = ${CHIBIOS_CONTRIB}/os/hal/boards/WVSHARE_BLE400 + +# Shared variables +ALLCSRC += $(BOARDSRC) +ALLINC += $(BOARDINC) diff --git a/os/hal/ports/NRF5/LLD/GPIOv1/hal_pal_lld.h b/os/hal/ports/NRF5/LLD/GPIOv1/hal_pal_lld.h index 4bb14e2..a005d50 100644 --- a/os/hal/ports/NRF5/LLD/GPIOv1/hal_pal_lld.h +++ b/os/hal/ports/NRF5/LLD/GPIOv1/hal_pal_lld.h @@ -119,6 +119,11 @@ typedef uint32_t ioline_t; */
typedef NRF_GPIO_Type *ioportid_t;
+/**
+ * @brief Type of an pad identifier.
+ */
+typedef uint32_t iopadid_t;
+
/*===========================================================================*/
/* I/O Ports Identifiers. */
/*===========================================================================*/
|