Commit 7f13132c authored by Michael Carpenter's avatar Michael Carpenter

Fix for erronious error message due to connecting a signal in the wrong order on SonarConfig

parent 4decb8d6
...@@ -18,6 +18,8 @@ BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : AP2ConfigWidget(pa ...@@ -18,6 +18,8 @@ BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : AP2ConfigWidget(pa
ui.apmVerComboBox->addItem("1: APM2 - 2.5 non 3DR"); ui.apmVerComboBox->addItem("1: APM2 - 2.5 non 3DR");
ui.apmVerComboBox->addItem("2: APM2.5 - 3DR Power Module"); ui.apmVerComboBox->addItem("2: APM2.5 - 3DR Power Module");
ui.apmVerComboBox->addItem("3: PX4"); ui.apmVerComboBox->addItem("3: PX4");
ui.alertOnLowCheckBox->setVisible(false);
connect(ui.monitorComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(monitorCurrentIndexChanged(int))); connect(ui.monitorComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(monitorCurrentIndexChanged(int)));
connect(ui.sensorComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(sensorCurrentIndexChanged(int))); connect(ui.sensorComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(sensorCurrentIndexChanged(int)));
...@@ -27,7 +29,7 @@ BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : AP2ConfigWidget(pa ...@@ -27,7 +29,7 @@ BatteryMonitorConfig::BatteryMonitorConfig(QWidget *parent) : AP2ConfigWidget(pa
connect(ui.ampsPerVoltsLineEdit,SIGNAL(editingFinished()),this,SLOT(ampsPerVoltSet())); connect(ui.ampsPerVoltsLineEdit,SIGNAL(editingFinished()),this,SLOT(ampsPerVoltSet()));
connect(ui.battCapacityLineEdit,SIGNAL(editingFinished()),this,SLOT(batteryCapacitySet())); connect(ui.battCapacityLineEdit,SIGNAL(editingFinished()),this,SLOT(batteryCapacitySet()));
ui.alertOnLowCheckBox->setVisible(false);
} }
void BatteryMonitorConfig::calcDividerSet() void BatteryMonitorConfig::calcDividerSet()
......
...@@ -4,13 +4,12 @@ ...@@ -4,13 +4,12 @@
SonarConfig::SonarConfig(QWidget *parent) : AP2ConfigWidget(parent) SonarConfig::SonarConfig(QWidget *parent) : AP2ConfigWidget(parent)
{ {
ui.setupUi(this); ui.setupUi(this);
connect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool)));
connect(ui.sonarTypeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(sonarTypeChanged(int)));
ui.sonarTypeComboBox->addItem("XL-EZ0 / XL-EZ4"); ui.sonarTypeComboBox->addItem("XL-EZ0 / XL-EZ4");
ui.sonarTypeComboBox->addItem("LV-EZ0"); ui.sonarTypeComboBox->addItem("LV-EZ0");
ui.sonarTypeComboBox->addItem("XL-EZL0"); ui.sonarTypeComboBox->addItem("XL-EZL0");
ui.sonarTypeComboBox->addItem("HRLV"); ui.sonarTypeComboBox->addItem("HRLV");
connect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool)));
connect(ui.sonarTypeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(sonarTypeChanged(int)));
} }
SonarConfig::~SonarConfig() SonarConfig::~SonarConfig()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment