From 013eed7fa05a29fd191fcd38847e8165dfcc1736 Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Sat, 20 Feb 2016 17:22:39 +0100
Subject: [PATCH] sys: adapted to GPIO changes
---
sys/arduino/base.cpp | 19 +++++++++----------
sys/auto_init/saul/auto_init_gpio.c | 2 +-
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/sys/arduino/base.cpp b/sys/arduino/base.cpp
index d3c06be1ab..6c9ea49f8e 100644
--- a/sys/arduino/base.cpp
+++ b/sys/arduino/base.cpp
@@ -25,19 +25,18 @@ extern "C" {
#include "arduino.hpp"
-static inline gpio_dir_t _dir(int mode)
+void pinMode(int pin, int mode)
{
- return (mode == OUTPUT) ? GPIO_DIR_OUT : GPIO_DIR_IN;
-}
+ gpio_mode_t m = GPIO_OUT;
-static inline gpio_pp_t _pr(int mode)
-{
- return (mode == INPUT_PULLUP) ? GPIO_PULLUP : GPIO_NOPULL;
-}
+ if (mode == INPUT) {
+ m = GPIO_IN;
+ }
+ else if (mode == INPUT_PULLUP) {
+ m = GPIO_IN_PU;
+ }
-void pinMode(int pin, int mode)
-{
- gpio_init(arduino_pinmap[pin], _dir(mode), _pr(mode));
+ gpio_init(arduino_pinmap[pin], m);
}
void digitalWrite(int pin, int state)
diff --git a/sys/auto_init/saul/auto_init_gpio.c b/sys/auto_init/saul/auto_init_gpio.c
index f72723ec7d..454c1d0b82 100644
--- a/sys/auto_init/saul/auto_init_gpio.c
+++ b/sys/auto_init/saul/auto_init_gpio.c
@@ -62,7 +62,7 @@ void auto_init_gpio(void)
saul_reg_entries[i].name = p->name;
saul_reg_entries[i].driver = &gpio_saul_driver;
/* initialize the GPIO pin */
- gpio_init(p->pin, p->dir, p->pull);
+ gpio_init(p->pin, p->mode);
/* add to registry */
saul_reg_add(&(saul_reg_entries[i]));
}
--
GitLab