diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-13 11:12:34 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-12-13 11:12:34 +0100 |
| commit | 1fc0a6546e30cfc913de8c0c03cfc625fba5d2ae (patch) | |
| tree | 65cf4f9b03e9dc63ffdf05ff698272f326d76908 /apps/px4io/controls.c | |
| parent | 26faab64e5e1679d15afe88ef0edebd598f47dc7 (diff) | |
| parent | 03076a72ca75917cf62d7889c6c6d0de36866b04 (diff) | |
| download | px4-firmware-1fc0a6546e30cfc913de8c0c03cfc625fba5d2ae.tar.gz px4-firmware-1fc0a6546e30cfc913de8c0c03cfc625fba5d2ae.tar.bz2 px4-firmware-1fc0a6546e30cfc913de8c0c03cfc625fba5d2ae.zip | |
Merged IO feature branch
Diffstat (limited to 'apps/px4io/controls.c')
| -rw-r--r-- | apps/px4io/controls.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/px4io/controls.c b/apps/px4io/controls.c index e64f8b204..9db9a0fa5 100644 --- a/apps/px4io/controls.c +++ b/apps/px4io/controls.c @@ -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; } /* |