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

Merge pull request #1942 from PX4/mc_mixer_limit 

Fix limiting in mc mixer
This commit is contained in:
Lorenz Meier 2015-03-21 23:15:33 -07:00
parent 49834b11cb 95be7c2289
commit 07389eabbe
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,14 +244,23 @@ MultirotorMixer::mix(float *outputs, unsigned space)
if (min_out < 0.0f) { if (min_out < 0.0f) {
float scale_in = thrust / (thrust - min_out); float scale_in = thrust / (thrust - min_out);
max_out = 0.0f;
/* mix again with adjusted controls */ /* mix again with adjusted controls */
for (unsigned i = 0; i < _rotor_count; i++) { for (unsigned i = 0; i < _rotor_count; i++) {
outputs[i] = scale_in * (roll * _rotors[i].roll_scale + pitch * _rotors[i].pitch_scale) + thrust; float out = scale_in * (roll * _rotors[i].roll_scale + pitch * _rotors[i].pitch_scale) + thrust;
/* update max output value */
if (out > max_out) {
max_out = out;
}
outputs[i] = out;
} }
_limits.roll_pitch = true; _limits.roll_pitch = true;
} else { } else {
/* roll/pitch mixed without limiting, add yaw control */ /* roll/pitch mixed without lower side limiting, add yaw control */
for (unsigned i = 0; i < _rotor_count; i++) { for (unsigned i = 0; i < _rotor_count; i++) {
outputs[i] += yaw * _rotors[i].yaw_scale; outputs[i] += yaw * _rotors[i].yaw_scale;
} }