diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp
index 0574e4f4a..e36188be4 100644
--- a/companion/src/generaledit/generalsetup.cpp
+++ b/companion/src/generaledit/generalsetup.cpp
@@ -145,7 +145,7 @@ ui(new Ui::GeneralSetup)
ui->gpsFormatCB->setCurrentIndex(generalSettings.gpsFormat);
ui->timezoneSB->setValue(generalSettings.timezone);
- if (IS_TARANIS(firmware->getBoard())) {
+ if (IS_HORUS_OR_TARANIS(firmware->getBoard())) {
ui->adjustRTC->setChecked(generalSettings.adjustRTC);
}
else {
@@ -172,6 +172,12 @@ ui(new Ui::GeneralSetup)
ui->BLBright_SB->setDisabled(true);
ui->label_BLBright->hide();
}
+
+ if (!IS_HORUS(firmware->getBoard())) {
+ ui->OFFBright_SB->hide();
+ ui->OFFBright_SB->setDisabled(true);
+ ui->label_OFFBright->hide();
+ }
if (!firmware->getCapability(SoundMod)) {
ui->soundModeCB->setDisabled(true);
@@ -373,6 +379,7 @@ void GeneralSetupPanel::setValues()
ui->hapticLengthCB->hide();
}
ui->BLBright_SB->setValue(100-generalSettings.backlightBright);
+ ui->OFFBright_SB->setValue(generalSettings.backlightOffBright);
ui->soundModeCB->setCurrentIndex(generalSettings.speakerMode);
ui->volume_SB->setValue(generalSettings.speakerVolume);
ui->beeperlenCB->setCurrentIndex(generalSettings.beeperLength+2);
@@ -486,6 +493,12 @@ void GeneralSetupPanel::on_BLBright_SB_editingFinished()
emit modified();
}
+void GeneralSetupPanel::on_OFFBright_SB_editingFinished()
+{
+ generalSettings.backlightOffBright = ui->OFFBright_SB->value();
+ emit modified();
+}
+
void GeneralSetupPanel::on_volume_SB_editingFinished()
{
generalSettings.speakerVolume = ui->volume_SB->value();
diff --git a/companion/src/generaledit/generalsetup.h b/companion/src/generaledit/generalsetup.h
index 75cd040fb..f45c31e9d 100644
--- a/companion/src/generaledit/generalsetup.h
+++ b/companion/src/generaledit/generalsetup.h
@@ -43,6 +43,7 @@ class GeneralSetupPanel : public GeneralPanel
void on_gpsFormatCB_currentIndexChanged(int index);
void on_displayTypeCB_currentIndexChanged(int index);
void on_BLBright_SB_editingFinished();
+ void on_OFFBright_SB_editingFinished();
void on_re_CB_currentIndexChanged(int index);
void on_countrycode_CB_currentIndexChanged(int index);
void on_units_CB_currentIndexChanged(int index);
diff --git a/companion/src/generaledit/generalsetup.ui b/companion/src/generaledit/generalsetup.ui
index c889ab862..114915673 100644
--- a/companion/src/generaledit/generalsetup.ui
+++ b/companion/src/generaledit/generalsetup.ui
@@ -29,10 +29,10 @@
QLayout::SetMinimumSize
-
+
0
-
+
0
-
@@ -553,32 +553,8 @@
-
-
-
-
-
-
- Timeshift from UTC
-
-
-
- -
-
-
- Voice Language
-
-
-
- -
-
-
- -
-
-
- Country Code
-
-
-
- -
+
+
-
@@ -591,14 +567,14 @@
- -
-
+
-
+
- FAI Mode
+ Country Code
- -
+
-
If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.
@@ -608,7 +584,44 @@
- -
+
-
+
+
+ FAI Mode
+
+
+
+ -
+
+
-
+
+
+ -14
+
+
+ 12
+
+
+ 0
+
+
+
+ -
+
+
+ Automatically adjust the radio's clock if a GPS is connected to telemetry.
+
+
+ Qt::RightToLeft
+
+
+ Adjust RTC
+
+
+
+
+
+ -
-
@@ -640,53 +653,10 @@
- -
-
-
-
-
-
- -14
-
-
- 12
-
-
- 0
-
-
-
- -
-
-
- Automatically adjust the radio's clock if a GPS is connected to telemetry.
-
-
- Qt::RightToLeft
-
-
- Adjust RTC
-
-
-
-
-
- -
-
+
-
+
- Vario pitch at max
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- 23
+ Speaker Volume
@@ -709,10 +679,10 @@
- -
-
+
-
+
- Speaker Volume
+ Vario pitch at max
@@ -723,14 +693,20 @@
- -
-
-
- Sound Mode
+
-
+
+
+
+ 0
+ 0
+
+
+
+ 23
- -
+
-
-
@@ -761,10 +737,10 @@
- -
-
+
-
+
- Speaker Pitch (spkr only)
+ Sound Mode
@@ -796,13 +772,20 @@
- -
+
-
Backlight color
+ -
+
+
+ Speaker Pitch (spkr only)
+
+
+
-
-
@@ -961,13 +944,6 @@
- -
-
-
- Backlight Auto OFF after
-
-
-
-
@@ -982,6 +958,13 @@
+ -
+
+
+ Vario repeat at zero
+
+
+
-
@@ -989,10 +972,10 @@
- -
-
+
-
+
- Vario repeat at zero
+ Backlight Auto OFF after
@@ -1014,13 +997,6 @@
- -
-
-
-
-
-
-
-
@@ -1048,6 +1024,20 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ RotEnc Navigation
+
+
+
+ -
+
+
+
+
+
+
-
@@ -1055,17 +1045,7 @@ p, li { white-space: pre-wrap; }
- -
-
-
- RotEnc Navigation
-
-
-
- -
-
-
- -
+
-
-
@@ -1084,7 +1064,10 @@ p, li { white-space: pre-wrap; }
- -
+
-
+
+
+ -
Qt::Vertical
@@ -1097,6 +1080,40 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ Voice Language
+
+
+
+ -
+
+
+ Timeshift from UTC
+
+
+
+ -
+
+
+ -
+
+
+ Backlight OFF Brightness
+
+
+
+ -
+
+
+ 5
+
+
+ 100
+
+
+
-
diff --git a/companion/src/generaledit/hardware.cpp b/companion/src/generaledit/hardware.cpp
index b2028f3de..4418c00bc 100644
--- a/companion/src/generaledit/hardware.cpp
+++ b/companion/src/generaledit/hardware.cpp
@@ -78,8 +78,10 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
ui(new Ui::Hardware)
{
ui->setupUi(this);
+
+ BoardEnum board = firmware->getBoard();
- if (IS_STM32(firmware->getBoard())) {
+ if (IS_STM32(board)) {
ui->rudName->setField(generalSettings.stickName[0], 3, this);
ui->eleName->setField(generalSettings.stickName[1], 3, this);
ui->thrName->setField(generalSettings.stickName[2], 3, this);
@@ -125,7 +127,7 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
setupSwitchConfig(16, ui->sqLabel, ui->sqName, ui->sqType);
setupSwitchConfig(17, ui->srLabel, ui->srName, ui->srType);
- if (IS_TARANIS(firmware->getBoard())) {
+ if (IS_HORUS_OR_TARANIS(board) && !IS_TARANIS_X7(board)) {
ui->serialPortMode->setCurrentIndex(generalSettings.hw_uartMode);
}
else {
@@ -133,12 +135,12 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
ui->serialPortLabel->hide();
}
- if (!IS_SKY9X(firmware->getBoard())) {
+ if (!IS_SKY9X(board)) {
ui->txCurrentCalibration->hide();
ui->txCurrentCalibrationLabel->hide();
}
- if (IS_TARANIS_X9E(firmware->getBoard())) {
+ if (IS_TARANIS_X9E(board) || IS_HORUS(board)) {
ui->bluetoothEnable->setChecked(generalSettings.bluetoothEnable);
ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
}
@@ -147,6 +149,13 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
ui->bluetoothEnable->hide();
ui->bluetoothName->hide();
}
+
+ if (IS_HORUS_OR_TARANIS(board)) {
+ ui->filterEnable->setChecked(!generalSettings.jitterFilter);
+ }
+ else {
+ ui->filterEnable->hide();
+ }
disableMouseScrolling();
@@ -158,6 +167,11 @@ HardwarePanel::~HardwarePanel()
delete ui;
}
+void HardwarePanel::on_filterEnable_stateChanged()
+{
+ generalSettings.jitterFilter = !ui->filterEnable->isChecked();
+}
+
void HardwarePanel::on_PPM_MultiplierDSB_editingFinished()
{
generalSettings.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
diff --git a/companion/src/generaledit/hardware.h b/companion/src/generaledit/hardware.h
index 0683389a7..430ad600a 100644
--- a/companion/src/generaledit/hardware.h
+++ b/companion/src/generaledit/hardware.h
@@ -49,6 +49,7 @@ class HardwarePanel : public GeneralPanel
void on_txCurrentHardware_editingFinished();
void on_bluetoothEnable_stateChanged(int);
+ void on_filterEnable_stateChanged();
void on_serialPortMode_currentIndexChanged(int index);
diff --git a/companion/src/generaledit/hardware.ui b/companion/src/generaledit/hardware.ui
index 7ff18ac4e..c7e70c10a 100644
--- a/companion/src/generaledit/hardware.ui
+++ b/companion/src/generaledit/hardware.ui
@@ -1108,6 +1108,20 @@
+ -
+
+
+
+
+
+
+ -
+
+
+ ADC Filter
+
+
+