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

This takes care of connection sources to the right channels. BUt I have a terribel feeling that I must be duplicating code. This code just has to exist somewhere.

Browse source
This commit is contained in:
Kjell Kernen 2014-04-04 14:41:09 +02:00
parent 4c6cdd4ed5
commit 63bacf04f8
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
companion/src/eeprominterface.cpp
View file

@ -916,6 +916,15 @@ RawSource GeneralSettings::getDefaultSource(unsigned int channel) const
return RawSource(SOURCE_TYPE_STICK, stick_index);
}
int GeneralSettings::translateSource(unsigned int channel) const
{
for(int i=0; i<4; i++){
if (chout_ar[4*templateSetup + i]==(channel+1))
return i;
}
return -1;
}
void FrSkyData::clear()
{
memset(this, 0, sizeof(FrSkyData));

1
companion/src/eeprominterface.h
View file

@ -417,6 +417,7 @@ class GeneralSettings {
GeneralSettings();
RawSource getDefaultSource(unsigned int channel) const;
int translateSource(unsigned int channel) const;
unsigned int version;
unsigned int variant;

4
companion/src/wizarddata.cpp
View file

@ -56,8 +56,8 @@ void WizMix::addMix(ModelData &model, Input input, int weight, int channel, int
MixData & mix = model.mixData[mixIndex++];
mix.destCh = channel+1;
if (isTaranis){
RawSource tmpSource = settings.getDefaultSource( input-1 );
mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, tmpSource.index, &model);
int source = settings.translateSource(input-1);
mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, source, &model);
}
else
mix.srcRaw = RawSource(SOURCE_TYPE_STICK, input-1);