fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-05 01:10:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

replace + with &&

Browse Source
This commit is contained in:
Dennis Mannhart
2018-10-31 08:07:01 +01:00
committed by Roman Bapst
parent 6a0a9c92fb
commit 3b92d49b64
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mc_pos_control/PositionControl.cpp
+1 -1
View File
@@ -263,7 +263,7 @@ void PositionControl::_velocityController(const float &dt)
// Saturate thrust setpoint in D-direction.
_thr_sp(2) = math::constrain(thrust_desired_D, uMin, uMax);
if (PX4_ISFINITE(_thr_sp(0)) + PX4_ISFINITE(_thr_sp(1))) {
if (PX4_ISFINITE(_thr_sp(0)) && PX4_ISFINITE(_thr_sp(1))) {
// Thrust set-point in NE-direction is already provided. Only
// scaling by the maximum tilt is required.
float thr_xy_max = fabsf(_thr_sp(2)) * tanf(_constraints.tilt);