yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 09:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

FlightTaskManualAltitude: rename method from updateZsetpoints to updateAltitudeLock

Browse Source
This commit is contained in:
Dennis Mannhart
2018-01-05 10:43:13 +01:00
committed by Beat Küng
parent 1810ae8226
commit efc2721add
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/FlightTasks/tasks/FlightTaskManualAltitude.cpp
View File

@@ -67,11 +67,10 @@ void FlightTaskManualAltitude::_scaleSticks()
_vel_sp_z = vel_max_z * _sticks_expo(2);
}
void FlightTaskManualAltitude::_updateZsetpoints()
void FlightTaskManualAltitude::_updateAltitudeLock()
{
/* Depending on stick inputs, position is locked or
* velocity setpoint is used. If not locked, position
* setpoints is set to NAN.
/* Depending on stick inputs and velocity, position is locked.
* If not locked, altitude setpoint is set to NAN.
*/
/* handle position and altitude hold */
@@ -104,7 +103,7 @@ void FlightTaskManualAltitude::_updateSetpoints()
_thr_sp(0) = sp(0);
_thr_sp(1) = sp(1);
_updateZsetpoints(); // get z setpoints
_updateAltitudeLock(); // get z setpoints
}
bool FlightTaskManualAltitude::update()