Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

V-tail and Elevon mixing added to wizard.

Browse source
This commit is contained in:
Kjell Kernen 2014-04-01 01:11:23 +02:00
parent a527a869c1
commit 342aa93213
5 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
companion/src/images/wizard/cyclic.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

8
companion/src/translations/companion_sv.ts
View file

@ -484,7 +484,7 @@ Om fältet lämnas tomt så är filtret aktivt hela tiden.</translation>
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>Ele</source> <source>Ele</source>
<translation>Höj</translation> <translation>Hjd</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
@ -552,7 +552,7 @@ Om fältet lämnas tomt så är filtret aktivt hela tiden.</translation>
<message> <message>
<location line="+0"/> <location line="+0"/>
<source>Ele</source> <source>Ele</source>
<translation>Höj</translation> <translation>Hjd</translation>
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>
@ -3899,7 +3899,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>Ele</source> <source>Ele</source>
<translation>Höj</translation> <translation>Hjd</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
@ -4609,7 +4609,7 @@ p, li { white-space: pre-wrap; }
<location line="+0"/> <location line="+0"/>
<location filename="../helpers.cpp" line="+0"/> <location filename="../helpers.cpp" line="+0"/>
<source>Ele</source> <source>Ele</source>
<translation>Höj</translation> <translation>Hjd</translation>
</message> </message>
<message> <message>
<location line="+0"/> <location line="+0"/>

41
companion/src/wizarddata.cpp
View file

@ -37,10 +37,30 @@ WizMix::WizMix(const GeneralSettings & settings, const unsigned int modelId):
strcpy(name, " "); 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() WizMix::operator ModelData()
{ {
ModelData model; ModelData model;
model.used = true; model.used = true;
model.modelId = modelId; model.modelId = modelId;
model.setDefaultInputs(settings); model.setDefaultInputs(settings);
@ -49,22 +69,13 @@ WizMix::operator ModelData()
strncpy(model.name, name, WIZ_MODEL_NAME_LENGTH); strncpy(model.name, name, WIZ_MODEL_NAME_LENGTH);
model.name[WIZ_MODEL_NAME_LENGTH] = 0; model.name[WIZ_MODEL_NAME_LENGTH] = 0;
for (int i=0; i<WIZ_MAX_CHANNELS; i++ ) { int mixIndex = 0;
for (int i=0; i<WIZ_MAX_CHANNELS; i++ )
{
Channel ch = channel[i]; Channel ch = channel[i];
if (ch.page != Page_None) { addMix(model, ch.input1, ch.weight1, i, mixIndex);
// qDebug() << "channel" << i << "page" << ch.page << ch.input1 << ch.input2; addMix(model, ch.input2, ch.weight2, i, mixIndex);
MixData & mix = model.mixData[i];
mix.destCh = i+1;
if (ch.input1 >= 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;
}
}
return model; return model;
} }

1
companion/src/wizarddata.h
View file

@ -91,6 +91,7 @@ class WizMix
private: private:
WizMix(); WizMix();
void addMix(ModelData & model, Input input, int weight, int channel, int & mixerIndex);
}; };
#endif // WIZARDDATA_H #endif // WIZARDDATA_H

2
companion/src/wizarddialog.cpp
View file

@ -15,12 +15,14 @@
#include <QtGui> #include <QtGui>
#include "wizarddialog.h" #include "wizarddialog.h"
#include "wizarddata.h" #include "wizarddata.h"
#include "helpers.h"
WizardDialog::WizardDialog(const GeneralSettings & settings, unsigned int modelId, QWidget *parent) WizardDialog::WizardDialog(const GeneralSettings & settings, unsigned int modelId, QWidget *parent)
: QWizard(parent), : QWizard(parent),
mix(settings, modelId), mix(settings, modelId),
settings(settings) settings(settings)
{ {
setWindowIcon(CompanionIcon("wizard.png"));
setWindowTitle(tr("Model Wizard")); setWindowTitle(tr("Model Wizard"));
setPage(Page_Models, new ModelSelectionPage(this, "models",tr("Model Type"),tr("Enter model name and model type."))); setPage(Page_Models, new ModelSelectionPage(this, "models",tr("Model Type"),tr("Enter model name and model type.")));