From 10d68c4855b9c29b22b238aa1626f0da8ef21fec Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Tue, 16 Feb 2016 08:49:21 +0100
Subject: [PATCH] boards/nrf51dongle: cleaned up LED handling
---
boards/nrf51dongle/board.c | 4 ++--
boards/nrf51dongle/include/board.h | 27 +++++++++++++++------------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/boards/nrf51dongle/board.c b/boards/nrf51dongle/board.c
index 7e00e24d6e..a6660078be 100644
--- a/boards/nrf51dongle/board.c
+++ b/boards/nrf51dongle/board.c
@@ -24,8 +24,8 @@
void board_init(void)
{
/* initialize the boards LEDs, set pins as output and turn LEDs off */
- NRF_GPIO->DIRSET = (LED_RED_PIN | LED_GREEN_PIN | LED_BLUE_PIN);
- NRF_GPIO->OUTSET = (LED_RED_PIN | LED_GREEN_PIN | LED_BLUE_PIN);
+ NRF_GPIO->DIRSET = (LED_RED_MASK | LED_GREEN_MASK | LED_BLUE_MASK);
+ NRF_GPIO->OUTSET = (LED_RED_MASK | LED_GREEN_MASK | LED_BLUE_MASK);
/* initialize the CPU */
cpu_init();
}
diff --git a/boards/nrf51dongle/include/board.h b/boards/nrf51dongle/include/board.h
index 9f1ce05921..9dbb744072 100644
--- a/boards/nrf51dongle/include/board.h
+++ b/boards/nrf51dongle/include/board.h
@@ -32,24 +32,27 @@ extern "C" {
* @name LED pin definitions
* @{
*/
-#define LED_RED_PIN (1 << 21)
-#define LED_GREEN_PIN (1 << 22)
-#define LED_BLUE_PIN (1 << 23)
+#define LED_RED_PIN (GPIO_PIN(0, 21))
+#define LED_GREEN_PIN (GPIO_PIN(0, 22))
+#define LED_BLUE_PIN (GPIO_PIN(0, 23))
+#define LED_RED_MASK (1 << 21)
+#define LED_GREEN_MASK (1 << 22)
+#define LED_BLUE_MASK (1 << 23)
/** @} */
/**
* @name Macros for controlling the on-board LEDs
* @{
*/
-#define LED_RED_ON (NRF_GPIO->OUTCLR = LED_RED_PIN)
-#define LED_RED_OFF (NRF_GPIO->OUTSET = LED_RED_PIN)
-#define LED_RED_TOGGLE (NRF_GPIO->OUT ^= LED_RED_PIN)
-#define LED_GREEN_ON (NRF_GPIO->OUTCLR = LED_GREEN_PIN)
-#define LED_GREEN_OFF (NRF_GPIO->OUTSET = LED_GREEN_PIN)
-#define LED_GREEN_TOGGLE (NRF_GPIO->OUT ^= LED_GREEN_PIN)
-#define LED_BLUE_ON (NRF_GPIO->OUTCLR = LED_BLUE_PIN)
-#define LED_BLUE_OFF (NRF_GPIO->OUTSET = LED_BLUE_PIN)
-#define LED_BLUE_TOGGLE (NRF_GPIO->OUT ^= LED_BLUE_PIN)
+#define LED_RED_ON (NRF_GPIO->OUTCLR = LED_RED_MASK)
+#define LED_RED_OFF (NRF_GPIO->OUTSET = LED_RED_MASK)
+#define LED_RED_TOGGLE (NRF_GPIO->OUT ^= LED_RED_MASK)
+#define LED_GREEN_ON (NRF_GPIO->OUTCLR = LED_GREEN_MASK)
+#define LED_GREEN_OFF (NRF_GPIO->OUTSET = LED_GREEN_MASK)
+#define LED_GREEN_TOGGLE (NRF_GPIO->OUT ^= LED_GREEN_MASK)
+#define LED_BLUE_ON (NRF_GPIO->OUTCLR = LED_BLUE_MASK)
+#define LED_BLUE_OFF (NRF_GPIO->OUTSET = LED_BLUE_MASK)
+#define LED_BLUE_TOGGLE (NRF_GPIO->OUT ^= LED_BLUE_MASK)
/** @} */
/**
--
GitLab