setup power delay instead of speed (#6694)

This commit is contained in:
Raphael Coeffic
2019-09-01 17:52:21 +02:00
committed by Bertrand Songis
parent 345d80cd94
commit 706e96de95
19 changed files with 68 additions and 69 deletions
+12 -12
View File
@@ -256,14 +256,14 @@ ui(new Ui::GeneralSetup)
}
if (!firmware->getCapability(PwrButtonPress)) {
ui->pwrOnSpeedLabel->hide();
ui->pwrOnSpeed->hide();
ui->pwrOffSpeedLabel->hide();
ui->pwrOffSpeed->hide();
ui->pwrOnDelayLabel->hide();
ui->pwrOnDelay->hide();
ui->pwrOffDelayLabel->hide();
ui->pwrOffDelay->hide();
}
else if (!IS_TARANIS(firmware->getBoard())) {
ui->pwrOnSpeedLabel->hide();
ui->pwrOnSpeed->hide();
ui->pwrOnDelayLabel->hide();
ui->pwrOnDelay->hide();
}
setValues();
@@ -453,8 +453,8 @@ void GeneralSetupPanel::setValues()
ui->vBatMaxDSB->setValue((double)(generalSettings.vBatMax + 120) / 10);
}
ui->pwrOnSpeed->setValue(generalSettings.pwrOnSpeed);
ui->pwrOffSpeed->setValue(generalSettings.pwrOffSpeed);
ui->pwrOnDelay->setValue(2 - generalSettings.pwrOnSpeed);
ui->pwrOffDelay->setValue(2 - generalSettings.pwrOffSpeed);
// TODO: only if ACCESS available??
ui->registrationId->setText(generalSettings.registrationId);
@@ -510,15 +510,15 @@ void GeneralSetupPanel::on_splashScreenDuration_currentIndexChanged(int index)
emit modified();
}
void GeneralSetupPanel::on_pwrOnSpeed_valueChanged()
void GeneralSetupPanel::on_pwrOnDelay_valueChanged()
{
generalSettings.pwrOnSpeed = ui->pwrOnSpeed->value();
generalSettings.pwrOnSpeed = 2 - ui->pwrOnDelay->value();
emit modified();
}
void GeneralSetupPanel::on_pwrOffSpeed_valueChanged()
void GeneralSetupPanel::on_pwrOffDelay_valueChanged()
{
generalSettings.pwrOffSpeed = ui->pwrOffSpeed->value();
generalSettings.pwrOffSpeed = 2 - ui->pwrOffDelay->value();
emit modified();
}
+2 -2
View File
@@ -89,8 +89,8 @@ class GeneralSetupPanel : public GeneralPanel
void on_contrastSB_editingFinished();
void on_ownerID_editingFinished();
void on_pwrOnSpeed_valueChanged();
void on_pwrOffSpeed_valueChanged();
void on_pwrOnDelay_valueChanged();
void on_pwrOffDelay_valueChanged();
private:
Ui::GeneralSetup *ui;
+12 -18
View File
@@ -1567,9 +1567,9 @@ Acceptable values are 5v..10v</string>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="pwrOnSpeedLabel">
<widget class="QLabel" name="pwrOnDelayLabel">
<property name="text">
<string>Power On Speed</string>
<string>Power On Delay</string>
</property>
</widget>
</item>
@@ -2432,35 +2432,29 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item row="12" column="0">
<widget class="QLabel" name="pwrOffSpeedLabel">
<widget class="QLabel" name="pwrOffDelayLabel">
<property name="text">
<string>Power Off Speed</string>
<string>Power Off Delay</string>
</property>
</widget>
</item>
<item row="11" column="1">
<widget class="QSlider" name="pwrOnSpeed">
<property name="minimum">
<number>-1</number>
<widget class="QSpinBox" name="pwrOnDelay">
<property name="suffix">
<string> sec</string>
</property>
<property name="maximum">
<number>2</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<number>3</number>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QSlider" name="pwrOffSpeed">
<property name="minimum">
<number>-1</number>
<widget class="QSpinBox" name="pwrOffDelay">
<property name="suffix">
<string> sec</string>
</property>
<property name="maximum">
<number>2</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<number>3</number>
</property>
</widget>
</item>