diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-12 20:17:59 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-12 20:17:59 +0200 |
| commit | c5b890e87d545328734a815d90ce16d396630048 (patch) | |
| tree | dbd08e2d6833d4632b9de10cb9ebdbdfadb3d34c /src/modules/systemlib/mixer/mixer_multirotor.cpp | |
| parent | 4a4834c3de4b12d9b31afef0e27ee0e364972d91 (diff) | |
| download | px4-firmware-c5b890e87d545328734a815d90ce16d396630048.tar.gz px4-firmware-c5b890e87d545328734a815d90ce16d396630048.tar.bz2 px4-firmware-c5b890e87d545328734a815d90ce16d396630048.zip | |
Moved mixer file load / compression into mixer library.
Diffstat (limited to 'src/modules/systemlib/mixer/mixer_multirotor.cpp')
| -rw-r--r-- | src/modules/systemlib/mixer/mixer_multirotor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/systemlib/mixer/mixer_multirotor.cpp b/src/modules/systemlib/mixer/mixer_multirotor.cpp index 2446cc3fb..89afc272c 100644 --- a/src/modules/systemlib/mixer/mixer_multirotor.cpp +++ b/src/modules/systemlib/mixer/mixer_multirotor.cpp @@ -130,7 +130,7 @@ const MultirotorMixer::Rotor _config_octa_plus[] = { { 1.000000, 0.000000, -1.00 }, { -1.000000, 0.000000, -1.00 }, }; -const MultirotorMixer::Rotor *_config_index[MultirotorMixer::Geometry::MAX_GEOMETRY] = { +const MultirotorMixer::Rotor *_config_index[MultirotorMixer::MAX_GEOMETRY] = { &_config_quad_x[0], &_config_quad_plus[0], &_config_quad_v[0], @@ -140,7 +140,7 @@ const MultirotorMixer::Rotor *_config_index[MultirotorMixer::Geometry::MAX_GEOME &_config_octa_x[0], &_config_octa_plus[0], }; -const unsigned _config_rotor_count[MultirotorMixer::Geometry::MAX_GEOMETRY] = { +const unsigned _config_rotor_count[MultirotorMixer::MAX_GEOMETRY] = { 4, /* quad_x */ 4, /* quad_plus */ 4, /* quad_v */ |