From b56dd91f98fbf78b6fbd042e44be4bd65412408c Mon Sep 17 00:00:00 2001 From: Hauke Petersen Date: Tue, 16 Feb 2016 08:50:20 +0100 Subject: [PATCH] boards/pca10000: cleaned up LED handling --- boards/pca10000/board.c | 4 ++-- boards/pca10000/include/board.h | 28 +++++++++++++++------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/boards/pca10000/board.c b/boards/pca10000/board.c index 62875d180f..be7c3e9602 100644 --- a/boards/pca10000/board.c +++ b/boards/pca10000/board.c @@ -25,8 +25,8 @@ void board_init(void) { /* initialize the boards LEDs: set pins to 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); /* trigger the CPU initialization code */ cpu_init(); } diff --git a/boards/pca10000/include/board.h b/boards/pca10000/include/board.h index d0be5893b2..733c096fdf 100644 --- a/boards/pca10000/include/board.h +++ b/boards/pca10000/include/board.h @@ -43,25 +43,27 @@ extern "C" { * @name LED pin definitions * @{ */ -#define ONBOARD_LED 1 -#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) /** @} */ /**