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

Re #1881: notice displayed while saving model at radio shutdown

Browse Source
This commit is contained in:
Damjan Adamic
2014-12-01 19:31:25 +01:00
parent 7717348bf5
commit de43ce71df
13 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+4
View File
@@ -2088,6 +2088,10 @@ void opentxClose()
}
#endif
if (s_eeDirtyMsk & EE_MODEL) {
displayPopup(STR_SAVEMODEL);
}
g_eeGeneral.unexpectedShutdown = 0;
eeDirty(EE_GENERAL);
radio/src/translations.cpp
+5 -4
View File
@@ -345,13 +345,13 @@ const pm_char STR_EXTERNALRF[] PROGMEM = TR_EXTERNALRF;
const pm_char STR_COUNTRYCODE[] PROGMEM = TR_COUNTRYCODE;
const pm_char STR_FAILSAFE[] PROGMEM = TR_FAILSAFE;
const pm_char STR_FAILSAFESET[] PROGMEM = TR_FAILSAFESET;
const pm_char STR_MENUSENSOR[] PROGMEM = TR_MENUSENSOR;
const pm_char STR_MENUSENSOR[] PROGMEM = TR_MENUSENSOR;
#endif
const pm_char STR_INVERT_THR[] PROGMEM = TR_INVERT_THR;
const pm_char STR_AND_SWITCH[] PROGMEM = TR_AND_SWITCH;
const pm_char STR_SF[] PROGMEM = TR_SF;
const pm_char STR_GF[] PROGMEM = TR_GF;
const pm_char STR_GF[] PROGMEM = TR_GF;
#if defined(FRSKY_HUB)
const pm_char STR_MINRSSI[] PROGMEM = TR_MINRSSI;
@@ -361,6 +361,7 @@ const pm_char STR_LONGITUDE[] PROGMEM = TR_LONGITUDE;
#if defined(CPUARM) || defined(CPUM2560)
const pm_char STR_SHUTDOWN[] PROGMEM = TR_SHUTDOWN;
const pm_char STR_SAVEMODEL[] PROGMEM = TR_SAVEMODEL;
#endif
const pm_char STR_BATT_CALIB[] PROGMEM = TR_BATT_CALIB;
@@ -510,10 +511,10 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR;
const pm_char STR_LOWALARM[] PROGMEM = TR_LOWALARM;
const pm_char STR_CRITICALALARM[] PROGMEM = TR_CRITICALALARM;
const pm_char STR_TELEMETRY_TYPE[] PROGMEM = TR_TELEMETRY_TYPE;
const pm_char STR_TELEMETRY_SENSORS[] PROGMEM = TR_TELEMETRY_SENSORS;
const pm_char STR_TELEMETRY_SENSORS[] PROGMEM = TR_TELEMETRY_SENSORS;
const pm_char STR_TELEMETRY_NEWSENSOR[] PROGMEM = TR_TELEMETRY_NEWSENSOR;
const pm_char STR_ID[] PROGMEM = TR_ID;
const pm_char STR_PRECISION[] PROGMEM = TR_PRECISION;
const pm_char STR_PRECISION[] PROGMEM = TR_PRECISION;
#endif
#if defined(PCBTARANIS)
radio/src/translations.h
+4 -3
View File
@@ -506,7 +506,7 @@ extern const pm_char STR_INTERNALRF[];
extern const pm_char STR_EXTERNALRF[];
extern const pm_char STR_FAILSAFE[];
extern const pm_char STR_FAILSAFESET[];
extern const pm_char STR_MENUSENSOR[];
extern const pm_char STR_MENUSENSOR[];
extern const pm_char STR_COUNTRYCODE[];
#endif
@@ -522,6 +522,7 @@ extern const pm_char STR_LONGITUDE[];
#if defined(CPUARM) || defined(CPUM2560)
extern const pm_char STR_SHUTDOWN[];
extern const pm_char STR_SAVEMODEL[];
#endif
extern const pm_char STR_BATT_CALIB[];
@@ -711,10 +712,10 @@ extern const pm_char STR_BLCOLOR[];
extern const pm_char STR_LOWALARM[];
extern const pm_char STR_CRITICALALARM[];
extern const pm_char STR_TELEMETRY_TYPE[];
extern const pm_char STR_TELEMETRY_SENSORS[];
extern const pm_char STR_TELEMETRY_SENSORS[];
extern const pm_char STR_TELEMETRY_NEWSENSOR[];
extern const pm_char STR_ID[];
extern const pm_char STR_PRECISION[];
extern const pm_char STR_PRECISION[];
#endif
#if defined(PCBTARANIS)
radio/src/translations/cz.h.txt
+1
View File
@@ -709,6 +709,7 @@
#define TR_PITCH_AT_MAX INDENT "Tón na maximu"
#define TR_REPEAT_AT_ZERO INDENT "Opakování na nule"
#define TR_SHUTDOWN "VYPÍNÁNí.."
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "Kalib. baterie"
#define TR_CURRENT_CALIB " +=\006Proud"
#define TR_VOLTAGE INDENT"Napětí"
radio/src/translations/de.h.txt
+1
View File
@@ -713,6 +713,7 @@
#define TR_PITCH_AT_MAX INDENT "Höchster Ton"
#define TR_REPEAT_AT_ZERO INDENT "Wiederholrate"
#define TR_SHUTDOWN "Herunterfahren"
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "Akku abgleichen"
#define TR_CURRENT_CALIB "Strom abgl."
#define TR_VOLTAGE TR(INDENT "Spg",INDENT "Spannungsquelle") //9XR-Pro
radio/src/translations/en.h.txt
+1
View File
@@ -732,6 +732,7 @@
#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "SHUTTING DOWN"
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "Battery Calib"
#define TR_CURRENT_CALIB "Current Calib"
#define TR_VOLTAGE TR(INDENT "Voltage",INDENT "Voltage Source")
radio/src/translations/es.h.txt
+1
View File
@@ -706,6 +706,7 @@
#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "APAGANDO"
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "Calib.bateria"
#define TR_CURRENT_CALIB "Calib. actual"
#define TR_VOLTAGE INDENT"Voltaje"
radio/src/translations/fi.h.txt
+1
View File
@@ -706,6 +706,7 @@
#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "SHUTTING DOWN"
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "Battery Calib"
#define TR_CURRENT_CALIB "Current Calib"
#define TR_VOLTAGE INDENT"Voltage"
radio/src/translations/fr.h.txt
+1
View File
@@ -706,6 +706,7 @@
#define TR_PITCH_AT_MAX INDENT "Tonalité au max"
#define TR_REPEAT_AT_ZERO INDENT "Intervalle au zéro"
#define TR_SHUTDOWN "ARRET EN COURS"
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "Calib. Batterie"
#define TR_CURRENT_CALIB "Calib. Courant"
#define TR_VOLTAGE TR(INDENT "Tension",INDENT "Source Tension")
radio/src/translations/it.h.txt
+10 -9
View File
@@ -598,7 +598,7 @@
#define TR_RENAVIG "Navig EncRot "
#define TR_THROTTLE_LABEL "Motore"
#define TR_THROTTLEREVERSE TR("Mot inv.", INDENT "Motore Inverso")
#define TR_TIMER_NAME INDENT "Name"
#define TR_TIMER_NAME INDENT "Name"
#define TR_MINUTEBEEP INDENT"Minuto"
#define TR_BEEPCOUNTDOWN TR(INDENT"Conto rov", INDENT"Conto rovescia")
#define TR_PERSISTENT TR(INDENT"Persist.", INDENT"Persistente")
@@ -660,7 +660,7 @@
#define TR_MENURADIOSETUP "CONFIGURATX"
#define TR_MENUDATEANDTIME "DATA E ORA"
#define TR_MENUTRAINER "MAESTRO/ALLIEVO"
#define TR_MENUGLOBALFUNCS "GLOBAL FUNCTIONS"
#define TR_MENUGLOBALFUNCS "GLOBAL FUNCTIONS"
#define TR_MENUVERSION "VERSIONE"
#define TR_MENUDIAG "DIAG"
#define TR_MENUANA "ANAS"
@@ -706,6 +706,7 @@
#define TR_PITCH_AT_MAX INDENT "Tono al Max"
#define TR_REPEAT_AT_ZERO INDENT "Ripeti a Zero"
#define TR_SHUTDOWN "ARRESTO.."
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "Calibra batt."
#define TR_CURRENT_CALIB "Calibra corr."
#define TR_VOLTAGE "Voltaggio"
@@ -786,7 +787,7 @@
#define TR_EXTERNALRF "Modulo esterno"
#define TR_FAILSAFE "Modo failsafe"
#define TR_FAILSAFESET TR("FAILSAFE","IMPOSTAZIONI FAILSAFE")
#define TR_MENUSENSOR "SENSOR"
#define TR_MENUSENSOR "SENSOR"
#define TR_COUNTRYCODE TR("Codice Paese","Standard 2.4Ghz")
#define TR_VOICELANG "Lingua Voce"
#define TR_UNITSSYSTEM "Unità"
@@ -801,13 +802,13 @@
#define TR_RESET_FLIGHT "Azzera volo"
#define TR_RESET_TIMER1 "Azzera Timer1"
#define TR_RESET_TIMER2 "Azzera Timer2"
#define TR_RESET_TIMER3 "Azzera Timer3"
#define TR_RESET_TIMER3 "Azzera Timer3"
#define TR_RESET_TELEMETRY "Azzera Telemetria"
#define TR_STATISTICS "Statistiche"
#define TR_ABOUT_US "Info su"
#define TR_AND_SWITCH "Inter. AND"
#define TR_SF "CF"
#define TR_GF "GF"
#define TR_GF "GF"
#define TR_SPEAKER INDENT"Speaker"
#define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "Bytes"
@@ -820,8 +821,8 @@
#define TR_MODELIDUSED TR("ID già usato","ID Modello già usato")
#define TR_MODULE INDENT "Modulo"
#define TR_TELEMETRY_TYPE "Tipo Telemetria"
#define TR_TELEMETRY_SENSORS "Sensors"
#define TR_TELEMETRY_NEWSENSOR INDENT "Add a new sensor..."
#define TR_TELEMETRY_SENSORS "Sensors"
#define TR_TELEMETRY_NEWSENSOR INDENT "Add a new sensor..."
#define TR_CHANNELRANGE INDENT "Numero Canali"
#define TR_LOWALARM INDENT "Allarme Basso"
#define TR_CRITICALALARM INDENT "Allarme Critico"
@@ -951,5 +952,5 @@
#define TR_VIEW_NOTES "Vedi Note"
#define TR_MODS_FORBIDDEN "Modifica proibita!"
#define TR_UNLOCKED "Sbloccato"
#define TR_ID "ID"
#define TR_PRECISION "Precision"
#define TR_ID "ID"
#define TR_PRECISION "Precision"
radio/src/translations/pl.h.txt
+1
View File
@@ -706,6 +706,7 @@
#define TR_PITCH_AT_MAX INDENT "Ton przy Max"
#define TR_REPEAT_AT_ZERO INDENT "Powtórz przy Zerze"
#define TR_SHUTDOWN "Wyłączanie.."
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "Kalib:Baterii"
#define TR_CURRENT_CALIB " +=\006Kalibracja prądu"
#define TR_VOLTAGE TR (INDENT"Napięcie",INDENT"Źródło Napięcia")
radio/src/translations/pt.h.txt
+15 -14
View File
@@ -584,7 +584,7 @@
#define TR_SCREEN "Tela"
#define TR_SOUND_LABEL "Som"
#define TR_LENGTH INDENT"Comprimento"
#define TR_BEEP_LENGTH INDENT "Beep Length"
#define TR_BEEP_LENGTH INDENT "Beep Length"
#define TR_SPKRPITCH INDENT"Pitch"
#define TR_HAPTIC_LABEL "Vibrar"
#define TR_HAPTICSTRENGTH INDENT"Forca"
@@ -598,7 +598,7 @@
#define TR_RENAVIG "RotEnc Navig"
#define TR_THROTTLE_LABEL "Throttle"
#define TR_THROTTLEREVERSE TR("Inverte Acel.", INDENT "Inverte Acel.")
#define TR_TIMER_NAME INDENT "Name"
#define TR_TIMER_NAME INDENT "Name"
#define TR_MINUTEBEEP INDENT "Beep Minuto"
#define TR_BEEPCOUNTDOWN INDENT "Beep Regressivo"
#define TR_PERSISTENT INDENT "Persist."
@@ -613,7 +613,7 @@
#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning")
#define TR_TIMEZONE "Time Zone"
#define TR_RXCHANNELORD "Ordem Canal RX"
#define TR_SWITCHES_DELAY "Switches Delay"
#define TR_SWITCHES_DELAY "Switches Delay"
#define TR_SLAVE "Escravo"
#define TR_MODESRC "Modo\006% Fonte"
#define TR_MULTIPLIER "Multiplicar"
@@ -660,7 +660,7 @@
#define TR_MENURADIOSETUP "AJUSTAR RADIO"
#define TR_MENUDATEANDTIME "DATA E HORA"
#define TR_MENUTRAINER "TRAINER"
#define TR_MENUGLOBALFUNCS "GLOBAL FUNCTIONS"
#define TR_MENUGLOBALFUNCS "GLOBAL FUNCTIONS"
#define TR_MENUVERSION "VERSAO"
#define TR_MENUDIAG "DIAGNOST"
#define TR_MENUANA "ANALOGICOS"
@@ -706,6 +706,7 @@
#define TR_PITCH_AT_MAX INDENT "Pitch at Max"
#define TR_REPEAT_AT_ZERO INDENT "Repeat at Zero"
#define TR_SHUTDOWN "DESLIGANDOo"
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "CALIBRAR BATT"
#define TR_CURRENT_CALIB "Corrente Calib"
#define TR_VOLTAGE INDENT"Volts"
@@ -786,7 +787,7 @@
#define TR_EXTERNALRF "External RF"
#define TR_FAILSAFE "Failsafe mode"
#define TR_FAILSAFESET "FAILSAFE SETTINGS"
#define TR_MENUSENSOR "SENSOR"
#define TR_MENUSENSOR "SENSOR"
#define TR_COUNTRYCODE "Country Code"
#define TR_VOICELANG "Voice Language"
#define TR_UNITSSYSTEM "Units"
@@ -801,13 +802,13 @@
#define TR_RESET_FLIGHT "Reset Flight"
#define TR_RESET_TIMER1 "Reset Timer1"
#define TR_RESET_TIMER2 "Reset Timer2"
#define TR_RESET_TIMER3 "Reset Timer3"
#define TR_RESET_TIMER3 "Reset Timer3"
#define TR_RESET_TELEMETRY "Reset Telemetry"
#define TR_STATISTICS "Statistics"
#define TR_ABOUT_US "About Us"
#define TR_AND_SWITCH "AND Switch"
#define TR_SF "CF"
#define TR_GF "GF"
#define TR_GF "GF"
#define TR_SPEAKER INDENT"Speaker"
#define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "bytes"
@@ -819,9 +820,9 @@
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED TR("ID already used","Model ID already used")
#define TR_MODULE INDENT "Module"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_TELEMETRY_SENSORS "Sensors"
#define TR_TELEMETRY_NEWSENSOR INDENT "Add a new sensor..."
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_TELEMETRY_SENSORS "Sensors"
#define TR_TELEMETRY_NEWSENSOR INDENT "Add a new sensor..."
#define TR_CHANNELRANGE INDENT "Channel Range"
#define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Critical Alarm"
@@ -838,7 +839,7 @@
#define TR_PTS "pts"
#define TR_SMOOTH "Smooth"
#define TR_COPY_STICKS_TO_OFS "Copy Sticks To Offset"
#define TR_COPY_TRIMS_TO_OFS "Copy trims to subtrim"
#define TR_COPY_TRIMS_TO_OFS "Copy trims to subtrim"
#define TR_PERSISTENT_MAH INDENT "Store mAh"
#define TR_PREFLIGHT "Preflight Checks"
#define TR_CHECKLIST INDENT "Display Checklist"
@@ -848,7 +849,7 @@
#define TR_INPUTS "Inputs"
#define TR_OUTPUTS "Outputs"
#define TR_EEBACKUP "\004[ENTER Long] to backup the EEPROM"
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
#define TR_TO_MANY_LUA_SCRIPTS "Too many Lua scripts!"
#if defined(MAVLINK)
#define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"
@@ -951,5 +952,5 @@
#define TR_VIEW_NOTES "View Notes"
#define TR_MODS_FORBIDDEN "Modifications forbidden!"
#define TR_UNLOCKED "Unlocked"
#define TR_ID "ID"
#define TR_PRECISION "Precision"
#define TR_ID "ID"
#define TR_PRECISION "Precision"
radio/src/translations/se.h.txt
+1
View File
@@ -706,6 +706,7 @@
#define TR_PITCH_AT_MAX INDENT "Ton vid Max"
#define TR_REPEAT_AT_ZERO INDENT "Repetera vid Noll"
#define TR_SHUTDOWN "STÄNGER AV"
#define TR_SAVEMODEL "Saving model settings"
#define TR_BATT_CALIB "Kalib. Batteri"
#define TR_CURRENT_CALIB "Kalib. Ström"
#define TR_VOLTAGE INDENT"Volt"