From dfed00d870869edc33c104958f48a48ee9942385 Mon Sep 17 00:00:00 2001 From: Tiktiki Date: Wed, 10 Aug 2016 16:46:38 -0400 Subject: [PATCH] Update multi_tables.py Corrected HEX_T position and rotation for motors 1-2-5-6 --- src/modules/systemlib/mixer/mixer_multirotor.cpp | 2 +- src/modules/systemlib/mixer/multi_tables.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/systemlib/mixer/mixer_multirotor.cpp b/src/modules/systemlib/mixer/mixer_multirotor.cpp index 8a93dcac63..f05747ee8a 100644 --- a/src/modules/systemlib/mixer/mixer_multirotor.cpp +++ b/src/modules/systemlib/mixer/mixer_multirotor.cpp @@ -170,7 +170,7 @@ MultirotorMixer::from_text(Mixer::ControlCallback control_cb, uintptr_t cb_handl } else if (!strcmp(geomname, "6c")) { geometry = MultirotorGeometry::HEX_COX; - + } else if (!strcmp(geomname, "6t")) { geometry = MultirotorGeometry::HEX_t; diff --git a/src/modules/systemlib/mixer/multi_tables.py b/src/modules/systemlib/mixer/multi_tables.py index 2145604a97..f914547a4d 100755 --- a/src/modules/systemlib/mixer/multi_tables.py +++ b/src/modules/systemlib/mixer/multi_tables.py @@ -125,12 +125,12 @@ hex_cox = [ ] hex_t = [ - [ 60, CW], - [ 60, CCW], + [ 43.21, CCW], + [ 43.21, CW], [ 180, CW], [ 180, CCW], - [ -60, CW], - [ -60, CCW], + [ -43.21, CW], + [ -43.21, CCW], ] octa_x = [