diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-06 15:47:34 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-06 15:47:34 +0200 |
| commit | 1492323f0327916435d806c2af1e0c8296278c9d (patch) | |
| tree | d53e2768c326ec6a2cbcfd896550c446ba93fab3 /src/modules/systemlib/mixer/mixer.h | |
| parent | 2669f7f3af65921d4abbf3850cd62e48f2eeeec7 (diff) | |
| parent | bd88951f6ce609bc5ba364bfa3d19ae61e444964 (diff) | |
| download | px4-firmware-1492323f0327916435d806c2af1e0c8296278c9d.tar.gz px4-firmware-1492323f0327916435d806c2af1e0c8296278c9d.tar.bz2 px4-firmware-1492323f0327916435d806c2af1e0c8296278c9d.zip | |
Merged master into uavcan
Diffstat (limited to 'src/modules/systemlib/mixer/mixer.h')
| -rw-r--r-- | src/modules/systemlib/mixer/mixer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/systemlib/mixer/mixer.h b/src/modules/systemlib/mixer/mixer.h index 1c889a811..225570fa4 100644 --- a/src/modules/systemlib/mixer/mixer.h +++ b/src/modules/systemlib/mixer/mixer.h @@ -447,6 +447,7 @@ public: QUAD_WIDE, /**< quad in wide configuration */ HEX_X, /**< hex in X configuration */ HEX_PLUS, /**< hex in + configuration */ + HEX_COX, OCTA_X, OCTA_PLUS, OCTA_COX, @@ -516,7 +517,7 @@ private: float _roll_scale; float _pitch_scale; float _yaw_scale; - float _deadband; + float _idle_speed; unsigned _rotor_count; const Rotor *_rotors; |