diff options
| author | Lorenz Meier <lorenz@px4.io> | 2015-01-08 17:55:12 +0100 |
|---|---|---|
| committer | Lorenz Meier <lorenz@px4.io> | 2015-01-08 17:55:12 +0100 |
| commit | e4a3c3f76d57282da1e4db7644a35bc83ad77e26 (patch) | |
| tree | 5a9e8f097a7a5b1e4cd90fbaa46cf53db2abc696 /src/modules/systemlib/mixer/mixer.h | |
| parent | 28ddd729875697af28197a32bc84c9ab94805f20 (diff) | |
| parent | ba89c9eae26ba990317ff0b66d42e114b8c7dffa (diff) | |
| download | px4-firmware-e4a3c3f76d57282da1e4db7644a35bc83ad77e26.tar.gz px4-firmware-e4a3c3f76d57282da1e4db7644a35bc83ad77e26.tar.bz2 px4-firmware-e4a3c3f76d57282da1e4db7644a35bc83ad77e26.zip | |
Merge pull request #1600 from anton-matosov/SK450DeadCat.v2
Implemented SK450 DeadCat frame support
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 864ce21a5..67ef521b4 100644 --- a/src/modules/systemlib/mixer/mixer.h +++ b/src/modules/systemlib/mixer/mixer.h @@ -441,7 +441,6 @@ private: SimpleMixer operator=(const SimpleMixer&); }; - /** * Supported multirotor geometries. * @@ -460,12 +459,14 @@ class __EXPORT MultirotorMixer : public Mixer { public: /** + * Precalculated rotor mix. */ struct Rotor { float roll_scale; /**< scales roll for this rotor */ float pitch_scale; /**< scales pitch for this rotor */ float yaw_scale; /**< scales yaw for this rotor */ + float out_scale; /**< scales total out for this rotor */ }; /** |