Removed MixesWithoutExpo capability. Added missing files for previous commit.

This commit is contained in:
Damjan Adamic
2014-06-01 16:13:06 +02:00
parent d641147ef0
commit 6d384759ae
3 changed files with 3 additions and 4 deletions
-1
View File
@@ -1067,7 +1067,6 @@ enum Capability {
FlightModesName, FlightModesName,
FlightModesHaveFades, FlightModesHaveFades,
Mixes, Mixes,
MixesWithoutExpo,
Timers, Timers,
TimeDivisions, TimeDivisions,
CustomFunctions, CustomFunctions,
@@ -586,14 +586,14 @@ int OpenTxFirmware::getCapability(const Capability capability)
return 1; return 1;
case DSM2Indexes: case DSM2Indexes:
return 1; return 1;
case MixesWithoutExpo:
return 1;
case NumCurves: case NumCurves:
return (IS_TARANIS(board) ? 32 : (IS_ARM(board) ? 16 : 8)); return (IS_TARANIS(board) ? 32 : (IS_ARM(board) ? 16 : 8));
case HasMixerNames: case HasMixerNames:
return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false); return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false);
case HasExpoNames: case HasExpoNames:
return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false); return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : false);
case HasNoExpo:
return (IS_TARANIS(board) ? false : true);
case ChannelsName: case ChannelsName:
return (IS_TARANIS(board) ? 6 : 0); return (IS_TARANIS(board) ? 6 : 0);
case HasCvNames: case HasCvNames:
+1 -1
View File
@@ -143,7 +143,7 @@ void MixerDialog::valuesChanged()
lock = true; lock = true;
QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 }; QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
md->srcRaw = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt(), &model); md->srcRaw = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt(), &model);
if (!firmware->getCapability(VirtualInputs) && firmware->getCapability(MixesWithoutExpo)) { if (firmware->getCapability(HasNoExpo)) {
bool drVisible = (md->srcRaw.type == SOURCE_TYPE_STICK && md->srcRaw.index < NUM_STICKS); bool drVisible = (md->srcRaw.type == SOURCE_TYPE_STICK && md->srcRaw.index < NUM_STICKS);
ui->MixDR_CB->setEnabled(drVisible); ui->MixDR_CB->setEnabled(drVisible);
ui->label_MixDR->setEnabled(drVisible); ui->label_MixDR->setEnabled(drVisible);