sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Change ResetOKMessage to use warnUser

Browse Source
This commit is contained in:
Alvin Wong
2021-03-29 19:07:50 +08:00
parent 33901b688a
commit ab1b48a0f2
31 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Translations/translation_BG.json
View File

@@ -21,10 +21,13 @@
"TipDisconnectedString": "ПРЕКЪСНАТ ВРЪХ",
"SolderingAdvancedPowerPrompt": "Захранване: ",
"OffString": "Изкл.",
"ResetOKMessage": "Нулиране завършено",
"YourGainMessage": "Усилване:"
},
"messagesWarn": {
"ResetOKMessage": [
"Нулиране",
"завършено"
],
"SettingsResetMessage": [
"Настройките бяха",
"нулирани!"

2
Translations/translation_CS.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "HROT NEPŘIPOJEN",
"SolderingAdvancedPowerPrompt": "Ohřev: ",
"OffString": "Vyp",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Zisk:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Tov. nas. obnov.",
""

2
Translations/translation_DA.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "TIP DISCONNECTED",
"SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

2
Translations/translation_DE.json
View File

@@ -22,10 +22,10 @@
"TipDisconnectedString": "Spitze fehlt",
"SolderingAdvancedPowerPrompt": "Leistung: ",
"OffString": "Aus",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Dein Faktor:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Einstellungen",
"zurückgesetzt!"

2
Translations/translation_EN.json
View File

@@ -22,10 +22,10 @@
"TipDisconnectedString": "NO TIP",
"SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

2
Translations/translation_ES.json
View File

@@ -21,11 +21,11 @@
"TipDisconnectedString": "NO HAY PUNTA",
"SolderingAdvancedPowerPrompt": "Potencia: ",
"OffString": " No",
"ResetOKMessage": "Hecho. ",
"YourGainMessage": "Gananc.:",
"SettingsResetMessage": "Ajustes borrados"
},
"messagesWarn": {
"ResetOKMessage": "Hecho.",
"SettingsResetMessage": [
"Settings were",
"reset!"

2
Translations/translation_FI.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "KÄRKI ON IRTI",
"SolderingAdvancedPowerPrompt": "Teho: ",
"OffString": "OFF",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

2
Translations/translation_FR.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "PANNE DÉBRANCHÉE",
"SolderingAdvancedPowerPrompt": "Puissance : ",
"OffString": "Off",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Gain : "
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Réglage",
"réinit. !"

2
Translations/translation_HR.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "VRH NIJE SPOJEN!",
"SolderingAdvancedPowerPrompt": "Snaga: ",
"OffString": "Off",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

5
Translations/translation_HU.json
View File

@@ -21,10 +21,13 @@
"TipDisconnectedString": "PÁKA LEVÉVE",
"SolderingAdvancedPowerPrompt": "Telj: ",
"OffString": "Ki",
"ResetOKMessage": "Törlés OK",
"YourGainMessage": "Erősítés:"
},
"messagesWarn": {
"ResetOKMessage": [
"Törlés OK",
""
],
"SettingsResetMessage": [
"Beállítások",
"törölve!"

2
Translations/translation_IT.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "PUNTA ASSENTE",
"SolderingAdvancedPowerPrompt": "Potenz:",
"OffString": "OFF",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Guad.: "
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Reset effettuato",
""

5
Translations/translation_LT.json
View File

@@ -21,10 +21,13 @@
"TipDisconnectedString": "NĖRA ANTGALIO",
"SolderingAdvancedPowerPrompt": "Galia: ",
"OffString": "Išj",
"ResetOKMessage": "Atstatytas OK",
"YourGainMessage": "Greitis:"
},
"messagesWarn": {
"ResetOKMessage": [
"Atstatytas OK",
""
],
"SettingsResetMessage": [
"Nust. atstatyti!",
""

2
Translations/translation_NL.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "PUNT LOSGEKOPPELT",
"SolderingAdvancedPowerPrompt": "Vermogen: ",
"OffString": "Uit",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Niveau:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Instellingen",
"zijn gereset!"

2
Translations/translation_NL_BE.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "Punt ONTKOPPELD",
"SolderingAdvancedPowerPrompt": "Vermogen: ",
"OffString": "Uit",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

2
Translations/translation_NO.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "SPISS FRAKOBLET",
"SolderingAdvancedPowerPrompt": "Effekt: ",
"OffString": "Av",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

2
Translations/translation_PL.json
View File

@@ -22,10 +22,10 @@
"TipDisconnectedString": "GROT ODŁĄCZONY",
"SolderingAdvancedPowerPrompt": "Moc: ",
"OffString": "Wył",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Us.zysk:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Ust. zresetowane",
""

2
Translations/translation_PT.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "SEM PONTA",
"SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

2
Translations/translation_RU.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "ЖАЛО ОТСОЕДИНЕНО",
"SolderingAdvancedPowerPrompt": "Питание: ",
"OffString": "Выкл.",
"ResetOKMessage": "Сброс OK",
"YourGainMessage": "Прирост:"
},
"messagesWarn": {
"ResetOKMessage": "Сброс OK",
"SettingsResetMessage": [
"Настройки",
"сброшены!"

2
Translations/translation_SK.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "HROT ODPOJENÝ",
"SolderingAdvancedPowerPrompt": "Výkon: ",
"OffString": "Vyp",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Zisk:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Tov. nas. obnov.",
""

2
Translations/translation_SL.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "NI KONICE",
"SolderingAdvancedPowerPrompt": "Moč: ",
"OffString": "Off",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Ojačenje"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Nastavitve OK!",
""

2
Translations/translation_SR_CYRL.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
"SolderingAdvancedPowerPrompt": "Снага: ",
"OffString": "Иск",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

2
Translations/translation_SR_LATN.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "VRH NIJE SPOJEN",
"SolderingAdvancedPowerPrompt": "Snaga: ",
"OffString": "Isk",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

2
Translations/translation_SV.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "SPETS URTAGEN",
"SolderingAdvancedPowerPrompt": "Ström: ",
"OffString": "Av",
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "Reset OK",
"SettingsResetMessage": [
"Settings were",
"reset!"

5
Translations/translation_TR.json
View File

@@ -21,10 +21,13 @@
"TipDisconnectedString": "UÇ ÇIKARILDI",
"SolderingAdvancedPowerPrompt": "Güç: ",
"OffString": "Kapalı",
"ResetOKMessage": "Sıfırlama Tamam",
"YourGainMessage": "Kazancınız:"
},
"messagesWarn": {
"ResetOKMessage": [
"Sıfırlama Tamam",
""
],
"SettingsResetMessage": [
"Ayarlar",
"Sıfırlandı"

2
Translations/translation_UK.json
View File

@@ -21,10 +21,10 @@
"TipDisconnectedString": "Жало вимкнено!",
"SolderingAdvancedPowerPrompt": "Живлення: ",
"OffString": "Вимк",
"ResetOKMessage": "Скид. OK",
"YourGainMessage": "Приріст:"
},
"messagesWarn": {
"ResetOKMessage": "Скид. OK",
"SettingsResetMessage": [
"Налаштування",
"скинуті!"

2
Translations/translation_YUE_HK.json
View File

@@ -22,10 +22,10 @@
"TipDisconnectedString": "NO TIP",
"SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "關",
"ResetOKMessage": "已重設！",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "已重設！",
"SettingsResetMessage": "設定已被重設！",
"NoAccelerometerMessage": [
"No accelerometer",

2
Translations/translation_ZH_TW.json
View File

@@ -22,10 +22,10 @@
"TipDisconnectedString": "NO TIP",
"SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "關",
"ResetOKMessage": "已重設！",
"YourGainMessage": "Your gain:"
},
"messagesWarn": {
"ResetOKMessage": "已重設！",
"SettingsResetMessage": "設定已被重設！",
"NoAccelerometerMessage": [
"No accelerometer",

7
Translations/translations_def.js
View File

@@ -81,10 +81,6 @@ var def =
"id": "OffString",
"maxLen": 3
},
{
"id": "ResetOKMessage",
"maxLen": 8
},
{
"id": "YourGainMessage",
"maxLen": 8,
@@ -92,6 +88,9 @@ var def =
}
],
"messagesWarn": [
{
"id": "ResetOKMessage"
},
{
"id": "SettingsResetMessage"
},

2
source/Core/Inc/Translation.h
View File

@@ -35,9 +35,9 @@ extern const char *IdleSetString;
extern const char *TipDisconnectedString;
extern const char *SolderingAdvancedPowerPrompt;
extern const char *OffString;
extern const char *ResetOKMessage;
extern const char *YourGainMessage;
extern const char *ResetOKMessage;
extern const char *SettingsResetMessage;
extern const char *NoAccelerometerMessage;
extern const char *NoPowerDeliveryMessage;

1
source/Core/Inc/gui.hpp
View File

@@ -29,6 +29,7 @@ typedef struct {
void enterSettingsMenu();
void GUIDelay();
void warnUser(const char *warning, const int timeout);
extern const menuitem rootSettingsMenu[];
#endif /* GUI_HPP_ */

10
source/Core/Src/gui.cpp
View File

@@ -711,13 +711,7 @@ static bool settings_displayCoolingBlinkEnabled(void) {
static bool settings_setResetSettings(void) {
if (userConfirmation(SettingsResetWarning)) {
resetSettings();
OLED::clearScreen();
OLED::setCursor(0, 0);
OLED::print(ResetOKMessage, FontStyle::LARGE);
OLED::refresh();
waitForButtonPressOrTimeout(2000); // 2 second timeout
warnUser(ResetOKMessage, 2 * TICKS_SECOND);
}
return false;
}
@@ -801,7 +795,7 @@ static bool settings_setCalibrateVIN(void) {
OLED::setCursor(0, 0);
OLED::printNumber(systemSettings.voltageDiv, 3, FontStyle::LARGE);
OLED::refresh();
waitForButtonPressOrTimeout(1000);
waitForButtonPressOrTimeout(1 * TICKS_SECOND);
return false;
case BUTTON_NONE:
default: