diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-30 08:55:26 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-30 08:55:26 +0400 |
| commit | a71b04775c435f53489e8a62c421131280ca093b (patch) | |
| tree | 33391c7ab9127fdf4bf09cff08a774f80d792cff /src/modules/multirotor_att_control | |
| parent | f084ddfeb05715efee2488e7bd9b51939b4142b8 (diff) | |
| parent | 95bdc1a9bd364ce95abe06b097579cc8a9162e33 (diff) | |
| download | px4-firmware-a71b04775c435f53489e8a62c421131280ca093b.tar.gz px4-firmware-a71b04775c435f53489e8a62c421131280ca093b.tar.bz2 px4-firmware-a71b04775c435f53489e8a62c421131280ca093b.zip | |
Merge commit '95bdc1a9bd364ce95abe06b097579cc8a9162e33' into navigator_new_vector
Diffstat (limited to 'src/modules/multirotor_att_control')
| -rw-r--r-- | src/modules/multirotor_att_control/multirotor_att_control_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/multirotor_att_control/multirotor_att_control_main.c b/src/modules/multirotor_att_control/multirotor_att_control_main.c index 60a211817..111e9197f 100644 --- a/src/modules/multirotor_att_control/multirotor_att_control_main.c +++ b/src/modules/multirotor_att_control/multirotor_att_control_main.c @@ -316,7 +316,7 @@ mc_thread_main(int argc, char *argv[]) } } else { - if (!control_mode.flag_control_auto_enabled) { + if (!control_mode.flag_control_attitude_enabled) { /* no control, try to stay on place */ if (!control_mode.flag_control_velocity_enabled) { /* no velocity control, reset attitude setpoint */ |