From 161b8ba2cb03b153b42050e4fb221241ffb7de8d Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Thu, 17 Nov 2022 00:30:27 +0100 Subject: [PATCH] reworked CJC appearance --- Translations/translation_BE.json | 5 +++++ Translations/translation_BG.json | 5 +++++ Translations/translation_CS.json | 5 +++++ Translations/translation_DA.json | 5 +++++ Translations/translation_DE.json | 5 +++++ Translations/translation_EL.json | 5 +++++ Translations/translation_EN.json | 5 +++++ Translations/translation_ES.json | 6 +++++- Translations/translation_FI.json | 5 +++++ Translations/translation_FR.json | 5 +++++ Translations/translation_HR.json | 5 +++++ Translations/translation_HU.json | 5 +++++ Translations/translation_IT.json | 5 +++++ Translations/translation_JA_JP.json | 2 ++ Translations/translation_LT.json | 5 +++++ Translations/translation_NB.json | 5 +++++ Translations/translation_NL.json | 5 +++++ Translations/translation_NL_BE.json | 5 +++++ Translations/translation_PL.json | 5 +++++ Translations/translation_PT.json | 5 +++++ Translations/translation_RO.json | 5 +++++ Translations/translation_RU.json | 5 +++++ Translations/translation_SK.json | 5 +++++ Translations/translation_SL.json | 5 +++++ Translations/translation_SR_CYRL.json | 5 +++++ Translations/translation_SR_LATN.json | 5 +++++ Translations/translation_SV.json | 5 +++++ Translations/translation_TR.json | 5 +++++ Translations/translation_UK.json | 5 +++++ Translations/translation_VI.json | 5 +++++ Translations/translation_YUE_HK.json | 2 ++ Translations/translation_ZH_CN.json | 2 ++ Translations/translation_ZH_TW.json | 2 ++ Translations/translations_def.js | 8 ++++++++ source/Core/Inc/Translation.h | 2 ++ source/Core/Threads/GUIThread.cpp | 13 ++++++------- 36 files changed, 169 insertions(+), 8 deletions(-) diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json index 2fcda516..2219463c 100644 --- a/Translations/translation_BE.json +++ b/Translations/translation_BE.json @@ -9,6 +9,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Пераканайцеся, што пры наступнай загрузцы наканечнік і ручка маюць пакаёвую тэмпературу!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Вы ўпэннены, што жадаеце зкінуць налады да першапачатковых значэнняў?", "UVLOWarningString": "НАПРУГА--", "UndervoltageString": "Нізкая напруга", @@ -20,6 +21,10 @@ "DeviceFailedValidationWarning": "Ваша прылада, хутчэй за ўсё, падробка!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Скід OK", "SettingsResetMessage": [ "Налады", diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json index d0fffa64..b18fe31d 100644 --- a/Translations/translation_BG.json +++ b/Translations/translation_BG.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Сигурни ли сте, че искате да върнете фабричните настройки?", "UVLOWarningString": "Ниско DC Напрежение", "UndervoltageString": "Ниско Напрежение", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Нулиране", "SettingsResetMessage": [ "Настройките бяха", diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json index 5a8c5894..9eaeecd1 100644 --- a/Translations/translation_CS.json +++ b/Translations/translation_CS.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Opravdu chcete resetovat zařízení do továrního nastavení?", "UVLOWarningString": "Nízké DC", "UndervoltageString": "Nízké napětí", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Nějaká nastavení", diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json index f71ab4c2..435549f9 100644 --- a/Translations/translation_DA.json +++ b/Translations/translation_DA.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Sørg for at loddespidsen er ved stuetemperatur, inden næste start!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Er du sikker du vil resette indstillingerne til standard?", "UVLOWarningString": "Lav Volt", "UndervoltageString": "Undervolt", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Din enhed er højst sandsyneligt en Kopivare!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Visse indstillinger", diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json index 270f94f1..c6dbb101 100644 --- a/Translations/translation_DE.json +++ b/Translations/translation_DE.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Bitte sicherstellen, dass Lötspitze & Gerät beim nächsten Start Raumtemperatur haben!", + "CJCCalibrating": "kalibriere", "SettingsResetWarning": "Sicher, dass alle Werte zurückgesetzt werden sollen?", "UVLOWarningString": "V niedr.", "UndervoltageString": "Unterspannung", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Höchstwahrscheinlich ist das Gerät eine Fälschung!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Erfolgreich", + "kalibriert!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Einstellungen", diff --git a/Translations/translation_EL.json b/Translations/translation_EL.json index 41049f46..24578a12 100644 --- a/Translations/translation_EL.json +++ b/Translations/translation_EL.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": true, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Σίγουρα θέλετε επαναφορά αρχικών ρυθμίσεων;", "UVLOWarningString": "Χαμηλ DC", "UndervoltageString": "Υπόταση", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Επαν. OK", "SettingsResetMessage": [ "Κάποιες ρυθμ.", diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json index 40794ce4..5f716179 100644 --- a/Translations/translation_EN.json +++ b/Translations/translation_EN.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": true, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Are you sure you want to restore default settings?", "UVLOWarningString": "DC LOW", "UndervoltageString": "Undervoltage", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Certain settings", diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json index aaebb5a1..845ae1b5 100644 --- a/Translations/translation_ES.json +++ b/Translations/translation_ES.json @@ -8,7 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "¡Asegúrate que la punta esté a temperatura ambiente al inicio", - + "CJCCalibrating": "calibrating", "SettingsResetWarning": "¿Quieres restablecer los ajustes?", "UVLOWarningString": "CC BAJA", "UndervoltageString": "Voltaje bajo", @@ -20,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Hecho.", "SettingsResetMessage": [ "Ajustes", diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json index e2d00bf5..282e0a10 100644 --- a/Translations/translation_FI.json +++ b/Translations/translation_FI.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Haluatko varmasti palauttaa oletusarvot?", "UVLOWarningString": "DC ALH.", "UndervoltageString": "Alijännite", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Palautus", "SettingsResetMessage": [ "Asetukset", diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json index 1e155590..ed00e27a 100644 --- a/Translations/translation_FR.json +++ b/Translations/translation_FR.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ?", "UVLOWarningString": "DC FAIBL", "UndervoltageString": "Sous-tension", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Votre appareil semble être une contrefaçon !" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Réglages", diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json index 1b80fe3c..1363fee6 100644 --- a/Translations/translation_HR.json +++ b/Translations/translation_HR.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Jeste li sigurni da želite sve postavke vratiti na tvorničke vrijednosti?", "UVLOWarningString": "BATERIJA", "UndervoltageString": "PRENIZAK NAPON", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Certain settings", diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json index 926d9fd9..992d0d28 100644 --- a/Translations/translation_HU.json +++ b/Translations/translation_HU.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Biztos visszaállítja a beállításokat alapértékekre?", "UVLOWarningString": "DC TÚL KEVÉS", "UndervoltageString": "Alulfeszültség", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Törlés OK", "SettingsResetMessage": [ "Beállítások", diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json index 2e7c9d82..b8290178 100644 --- a/Translations/translation_IT.json +++ b/Translations/translation_IT.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Assicurarsi che la punta e il manico si trovino a temperatura ambiente prima di continuare!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Ripristinare le impostazioni iniziali?", "UVLOWarningString": "DC BASSA", "UndervoltageString": "DC INSUFFICIENTE", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Il dispositivo in uso è molto probabilmente una contraffazione!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Impostazioni", diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json index d27299cc..f24e6e28 100755 --- a/Translations/translation_JA_JP.json +++ b/Translations/translation_JA_JP.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": true, "messages": { "SettingsCalibrationWarning": "次に電源を入れるときは、コテ先と本体が室温と同じになっていることを確認してください", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "設定をリセットしますか？", "UVLOWarningString": "電圧が低すぎます", "UndervoltageString": "Undervoltage", @@ -19,6 +20,7 @@ "DeviceFailedValidationWarning": "このデバイスはおそらく偽造品です" }, "messagesWarn": { + "CJCCalibrationDone": "Calibration done!", "ResetOKMessage": "リセットOK", "SettingsResetMessage": "初期化されました", "NoAccelerometerMessage": "加速度計未検出", diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json index 81a8a403..218c9bb6 100644 --- a/Translations/translation_LT.json +++ b/Translations/translation_LT.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Ar norite atstatyti nustatymus į numatytas reikšmes?", "UVLOWarningString": "MAŽ VOLT", "UndervoltageString": "Žema įtampa", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Atstatyta", "SettingsResetMessage": [ "Nust. atstatyti!", diff --git a/Translations/translation_NB.json b/Translations/translation_NB.json index 7fc588e9..4186f860 100644 --- a/Translations/translation_NB.json +++ b/Translations/translation_NB.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Sørg for at loddespissen har romtemperatur før du fortsetter!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Er du sikker på at du vil tilbakestille til standardinnstillinger?", "UVLOWarningString": "Lavspenn", "UndervoltageString": "Underspenning", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Enheten din er sannsynligvis en forfalskning!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Tilbakestilling OK", "SettingsResetMessage": [ "Noen innstillinger", diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json index 02f0c8ee..f873f8fb 100644 --- a/Translations/translation_NL.json +++ b/Translations/translation_NL.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Weet je zeker dat je de fabrieksinstellingen terug wilt zetten?", "UVLOWarningString": "DC Laag", "UndervoltageString": "Onderspanning", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Jouw toestel is wellicht een namaak-versie!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Instellingen", diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json index 44f6349a..d73de42f 100644 --- a/Translations/translation_NL_BE.json +++ b/Translations/translation_NL_BE.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Ben je zeker dat je alle standaardwaarden wil resetten?", "UVLOWarningString": "Voedingsspanning LAAG", "UndervoltageString": "Onderspanning", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Certain settings", diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json index 95e62abb..892866c9 100644 --- a/Translations/translation_PL.json +++ b/Translations/translation_PL.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Upewnij się, że końcówka i uchwyt mają temperaturę pokojową podczas następnego rozruchu!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Czy na pewno chcesz przywrócić ustawienia fabryczne?", "UVLOWarningString": "NIS. NAP", "UndervoltageString": "Zbyt niskie nap.", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Twoje urządzenie jest najprawdopodobniej podróbką!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Ust. zresetowane", diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json index 29f806a4..bd045b6b 100644 --- a/Translations/translation_PT.json +++ b/Translations/translation_PT.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Definições de fábrica?", "UVLOWarningString": "DC BAIXO", "UndervoltageString": "Subtensão", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Certain settings", diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json index cf55879d..0e196df3 100644 --- a/Translations/translation_RO.json +++ b/Translations/translation_RO.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": true, "messages": { "SettingsCalibrationWarning": "Vă rugăm să vă asigurati că vârful si mânerul sunt la temperatura camerei la următoarea pornire!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Sigur doriti să restaurati la setările implicite?", "UVLOWarningString": "DC LOW", "UndervoltageString": "Sub tensiune", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Setările au fost", diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json index 318b309d..488a60ae 100644 --- a/Translations/translation_RU.json +++ b/Translations/translation_RU.json @@ -9,6 +9,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Пожалуйста, убедитесь, что жало и корпус имеют комнатную температуру при следующей загрузке!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?", "UVLOWarningString": "НАПРЯЖ--", "UndervoltageString": "Низ. напряжение", @@ -20,6 +21,10 @@ "DeviceFailedValidationWarning": "Скорее всего, это устройство подделка!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Сброс OK", "SettingsResetMessage": [ "Настройки", diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json index 894be258..bfc1b500 100644 --- a/Translations/translation_SK.json +++ b/Translations/translation_SK.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Naozaj chcete obnoviť továrenské nastavenia?", "UVLOWarningString": "Nízke U!", "UndervoltageString": "Nízke napätie", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Vaše zariadenie je pravdepodobne falzifikát!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Nastavenia", diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json index cd398186..6f18fd72 100644 --- a/Translations/translation_SL.json +++ b/Translations/translation_SL.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Res želite ponastaviti na privzete nastavitve?", "UVLOWarningString": "NIZKA U", "UndervoltageString": "Nizka napetost", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Nastavitve OK!", diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json index ee2b472b..f23f1eac 100644 --- a/Translations/translation_SR_CYRL.json +++ b/Translations/translation_SR_CYRL.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Да ли заиста желите да вратите поставке на фабричке вредности?", "UVLOWarningString": "НИЗ.НАП.", "UndervoltageString": "ПРЕНИЗАК НАПОН", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Certain settings", diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json index 59437fe8..6aaaef51 100644 --- a/Translations/translation_SR_LATN.json +++ b/Translations/translation_SR_LATN.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Da li zaista želite da vratite postavke na fabričke vrednosti?", "UVLOWarningString": "NIZ.NAP.", "UndervoltageString": "PRENIZAK NAPON", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Certain settings", diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json index 20ca5bb0..18781362 100644 --- a/Translations/translation_SV.json +++ b/Translations/translation_SV.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Är du säker på att du vill återställa inställningarna?", "UVLOWarningString": "DC LÅG", "UndervoltageString": "Underspänning", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Inställningar", diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json index f0b34bee..bb36540b 100644 --- a/Translations/translation_TR.json +++ b/Translations/translation_TR.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz?", "UVLOWarningString": "Güç Az", "UndervoltageString": "Düşük Voltaj", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Sıfırlama Tamam", "SettingsResetMessage": [ "Ayarlar", diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json index e3a5b159..b51a854f 100644 --- a/Translations/translation_UK.json +++ b/Translations/translation_UK.json @@ -9,6 +9,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну температуру!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? (A=Так, В=Ні)", "UVLOWarningString": "АККУМ--", "UndervoltageString": "Низька напруга", @@ -20,6 +21,10 @@ "DeviceFailedValidationWarning": "Ваш пристрій, швидше за все, підробка!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Скид. OK", "SettingsResetMessage": [ "Налаштування", diff --git a/Translations/translation_VI.json b/Translations/translation_VI.json index 52a04b4f..8183156b 100644 --- a/Translations/translation_VI.json +++ b/Translations/translation_VI.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": false, "messages": { "SettingsCalibrationWarning": "Please make sure tip & handle are at room temperature at next boot!", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "Ban chac chan muon khôi phuc tat ca cài đat ve mac đinh?", "UVLOWarningString": "DC thap", "UndervoltageString": "Đien áp thap", @@ -19,6 +20,10 @@ "DeviceFailedValidationWarning": "Your device is most likely a counterfeit!" }, "messagesWarn": { + "CJCCalibrationDone": [ + "Calibration", + "done!" + ], "ResetOKMessage": "Reset OK", "SettingsResetMessage": [ "Mot so cài đat", diff --git a/Translations/translation_YUE_HK.json b/Translations/translation_YUE_HK.json index 86643600..55ef8780 100644 --- a/Translations/translation_YUE_HK.json +++ b/Translations/translation_YUE_HK.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": true, "messages": { "SettingsCalibrationWarning": "喺下次開機嗰陣時，請確定焫雞咀同機身都係處於室温！", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "你係咪確定要將全部設定重設到預設值？", "UVLOWarningString": "電壓過低", "UndervoltageString": "Undervoltage", @@ -19,6 +20,7 @@ "DeviceFailedValidationWarning": "依支焫雞好有可能係冒牌貨！" }, "messagesWarn": { + "CJCCalibrationDone": "Calibration done!", "ResetOKMessage": "已重設！", "SettingsResetMessage": "設定已被重設！", "NoAccelerometerMessage": "未能偵測加速度計", diff --git a/Translations/translation_ZH_CN.json b/Translations/translation_ZH_CN.json index 8fa01cf8..126439bc 100644 --- a/Translations/translation_ZH_CN.json +++ b/Translations/translation_ZH_CN.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": true, "messages": { "SettingsCalibrationWarning": "于下次开机时，请确定烙铁头和机身均处于室温！", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "你是否确定要将全部设定重置为默认值？", "UVLOWarningString": "电压过低", "UndervoltageString": "Undervoltage", @@ -19,6 +20,7 @@ "DeviceFailedValidationWarning": "这支电烙铁很有可能是冒牌货！" }, "messagesWarn": { + "CJCCalibrationDone": "Calibration done!", "ResetOKMessage": "已重置！", "SettingsResetMessage": "设定已被重置！", "NoAccelerometerMessage": "未检测到加速度计", diff --git a/Translations/translation_ZH_TW.json b/Translations/translation_ZH_TW.json index 3627a5e3..1b99fd59 100644 --- a/Translations/translation_ZH_TW.json +++ b/Translations/translation_ZH_TW.json @@ -8,6 +8,7 @@ "tempUnitFahrenheit": true, "messages": { "SettingsCalibrationWarning": "於下次開機時，請確定烙鐵頭和機身均處於室溫！", + "CJCCalibrating": "calibrating", "SettingsResetWarning": "你是否確定要將全部設定重設到預設值？", "UVLOWarningString": "電壓過低", "UndervoltageString": "Undervoltage", @@ -19,6 +20,7 @@ "DeviceFailedValidationWarning": "這支電烙鐵很有可能是冒牌貨！" }, "messagesWarn": { + "CJCCalibrationDone": "Calibration done!", "ResetOKMessage": "已重設！", "SettingsResetMessage": "設定已被重設！", "NoAccelerometerMessage": "未能偵測加速度計", diff --git a/Translations/translations_def.js b/Translations/translations_def.js index 16f35951..e465c2a8 100644 --- a/Translations/translations_def.js +++ b/Translations/translations_def.js @@ -4,6 +4,10 @@ var def = /// "id": "SettingsCalibrationWarning", "description": "Confirmation message shown before performing an offset calibration. Should warn the user to make sure tip and handle are at the same temperature." }, + { + "id": "CJCCalibrating", + "description": "Message indicating CJC is being calibrated." + }, { "id": "SettingsResetWarning", "description": "Confirmation message shown before confirming a settings reset." @@ -51,6 +55,10 @@ var def = /// } ], "messagesWarn": [{ + "id": "CJCCalibrationDone", + "description": "Confirmation message indicating CJC calibration is complete." + }, + { "id": "SettingsResetMessage", "description": "Shown when the settings are reset to factory defaults either by the user or by incompatible firmware changes." }, diff --git a/source/Core/Inc/Translation.h b/source/Core/Inc/Translation.h index 329a2218..3235237c 100644 --- a/source/Core/Inc/Translation.h +++ b/source/Core/Inc/Translation.h @@ -74,6 +74,7 @@ enum class SettingsItemIndex : uint8_t { struct TranslationIndexTable { uint16_t SettingsCalibrationWarning; + uint16_t CJCCalibrating; uint16_t SettingsResetWarning; uint16_t UVLOWarningString; uint16_t UndervoltageString; @@ -85,6 +86,7 @@ struct TranslationIndexTable { uint16_t OffString; uint16_t DeviceFailedValidationWarning; + uint16_t CJCCalibrationDone; uint16_t SettingsResetMessage; uint16_t NoAccelerometerMessage; uint16_t NoPowerDeliveryMessage; diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index a22b3e78..c6e2482b 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/source/Core/Threads/GUIThread.cpp @@ -110,9 +110,11 @@ void performCJCC() { // cycle through the filter a fair bit to ensure we're stable. OLED::clearScreen(); OLED::setCursor(0, 0); - OLED::print(SymbolDot, FontStyle::LARGE); + OLED::print(translatedString(Tr->CJCCalibrating), FontStyle::SMALL); + OLED::setCursor(0, 8); + OLED::print(SymbolDot, FontStyle::SMALL); for (uint8_t x = 0; x < (i / 4); x++) - OLED::print(SymbolDot, FontStyle::LARGE); + OLED::print(SymbolDot, FontStyle::SMALL); OLED::refresh(); osDelay(100); } @@ -120,11 +122,8 @@ void performCJCC() { } setSettingValue(SettingsOptions::CalibrationOffset, setoffset); OLED::clearScreen(); - OLED::setCursor(0, 0); - OLED::drawCheckbox(true); - OLED::printNumber(setoffset, 5, FontStyle::LARGE); + warnUser(translatedString(Tr->CJCCalibrationDone), 3 * TICKS_SECOND); OLED::refresh(); - osDelay(1200); // Preventing to repeat calibration at boot automatically (only one shot). setSettingValue(SettingsOptions::CalibrateCJC, 0); saveSettings(); @@ -1231,4 +1230,4 @@ void startGUITask(void const *argument) { GUIDelay(); } } -} +} \ No newline at end of file