fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-01 00:41:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support PX4IO_DEVICE_PATH not defined

Browse Source
This commit is contained in:
David Sidrane
2015-11-28 09:13:15 +01:00
committed by Lorenz Meier
parent d6c6cb72b2
commit 09f83e78e5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/gpio_led/gpio_led.c
+7 -3
View File
@@ -89,7 +89,7 @@ int gpio_led_main(int argc, char *argv[])
"\t\tr2\tPX4IO RELAY2" "\t\tr2\tPX4IO RELAY2"
); );
#endif #endif
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2 #if defined(CONFIG_ARCH_BOARD_PX4FMU_V2) || defined(CONFIG_ARCH_BOARD_PX4FMU_V3)
errx(1, "usage: gpio_led {start|stop} [-p <n>]\n" errx(1, "usage: gpio_led {start|stop} [-p <n>]\n"
"\t-p <n>\tUse specified AUX OUT pin number (default: 1)" "\t-p <n>\tUse specified AUX OUT pin number (default: 1)"
); );
@@ -111,7 +111,7 @@ int gpio_led_main(int argc, char *argv[])
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V1 #ifdef CONFIG_ARCH_BOARD_PX4FMU_V1
char *pin_name = "PX4FMU GPIO_EXT1"; char *pin_name = "PX4FMU GPIO_EXT1";
#endif #endif
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2 #if defined(CONFIG_ARCH_BOARD_PX4FMU_V2) || defined(CONFIG_ARCH_BOARD_PX4FMU_V3)
char pin_name[] = "AUX OUT 1"; char pin_name[] = "AUX OUT 1";
#endif #endif
@@ -154,7 +154,7 @@ int gpio_led_main(int argc, char *argv[])
} }
#endif #endif
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2 #if defined(CONFIG_ARCH_BOARD_PX4FMU_V2) || defined(CONFIG_ARCH_BOARD_PX4FMU_V3)
unsigned int n = strtoul(argv[3], NULL, 10); unsigned int n = strtoul(argv[3], NULL, 10);
if (n >= 1 && n <= 6) { if (n >= 1 && n <= 6) {
@@ -207,12 +207,16 @@ void gpio_led_start(FAR void *arg)
char *gpio_dev; char *gpio_dev;
#if defined(PX4IO_DEVICE_PATH)
if (priv->use_io) { if (priv->use_io) {
gpio_dev = PX4IO_DEVICE_PATH; gpio_dev = PX4IO_DEVICE_PATH;
} else { } else {
gpio_dev = PX4FMU_DEVICE_PATH; gpio_dev = PX4FMU_DEVICE_PATH;
} }
#else
gpio_dev = PX4FMU_DEVICE_PATH;
#endif
/* open GPIO device */ /* open GPIO device */
priv->gpio_fd = open(gpio_dev, 0); priv->gpio_fd = open(gpio_dev, 0);