dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into pwm_limits

This commit is contained in:
Anton Babushkin 2014-05-23 21:46:31 +02:00
parent b4a03d8de5 dc3b496655
commit 3b509aaee4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/systemlib/mixer/mixer_multirotor.cpp
View File

@ -351,9 +351,9 @@ MultirotorMixer::mix(float *outputs, unsigned space)
scale_out = 1.0f; scale_out = 1.0f;
} }
/* scale outputs to range _idle_speed..1 */ /* scale outputs to range _idle_speed..1, and do final limiting */
for (unsigned i = 0; i < _rotor_count; i++) { for (unsigned i = 0; i < _rotor_count; i++) {
outputs[i] = _idle_speed + (outputs[i] * (1.0f - _idle_speed) * scale_out); outputs[i] = constrain(_idle_speed + (outputs[i] * (1.0f - _idle_speed) * scale_out), _idle_speed, 1.0f);
} }
return _rotor_count; return _rotor_count;