fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-27 16:40:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

MultiRotor Mixer: Fix a styling issue for readability

Browse Source
This commit is contained in:
Azarakhsh Keipour
2020-07-13 12:21:04 -04:00
parent 69fe37e6be
commit 4d3c915183
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/mixer/MultirotorMixer/MultirotorMixer.cpp
+4 -3
View File
@@ -439,8 +439,7 @@ MultirotorMixer::mix(float *outputs, unsigned space)
// clean out class variable used to capture saturation
_saturation_status.value = 0;
if (!_is_6dof)
if (!_is_6dof) {
// Do the mixing using the strategy given by the current Airmode configuration
switch (_airmode) {
case Airmode::roll_pitch:
@@ -456,7 +455,9 @@ MultirotorMixer::mix(float *outputs, unsigned space)
mix_airmode_disabled(roll, pitch, yaw, math::constrain(get_control(0, 3), 0.0f, 1.0f), outputs);
break;
} else { // if is 6-DoF vehicle
}
} else { // if is 6-DoF vehicle
float x_thrust = math::constrain(get_control(0, 8), -1.0f, 1.0f);
float y_thrust = math::constrain(get_control(0, 9), -1.0f, 1.0f);
float z_thrust = math::constrain(get_control(0, 10), -1.0f, 1.0f);