diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index a57990e14..2acda3b71 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -577,7 +577,6 @@ class MixData {
MltpxValue mltpx; // multiplex method 0=+ 1=* 2=replace
unsigned int mixWarn; // mixer warning
unsigned int phases; // -5=!FP4, 0=normal, 5=FP4
- unsigned int lateOffset;
int sOffset;
char name[10+1];
@@ -995,7 +994,6 @@ enum Capability {
HasPPMSim,
HasCrossTrims,
HasStickScroll,
- HasFixOffset,
HasSoundMixer,
NumModules,
FSSwitch,
diff --git a/companion/src/firmwares/er9x/er9xeeprom.cpp b/companion/src/firmwares/er9x/er9xeeprom.cpp
index 89f28f311..f07716e72 100644
--- a/companion/src/firmwares/er9x/er9xeeprom.cpp
+++ b/companion/src/firmwares/er9x/er9xeeprom.cpp
@@ -229,7 +229,7 @@ t_Er9xMixData::operator MixData ()
c9x.curve.value = curve;
}
- c9x.lateOffset=lateOffset;
+ // c9x.lateOffset=lateOffset;
c9x.delayUp = delayUp;
c9x.delayDown = delayDown;
c9x.speedUp = speedUp;
diff --git a/companion/src/firmwares/er9x/er9xinterface.cpp b/companion/src/firmwares/er9x/er9xinterface.cpp
index 4f986ced7..123ec7f3b 100644
--- a/companion/src/firmwares/er9x/er9xinterface.cpp
+++ b/companion/src/firmwares/er9x/er9xinterface.cpp
@@ -281,8 +281,6 @@ int Er9xInterface::getCapability(const Capability capability)
case HasVolume:
case HasBlInvert:
case ModelVoice:
- case HasFixOffset:
- return 1;
case Gvars:
return 7;
case GvarsHaveSources:
diff --git a/companion/src/modeledit/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
index 33c374ef9..896cdad56 100644
--- a/companion/src/modeledit/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -83,16 +83,11 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
populateCurveReference(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, md->curve, 0);
- ui->FixOffsetChkB->setChecked(md->lateOffset);
ui->MixDR_CB->setChecked(md->noExpo==0);
if (!GetEepromInterface()->getCapability(MixesWithoutExpo)) {
ui->MixDR_CB->hide();
ui->label_MixDR->hide();
}
- if (!GetEepromInterface()->getCapability(HasFixOffset)) {
- ui->FixOffsetChkB->hide();
- ui->label_FixOffset->hide();
- }
if (GetEepromInterface()->getCapability(ExtraTrims)) {
ui->trimCB->addItem(tr("Rud"),1);
ui->trimCB->addItem(tr("Ele"),2);
@@ -171,7 +166,6 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
connect(ui->offsetGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
connect(ui->trimCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
connect(ui->MixDR_CB,SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
- connect(ui->FixOffsetChkB,SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
connect(ui->warningCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
connect(ui->mltpxCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
@@ -261,7 +255,6 @@ void MixerDialog::valuesChanged()
}
md->carryTrim = -(ui->trimCB->currentIndex()-1);
md->noExpo = ui->MixDR_CB->checkState() ? 0 : 1;
- md->lateOffset = ui->FixOffsetChkB->checkState() ? 1 : 0;
// TODO md->curve = ui->curvesCB->currentIndex()-(numcurves)*GetEepromInterface()->getCapability(HasNegCurves);
// TODO if (ui->differentialGV->isChecked()) {
diff --git a/companion/src/modeledit/mixerdialog.ui b/companion/src/modeledit/mixerdialog.ui
index 3eec442eb..c41bf2563 100644
--- a/companion/src/modeledit/mixerdialog.ui
+++ b/companion/src/modeledit/mixerdialog.ui
@@ -178,30 +178,6 @@ p, li { white-space: pre-wrap; }
-
-
-
-
-
- Include DR/Expo
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- Flight modes
-
-
-
-
@@ -209,146 +185,21 @@ p, li { white-space: pre-wrap; }
- -
-
+
-
+
- Switch
+ Offset
- -
-
+
-
+
-
+ Weight
- -
-
-
- The curve used by the mix
-
-
-
- -
-
-
- Mixer warning.
-Setting this value will cause a beep to be emmitted when this value is active.
-
-
-
-
- OFF
-
-
- -
-
- 1 Beep
-
-
- -
-
- 2 Beep
-
-
- -
-
- 3 Beep
-
-
-
-
- -
-
-
- Fix Offset
-
-
-
- -
-
-
-
-
- No
-
-
- -
-
- Yes
-
-
-
-
- -
-
-
-
-
-
- GV
-
-
-
- -
-
-
- The source for the mixer
-
-
-
- -
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- Multiplexer
-
-This determines how mixer values are added.
-
-"+" means the value of the current mix is added to the previous mixes in the same channel.
-"*" means the value of the current mix is amultiplied with the previous mixes in the same channel.
-"R" means the value replaces the previous values. If the switch is off the value will be ignored.
-
-
-
-
- ADD
-
-
- -
-
- MULTIPLY
-
-
- -
-
- REPLACE
-
-
-
-
- -
-
-
- The source for the mixer
-
-
-
- -
+
-
-
@@ -505,20 +356,6 @@ This determines how mixer values are added.
- -
-
-
- Warning
-
-
-
- -
-
-
- Multiplex
-
-
-
-
@@ -533,17 +370,163 @@ This determines how mixer values are added.
- -
-
+
-
+
- Weight
+ Multiplex
- -
-
+
-
+
- Offset
+ Warning
+
+
+
+ -
+
+
+ The curve used by the mix
+
+
+
+ -
+
+
+ Include DR/Expo
+
+
+
+ -
+
+
+ Flight modes
+
+
+
+ -
+
+
+ Switch
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Mixer warning.
+Setting this value will cause a beep to be emmitted when this value is active.
+
+
-
+
+ OFF
+
+
+ -
+
+ 1 Beep
+
+
+ -
+
+ 2 Beep
+
+
+ -
+
+ 3 Beep
+
+
+
+
+ -
+
+
-
+
+ No
+
+
+ -
+
+ Yes
+
+
+
+
+ -
+
+
-
+
+
+ GV
+
+
+
+ -
+
+
+ The source for the mixer
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Multiplexer
+
+This determines how mixer values are added.
+
+"+" means the value of the current mix is added to the previous mixes in the same channel.
+"*" means the value of the current mix is amultiplied with the previous mixes in the same channel.
+"R" means the value replaces the previous values. If the switch is off the value will be ignored.
+
+
-
+
+ ADD
+
+
+ -
+
+ MULTIPLY
+
+
+ -
+
+ REPLACE
+
+
+
+
+ -
+
+
+ The source for the mixer
@@ -588,7 +571,7 @@ This determines how mixer values are added.
- -
+
-
Switch used by the mix.