Skip to content

Commit

Permalink
added passthrough back in
Browse files Browse the repository at this point in the history
  • Loading branch information
JMoore5353 authored and bsutherland333 committed Feb 22, 2024
1 parent f00eb9c commit e1ca50e
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions include/mixer.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ class Mixer : public ParamListenerInterface
X8 = 8,
TRICOPTER = 9,
FIXEDWING = 10,
VTAIL = 11,
CUSTOM = 12,
PASSTHROUGH = 11,
VTAIL = 12,
CUSTOM = 13,
NUM_MIXERS,
INVALID_MIXER = 255
};
Expand Down Expand Up @@ -201,6 +202,14 @@ class Mixer : public ParamListenerInterface
{0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f}, // Z Mix
50};

const mixer_t passthrough_mixing = {{NONE, NONE, NONE, NONE, NONE, NONE, NONE, NONE},

{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, // F Mix
{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, // X Mix
{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, // Y Mix
{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, // Z Mix
50};

const mixer_t fixedwing_vtail_mixing = {
{M, S, S, S, S, S, S,
S}, // output type - Motor | LAil | RAil | LRudVator | RRudVator | LAirBrake | RAirBrake | LandingGear
Expand Down Expand Up @@ -233,6 +242,7 @@ class Mixer : public ParamListenerInterface
&X8_mixing,
&tricopter_mixing,
&fixedwing_mixing,
&passthrough_mixing,
&fixedwing_vtail_mixing,
&custom_mixing};
// clang-format on
Expand Down

0 comments on commit e1ca50e

Please sign in to comment.