diff --git a/companion/src/generaledit/hardware.cpp b/companion/src/generaledit/hardware.cpp
index 3851e2a0c..770a226c2 100644
--- a/companion/src/generaledit/hardware.cpp
+++ b/companion/src/generaledit/hardware.cpp
@@ -110,6 +110,8 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
ui->thrName->hide();
ui->ailLabel->hide();
ui->ailName->hide();
+ ui->potsTypeSeparator_1->hide();
+ ui->potsTypeSeparator_2->hide();
}
setupPotType(0, ui->pot1Label, ui->pot1Name, ui->pot1Type);
@@ -141,10 +143,11 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
setupSwitchType(16, ui->sqLabel, ui->sqName, ui->sqType);
setupSwitchType(17, ui->srLabel, ui->srName, ui->srType);
- if (IS_HORUS_OR_TARANIS(board) && !IS_TARANIS_X7(board)) {
+ if (IS_TARANIS(board) && !IS_TARANIS_X7(board)) {
ui->serialPortMode->setCurrentIndex(generalSettings.hw_uartMode);
}
else {
+ ui->serialPortMode->setCurrentIndex(0);
ui->serialPortMode->hide();
ui->serialPortLabel->hide();
}
@@ -160,8 +163,7 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
}
else {
ui->bluetoothLabel->hide();
- ui->bluetoothEnable->hide();
- ui->bluetoothName->hide();
+ ui->bluetoothWidget->hide();
}
if (IS_HORUS_OR_TARANIS(board)) {
@@ -188,39 +190,52 @@ void HardwarePanel::on_filterEnable_stateChanged()
void HardwarePanel::on_PPM_MultiplierDSB_editingFinished()
{
- generalSettings.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
- emit modified();
+ int val = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
+ if (generalSettings.PPM_Multiplier != val) {
+ generalSettings.PPM_Multiplier = val;
+ emit modified();
+ }
}
void HardwarePanel::on_PPM1_editingFinished()
{
- generalSettings.trainer.calib[0] = ui->PPM1->value();
- emit modified();
+ if (generalSettings.trainer.calib[0] != ui->PPM1->value()) {
+ generalSettings.trainer.calib[0] = ui->PPM1->value();
+ emit modified();
+ }
}
void HardwarePanel::on_PPM2_editingFinished()
{
- generalSettings.trainer.calib[1] = ui->PPM2->value();
- emit modified();
+ if (generalSettings.trainer.calib[1] != ui->PPM2->value()) {
+ generalSettings.trainer.calib[1] = ui->PPM2->value();
+ emit modified();
+ }
}
void HardwarePanel::on_PPM3_editingFinished()
{
- generalSettings.trainer.calib[2] = ui->PPM3->value();
- emit modified();
+ if (generalSettings.trainer.calib[2] != ui->PPM3->value()) {
+ generalSettings.trainer.calib[2] = ui->PPM3->value();
+ emit modified();
+ }
}
void HardwarePanel::on_PPM4_editingFinished()
{
- generalSettings.trainer.calib[3] = ui->PPM4->value();
- emit modified();
+ if (generalSettings.trainer.calib[3] != ui->PPM4->value()) {
+ generalSettings.trainer.calib[3] = ui->PPM4->value();
+ emit modified();
+ }
}
-void HardwarePanel::on_txCurrentHardware_editingFinished()
+void HardwarePanel::on_txCurrentCalibration_editingFinished()
{
- generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value();
- emit modified();
+ if (generalSettings.txCurrentCalibration != ui->txCurrentCalibration->value()) {
+ generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value();
+ emit modified();
+ }
}
void HardwarePanel::on_bluetoothEnable_stateChanged(int)
@@ -241,10 +256,12 @@ void HardwarePanel::setValues()
ui->PPM_MultiplierDSB->setValue((qreal)(generalSettings.PPM_Multiplier+10)/10);
}
-void HardwarePanel::on_txVoltageHardware_editingFinished()
+void HardwarePanel::on_txVoltageCalibration_editingFinished()
{
- generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10;
- emit modified();
+ if (generalSettings.txVoltageCalibration != ui->txVoltageCalibration->value()*10) {
+ generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10;
+ emit modified();
+ }
}
void HardwarePanel::on_serialPortMode_currentIndexChanged(int index)
diff --git a/companion/src/generaledit/hardware.h b/companion/src/generaledit/hardware.h
index af7a2237a..7d53a6d14 100644
--- a/companion/src/generaledit/hardware.h
+++ b/companion/src/generaledit/hardware.h
@@ -40,14 +40,14 @@ class HardwarePanel : public GeneralPanel
virtual ~HardwarePanel();
private slots:
- void on_txVoltageHardware_editingFinished();
void on_PPM1_editingFinished();
void on_PPM2_editingFinished();
void on_PPM3_editingFinished();
void on_PPM4_editingFinished();
void on_PPM_MultiplierDSB_editingFinished();
- void on_txCurrentHardware_editingFinished();
+ void on_txCurrentCalibration_editingFinished();
+ void on_txVoltageCalibration_editingFinished();
void on_bluetoothEnable_stateChanged(int);
void on_filterEnable_stateChanged();
diff --git a/companion/src/generaledit/hardware.ui b/companion/src/generaledit/hardware.ui
index c7e70c10a..72fe4ba15 100644
--- a/companion/src/generaledit/hardware.ui
+++ b/companion/src/generaledit/hardware.ui
@@ -6,14 +6,23 @@
0
0
- 359
- 1594
+ 470
+ 1095
+
+
+ 0
+ 0
+
+
Form
-
+
+
+ 6
+
-
@@ -125,19 +134,6 @@
- -
-
-
-
- 0
- 10
-
-
-
- Qt::Horizontal
-
-
-
-
@@ -730,32 +726,6 @@
- -
-
-
-
- 0
- 10
-
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 0
- 10
-
-
-
- Qt::Horizontal
-
-
-
-
@@ -1075,6 +1045,12 @@
-
+
+
+ 0
+ 0
+
+
Bluetooth
@@ -1090,24 +1066,6 @@
- -
-
-
-
-
-
-
-
-
-
- -
-
-
- 10
-
-
-
-
-
-
@@ -1122,19 +1080,116 @@
+ -
+
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 5
+ 20
+
+
+
+
+ -
+
+
+ Device Name:
+
+
+
+ -
+
+
+ 10
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 10
+
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 10
+
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 10
+
+
+
+ Qt::Horizontal
+
+
+
-
- AutoLineEdit
- QLineEdit
-
-
AutoComboBox
QComboBox
+
+ AutoLineEdit
+ QLineEdit
+
+