From 5ecb034f665785ad2a3a80979893dec6edd5dc6d Mon Sep 17 00:00:00 2001 From: Hauke Petersen <hauke.petersen@fu-berlin.de> Date: Tue, 16 Feb 2016 08:49:03 +0100 Subject: [PATCH] boards/airfy-beacon: cleaned up LED handling --- boards/airfy-beacon/board.c | 2 +- boards/airfy-beacon/include/board.h | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/boards/airfy-beacon/board.c b/boards/airfy-beacon/board.c index 1e6f86148f..80762f4897 100644 --- a/boards/airfy-beacon/board.c +++ b/boards/airfy-beacon/board.c @@ -24,7 +24,7 @@ void board_init(void) { /* setup led(s) for debugging */ - NRF_GPIO->PIN_CNF[LED_RED_PIN] = GPIO_PIN_CNF_DIR_Output; + NRF_GPIO->DIRSET = LED_RED_MASK; /* initialize the CPU */ cpu_init(); diff --git a/boards/airfy-beacon/include/board.h b/boards/airfy-beacon/include/board.h index 95603988d8..7b194bb152 100644 --- a/boards/airfy-beacon/include/board.h +++ b/boards/airfy-beacon/include/board.h @@ -42,12 +42,18 @@ * @name Macros for controlling the on-board LEDs. * @{ */ -#define LED_RED_PIN 16 - -#define LED_RED_ON (NRF_GPIO->OUTSET = (1 << LED_RED_PIN)) -#define LED_RED_OFF (NRF_GPIO->OUTCLR = (1 << LED_RED_PIN)) -#define LED_RED_TOGGLE (NRF_GPIO->OUT ^= (1 << LED_RED_PIN)) +#define LED_RED_PIN (GPIO_PIN(0, 16)) +#define LED_RED_MASK (1 << 16) +#define LED_RED_ON (NRF_GPIO->OUTSET = LED_RED_MASK) +#define LED_RED_OFF (NRF_GPIO->OUTCLR = LED_RED_MASK) +#define LED_RED_TOGGLE (NRF_GPIO->OUT ^= LED_RED_MASK) +#define LED_GREEN_ON /* not available */ +#define LED_GREEN_OFF /* not available */ +#define LED_GREEN_TOGGLE /* not available */ +#define LED_BLUE_ON /* not available */ +#define LED_BLUE_OFF /* not available */ +#define LED_BLUE_TOGGLE /* not available */ /* @} */ /** -- GitLab