diff options
author | andre-nguyen <nguyen.apv@gmail.com> | 2014-06-14 15:27:07 -0400 |
---|---|---|
committer | andre-nguyen <nguyen.apv@gmail.com> | 2014-06-14 15:27:07 -0400 |
commit | 6cf890b46b5a112ed20b3f8ed7be7b658d5c4a8c (patch) | |
tree | c9119e7becdf23e7a774fed3bdf7c6a31a749845 /src/modules/mc_pos_control/mc_pos_control_main.cpp | |
parent | d9b5efb263b61b8dc47ee63d7b4eb0b62853877a (diff) | |
download | px4-firmware-6cf890b46b5a112ed20b3f8ed7be7b658d5c4a8c.tar.gz px4-firmware-6cf890b46b5a112ed20b3f8ed7be7b658d5c4a8c.tar.bz2 px4-firmware-6cf890b46b5a112ed20b3f8ed7be7b658d5c4a8c.zip |
indentation and fix commander flags. It's impossible to control position at the same time as attitude so we have to disable some things. My logic is that all the control flags for position control should be opposite of the attitude control mode.
Diffstat (limited to 'src/modules/mc_pos_control/mc_pos_control_main.cpp')
-rw-r--r-- | src/modules/mc_pos_control/mc_pos_control_main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/mc_pos_control/mc_pos_control_main.cpp b/src/modules/mc_pos_control/mc_pos_control_main.cpp index 9d9d2a7c0..6721d017d 100644 --- a/src/modules/mc_pos_control/mc_pos_control_main.cpp +++ b/src/modules/mc_pos_control/mc_pos_control_main.cpp @@ -679,12 +679,12 @@ MulticopterPositionControl::task_main() /* Make sure position control is selected i.e. not only velocity control */ if (_control_mode.flag_control_position_enabled) { - _pos_sp(0) = _local_pos_sp.x; - _pos_sp(1) = _local_pos_sp.y; + _pos_sp(0) = _local_pos_sp.x; + _pos_sp(1) = _local_pos_sp.y; } if (_control_mode.flag_control_altitude_enabled) { - _pos_sp(2) = _local_pos_sp.z; + _pos_sp(2) = _local_pos_sp.z; } _att_sp.yaw_body = _local_pos_sp.yaw; |