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

Merge branch 'upstream/next'

Browse source
This commit is contained in:
projectkk2glider 2014-04-16 09:34:14 +02:00
commit 4ccbc13f6a
44 changed files with 2840 additions and 3020 deletions
Download patch file Download diff file Expand all files Collapse all files

5
companion/src/eeprominterface.cpp
View file

@ -308,10 +308,7 @@ QString RawSource::toString()
case SOURCE_TYPE_PPM:
return QObject::tr("TR%1").arg(index+1);
case SOURCE_TYPE_CH:
if (index < GetEepromInterface()->getCapability(Outputs))
return QObject::tr("CH%1%2").arg((index+1)/10).arg((index+1)%10);
else
return QObject::tr("X%1").arg(index-GetEepromInterface()->getCapability(Outputs)+1);
return QObject::tr("CH%1").arg(index+1);
case SOURCE_TYPE_TELEMETRY:
return CHECK_IN_ARRAY(telemetry, index);
case SOURCE_TYPE_GVAR: