diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index f2d39810a..2cc820f3d 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -986,7 +986,6 @@ class RadioData { // TODO rename FlightPhase to FlightMode enum Capability { - OwnerName, FlightPhases, FlightModesName, FlightPhasesHaveFades, @@ -1013,7 +1012,6 @@ enum Capability { ExtraChannels, ExtraInputs, ExtendedTrims, - HasInputFilter, NumCurves, NumCurvePoints, OffsetWeight, @@ -1026,11 +1024,7 @@ enum Capability { Haptic, HapticLength, HapticMode, - HasBlInvert, HasBeeper, - BandgapMeasure, - PotScrolling, - TrainerSwitch, ModelTrainerEnable, Timer2ThrTrig, HasExpoNames, @@ -1045,8 +1039,6 @@ enum Capability { OptrexDisplay, PPMExtCtrl, PPMFrameLength, - gsSwitchMask, - BLonStickMove, DSM2Indexes, Telemetry, TelemetryUnits, @@ -1061,8 +1053,6 @@ enum Capability { TelemetryCustomScreens, TelemetryCustomScreensFieldsPerLine, TelemetryRSSIModel, - TelemetryAlarm, - TelemetryInternalAlarm, TelemetryTimeshift, TelemetryMaxMultiplier, HasAltitudeSel, @@ -1070,9 +1060,6 @@ enum Capability { HasVarioSink, HasVariants, HasFailsafe, - HasPPMSim, - HasCrossTrims, - HasStickScroll, HasSoundMixer, NumModules, PPMCenter, @@ -1095,7 +1082,6 @@ enum Capability { LuaInputs, LimitsPer1000, EnhancedCurves, - TelemetryInternalAlarms, HasFasOffset, HasMahPersistent, MultiposPots, diff --git a/companion/src/firmwares/er9x/er9xinterface.cpp b/companion/src/firmwares/er9x/er9xinterface.cpp index af05f58c5..bde6ef768 100644 --- a/companion/src/firmwares/er9x/er9xinterface.cpp +++ b/companion/src/firmwares/er9x/er9xinterface.cpp @@ -213,22 +213,14 @@ int Er9xInterface::getCapability(const Capability capability) return 1; case Timer2ThrTrig: return 1; - case TrainerSwitch: - return 1; case OffsetWeight: return 125; - case BandgapMeasure: - return 1; - case PotScrolling: - return 1; case SoundMod: return 1; case SoundPitch: return 1; case Haptic: return 1; - case OwnerName: - return 10; case Timers: return 1; case Pots: @@ -251,10 +243,6 @@ int Er9xInterface::getCapability(const Capability capability) return 0; case Simulation: return 1; - case gsSwitchMask: - return 1; - case BLonStickMove: - return 1; case Telemetry: return TM_HASTELEMETRY|TM_HASWSHH; case TelemetryUnits: @@ -270,14 +258,9 @@ int Er9xInterface::getCapability(const Capability capability) case LCDWidth: return 128; case VoicesAsNumbers: - case TelemetryInternalAlarm: - case HasPPMSim: - case HasCrossTrims: - case HasStickScroll: case HasAltitudeSel: case HasContrast: case HasVolume: - case HasBlInvert: case ModelVoice: case Gvars: return 7; diff --git a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp index 7ff98b5a1..91ae4ec59 100644 --- a/companion/src/firmwares/ersky9x/ersky9xinterface.cpp +++ b/companion/src/firmwares/ersky9x/ersky9xinterface.cpp @@ -255,22 +255,12 @@ int Ersky9xInterface::getCapability(const Capability capability) return 1; case Timer2ThrTrig: return 1; - case TrainerSwitch: - return 1; - case BandgapMeasure: - return 1; - case PotScrolling: - return 1; case SoundMod: return 1; case SoundPitch: return 1; case Haptic: return 1; - case OwnerName: - return 10; - case HasInputFilter: - return 0; case ModelVoice: return 1; case Timers: @@ -297,10 +287,6 @@ int Ersky9xInterface::getCapability(const Capability capability) return 0; case Simulation: return 1; - case gsSwitchMask: - return 1; - case BLonStickMove: - return 1; case Telemetry: return TM_HASTELEMETRY|TM_HASWSHH; case TelemetryUnits: diff --git a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp index 7a2ce5f46..2afe8ba03 100644 --- a/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp +++ b/companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp @@ -219,8 +219,6 @@ int Gruvin9xInterface::getSize(GeneralSettings &settings) int Gruvin9xInterface::getCapability(const Capability capability) { switch (capability) { - case OwnerName: - return 0; case Mixes: return G9X_MAX_MIXERS; case FlightPhases: diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index b77532130..61b30e027 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -451,8 +451,6 @@ int OpenTxInterface::getSize(GeneralSettings &settings) int OpenTxInterface::getCapability(const Capability capability) { switch (capability) { - case OwnerName: - return 0; case ModelImage: if (IS_TARANIS(board)) return 1; @@ -619,8 +617,6 @@ int OpenTxInterface::getCapability(const Capability capability) return 1; case TelemetryRSSIModel: return 1; - case TelemetryAlarm: - return 0; case TelemetryTimeshift: return 1; case TelemetryMaxMultiplier: @@ -676,8 +672,6 @@ int OpenTxInterface::getCapability(const Capability capability) case LuaInputs: case LimitsPer1000: case EnhancedCurves: - case TelemetryInternalAlarms: - return IS_TARANIS(board); case HasFasOffset: return (IS_STOCK(board) ? false : true); case HasMahPersistent: diff --git a/companion/src/firmwares/th9x/th9xinterface.cpp b/companion/src/firmwares/th9x/th9xinterface.cpp index 8e1b50866..aefe77d8c 100644 --- a/companion/src/firmwares/th9x/th9xinterface.cpp +++ b/companion/src/firmwares/th9x/th9xinterface.cpp @@ -145,8 +145,6 @@ int Th9xInterface::getCapability(const Capability capability) switch (capability) { case Mixes: return TH9X_MAX_MIXERS; - case OwnerName: - return 0; case Timers: return 1; case Pots: @@ -168,8 +166,6 @@ int Th9xInterface::getCapability(const Capability capability) case Simulation: return 1; case HasContrast: - case HasInputFilter: - return 1; case CSFunc: return 13; case SlowScale: diff --git a/companion/src/generaledit.cpp b/companion/src/generaledit.cpp index 6d9681efd..8db6ad4aa 100644 --- a/companion/src/generaledit.cpp +++ b/companion/src/generaledit.cpp @@ -79,9 +79,7 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) : } } } - - QRegExp rx(CHAR_FOR_NAMES_REGEX); - ui->ownerNameLE->setValidator(new QRegExpValidator(rx, this)); + switchDefPosEditLock=true; populateBacklightCB(ui->backlightswCB, g_eeGeneral.backlightMode); bool voice = current_firmware_variant.id.contains("voice"); @@ -133,13 +131,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) : ui->varioPMax_SB->setValue(700+(g_eeGeneral.varioPitch*10)+1000+(g_eeGeneral.varioRange*10)); ui->varioR0_SB->setValue(500+(g_eeGeneral.varioRepeat*10)); } - - if (!GetEepromInterface()->getCapability(HasBlInvert)) { - ui->blinvert_cb->hide(); - ui->blinvert_label->hide(); - } else { - ui->blinvert_cb->setChecked(g_eeGeneral.blightinv); - } if (!GetEepromInterface()->getCapability(HasFAIMode)) { ui->faimode_CB->hide(); ui->label_faimode->hide(); @@ -147,35 +138,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) : else { ui->faimode_CB->setChecked(g_eeGeneral.fai); } - ui->ownerNameLE->setText(g_eeGeneral.ownerName); - if (!GetEepromInterface()->getCapability(OwnerName)) { - ui->ownerNameLE->setDisabled(true); - ui->label_ownerName->hide(); - ui->ownerNameLE->hide(); - ui->hideNameOnSplashChkB->setDisabled(true); - ui->hideNameOnSplashChkB->hide(); - ui->label_hideOwnerName->hide(); - } - if (!GetEepromInterface()->getCapability(HasInputFilter)) { - ui->inputfilterCB->hide(); - ui->inputfilterLabel->hide(); - } - if (!GetEepromInterface()->getCapability(HasStickScroll)) { - ui->StickScrollChkB->hide(); - ui->StickScrollLB->hide(); - } - if (!GetEepromInterface()->getCapability(TelemetryInternalAlarm)) { - ui->frskyintalarmChkB->hide(); - ui->label_frskyintalarm->hide(); - } - if (!GetEepromInterface()->getCapability(HasCrossTrims)) { - ui->crosstrimChkB->hide(); - ui->crosstrimLB->hide(); - } - if (!GetEepromInterface()->getCapability(HasPPMSim)) { - ui->PPMSimLB->hide(); - ui->PPMSimChkB->hide(); - } if (!GetEepromInterface()->getCapability( HasPxxCountry)) { ui->countrycode_label->hide(); ui->countrycode_CB->hide(); @@ -223,9 +185,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) : ui->label_CurrentCalib->hide(); } - if (GetEepromInterface()->getCapability(TelemetryRSSIModel) ) { - ui->tabWidget->removeTab(2); - } ui->tabWidget->setCurrentIndex(0); if (!GetEepromInterface()->getCapability(SoundMod)) { @@ -245,14 +204,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) : ui->hapticStrengthSB->hide(); ui->label_hapticStrengthSB->hide(); } - - if (GetEepromInterface()->getCapability(PerModelTimers)) { - ui->beepCountDownChkB->hide(); - ui->beepFlashChkB->hide(); - ui->beepMinuteChkB->hide(); - ui->label_timers->hide(); - } - if (!GetEepromInterface()->getCapability(HapticMode)) { ui->hapticmodeCB->setDisabled(true); @@ -260,66 +211,6 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) : ui->label_hapticmode->hide(); } - if (!GetEepromInterface()->getCapability(BandgapMeasure)) { - ui->BandGapEnableChkB->setDisabled(true); - ui->BandGapEnableChkB->hide(); - ui->label_BandGapEnable->hide(); - } - - if (!GetEepromInterface()->getCapability(PotScrolling)) { - ui->PotScrollEnableChkB->setDisabled(true); - ui->PotScrollEnableChkB->hide(); - ui->label_PotScrollEnable->hide(); - } - - if (!GetEepromInterface()->getCapability(TrainerSwitch)) { - ui->label_switch->hide(); - ui->swtchCB_1->setDisabled(true); - ui->swtchCB_2->setDisabled(true); - ui->swtchCB_3->setDisabled(true); - ui->swtchCB_4->setDisabled(true); - ui->swtchCB_1->hide(); - ui->swtchCB_2->hide(); - ui->swtchCB_3->hide(); - ui->swtchCB_4->hide(); - } else { - populateSwitchCB(ui->swtchCB_1,g_eeGeneral.trainer.mix[0].swtch); - populateSwitchCB(ui->swtchCB_2,g_eeGeneral.trainer.mix[1].swtch); - populateSwitchCB(ui->swtchCB_3,g_eeGeneral.trainer.mix[2].swtch); - populateSwitchCB(ui->swtchCB_4,g_eeGeneral.trainer.mix[3].swtch); - } - if (!GetEepromInterface()->getCapability(BLonStickMove)) { - ui->blOnStickMoveSB->setDisabled(true); - ui->blOnStickMoveSB->hide(); - ui->label_blOnStickMove->hide(); - } else { - ui->blOnStickMoveSB->setValue(g_eeGeneral.lightOnStickMove*5); - } - if (!GetEepromInterface()->getCapability(gsSwitchMask)) { - ui->swAILChkB->setDisabled(true); - ui->swELEChkB->setDisabled(true); - ui->swTHRChkB->setDisabled(true); - ui->swRUDChkB->setDisabled(true); - ui->swGEAChkB->setDisabled(true); - ui->swID0ChkB->setDisabled(true); - ui->swID1ChkB->setDisabled(true); - ui->swID2ChkB->setDisabled(true); - ui->swAILChkB->hide(); - ui->swELEChkB->hide(); - ui->swTHRChkB->hide(); - ui->swRUDChkB->hide(); - ui->swGEAChkB->hide(); - ui->swID0ChkB->hide(); - ui->swID1ChkB->hide(); - ui->swID2ChkB->hide(); - this->layout()->removeItem(ui->switchMaskLayout); - } else { - setSwitchDefPos(); - } - if (!GetEepromInterface()->getCapability(TelemetryAlarm)) { - ui->telalarmsChkB->hide(); - ui->label_telalarms->hide(); - } int renumber=GetEepromInterface()->getCapability(RotaryEncoders); if (renumber==0) { ui->re_label->hide(); @@ -327,28 +218,15 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) : } else { populateRotEncCB(ui->re_CB, g_eeGeneral.reNavigation, renumber); } - ui->telalarmsChkB->setChecked(g_eeGeneral.enableTelemetryAlarm); - ui->PotScrollEnableChkB->setChecked(!g_eeGeneral.disablePotScroll); - ui->BandGapEnableChkB->setChecked(!g_eeGeneral.disableBG); ui->contrastSB->setValue(g_eeGeneral.contrast); ui->battwarningDSB->setValue((double)g_eeGeneral.vBatWarn/10); ui->backlightautoSB->setValue(g_eeGeneral.backlightDelay*5); ui->inactimerSB->setValue(g_eeGeneral.inactivityTimer); - ui->crosstrimChkB->setChecked(g_eeGeneral.crosstrim); - ui->frskyintalarmChkB->setChecked(g_eeGeneral.frskyinternalalarm); - ui->StickScrollChkB->setChecked(g_eeGeneral.stickScroll); - ui->PPMSimChkB->setChecked(g_eeGeneral.enablePpmsim); - ui->inputfilterCB->setCurrentIndex(g_eeGeneral.filterInput); ui->memwarnChkB->setChecked(!g_eeGeneral.disableMemoryWarning); //Default is zero=checked ui->alarmwarnChkB->setChecked(!g_eeGeneral.disableAlarmWarning);//Default is zero=checked - ui->enableTelemetryAlarmChkB->setChecked(g_eeGeneral.enableTelemetryAlarm); - ui->beepMinuteChkB->setChecked(g_eeGeneral.minuteBeep); - ui->beepCountDownChkB->setChecked(g_eeGeneral.preBeep); - ui->beepFlashChkB->setChecked(g_eeGeneral.flashBeep); ui->splashScreenChkB->setChecked(!g_eeGeneral.splashMode); - ui->hideNameOnSplashChkB->setChecked(!g_eeGeneral.hideNameOnSplash); ui->trnMode_1->setCurrentIndex(g_eeGeneral.trainer.mix[0].mode); ui->trnChn_1->setCurrentIndex(g_eeGeneral.trainer.mix[0].src); @@ -462,9 +340,8 @@ void GeneralEdit::setValues() ui->speakerPitchSB->setValue(g_eeGeneral.speakerPitch); ui->hapticStrengthSB->setValue(g_eeGeneral.hapticStrength); ui->hapticmodeCB->setCurrentIndex(g_eeGeneral.hapticMode+2); - ui->battcalibDSB->setValue((double)g_eeGeneral.vBatCalib/10); + ui->battCalibDSB->setValue((double)g_eeGeneral.vBatCalib/10); ui->CurrentCalib_SB->setValue((double)g_eeGeneral.currentCalib); - ui->battCalib->setValue((double)g_eeGeneral.vBatCalib/10); ui->ana1Neg->setValue(g_eeGeneral.calibSpanNeg[0]); ui->ana2Neg->setValue(g_eeGeneral.calibSpanNeg[1]); @@ -500,27 +377,6 @@ void GeneralEdit::setValues() ui->PPM_MultiplierDSB->setValue((qreal)(g_eeGeneral.PPM_Multiplier+10)/10); } -void GeneralEdit::setSwitchDefPos() -{ - quint8 x = g_eeGeneral.switchWarningStates & 0x38; - if(x==0x00 || x==0x18 || x== 0x28 || x==0x38 || x==0x30) //illegal states for ID0/1/2 - { - g_eeGeneral.switchWarningStates &= ~0x38; // turn all off, make sure only one is on - g_eeGeneral.switchWarningStates |= 0x08; - } - - switchDefPosEditLock = true; - ui->swTHRChkB->setChecked(g_eeGeneral.switchWarningStates & 0x01); - ui->swRUDChkB->setChecked(g_eeGeneral.switchWarningStates & 0x02); - ui->swELEChkB->setChecked(g_eeGeneral.switchWarningStates & 0x04); - ui->swID0ChkB->setChecked(g_eeGeneral.switchWarningStates & 0x08); - ui->swID1ChkB->setChecked(g_eeGeneral.switchWarningStates & 0x10); - ui->swID2ChkB->setChecked(g_eeGeneral.switchWarningStates & 0x20); - ui->swAILChkB->setChecked(g_eeGeneral.switchWarningStates & 0x40); - ui->swGEAChkB->setChecked(g_eeGeneral.switchWarningStates & 0x80); - switchDefPosEditLock = false; -} - void GeneralEdit::updateSettings() { radioData.generalSettings = g_eeGeneral; @@ -539,10 +395,9 @@ void GeneralEdit::on_battwarningDSB_editingFinished() updateSettings(); } -void GeneralEdit::on_battcalibDSB_editingFinished() +void GeneralEdit::on_battCalibDSB_editingFinished() { - g_eeGeneral.vBatCalib = ui->battcalibDSB->value()*10; - ui->battCalib->setValue(ui->battcalibDSB->value()); + g_eeGeneral.vBatCalib = ui->battCalibDSB->value()*10; updateSettings(); } @@ -630,29 +485,12 @@ void GeneralEdit::on_timezoneSB_editingFinished() updateSettings(); } - -void GeneralEdit::on_blOnStickMoveSB_editingFinished() -{ - int i = ui->blOnStickMoveSB->value()/5; - if((i*5)!=ui->blOnStickMoveSB->value()) - ui->blOnStickMoveSB->setValue(i*5); - - g_eeGeneral.lightOnStickMove = i; - updateSettings(); -} - void GeneralEdit::on_inactimerSB_editingFinished() { g_eeGeneral.inactivityTimer = ui->inactimerSB->value(); updateSettings(); } -void GeneralEdit::on_inputfilterCB_currentIndexChanged(int index) -{ - g_eeGeneral.filterInput = index; - updateSettings(); -} - void GeneralEdit::on_memwarnChkB_stateChanged(int ) { g_eeGeneral.disableMemoryWarning = ui->memwarnChkB->isChecked() ? 0 : 1; @@ -665,12 +503,6 @@ void GeneralEdit::on_alarmwarnChkB_stateChanged(int ) updateSettings(); } -void GeneralEdit::on_enableTelemetryAlarmChkB_stateChanged(int ) -{ - g_eeGeneral.enableTelemetryAlarm = ui->enableTelemetryAlarmChkB->isChecked(); - updateSettings(); -} - void GeneralEdit::on_beeperCB_currentIndexChanged(int index) { g_eeGeneral.beeperMode = (BeeperMode)(index-2); @@ -919,13 +751,6 @@ void GeneralEdit::on_ana8Pos_editingFinished() updateSettings(); } -void GeneralEdit::on_battCalib_editingFinished() -{ - g_eeGeneral.vBatCalib = ui->battCalib->value()*10; - ui->battcalibDSB->setValue(ui->battCalib->value()); - updateSettings(); -} - void GeneralEdit::on_volume_SB_editingFinished() { g_eeGeneral.speakerVolume = ui->volume_SB->value(); @@ -1022,49 +847,18 @@ void GeneralEdit::on_tabWidget_currentChanged(int index) g.generalEditTab(index); } - -void GeneralEdit::on_beepMinuteChkB_stateChanged(int ) -{ - g_eeGeneral.minuteBeep = ui->beepMinuteChkB->isChecked() ? 1 : 0; - updateSettings(); -} - -void GeneralEdit::on_beepCountDownChkB_stateChanged(int ) -{ - g_eeGeneral.preBeep = ui->beepCountDownChkB->isChecked() ? 1 : 0; - updateSettings(); -} - -void GeneralEdit::on_beepFlashChkB_stateChanged(int ) -{ - g_eeGeneral.flashBeep = ui->beepFlashChkB->isChecked() ? 1 : 0; - updateSettings(); -} - void GeneralEdit::on_splashScreenChkB_stateChanged(int ) { g_eeGeneral.splashMode = ui->splashScreenChkB->isChecked() ? 0 : 1; updateSettings(); } -void GeneralEdit::on_hideNameOnSplashChkB_stateChanged(int ) -{ - g_eeGeneral.hideNameOnSplash = ui->hideNameOnSplashChkB->isChecked() ? 0 : 1; - updateSettings(); -} - void GeneralEdit::on_PPM_MultiplierDSB_editingFinished() { g_eeGeneral.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10; updateSettings(); } -void GeneralEdit::on_ownerNameLE_editingFinished() -{ - strncpy(g_eeGeneral.ownerName, ui->ownerNameLE->text().toAscii(), 10); - updateSettings(); -} - void GeneralEdit::on_speakerPitchSB_editingFinished() { g_eeGeneral.speakerPitch = ui->speakerPitchSB->value(); @@ -1083,18 +877,6 @@ void GeneralEdit::on_soundModeCB_currentIndexChanged(int index) updateSettings(); } -void GeneralEdit::on_PotScrollEnableChkB_stateChanged(int ) -{ - g_eeGeneral.disablePotScroll = ui->PotScrollEnableChkB->isChecked() ? false : true; - updateSettings(); -} - -void GeneralEdit::on_blinvert_cb_stateChanged(int ) -{ - g_eeGeneral.blightinv = ui->blinvert_cb->isChecked(); - updateSettings(); -} - void GeneralEdit::on_faimode_CB_stateChanged(int ) { if (ui->faimode_CB->isChecked()) { @@ -1112,159 +894,6 @@ void GeneralEdit::on_faimode_CB_stateChanged(int ) updateSettings(); } -void GeneralEdit::on_BandGapEnableChkB_stateChanged(int ) -{ - g_eeGeneral.disableBG = ui->BandGapEnableChkB->isChecked() ? false : true; - updateSettings(); -} - -void GeneralEdit::on_crosstrimChkB_stateChanged(int ) -{ - g_eeGeneral.crosstrim = ui->crosstrimChkB->isChecked() ? true : false; - updateSettings(); -} - -void GeneralEdit::on_frskyintalarmChkB_stateChanged(int ) -{ - g_eeGeneral.frskyinternalalarm = ui->frskyintalarmChkB->isChecked() ? true : false ; - updateSettings(); -} - -void GeneralEdit::on_StickScrollChkB_stateChanged(int ) -{ - g_eeGeneral.stickScroll = ui->StickScrollChkB->isChecked() ? true : false; - updateSettings(); -} - -void GeneralEdit::on_PPMSimChkB_stateChanged(int ) -{ - g_eeGeneral.enablePpmsim = ui->PPMSimChkB->isChecked() ? true : false; - updateSettings(); -} - -void GeneralEdit::on_swtchCB_1_currentIndexChanged(int index) -{ - g_eeGeneral.trainer.mix[0].swtch = RawSwitch(ui->swtchCB_1->itemData(ui->swtchCB_1->currentIndex()).toInt()); - updateSettings(); -} - -void GeneralEdit::on_swtchCB_2_currentIndexChanged(int index) -{ - g_eeGeneral.trainer.mix[1].swtch = RawSwitch(ui->swtchCB_2->itemData(ui->swtchCB_2->currentIndex()).toInt()); - updateSettings(); -} - -void GeneralEdit::on_swtchCB_3_currentIndexChanged(int index) -{ - g_eeGeneral.trainer.mix[2].swtch = RawSwitch(ui->swtchCB_3->itemData(ui->swtchCB_3->currentIndex()).toInt()); - updateSettings(); -} - -void GeneralEdit::on_swtchCB_4_currentIndexChanged(int index) -{ - g_eeGeneral.trainer.mix[3].swtch = RawSwitch(ui->swtchCB_4->itemData(ui->swtchCB_4->currentIndex()).toInt()); - updateSettings(); -} - -void GeneralEdit::getGeneralSwitchDefPos(int i, bool val) -{ - if(val) - g_eeGeneral.switchWarningStates |= (1<<(i-1)); - else - g_eeGeneral.switchWarningStates &= ~(1<<(i-1)); -} - -void GeneralEdit::on_swTHRChkB_stateChanged(int ) -{ - if(switchDefPosEditLock) return; - getGeneralSwitchDefPos(1,ui->swTHRChkB->isChecked()); - updateSettings(); -} - -void GeneralEdit::on_telalarmsChkB_stateChanged(int ) -{ - g_eeGeneral.enableTelemetryAlarm=ui->telalarmsChkB->isChecked(); - updateSettings(); -} - -void GeneralEdit::on_swRUDChkB_stateChanged(int ) -{ - if(switchDefPosEditLock) return; - getGeneralSwitchDefPos(2,ui->swRUDChkB->isChecked()); - updateSettings(); -} -void GeneralEdit::on_swELEChkB_stateChanged(int ) -{ - getGeneralSwitchDefPos(3,ui->swELEChkB->isChecked()); - updateSettings(); -} -void GeneralEdit::on_swID0ChkB_stateChanged(int ) -{ - if(switchDefPosEditLock) return; - - if(ui->swID0ChkB->isChecked()) - { - switchDefPosEditLock = true; - ui->swID1ChkB->setChecked(false); - ui->swID2ChkB->setChecked(false); - switchDefPosEditLock = false; - } - else - return; - - g_eeGeneral.switchWarningStates &= ~0x30; //turn off ID1/2 - getGeneralSwitchDefPos(4,ui->swID0ChkB->isChecked()); - updateSettings(); -} -void GeneralEdit::on_swID1ChkB_stateChanged(int ) -{ - if(switchDefPosEditLock) return; - - if(ui->swID1ChkB->isChecked()) - { - switchDefPosEditLock = true; - ui->swID0ChkB->setChecked(false); - ui->swID2ChkB->setChecked(false); - switchDefPosEditLock = false; - } - else - return; - - g_eeGeneral.switchWarningStates &= ~0x28; //turn off ID0/2 - getGeneralSwitchDefPos(5,ui->swID1ChkB->isChecked()); - updateSettings(); -} -void GeneralEdit::on_swID2ChkB_stateChanged(int ) -{ - if(switchDefPosEditLock) return; - - if(ui->swID2ChkB->isChecked()) - { - switchDefPosEditLock = true; - ui->swID0ChkB->setChecked(false); - ui->swID1ChkB->setChecked(false); - switchDefPosEditLock = false; - } - else - return; - - g_eeGeneral.switchWarningStates &= ~0x18; //turn off ID1/2 - getGeneralSwitchDefPos(6,ui->swID2ChkB->isChecked()); - updateSettings(); -} -void GeneralEdit::on_swAILChkB_stateChanged(int ) -{ - if(switchDefPosEditLock) return; - getGeneralSwitchDefPos(7,ui->swAILChkB->isChecked()); - updateSettings(); -} -void GeneralEdit::on_swGEAChkB_stateChanged(int ) -{ - if(switchDefPosEditLock) return; - getGeneralSwitchDefPos(8,ui->swGEAChkB->isChecked()); - updateSettings(); -} - void GeneralEdit::on_calretrieve_PB_clicked() { int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt(); diff --git a/companion/src/generaledit.h b/companion/src/generaledit.h index 7051e32f7..0f0be0fdc 100644 --- a/companion/src/generaledit.h +++ b/companion/src/generaledit.h @@ -33,15 +33,7 @@ signals: void modelValuesChanged(); private slots: - void on_ownerNameLE_editingFinished(); - void on_PotScrollEnableChkB_stateChanged(int); - void on_blinvert_cb_stateChanged(int); void on_faimode_CB_stateChanged(int ); - void on_BandGapEnableChkB_stateChanged(int); - void on_crosstrimChkB_stateChanged(int ); - void on_frskyintalarmChkB_stateChanged(int ); - void on_StickScrollChkB_stateChanged(int ); - void on_PPMSimChkB_stateChanged(int ); void on_speakerPitchSB_editingFinished(); void on_timezoneSB_editingFinished(); void on_hapticStrengthSB_editingFinished(); @@ -52,11 +44,7 @@ private slots: void on_hapticLengthCB_currentIndexChanged(int index); void on_PPM_MultiplierDSB_editingFinished(); void on_splashScreenChkB_stateChanged(int ); - void on_hideNameOnSplashChkB_stateChanged(int); - void on_beepCountDownChkB_stateChanged(int ); - void on_beepMinuteChkB_stateChanged(int ); void on_alarmwarnChkB_stateChanged(int ); - void on_enableTelemetryAlarmChkB_stateChanged(int ); void on_gpsFormatCB_currentIndexChanged(int index); void on_tabWidget_currentChanged(int index); void on_displayTypeCB_currentIndexChanged(int index); @@ -66,22 +54,17 @@ private slots: void on_units_CB_currentIndexChanged(int index); void on_trnMode_1_currentIndexChanged(int index); void on_trnChn_1_currentIndexChanged(int index); - void on_swtchCB_1_currentIndexChanged(int index); void on_trnWeight_1_editingFinished(); void on_trnMode_2_currentIndexChanged(int index); void on_trnChn_2_currentIndexChanged(int index); - void on_swtchCB_2_currentIndexChanged(int index); void on_trnWeight_2_editingFinished(); void on_trnMode_3_currentIndexChanged(int index); void on_trnChn_3_currentIndexChanged(int index); - void on_swtchCB_3_currentIndexChanged(int index); void on_trnWeight_3_editingFinished(); void on_trnMode_4_currentIndexChanged(int index); - void on_swtchCB_4_currentIndexChanged(int index); void on_trnChn_4_currentIndexChanged(int index); void on_trnWeight_4_editingFinished(); - void on_battCalib_editingFinished(); void on_CurrentCalib_SB_editingFinished(); void on_ana1Neg_editingFinished(); @@ -133,26 +116,14 @@ private slots: void on_channelorderCB_currentIndexChanged(int index); void on_beeperCB_currentIndexChanged(int index); void on_memwarnChkB_stateChanged(int ); - void on_telalarmsChkB_stateChanged(int ); - void on_inputfilterCB_currentIndexChanged(int index); void on_inactimerSB_editingFinished(); void on_backlightautoSB_editingFinished(); void on_backlightswCB_currentIndexChanged(int index); void on_mavbaud_CB_currentIndexChanged(int index); void on_voiceLang_CB_currentIndexChanged(int index); - void on_blOnStickMoveSB_editingFinished(); - void on_battcalibDSB_editingFinished(); + void on_battCalibDSB_editingFinished(); void on_battwarningDSB_editingFinished(); void on_contrastSB_editingFinished(); - void on_beepFlashChkB_stateChanged(int ); - void on_swTHRChkB_stateChanged(int ); - void on_swRUDChkB_stateChanged(int ); - void on_swELEChkB_stateChanged(int ); - void on_swID0ChkB_stateChanged(int ); - void on_swID1ChkB_stateChanged(int ); - void on_swID2ChkB_stateChanged(int ); - void on_swAILChkB_stateChanged(int ); - void on_swGEAChkB_stateChanged(int ); void on_calretrieve_PB_clicked(); void on_calstore_PB_clicked(); void unlockSwitchEdited(); diff --git a/companion/src/generaledit.ui b/companion/src/generaledit.ui index 44f32e121..700289578 100644 --- a/companion/src/generaledit.ui +++ b/companion/src/generaledit.ui @@ -106,24 +106,68 @@ These will be relevant for all models in the same EEPROM. - 0 + 1 Setup - - - - PPMSim + + + + - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + Mode selection: + +Mode 1: + Left stick: Elevator, Rudder + Right stick: Throttle, Aileron + +Mode 2: + Left stick: Throttle, Rudder + Right stick: Elevator, Aileron + +Mode 3: + Left stick: Elevator, Aileron + Right stick: Throttle, Rudder + +Mode 4: + Left stick: Throttle, Aileron + Right stick: Elevator, Rudder + + + + + 1 + + + + Mode 1 (RUD ELE THR AIL) + + + + + Mode 2 (RUD THR ELE AIL) + + + + + Mode 3 (AIL ELE THR RUD) + + + + + Mode 4 (AIL THR ELE RUD) + + - + @@ -167,14 +211,14 @@ These will be relevant for all models in the same EEPROM. - + Haptic Length - + @@ -270,47 +314,7 @@ These will be relevant for all models in the same EEPROM. - - - - - 0 - 0 - - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html> - - - 10 - - - 45 - - - 25 - - - - - - - Pot Scrolling Enable - - - - + @@ -340,68 +344,14 @@ p, li { white-space: pre-wrap; } - - - - - - - - - - Mode selection: - -Mode 1: - Left stick: Elevator, Rudder - Right stick: Throttle, Aileron - -Mode 2: - Left stick: Throttle, Rudder - Right stick: Elevator, Aileron - -Mode 3: - Left stick: Elevator, Aileron - Right stick: Throttle, Rudder - -Mode 4: - Left stick: Throttle, Aileron - Right stick: Elevator, Rudder - - - - - 1 - - - - Mode 1 (RUD ELE THR AIL) - - - - - Mode 2 (RUD THR ELE AIL) - - - - - Mode 3 (AIL ELE THR RUD) - - - - - Mode 4 (AIL THR ELE RUD) - - - - - + Beeper Length - + Vario pitch at zero @@ -415,56 +365,14 @@ Mode 4: - + MAVLink Baud Rate - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Single Beep Every whole Minute</span></p></body></html> - - - Every Minute - - - - - - - Beeps at 30, 15, 10, and down from5 seconds - - - Count Down to Zero - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Flash backlight on timer beep</span></p></body></html> - - - Flash on beep - - - - - - + @@ -478,40 +386,44 @@ p, li { white-space: pre-wrap; } - - + + - FrSky Internal Alarm + Speaker Volume - - - - - 0 - 0 - + + + + Readonly Unlock - + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + Qt::Vertical + + - 16777215 - 16777215 + 20 + 5 + + + + - + Sound Mode - - - - Inactivity Timer - - - - + @@ -536,284 +448,7 @@ p, li { white-space: pre-wrap; } - - - - Speaker Volume - - - - - - - Readonly Unlock - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - Telemetry NO DATA Alarm - - - - - - - - 0 - 0 - - - - - - - - - - Battery warning voltage. -This is the threashhold where the battery warning sounds. - -Acceptable values are 5v..10v - - - - - - V - - - 1 - - - 4.000000000000000 - - - 12.000000000000000 - - - 0.100000000000000 - - - 9.600000000000000 - - - - - - - - - - Battery Warning - - - - - - - Battery Calibration - - - - - - - - - - - - - Battery calibration: -This value will be added to the measured battery voltage. Use this value to calibrate the meter with an external meter. - - - - - - V - - - 1 - - - -9.900000000000000 - - - 9.900000000000000 - - - 0.100000000000000 - - - - - - - BackLight Switch - - - - - - - Qt::Vertical - - - - 20 - 5 - - - - - - - - Sound Mode - - - - - - - CrossTrim - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Input Filter - - - - - - - Bandgap Measuring Enable - - - - - - - - - - - - - This is the switch selectrion for turning on the backlight (if installed). - - - - - -1 - - - - - - - - Single - - - - - Oversample - - - - - Filter - - - - - - - - BackLight Auto OFF after - - - - - - - - - - - - - - - - - Contrast - - - - - - - BackLight Brightness - - - - - - - Timer Beeps - - - - - - - 10 - - - - - - - - 0 - 0 - - - - - - - - - - If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds. - - - sec - - - 600 - - - 5 - - - - + @@ -852,14 +487,7 @@ This value will be added to the measured battery voltage. Use this value to cal - - - - 100 - - - - + @@ -883,45 +511,6 @@ This value will be added to the measured battery voltage. Use this value to cal - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - Show splash screen on startup - - - Show splash screen on startup - - - - - - - - - - - Standard - - - - - Optrex - - - - @@ -935,38 +524,21 @@ This value will be added to the measured battery voltage. Use this value to cal - - - - BackLight Invert - - - - - - - - - - Owner Name - - - - + Haptic Mode - + Stick Mode - + @@ -979,7 +551,7 @@ This value will be added to the measured battery voltage. Use this value to cal - + @@ -993,7 +565,7 @@ This value will be added to the measured battery voltage. Use this value to cal - + -14 @@ -1006,57 +578,7 @@ This value will be added to the measured battery voltage. Use this value to cal - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - - - - - - true - - - - - - - - - - - - - - - 0 - 0 - - - - Show Splash Screen on Startup - - - - - - - - - - - + @@ -1085,7 +607,7 @@ p, li { white-space: pre-wrap; } - + @@ -1109,31 +631,21 @@ p, li { white-space: pre-wrap; } - + Haptic Strength - + FAI Mode - - - - StickScroll - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - + @@ -1162,24 +674,14 @@ p, li { white-space: pre-wrap; } - - - - + Speaker Pitch (spkr only) - - - - Show Owner Name on Splash - - - - + @@ -1317,7 +819,7 @@ This is used by the templated to determine which channel goes to what number out - + If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio. @@ -1327,7 +829,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -1352,97 +854,7 @@ This is used by the templated to determine which channel goes to what number out - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - - - - - - true - - - - - - - - - THR - - - - - - - RUD - - - - - - - ELE - - - - - - - AIL - - - - - - - GEA - - - - - - - ID0 - - - - - - - ID1 - - - - - - - ID2 - - - - - - - - - - - - - + @@ -1455,35 +867,14 @@ p, li { white-space: pre-wrap; } - + Measurement Units - - - - - - - - - - - - - - - - - - LCD Display Type - - - - + @@ -1496,14 +887,7 @@ p, li { white-space: pre-wrap; } - - - - BackLight On Stick Move - - - - + @@ -1530,90 +914,21 @@ p, li { white-space: pre-wrap; } - - - - sec - - - 600 - - - 5 - - - - + Beeper Mode - + Timeshift from UTC - - - - RotEnc Navigation - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - - - - - - true - - - - - - - Alarm Warning - - - - - - - Memory Startup Warning - - - - + QLayout::SetMinimumSize @@ -2141,41 +1456,6 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - - - - - - true - - - @@ -2183,7 +1463,7 @@ p, li { white-space: pre-wrap; } - + Hz @@ -2240,6 +1520,336 @@ p, li { white-space: pre-wrap; } + + + + Alarm Warning + + + + + + + Memory Startup Warning + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> + + + + + + true + + + + + + + + 0 + 0 + + + + Show Splash Screen on Startup + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + Show splash screen on startup + + + Show splash screen on startup + + + + + + + + + + + + + Battery Warning + + + + + + + + + + Contrast + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> + + + + + + true + + + + + + + Inactivity Timer + + + + + + + + Standard + + + + + Optrex + + + + + + + + BackLight Auto OFF after + + + + + + + + 0 + 0 + + + + + + + + + + If this value is not 0, any keypress will turn on the backlight and turn it off after the specified number of seconds. + + + sec + + + 600 + + + 5 + + + + + + + RotEnc Navigation + + + + + + + 100 + + + + + + + + + + LCD Display Type + + + + + + + + 0 + 0 + + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html> + + + 10 + + + 45 + + + 25 + + + + + + + BackLight Brightness + + + + + + + + 0 + 0 + + + + + + + + + + Battery warning voltage. +This is the threashhold where the battery warning sounds. + +Acceptable values are 5v..10v + + + + + + V + + + 1 + + + 4.000000000000000 + + + 12.000000000000000 + + + 0.100000000000000 + + + 9.600000000000000 + + + + + + + BackLight Switch + + + + + + + + + + + + + This is the switch selectrion for turning on the backlight (if installed). + + + + + -1 + + + @@ -2287,17 +1897,16 @@ p, li { white-space: pre-wrap; } - - - - Switch - - - + + + 0 + 0 + + - PPM 1 + Rud @@ -2393,13 +2002,16 @@ p, li { white-space: pre-wrap; } - - - + + + 0 + 0 + + - PPM 2 + Ele @@ -2534,13 +2146,16 @@ p, li { white-space: pre-wrap; } - - - + + + 0 + 0 + + - PPM 3 + Thr @@ -2578,13 +2193,16 @@ p, li { white-space: pre-wrap; } - - - + + + 0 + 0 + + - PPM 4 + Ail @@ -2680,9 +2298,6 @@ p, li { white-space: pre-wrap; } - - - @@ -2698,209 +2313,6 @@ p, li { white-space: pre-wrap; } - - - Telemetry - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 0 - - - - RSSI Alarm 1 - - - - - - - - - true - - - - 0 - 0 - - - - - - - 0 - - - 256 - - - 1 - - - 0 - - - - - - - - 0 - 0 - - - - - ---- - - - - - Yellow - - - - - Orange - - - - - Red - - - - - - - - - - - 0 - 0 - - - - RSSI Alarm 2 - - - - - - - - - true - - - - 0 - 0 - - - - - - - 0 - - - 256 - - - 1 - - - 0 - - - - - - - - 0 - 0 - - - - - ---- - - - - - Yellow - - - - - Orange - - - - - Red - - - - - - - - - - NO DATA Alarm - - - - - - - true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - - - - - - false - - - - - Calibration @@ -3228,7 +2640,7 @@ p, li { white-space: pre-wrap; } - + @@ -3740,40 +3152,19 @@ p, li { white-space: pre-wrap; } - ownerNameLE - beepMinuteChkB - beepCountDownChkB - beepFlashChkB - swTHRChkB - swRUDChkB - swELEChkB - swAILChkB - swGEAChkB - swID0ChkB - swID1ChkB - swID2ChkB channelorderCB trnMode_1 trnChn_1 trnWeight_1 - swtchCB_1 trnMode_2 trnChn_2 trnWeight_2 - swtchCB_2 trnMode_3 trnChn_3 trnWeight_3 - swtchCB_3 trnMode_4 trnChn_4 trnWeight_4 - swtchCB_4 - rssiAlarm1SB - rssiAlarm1CB - rssiAlarm2SB - rssiAlarm2CB - enableTelemetryAlarmChkB ana1Neg ana1Mid ana1Pos @@ -3786,7 +3177,7 @@ p, li { white-space: pre-wrap; } ana4Neg ana4Mid ana4Pos - battCalib + battCalibDSB PPM1 PPM2 PPM3 diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp index d6e72b219..15efc1403 100644 --- a/companion/src/modelslist.cpp +++ b/companion/src/modelslist.cpp @@ -271,10 +271,7 @@ void ModelsListWidget::refreshList() clear(); int msize; div_t divresult; - QString name = radioData->generalSettings.ownerName; - if(!name.isEmpty()) - name.prepend(" - "); - addItem(tr("General Settings") + name); + addItem(tr("General Settings")); EEPROMInterface *eepromInterface = GetEepromInterface(); int availableEEpromSize = eepromInterface->getEEpromSize()-64; //let's consider fat