Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 11:06:04 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Multicopter mixer - Rewrite unnecessarily complicated conditions

Browse Source
This commit is contained in:
bresch
2017-09-04 12:43:35 +02:00
committed by Roman Bapst
parent 5da2842dbc
commit df194b1de4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/mixer/mixer_multirotor.cpp
+4 -4
View File
@@ -209,10 +209,10 @@ MultirotorMixer::mix(float *outputs, unsigned space)
// which may result in motor saturation after thrust boost is applied // which may result in motor saturation after thrust boost is applied
// TODO: revise the saturation/boosting strategy // TODO: revise the saturation/boosting strategy
if (min_out < 0.0f && max_out < 1.0f && -min_out <= 1.0f - max_out) { if (min_out < 0.0f && max_out < 1.0f && max_out - min_out <= 1.0f) {
boost = -min_out; boost = -min_out;
} else if (max_out > 1.0f && min_out > 0.0f && min_out >= max_out - 1.0f) { } else if (max_out > 1.0f && min_out > 0.0f && max_out - min_out <= 1.0f) {
float max_thrust_diff = thrust - thrust_decrease_factor * thrust; float max_thrust_diff = thrust - thrust_decrease_factor * thrust;
if (max_thrust_diff >= max_out - 1.0f) { if (max_thrust_diff >= max_out - 1.0f) {
@@ -223,12 +223,12 @@ MultirotorMixer::mix(float *outputs, unsigned space)
roll_pitch_scale = (1 - (thrust + boost)) / (max_out - thrust); roll_pitch_scale = (1 - (thrust + boost)) / (max_out - thrust);
} }
} else if (min_out < 0.0f && max_out < 1.0f && -min_out > 1.0f - max_out) { } else if (min_out < 0.0f && max_out < 1.0f && max_out - min_out > 1.0f) {
float max_thrust_diff = thrust * thrust_increase_factor - thrust; float max_thrust_diff = thrust * thrust_increase_factor - thrust;
boost = math::constrain(-min_out - (1.0f - max_out) / 2.0f, 0.0f, max_thrust_diff); boost = math::constrain(-min_out - (1.0f - max_out) / 2.0f, 0.0f, max_thrust_diff);
roll_pitch_scale = (thrust + boost) / (thrust - min_out); roll_pitch_scale = (thrust + boost) / (thrust - min_out);
} else if (max_out > 1.0f && min_out > 0.0f && min_out < max_out - 1.0f) { } else if (max_out > 1.0f && min_out > 0.0f && max_out - min_out > 1.0f) {
float max_thrust_diff = thrust - thrust_decrease_factor * thrust; float max_thrust_diff = thrust - thrust_decrease_factor * thrust;
boost = math::constrain(-(max_out - 1.0f - min_out) / 2.0f, -max_thrust_diff, 0.0f); boost = math::constrain(-(max_out - 1.0f - min_out) / 2.0f, -max_thrust_diff, 0.0f);
roll_pitch_scale = (1 - (thrust + boost)) / (max_out - thrust); roll_pitch_scale = (1 - (thrust + boost)) / (max_out - thrust);