diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:24:22 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-05-12 09:24:22 +0200 |
| commit | 299918295201c235dd7b6c96f3a5e3241f3e2813 (patch) | |
| tree | 1ab20615bca8dbf8c8aa7252d858d4ae26a0270e /src/modules/mc_pos_control/mc_pos_control_main.cpp | |
| parent | de4c4561961562d424e77c4557b51c6166bfd1d2 (diff) | |
| download | px4-firmware-299918295201c235dd7b6c96f3a5e3241f3e2813.tar.gz px4-firmware-299918295201c235dd7b6c96f3a5e3241f3e2813.tar.bz2 px4-firmware-299918295201c235dd7b6c96f3a5e3241f3e2813.zip | |
mc pos control: use new manual control setpoint variable names
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 | 8 |
1 files changed, 4 insertions, 4 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 7c625a0c5..bd63a100b 100644 --- a/src/modules/mc_pos_control/mc_pos_control_main.cpp +++ b/src/modules/mc_pos_control/mc_pos_control_main.cpp @@ -617,7 +617,7 @@ MulticopterPositionControl::task_main() reset_alt_sp(); /* move altitude setpoint with throttle stick */ - sp_move_rate(2) = -scale_control(_manual.throttle - 0.5f, 0.5f, alt_ctl_dz); + sp_move_rate(2) = -scale_control(_manual.z - 0.5f, 0.5f, alt_ctl_dz); } if (_control_mode.flag_control_position_enabled) { @@ -625,8 +625,8 @@ MulticopterPositionControl::task_main() reset_pos_sp(); /* move position setpoint with roll/pitch stick */ - sp_move_rate(0) = _manual.pitch; - sp_move_rate(1) = _manual.roll; + sp_move_rate(0) = _manual.x; + sp_move_rate(1) = _manual.y; } /* limit setpoint move rate */ @@ -782,7 +782,7 @@ MulticopterPositionControl::task_main() float i = _params.thr_min; if (reset_int_z_manual) { - i = _manual.throttle; + i = _manual.z; if (i < _params.thr_min) { i = _params.thr_min; |