From c64b8c7095fdb337507d721f693087120e7f59b3 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 21 Nov 2016 15:56:46 +0100 Subject: [PATCH] mc_pos_control: always use fabsf and not fabs --- src/modules/mc_pos_control/mc_pos_control_main.cpp | 6 +++--- 1 file 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 b71a1bbf85..e6722032ed 100644 --- a/src/modules/mc_pos_control/mc_pos_control_main.cpp +++ b/src/modules/mc_pos_control/mc_pos_control_main.cpp @@ -1107,8 +1107,8 @@ MulticopterPositionControl::control_non_manual(float dt) ft_vel.zero(); } - _vel_sp(0) = fabs(ft_vel(0)) > fabs(_vel_sp(0)) ? ft_vel(0) : _vel_sp(0); - _vel_sp(1) = fabs(ft_vel(1)) > fabs(_vel_sp(1)) ? ft_vel(1) : _vel_sp(1); + _vel_sp(0) = fabsf(ft_vel(0)) > fabsf(_vel_sp(0)) ? ft_vel(0) : _vel_sp(0); + _vel_sp(1) = fabsf(ft_vel(1)) > fabsf(_vel_sp(1)) ? ft_vel(1) : _vel_sp(1); // track target using velocity only @@ -1837,7 +1837,7 @@ MulticopterPositionControl::control_position(float dt) /* descend stabilized, we're landing */ if (!_in_landing && !_lnd_reached_ground - && (float)fabs(_acc_z_lp) < 0.1f + && (float)fabsf(_acc_z_lp) < 0.1f && _vel_z_lp > 0.5f * _params.land_speed) { _in_landing = true; }