piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

setup power delay instead of speed (#6694)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/generaledit/generalsetup.cpp
+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();
}
companion/src/generaledit/generalsetup.h
+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;
companion/src/generaledit/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>
radio/src/gui/128x64/radio_setup.cpp
+6 -4
View File
@@ -511,14 +511,16 @@ void menuRadioSetup(event_t event)
#if defined(PWR_BUTTON_PRESS)
case ITEM_RADIO_SETUP_PWR_ON_SPEED:
lcdDrawTextAlignedLeft(y, STR_PWR_ON_SPEED);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, g_eeGeneral.pwrOnSpeed +1, 3, attr);
lcdDrawTextAlignedLeft(y, STR_PWR_ON_DELAY);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 2 - g_eeGeneral.pwrOnSpeed, attr|LEFT);
lcdDrawChar(lcdLastRightPos, y, 's');
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOnSpeed, -1, 2);
break;
case ITEM_RADIO_SETUP_PWR_OFF_SPEED:
lcdDrawTextAlignedLeft(y, STR_PWR_OFF_SPEED);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, LCD_W - 2 - RADIO_SETUP_2ND_COLUMN, g_eeGeneral.pwrOffSpeed +1, 3, attr);
lcdDrawTextAlignedLeft(y, STR_PWR_OFF_DELAY);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 2 - g_eeGeneral.pwrOffSpeed, attr|LEFT);
lcdDrawChar(lcdLastRightPos, y, 's');
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOffSpeed, -1, 2);
break;
#endif
radio/src/gui/212x64/radio_setup.cpp
+6 -4
View File
@@ -472,14 +472,16 @@ void menuRadioSetup(event_t event)
#if defined(PWR_BUTTON_PRESS)
case ITEM_RADIO_SETUP_PWR_ON_SPEED:
lcdDrawTextAlignedLeft(y, STR_PWR_ON_SPEED);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOnSpeed +1, 3, attr);
lcdDrawTextAlignedLeft(y, STR_PWR_ON_DELAY);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 2 - g_eeGeneral.pwrOnSpeed, attr|LEFT);
lcdDrawChar(lcdLastRightPos, y, 's');
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOnSpeed, -1, 2);
break;
case ITEM_RADIO_SETUP_PWR_OFF_SPEED:
lcdDrawTextAlignedLeft(y, STR_PWR_OFF_SPEED);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.pwrOffSpeed +1, 3, attr);
lcdDrawTextAlignedLeft(y, STR_PWR_OFF_DELAY);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 2 - g_eeGeneral.pwrOffSpeed, attr|LEFT);
lcdDrawChar(lcdLastRightPos, y, 's');
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOffSpeed, -1, 2);
break;
#endif
radio/src/gui/480x272/radio_setup.cpp
+3 -2
View File
@@ -407,8 +407,9 @@ bool menuRadioSetup(event_t event)
#if defined(PWR_BUTTON_PRESS)
case ITEM_SETUP_PWR_OFF_SPEED:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_PWR_OFF_SPEED);
g_eeGeneral.pwrOffSpeed = editSlider(RADIO_SETUP_2ND_COLUMN, y, event, g_eeGeneral.pwrOffSpeed, -1, 2, attr);
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_PWR_OFF_DELAY);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 2 - g_eeGeneral.pwrOffSpeed, attr|LEFT, 0, NULL, "m");
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.pwrOffSpeed, -1, 2);
break;
#endif
radio/src/translations.cpp
+2 -2
View File
@@ -221,8 +221,8 @@ const char STR_MENULOGICALSWITCH[] = TR_MENULOGICALSWITCH;
const char STR_MENULOGICALSWITCHES[] = TR_MENULOGICALSWITCHES;
const char STR_MENUCUSTOMFUNC[] = TR_MENUCUSTOMFUNC;
const char STR_SPLASHSCREEN[] = TR_SPLASHSCREEN;
const char STR_PWR_ON_SPEED[] = TR_PWR_ON_SPEED;
const char STR_PWR_OFF_SPEED[] = TR_PWR_OFF_SPEED;
const char STR_PWR_ON_DELAY[] = TR_PWR_ON_DELAY;
const char STR_PWR_OFF_DELAY[] = TR_PWR_OFF_DELAY;
const char STR_THROTTLEWARNING[] = TR_THROTTLEWARNING;
const char STR_SWITCHWARNING[] = TR_SWITCHWARNING;
const char STR_POTWARNINGSTATE[] = TR_POTWARNINGSTATE;
radio/src/translations.h
+2 -2
View File
@@ -296,8 +296,8 @@ extern const char STR_BLOFFBRIGHTNESS[];
extern const char STR_SPLASHSCREEN[];
#if defined(PWR_BUTTON_PRESS)
extern const char STR_PWR_ON_SPEED[];
extern const char STR_PWR_OFF_SPEED[];
extern const char STR_PWR_ON_DELAY[];
extern const char STR_PWR_OFF_DELAY[];
#endif
extern const char STR_THROTTLEWARNING[];
extern const char STR_SWITCHWARNING[];
radio/src/translations/cz.h.txt
+2 -2
View File
@@ -531,8 +531,8 @@
#define TR_BLOFFBRIGHTNESS TR3(INDENT"Jas Vyp.", INDENT"Jas Vyp.", INDENT"Jas vypnutého LCD")
#define TR_BLCOLOR INDENT "Barva"
#define TR_SPLASHSCREEN TR("úvodní logo", "Zobrazit úvodní logo")
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR("* Plyn", INDENT "Kontrola plynu")
#define TR_SWITCHWARNING TR("* Spínače", INDENT "Polohy spínačů")
#define TR_POTWARNINGSTATE TR("* Pot&Slid.", INDENT "Kontrola Pot&Slid.")
radio/src/translations/de.h.txt
+2 -2
View File
@@ -533,8 +533,8 @@
#define TR_BLOFFBRIGHTNESS INDENT "Aus-Helligkeit"
#define TR_BLCOLOR INDENT "Farbe"
#define TR_SPLASHSCREEN TR("Startbild Ein", "Startbild Anzeigedauer")
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR("Gasalarm", INDENT "Gas Alarm")
#define TR_SWITCHWARNING TR("Sch. Alarm", INDENT "Schalter-Alarm")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
radio/src/translations/en.h.txt
+2 -2
View File
@@ -533,8 +533,8 @@
#define TR_BLOFFBRIGHTNESS INDENT "OFF brightness"
#define TR_BLCOLOR INDENT "Color"
#define TR_SPLASHSCREEN "Splash screen"
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR(INDENT "T-Warning", INDENT "Throttle state")
#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "Switch positions")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
radio/src/translations/es.h.txt
+2 -2
View File
@@ -553,8 +553,8 @@
#define TR_BLOFFBRIGHTNESS INDENT"MENOS Brillo"
#define TR_BLCOLOR INDENT "Color"
#define TR_SPLASHSCREEN "Ptalla.inicio"
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR("Aviso-A", INDENT "Aviso Acelerador")
#define TR_SWITCHWARNING TR("Aviso-I", INDENT "Aviso Intrptor")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
radio/src/translations/fi.h.txt
+2 -2
View File
@@ -545,8 +545,8 @@
#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness"
#define TR_BLCOLOR INDENT "Color"
#define TR_SPLASHSCREEN "Splash screen"
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle Warning")
#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Warning")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
radio/src/translations/fr.h.txt
+2 -2
View File
@@ -551,8 +551,8 @@
#define TR_BLOFFBRIGHTNESS INDENT "Luminosité OFF"
#define TR_BLCOLOR INDENT "Couleur"
#define TR_SPLASHSCREEN "Logo d'accueil"
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR(INDENT "Alerte gaz", INDENT "Alerte gaz")
#define TR_SWITCHWARNING TR(INDENT "Alerte int", INDENT "Pos. interrupteurs")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
radio/src/translations/it.h.txt
+2 -2
View File
@@ -552,8 +552,8 @@
#define TR_BLOFFBRIGHTNESS TR(INDENT"Lumin. OFF",INDENT"Luminosità OFF")
#define TR_BLCOLOR INDENT "Colore"
#define TR_SPLASHSCREEN TR("Schermo avvio", "Schermata di avvio")
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR("All. Mot.", INDENT "Allarme Motore")
#define TR_SWITCHWARNING TR("Avv. Int.", INDENT "Avviso Interr.")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
radio/src/translations/nl.h.txt
+2 -2
View File
@@ -535,8 +535,8 @@ TR_GYR_VSRCRAW
#define TR_BLOFFBRIGHTNESS INDENT "Uit-Helderheid"
#define TR_BLCOLOR INDENT "Kleur"
#define TR_SPLASHSCREEN "Startscherm Aan"
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR(INDENT "T-Warning", INDENT "Throttle Status")
#define TR_SWITCHWARNING TR(INDENT "S-Warning", INDENT "Switch Posities")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
radio/src/translations/pl.h.txt
+3 -3
View File
@@ -552,8 +552,8 @@
#define TR_BLOFFBRIGHTNESS INDENT"Jasność wył."
#define TR_BLCOLOR INDENT "Color"
#define TR_SPLASHSCREEN "Logo ekranu"
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR(INDENT"OstrzGaz", INDENT "OstrzeżenieGaz")
#define TR_SWITCHWARNING TR(INDENT "OstrzPrzeł", INDENT "PozycjaPrzeł")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
@@ -1257,4 +1257,4 @@
#define ZSTR_GASSUIT_MAX_FLOW "GMFl"
#define ZSTR_GASSUIT_AVG_FLOW "GAFl"
#define ZSTR_SBEC_VOLTAGE "BecV"
#define ZSTR_SBEC_CURRENT "BecA"
#define ZSTR_SBEC_CURRENT "BecA"
radio/src/translations/pt.h.txt
+2 -2
View File
@@ -538,8 +538,8 @@
#define TR_BLOFFBRIGHTNESS INDENT "OFF Brightness"
#define TR_BLCOLOR INDENT "Color"
#define TR_SPLASHSCREEN "Splash screen"
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_THROTTLEWARNING TR("Avisa Acel", INDENT "Avisa Acel")
#define TR_SWITCHWARNING TR("Avisa Chav", INDENT "Avisa Chav")
#define TR_POTWARNINGSTATE TR(INDENT "Pot&Slid.", INDENT "Pots & sliders")
radio/src/translations/se.h.txt
+2 -2
View File
@@ -550,8 +550,8 @@
#define TR_BLONBRIGHTNESS INDENT "På Ljusstyrka"
#define TR_BLOFFBRIGHTNESS INDENT "Av Ljusstyrka"
#define TR_SPLASHSCREEN "Startbild"
#define TR_PWR_ON_SPEED "Pwr On speed"
#define TR_PWR_OFF_SPEED "Pwr Off speed"
#define TR_PWR_ON_DELAY "Pwr Off delay"
#define TR_PWR_OFF_DELAY "Pwr Off delay"
#define TR_BLCOLOR INDENT "Color"
#define TR_THROTTLEWARNING TR("Gasvarning", INDENT "Gasvarning")
#define TR_SWITCHWARNING TR("Bryt.varn.", INDENT "Brytarvarning")