From 342aa93213917ef24f2a63ea777dcceb296cf02d Mon Sep 17 00:00:00 2001 From: Kjell Kernen Date: Tue, 1 Apr 2014 01:11:23 +0200 Subject: [PATCH] V-tail and Elevon mixing added to wizard. --- companion/src/images/wizard/cyclic.png | Bin 18604 -> 12692 bytes companion/src/translations/companion_sv.ts | 8 ++-- companion/src/wizarddata.cpp | 41 +++++++++++++-------- companion/src/wizarddata.h | 1 + companion/src/wizarddialog.cpp | 2 + 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/companion/src/images/wizard/cyclic.png b/companion/src/images/wizard/cyclic.png index 1d5a5cdc497d98a4ea8ff1870d483dddf0d08efc..6b1922241ba6d06fde78a7808be6038ea082a8c6 100644 GIT binary patch literal 12692 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 literal 18604 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%0D7u(#4j3cCqRESlHg6GBF! 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 Ele - Höj + Hjd @@ -552,7 +552,7 @@ Om fältet lämnas tomt så är filtret aktivt hela tiden. Ele - Höj + Hjd @@ -3899,7 +3899,7 @@ p, li { white-space: pre-wrap; } Ele - Höj + Hjd @@ -4609,7 +4609,7 @@ p, li { white-space: pre-wrap; } Ele - Höj + Hjd diff --git a/companion/src/wizarddata.cpp b/companion/src/wizarddata.cpp index b67adcb55..b4da413a1 100644 --- a/companion/src/wizarddata.cpp +++ b/companion/src/wizarddata.cpp @@ -37,10 +37,30 @@ WizMix::WizMix(const GeneralSettings & settings, const unsigned int modelId): strcpy(name, " "); } +void WizMix::addMix(ModelData &model, Input input, int weight, int channel, int & mixerIndex) +{ + if (input != NOINPUT) + { + MixData & mix = model.mixData[mixerIndex++]; + mix.destCh = channel+1; + if (input >= RUDDER && input <= AILERON) + { + if (IS_TARANIS(GetEepromInterface()->getBoard())) + mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, input-1, &model); + else + mix.srcRaw = RawSource(SOURCE_TYPE_STICK, input-1); + } + if (input==FLAP){ + } + if (input==AIRBREAK){ + } + mix.weight = weight; + } +} + WizMix::operator ModelData() { ModelData model; - model.used = true; model.modelId = modelId; model.setDefaultInputs(settings); @@ -49,22 +69,13 @@ WizMix::operator ModelData() strncpy(model.name, name, WIZ_MODEL_NAME_LENGTH); model.name[WIZ_MODEL_NAME_LENGTH] = 0; - for (int i=0; i= RUDDER && ch.input1 <= AILERON) { - if (IS_TARANIS(GetEepromInterface()->getBoard())) - mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, ch.input1-1, &model); - else - mix.srcRaw = RawSource(SOURCE_TYPE_STICK, ch.input1-1); - } - mix.weight = ch.weight1; - } + addMix(model, ch.input1, ch.weight1, i, mixIndex); + addMix(model, ch.input2, ch.weight2, i, mixIndex); } - return model; } diff --git a/companion/src/wizarddata.h b/companion/src/wizarddata.h index bc190fdf6..1fe1a4e0b 100644 --- a/companion/src/wizarddata.h +++ b/companion/src/wizarddata.h @@ -91,6 +91,7 @@ class WizMix private: WizMix(); + void addMix(ModelData & model, Input input, int weight, int channel, int & mixerIndex); }; #endif // WIZARDDATA_H diff --git a/companion/src/wizarddialog.cpp b/companion/src/wizarddialog.cpp index e5c5ba9d8..de3fdbed9 100644 --- a/companion/src/wizarddialog.cpp +++ b/companion/src/wizarddialog.cpp @@ -15,12 +15,14 @@ #include #include "wizarddialog.h" #include "wizarddata.h" +#include "helpers.h" WizardDialog::WizardDialog(const GeneralSettings & settings, unsigned int modelId, QWidget *parent) : QWizard(parent), mix(settings, modelId), settings(settings) { + setWindowIcon(CompanionIcon("wizard.png")); setWindowTitle(tr("Model Wizard")); setPage(Page_Models, new ModelSelectionPage(this, "models",tr("Model Type"),tr("Enter model name and model type.")));