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

boards/nrf52dk: unified LED defines

Browse Source
This commit is contained in:
Hauke Petersen 2016-03-11 18:04:26 +01:00
parent e972431273
commit bedf98984e
3 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boards/nrf52dk/board.c
View File

@ -24,8 +24,9 @@
void board_init(void) void board_init(void)
{ {
/* initialize the boards LEDs */ /* initialize the boards LEDs */
NRF_P0->DIRSET = (LED1_MASK | LED2_MASK | LED3_MASK | LED4_MASK); NRF_P0->DIRSET = (LED0_MASK | LED1_MASK | LED2_MASK | LED3_MASK);
NRF_P0->OUTSET = (LED1_MASK | LED2_MASK | LED3_MASK | LED4_MASK); NRF_P0->OUTSET = (LED0_MASK | LED1_MASK | LED2_MASK | LED3_MASK);
NRF_P0->OUTSET = (LED0_MASK | LED1_MASK | LED2_MASK | LED3_MASK);
/* initialize the CPU */ /* initialize the CPU */
cpu_init(); cpu_init();

46
boards/nrf52dk/include/board.h
View File

@ -31,29 +31,31 @@ extern "C" {
* @brief LED pin configuration * @brief LED pin configuration
* @{ * @{
*/ */
#define LED1_PIN (GPIO_PIN(0, 17)) #define LED0_PIN GPIO_PIN(0, 17)
#define LED2_PIN (GPIO_PIN(0, 18)) #define LED1_PIN GPIO_PIN(0, 18)
#define LED3_PIN (GPIO_PIN(0, 19)) #define LED2_PIN GPIO_PIN(0, 19)
#define LED4_PIN (GPIO_PIN(0, 20)) #define LED3_PIN GPIO_PIN(0, 20)
#define LED1_MASK (1 << 17)
#define LED2_MASK (1 << 18)
#define LED3_MASK (1 << 19)
#define LED4_MASK (1 << 20)
/** @} */
/** #define LED0_MASK (1 << 17)
* @brief RIOT LED macros for backwards compatibility #define LED1_MASK (1 << 18)
* @{ #define LED2_MASK (1 << 19)
*/ #define LED3_MASK (1 << 20)
#define LED_RED_ON (NRF_P0->OUTSET = LED1_MASK)
#define LED_RED_OFF (NRF_P0->OUTCLR = LED1_MASK) #define LED0_ON (NRF_P0->OUTCLR = LED0_MASK)
#define LED_RED_TOGGLE (NRF_P0->OUT ^= LED1_MASK) #define LED0_OFF (NRF_P0->OUTSET = LED0_MASK)
#define LED_GREEN_ON (NRF_P0->OUTSET = LED2_MASK) #define LED0_TOGGLE (NRF_P0->OUT ^= LED0_MASK)
#define LED_GREEN_OFF (NRF_P0->OUTCLR = LED2_MASK)
#define LED_GREEN_TOGGLE (NRF_P0->OUT ^= LED2_MASK) #define LED1_ON (NRF_P0->OUTCLR = LED1_MASK)
#define LED_ORANGE_ON (NRF_P0->OUTSET = LED3_MASK) #define LED1_OFF (NRF_P0->OUTSET = LED1_MASK)
#define LED_ORANGE_OFF (NRF_P0->OUTCLR = LED3_MASK) #define LED1_TOGGLE (NRF_P0->OUT ^= LED1_MASK)
#define LED_ORANGE_TOGGLE (NRF_P0->OUT ^= LED3_MASK)
#define LED2_ON (NRF_P0->OUTCLR = LED2_MASK)
#define LED2_OFF (NRF_P0->OUTSET = LED2_MASK)
#define LED2_TOGGLE (NRF_P0->OUT ^= LED2_MASK)
#define LED3_ON (NRF_P0->OUTCLR = LED3_MASK)
#define LED3_OFF (NRF_P0->OUTSET = LED3_MASK)
#define LED3_TOGGLE (NRF_P0->OUT ^= LED3_MASK)
/** @} */ /** @} */
/** /**

8
boards/nrf52dk/include/gpio_params.h
View File

@ -34,25 +34,25 @@ static const saul_gpio_params_t saul_gpio_params[] =
{ {
{ {
.name = "LED 1", .name = "LED 1",
.pin = LED1_PIN, .pin = LED0_PIN,
.dir = GPIO_DIR_OUT, .dir = GPIO_DIR_OUT,
.pull = GPIO_NOPULL .pull = GPIO_NOPULL
}, },
{ {
.name = "LED 2", .name = "LED 2",
.pin = LED2_PIN, .pin = LED1_PIN,
.dir = GPIO_DIR_OUT, .dir = GPIO_DIR_OUT,
.pull = GPIO_NOPULL .pull = GPIO_NOPULL
}, },
{ {
.name = "LED 3", .name = "LED 3",
.pin = LED3_PIN, .pin = LED2_PIN,
.dir = GPIO_DIR_OUT, .dir = GPIO_DIR_OUT,
.pull = GPIO_NOPULL .pull = GPIO_NOPULL
}, },
{ {
.name = "LED 4", .name = "LED 4",
.pin = LED4_PIN, .pin = LED3_PIN,
.dir = GPIO_DIR_OUT, .dir = GPIO_DIR_OUT,
.pull = GPIO_NOPULL .pull = GPIO_NOPULL
}, },