fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-25 02:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:PX4/Firmware into ekf_params

Browse Source
This commit is contained in:
Lorenz Meier
2014-04-30 15:43:08 +02:00
parent c1b02ae302 2829d65871
commit 918c87912d
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander_helper.cpp
+3 -13
View File
@@ -199,15 +199,9 @@ int led_init()
} }
/* the blue LED is only available on FMUv1 but not FMUv2 */ /* the blue LED is only available on FMUv1 but not FMUv2 */
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V1 (void)ioctl(leds, LED_ON, LED_BLUE);
if (ioctl(leds, LED_ON, LED_BLUE)) {
warnx("Blue LED: ioctl fail\n");
return ERROR;
}
#endif
/* we consider the amber led mandatory */
if (ioctl(leds, LED_ON, LED_AMBER)) { if (ioctl(leds, LED_ON, LED_AMBER)) {
warnx("Amber LED: ioctl fail\n"); warnx("Amber LED: ioctl fail\n");
return ERROR; return ERROR;
@@ -217,11 +211,7 @@ int led_init()
rgbleds = open(RGBLED_DEVICE_PATH, 0); rgbleds = open(RGBLED_DEVICE_PATH, 0);
if (rgbleds == -1) { if (rgbleds == -1) {
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2 warnx("No RGB LED found at " RGBLED_DEVICE_PATH);
errx(1, "Unable to open " RGBLED_DEVICE_PATH);
#else
warnx("No RGB LED found");
#endif
} }
return 0; return 0;