From 6535ccbdd83dbe574b969e1a6519189bed064c3b Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 2 Apr 2018 17:11:45 +0200 Subject: [PATCH] Improve RSSI shutdown display message on Horus (#5782) Improve RSSI shutdown display message on Horus --- radio/src/opentx.cpp | 5 ++++- radio/src/translations.cpp | 1 + radio/src/translations.h | 1 + radio/src/translations/cz.h.txt | 1 + radio/src/translations/de.h.txt | 1 + radio/src/translations/en.h.txt | 1 + radio/src/translations/es.h.txt | 1 + radio/src/translations/fi.h.txt | 1 + radio/src/translations/fr.h.txt | 1 + radio/src/translations/it.h.txt | 1 + radio/src/translations/nl.h.txt | 1 + radio/src/translations/pl.h.txt | 1 + radio/src/translations/pt.h.txt | 1 + radio/src/translations/se.h.txt | 1 + 14 files changed, 17 insertions(+), 1 deletion(-) diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 788f0501b..b9f4d2395 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -2827,10 +2827,13 @@ uint32_t pwrCheck() #endif lcdRefreshWait(); lcdClear(); - POPUP_CONFIRMATION("Confirm Shutdown"); + + POPUP_CONFIRMATION(STR_MODEL_SHUTDOWN); + SET_WARNING_INFO(STR_MODEL_STILL_POWERED, sizeof(TR_MODEL_STILL_POWERED), 0); event_t evt = getEvent(false); DISPLAY_WARNING(evt); lcdRefresh(); + if (warningResult) { pwr_check_state = PWR_CHECK_OFF; return e_power_off; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index f8179f22b..daacfe504 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -243,6 +243,7 @@ const pm_char STR_MEMORYWARNING[] PROGMEM = TR_MEMORYWARNING; const pm_char STR_ALARMWARNING[] PROGMEM = TR_ALARMWARNING; const pm_char STR_RSSISHUTDOWNALARM[] PROGMEM = TR_RSSISHUTDOWNALARM; const pm_char STR_MODEL_STILL_POWERED[] PROGMEM = TR_MODEL_STILL_POWERED; +const pm_char STR_MODEL_SHUTDOWN[] PROGMEM = TR_MODEL_SHUTDOWN; const pm_char STR_PRESS_ENTER_TO_CONFIRM[] PROGMEM = TR_PRESS_ENTER_TO_CONFIRM; #if defined(ROTARY_ENCODERS) const pm_char STR_RENAVIG[] PROGMEM = TR_RENAVIG; diff --git a/radio/src/translations.h b/radio/src/translations.h index bc8e15152..bc7d2bb58 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -500,6 +500,7 @@ extern const pm_char STR_MEMORYWARNING[]; extern const pm_char STR_ALARMWARNING[]; extern const pm_char STR_RSSISHUTDOWNALARM[]; extern const pm_char STR_MODEL_STILL_POWERED[]; +extern const pm_char STR_MODEL_SHUTDOWN[]; extern const pm_char STR_PRESS_ENTER_TO_CONFIRM[]; extern const pm_char STR_RENAVIG[]; extern const pm_char STR_THROTTLEREVERSE[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 90fdd2b36..e81ee994a 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -714,6 +714,7 @@ #define TR_ALARMWARNING TR3(INDENT "Vypnutý zvuk", INDENT "Upozornit na vypnutý zvuk", INDENT "Upozornit na vyp. zvuk") #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi Shutdown", INDENT "Check Rssi on Shutdown") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "Navig. RotEnc" #define TR_THROTTLE_LABEL "Plyn" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 5d41419fb..ef33613a0 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -727,6 +727,7 @@ #define TR_ALARMWARNING TR(INDENT "Alle Töne aus?", INDENT "Alle Töne ganz aus?") #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi-Chk bei aus", INDENT "Prüfe RSSI bei Ausschalten") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "Drehgeb. Navig." #define TR_THROTTLE_LABEL "Gas-Kontrolle" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index e8ac8acbe..f160fc949 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -721,6 +721,7 @@ #define TR_ALARMWARNING INDENT "Sound off" #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi Shutdown", INDENT "Check Rssi on Shutdown") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 4954f9e26..828e03f02 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -709,6 +709,7 @@ #define TR_ALARMWARNING INDENT"Sin Sonido" #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi Shutdown", INDENT "Check Rssi on Shutdown") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 671bb8f3b..7fce6fd62 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -705,6 +705,7 @@ #define TR_ALARMWARNING INDENT"Sound Off" #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi Shutdown", INDENT "Check Rssi on Shutdown") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 85617ec7c..fe5a7d037 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -734,6 +734,7 @@ #define TR_ALARMWARNING TR(INDENT "Silence", INDENT "Sons désactivés") #define TR_RSSISHUTDOWNALARM TR(INDENT "RSSI extinction", INDENT "Vérif RSSI à l'extinction") #define TR_MODEL_STILL_POWERED "Modèle encore allumé" +#define TR_MODEL_SHUTDOWN "Eteindre ?" #define TR_PRESS_ENTER_TO_CONFIRM "Presser [Enter] pour confirmer" #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLE_LABEL "Gaz" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 0ff7d7ddf..14a1f048d 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -724,6 +724,7 @@ #define TR_ALARMWARNING INDENT"Spegni suono" #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi Shutdown", INDENT "Check Rssi on Shutdown") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "Navig EncRot " #define TR_THROTTLE_LABEL "Motore" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 5b215160f..e21114642 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -710,6 +710,7 @@ #define TR_ALARMWARNING TR(INDENT "Al Geluid uit?", INDENT "Al het geluid uit?") #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi Shutdown", INDENT "Check Rssi on Shutdown") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "Stappenschakelaar" #define TR_THROTTLE_LABEL "Gas" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index e4fd825e1..a7b0b0641 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -726,6 +726,7 @@ #define TR_ALARMWARNING INDENT"Wyłącz dźwięk" #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi Shutdown", INDENT "Check Rssi on Shutdown") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "Nawigacja potencjometrem" #define TR_THROTTLE_LABEL "Gaz " diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 37478b5c6..239260afb 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -712,6 +712,7 @@ #define TR_ALARMWARNING INDENT"Som Off" #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi Shutdown", INDENT "Check Rssi on Shutdown") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 646bc1879..6297e1219 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -733,6 +733,7 @@ #define TR_ALARMWARNING INDENT"Ljud Av" #define TR_RSSISHUTDOWNALARM TR(INDENT "Rssi Shutdown", INDENT "Check Rssi on Shutdown") #define TR_MODEL_STILL_POWERED "Model still powered" +#define TR_MODEL_SHUTDOWN "Shutdown ?" #define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm" #define TR_RENAVIG "RotEnk Navig" #define TR_THROTTLE_LABEL "Gas"