diff options
| author | Anton Matosov <anton.matosov@gmail.com> | 2015-01-05 23:15:12 +0200 |
|---|---|---|
| committer | Anton Matosov <anton.matosov@gmail.com> | 2015-01-05 23:15:12 +0200 |
| commit | 117d43067f3c16c596a41cf0af5feaee1b11716b (patch) | |
| tree | 07e0665f6025f2c8ae9551b1771b9d5e7eccb323 /src/modules/systemlib/mixer/mixer.h | |
| parent | 18bf501992afa8b561822615104c3868091429b9 (diff) | |
| download | px4-firmware-117d43067f3c16c596a41cf0af5feaee1b11716b.tar.gz px4-firmware-117d43067f3c16c596a41cf0af5feaee1b11716b.tar.bz2 px4-firmware-117d43067f3c16c596a41cf0af5feaee1b11716b.zip | |
Switched to enum class out of class definition
Diffstat (limited to 'src/modules/systemlib/mixer/mixer.h')
| -rw-r--r-- | src/modules/systemlib/mixer/mixer.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/modules/systemlib/mixer/mixer.h b/src/modules/systemlib/mixer/mixer.h index a0197df48..55c4ce6af 100644 --- a/src/modules/systemlib/mixer/mixer.h +++ b/src/modules/systemlib/mixer/mixer.h @@ -441,6 +441,14 @@ private: SimpleMixer operator=(const SimpleMixer&); }; + +/** + * Supported multirotor geometries. + * + * Values are generated by the multi_tables script and placed to mixer_multirotor.generated.h + */ +enum class MultirotorGeometry : unsigned int; + /** * Multi-rotor mixer for pre-defined vehicle geometries. * @@ -451,13 +459,6 @@ class __EXPORT MultirotorMixer : public Mixer { public: /** - * Supported multirotor geometries. - * - * Values are generated by the multi_tables script and placed to mixer_multirotor.generated.h - */ - enum Geometry : unsigned int; - - /** * Precalculated rotor mix. */ struct Rotor { @@ -484,7 +485,7 @@ public: */ MultirotorMixer(ControlCallback control_cb, uintptr_t cb_handle, - Geometry geometry, + MultirotorGeometry geometry, float roll_scale, float pitch_scale, float yaw_scale, |