diff --git a/boards/nrf52dk/board.c b/boards/nrf52dk/board.c index 8d3649c881..9d06a200ca 100644 --- a/boards/nrf52dk/board.c +++ b/boards/nrf52dk/board.c @@ -24,8 +24,9 @@ void board_init(void) { /* initialize the boards LEDs */ - NRF_P0->DIRSET = (LED1_MASK | LED2_MASK | LED3_MASK | LED4_MASK); - NRF_P0->OUTSET = (LED1_MASK | LED2_MASK | LED3_MASK | LED4_MASK); + NRF_P0->DIRSET = (LED0_MASK | LED1_MASK | LED2_MASK | LED3_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 */ cpu_init(); diff --git a/boards/nrf52dk/include/board.h b/boards/nrf52dk/include/board.h index 5e794b2ea2..48d3447d5d 100644 --- a/boards/nrf52dk/include/board.h +++ b/boards/nrf52dk/include/board.h @@ -31,29 +31,31 @@ extern "C" { * @brief LED pin configuration * @{ */ -#define LED1_PIN (GPIO_PIN(0, 17)) -#define LED2_PIN (GPIO_PIN(0, 18)) -#define LED3_PIN (GPIO_PIN(0, 19)) -#define LED4_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_PIN GPIO_PIN(0, 17) +#define LED1_PIN GPIO_PIN(0, 18) +#define LED2_PIN GPIO_PIN(0, 19) +#define LED3_PIN GPIO_PIN(0, 20) -/** - * @brief RIOT LED macros for backwards compatibility - * @{ - */ -#define LED_RED_ON (NRF_P0->OUTSET = LED1_MASK) -#define LED_RED_OFF (NRF_P0->OUTCLR = LED1_MASK) -#define LED_RED_TOGGLE (NRF_P0->OUT ^= LED1_MASK) -#define LED_GREEN_ON (NRF_P0->OUTSET = LED2_MASK) -#define LED_GREEN_OFF (NRF_P0->OUTCLR = LED2_MASK) -#define LED_GREEN_TOGGLE (NRF_P0->OUT ^= LED2_MASK) -#define LED_ORANGE_ON (NRF_P0->OUTSET = LED3_MASK) -#define LED_ORANGE_OFF (NRF_P0->OUTCLR = LED3_MASK) -#define LED_ORANGE_TOGGLE (NRF_P0->OUT ^= LED3_MASK) +#define LED0_MASK (1 << 17) +#define LED1_MASK (1 << 18) +#define LED2_MASK (1 << 19) +#define LED3_MASK (1 << 20) + +#define LED0_ON (NRF_P0->OUTCLR = LED0_MASK) +#define LED0_OFF (NRF_P0->OUTSET = LED0_MASK) +#define LED0_TOGGLE (NRF_P0->OUT ^= LED0_MASK) + +#define LED1_ON (NRF_P0->OUTCLR = LED1_MASK) +#define LED1_OFF (NRF_P0->OUTSET = LED1_MASK) +#define LED1_TOGGLE (NRF_P0->OUT ^= LED1_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) /** @} */ /** diff --git a/boards/nrf52dk/include/gpio_params.h b/boards/nrf52dk/include/gpio_params.h index 81b82f5670..6045bd9f0f 100644 --- a/boards/nrf52dk/include/gpio_params.h +++ b/boards/nrf52dk/include/gpio_params.h @@ -34,25 +34,25 @@ static const saul_gpio_params_t saul_gpio_params[] = { { .name = "LED 1", - .pin = LED1_PIN, + .pin = LED0_PIN, .dir = GPIO_DIR_OUT, .pull = GPIO_NOPULL }, { .name = "LED 2", - .pin = LED2_PIN, + .pin = LED1_PIN, .dir = GPIO_DIR_OUT, .pull = GPIO_NOPULL }, { .name = "LED 3", - .pin = LED3_PIN, + .pin = LED2_PIN, .dir = GPIO_DIR_OUT, .pull = GPIO_NOPULL }, { .name = "LED 4", - .pin = LED4_PIN, + .pin = LED3_PIN, .dir = GPIO_DIR_OUT, .pull = GPIO_NOPULL },