diff options
author | Jean Cyr <jcyr@dillobits.com> | 2013-07-09 20:37:00 -0400 |
---|---|---|
committer | Jean Cyr <jcyr@dillobits.com> | 2013-07-09 20:37:00 -0400 |
commit | 897b541b12d5782af51ce0a78658cc153bd13544 (patch) | |
tree | 9f4ff4b364a7967f96ce3b38fb45e2518f497213 /src/modules/gpio_led | |
parent | 328f4f8c872a0e33857fd9a1112963438a87165b (diff) | |
download | px4-firmware-897b541b12d5782af51ce0a78658cc153bd13544.tar.gz px4-firmware-897b541b12d5782af51ce0a78658cc153bd13544.tar.bz2 px4-firmware-897b541b12d5782af51ce0a78658cc153bd13544.zip |
General cleanup of /dev/px4io and /dev/px4fmu
- Use distinct common symbols for px4io and px4fmu device files, and use
instead of hardcoded filenames
- Use common symbols defining px4io bits consistently between px4fmu and
px4io builds.
Diffstat (limited to 'src/modules/gpio_led')
-rw-r--r-- | src/modules/gpio_led/gpio_led.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/modules/gpio_led/gpio_led.c b/src/modules/gpio_led/gpio_led.c index 8b4c0cb30..1aef739c7 100644 --- a/src/modules/gpio_led/gpio_led.c +++ b/src/modules/gpio_led/gpio_led.c @@ -53,11 +53,7 @@ #include <uORB/topics/vehicle_status.h> #include <poll.h> #include <drivers/drv_gpio.h> - -#define PX4IO_RELAY1 (1<<0) -#define PX4IO_RELAY2 (1<<1) -#define PX4IO_ACC1 (1<<2) -#define PX4IO_ACC2 (1<<3) +#include <modules/px4iofirmware/protocol.h> struct gpio_led_s { struct work_s work; @@ -186,10 +182,9 @@ void gpio_led_start(FAR void *arg) char *gpio_dev; if (priv->use_io) { - gpio_dev = "/dev/px4io"; - + gpio_dev = PX4IO_DEVICE_PATH; } else { - gpio_dev = "/dev/px4fmu"; + gpio_dev = PX4FMU_DEVICE_PATH; } /* open GPIO device */ @@ -203,6 +198,7 @@ void gpio_led_start(FAR void *arg) } /* configure GPIO pin */ + /* px4fmu only, px4io doesn't support GPIO_SET_OUTPUT and will ignore */ ioctl(priv->gpio_fd, GPIO_SET_OUTPUT, priv->pin); /* subscribe to vehicle status topic */ @@ -263,7 +259,6 @@ void gpio_led_cycle(FAR void *arg) if (led_state_new) { ioctl(priv->gpio_fd, GPIO_SET, priv->pin); - } else { ioctl(priv->gpio_fd, GPIO_CLEAR, priv->pin); } |