diff options
| author | Roman Bapst <romanbapst@yahoo.de> | 2015-04-21 14:59:08 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-04-22 13:40:49 +0200 |
| commit | 67956341e68824942cccac5c5c2c6c425a9c4d97 (patch) | |
| tree | 5748b7c153d67f86a346d58532072114d436ed36 | |
| parent | 5b772e5720ed6bc8f90316dc7632b218819543b7 (diff) | |
| download | px4-firmware-67956341e68824942cccac5c5c2c6c425a9c4d97.tar.gz px4-firmware-67956341e68824942cccac5c5c2c6c425a9c4d97.tar.bz2 px4-firmware-67956341e68824942cccac5c5c2c6c425a9c4d97.zip | |
FireFly6: make landing gear manual pass-through
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/firefly6.aux.mix | 2 | ||||
| -rw-r--r-- | src/modules/vtol_att_control/vtol_att_control_main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/mixers/firefly6.aux.mix b/ROMFS/px4fmu_common/mixers/firefly6.aux.mix index b0b425092..fda841640 100644 --- a/ROMFS/px4fmu_common/mixers/firefly6.aux.mix +++ b/ROMFS/px4fmu_common/mixers/firefly6.aux.mix @@ -23,4 +23,4 @@ Landing gear mixer ------------------ M: 1 O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 +S: 3 6 10000 10000 0 -10000 10000 diff --git a/src/modules/vtol_att_control/vtol_att_control_main.cpp b/src/modules/vtol_att_control/vtol_att_control_main.cpp index d9425f2bb..2ae10bd27 100644 --- a/src/modules/vtol_att_control/vtol_att_control_main.cpp +++ b/src/modules/vtol_att_control/vtol_att_control_main.cpp @@ -765,7 +765,7 @@ void VtolAttitudeControl::task_main() vehicle_battery_poll(); - if (_manual_control_sp.aux1 <= 0.0f) { /* vehicle is in mc mode */ + if (_manual_control_sp.aux1 < 0.0f) { /* vehicle is in mc mode */ _vtol_vehicle_status.vtol_in_rw_mode = true; if (!flag_idle_mc) { /* we want to adjust idle speed for mc mode */ |