riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boards/pca10000: cleaned up LED handling

Browse Source
This commit is contained in:
Hauke Petersen 2016-02-16 08:50:20 +01:00
parent bda005e1d3
commit b56dd91f98
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boards/pca10000/board.c
View File

@ -25,8 +25,8 @@
void board_init(void) void board_init(void)
{ {
/* initialize the boards LEDs: set pins to output and turn LEDs off */ /* 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->DIRSET = (LED_RED_MASK | LED_GREEN_MASK | LED_BLUE_MASK);
NRF_GPIO->OUTSET = (LED_RED_PIN | LED_GREEN_PIN | LED_BLUE_PIN); NRF_GPIO->OUTSET = (LED_RED_MASK | LED_GREEN_MASK | LED_BLUE_MASK);
/* trigger the CPU initialization code */ /* trigger the CPU initialization code */
cpu_init(); cpu_init();
} }

28
boards/pca10000/include/board.h
View File

@ -43,25 +43,27 @@ extern "C" {
* @name LED pin definitions * @name LED pin definitions
* @{ * @{
*/ */
#define ONBOARD_LED 1 #define LED_RED_PIN (GPIO_PIN(0, 21))
#define LED_RED_PIN (1 << 21) #define LED_GREEN_PIN (GPIO_PIN(0, 22))
#define LED_GREEN_PIN (1 << 22) #define LED_BLUE_PIN (GPIO_PIN(0, 23))
#define LED_BLUE_PIN (1 << 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. * @name Macros for controlling the on-board LEDs.
* @{ * @{
*/ */
#define LED_RED_ON (NRF_GPIO->OUTCLR = LED_RED_PIN) #define LED_RED_ON (NRF_GPIO->OUTCLR = LED_RED_MASK)
#define LED_RED_OFF (NRF_GPIO->OUTSET = LED_RED_PIN) #define LED_RED_OFF (NRF_GPIO->OUTSET = LED_RED_MASK)
#define LED_RED_TOGGLE (NRF_GPIO->OUT ^= LED_RED_PIN) #define LED_RED_TOGGLE (NRF_GPIO->OUT ^= LED_RED_MASK)
#define LED_GREEN_ON (NRF_GPIO->OUTCLR = LED_GREEN_PIN) #define LED_GREEN_ON (NRF_GPIO->OUTCLR = LED_GREEN_MASK)
#define LED_GREEN_OFF (NRF_GPIO->OUTSET = LED_GREEN_PIN) #define LED_GREEN_OFF (NRF_GPIO->OUTSET = LED_GREEN_MASK)
#define LED_GREEN_TOGGLE (NRF_GPIO->OUT ^= LED_GREEN_PIN) #define LED_GREEN_TOGGLE (NRF_GPIO->OUT ^= LED_GREEN_MASK)
#define LED_BLUE_ON (NRF_GPIO->OUTCLR = LED_BLUE_PIN) #define LED_BLUE_ON (NRF_GPIO->OUTCLR = LED_BLUE_MASK)
#define LED_BLUE_OFF (NRF_GPIO->OUTSET = LED_BLUE_PIN) #define LED_BLUE_OFF (NRF_GPIO->OUTSET = LED_BLUE_MASK)
#define LED_BLUE_TOGGLE (NRF_GPIO->OUT ^= LED_BLUE_PIN) #define LED_BLUE_TOGGLE (NRF_GPIO->OUT ^= LED_BLUE_MASK)
/** @} */ /** @} */
/** /**