Skip to content

Commit

Permalink
Airmode - Minor rewording
Browse files Browse the repository at this point in the history
  • Loading branch information
bresch authored and RomanBapst committed Mar 23, 2018
1 parent c9d72c0 commit 81a80e0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/lib/mixer/mixer.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ class __EXPORT Mixer
/**
* @brief Set airmode. Airmode allows the mixer to increase the total thrust in order to unsaturate the motors.
*
* @param[in] airmode Dis/-activate airmode by setting it to false/true
* @param[in] airmode De/-activate airmode by setting it to false/true
*/
virtual void set_airmode(bool airmode) {};

Expand Down
4 changes: 2 additions & 2 deletions src/lib/mixer/mixer_multirotor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,13 @@ MultirotorMixer::mix(float *outputs, unsigned space)
}

} else {
roll_pitch_scale = 1 / (delta_out_max);
roll_pitch_scale = 1.0f / (delta_out_max);
boost = 1.0f - ((max_out - thrust) * roll_pitch_scale + thrust);
}

if (!_airmode) {
// disable positive boosting if not in air-mode
// boosting is positive when min_out < 0.0
// boosting can only be positive when min_out < 0.0
// roll_pitch_scale is reduced accordingly
if (boost > 0.0f) {
roll_pitch_scale = thrust / (thrust - min_out);
Expand Down
2 changes: 1 addition & 1 deletion src/modules/mc_att_control/mc_att_control_params.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ PARAM_DEFINE_FLOAT(MC_DTERM_CUTOFF, 0.f);
/**
* Multicopter air-mode
*
* The air-mode enables the mixer to increase or decrease the total thrust of the multirotor
* The air-mode enables the mixer to increase the total thrust of the multirotor
* in order to keep attitude and rate control even at low and high throttle.
* This function should be disabled during tuning as it will help the controller
* to diverge if the closed-loop is unstable.
Expand Down

0 comments on commit 81a80e0

Please sign in to comment.