From 6aaf48940e8480511bb853f9611b8d307b3661fb Mon Sep 17 00:00:00 2001 From: Henry Bruce Date: Fri, 23 Oct 2015 15:06:27 -0700 Subject: [PATCH] examples: Fixed bug in mraa-gpio introduced by sub-platform update. Signed-off-by: Henry Bruce Signed-off-by: Brendan Le Foll --- examples/mraa-gpio.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/examples/mraa-gpio.c b/examples/mraa-gpio.c index 93fbef2..e94d48f 100644 --- a/examples/mraa-gpio.c +++ b/examples/mraa-gpio.c @@ -65,21 +65,22 @@ list_platform_pins(uint8_t platform_offset) int pin_count = mraa_get_platform_pin_count(platform_offset); int i; for (i = 0; i < pin_count; ++i) { - if (strcmp(mraa_get_pin_name(i), "INVALID") != 0) { - int pin_id = platform_offset > 0 ? mraa_get_sub_platform_id(i) : i; + int pin_id = platform_offset > 0 ? mraa_get_sub_platform_id(i) : i; + char* pin_name = mraa_get_pin_name(pin_id); + if (strcmp(pin_name, "INVALID") != 0) { fprintf(stdout, "%02d ", pin_id); - fprintf(stdout, "%*s: ", (MRAA_PIN_NAME_SIZE - 1), mraa_get_pin_name(i)); - if (mraa_pin_mode_test(i, MRAA_PIN_GPIO)) + fprintf(stdout, "%*s: ", (MRAA_PIN_NAME_SIZE - 1), pin_name); + if (mraa_pin_mode_test(pin_id, MRAA_PIN_GPIO)) fprintf(stdout, "GPIO "); - if (mraa_pin_mode_test(i, MRAA_PIN_I2C)) + if (mraa_pin_mode_test(pin_id, MRAA_PIN_I2C)) fprintf(stdout, "I2C "); - if (mraa_pin_mode_test(i, MRAA_PIN_SPI)) + if (mraa_pin_mode_test(pin_id, MRAA_PIN_SPI)) fprintf(stdout, "SPI "); - if (mraa_pin_mode_test(i, MRAA_PIN_PWM)) + if (mraa_pin_mode_test(pin_id, MRAA_PIN_PWM)) fprintf(stdout, "PWM "); - if (mraa_pin_mode_test(i, MRAA_PIN_AIO)) + if (mraa_pin_mode_test(pin_id, MRAA_PIN_AIO)) fprintf(stdout, "AIO "); - if (mraa_pin_mode_test(i, MRAA_PIN_UART)) + if (mraa_pin_mode_test(pin_id, MRAA_PIN_UART)) fprintf(stdout, "UART "); fprintf(stdout, "\n"); }