From 706e96de950a716d3221bbf6719bd359e0e094f8 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 1 Sep 2019 17:52:21 +0200 Subject: [PATCH] setup power delay instead of speed (#6694) --- companion/src/generaledit/generalsetup.cpp | 24 ++++++++--------- companion/src/generaledit/generalsetup.h | 4 +-- companion/src/generaledit/generalsetup.ui | 30 +++++++++------------- radio/src/gui/128x64/radio_setup.cpp | 10 +++++--- radio/src/gui/212x64/radio_setup.cpp | 10 +++++--- radio/src/gui/480x272/radio_setup.cpp | 5 ++-- radio/src/translations.cpp | 4 +-- radio/src/translations.h | 4 +-- radio/src/translations/cz.h.txt | 4 +-- radio/src/translations/de.h.txt | 4 +-- radio/src/translations/en.h.txt | 4 +-- radio/src/translations/es.h.txt | 4 +-- radio/src/translations/fi.h.txt | 4 +-- radio/src/translations/fr.h.txt | 4 +-- radio/src/translations/it.h.txt | 4 +-- radio/src/translations/nl.h.txt | 4 +-- radio/src/translations/pl.h.txt | 6 ++--- radio/src/translations/pt.h.txt | 4 +-- radio/src/translations/se.h.txt | 4 +-- 19 files changed, 68 insertions(+), 69 deletions(-) diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp index bcc61afde..5e1bcd13c 100644 --- a/companion/src/generaledit/generalsetup.cpp +++ b/companion/src/generaledit/generalsetup.cpp @@ -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(); } diff --git a/companion/src/generaledit/generalsetup.h b/companion/src/generaledit/generalsetup.h index 5ad3a1afe..53a1286eb 100644 --- a/companion/src/generaledit/generalsetup.h +++ b/companion/src/generaledit/generalsetup.h @@ -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; diff --git a/companion/src/generaledit/generalsetup.ui b/companion/src/generaledit/generalsetup.ui index 88789aa8c..d4e9bff01 100644 --- a/companion/src/generaledit/generalsetup.ui +++ b/companion/src/generaledit/generalsetup.ui @@ -1567,9 +1567,9 @@ Acceptable values are 5v..10v - + - Power On Speed + Power On Delay @@ -2432,35 +2432,29 @@ p, li { white-space: pre-wrap; } - + - Power Off Speed + Power Off Delay - - - -1 + + + sec - 2 - - - Qt::Horizontal + 3 - - - -1 + + + sec - 2 - - - Qt::Horizontal + 3 diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index aabf4dc5e..6c85607dc 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -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 diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index 929cfe944..b467a55c4 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -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 diff --git a/radio/src/gui/480x272/radio_setup.cpp b/radio/src/gui/480x272/radio_setup.cpp index 58c061175..974d24561 100644 --- a/radio/src/gui/480x272/radio_setup.cpp +++ b/radio/src/gui/480x272/radio_setup.cpp @@ -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 diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 22ab26681..ef3c4f2a9 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -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; diff --git a/radio/src/translations.h b/radio/src/translations.h index 54e7f3fb4..8aa3795b7 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -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[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 82f6c381b..eac5de7e9 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -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.") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 18f2323d3..aa59d1d26 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -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") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 2730b02c0..967344b29 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -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") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index e62d5c400..03ed2eb66 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -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") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 962f170b2..3b01a4dca 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -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") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 6b38d1486..77737027a 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -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") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 4da8a5fd2..56363de7c 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -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") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 3b6928bbc..612f5eb5d 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -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") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 4300c9a9e..7ca36ff66 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -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" \ No newline at end of file +#define ZSTR_SBEC_CURRENT "BecA" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index e766602da..4dd490d4a 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -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") diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b81ac78d3..aef59dbbd 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -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")