From 7ba3818cdb3349e21e075b29eed6a392a2d7f521 Mon Sep 17 00:00:00 2001 From: jonnieZG Date: Mon, 8 Jan 2018 12:28:13 +0100 Subject: [PATCH] Croatian Language: Double-line menus + some minor translation corrections (#186) * Croatian: Double-line Menus + minor corrections * Updated main.css - externalizing string Externalized strings: "Undervoltage" "Input V: " "DC LOW" (Using previously unused ULOWarningString) "Tip Temp: " (At temperature warning) "Tip:" (At sleeping advanced) "Tip:" (At idle screen) " Set:" (At idle screen) "BAD TIP" "Tip Disconnected!" (changed to "TIP DISCONNECTED" due to <=16 limit) * Update Translation.c - Externalized strings Externalized strings: "Undervoltage" "Input V: " "DC LOW" (Using previously unused ULOWarningString) "Tip Temp: " (At temperature warning) "Tip:" (At sleeping advanced) "Tip:" (At idle screen) " Set:" (At idle screen) "BAD TIP" "Tip Disconnected!" (changed to "TIP DISCONNECTED" due to <=16 limit) Max string length corrected from 17 to 16. * Update Translation.h - Externalized strings Externalized strings: "Undervoltage" "Input V: " "DC LOW" (Using previously unused ULOWarningString) "Tip Temp: " (At temperature warning) "Tip:" (At sleeping advanced) "Tip:" (At idle screen) " Set:" (At idle screen) "BAD TIP" "Tip Disconnected!" (changed to "TIP DISCONNECTED" due to <=16 limit) --- workspace/TS100/inc/Translation.h | 9 ++ workspace/TS100/src/Translation.c | 200 +++++++++++++++++++++++------- workspace/TS100/src/main.cpp | 21 ++-- 3 files changed, 175 insertions(+), 55 deletions(-) diff --git a/workspace/TS100/inc/Translation.h b/workspace/TS100/inc/Translation.h index 029c2937..bea1e703 100644 --- a/workspace/TS100/inc/Translation.h +++ b/workspace/TS100/inc/Translation.h @@ -22,10 +22,19 @@ extern const char* SettingsLongNames[16]; extern const char* SettingsCalibrationWarning; extern const char* SettingsResetWarning; extern const char* UVLOWarningString; +extern const char* UndervoltageString; +extern const char* InputVoltageString; +extern const char* WarningTipTempString; +extern const char* BadTipString; + extern const char* SleepingSimpleString; extern const char* SleepingAdvancedString; extern const char* WarningSimpleString; extern const char* WarningAdvancedString; +extern const char* SleepingTipAdvancedString; +extern const char* IdleTipString; +extern const char* IdleSetString; +extern const char* TipDisconnectedString; extern const char SettingTrueChar; extern const char SettingFalseChar; diff --git a/workspace/TS100/src/Translation.c b/workspace/TS100/src/Translation.c index 175a0462..8cd3a380 100644 --- a/workspace/TS100/src/Translation.c +++ b/workspace/TS100/src/Translation.c @@ -73,11 +73,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Sleeping..."; // <=17 chars +const char* SleepingAdvancedString = "Sleeping..."; // <=16 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars -const char* WarningAdvancedString = "WARNING! TIP HOT!"; +const char* WarningAdvancedString = "!!! TIP HOT !!!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; @@ -128,11 +136,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "БАТ РАЗР"; // Fixed width 8 chars +const char* UVLOWarningString = "БАТ РАЗР"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Хррр"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Ожидание..."; // <=17 chars +const char* SleepingAdvancedString = "Ожидание..."; // <=16 chars const char* WarningSimpleString = " АЙ!"; // Must be <= 4 chars -const char* WarningAdvancedString = "ОСТОРОЖНО! ГОРЯЧО"; +const char* WarningAdvancedString = "ОСТОРОЖНО! ГОРЯЧО"; // <=16 chars +cconst char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars /* * #TODO change support for multibyte constants here @@ -189,11 +205,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Sleeping..."; // <=17 chars +const char* SleepingAdvancedString = "Sleeping..."; // <=16 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars -const char* WarningAdvancedString = "WARNING! TIP HOT!"; +const char* WarningAdvancedString = "WARNING! TIP HOT!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; @@ -244,11 +268,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Please ensure the tip is at room temperature before continuing!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Sleeping..."; // <=17 chars +const char* SleepingAdvancedString = "Sleeping..."; // <=16 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars -const char* WarningAdvancedString = "WARNING! TIP HOT!"; +const char* WarningAdvancedString = "WARNING! TIP HOT!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; @@ -299,11 +331,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Assicurati che la punta si trovi a temperatura ambiente prima di continuare!"; const char* SettingsResetWarning = "Ripristinare le impostazioni iniziali?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Standby"; // <=17 chars +const char* SleepingAdvancedString = "Standby"; // <=16 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars -const char* WarningAdvancedString = "ATTENZIONE! PUNTA CALDA!"; +const char* WarningAdvancedString = "ATTENZIONE! PUNTA CALDA!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'D'; const char SettingLeftChar = 'S'; @@ -354,11 +394,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Assurez-vous que la panne soit à température ambiante avant de continuer!"; const char* SettingsResetWarning = "Voulez-vous vraiment réinitialiser les paramètres aux valeurs d'usine?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars -const char* SleepingAdvancedString = "En veille..."; // <=17 chars +const char* SleepingAdvancedString = "En veille..."; // <=16 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "ATTENTION! CHAUD"; // Must be <= 16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'D'; const char SettingLeftChar = 'G'; @@ -409,11 +457,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzz "; // Must be <= 4 chars -const char* SleepingAdvancedString = "Ruhemodus..."; // <=17 chars +const char* SleepingAdvancedString = "Ruhemodus..."; // <=16 chars const char* WarningSimpleString = "HEIß"; // Must be <= 4 chars -const char* WarningAdvancedString = "Achtung! Spitze Heiß!"; +const char* WarningAdvancedString = "Achtung! Spitze Heiß!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; @@ -464,11 +520,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Najprv sa prosim uistite, ze hrot ma izbovu teplotu!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Chrr"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Kludovy rezim..."; // <=17 chars +const char* SleepingAdvancedString = "Kludovy rezim..."; // <=16 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars -const char* WarningAdvancedString = "Pozor! Hrot je horuci!"; +const char* WarningAdvancedString = "Pozor! Hrot je horuci!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; @@ -519,11 +583,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Lütfen devam etmeden önce ucun oda sıcaklığında olduğunu garantiye alın!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Uyuyor..."; // <=17 chars +const char* SleepingAdvancedString = "Uyuyor..."; // <=16 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars -const char* WarningAdvancedString = "UYARI! UÇ SICAK!"; +const char* WarningAdvancedString = "UYARI! UÇ SICAK!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; @@ -574,11 +646,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Provjerite da je vršak ohlađen na sobnu temperaturu prije nego što nastavite!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "NAPON!!!"; // Fixed width 8 chars -const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Spavanje..."; // <=17 chars -const char* WarningSimpleString = "VRUĆ"; // Must be <= 4 chars -const char* WarningAdvancedString = "OPREZ! Vršak je vruć!"; +const char* UVLOWarningString = "BATERIJA"; // <=8 chars +const char* UndervoltageString = "PRENIZAK NAPON"; // <=16 chars +const char* InputVoltageString = "Napajanje: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Temp vrha: "; // <=11 chars, preferably end with a space +const char* BadTipString = "NEISPRAVAN VRH"; // <=16 chars +const char* SleepingSimpleString = "Zzz "; // Must be <= 4 chars +const char* SleepingAdvancedString = "SPAVANJE..."; // <=16 chars +const char* WarningSimpleString = "VRUĆ"; // Must be <= 4 chars +const char* WarningAdvancedString = "OPREZ, VRUĆE!"; // <=16 chars +const char* SleepingTipAdvancedString = "Vrh: "; // <=6 chars +const char* IdleTipString = "Vrh: "; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " / "; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "VRH NIJE SPOJEN!"; // <=16 chars const char SettingRightChar = 'D'; const char SettingLeftChar = 'L'; @@ -629,11 +709,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Ujistěte se, že hrot má pokojovou teplotu! "; // ending space needed const char* SettingsResetWarning = "Opravdu chcete resetovat zařízení do továrního nastavení?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzz "; // Must be <= 4 chars -const char* SleepingAdvancedString = "Režim spánku..."; // <=17 chars +const char* SleepingAdvancedString = "Režim spánku..."; // <=16 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars const char* WarningAdvancedString = "!! HORKÝ HROT !!"; // <= 16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'P'; const char SettingLeftChar = 'L'; @@ -684,11 +772,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Folytatás előtt győződj meg róla, hogy a hegy szobahőmérsékletű!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars -const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Alvás..."; // <=17 chars -const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars -const char* WarningAdvancedString = "FIGYELEM! FORRÓ HEGY!"; +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars +const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars +const char* SleepingAdvancedString = "Alvás..."; // <=16 chars +const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars +const char* WarningAdvancedString = "FIGYELEM! FORRÓ HEGY!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'R'; const char SettingLeftChar = 'L'; @@ -739,11 +835,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Sørg for at loddespidsen er ved stuetemperatur, inden du fortsætter!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "Lav Volt"; // Fixed width 8 chars +const char* UVLOWarningString = "Lav Volt"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzzz"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Dvale..."; // <=17 chars +const char* SleepingAdvancedString = "Dvale..."; // <=16 chars const char* WarningSimpleString = "Varm"; // Must be <= 4 chars -const char* WarningAdvancedString = "ADVARSEL! VARM LODDESPIDS!"; +const char* WarningAdvancedString = "ADVARSEL! VARM LODDESPIDS!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'H'; const char SettingLeftChar = 'V'; @@ -794,11 +898,19 @@ const char* SettingsLongNames[16] = { const char* SettingsCalibrationWarning = "Przed kontynuowaniem upewnij się, że końcówka osiągnela temperature pokojowa!"; const char* SettingsResetWarning = "Are you sure to reset settings to default values?"; -const char* UVLOWarningString = "LOW VOLT"; // Fixed width 8 chars +const char* UVLOWarningString = "DC LOW"; // <=8 chars +const char* UndervoltageString = "Undervoltage"; // <=16 chars +const char* InputVoltageString = "Input V: "; // <=11 chars, preferably end with a space +const char* WarningTipTempString = "Tip Temp: "; // <=11 chars, preferably end with a space +const char* BadTipString = "BAD TIP"; // <=16 chars const char* SleepingSimpleString = "Zzz!"; // Must be <= 4 chars -const char* SleepingAdvancedString = "Uspienie..."; // <=17 chars +const char* SleepingAdvancedString = "Uspienie..."; // <=16 chars const char* WarningSimpleString = "HOT!"; // Must be <= 4 chars -const char* WarningAdvancedString = "UWAGA! GORĄCA KOŃCÓWKA!"; +const char* WarningAdvancedString = "UWAGA! GORĄCA KOŃCÓWKA!"; // <=16 chars +const char* SleepingTipAdvancedString = "Tip:"; // <=6 chars +const char* IdleTipString = "Tip:"; // IdleTipString+IdleSetString <= 10 +const char* IdleSetString = " Set:"; // preferably start with a space; IdleTipString+IdleSetString <= 10 +const char* TipDisconnectedString = "TIP DISCONNECTED"; // <=16 chars const char SettingRightChar = 'P'; const char SettingLeftChar = 'L'; diff --git a/workspace/TS100/src/main.cpp b/workspace/TS100/src/main.cpp index 895f5bad..ad289e69 100644 --- a/workspace/TS100/src/main.cpp +++ b/workspace/TS100/src/main.cpp @@ -197,9 +197,9 @@ static bool checkVoltageForExit() { lcd.setCursor(0, 0); if (systemSettings.detailedSoldering) { lcd.setFont(1); - lcd.print("Undervoltage"); + lcd.print(UndervoltageString); lcd.setCursor(0, 8); - lcd.print("Input V: "); + lcd.print(InputVoltageString); lcd.printNumber(getInputVoltageX10(systemSettings.voltageDiv) / 10, 2); lcd.drawChar('.'); lcd.printNumber(getInputVoltageX10(systemSettings.voltageDiv) % 10, 1); @@ -207,7 +207,7 @@ static bool checkVoltageForExit() { } else { lcd.setFont(0); - lcd.print("DC LOW"); + lcd.print(UVLOWarningString); } lcd.refresh(); @@ -387,7 +387,7 @@ static int gui_showTipTempWarning() { lcd.setFont(1); lcd.print(WarningAdvancedString); lcd.setCursor(0, 8); - lcd.print("Tip Temp: "); + lcd.print(WarningTipTempString); if (systemSettings.temperatureInF) { lcd.printNumber(tipMeasurementToF(getTipRawTemp(0)), 3); @@ -462,7 +462,7 @@ static int gui_SolderingSleepingMode() { lcd.setFont(1); lcd.print(SleepingAdvancedString); lcd.setCursor(0, 8); - lcd.print("Tip:"); + lcd.print(SleepingTipAdvancedString); lcd.printNumber(tipTemp, 3); if (systemSettings.temperatureInF) lcd.print("F"); @@ -552,7 +552,7 @@ static void gui_solderingMode() { lcd.clearScreen(); lcd.setFont(0); if (tipTemp > 16300) { - lcd.print("BAD TIP"); + lcd.print(BadTipString); lcd.refresh(); currentlyActiveTemperatureTarget = 0; waitForButtonPress(); @@ -766,19 +766,18 @@ void startGUITask(void const *argument) { if (systemSettings.detailedIDLE) { lcd.setFont(1); if (tipTemp > 470) { - lcd.print("Tip Disconnected!"); + lcd.print(TipDisconnectedString); } else { - lcd.print("Tip:"); + lcd.print(IdleTipString); if (systemSettings.temperatureInF) lcd.printNumber(tipMeasurementToF(getTipRawTemp(0)), 3); else lcd.printNumber(tipMeasurementToC(getTipRawTemp(0)), 3); - lcd.print(" "); - lcd.print("Set:"); + lcd.print(IdleSetString); lcd.printNumber(systemSettings.SolderingTemp, 3); } lcd.setCursor(0, 8); - lcd.print("Input V: "); + lcd.print(InputVoltageString); lcd.printNumber(getInputVoltageX10(systemSettings.voltageDiv) / 10, 2); lcd.drawChar('.'); lcd.printNumber(getInputVoltageX10(systemSettings.voltageDiv) % 10, 1);