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

Merged IO feature branch

Browse Source
This commit is contained in:
Lorenz Meier
2012-12-13 11:12:34 +01:00
parent 26faab64e5 03076a72ca
commit 1fc0a6546e
13 changed files with 253 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/px4io/controls.c
+4 -3
View File
@@ -110,12 +110,13 @@ controls_main(void)
if (!locked)
ppm_input();
/* force manual input override */
/* check for manual override status */
if (system_state.rc_channel_data[4] > RC_CHANNEL_HIGH_THRESH) {
system_state.mixer_use_fmu = false;
/* force manual input override */
system_state.mixer_manual_override = true;
} else {
/* override not engaged, use FMU */
system_state.mixer_use_fmu = true;
system_state.mixer_manual_override = false;
}
/*