From cf3a40dc5f585d7e7b0666fd763e5176493711e1 Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Sat, 20 Feb 2016 17:21:55 +0100
Subject: [PATCH] baords: adapted saul config to GPIO changes
---
boards/iotlab-m3/include/gpio_params.h | 9 +++------
boards/nrf52dk/include/gpio_params.h | 24 ++++++++----------------
boards/samr21-xpro/include/gpio_params.h | 6 ++----
3 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/boards/iotlab-m3/include/gpio_params.h b/boards/iotlab-m3/include/gpio_params.h
index 17a73f6e11..7a3f26e6c4 100644
--- a/boards/iotlab-m3/include/gpio_params.h
+++ b/boards/iotlab-m3/include/gpio_params.h
@@ -34,20 +34,17 @@ static const saul_gpio_params_t saul_gpio_params[] =
{
.name = "LED(red)",
.pin = LED0_PIN,
- .dir = GPIO_DIR_OUT,
- .pull = GPIO_NOPULL,
+ .mode = GPIO_OUT
},
{
.name = "LED(green)",
.pin = LED1_PIN,
- .dir = GPIO_DIR_OUT,
- .pull = GPIO_NOPULL,
+ .mode = GPIO_OUT
},
{
.name = "LED(orange)",
.pin = LED2_PIN,
- .dir = GPIO_DIR_OUT,
- .pull = GPIO_NOPULL,
+ .mode = GPIO_OUT
},
};
diff --git a/boards/nrf52dk/include/gpio_params.h b/boards/nrf52dk/include/gpio_params.h
index 6045bd9f0f..bb1846a064 100644
--- a/boards/nrf52dk/include/gpio_params.h
+++ b/boards/nrf52dk/include/gpio_params.h
@@ -35,50 +35,42 @@ static const saul_gpio_params_t saul_gpio_params[] =
{
.name = "LED 1",
.pin = LED0_PIN,
- .dir = GPIO_DIR_OUT,
- .pull = GPIO_NOPULL
+ .mode = GPIO_OUT
},
{
.name = "LED 2",
.pin = LED1_PIN,
- .dir = GPIO_DIR_OUT,
- .pull = GPIO_NOPULL
+ .mode = GPIO_OUT
},
{
.name = "LED 3",
.pin = LED2_PIN,
- .dir = GPIO_DIR_OUT,
- .pull = GPIO_NOPULL
+ .mode = GPIO_OUT
},
{
.name = "LED 4",
.pin = LED3_PIN,
- .dir = GPIO_DIR_OUT,
- .pull = GPIO_NOPULL
+ .mode = GPIO_OUT
},
{
.name = "Button 1",
.pin = BUTTON1_PIN,
- .dir = GPIO_DIR_IN,
- .pull = GPIO_PULLUP
+ .mode = GPIO_IN_PU
},
{
.name = "Button 2",
.pin = BUTTON2_PIN,
- .dir = GPIO_DIR_IN,
- .pull = GPIO_PULLUP
+ .mode = GPIO_IN_PU
},
{
.name = "Button 3",
.pin = BUTTON3_PIN,
- .dir = GPIO_DIR_IN,
- .pull = GPIO_PULLUP
+ .mode = GPIO_IN_PU
},
{
.name = "Button 4",
.pin = BUTTON4_PIN,
- .dir = GPIO_DIR_IN,
- .pull = GPIO_PULLUP
+ .mode = GPIO_IN_PU
}
};
diff --git a/boards/samr21-xpro/include/gpio_params.h b/boards/samr21-xpro/include/gpio_params.h
index 8551e0d808..6adf9f9744 100644
--- a/boards/samr21-xpro/include/gpio_params.h
+++ b/boards/samr21-xpro/include/gpio_params.h
@@ -36,14 +36,12 @@ static const saul_gpio_params_t saul_gpio_params[] =
{
.name = "LED(orange)",
.pin = LED0_PIN,
- .dir = GPIO_DIR_OUT,
- .pull = GPIO_NOPULL,
+ .mode = GPIO_OUT
},
{
.name = "Button(SW0)",
.pin = BUTTON_GPIO,
- .dir = GPIO_DIR_IN,
- .pull = GPIO_PULLUP,
+ .mode = GPIO_IN_PU
},
};
--
GitLab