From b051aaecb17bb19c94cfde7fed1e84851ff9cd3e Mon Sep 17 00:00:00 2001 From: JMoore5353 Date: Tue, 20 Feb 2024 10:47:57 -0700 Subject: [PATCH] added passthrough back in --- include/mixer.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/mixer.h b/include/mixer.h index 76ed1139..b9098056 100644 --- a/include/mixer.h +++ b/include/mixer.h @@ -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 }; @@ -194,6 +195,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 @@ -226,6 +235,7 @@ class Mixer : public ParamListenerInterface &X8_mixing, &tricopter_mixing, &fixedwing_mixing, + &passthrough_mixing, &fixedwing_vtail_mixing, &custom_mixing}; // clang-format on