Browse Source

multirotor mixer: add H configuration

sbg
DroneBuster 9 years ago
parent
commit
4ee04e3530
  1. 3
      src/modules/systemlib/mixer/mixer_multirotor.cpp
  2. 9
      src/modules/systemlib/mixer/multi_tables.py

3
src/modules/systemlib/mixer/mixer_multirotor.cpp

@ -150,6 +150,9 @@ MultirotorMixer::from_text(Mixer::ControlCallback control_cb, uintptr_t cb_handl @@ -150,6 +150,9 @@ MultirotorMixer::from_text(Mixer::ControlCallback control_cb, uintptr_t cb_handl
} else if (!strcmp(geomname, "4x")) {
geometry = MultirotorGeometry::QUAD_X;
} else if (!strcmp(geomname, "4h")) {
geometry = MultirotorGeometry::QUAD_H;
} else if (!strcmp(geomname, "4v")) {
geometry = MultirotorGeometry::QUAD_V;

9
src/modules/systemlib/mixer/multi_tables.py

@ -62,6 +62,13 @@ quad_x = [ @@ -62,6 +62,13 @@ quad_x = [
[135, CW],
]
quad_h = [
[ 45, CW],
[-135, CW],
[-45, CCW],
[135, CCW],
]
quad_plus = [
[ 90, CCW],
[ -90, CCW],
@ -162,7 +169,7 @@ tri_y = [ @@ -162,7 +169,7 @@ tri_y = [
]
tables = [quad_x, quad_plus, quad_v, quad_wide, quad_deadcat, hex_x, hex_plus, hex_cox, octa_x, octa_plus, octa_cox, twin_engine, tri_y]
tables = [quad_x, quad_h, quad_plus, quad_v, quad_wide, quad_deadcat, hex_x, hex_plus, hex_cox, octa_x, octa_plus, octa_cox, twin_engine, tri_y]
def variableName(variable):
for variableName, value in list(globals().items()):

Loading…
Cancel
Save