Added confirmation dialog on power down and USB connected.
This commit is contained in:
committed by
Raphael Coeffic
parent
273ab9bfee
commit
4fe4c1a385
+12
-3
@@ -2053,7 +2053,8 @@ uint32_t pwrCheck()
|
||||
#if defined(SHUTDOWN_CONFIRMATION)
|
||||
while (1)
|
||||
#else
|
||||
while ((TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm))
|
||||
while (usbPlugged() ||
|
||||
(TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm))
|
||||
#endif
|
||||
{
|
||||
|
||||
@@ -2091,8 +2092,16 @@ uint32_t pwrCheck()
|
||||
}
|
||||
#else // COLORLCD
|
||||
|
||||
// TODO: abort dialog condition (here, RSSI lost)
|
||||
if (confirmationDialog(STR_MODEL_SHUTDOWN, STR_MODEL_STILL_POWERED, false)) {
|
||||
const char* message = nullptr;
|
||||
if (usbPlugged()) {
|
||||
message = STR_USB_STILL_CONNECTED;
|
||||
}
|
||||
else {
|
||||
message = STR_MODEL_STILL_POWERED;
|
||||
}
|
||||
|
||||
// TODO: abort dialog condition (here, RSSI lost / USB connected)
|
||||
if (confirmationDialog(STR_MODEL_SHUTDOWN, message, false)) {
|
||||
pwr_check_state = PWR_CHECK_OFF;
|
||||
return e_power_off;
|
||||
} else {
|
||||
|
||||
@@ -188,6 +188,7 @@ const char STR_MEMORYWARNING[] = TR_MEMORYWARNING;
|
||||
const char STR_ALARMWARNING[] = TR_ALARMWARNING;
|
||||
const char STR_RSSI_SHUTDOWN_ALARM[] = TR_RSSI_SHUTDOWN_ALARM;
|
||||
const char STR_MODEL_STILL_POWERED[] = TR_MODEL_STILL_POWERED;
|
||||
const char STR_USB_STILL_CONNECTED[] = TR_USB_STILL_CONNECTED;
|
||||
const char STR_MODEL_SHUTDOWN[] = TR_MODEL_SHUTDOWN;
|
||||
const char STR_PRESS_ENTER_TO_CONFIRM[] = TR_PRESS_ENTER_TO_CONFIRM;
|
||||
const char STR_THROTTLEREVERSE[] = TR_THROTTLEREVERSE;
|
||||
|
||||
@@ -309,6 +309,7 @@ extern const char STR_MEMORYWARNING[];
|
||||
extern const char STR_ALARMWARNING[];
|
||||
extern const char STR_RSSI_SHUTDOWN_ALARM[];
|
||||
extern const char STR_MODEL_STILL_POWERED[];
|
||||
extern const char STR_USB_STILL_CONNECTED[];
|
||||
extern const char STR_MODEL_SHUTDOWN[];
|
||||
extern const char STR_PRESS_ENTER_TO_CONFIRM[];
|
||||
extern const char STR_THROTTLEREVERSE[];
|
||||
|
||||
@@ -451,6 +451,7 @@
|
||||
#define TR_ALARMWARNING "静音"
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "关机时检查RSSI")
|
||||
#define TR_MODEL_STILL_POWERED "模型未断电"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "关机 ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "按ENTER键确认"
|
||||
#define TR_THROTTLE_LABEL "油门"
|
||||
|
||||
@@ -536,6 +536,7 @@
|
||||
#define TR_ALARMWARNING TR3("Vypnutý zvuk", "Upozornit na vypnutý zvuk", "Upozornit na vyp. zvuk")
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi při vyp.", "Hlídat Rssi při vypnutí")
|
||||
#define TR_MODEL_STILL_POWERED "Model stále spuštěn"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Vypnout ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Zmáčkni enter pro potvrzení"
|
||||
#define TR_THROTTLE_LABEL "Plyn"
|
||||
|
||||
@@ -542,6 +542,7 @@
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR(INDENT "RSSI-Chk aus?", INDENT "Prüfe RSSI bei Ausschalten")
|
||||
#define TR_FLYSKY_TELEMETRY TR("FlySky RSSI #", "Use FlySky RSSI value without rescalling")
|
||||
#define TR_MODEL_STILL_POWERED "Model still powered"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Shutdown ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm"
|
||||
#define TR_THROTTLE_LABEL "Gas-Kontrolle"
|
||||
|
||||
@@ -540,6 +540,7 @@
|
||||
#define TR_ALARMWARNING "Sound off"
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI shutdown", "Check RSSI on shutdown")
|
||||
#define TR_MODEL_STILL_POWERED "Model still powered"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Shutdown?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm"
|
||||
#define TR_THROTTLE_LABEL "Throttle"
|
||||
|
||||
@@ -539,6 +539,7 @@
|
||||
#define TR_ALARMWARNING "Sin sonido"
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("Apagado Rssi", "Check Rssi al apagar")
|
||||
#define TR_MODEL_STILL_POWERED "Modelo aun encendido"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Apagar ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Enter para confirmar"
|
||||
#define TR_THROTTLE_LABEL "Potencia"
|
||||
|
||||
@@ -553,6 +553,7 @@
|
||||
#define TR_ALARMWARNING "Sound Off"
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "Check Rssi on Shutdown")
|
||||
#define TR_MODEL_STILL_POWERED "Model still powered"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Shutdown ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm"
|
||||
#define TR_THROTTLE_LABEL "Throttle"
|
||||
|
||||
@@ -560,6 +560,7 @@
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI extinct.", "Vérif RSSI à l'extinction")
|
||||
#define TR_FLYSKY_TELEMETRY TR("FlySky RSSI #", "Use FlySky RSSI value without rescalling")
|
||||
#define TR_MODEL_STILL_POWERED TR("Modèle allumé", "Modèle encore allumé")
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Eteindre ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Presser [Enter] pour confirmer"
|
||||
#define TR_THROTTLE_LABEL "Gaz"
|
||||
|
||||
@@ -564,6 +564,7 @@
|
||||
#define TR_ALARMWARNING INDENT "Spegni suono"
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR(INDENT "RSSI Shut.", INDENT "Control. RSSI al Shutdown")
|
||||
#define TR_MODEL_STILL_POWERED "Ricevente ancora connessa"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Shutdown?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Premi [ENT] per confermare"
|
||||
#define TR_THROTTLE_LABEL "Motore"
|
||||
|
||||
@@ -541,6 +541,7 @@
|
||||
#define TR_ALARMWARNING TR("Al Geluid uit?", "Al het geluid uit?")
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "Check Rssi on Shutdown")
|
||||
#define TR_MODEL_STILL_POWERED "Model still powered"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Shutdown ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm"
|
||||
#define TR_THROTTLE_LABEL "Gas"
|
||||
|
||||
@@ -560,6 +560,7 @@
|
||||
#define TR_ALARMWARNING "Wyłącz dźwięk"
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "Check Rssi on Shutdown")
|
||||
#define TR_MODEL_STILL_POWERED "Model still powered"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Shutdown ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm"
|
||||
#define TR_THROTTLE_LABEL "Gaz "
|
||||
|
||||
@@ -557,6 +557,7 @@
|
||||
#define TR_ALARMWARNING "Som Off"
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "Check Rssi on Shutdown")
|
||||
#define TR_MODEL_STILL_POWERED "Model still powered"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Shutdown ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm"
|
||||
#define TR_THROTTLE_LABEL "Throttle"
|
||||
|
||||
@@ -562,6 +562,7 @@
|
||||
#define TR_ALARMWARNING "Ljud Av"
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "Check Rssi on Shutdown")
|
||||
#define TR_MODEL_STILL_POWERED "Model still powered"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "Shutdown ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm"
|
||||
#define TR_THROTTLE_LABEL "Gas"
|
||||
|
||||
@@ -451,6 +451,7 @@
|
||||
#define TR_ALARMWARNING "靜音"
|
||||
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "關機時檢查RSSI")
|
||||
#define TR_MODEL_STILL_POWERED "模型未斷電"
|
||||
#define TR_USB_STILL_CONNECTED "USB still connected"
|
||||
#define TR_MODEL_SHUTDOWN "關機 ?"
|
||||
#define TR_PRESS_ENTER_TO_CONFIRM "按ENTER鍵確認"
|
||||
#define TR_THROTTLE_LABEL "油門"
|
||||
|
||||
Reference in New Issue
Block a user