aboutsummaryrefslogtreecommitdiff
path: root/apps/systemlib/mixer/mixer_multirotor.cpp
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2012-09-03 02:45:33 -0700
committerpx4dev <px4@purgatory.org>2012-09-03 02:45:33 -0700
commit0d89da96a3b7ef75de80fe52ee885091cfb173a8 (patch)
tree1fe3cd26fb2d2f21386ec0562c6c10e1c6819b19 /apps/systemlib/mixer/mixer_multirotor.cpp
parentb9a5f714760a2bdfa8bfdbce8e39a2ec471b4c12 (diff)
downloadpx4-firmware-0d89da96a3b7ef75de80fe52ee885091cfb173a8.tar.gz
px4-firmware-0d89da96a3b7ef75de80fe52ee885091cfb173a8.tar.bz2
px4-firmware-0d89da96a3b7ef75de80fe52ee885091cfb173a8.zip
Adjust the mixer tables for observed yaw sign behavior.
Diffstat (limited to 'apps/systemlib/mixer/mixer_multirotor.cpp')
-rw-r--r--apps/systemlib/mixer/mixer_multirotor.cpp72
1 files changed, 36 insertions, 36 deletions
diff --git a/apps/systemlib/mixer/mixer_multirotor.cpp b/apps/systemlib/mixer/mixer_multirotor.cpp
index 60b71c60a..7d1605917 100644
--- a/apps/systemlib/mixer/mixer_multirotor.cpp
+++ b/apps/systemlib/mixer/mixer_multirotor.cpp
@@ -64,52 +64,52 @@ namespace
* These tables automatically generated by multi_tables - do not edit.
*/
const MultirotorMixer::Rotor _config_quad_x[] = {
- { -0.707107, 0.707107, 1.00 },
- { 0.707107, -0.707107, 1.00 },
- { 0.707107, 0.707107, -1.00 },
- { -0.707107, -0.707107, -1.00 },
+ { -0.707107, 0.707107, -1.00 },
+ { 0.707107, -0.707107, -1.00 },
+ { 0.707107, 0.707107, 1.00 },
+ { -0.707107, -0.707107, 1.00 },
};
const MultirotorMixer::Rotor _config_quad_plus[] = {
- { -1.000000, 0.000000, 1.00 },
- { 1.000000, 0.000000, 1.00 },
- { 0.000000, 1.000000, -1.00 },
- { -0.000000, -1.000000, -1.00 },
+ { -1.000000, 0.000000, -1.00 },
+ { 1.000000, 0.000000, -1.00 },
+ { 0.000000, 1.000000, 1.00 },
+ { -0.000000, -1.000000, 1.00 },
};
const MultirotorMixer::Rotor _config_hex_x[] = {
- { -1.000000, 0.000000, -1.00 },
- { 1.000000, 0.000000, 1.00 },
- { 0.500000, 0.866025, -1.00 },
- { -0.500000, -0.866025, 1.00 },
- { -0.500000, 0.866025, 1.00 },
- { 0.500000, -0.866025, -1.00 },
+ { -1.000000, 0.000000, 1.00 },
+ { 1.000000, 0.000000, -1.00 },
+ { 0.500000, 0.866025, 1.00 },
+ { -0.500000, -0.866025, -1.00 },
+ { -0.500000, 0.866025, -1.00 },
+ { 0.500000, -0.866025, 1.00 },
};
const MultirotorMixer::Rotor _config_hex_plus[] = {
- { 0.000000, 1.000000, -1.00 },
- { -0.000000, -1.000000, 1.00 },
- { 0.866025, -0.500000, -1.00 },
- { -0.866025, 0.500000, 1.00 },
- { 0.866025, 0.500000, 1.00 },
- { -0.866025, -0.500000, -1.00 },
+ { 0.000000, 1.000000, 1.00 },
+ { -0.000000, -1.000000, -1.00 },
+ { 0.866025, -0.500000, 1.00 },
+ { -0.866025, 0.500000, -1.00 },
+ { 0.866025, 0.500000, -1.00 },
+ { -0.866025, -0.500000, 1.00 },
};
const MultirotorMixer::Rotor _config_octa_x[] = {
- { -0.382683, 0.923880, -1.00 },
- { 0.382683, -0.923880, -1.00 },
- { -0.923880, 0.382683, 1.00 },
- { -0.382683, -0.923880, 1.00 },
- { 0.382683, 0.923880, 1.00 },
- { 0.923880, -0.382683, 1.00 },
- { 0.923880, 0.382683, -1.00 },
- { -0.923880, -0.382683, -1.00 },
+ { -0.382683, 0.923880, 1.00 },
+ { 0.382683, -0.923880, 1.00 },
+ { -0.923880, 0.382683, -1.00 },
+ { -0.382683, -0.923880, -1.00 },
+ { 0.382683, 0.923880, -1.00 },
+ { 0.923880, -0.382683, -1.00 },
+ { 0.923880, 0.382683, 1.00 },
+ { -0.923880, -0.382683, 1.00 },
};
const MultirotorMixer::Rotor _config_octa_plus[] = {
- { 0.000000, 1.000000, -1.00 },
- { -0.000000, -1.000000, -1.00 },
- { -0.707107, 0.707107, 1.00 },
- { -0.707107, -0.707107, 1.00 },
- { 0.707107, 0.707107, 1.00 },
- { 0.707107, -0.707107, 1.00 },
- { 1.000000, 0.000000, -1.00 },
- { -1.000000, 0.000000, -1.00 },
+ { 0.000000, 1.000000, 1.00 },
+ { -0.000000, -1.000000, 1.00 },
+ { -0.707107, 0.707107, -1.00 },
+ { -0.707107, -0.707107, -1.00 },
+ { 0.707107, 0.707107, -1.00 },
+ { 0.707107, -0.707107, -1.00 },
+ { 1.000000, 0.000000, 1.00 },
+ { -1.000000, 0.000000, 1.00 },
};
const MultirotorMixer::Rotor *_config_index[MultirotorMixer::Geometry::MAX_GEOMETRY] = {
&_config_quad_x[0],