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

PWMSim: refactor to use math constrain

Browse Source
This commit is contained in:
Matthias Grob 2018-12-28 20:45:23 +01:00 committed by Lorenz Meier
parent 1560364c04
commit c22dbe130b
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/drivers/pwm_out_sim/PWMSim.cpp
View File

@ -31,9 +31,11 @@
*
****************************************************************************/
#include <px4_time.h>
#include "PWMSim.hpp"
#include <px4_time.h>
#include <mathlib/mathlib.h>
#include <uORB/topics/multirotor_motor_limits.h>
PWMSim::PWMSim() :
@ -254,14 +256,7 @@ PWMSim::run()
_actuator_outputs.output[i] <= 1.0f) {
/* scale for PWM output 1000 - 2000us */
_actuator_outputs.output[i] = 1500 + (500 * _actuator_outputs.output[i]);
if (_actuator_outputs.output[i] > _pwm_max[i]) {
_actuator_outputs.output[i] = _pwm_max[i];
}
if (_actuator_outputs.output[i] < _pwm_min[i]) {
_actuator_outputs.output[i] = _pwm_min[i];
}
_actuator_outputs.output[i] = math::constrain(_actuator_outputs.output[i], (float)_pwm_min[i], (float)_pwm_max[i]);
} else {
/*