From 8ccefe95e5bbc211882dce5fe9e2215f3e5d2736 Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Thu, 5 Feb 2015 15:00:27 +0000 Subject: [PATCH] Revert "setup_mux_mapped: use HIGH/LOW instead" This reverts commit 6c73a8adceb2b59e1868dc57737be9b2ea51cec7 as it breaks galileo gen1 muxing. Signed-off-by: Brendan Le Foll --- src/mraa.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/mraa.c b/src/mraa.c index 0e82ebb..e790325 100644 --- a/src/mraa.c +++ b/src/mraa.c @@ -146,17 +146,13 @@ mraa_setup_mux_mapped(mraa_pin_t meta) if (mux_i == NULL) { return MRAA_ERROR_INVALID_HANDLE; } + // this function will sometimes fail, however this is not critical as + // long as the write succeeds - Test case galileo gen2 pin2 + mraa_gpio_dir(mux_i, MRAA_GPIO_OUT); - if (meta.mux[mi].value) { - if (mraa_gpio_dir(mux_i, MRAA_GPIO_OUT_HIGH) != MRAA_SUCCESS) { - mraa_gpio_close(mux_i); - return MRAA_ERROR_INVALID_RESOURCE; - } - } else { - if (mraa_gpio_dir(mux_i, MRAA_GPIO_OUT_LOW) != MRAA_SUCCESS) { - mraa_gpio_close(mux_i); - return MRAA_ERROR_INVALID_RESOURCE; - } + if (mraa_gpio_write(mux_i, meta.mux[mi].value) != MRAA_SUCCESS) { + mraa_gpio_close(mux_i); + return MRAA_ERROR_INVALID_RESOURCE; } mraa_gpio_close(mux_i); }