diff --git a/Translation Editor/translation_bg.json b/Translation Editor/translation_bg.json index c6a2722d..b9f4252b 100644 --- a/Translation Editor/translation_bg.json +++ b/Translation Editor/translation_bg.json @@ -23,7 +23,10 @@ "OffString": "Изкл.", "ResetOKMessage": "Нулиране завършено", "YourGainMessage": "Усилване:", - "SettingsResetMessage": "Настройките бяха\nнулирани!" + "SettingsResetMessage": "Настройките бяха\nнулирани!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "R", @@ -35,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -72,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Източник", "захранване" ], "desc": "Източник на захранване. Минимално напрежение. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Темп.", "сън" ], "desc": "Температура при режим \"сън\" " }, "SleepTimeout": { - "text2": [ + "text2": [ "Време", "сън" ], "desc": "Включване в режим \"сън\" след: <Минути/Секунди>" }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Време", "изкл." ], "desc": "Изключване след <Минути>" }, "MotionSensitivity": { - "text2": [ + "text2": [ "Усещане", "за движение" ], "desc": "Усещане за движение <0.Изключено 1.Слабо 9.Силно>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Единици за", "температура" ], "desc": "Единици за температура " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Детайлен", "екран в покой" ], "desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой." }, "DisplayRotation": { - "text2": [ + "text2": [ "Ориентация", "на дисплея" ], "desc": "Ориентация на дисплея " }, "BoostTemperature": { - "text2": [ + "text2": [ "Турбо", "темп." ], "desc": "Температура за \"турбо\" режим" }, "AutoStart": { - "text2": [ + "text2": [ "Автоматичен", "работен режим" ], "desc": "Режим на поялника при включване на захранването. T=Работен, S=Сън, F=Изключен" }, "CooldownBlink": { - "text2": [ + "text2": [ "Мигай при", "топъл поялник" ], "desc": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла" }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Калибриране", "температура?" ], "desc": "Калибриране на температурата" }, "SettingsReset": { - "text2": [ + "text2": [ "Фабрични", "настройки?" ], "desc": "Връщане на фабрични настройки" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Калибриране", "напрежение?" ], "desc": "Калибриране на входното напрежение. Задръжте бутонa за изход" }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Детайлен", "работен екран" ], "desc": "Детайлна информация в работен режим при запояване" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Скорост", "на текста" ], "desc": "Скорост на движение на този текст" }, "TipModel": { - "text2": [ + "text2": [ "Модел", "на връх" ], "desc": "Избор на модел на връх" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Бърза", "калибрация" ], "desc": "Бърза калибрация с използване на гореща вода" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Прецизна", "калибрация" ], "desc": "Прецизна калибрация с използване на термо-двойка на върха на поялника" }, "PowerInput": { - "text2": [ + "text2": [ "Мощност на", "захранване" ], "desc": "Мощност на избраното захранване" }, "PowerLimit": { - "text2": [ + "text2": [ "Лимит на", "мощност" ], "desc": "Максимална мощност на поялника " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Размяна", "бутони +-?" ], "desc": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника" }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Промяна T", "бързо?" ], "desc": "Промяна на температура при бързо натискане на бутон!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Промяна Т", "задържане?" ], "desc": "Промяна на температура при задържане на бутон!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Захранващ", "импулс" ], "desc": "Поддържане на интензивност на захранващия импулс" }, "TipGain": { - "text2": [ + "text2": [ "Промяна", "сила връх" ], "desc": "Усилване на върха на поялника" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_cs.json b/Translation Editor/translation_cs.json old mode 100755 new mode 100644 index e589e635..b58ddcc0 --- a/Translation Editor/translation_cs.json +++ b/Translation Editor/translation_cs.json @@ -23,7 +23,10 @@ "OffString": "Vyp", "ResetOKMessage": "Reset OK", "YourGainMessage": "Zisk:", - "SettingsResetMessage": "Tov. nas. obnov." + "SettingsResetMessage": "Tov. nas. obnov.", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "P", @@ -35,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -72,112 +78,112 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Zdroj", "napájení" ], "desc": "Při nižším napětí ukončí pájení ." }, "SleepTemperature": { - "text2": [ + "text2": [ "Teplota v", "r. spánku" ], "desc": "Teplota v režimu spánku." }, "SleepTimeout": { - "text2": [ + "text2": [ "Čas do", "r. spánku" ], "desc": "Čas do režimu spánku ." }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Čas do", "vypnutí" ], "desc": "Čas do automatického vypnutí ." }, "MotionSensitivity": { - "text2": [ + "text2": [ "Citlivost", "det. pohybu" ], "desc": "Citlivost detekce pohybu <0=Vyp, 1=Min, ... 9=Max>." }, "TemperatureUnit": { - "text2": [ + "text2": [ "Jednotky", "teploty" ], "desc": "Jednotky měření teploty ." }, "AdvancedIdle": { - "text2": [ + "text2": [ "Podrobnosti", "na vých. obr." ], "desc": "Zobrazit podrobnosti na výchozí obrazovce?" }, "DisplayRotation": { - "text2": [ + "text2": [ "Orientace", "obrazovky" ], "desc": "Orientace obrazovky ." }, "BoostTemperature": { - "text2": [ + "text2": [ "Teplota v", "r. boost" ], "desc": "Teplota v režimu boost." }, "AutoStart": { - "text2": [ + "text2": [ "Automatický", "start" ], "desc": "Při startu ihned nahřát hrot?" }, "CooldownBlink": { - "text2": [ + "text2": [ "Blikáni při", "chladnutí" ], "desc": "Blikání teploty při chladnutí, dokud je hrot horký?" }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Kalibrovat", "teplotu?" ], "desc": "Kalibrace měření teploty." }, "SettingsReset": { - "text2": [ + "text2": [ "Tovární", "nastavení?" ], "desc": "Obnovení továrního nastavení." }, "VoltageCalibration": { - "text2": [ + "text2": [ "Kalibrovat", "vstupní napětí?" ], "desc": "Kalibrace vstupního napětí. Tlačítky uprav, podržením potvrď." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Podrobnosti", "při pájení" ], "desc": "Zobrazit podrobnosti při pájení?" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Rychlost", "popisků" ], @@ -254,11 +260,18 @@ "desc": "Zisk hrotu (měření)" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } } \ No newline at end of file diff --git a/Translation Editor/translation_da.json b/Translation Editor/translation_da.json index 8545f12f..3a18f939 100644 --- a/Translation Editor/translation_da.json +++ b/Translation Editor/translation_da.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "TIP DISCONNECTED", "SolderingAdvancedPowerPrompt": "Power: ", "OffString": "Off", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "H", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "S", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -237,7 +245,7 @@ ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ + "PowerPulsePower": { "text2": [ "Power", "Pulse W" @@ -252,11 +260,18 @@ "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_de.json b/Translation Editor/translation_de.json index b61dc964..2bf34ed7 100644 --- a/Translation Editor/translation_de.json +++ b/Translation Editor/translation_de.json @@ -24,7 +24,10 @@ "OffString": "Aus", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your Gain:", - "SettingsResetMessage": "Einstellungen\nzurück gesetzt!" + "SettingsResetMessage": "Einstellungen\nzurück gesetzt!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "R", @@ -36,10 +39,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -73,194 +79,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Spannungs-", "quelle" ], "desc": "Spannungsquelle (Abschaltspannung) " }, "SleepTemperature": { - "text2": [ + "text2": [ "Ruhetemp-", "eratur" ], "desc": "Ruhetemperatur" }, "SleepTimeout": { - "text2": [ + "text2": [ "Ruhever-", "zögerung" ], "desc": "Ruhemodus nach " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Abschalt-", "zeit" ], "desc": "Abschalten nach " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Bewegungs-", "empfindlichk." ], "desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Temperatur-", "einheit" ], "desc": "Temperatureinheit " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Detaillierte", "Ruheansicht" ], "desc": "Detaillierte Anzeige im Ruhemodus" }, "DisplayRotation": { - "text2": [ + "text2": [ "Anzeige-", "ausrichtung" ], "desc": "Ausrichtung der Anzeige " }, "BoostTemperature": { - "text2": [ + "text2": [ "Boosttemp-", "eratur" ], "desc": "Temperatur im Boostmodus (In der eingestellten Einheit)" }, "AutoStart": { - "text2": [ + "text2": [ "Start im", "Lötmodus?" ], "desc": "Automatischer Start-Modus beim Einschalten der Spannungsversorgung. " }, "CooldownBlink": { - "text2": [ + "text2": [ "Abkühl-", "blinken?" ], "desc": "Blinkende Temperaturanzeige beim Abkühlen, solange heiß ist." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Temperatur", "kalibrieren?" ], "desc": "Kalibrierung der Lötspitzentemperatur" }, "SettingsReset": { - "text2": [ + "text2": [ "Einstellungen", "zurücksetzen?" ], "desc": "Einstellungen auf werkseinstellungen zurück setzen" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Eingangsspannung", "kalibrieren?" ], "desc": "Kalibrierung der Eingangsspannung. Kurzer Tastendruck zum Einstellen, langer Tastendruck zum Verlassen." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Detaillierte", "Lötansicht" ], "desc": "Detaillierte Anzeige im Lötmodus" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Scroll-", "geschw." ], "desc": "Scrollgeschwindigkeit der Texte " }, "TipModel": { - "text2": [ + "text2": [ "Löt-", "spitze" ], "desc": "Auswahl der Lötspitze" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Einfache", "Kalibrierung" ], "desc": "Einfache Kalibrierung mittels heißem Wasser" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Erweiterte", "Kalibrierung" ], "desc": "Erweiterte Kalibrierung mittels eines Thermoelements an der Lötspitze" }, "PowerInput": { - "text2": [ + "text2": [ "Leistungs-", "Aufnahme" ], "desc": "Leistungsaufnahme der verwendeten Spannungsversorgung" }, "PowerLimit": { - "text2": [ + "text2": [ "Leistungs-", "Limit" ], "desc": "Maximale aufnahme der Lötspitze " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Taste +-", "Umkehren?" ], "desc": "Temperatur-Änderungs-Tasten-Belegung Plus-Minus umkehren?" }, "TempChangeShortStep": { - "text2": [ + "text2": [ "T. Schritt", "Taste kurz?" ], "desc": "Temperaturwechselschritte bei kurzem Tastendruck!" - } - , + }, "TempChangeLongStep": { - "text2": [ + "text2": [ "T. Schritt", "Taste Lang?" ], "desc": "Temperaturwechselschritte bei langem Tastendruck!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_en.json b/Translation Editor/translation_en.json index c3d732de..3f29ca43 100644 --- a/Translation Editor/translation_en.json +++ b/Translation Editor/translation_en.json @@ -24,7 +24,10 @@ "OffString": "Off", "ResetOKMessage": "Reset OK", "YourGainMessage": "Your gain:", - "SettingsResetMessage": "Settings were\nreset!" + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "R", @@ -36,10 +39,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -73,193 +79,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Power", "source" ], "desc": "Power source. Sets cutoff voltage. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Sleep", "temp" ], "desc": "Sleep temperature" }, "SleepTimeout": { - "text2": [ + "text2": [ "Sleep", "timeout" ], "desc": "Sleep timeout " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Shutdown", "timeout" ], "desc": "Shutdown timeout " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Motion", "sensitivity" ], "desc": "Motion sensitivity <0=Off 1=Least sensitive 9=Most sensitive>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Temperature", "unit" ], "desc": "Temperature unit " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Detailed", "idle screen" ], "desc": "Display detailed information in a smaller font on the idle screen" }, "DisplayRotation": { - "text2": [ + "text2": [ "Display", "orientation" ], "desc": "Display orientation " }, "BoostTemperature": { - "text2": [ + "text2": [ "Boost", "temp" ], "desc": "Temperature when in \"boost mode\"" }, "AutoStart": { - "text2": [ + "text2": [ "Auto", "start" ], "desc": "Automatically starts the iron into soldering on power up " }, "CooldownBlink": { - "text2": [ + "text2": [ "Cooldown", "blink" ], "desc": "Blink the temperature on the cooling screen while the tip is still hot" }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Calibrate", "temperature?" ], "desc": "Calibrate tip offset?" }, "SettingsReset": { - "text2": [ + "text2": [ "Factory", "Reset?" ], "desc": "Reset all settings!" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Calibrate", "input voltage?" ], "desc": "VIN Calibration " }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Detailed", "solder screen" ], "desc": "Display detailed information while soldering" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Scrolling", "speed" ], "desc": "Speed this text scrolls past at " }, "TipModel": { - "text2": [ + "text2": [ "Tip", "model" ], "desc": "Tip model selection" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Simple", "calibration" ], "desc": "Simple calibration using hot water" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Advanced", "calibration" ], "desc": "Advanced calibration using thermocouple on the tip" }, "PowerInput": { - "text2": [ + "text2": [ "Power", "wattage" ], "desc": "Power wattage of the power adapter used" }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Reverse", "+ - keys" ], "desc": "Reverse assignment of temperature adjustment buttons" }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short" ], "desc": "Temperature change steps on short button press" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long" ], "desc": "Temperature change steps on long button press" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_es.json b/Translation Editor/translation_es.json index 19b5acc5..76baa713 100644 --- a/Translation Editor/translation_es.json +++ b/Translation Editor/translation_es.json @@ -23,7 +23,10 @@ "OffString": " No", "ResetOKMessage": "Hecho. ", "YourGainMessage": "Gananc.:", - "SettingsResetMessage": "Ajustes borrados" + "SettingsResetMessage": "Ajustes borrados", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", @@ -35,10 +38,13 @@ "SettingStartSleepChar": "R", "SettingStartSleepOffChar": "F", "SettingStartNoneChar": "N", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -72,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Fuente", "de energía" ], "desc": "Elige el tipo de fuente para limitar el voltaje " }, "SleepTemperature": { - "text2": [ + "text2": [ "Temperatura", "en reposo" ], "desc": "Temperatura de la punta en reposo." }, "SleepTimeout": { - "text2": [ + "text2": [ "Entrar", "en reposo" ], "desc": "Tiempo de inactividad para entrar en reposo " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Tiempo de", "apagado" ], "desc": "Tiempo de inactividad para apagarse " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Detección de", "movimiento" ], "desc": "Tiempo de reacción al agarrar <0=no 1=menos sensible 9=más sensible>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Unidad de", "temperatura" ], "desc": "Unidad de temperatura " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Info extra en", "modo reposo" ], "desc": "Muestra información detallada en letra pequeña al reposar." }, "DisplayRotation": { - "text2": [ + "text2": [ "Orientación", "de pantalla" ], "desc": "Orientación de la pantalla " }, "BoostTemperature": { - "text2": [ + "text2": [ "Ajustar la", "temp. extra" ], "desc": "Temperatura momentánea que se alcanza al apretar el botón del modo extra." }, "AutoStart": { - "text2": [ + "text2": [ "Calentar", "al enchufar" ], "desc": "Se calienta él solo al arrancar " }, "CooldownBlink": { - "text2": [ + "text2": [ "Parpadear", "al enfriar" ], "desc": "La temperatura en pantalla parpadea mientras la punta siga caliente." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Calibrar temp.", "de la punta" ], "desc": "Calibra la desviación térmica de la punta." }, "SettingsReset": { - "text2": [ + "text2": [ "Volver a ajustes", "de fábrica" ], "desc": "Restablece todos los ajustes a los valores originales." }, "VoltageCalibration": { - "text2": [ + "text2": [ "Calibrar voltaje", "de entrada" ], "desc": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Info extra", "al soldar" ], "desc": "Muestra más datos por pantalla cuando se está soldando." }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Velocidad", "del texto" ], "desc": "Velocidad de desplazamiento del texto " }, "TipModel": { - "text2": [ + "text2": [ "Modelo de", "punta" ], "desc": "Elegir el modelo de punta actual." }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Calibración", "simple" ], "desc": "Calibración simple con agua caliente." }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Calibración", "avanzada" ], "desc": "Calibrar con un termopar en la punta; más difícil." }, "PowerInput": { - "text2": [ + "text2": [ "Potencia de", "entrada" ], "desc": "Potencia en vatios del adaptador de corriente utilizado." }, "PowerLimit": { - "text2": [ + "text2": [ "Ajustar la", "potenc. máx." ], "desc": "Elige el límite de potencia máxima del soldador " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Invertir", "botones +/-" ], "desc": "Intercambia las funciones de subir y bajar la temperatura de los botones +/- para que funcionen al revés." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Cambio temp.", "puls. cortas" ], "desc": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-." }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Cambio temp.", "puls. largas" ], "desc": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-." }, "PowerPulsePower": { - "text2": [ + "text2": [ "Pulsos bat.", "constantes" ], "desc": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios." }, "TipGain": { - "text2": [ + "text2": [ "Ajustar ganancia", "de punta" ], "desc": "Modificar el valor de ganancia de la punta." }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } } \ No newline at end of file diff --git a/Translation Editor/translation_fi.json b/Translation Editor/translation_fi.json index 0513ba5e..ef33be94 100644 --- a/Translation Editor/translation_fi.json +++ b/Translation Editor/translation_fi.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "KÄRKI ON IRTI", "SolderingAdvancedPowerPrompt": "Teho: ", "OffString": "OFF", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "O", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Virtalähde", "DC" ], "desc": "Käytettävä virtalähde. Asettaa katkaisujänniteen. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Lepotilan", "lämpötila" ], "desc": "Lepotilan lämpötila. " }, "SleepTimeout": { - "text2": [ + "text2": [ "Lepotilan", "viive" ], "desc": "Lepotilan viive. " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Sammutus", "viive" ], "desc": "Automaattisen sammutuksen aikaviive. " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Liikkeen", "herkkyys" ], "desc": "Liikkeentunnistuksen herkkyys. <0=pois, 1=epäherkin, 9=herkin>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Lämpötilan", "yksikkö" ], "desc": "Lämpötilan yksikkö. " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Tiedot", "lepotilassa" ], "desc": "Näyttää yksityiskohtaisemmat tiedot lepotilassa." }, "DisplayRotation": { - "text2": [ + "text2": [ "Näytön", "kierto" ], "desc": "Näytön kierto. " }, "BoostTemperature": { - "text2": [ + "text2": [ "Tehostus-", "lämpötila" ], "desc": "Tehostustilan lämpötila" }, "AutoStart": { - "text2": [ + "text2": [ "Autom.", "käynnistys" ], "desc": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. T=juotostila, S=Lepotila, F=Ei käytössä" }, "CooldownBlink": { - "text2": [ + "text2": [ "Jäähdytyksen", "vilkutus" ], "desc": "Vilkuttaa jäähtyessä juotoskärjen lämpötilaa sen ollessa vielä vaarallisen kuuma." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Kalibroi", "lämpötila?" ], "desc": "Kalibroi kärjen lämpötilaeron." }, "SettingsReset": { - "text2": [ + "text2": [ "Palauta", "tehdasasetukset?" ], "desc": "Palauta kaikki asetukset oletusarvoihin." }, "VoltageCalibration": { - "text2": [ + "text2": [ "Kalibroi", "tulojännite?" ], "desc": "Tulojännitten kalibrointi (VIN). Painikkeilla säädetään ja pitkään painamalla poistutaan." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Tarkempi", "juotosnäyttö" ], "desc": "Näyttää yksityiskohtaisemmat tiedot juotostilassa." }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Tietojen", "näyttönopeus" ], "desc": "Näiden selitetekstien vieritysnopeus." }, "TipModel": { - "text2": [ + "text2": [ "Tip", "Model" ], "desc": "Tip Model selection" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Simple", "Calibration" ], "desc": "Simple Calibration using Hot water" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Advanced", "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" }, "PowerInput": { - "text2": [ + "text2": [ "Power", "Wattage" ], "desc": "Power Wattage of the power adapter used" }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_fr.json b/Translation Editor/translation_fr.json index 08e61b07..11dc5728 100644 --- a/Translation Editor/translation_fr.json +++ b/Translation Editor/translation_fr.json @@ -16,12 +16,17 @@ "WarningSimpleString": "CHAUD!", "WarningAdvancedString": "ATTENTION! CHAUD!", "SleepingTipAdvancedString": "Panne:", - "IdleTipString": "Tip:", - "IdleSetString": " Set:", + "IdleTipString": "Act:", + "IdleSetString": " Reg:", "TipDisconnectedString": "PANNE DÉBRANCHÉE", "SolderingAdvancedPowerPrompt": "Puissance: ", "OffString": "Off", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Gain:", + "SettingsResetMessage": "Réglage réinit.!", + "LockingKeysString": "VERROUIL", + "UnlockingKeysString": "DEVERROU", + "WarningKeysLockedString": "! VERR.!" }, "characters": { "SettingRightChar": "D", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "V", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "D", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "V" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Source", "d'alim" ], "desc": "Source d'alimentation. Règle la tension de coupure " }, "SleepTemperature": { - "text2": [ + "text2": [ "Temp.", "veille" ], "desc": "Température en veille " }, "SleepTimeout": { - "text2": [ + "text2": [ "Délai", "veille" ], "desc": "Délai avant mise en veille " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Délai", "extinction" ], "desc": "Délai avant extinction " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Sensibilité", "au mouvement" ], "desc": "Sensibilité du capteur de mouvement <0=Inactif 1=Peu sensible 9=Tres sensible>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Unité de", "température" ], "desc": "Unité de température " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Écran veille", "détaillé" ], "desc": "Afficher des informations détaillées lors de la veille." }, "DisplayRotation": { - "text2": [ + "text2": [ "Orientation", "de l'écran" ], "desc": "Orientation de l'affichage " }, "BoostTemperature": { - "text2": [ + "text2": [ "Temp.", "Boost" ], "desc": "Température du mode \"Boost\"" }, "AutoStart": { - "text2": [ + "text2": [ "Démarrage", "automatique" ], "desc": "Démarrer automatiquement la soudure a l'allumage " }, "CooldownBlink": { - "text2": [ + "text2": [ "Refroidir en", "clignotant" ], "desc": "Faire clignoter la température lors du refroidissement tant que la panne est chaude." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Étalonner", "température" ], "desc": "Étalonner température de la panne." }, "SettingsReset": { - "text2": [ + "text2": [ "Réinitialisation", "d'usine" ], "desc": "Réinitialiser tous les réglages" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Étalonner", "tension d'entrée" ], "desc": "Étalonner tension d'entrée. Boutons pour ajuster, appui long pour quitter" }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Écran soudure", "détaillé" ], "desc": "Afficher des informations détaillées pendant la soudure" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Vitesse de", "défilement" ], "desc": "Vitesse de défilement de ce texte en " }, "TipModel": { - "text2": [ - "Panne", - "Modèle" + "text2": [ + "Modèle de", + "la panne" ], "desc": "Sélection du modèle de la panne" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Calibration", "simple" ], "desc": "Calibration simple à l'aide d'eau chaude" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Calibration", "avancées" ], "desc": "Calibration avancées à l'aide d'un thermocouple sur la panne" }, "PowerInput": { - "text2": [ + "text2": [ "Puissance de", "l'alimentation" ], "desc": "Puissance de l'alimentation utilisée" }, "PowerLimit": { - "text2": [ + "text2": [ "Puissance", - "Limite" + "limite" ], "desc": "Puissance maximale utilisable " }, "ReverseButtonTempChange": { - "text2": [ - "Key +-", - "Inverser?" + "text2": [ + "Inverser les", + "touches + - ?" ], "desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe." }, "TempChangeShortStep": { - "text2": [ - "Temp change", - "Court?" + "text2": [ + "Incrément", + "appui court" ], "desc": "Incrément de changement de température sur appui court." }, "TempChangeLongStep": { - "text2": [ - "Temp change", - "Long?" + "text2": [ + "Incrément", + "appui long" ], "desc": "Incrément de changement de température sur appui long." }, - "PowerPulsePower":{ - "text2": [ - "Power", - "Pulse W" + "PowerPulsePower": { + "text2": [ + "Puissance des", + "impulsion W" ], - "desc": "Keep awake pulse power intensity" + "desc": "Puissance des impulsions pour éviter la mise en veille des batteries" }, "TipGain": { - "text2": [ - "Modify", - "tip gain" + "text2": [ + "Modifier", + "gain panne" ], - "desc": "Tip gain" + "desc": "Modifier le gain de la panne" + }, + "LockingMode": { + "text2": [ + "Autoriser le", + "verrouillage" + ], + "desc": "Permet de verrouiller les touches pendant la soudure sur un appuis long des 2 bouttons " }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_hr.json b/Translation Editor/translation_hr.json index 01c436ed..04d6095d 100644 --- a/Translation Editor/translation_hr.json +++ b/Translation Editor/translation_hr.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "VRH NIJE SPOJEN!", "SolderingAdvancedPowerPrompt": "Snaga: ", "OffString": "Off", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Izvor", "napajanja" ], "desc": "Izvor napajanja. Postavlja napon isključivanja. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Temp", "spavanja" ], "desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. " }, "SleepTimeout": { - "text2": [ + "text2": [ "Vrijeme", "spavanja" ], "desc": "Vrijeme mirovanja nakon kojega lemilica spušta temperaturu. " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Vrijeme", "gašenja" ], "desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti. " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Osjetljivost", "pokreta" ], "desc": "Osjetljivost prepoznavanja pokreta. <0=Ugašeno, 1=Najmanje osjetljivo, 9=Najosjetljivije>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Jedinica", "temperature" ], "desc": "Jedinica temperature. " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Detalji", "pri čekanju" ], "desc": "Prikazivanje detaljnih informacija tijekom čekanja." }, "DisplayRotation": { - "text2": [ + "text2": [ "Rotacija", "ekrana" ], "desc": "Orijentacija ekrana. " }, "BoostTemperature": { - "text2": [ + "text2": [ "Boost", "temp" ], "desc": "Temperatura u pojačanom (Boost) načinu." }, "AutoStart": { - "text2": [ + "text2": [ "Auto", "start" ], "desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati." }, "CooldownBlink": { - "text2": [ + "text2": [ "Upozorenje", "pri hlađenju" ], "desc": "Bljeskanje temperature prilikom hlađenja, ako je lemilica vruća." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Kalibracija", "temperature" ], "desc": "Kalibriranje temperature mjeri razliku temperatura vrška i drške, dok je lemilica hladna." }, "SettingsReset": { - "text2": [ + "text2": [ "Tvorničke", "postavke" ], "desc": "Vraćanje svih postavki na tvorničke vrijednosti." }, "VoltageCalibration": { - "text2": [ + "text2": [ "Kalibracija", "napona napajanja" ], "desc": "Kalibracija ulaznog napona. Podešavanje gumbima, dugački pritisak za kraj." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Detalji", "pri lemljenju" ], "desc": "Prikazivanje detaljnih informacija tijekom lemljenja." }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Brzina", "poruka" ], "desc": "Brzina kretanja dugačkih poruka. " }, "TipModel": { - "text2": [ + "text2": [ "Model", "Vrha" ], "desc": "Odabir modela lemnog vrha" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Jednostavna", "kalibracija" ], "desc": "Kalibracija kipućom vodom" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Napredna", "kalibracija" ], "desc": "Kalibracija korištenjem termo-elementa" }, "PowerInput": { - "text2": [ + "text2": [ "Snaga", "napajanja" ], "desc": "Snaga modula za napajanje" }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_hu.json b/Translation Editor/translation_hu.json index 5cb7af04..2228719b 100644 --- a/Translation Editor/translation_hu.json +++ b/Translation Editor/translation_hu.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "HEGY LEVÉVE", "SolderingAdvancedPowerPrompt": "Telj: ", "OffString": "Ki", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "J", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Áram", "forrás" ], "desc": "Áramforrás. Beállítja a lekapcsolási feszültséget. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Alvási", "hőfok" ], "desc": "Alvási hőmérséklet " }, "SleepTimeout": { - "text2": [ + "text2": [ "Alvás", "időzítő" ], "desc": "Alvás időzítő " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Kikapcsolás", "időzítő" ], "desc": "Kikapcsolási időzítő " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Mozgás", "érzékenység" ], "desc": "Mozgás érzékenység beállítása. <0.kikapcsolva 1.legkevésbé érzékeny 9.legérzékenyebb>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Hőmérséklet", "mértékegysége" ], "desc": "Hőmérséklet mértékegysége " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Részletes", "készenlét" ], "desc": "Részletes információ megjelenítése kisebb betűméretben a készenléti képernyőn." }, "DisplayRotation": { - "text2": [ + "text2": [ "Kijelző", "tájolása" ], "desc": "Kijelző tájolása " }, "BoostTemperature": { - "text2": [ + "text2": [ "Boost", "hőfok" ], "desc": "Hőmérséklet \"boost\" módban" }, "AutoStart": { - "text2": [ + "text2": [ "Automatikus", "indítás" ], "desc": "Bekapcsolás után automatikusan lépjen forrasztás módba. T=forrasztás, S=alvó mód, F=ki" }, "CooldownBlink": { - "text2": [ + "text2": [ "Villogás", "hűléskor" ], "desc": "Villogjon a hőmérséklet hűlés közben, amíg a hegy forró." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Hőmérséklet", "kalibrálása?" ], "desc": "Hegy hőmérséklet-különbségének kalibrálása." }, "SettingsReset": { - "text2": [ + "text2": [ "Gyári", "beállítások?" ], "desc": "Beállítások alaphelyzetbe állítása" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Bemeneti fesz", "kalibrálása?" ], "desc": "Bemeneti feszültség kalibrálása. Röviden megnyomva módosítás, hosszan megnyomva kilépés" }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Részletes", "forr. kép." ], "desc": "Részletes információk megjelenítése forrasztás közben" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Görgetés", "sebessége" ], "desc": "Szöveggörgetés sebessége" }, "TipModel": { - "text2": [ + "text2": [ "Forrasztóhegy", "modell" ], "desc": "Forrasztóhegy modell kiválasztása" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Egyszerű", "kalibráció" ], "desc": "Egyszerű kalibrálás forró víz segítségével" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Haladó", "Kalibráció" ], "desc": "Haladó kalibrálás hegyre helyezett hőelem segítségével" }, "PowerInput": { - "text2": [ + "text2": [ "Bemeneti", "teljesítmény" ], "desc": "A tápegység által leadott teljesítmény" }, "PowerLimit": { - "text2": [ + "text2": [ "Telj", "maximum" ], "desc": "Maximális teljesitmény beállitása " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "GOMB +-", "Felcseréled?" ], "desc": "A páka hömérséklet növelés csökkentési gombok felcserélése." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Hömérséklet", "váltás rövid?" ], "desc": "Hömérséklet váltás rövid gombnyomásrs bekapcsolva!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Hömérséklet", "váltás hosszú?" ], "desc": "Hömérséklet váltás hosszú gombnyomásrs bekapcsolva!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Telj power", "bank üzem W" ], "desc": "Powerbank üzemnél nem engedi a powerbankot kikapcsolni idönkénti áram felvételt generál. " }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_it.json b/Translation Editor/translation_it.json index d94b07cc..00a489f4 100644 --- a/Translation Editor/translation_it.json +++ b/Translation Editor/translation_it.json @@ -23,7 +23,10 @@ "OffString": "OFF", "ResetOKMessage": "Reset OK", "YourGainMessage": "Guad.: ", - "SettingsResetMessage": "Reset effettuato" + "SettingsResetMessage": "Reset effettuato", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", @@ -35,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "D", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -72,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Sorgente", "alimentaz" ], "desc": "Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia " }, "SleepTemperature": { - "text2": [ + "text2": [ "Temp", "standby" ], "desc": "Imposta la temperatura da mantenere in modalità Standby <°C/°F>" }, "SleepTimeout": { - "text2": [ + "text2": [ "Timer", "standby" ], "desc": "Imposta il timer per entrare in modalità Standby " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Timer", "spegnimento" ], "desc": "Imposta il timer per lo spegnimento " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Sensibilità", "al movimento" ], "desc": "Imposta la sensibilità al movimento per uscire dalla modalità Standby <0: nessuna; 1: minima; 9: massima>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Unità di", "temperatura" ], "desc": "Scegli l'unità di misura per la temperatura " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Interfaccia", "testuale" ], "desc": "Mostra informazioni dettagliate all'interno della schermata principale" }, "DisplayRotation": { - "text2": [ + "text2": [ "Orientamento", "display" ], "desc": "Imposta l'orientamento del display " }, "BoostTemperature": { - "text2": [ + "text2": [ "Temp", "«Turbo»" ], "desc": "Imposta la temperatura della funzione «Turbo» <°C/°F>" }, "AutoStart": { - "text2": [ + "text2": [ "Avvio", "automatico" ], "desc": "Attiva automaticamente il saldatore quando viene alimentato " }, "CooldownBlink": { - "text2": [ + "text2": [ "Avviso", "punta calda" ], "desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda" }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Calibrazione", "temperatura" ], "desc": "Calibra le rilevazioni di temperatura" }, "SettingsReset": { - "text2": [ + "text2": [ "Ripristino", "impostazioni" ], "desc": "Ripristina tutte le impostazioni" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Calibrazione", "tensione" ], "desc": "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire" }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Dettagli", "saldatura" ], "desc": "Mostra informazioni dettagliate durante la modalità Saldatura" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Velocità", "testo" ], "desc": "Imposta la velocità di scorrimento del testo " }, "TipModel": { - "text2": [ + "text2": [ "Modello", "punta" ], "desc": "Seleziona il modello della punta in uso" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Calibrazione", "semplice" ], "desc": "Calibra le rilevazioni di temperatura tramite l'utilizzo di acqua calda" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Calibrazione", "avanzata" ], "desc": "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta" }, "PowerInput": { - "text2": [ + "text2": [ "Potenza", "alimentaz" ], "desc": "Imposta la potenza massima erogabile dall'alimentatore in uso" }, "PowerLimit": { - "text2": [ + "text2": [ "Limite", "potenza" ], "desc": "Imposta il valore di potenza massima erogabile al saldatore " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Inversione", "tasti" ], "desc": "Inverti i tasti per aumentare o diminuire la temperatura della punta" }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp passo", "breve" ], "desc": "Imposta il «passo» dei valori di temperatura ad una breve pressione dei tasti" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp passo", "lungo" ], "desc": "Imposta il «passo» dei valori di temperatura ad una lunga pressione dei tasti" }, "PowerPulsePower": { - "text2": [ + "text2": [ "Potenza", "impulso" ], "desc": "Regola la potenza d'impulso per prevenire lo standby eventuale dell'alimentatore " }, "TipGain": { - "text2": [ + "text2": [ "Guadagno", "punta" ], "desc": "Varia il guadagno della punta" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_lt.json b/Translation Editor/translation_lt.json index 2aaddf72..44a4e549 100644 --- a/Translation Editor/translation_lt.json +++ b/Translation Editor/translation_lt.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "ANTGAL ATJUNGTAS", "SolderingAdvancedPowerPrompt": "Maitinimas: ", "OffString": "Išj", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Maitinimo", "šaltinis" ], "desc": "Išjungimo įtampa. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Miego", "temperat." ], "desc": "Miego temperatūra " }, "SleepTimeout": { - "text2": [ + "text2": [ "Miego", "laikas" ], "desc": "Miego laikas " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Išjungimo", "laikas" ], "desc": "Išjungimo laikas " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Jautrumas", "judesiui" ], "desc": "Jautrumas judesiui <0 - išjungta, 1 - mažiausias, 9 - didžiausias>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Temperatūros", "vienetai" ], "desc": "Temperatūros vienetai " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Detalus lauki", "mo ekranas" ], "desc": "Ar rodyti papildomą informaciją mažesniu šriftu laukimo ekrane" }, "DisplayRotation": { - "text2": [ + "text2": [ "Ekrano", "orientacija" ], "desc": "Ekrano orientacija " }, "BoostTemperature": { - "text2": [ + "text2": [ "Turbo", "temperat." ], "desc": "Temperatūra turbo režimu" }, "AutoStart": { - "text2": [ + "text2": [ "Auto", "paleidimas" ], "desc": "Ar pradėti kaitininti iš karto įjungus lituoklį" }, "CooldownBlink": { - "text2": [ + "text2": [ "Atvėsimo", "mirksėjimas" ], "desc": "Ar mirksėti temperatūrą ekrane kol vėstantis antgalis vis dar karštas" }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Kalibruoti", "temperatūrą?" ], "desc": "Antgalio temperatūros kalibravimas" }, "SettingsReset": { - "text2": [ + "text2": [ "Atstatyti", "nustatymus?" ], "desc": "Nustatyti nustatymus iš naujo" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Kalibruoti", "įvesties įtampą?" ], "desc": "Įvesties įtampos kalibravimas. Trumpai paspauskite, norėdami nustatyti, ilgai paspauskite, kad išeitumėte" }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Detalus lita-", "vimo ekranas" ], "desc": "Ar rodyti išsamią informaciją lituojant" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Greitas apr", "ašym. slink" ], "desc": "Greitis, kuriuo šis tekstas slenka" }, "TipModel": { - "text2": [ + "text2": [ "Antgalio", "modelis" ], "desc": "Antgalio modelio pasirinkimas" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Paprasta", "kalibracija" ], "desc": "Paprasta kalibracija naudojant karštą vandienį" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Išplėstinė", "kalibracija" ], "desc": "Išplėstinė kalibracija naudojant termoelementą" }, "PowerInput": { - "text2": [ + "text2": [ "Galia", "vatais" ], "desc": "Maitinimo bloko galia vatais" }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_nl.json b/Translation Editor/translation_nl.json index 612b7028..a7b8bb86 100644 --- a/Translation Editor/translation_nl.json +++ b/Translation Editor/translation_nl.json @@ -1,262 +1,277 @@ -{ - "languageCode": "NL", - "languageLocalName": "Nederlands", - "cyrillicGlyphs": false, - "messages": { - "SettingsCalibrationDone": "Calibration done!", - "SettingsCalibrationWarning": "Zorg ervoor dat de soldeerpunt op kamertemperatuur is voor je verdergaat!", - "SettingsResetWarning": "Ben je zeker dat je alle instellingen naar de standaardwaardes wilt terugzetten?", - "UVLOWarningString": "DC LAAG", - "UndervoltageString": "Onderspanning", - "InputVoltageString": "Input V: ", - "WarningTipTempString": "Tip Temp: ", - "BadTipString": "DEFECT", - "SleepingSimpleString": "Zzz ", - "SleepingAdvancedString": "Slaapstand...", - "WarningSimpleString": "HEET", - "WarningAdvancedString": "!!! TIP HEET !!!", - "SleepingTipAdvancedString": "Tip:", - "IdleTipString": "Tip:", - "IdleSetString": " Set:", - "TipDisconnectedString": "TIP LOSGEKOPPELD", - "SolderingAdvancedPowerPrompt": "vermogen: ", - "OffString": "Off", - "ResetOKMessage": "Reset OK" - }, - "characters": { - "SettingRightChar": "R", - "SettingLeftChar": "L", - "SettingAutoChar": "A", - "SettingFastChar": "F", - "SettingSlowChar": "S", - "SettingStartSolderingChar": "T", - "SettingStartSleepChar": "S", - "SettingStartSleepOffChar": "O", - "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" - }, - "menuGroups": { - "SolderingMenu": { - "text2": [ - "Soldeer", - "Instellingen" - ], - "desc": "Soldeerinstellingen" - }, - "PowerSavingMenu": { - "text2": [ - "Slaap", - "Modes" - ], - "desc": "Batterijbesparingsinstellingen" - }, - "UIMenu": { - "text2": [ - "Gebruikers-", - "Interface" - ], - "desc": "Gebruikersinterface Instellingen" - }, - "AdvancedMenu": { - "text2": [ - "geavanceerde", - "Instellingen" - ], - "desc": "geavanceerde Instellingen" - } - }, - "menuOptions": { - "PowerSource": { - "text2": [ - "Spannings-", - "bron" - ], - "desc": "Spanningsbron. Stelt drempelspanning in. " - }, - "SleepTemperature": { - "text2": [ - "Slaap", - "temp" - ], - "desc": "Temperatuur in slaapstand " - }, - "SleepTimeout": { - "text2": [ - "Slaap", - "time-out" - ], - "desc": "Slaapstand time-out " - }, - "ShutdownTimeout": { - "text2": [ - "Uitschakel", - "time-out" - ], - "desc": "Automatisch afsluiten time-out " - }, - "MotionSensitivity": { - "text2": [ - "Bewegings-", - "gevoeligheid" - ], - "desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>" - }, - "TemperatureUnit": { - "text2": [ - "Temperatuur", - "eenheid" - ], - "desc": "Temperatuureenheid " - }, - "AdvancedIdle": { - "text2": [ - "Gedetailleerd", - "slaapscherm" - ], - "desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het slaapscherm." - }, - "DisplayRotation": { - "text2": [ - "Scherm-", - "oriëntatie" - ], - "desc": "Schermoriëntatie " - }, - "BoostTemperature": { - "text2": [ - "Boost", - "temp" - ], - "desc": "Temperatuur in boostmodes" - }, - "AutoStart": { - "text2": [ - "Auto", - "start" - ], - "desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit" - }, - "CooldownBlink": { - "text2": [ - "Afkoel", - "flikker" - ], - "desc": "Temperatuur laten flikkeren in het hoofdmenu als de soldeerpunt aan het afkoelen is." - }, - "TemperatureCalibration": { - "text2": [ - "Calibreer", - "temperatuur?" - ], - "desc": "Temperatuursafwijking van de soldeerpunt calibreren." - }, - "SettingsReset": { - "text2": [ - "Instellingen", - "resetten?" - ], - "desc": "Alle instellingen terugzetten." - }, - "VoltageCalibration": { - "text2": [ - "Calibreer", - "input-voltage?" - ], - "desc": "VIN Calibreren. Knoppen lang ingedrukt houden om te bevestigen." - }, - "AdvancedSoldering": { - "text2": [ - "Gedetailleerd", - "soldeerscherm" - ], - "desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm." - }, - "ScrollingSpeed": { - "text2": [ - "Scroll", - "snelheid" - ], - "desc": "Snelheid waarmee de tekst scrolt." - }, - "TipModel": { - "text2": [ - "Tip", - "Model" - ], - "desc": "Tip Model selection" - }, - "SimpleCalibrationMode": { - "text2": [ - "Simple", - "Calibration" - ], - "desc": "Simple Calibration using Hot water" - }, - "AdvancedCalibrationMode": { - "text2": [ - "Advanced", - "Calibration" - ], - "desc": "Advanced calibration using thermocouple on the tip" - }, - "PowerInput": { - "text2": [ - "Power", - "Wattage" - ], - "desc": "Power Wattage of the power adapter used" - }, - "PowerLimit": { - "text2": [ - "Power", - "Limit" - ], - "desc": "Maximum power the iron can use " - }, - "ReverseButtonTempChange": { - "text2": [ - "Key +-", - "reverse?" - ], - "desc": "Reverse the tip temperature change buttons plus minus assignment." - }, - "TempChangeShortStep": { - "text2": [ - "Temp change", - "short?" - ], - "desc": "Temperature change steps on short button press!" - }, - "TempChangeLongStep": { - "text2": [ - "Temp change", - "long?" - ], - "desc": "Temperature change steps on long button press!" - }, - "PowerPulsePower":{ - "text2": [ - "Power", - "Pulse W" - ], - "desc": "Keep awake pulse power intensity" - }, - "TipGain": { - "text2": [ - "Modify", - "tip gain" - ], - "desc": "Tip gain" - }, - "HallEffSensitivity": { - "text2": [ - "Hall Eff", - "Sensitivity" - ], - "desc": "Sensitivity of the Hall effect sensor in detecting sleep " - } - } -} +{ + "languageCode": "NL", + "languageLocalName": "Nederlands", + "cyrillicGlyphs": false, + "messages": { + "SettingsCalibrationDone": "Calibratie klaar!", + "SettingsCalibrationWarning": "Zorg ervoor dat te punt op kamertemperatuur is voor je verder gaat!", + "SettingsResetWarning": "Weet je zeker dat je de fabrieksinstellingen terug wil zetten?", + "UVLOWarningString": "DC Laag", + "UndervoltageString": "Onderspanning", + "InputVoltageString": "Input V: ", + "WarningTipTempString": "Punt temp: ", + "BadTipString": "DEFECTE PUNT", + "SleepingSimpleString": "Zzzz", + "SleepingAdvancedString": "Slaapstand...", + "WarningSimpleString": "HEET!", + "WarningAdvancedString": "!!! PUNT HOT !!!", + "SleepingTipAdvancedString": "Punt:", + "IdleTipString": "Punt:", + "IdleSetString": " Zet:", + "TipDisconnectedString": "PUNT LOSGEKOPPELT", + "SolderingAdvancedPowerPrompt": "Vermogen: ", + "OffString": "Uit", + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Niveau:", + "SettingsResetMessage": "Instellingen zijn\ngereset!", + "LockingKeysString": " GEBLOKKEERD", + "UnlockingKeysString": "GEDEBLOKKEERD", + "WarningKeysLockedString": "!GEBLOKKEERD!" + }, + "characters": { + "SettingRightChar": "R", + "SettingLeftChar": "L", + "SettingAutoChar": "A", + "SettingFastChar": "F", + "SettingSlowChar": "S", + "SettingStartSolderingChar": "T", + "SettingStartSleepChar": "S", + "SettingStartSleepOffChar": "O", + "SettingStartNoneChar": "F", + "SettingLockDisableChar": "U", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "V", + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H" + }, + "menuGroups": { + "SolderingMenu": { + "text2": [ + "Soldeer", + "Instellingen" + ], + "desc": "Soldeer instellingen" + }, + "PowerSavingMenu": { + "text2": [ + "Slaap", + "Modes" + ], + "desc": "Stroom besparings instellingen" + }, + "UIMenu": { + "text2": [ + "Gebruikers-", + "interface" + ], + "desc": "Gebruikers-interface instellingen" + }, + "AdvancedMenu": { + "text2": [ + "Geavanceerde", + "Instellingen" + ], + "desc": "Geavanceerde Instellingen" + } + }, + "menuOptions": { + "PowerSource": { + "text2": [ + "Spannings-", + "bron" + ], + "desc": "Spanningsbron. Stelt drempelspanning in. " + }, + "SleepTemperature": { + "text2": [ + "Slaap", + "temp" + ], + "desc": "Temperatuur in slaapstand" + }, + "SleepTimeout": { + "text2": [ + "Slaap", + "time-out" + ], + "desc": "Slaap time-out " + }, + "ShutdownTimeout": { + "text2": [ + "Uitschakel", + "time-out" + ], + "desc": "Automatisch afsluiten time-out " + }, + "MotionSensitivity": { + "text2": [ + "Bewegings-", + "gevoeligheid" + ], + "desc": "Bewegingsgevoeligheid <0=uit 1=minst gevoelig 9=meest gevoelig>" + }, + "TemperatureUnit": { + "text2": [ + "Temperatuur", + "eenheid" + ], + "desc": "Temperatuureenheid " + }, + "AdvancedIdle": { + "text2": [ + "Gedetailleerd", + "startscherm" + ], + "desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het startscherm." + }, + "DisplayRotation": { + "text2": [ + "Scherm-", + "oriëntatie" + ], + "desc": "Schermoriëntatie " + }, + "BoostTemperature": { + "text2": [ + "Boost", + "temp" + ], + "desc": "Temperatuur in boostmode" + }, + "AutoStart": { + "text2": [ + "Auto", + "start" + ], + "desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. " + }, + "CooldownBlink": { + "text2": [ + "Afkoel", + "flikker" + ], + "desc": "Temperatuur laten flikkeren in het hoofdmenu als de soldeerpunt aan het afkoelen is." + }, + "TemperatureCalibration": { + "text2": [ + "Calibreer", + "temperatuur?" + ], + "desc": "Temperatuursafwijking van de soldeerpunt calibreren." + }, + "SettingsReset": { + "text2": [ + "Instellingen", + "resetten?" + ], + "desc": "Alle instellingen terugzetten." + }, + "VoltageCalibration": { + "text2": [ + "Calibreer", + "input-voltage?" + ], + "desc": "VIN Calibreren. ." + }, + "AdvancedSoldering": { + "text2": [ + "Gedetailleerd", + "soldeerscherm" + ], + "desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm." + }, + "ScrollingSpeed": { + "text2": [ + "Scroll", + "snelheid" + ], + "desc": "Snelheid waarmee de tekst scrolt." + }, + "TipModel": { + "text2": [ + "Punt", + "Model" + ], + "desc": "Punt Model selecteren" + }, + "SimpleCalibrationMode": { + "text2": [ + "Simpele", + "Calibratie" + ], + "desc": "Simpele Calibratie met warm water" + }, + "AdvancedCalibrationMode": { + "text2": [ + "Geavanceerde", + "Calibratie" + ], + "desc": "Geavanceerde calibratie met een thermokoppel op de punt" + }, + "PowerInput": { + "text2": [ + "Power", + "Wattage" + ], + "desc": "Wattage van de gebruikte voeding" + }, + "PowerLimit": { + "text2": [ + "Vermogen", + "limiet" + ], + "desc": "Maximaal vermogen " + }, + "ReverseButtonTempChange": { + "text2": [ + "Draai", + "+ - knoppen om" + ], + "desc": "Keer de +- knoppen om de termperatuur van de punt te regelen om." + }, + "TempChangeShortStep": { + "text2": [ + "Temp veranderen", + "kort" + ], + "desc": "Temperatuur verandering bij kort drukken" + }, + "TempChangeLongStep": { + "text2": [ + "Temp veranderen", + "lang" + ], + "desc": "Temperatuur verandering bij lang drukken" + }, + "PowerPulsePower": { + "text2": [ + "Vermogen", + "Puls W" + ], + "desc": "Vermogen van puls om soldeerbout aan te houden" + }, + "TipGain": { + "text2": [ + "Verander", + "punt gain" + ], + "desc": "Punt gain" + }, + "HallEffSensitivity": { + "text2": [ + "Hall Eff", + "Sensitivity" + ], + "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Blokkeer", + "knoppen" + ], + "desc": "Tijdens solderen lang op beide knoppen drukken, blokkeert ze. " + } + } +} \ No newline at end of file diff --git a/Translation Editor/translation_nl_be.json b/Translation Editor/translation_nl_be.json index 7f913d5b..c3450cca 100644 --- a/Translation Editor/translation_nl_be.json +++ b/Translation Editor/translation_nl_be.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "Punt ONTKOPPELD", "SolderingAdvancedPowerPrompt": "Vermogen: ", "OffString": "Uit", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "R", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Spannings-", "bron" ], "desc": "Spanningsbron. Stelt minimumspanning in. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Slaap", "temp" ], "desc": "Temperatuur in slaapstand <°C>" }, "SleepTimeout": { - "text2": [ + "text2": [ "Slaap", "time-out" ], "desc": "Slaapstand time-out " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Uitschakel", "time-out" ], "desc": "Automatisch afsluiten time-out " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Bewegings-", "gevoeligheid" ], "desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Temperatuur", "schaal" ], "desc": "Temperatuurschaal <°C=Celsius °F=Fahrenheit>" }, "AdvancedIdle": { - "text2": [ + "text2": [ "Gedetailleerd", "slaapscherm" ], "desc": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm." }, "DisplayRotation": { - "text2": [ + "text2": [ "Scherm-", "oriëntatie" ], "desc": "Schermoriëntatie " }, "BoostTemperature": { - "text2": [ + "text2": [ "Verhogings", "temp" ], "desc": "Verhogingstemperatuur" }, "AutoStart": { - "text2": [ + "text2": [ "Auto", "start" ], "desc": "Breng de soldeerbout op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit" }, "CooldownBlink": { - "text2": [ + "text2": [ "Afkoel", "knipper" ], "desc": "Temperatuur knippert in hoofdmenu tijdens afkoeling." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Calibreer", "temperatuur?" ], "desc": "Temperatuur van de punt calibreren." }, "SettingsReset": { - "text2": [ + "text2": [ "Instellingen", "resetten?" ], "desc": "Alle instellingen resetten." }, "VoltageCalibration": { - "text2": [ + "text2": [ "Calibreer", "voedingsspanning?" ], "desc": "VIN Calibreren. Bevestigen door knoppen lang in te drukken." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Gedetailleerd", "soldeerscherm" ], "desc": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm." }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Scrol", "snelheid" ], "desc": "Scrolsnelheid van de tekst." }, "TipModel": { - "text2": [ + "text2": [ "Punt", "Model" ], "desc": "Gekozen punt" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Eenvoudige", "Calibrering" ], "desc": "Calibrering met heet water" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Gevorderde", "Calibrering" ], "desc": "Calibrering met thermokoppel" }, "PowerInput": { - "text2": [ + "text2": [ "Vermogen", "Watt" ], "desc": "Vermogen van de adapter" }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_no.json b/Translation Editor/translation_no.json index 3f251c58..83544cff 100644 --- a/Translation Editor/translation_no.json +++ b/Translation Editor/translation_no.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "SPISS FRAKOBLET", "SolderingAdvancedPowerPrompt": "Effekt: ", "OffString": "Av", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "H", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "D", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "I", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Kilde", "" ], "desc": "Strømforsyning. Sett nedre spenning for automatisk nedstenging. " }, "SleepTimeout": { - "text2": [ + "text2": [ "", "" ], "desc": "Tid før dvale " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_pl.json b/Translation Editor/translation_pl.json index 4664aa55..a03bc634 100644 --- a/Translation Editor/translation_pl.json +++ b/Translation Editor/translation_pl.json @@ -24,7 +24,10 @@ "OffString": "Wyłącz", "ResetOKMessage": "Reset OK", "YourGainMessage": "Twój zysk:", - "SettingsResetMessage": "Ustawienia zostały\nzresetowane!" + "SettingsResetMessage": "Ustawienia zostały\nzresetowane!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "P", @@ -36,10 +39,13 @@ "SettingStartSleepChar": "Z", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "B", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -73,193 +79,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Źródło", "zasilania" ], "desc": "Źródło zasilania. Ustaw napięcie odcięcia. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Temperatura", "uśpienia" ], "desc": "Temperatura uśpienia <°C>" }, "SleepTimeout": { - "text2": [ + "text2": [ "Czas", "uśpienia" ], "desc": "Czas uśpienia " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Czas", "wyłączenia" ], "desc": "Czas wyłączenia " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Czułość", "ruchu" ], "desc": "Czułość ruchu <0.Wyłączona 1.Minimalna 9.Maksymalna>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Jednostka", "temperatury" ], "desc": "Jednostka temperatury " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Mniejsza", "czcionka" ], "desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynności" }, "DisplayRotation": { - "text2": [ + "text2": [ "Orientacja", "wyświetlacza" ], "desc": "Orientacja wyświetlacza " }, "BoostTemperature": { - "text2": [ + "text2": [ "Temperatura", "w trybie boost" ], "desc": "Temperatura w trybie \"boost\" " }, "AutoStart": { - "text2": [ + "text2": [ "Automatyczne", "uruchamianie" ], "desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania." + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_pt.json b/Translation Editor/translation_pt.json index 13875cd5..3297c338 100644 --- a/Translation Editor/translation_pt.json +++ b/Translation Editor/translation_pt.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "SEM PONTA", "SolderingAdvancedPowerPrompt": "Power: ", "OffString": "Off", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Fonte", "alimentação" ], "desc": "Fonte de alimentação. Define a tensão de corte. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Temperat.", "repouso" ], "desc": "Temperatura de repouso " }, "SleepTimeout": { - "text2": [ + "text2": [ "Tempo", "repouso" ], "desc": "Tempo para repouso " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Tempo", "desligam." ], "desc": "Tempo para desligamento " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Sensibilidade", "movimento" ], "desc": "Sensibilidade ao movimento <0=Desligado 1=Menor 9=Maior>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Unidade", "temperatura" ], "desc": "Unidade de temperatura " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Tela repouso", "avançada" ], "desc": "Exibe informações avançadas quando em espera" }, "DisplayRotation": { - "text2": [ + "text2": [ "Orientação", "tela" ], "desc": "Orientação da tela " }, "BoostTemperature": { - "text2": [ + "text2": [ "Modo turbo", "temperat." ], "desc": "Ajuste de temperatura do modo \"turbo\"" }, "AutoStart": { - "text2": [ + "text2": [ "Partida", "automática" ], "desc": "Aquece a ponta automaticamente ao ligar" }, "CooldownBlink": { - "text2": [ + "text2": [ "Piscar ao", "arrefecer" ], "desc": "Faz o valor da temperatura piscar durante o arrefecimento" }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Calibrar", "temperatura" ], "desc": "Calibra a temperatura" }, "SettingsReset": { - "text2": [ + "text2": [ "Reset de", "fábrica?" ], "desc": "Reverte todos ajustes" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Calibrar", "tensão" ], "desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair" }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Tela trabalho", "avançada" ], "desc": "Exibe informações avançadas durante o uso" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Velocidade", "texto ajuda" ], "desc": "Velocidade a que o texto é exibido" }, "TipModel": { - "text2": [ + "text2": [ "Ponta", "Modelo" ], "desc": "Selecção de modelo de ponta" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Calibração", "Simples" ], "desc": "Calibração simples com água quente" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Calibração", "Avançada" ], "desc": "Calibração avançada com um termopar na ponta" }, "PowerInput": { - "text2": [ + "text2": [ "Potência", "Fonte" ], "desc": "Potência da fonte usada (Watt)" }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_ru.json b/Translation Editor/translation_ru.json index 14ea0b8b..21a07dea 100644 --- a/Translation Editor/translation_ru.json +++ b/Translation Editor/translation_ru.json @@ -23,7 +23,10 @@ "OffString": "Выкл.", "ResetOKMessage": "Сброс OK", "YourGainMessage": "Прирост:", - "SettingsResetMessage": "Настройки сброшены!" + "SettingsResetMessage": "Настройки сброшены!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "П", @@ -35,10 +38,13 @@ "SettingStartSleepChar": "О", "SettingStartSleepOffChar": "К", "SettingStartNoneChar": "В", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -72,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Источник", "питания" ], "desc": "Источник питания. Устанавливает напряжение отсечки. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Темп.", "ожидания" ], "desc": "Температура режима ожидания" }, "SleepTimeout": { - "text2": [ + "text2": [ "Таймаут", "ожидания" ], "desc": "Время до перехода в режим ожидания <Минуты/Секунды>" }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Таймаут", "выключения" ], "desc": "Время до отключения паяльника <Минуты>" }, "MotionSensitivity": { - "text2": [ + "text2": [ "Чувствительн.", "акселерометра" ], "desc": "Чувствительность акселерометра <0=Выкл., 1=Мин., 9=Макс.>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Единицы", "температуры" ], "desc": "Единицы измерения температуры " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Подробный", "реж. ожидания" ], "desc": "Отображать детальную информацию уменьшенным шрифтом на экране ожидания" }, "DisplayRotation": { - "text2": [ + "text2": [ "Ориентация", "экрана" ], "desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>" }, "BoostTemperature": { - "text2": [ + "text2": [ "t° турбо", "режима" ], "desc": "Температура жала в турбо-режиме" }, "AutoStart": { - "text2": [ + "text2": [ "Авто", "старт" ], "desc": "Режим, в котором запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>" }, "CooldownBlink": { - "text2": [ + "text2": [ "Мигание t°", "при остывании" ], "desc": "Мигать температурой на экране охлаждения, пока жало еще горячее" }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Калибровка", "температуры" ], "desc": "Калибровка термодатчика жала" }, "SettingsReset": { - "text2": [ + "text2": [ "Сброс", "Настроек" ], "desc": "Сброс настроек к значеням по умолчанию" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Калибровка", "напряжения" ], "desc": "Калибровка входного напряжения <длинное нажатие для выхода>" }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Подробный", "экран пайки" ], "desc": "Показывать детальную информацию на экране пайки" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Скорость", "текста" ], "desc": "Скорость прокрутки текста <М=медленно, Б=быстро>" }, "TipModel": { - "text2": [ + "text2": [ "Модель", "жала" ], "desc": "Выбор модели жала" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Упрощенная", "калибровка" ], "desc": "Упрощенная калибровка с использованием горячей воды" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Улучшенная", "калибровка" ], "desc": "Улучшенная калибровка с импользованием термопары жала" }, "PowerInput": { - "text2": [ + "text2": [ "Мощность", "питания" ], "desc": "Мощность используемого источника питания" }, "PowerLimit": { - "text2": [ + "text2": [ "Максимальная", "мощность" ], "desc": "Максимальная мощность, которую может использовать паяльник <Ватт>" }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Инвертировать", "кнопки" ], "desc": "Инвертировать кнопки изменения температуры" }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Шаг темп.", "кор. наж." ], "desc": "Шаг изменения температуры при коротком нажатии кнопок" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Шаг темп.", "длин. наж." ], "desc": "Шаг изменения температуры при длинном нажатии кнопок" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], - "desc": "Keep awake pulse power intensity" + "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_sk.json b/Translation Editor/translation_sk.json index 9423d33a..93a2f664 100644 --- a/Translation Editor/translation_sk.json +++ b/Translation Editor/translation_sk.json @@ -23,7 +23,10 @@ "OffString": "Vyp", "ResetOKMessage": "Reset OK", "YourGainMessage": "Zisk:", - "SettingsResetMessage": "Nast. Obnovené!" + "SettingsResetMessage": "Nast. Obnovené!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "P", @@ -35,10 +38,13 @@ "SettingStartSleepChar": "K", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "N", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -254,11 +260,18 @@ "desc": "Úprava zisku hrotu" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } } \ No newline at end of file diff --git a/Translation Editor/translation_sl.json b/Translation Editor/translation_sl.json index 7488affc..8c60f6ab 100644 --- a/Translation Editor/translation_sl.json +++ b/Translation Editor/translation_sl.json @@ -22,7 +22,11 @@ "SolderingAdvancedPowerPrompt": "Moč: ", "OffString": "Izk", "ResetOKMessage": "Reset OK", - "YourGainMessage": "Ojačan.:" + "YourGainMessage": "Ojačan.:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", @@ -34,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -71,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Vir", "napajanja" ], "desc": "Vir napajanja. Nastavi napetost izklopa. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Temp. med", "spanjem" ], "desc": "Temperatura med spanjem " }, "SleepTimeout": { - "text2": [ + "text2": [ "Čas do", "spanja" ], "desc": "Čas pred spanjem " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Čas do", "izklopa" ], "desc": "Čas pred izklopom " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Občutljivost", "premikanja" ], "desc": "Občutljivost premikanja <0.izklopljeno 1.najmanj 9.najbolj občutljivo>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Enota za", "temperaturo" ], "desc": "Enota za temperaturo " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Več info na", "zaslonu v mir" ], "desc": "Prikaže več informacij z manjšo pisavo na zaslonu med mirovanjem." }, "DisplayRotation": { - "text2": [ + "text2": [ "Orientacija", "zaslona" ], "desc": "Orientacija zaslona " }, "BoostTemperature": { - "text2": [ + "text2": [ "Temperat.", "v boost" ], "desc": "Temperatura v \"boost\" načinu" }, "AutoStart": { - "text2": [ + "text2": [ "Samodejni", "zagon" ], "desc": "Samodejno segrej konico ob vklopu. T=segrej, S=spanje, F=izklop" }, "CooldownBlink": { - "text2": [ + "text2": [ "Utripanje med", "hlajenjem" ], "desc": "Utripaj temperaturo med hlajenjem, ko je konica še vroča." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Kalibriram", "temperaturo?" ], "desc": "Kalibracija temperature na konici." }, "SettingsReset": { - "text2": [ + "text2": [ "Tovarniške", "nastavitve?" ], "desc": "Ponastavitev vseh nastavitev" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Kalibriram", "vhodno napetost?" ], "desc": "Kalibracija VIN. Nastavitve z gumbi, dolgi pritisk za izhod." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Več info na", "zaslonu spaj." ], "desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem." }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Hitrost", "besedila" ], "desc": "Hitrost, s katero se prikazuje besedilo" }, "TipModel": { - "text2": [ + "text2": [ "Model", "konice" ], "desc": "Izbira tipa konice" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Preprosta", "kalibracija" ], "desc": "Preprosta kalibracija z vročo vodo." }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Napredna", "kalibracija" ], "desc": "Napredna kalibracija s termočlenom na konici" }, "PowerInput": { - "text2": [ + "text2": [ "Moč napajalnega", "vira" ], "desc": "Moč v W napajalnega vira" }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_sr_cyrl.json b/Translation Editor/translation_sr_cyrl.json index a7d8799f..6faf743d 100644 --- a/Translation Editor/translation_sr_cyrl.json +++ b/Translation Editor/translation_sr_cyrl.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН", "SolderingAdvancedPowerPrompt": "Снага: ", "OffString": "Иск", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "Д", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Врста", "напајања" ], "desc": "Тип напајања; одређује најнижи радни напон. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Темп.", "спавања" ], "desc": "Температура на коју се спушта лемилица након одређеног времена мировања. " }, "SleepTimeout": { - "text2": [ + "text2": [ "Време до", "спавања" ], "desc": "Време мировања након кога лемилица спушта температуру. " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Време до", "гашења" ], "desc": "Време мировања након кога се лемилица гаси. " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Осетљивост", "на покрет" ], "desc": "Осетљивост сензора покрета. <0=искључено, 1=најмање осетљиво, 9=најосетљивије>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Јединица", "температуре" ], "desc": "Јединице у којима се приказује температура. " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Детаљи током", "мировања" ], "desc": "Приказивање детаљних информација на екрану током мировања." }, "DisplayRotation": { - "text2": [ + "text2": [ "Оријентација", "екрана" ], "desc": "Како је окренут екран. <А=аутоматски, Л=за леворуке, Д=за десноруке>" }, "BoostTemperature": { - "text2": [ + "text2": [ "Темп.", "појачања" ], "desc": "Температура врха лемилице у току појачања." }, "AutoStart": { - "text2": [ + "text2": [ "Врући", "старт" ], "desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се." }, "CooldownBlink": { - "text2": [ + "text2": [ "Упозорење", "при хлађењу" ], "desc": "Приказ температуре трепће приликом хлађења докле год је врх и даље врућ." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Калибрација", "температуре" ], "desc": "Калибрисање одступања температуре врха у односу на дршку." }, "SettingsReset": { - "text2": [ + "text2": [ "Фабричке", "поставке" ], "desc": "Враћање свих поставки на фабричке вредности." }, "VoltageCalibration": { - "text2": [ + "text2": [ "Калибрација", "улазног напона" ], "desc": "Калибрисање улазног напона. Подешава се на тастере; дуги притисак за крај." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Детаљи током", "лемљења" ], "desc": "Приказивање детаљних информација на екрану током лемљења." }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Брзина", "порука" ], "desc": "Брзина кретања описних порука попут ове. <С=споро, Б=брзо>" }, "TipModel": { - "text2": [ + "text2": [ "Модел", "врха" ], "desc": "Одабир модела лемног врха." }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Једноставна", "калибрација" ], "desc": "Једноставна калибрација кипућом водом." }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Напредна", "калибрација" ], "desc": "Напредна калибрација помоћу термопара." }, "PowerInput": { - "text2": [ + "text2": [ "Улазна", "снага" ], "desc": "Снага напајања у ватима." }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_sr_latn.json b/Translation Editor/translation_sr_latn.json index db0e41ee..839508ef 100644 --- a/Translation Editor/translation_sr_latn.json +++ b/Translation Editor/translation_sr_latn.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "VRH NIJE SPOJEN", "SolderingAdvancedPowerPrompt": "Snaga: ", "OffString": "Isk", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "D", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Vrsta", "napajanja" ], "desc": "Tip napajanja; određuje najniži radni napon. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Temp.", "spavanja" ], "desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. " }, "SleepTimeout": { - "text2": [ + "text2": [ "Vreme do", "spavanja" ], "desc": "Vreme mirovanja nakon koga lemilica spušta temperaturu. " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Vreme do", "gašenja" ], "desc": "Vreme mirovanja nakon koga se lemilica gasi. " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Osetljivost", "na pokret" ], "desc": "Osetljivost senzora pokreta. <0=isključeno, 1=najmanje osetljivo, 9=najosetljivije>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Jedinica", "temperature" ], "desc": "Jedinice u kojima se prikazuje temperatura. " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Detalji tokom", "mirovanja" ], "desc": "Prikazivanje detaljnih informacija na ekranu tokom mirovanja." }, "DisplayRotation": { - "text2": [ + "text2": [ "Orijentacija", "ekrana" ], "desc": "Kako je okrenut ekran. " }, "BoostTemperature": { - "text2": [ + "text2": [ "Temp.", "pojačanja" ], "desc": "Temperatura vrha lemilice u toku pojačanja." }, "AutoStart": { - "text2": [ + "text2": [ "Vrući", "start" ], "desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se." }, "CooldownBlink": { - "text2": [ + "text2": [ "Upozorenje", "pri hlađenju" ], "desc": "Prikaz temperature trepće prilikom hlađenja dokle god je vrh i dalje vruć." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Kalibracija", "temperature" ], "desc": "Kalibrisanje odstupanja temperature vrha u odnosu na dršku." }, "SettingsReset": { - "text2": [ + "text2": [ "Fabričke", "postavke" ], "desc": "Vraćanje svih postavki na fabričke vrednosti." }, "VoltageCalibration": { - "text2": [ + "text2": [ "Kalibracija", "ulaznog napona" ], "desc": "Kalibrisanje ulaznog napona. Podešava se na tastere; dugi pritisak za kraj." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Detalji tokom", "lemljenja" ], "desc": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja." }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Brzina", "poruka" ], "desc": "Brzina kretanja opisnih poruka poput ove. " }, "TipModel": { - "text2": [ + "text2": [ "Model", "vrha" ], "desc": "Odabir modela lemnog vrha." }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Jednostavna", "kalibracija" ], "desc": "Jednostavna kalibracija kipućom vodom." }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Napredna", "kalibracija" ], "desc": "Napredna kalibracija pomoću termopara." }, "PowerInput": { - "text2": [ + "text2": [ "Ulazna", "snaga" ], "desc": "Snaga napajanja u vatima." }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_sv.json b/Translation Editor/translation_sv.json index 2fa2e1fb..d5f55b1d 100644 --- a/Translation Editor/translation_sv.json +++ b/Translation Editor/translation_sv.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "SPETS URTAGEN", "SolderingAdvancedPowerPrompt": "Ström: ", "OffString": "Av", - "ResetOKMessage": "Reset OK" + "ResetOKMessage": "Reset OK", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "H", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Ström-", "källa" ], "desc": "Strömkälla. Anger lägsta spänning. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Vilo-", "temp" ], "desc": "Vilotemperatur " }, "SleepTimeout": { - "text2": [ + "text2": [ "Vilo-", "timeout" ], "desc": "Vilo-timeout " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Avstängn.", "timeout" ], "desc": "Avstängnings-timeout " }, "MotionSensitivity": { - "text2": [ + "text2": [ "Rörelse-", "känslighet" ], "desc": "Rörelsekänslighet <0.Av 1.minst känslig 9.mest känslig>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Temperatur-", "enheter" ], "desc": "Temperaturenhet " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Detaljerad", "vid inaktiv" ], "desc": "Visa detaljerad information i mindre typsnitt när inaktiv." }, "DisplayRotation": { - "text2": [ + "text2": [ "Visnings", "läge" ], "desc": "Visningsläge " }, "BoostTemperature": { - "text2": [ + "text2": [ "Turbo-", "temp" ], "desc": "Temperatur i \"turbo\"-läge" }, "AutoStart": { - "text2": [ + "text2": [ "Auto", "start" ], "desc": "Startar automatiskt lödpennan vid uppstart. T=Lödning, S=Viloläge, F=Av" }, "CooldownBlink": { - "text2": [ + "text2": [ "Nedkylnings-", "blink" ], "desc": "Blinka temperaturen medan spetsen kyls av och fortfarande är varm." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Kalibrera", "temperatur?" ], "desc": "Kalibrera spets-kompensation." }, "SettingsReset": { - "text2": [ + "text2": [ "Fabriks-", "inställ?" ], "desc": "Återställ alla inställningar" }, "VoltageCalibration": { - "text2": [ + "text2": [ "Kalibrera", "inspänning?" ], "desc": "Inspänningskalibrering. Knapparna justerar, håll inne för avslut" }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Detaljerad", "lödng.skärm" ], "desc": "Visa detaljerad information vid lödning" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Beskrivning", "rullhast." ], "desc": "Hastighet som den här texten rullar i" }, "TipModel": { - "text2": [ + "text2": [ "Tip", "Model" ], "desc": "Tip Model selection" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Simple", "Calibration" ], "desc": "Simple Calibration using Hot water" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Advanced", "Calibration" ], "desc": "Advanced calibration using thermocouple on the tip" }, "PowerInput": { - "text2": [ + "text2": [ "Power", "Wattage" ], "desc": "Power Wattage of the power adapter used" }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_tr.json b/Translation Editor/translation_tr.json index cdd1e561..be154426 100644 --- a/Translation Editor/translation_tr.json +++ b/Translation Editor/translation_tr.json @@ -21,7 +21,12 @@ "TipDisconnectedString": "UÇ ÇIKARILDI", "SolderingAdvancedPowerPrompt": "Güç: ", "OffString": "Kapalı", - "ResetOKMessage": "Reset Tamam" + "ResetOKMessage": "Reset Tamam", + "YourGainMessage": "Your gain:", + "SettingsResetMessage": "Settings were\nreset!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "R", @@ -33,10 +38,13 @@ "SettingStartSleepChar": "S", "SettingStartSleepOffChar": "O", "SettingStartNoneChar": "F", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -70,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "PWRSC", "" ], "desc": "Güç Kaynağı. kesim geriliminı ayarlar. " }, "SleepTemperature": { - "text2": [ + "text2": [ "STMP", "" ], "desc": "Uyku Sıcaklığı " }, "SleepTimeout": { - "text2": [ + "text2": [ "STME", "" ], "desc": "Uyku Zaman Aşımı " }, "ShutdownTimeout": { - "text2": [ + "text2": [ "SHTME", "" ], "desc": "Kapatma Zaman Aşımı " }, "MotionSensitivity": { - "text2": [ + "text2": [ "MSENSE", "" ], "desc": "Hareket Hassasiyeti <0.Kapalı 1.En az duyarlı 9.En duyarlı>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "TMPUNT", "" ], "desc": "Sıcaklık Ünitesi " }, "AdvancedIdle": { - "text2": [ + "text2": [ "ADVIDL", "" ], "desc": "Boş ekranda ayrıntılı bilgileri daha küçük bir yazı tipi ile göster." }, "DisplayRotation": { - "text2": [ + "text2": [ "DSPROT", "" ], "desc": "Görüntü Yönlendirme " }, "BoostTemperature": { - "text2": [ + "text2": [ "BTMP", "" ], "desc": "\"boost\" Modu Derecesi" }, "AutoStart": { - "text2": [ + "text2": [ "ASTART", "" ], "desc": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. T=Lehimleme Modu, S= Uyku Modu,F=Kapalı" }, "CooldownBlink": { - "text2": [ + "text2": [ "CLBLNK", "" ], "desc": "Soğutma ekranında uç hala sıcakken derece yanıp sönsün." }, "TemperatureCalibration": { - "text2": [ + "text2": [ "TMP CAL?", "" ], "desc": "Ucu kalibre et." }, "SettingsReset": { - "text2": [ + "text2": [ "RESET?", "" ], "desc": "Bütün ayarları sıfırla" }, "VoltageCalibration": { - "text2": [ + "text2": [ "CAL VIN?", "" ], "desc": "VIN Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "ADVSLD", "" ], "desc": "Lehimleme yaparken detaylı bilgi göster" }, "ScrollingSpeed": { - "text2": [ + "text2": [ "DESCSP", "" ], "desc": "Speed this text scrolls past at" }, "TipModel": { - "text2": [ + "text2": [ "Uç", "Modeli" ], "desc": "Uç Modeli seçimi" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Basit", "Kalibrasyon" ], "desc": "Sıcak su kullanarak basit kalibrasyon" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Gelişmiş", "Kalibrasyon" ], "desc": "Uçtaki ısı sensörünü kullanarak gelişmiş kalibrasyon" }, "PowerInput": { - "text2": [ + "text2": [ "Güç", "Miktarı(W)" ], "desc": "Kullanılan adaptörün güç miktarı" }, "PowerLimit": { - "text2": [ + "text2": [ "Power", "Limit" ], "desc": "Maximum power the iron can use " }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Key +-", "reverse?" ], "desc": "Reverse the tip temperature change buttons plus minus assignment." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Temp change", "short?" ], "desc": "Temperature change steps on short button press!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Temp change", "long?" ], "desc": "Temperature change steps on long button press!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Power", "Pulse W" ], "desc": "Keep awake pulse power intensity" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translation_uk.json b/Translation Editor/translation_uk.json index d4b5e8b9..b2351142 100644 --- a/Translation Editor/translation_uk.json +++ b/Translation Editor/translation_uk.json @@ -23,7 +23,10 @@ "OffString": "Вимк", "ResetOKMessage": "Скидання OK", "YourGainMessage": "Приріст:", - "SettingsResetMessage": "Налаштування скинуті!" + "SettingsResetMessage": "Налаштування скинуті!", + "LockingKeysString": " LOCKED", + "UnlockingKeysString": "UNLOCKED", + "WarningKeysLockedString": "!LOCKED!" }, "characters": { "SettingRightChar": "П", @@ -35,10 +38,13 @@ "SettingStartSleepChar": "О", "SettingStartSleepOffChar": "К", "SettingStartNoneChar": "В", - "SettingSensitivityOff":"O", - "SettingSensitivityLow":"L", - "SettingSensitivityMedium":"M", - "SettingSensitivityHigh":"H" + "SettingSensitivityOff": "O", + "SettingSensitivityLow": "L", + "SettingSensitivityMedium": "M", + "SettingSensitivityHigh": "H", + "SettingLockDisableChar": "D", + "SettingLockBoostChar": "B", + "SettingLockFullChar": "F" }, "menuGroups": { "SolderingMenu": { @@ -72,193 +78,200 @@ }, "menuOptions": { "PowerSource": { - "text2": [ + "text2": [ "Джерело", "живлення" ], "desc": "Встановлення напруги відключення. " }, "SleepTemperature": { - "text2": [ + "text2": [ "Темпер.", "сну" ], "desc": "Температура режиму очікування " }, "SleepTimeout": { - "text2": [ + "text2": [ "Тайм-аут", "сну" ], "desc": "Час до переходу в режим очікування <Хвилини/Секунди>" }, "ShutdownTimeout": { - "text2": [ + "text2": [ "Часу до", "вимкнення" ], "desc": "Час до відключення <Хвилини>" }, "MotionSensitivity": { - "text2": [ + "text2": [ "Чутл. сенсо-", "ру руху" ], "desc": "Акселерометр <0 - Вимк. 1 - мін. чутливості 9 - макс. чутливості>" }, "TemperatureUnit": { - "text2": [ + "text2": [ "Формат темпе-", "ратури(C°/F°)" ], "desc": "Одиниця виміру температури " }, "AdvancedIdle": { - "text2": [ + "text2": [ "Детальний ре-", "жим очікуван." ], "desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані" }, "DisplayRotation": { - "text2": [ + "text2": [ "Автоповорот", "екрану" ], "desc": "Орієнтація дисплея " }, "BoostTemperature": { - "text2": [ + "text2": [ "Темпер.", "Турбо" ], "desc": "Температура в Турбо-режимі" }, "AutoStart": { - "text2": [ + "text2": [ "Гарячий", "старт" ], "desc": "Режим з яким запускається паяльник при подачі живлення <П=Пайка, О=Очікування, К=Очікування при кімн. темп., В=Вимк.>" }, "CooldownBlink": { - "text2": [ + "text2": [ "Показ t° при", "охолодж." ], "desc": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран моргає" }, "TemperatureCalibration": { - "text2": [ + "text2": [ "Калібровка", "температури" ], "desc": "Калібрування температурного датчика." }, "SettingsReset": { - "text2": [ + "text2": [ "Скинути всі", "налаштування?" ], "desc": "Скидання всіх параметрів до стандартних значень." }, "VoltageCalibration": { - "text2": [ + "text2": [ "Калібрування", "напруги" ], "desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити." }, "AdvancedSoldering": { - "text2": [ + "text2": [ "Детальний ре-", "жим пайки" ], "desc": "Показувати детальну інформацію при пайці." }, "ScrollingSpeed": { - "text2": [ + "text2": [ "Швидкість", "тексту" ], "desc": "Швидкість прокрутки тексту <П=повільно, Ш=швидко>" }, "TipModel": { - "text2": [ + "text2": [ "Модель", "Жало" ], "desc": "Вибір моделі жала" }, "SimpleCalibrationMode": { - "text2": [ + "text2": [ "Просте", "Калібрування" ], "desc": "Просте калібрування з використанням гарячої води" }, "AdvancedCalibrationMode": { - "text2": [ + "text2": [ "Детальне", "Калібрування" ], "desc": "Калібрування за допомогою термопари" }, "PowerInput": { - "text2": [ + "text2": [ "Потужність", "дж. живл." ], "desc": "Потужність джерела живлення в Ватах" }, "PowerLimit": { - "text2": [ + "text2": [ "Макс.", "потуж." ], "desc": "Макс. потужність, яку може використовувати паяльник <Ват>" }, "ReverseButtonTempChange": { - "text2": [ + "text2": [ "Інвертувати", "кнопки +-?" ], "desc": "Інвертувати кнопки зміни температури." }, "TempChangeShortStep": { - "text2": [ + "text2": [ "Зм. темп.", "коротко?" ], "desc": "Змінювати температуру при короткому натисканні!" }, "TempChangeLongStep": { - "text2": [ + "text2": [ "Зм. темп.", "довго?" ], "desc": "Змінювати температуру при довгому натисканні!" }, - "PowerPulsePower":{ - "text2": [ + "PowerPulsePower": { + "text2": [ "Пульс.", "Навантаж." ], "desc": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії (це потрібно щоб паяльник не вимкнувся з часом)" }, "TipGain": { - "text2": [ + "text2": [ "Modify", "tip gain" ], "desc": "Tip gain" }, "HallEffSensitivity": { - "text2": [ + "text2": [ "Hall Eff", "Sensitivity" ], "desc": "Sensitivity of the Hall effect sensor in detecting sleep " + }, + "LockingMode": { + "text2": [ + "Allow buttons", + "locking" + ], + "desc": "When soldering, long press on both buttons lock them " } } -} +} \ No newline at end of file diff --git a/Translation Editor/translations_def.js b/Translation Editor/translations_def.js index bcbd4296..f3246e2d 100644 --- a/Translation Editor/translations_def.js +++ b/Translation Editor/translations_def.js @@ -94,6 +94,21 @@ var def = "id": "SettingsResetMessage", "maxLen": 16, "default": "Settings were\nreset!" + }, + { + "id": "LockingKeysString", + "maxLen": 8, + "default": "LOCKING" + }, + { + "id": "UnlockingKeysString", + "maxLen": 8, + "default": "UNLOCK" + }, + { + "id": "WarningKeysLockedString", + "maxLen": 8, + "default": "LOCKED!" } ], "characters": [ @@ -148,6 +163,20 @@ var def = { "id": "SettingSensitivityHigh", "len": 1 + }, { + "id": "SettingLockDisableChar", + "len": 1, + "default": "D" + }, + { + "id": "SettingLockBoostChar", + "len": 1, + "default": "B" + }, + { + "id": "SettingLockFullChar", + "len": 1, + "default": "F" } ], "menuGroups": [ @@ -303,6 +332,10 @@ var def = "id": "HallEffSensitivity", "maxLen": 6, "maxLen2": 8 + }, { + "id": "LockingMode", + "maxLen": 6, + "maxLen2": 13 } ] } diff --git a/workspace/TS100/Core/Drivers/Buttons.cpp b/workspace/TS100/Core/Drivers/Buttons.cpp index 8aa47833..e252ab8c 100644 --- a/workspace/TS100/Core/Drivers/Buttons.cpp +++ b/workspace/TS100/Core/Drivers/Buttons.cpp @@ -42,7 +42,7 @@ ButtonState getButtonState() { else if (currentState == 0x02) return BUTTON_B_LONG; else - return BUTTON_NONE; // Both being held case, we dont long hold this + return BUTTON_BOTH_LONG; // Both being held case } else return BUTTON_NONE; } else { diff --git a/workspace/TS100/Core/Drivers/Buttons.hpp b/workspace/TS100/Core/Drivers/Buttons.hpp index fb4b1991..d894bf18 100644 --- a/workspace/TS100/Core/Drivers/Buttons.hpp +++ b/workspace/TS100/Core/Drivers/Buttons.hpp @@ -17,6 +17,7 @@ enum ButtonState { BUTTON_F_LONG = 4, /* User is holding the front button*/ BUTTON_B_LONG = 8, /* User is holding the back button*/ BUTTON_BOTH = 16, /* User has pressed both buttons*/ + BUTTON_BOTH_LONG = 32, /* User is holding both buttons*/ /* * Note: diff --git a/workspace/TS100/Core/Inc/Settings.h b/workspace/TS100/Core/Inc/Settings.h index 1e5bd9a4..eea506f2 100644 --- a/workspace/TS100/Core/Inc/Settings.h +++ b/workspace/TS100/Core/Inc/Settings.h @@ -11,7 +11,7 @@ #define SETTINGS_H_ #include #include "unit.h" -#define SETTINGSVERSION ( 0x21 ) +#define SETTINGSVERSION (0x22) /*Change this if you change the struct below to prevent people getting \ out of sync*/ @@ -19,45 +19,48 @@ * This struct must be a multiple of 2 bytes as it is saved / restored from * flash in uint16_t chunks */ -typedef struct { - uint8_t version; // Used to track if a reset is needed on firmware upgrade +typedef struct +{ + uint8_t version; // Used to track if a reset is needed on firmware upgrade - uint16_t SolderingTemp; // current set point for the iron - uint16_t SleepTemp; // temp to drop to in sleep - uint8_t SleepTime; // minutes timeout to sleep - uint8_t cutoutSetting; // The voltage we cut out at for under voltage OR Power level for TS80 - uint8_t OrientationMode :2; // If true we want to invert the display for lefties - uint8_t sensitivity :4; // Sensitivity of accelerometer (5 bits) - uint8_t autoStartMode :2; // Should the unit automatically jump straight - // into soldering mode when power is applied - uint8_t ShutdownTime; // Time until unit shuts down if left alone + uint16_t SolderingTemp; // current set point for the iron + uint16_t SleepTemp; // temp to drop to in sleep + uint8_t SleepTime; // minutes timeout to sleep + uint8_t cutoutSetting; // The voltage we cut out at for under voltage OR Power level for TS80 + uint8_t OrientationMode : 2; // If true we want to invert the display for lefties + uint8_t sensitivity : 4; // Sensitivity of accelerometer (5 bits) + uint8_t autoStartMode : 2; // Should the unit automatically jump straight + // into soldering mode when power is applied + uint8_t ShutdownTime; // Time until unit shuts down if left alone - uint8_t coolingTempBlink :1; // Should the temperature blink on the cool - // down screen until its <50C - uint8_t detailedIDLE :1; // Detailed idle screen - uint8_t detailedSoldering :1; // Detailed soldering screens + uint8_t coolingTempBlink : 1; // Should the temperature blink on the cool + // down screen until its <50C + uint8_t detailedIDLE : 1; // Detailed idle screen + uint8_t detailedSoldering : 1; // Detailed soldering screens #ifdef ENABLED_FAHRENHEIT_SUPPORT - uint8_t temperatureInF :1; // Should the temp be in F or C (true is F) + uint8_t temperatureInF : 1; // Should the temp be in F or C (true is F) #endif - uint8_t descriptionScrollSpeed :1; // Description scroll speed - uint8_t KeepAwakePulse; // Keep Awake pulse power in 0.1 watts (10 = 1Watt) + uint8_t descriptionScrollSpeed : 1; // Description scroll speed + uint8_t lockingMode : 2; // Store the locking mode + uint8_t KeepAwakePulse; // Keep Awake pulse power in 0.1 watts (10 = 1Watt) - uint16_t voltageDiv; // Voltage divisor factor - uint16_t BoostTemp; // Boost mode set point for the iron + uint16_t voltageDiv; // Voltage divisor factor + uint16_t BoostTemp; // Boost mode set point for the iron uint16_t CalibrationOffset; // This stores the temperature offset for this tip // in the iron. - uint8_t powerLimit; // Maximum power iron allowed to output + uint8_t powerLimit; // Maximum power iron allowed to output uint16_t TipGain; // uV/C * 10, it can be used to convert tip thermocouple voltage to temperateture TipV/TipGain = TipTemp uint8_t ReverseButtonTempChangeEnabled; // Change the plus and minus button assigment - uint16_t TempChangeLongStep; // Change the plus and minus button assigment - uint16_t TempChangeShortStep; // Change the plus and minus button assigment - uint8_t hallEffectSensitivity; //Operating mode of the hall effect sensor - uint32_t padding; // This is here for in case we are not an even divisor so - // that nothing gets cut off - //MUST BE LAST + uint16_t TempChangeLongStep; // Change the plus and minus button assigment + uint16_t TempChangeShortStep; // Change the plus and minus button assigment + uint8_t hallEffectSensitivity; //Operating mode of the hall effect sensor + + uint32_t padding; // This is here for in case we are not an even divisor so + // that nothing gets cut off + //MUST BE LAST } systemSettingsType; diff --git a/workspace/TS100/Core/Inc/Translation.h b/workspace/TS100/Core/Inc/Translation.h index 2903366e..e090f06d 100644 --- a/workspace/TS100/Core/Inc/Translation.h +++ b/workspace/TS100/Core/Inc/Translation.h @@ -15,8 +15,8 @@ extern const uint8_t USER_FONT_6x8[]; * When SettingsShortNameType is SHORT_NAME_SINGLE_LINE * use SettingsShortNames as SettingsShortNames[16][1].. second column undefined */ -extern const char *SettingsShortNames[28][2]; -extern const char *SettingsDescriptions[28]; +extern const char *SettingsShortNames[29][2]; +extern const char *SettingsDescriptions[29]; extern const char *SettingsMenuEntries[4]; extern const char *SettingsCalibrationDone; @@ -41,6 +41,9 @@ extern const char *OffString; extern const char *ResetOKMessage; extern const char *YourGainMessage; extern const char *SettingsResetMessage; +extern const char *LockingKeysString; +extern const char *UnlockingKeysString; +extern const char *WarningKeysLockedString; extern const char *SettingTrueChar; extern const char *SettingFalseChar; @@ -55,6 +58,9 @@ extern const char *SettingSensitivityOff; extern const char *SettingSensitivityLow; extern const char *SettingSensitivityMedium; extern const char *SettingSensitivityHigh; +extern const char *SettingLockDisableChar; +extern const char *SettingLockBoostChar; +extern const char *SettingLockFullChar; extern const char *SettingFastChar; extern const char *SettingSlowChar; diff --git a/workspace/TS100/Core/Src/Settings.cpp b/workspace/TS100/Core/Src/Settings.cpp index 88d135b7..79996669 100644 --- a/workspace/TS100/Core/Src/Settings.cpp +++ b/workspace/TS100/Core/Src/Settings.cpp @@ -65,6 +65,7 @@ void resetSettings() { systemSettings.ShutdownTime = SHUTDOWN_TIME; // How many minutes until the unit turns itself off systemSettings.BoostTemp = BOOST_TEMP; // default to 400C systemSettings.autoStartMode = AUTO_START_MODE; // Auto start off for safety + systemSettings.lockingMode = LOCKING_MODE; // Disable locking for safety systemSettings.coolingTempBlink = COOLING_TEMP_BLINK; // Blink the temperature on the cooling screen when its > 50C #ifdef ENABLED_FAHRENHEIT_SUPPORT systemSettings.temperatureInF = TEMPERATURE_INF; // default to 0 diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp index cdb9c22e..a0abf503 100644 --- a/workspace/TS100/Core/Src/gui.cpp +++ b/workspace/TS100/Core/Src/gui.cpp @@ -50,6 +50,8 @@ static bool settings_setBoostTemp(void); static void settings_displayBoostTemp(void); static bool settings_setAutomaticStartMode(void); static void settings_displayAutomaticStartMode(void); +static bool settings_setLockingMode(void); +static void settings_displayLockingMode(void); static bool settings_setCoolingBlinkEnabled(void); static void settings_displayCoolingBlinkEnabled(void); static bool settings_setResetSettings(void); @@ -91,6 +93,7 @@ static bool settings_enterAdvancedMenu(void); * Auto Start * Temp change short step * Temp change long step + * Locking Mode * * Power Saving @@ -118,7 +121,7 @@ static bool settings_enterAdvancedMenu(void); * Reset Settings * */ -const menuitem rootSettingsMenu[] { +const menuitem rootSettingsMenu[]{ /* * Power Source * Soldering Menu @@ -128,31 +131,32 @@ const menuitem rootSettingsMenu[] { * Exit */ #ifdef MODEL_TS100 - { (const char*) SettingsDescriptions[0], settings_setInputVRange, - settings_displayInputVRange}, /*Voltage input*/ + {(const char *)SettingsDescriptions[0], settings_setInputVRange, + settings_displayInputVRange}, /*Voltage input*/ #else - { (const char*) SettingsDescriptions[19], settings_setInputPRange, settings_displayInputPRange }, /*Voltage input*/ + {(const char *)SettingsDescriptions[19], settings_setInputPRange, settings_displayInputPRange}, /*Voltage input*/ #endif - { (const char*) NULL, settings_enterSolderingMenu, settings_displaySolderingMenu }, /*Soldering*/ - { (const char*) NULL, settings_enterPowerMenu, settings_displayPowerMenu }, /*Sleep Options Menu*/ - { (const char*) NULL, settings_enterUIMenu, settings_displayUIMenu }, /*UI Menu*/ - { (const char*) NULL, settings_enterAdvancedMenu, settings_displayAdvancedMenu }, /*Advanced Menu*/ - { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE + {(const char *)NULL, settings_enterSolderingMenu, settings_displaySolderingMenu}, /*Soldering*/ + {(const char *)NULL, settings_enterPowerMenu, settings_displayPowerMenu}, /*Sleep Options Menu*/ + {(const char *)NULL, settings_enterUIMenu, settings_displayUIMenu}, /*UI Menu*/ + {(const char *)NULL, settings_enterAdvancedMenu, settings_displayAdvancedMenu}, /*Advanced Menu*/ + {NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE }; const menuitem solderingMenu[] = { -/* + /* * Boost Mode Enabled * Boost Mode Temp * Auto Start * Temp change short step * Temp change long step */ -{ (const char*) SettingsDescriptions[8], settings_setBoostTemp, settings_displayBoostTemp }, /*Boost Temp*/ -{ (const char*) SettingsDescriptions[9], settings_setAutomaticStartMode, settings_displayAutomaticStartMode }, /*Auto start*/ -{ (const char*) SettingsDescriptions[22], settings_setTempChangeShortStep, settings_displayTempChangeShortStep }, /*Temp change short step*/ -{ (const char*) SettingsDescriptions[23], settings_setTempChangeLongStep, settings_displayTempChangeLongStep }, /*Temp change long step*/ -{ NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE + {(const char *)SettingsDescriptions[8], settings_setBoostTemp, settings_displayBoostTemp}, /*Boost Temp*/ + {(const char *)SettingsDescriptions[9], settings_setAutomaticStartMode, settings_displayAutomaticStartMode}, /*Auto start*/ + {(const char *)SettingsDescriptions[22], settings_setTempChangeShortStep, settings_displayTempChangeShortStep}, /*Temp change short step*/ + {(const char *)SettingsDescriptions[23], settings_setTempChangeLongStep, settings_displayTempChangeLongStep}, /*Temp change long step*/ + {(const char *)SettingsDescriptions[26], settings_setLockingMode, settings_displayLockingMode}, /*Locking Mode*/ + {NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE }; const menuitem UIMenu[] = { /* @@ -164,34 +168,34 @@ const menuitem UIMenu[] = { * Reverse Temp change buttons + - */ #ifdef ENABLED_FAHRENHEIT_SUPPORT - { (const char*) SettingsDescriptions[5], settings_setTempF, - settings_displayTempF}, /* Temperature units*/ + {(const char *)SettingsDescriptions[5], settings_setTempF, + settings_displayTempF}, /* Temperature units*/ #endif - { (const char*) SettingsDescriptions[7], settings_setDisplayRotation, settings_displayDisplayRotation }, /*Display Rotation*/ - { (const char*) SettingsDescriptions[10], settings_setCoolingBlinkEnabled, settings_displayCoolingBlinkEnabled }, /*Cooling blink warning*/ - { (const char*) SettingsDescriptions[15], settings_setScrollSpeed, settings_displayScrollSpeed }, /*Scroll Speed for descriptions*/ - { (const char*) SettingsDescriptions[21], settings_setReverseButtonTempChangeEnabled, settings_displayReverseButtonTempChangeEnabled }, /* Reverse Temp change buttons + - */ - { NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE + {(const char *)SettingsDescriptions[7], settings_setDisplayRotation, settings_displayDisplayRotation}, /*Display Rotation*/ + {(const char *)SettingsDescriptions[10], settings_setCoolingBlinkEnabled, settings_displayCoolingBlinkEnabled}, /*Cooling blink warning*/ + {(const char *)SettingsDescriptions[15], settings_setScrollSpeed, settings_displayScrollSpeed}, /*Scroll Speed for descriptions*/ + {(const char *)SettingsDescriptions[21], settings_setReverseButtonTempChangeEnabled, settings_displayReverseButtonTempChangeEnabled}, /* Reverse Temp change buttons + - */ + {NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE }; const menuitem PowerMenu[] = { -/* + /* * Sleep Temp * Sleep Time * Shutdown Time * Motion Sensitivity */ -{ (const char*) SettingsDescriptions[1], settings_setSleepTemp, settings_displaySleepTemp }, /*Sleep Temp*/ -{ (const char*) SettingsDescriptions[2], settings_setSleepTime, settings_displaySleepTime }, /*Sleep Time*/ -{ (const char*) SettingsDescriptions[3], settings_setShutdownTime, settings_displayShutdownTime }, /*Shutdown Time*/ -{ (const char*) SettingsDescriptions[4], settings_setSensitivity, settings_displaySensitivity }, /* Motion Sensitivity*/ + {(const char *)SettingsDescriptions[1], settings_setSleepTemp, settings_displaySleepTemp}, /*Sleep Temp*/ + {(const char *)SettingsDescriptions[2], settings_setSleepTime, settings_displaySleepTime}, /*Sleep Time*/ + {(const char *)SettingsDescriptions[3], settings_setShutdownTime, settings_displayShutdownTime}, /*Shutdown Time*/ + {(const char *)SettingsDescriptions[4], settings_setSensitivity, settings_displaySensitivity}, /* Motion Sensitivity*/ #ifdef HALL_SENSOR -{ (const char*) SettingsDescriptions[26], settings_setHallEffect, settings_displayHallEffect}, /* HallEffect Sensitivity*/ + {(const char *)SettingsDescriptions[26], settings_setHallEffect, settings_displayHallEffect}, /* HallEffect Sensitivity*/ #endif -{ NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE + {NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE }; const menuitem advancedMenu[] = { -/* + /* * Power limit * Detailed IDLE * Detailed Soldering @@ -200,18 +204,19 @@ const menuitem advancedMenu[] = { * Reset Settings * Power Pulse */ -{ (const char*) SettingsDescriptions[20], settings_setPowerLimit, settings_displayPowerLimit }, /*Power limit*/ -{ (const char*) SettingsDescriptions[6], settings_setAdvancedIDLEScreens, settings_displayAdvancedIDLEScreens }, /* Advanced idle screen*/ -{ (const char*) SettingsDescriptions[14], settings_setAdvancedSolderingScreens, settings_displayAdvancedSolderingScreens }, /* Advanced soldering screen*/ -{ (const char*) SettingsDescriptions[12], settings_setResetSettings, settings_displayResetSettings }, /*Resets settings*/ -{ (const char*) SettingsDescriptions[11], settings_setCalibrate, settings_displayCalibrate }, /*Calibrate tip*/ -{ (const char*) SettingsDescriptions[13], settings_setCalibrateVIN, settings_displayCalibrateVIN }, /*Voltage input cal*/ -{ (const char*) SettingsDescriptions[24], settings_setPowerPulse, settings_displayPowerPulse }, /*Power Pulse adjustment */ -{ (const char*) SettingsDescriptions[25], settings_setTipGain, settings_displayTipGain }, /*TipGain*/ -{ NULL, NULL, NULL } // end of menu marker. DO NOT REMOVE + {(const char *)SettingsDescriptions[20], settings_setPowerLimit, settings_displayPowerLimit}, /*Power limit*/ + {(const char *)SettingsDescriptions[6], settings_setAdvancedIDLEScreens, settings_displayAdvancedIDLEScreens}, /* Advanced idle screen*/ + {(const char *)SettingsDescriptions[14], settings_setAdvancedSolderingScreens, settings_displayAdvancedSolderingScreens}, /* Advanced soldering screen*/ + {(const char *)SettingsDescriptions[12], settings_setResetSettings, settings_displayResetSettings}, /*Resets settings*/ + {(const char *)SettingsDescriptions[11], settings_setCalibrate, settings_displayCalibrate}, /*Calibrate tip*/ + {(const char *)SettingsDescriptions[13], settings_setCalibrateVIN, settings_displayCalibrateVIN}, /*Voltage input cal*/ + {(const char *)SettingsDescriptions[24], settings_setPowerPulse, settings_displayPowerPulse}, /*Power Pulse adjustment */ + {(const char *)SettingsDescriptions[25], settings_setTipGain, settings_displayTipGain}, /*TipGain*/ + {NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE }; -static void printShortDescriptionDoubleLine(uint32_t shortDescIndex) { +static void printShortDescriptionDoubleLine(uint32_t shortDescIndex) +{ OLED::setFont(1); OLED::setCharCursor(0, 0); OLED::print(SettingsShortNames[shortDescIndex][0]); @@ -226,7 +231,8 @@ static void printShortDescriptionDoubleLine(uint32_t shortDescIndex) { * @param cursorCharPosition Custom cursor char position to set after printing * description. */ -static void printShortDescription(uint32_t shortDescIndex, uint16_t cursorCharPosition) { +static void printShortDescription(uint32_t shortDescIndex, uint16_t cursorCharPosition) +{ // print short description (default single line, explicit double line) printShortDescriptionDoubleLine(shortDescIndex); @@ -237,7 +243,8 @@ static void printShortDescription(uint32_t shortDescIndex, uint16_t cursorCharPo OLED::setCursor(OLED::getCursorX() - 2, 0); } -static int userConfirmation(const char *message) { +static int userConfirmation(const char *message) +{ uint16_t messageWidth = FONT_12_WIDTH * (strlen(message) + 7); uint32_t messageStart = xTaskGetTickCount(); @@ -246,11 +253,13 @@ static int userConfirmation(const char *message) { int16_t lastOffset = -1; bool lcdRefresh = true; - for (;;) { + for (;;) + { int16_t messageOffset = ((xTaskGetTickCount() - messageStart) / (systemSettings.descriptionScrollSpeed == 1 ? 10 : 20)); - messageOffset %= messageWidth; // Roll around at the end + messageOffset %= messageWidth; // Roll around at the end - if (lastOffset != messageOffset) { + if (lastOffset != messageOffset) + { OLED::clearScreen(); //^ Rolling offset based on time @@ -261,7 +270,8 @@ static int userConfirmation(const char *message) { } ButtonState buttons = getButtonState(); - switch (buttons) { + switch (buttons) + { case BUTTON_F_SHORT: // User confirmed return 1; @@ -276,7 +286,8 @@ static int userConfirmation(const char *message) { return 0; } - if (lcdRefresh) { + if (lcdRefresh) + { OLED::refresh(); osDelay(40); lcdRefresh = false; @@ -285,34 +296,42 @@ static int userConfirmation(const char *message) { return 0; } #ifdef MODEL_TS100 -static bool settings_setInputVRange(void) { +static bool settings_setInputVRange(void) +{ systemSettings.cutoutSetting = (systemSettings.cutoutSetting + 1) % 5; if (systemSettings.cutoutSetting) - systemSettings.powerLimit = 0; // disable power limit if switching to a lipo power source + systemSettings.powerLimit = 0; // disable power limit if switching to a lipo power source return systemSettings.cutoutSetting == 4; } -static void settings_displayInputVRange(void) { +static void settings_displayInputVRange(void) +{ printShortDescription(0, 6); - if (systemSettings.cutoutSetting) { + if (systemSettings.cutoutSetting) + { OLED::printNumber(2 + systemSettings.cutoutSetting, 1); OLED::print(SymbolCellCount); - } else { + } + else + { OLED::print(SymbolDC); } } #else -static bool settings_setInputPRange(void) { +static bool settings_setInputPRange(void) +{ systemSettings.cutoutSetting = (systemSettings.cutoutSetting + 1) % 2; return false; } -static void settings_displayInputPRange(void) { +static void settings_displayInputPRange(void) +{ printShortDescription(0, 5); //0 = 9V, 1=12V (Fixed Voltages, these imply 1.5A limits) // These are only used in QC3.0 modes - switch (systemSettings.cutoutSetting) { + switch (systemSettings.cutoutSetting) + { case 0: OLED::printNumber(9, 2); OLED::print(SymbolVolts); @@ -324,19 +343,21 @@ static void settings_displayInputPRange(void) { default: break; } - } #endif -static bool settings_setSleepTemp(void) { +static bool settings_setSleepTemp(void) +{ // If in C, 10 deg, if in F 20 deg #ifdef ENABLED_FAHRENHEIT_SUPPORT - if (systemSettings.temperatureInF) { + if (systemSettings.temperatureInF) + { systemSettings.SleepTemp += 20; if (systemSettings.SleepTemp > 580) - systemSettings.SleepTemp = 60; + systemSettings.SleepTemp = 60; return systemSettings.SleepTemp == 580; - } else + } + else #endif { systemSettings.SleepTemp += 10; @@ -346,70 +367,88 @@ static bool settings_setSleepTemp(void) { } } -static void settings_displaySleepTemp(void) { +static void settings_displaySleepTemp(void) +{ printShortDescription(1, 5); OLED::printNumber(systemSettings.SleepTemp, 3); } -static bool settings_setSleepTime(void) { - systemSettings.SleepTime++; // Go up 1 minute at a time - if (systemSettings.SleepTime >= 16) { - systemSettings.SleepTime = 0; // can't set time over 10 mins +static bool settings_setSleepTime(void) +{ + systemSettings.SleepTime++; // Go up 1 minute at a time + if (systemSettings.SleepTime >= 16) + { + systemSettings.SleepTime = 0; // can't set time over 10 mins } // Remember that ^ is the time of no movement if (PCBVersion == 3) - systemSettings.SleepTime = 0; // Disable sleep on no accel + systemSettings.SleepTime = 0; // Disable sleep on no accel return systemSettings.SleepTime == 15; } -static void settings_displaySleepTime(void) { +static void settings_displaySleepTime(void) +{ printShortDescription(2, 5); - if (systemSettings.SleepTime == 0) { + if (systemSettings.SleepTime == 0) + { OLED::print(OffString); - } else if (systemSettings.SleepTime < 6) { + } + else if (systemSettings.SleepTime < 6) + { OLED::printNumber(systemSettings.SleepTime * 10, 2); OLED::print(SymbolSeconds); - } else { + } + else + { OLED::printNumber(systemSettings.SleepTime - 5, 2); OLED::print(SymbolMinutes); } } -static bool settings_setShutdownTime(void) { +static bool settings_setShutdownTime(void) +{ systemSettings.ShutdownTime++; - if (systemSettings.ShutdownTime > 60) { - systemSettings.ShutdownTime = 0; // wrap to off + if (systemSettings.ShutdownTime > 60) + { + systemSettings.ShutdownTime = 0; // wrap to off } if (PCBVersion == 3) - systemSettings.ShutdownTime = 0; // Disable shutdown on no accel + systemSettings.ShutdownTime = 0; // Disable shutdown on no accel return systemSettings.ShutdownTime == 60; } -static void settings_displayShutdownTime(void) { +static void settings_displayShutdownTime(void) +{ printShortDescription(3, 5); - if (systemSettings.ShutdownTime == 0) { + if (systemSettings.ShutdownTime == 0) + { OLED::print(OffString); - } else { + } + else + { OLED::printNumber(systemSettings.ShutdownTime, 2); OLED::print(SymbolMinutes); } } #ifdef ENABLED_FAHRENHEIT_SUPPORT -static bool settings_setTempF(void) { +static bool settings_setTempF(void) +{ systemSettings.temperatureInF = !systemSettings.temperatureInF; - if (systemSettings.temperatureInF) { + if (systemSettings.temperatureInF) + { // Change sleep, boost and soldering temps to the F equiv // C to F == F= ( (C*9) +160)/5 systemSettings.BoostTemp = ((systemSettings.BoostTemp * 9) + 160) / 5; systemSettings.SolderingTemp = - ((systemSettings.SolderingTemp * 9) + 160) / 5; + ((systemSettings.SolderingTemp * 9) + 160) / 5; systemSettings.SleepTemp = ((systemSettings.SleepTemp * 9) + 160) / 5; - } else { + } + else + { // Change sleep, boost and soldering temps to the C equiv // F->C == C = ((F-32)*5)/9 systemSettings.BoostTemp = ((systemSettings.BoostTemp - 32) * 5) / 9; - systemSettings.SolderingTemp = ((systemSettings.SolderingTemp - 32) * 5) - / 9; + systemSettings.SolderingTemp = ((systemSettings.SolderingTemp - 32) * 5) / 9; systemSettings.SleepTemp = ((systemSettings.SleepTemp - 32) * 5) / 9; } // Rescale both to be multiples of 10 @@ -422,64 +461,77 @@ static bool settings_setTempF(void) { return false; } -static void settings_displayTempF(void) { +static void settings_displayTempF(void) +{ printShortDescription(5, 7); OLED::print((systemSettings.temperatureInF) ? SymbolDegF : SymbolDegC); } #endif -static bool settings_setSensitivity(void) { +static bool settings_setSensitivity(void) +{ systemSettings.sensitivity++; systemSettings.sensitivity = systemSettings.sensitivity % 10; return systemSettings.sensitivity == 9; } -static void settings_displaySensitivity(void) { +static void settings_displaySensitivity(void) +{ printShortDescription(4, 7); OLED::printNumber(systemSettings.sensitivity, 1, false); } -static bool settings_setAdvancedSolderingScreens(void) { +static bool settings_setAdvancedSolderingScreens(void) +{ systemSettings.detailedSoldering = !systemSettings.detailedSoldering; return false; } -static void settings_displayAdvancedSolderingScreens(void) { +static void settings_displayAdvancedSolderingScreens(void) +{ printShortDescription(14, 7); OLED::drawCheckbox(systemSettings.detailedSoldering); } -static bool settings_setAdvancedIDLEScreens(void) { +static bool settings_setAdvancedIDLEScreens(void) +{ systemSettings.detailedIDLE = !systemSettings.detailedIDLE; return false; } -static void settings_displayAdvancedIDLEScreens(void) { +static void settings_displayAdvancedIDLEScreens(void) +{ printShortDescription(6, 7); OLED::drawCheckbox(systemSettings.detailedIDLE); } -static bool settings_setPowerLimit(void) { +static bool settings_setPowerLimit(void) +{ systemSettings.powerLimit += POWER_LIMIT_STEPS; if (systemSettings.powerLimit > MAX_POWER_LIMIT) systemSettings.powerLimit = 0; return systemSettings.powerLimit + POWER_LIMIT_STEPS > MAX_POWER_LIMIT; } -static void settings_displayPowerLimit(void) { +static void settings_displayPowerLimit(void) +{ printShortDescription(20, 5); - if (systemSettings.powerLimit == 0) { + if (systemSettings.powerLimit == 0) + { OLED::print(OffString); - } else { + } + else + { OLED::printNumber(systemSettings.powerLimit, 2); OLED::print(SymbolWatts); } } -static bool settings_setScrollSpeed(void) { +static bool settings_setScrollSpeed(void) +{ if (systemSettings.descriptionScrollSpeed == 0) systemSettings.descriptionScrollSpeed = 1; else @@ -487,15 +539,18 @@ static bool settings_setScrollSpeed(void) { return false; } -static void settings_displayScrollSpeed(void) { +static void settings_displayScrollSpeed(void) +{ printShortDescription(15, 7); OLED::print((systemSettings.descriptionScrollSpeed) ? SettingFastChar : SettingSlowChar); } -static bool settings_setDisplayRotation(void) { +static bool settings_setDisplayRotation(void) +{ systemSettings.OrientationMode++; systemSettings.OrientationMode = systemSettings.OrientationMode % 3; - switch (systemSettings.OrientationMode) { + switch (systemSettings.OrientationMode) + { case 0: OLED::setRotation(false); break; @@ -511,10 +566,12 @@ static bool settings_setDisplayRotation(void) { return systemSettings.OrientationMode == 2; } -static void settings_displayDisplayRotation(void) { +static void settings_displayDisplayRotation(void) +{ printShortDescription(7, 7); - switch (systemSettings.OrientationMode) { + switch (systemSettings.OrientationMode) + { case 0: OLED::print(SettingRightChar); break; @@ -530,55 +587,71 @@ static void settings_displayDisplayRotation(void) { } } -static bool settings_setBoostTemp(void) { +static bool settings_setBoostTemp(void) +{ #ifdef ENABLED_FAHRENHEIT_SUPPORT - if (systemSettings.temperatureInF) { - if (systemSettings.BoostTemp == 0) { - systemSettings.BoostTemp = 480; // loop back at 480 - } else { - systemSettings.BoostTemp += 20; // Go up 20F at a time + if (systemSettings.temperatureInF) + { + if (systemSettings.BoostTemp == 0) + { + systemSettings.BoostTemp = 480; // loop back at 480 + } + else + { + systemSettings.BoostTemp += 20; // Go up 20F at a time } - if (systemSettings.BoostTemp > 850) { + if (systemSettings.BoostTemp > 850) + { systemSettings.BoostTemp = 0; // jump to off } return systemSettings.BoostTemp == 840; - } else + } + else #endif { - if (systemSettings.BoostTemp == 0) { - systemSettings.BoostTemp = 250; // loop back at 250 - - } else { - systemSettings.BoostTemp += 10; // Go up 10C at a time + if (systemSettings.BoostTemp == 0) + { + systemSettings.BoostTemp = 250; // loop back at 250 } - if (systemSettings.BoostTemp > 450) { - systemSettings.BoostTemp = 0; //Go to off state - + else + { + systemSettings.BoostTemp += 10; // Go up 10C at a time + } + if (systemSettings.BoostTemp > 450) + { + systemSettings.BoostTemp = 0; //Go to off state } return systemSettings.BoostTemp == 450; } } -static void settings_displayBoostTemp(void) { +static void settings_displayBoostTemp(void) +{ printShortDescription(8, 5); - if (systemSettings.BoostTemp) { + if (systemSettings.BoostTemp) + { OLED::printNumber(systemSettings.BoostTemp, 3); - } else { + } + else + { OLED::print(OffString); } } -static bool settings_setAutomaticStartMode(void) { +static bool settings_setAutomaticStartMode(void) +{ systemSettings.autoStartMode++; systemSettings.autoStartMode %= 4; return systemSettings.autoStartMode == 3; } -static void settings_displayAutomaticStartMode(void) { +static void settings_displayAutomaticStartMode(void) +{ printShortDescription(9, 7); - switch (systemSettings.autoStartMode) { + switch (systemSettings.autoStartMode) + { case 0: OLED::print(SettingStartNoneChar); break; @@ -597,19 +670,51 @@ static void settings_displayAutomaticStartMode(void) { } } -static bool settings_setCoolingBlinkEnabled(void) { +static bool settings_setLockingMode(void) +{ + systemSettings.lockingMode++; + systemSettings.lockingMode %= 3; + return systemSettings.lockingMode == 2; +} + +static void settings_displayLockingMode(void) +{ + printShortDescription(26, 7); + + switch (systemSettings.lockingMode) + { + case 0: + OLED::print(SettingLockDisableChar); + break; + case 1: + OLED::print(SettingLockBoostChar); + break; + case 2: + OLED::print(SettingLockFullChar); + break; + default: + OLED::print(SettingLockDisableChar); + break; + } +} + +static bool settings_setCoolingBlinkEnabled(void) +{ systemSettings.coolingTempBlink = !systemSettings.coolingTempBlink; return false; } -static void settings_displayCoolingBlinkEnabled(void) { +static void settings_displayCoolingBlinkEnabled(void) +{ printShortDescription(10, 7); OLED::drawCheckbox(systemSettings.coolingTempBlink); } -static bool settings_setResetSettings(void) { - if (userConfirmation(SettingsResetWarning)) { +static bool settings_setResetSettings(void) +{ + if (userConfirmation(SettingsResetWarning)) + { resetSettings(); OLED::setFont(0); @@ -617,24 +722,28 @@ static bool settings_setResetSettings(void) { OLED::print(ResetOKMessage); OLED::refresh(); - waitForButtonPressOrTimeout(2000); // 2 second timeout + waitForButtonPressOrTimeout(2000); // 2 second timeout } return false; } -static void settings_displayResetSettings(void) { +static void settings_displayResetSettings(void) +{ printShortDescription(12, 7); } -static void setTipOffset() { +static void setTipOffset() +{ systemSettings.CalibrationOffset = 0; // If the thermo-couple at the end of the tip, and the handle are at // equilibrium, then the output should be zero, as there is no temperature // differential. - while (systemSettings.CalibrationOffset == 0) { + while (systemSettings.CalibrationOffset == 0) + { uint32_t offset = 0; - for (uint8_t i = 0; i < 16; i++) { + for (uint8_t i = 0; i < 16; i++) + { offset += getTipRawTemp(1); // cycle through the filter a fair bit to ensure we're stable. OLED::clearScreen(); @@ -657,9 +766,11 @@ static void setTipOffset() { //Provide the user the option to tune their own tip if custom is selected //If not only do single point tuning as per usual -static bool settings_setCalibrate(void) { +static bool settings_setCalibrate(void) +{ - if (userConfirmation(SettingsCalibrationWarning)) { + if (userConfirmation(SettingsCalibrationWarning)) + { // User confirmed // So we now perform the actual calculation setTipOffset(); @@ -667,17 +778,20 @@ static bool settings_setCalibrate(void) { return false; } -static void settings_displayCalibrate(void) { +static void settings_displayCalibrate(void) +{ printShortDescription(11, 5); } -static bool settings_setCalibrateVIN(void) { +static bool settings_setCalibrateVIN(void) +{ // Jump to the voltage calibration subscreen OLED::setFont(0); OLED::clearScreen(); OLED::setCursor(0, 0); - for (;;) { + for (;;) + { OLED::setCursor(0, 0); OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) / 10, 2); OLED::print(SymbolDot); @@ -685,7 +799,8 @@ static bool settings_setCalibrateVIN(void) { OLED::print(SymbolVolts); ButtonState buttons = getButtonState(); - switch (buttons) { + switch (buttons) + { case BUTTON_F_SHORT: systemSettings.voltageDiv++; break; @@ -712,16 +827,22 @@ static bool settings_setCalibrateVIN(void) { osDelay(40); // Cap to sensible values -#if defined(MODEL_TS80)+defined(MODEL_TS80P)>0 - if (systemSettings.voltageDiv < 500) { +#if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0 + if (systemSettings.voltageDiv < 500) + { systemSettings.voltageDiv = 500; - } else if (systemSettings.voltageDiv > 900) { + } + else if (systemSettings.voltageDiv > 900) + { systemSettings.voltageDiv = 900; } #else - if (systemSettings.voltageDiv < 360) { + if (systemSettings.voltageDiv < 360) + { systemSettings.voltageDiv = 360; - } else if (systemSettings.voltageDiv > 520) { + } + else if (systemSettings.voltageDiv > 520) + { systemSettings.voltageDiv = 520; } #endif @@ -729,18 +850,21 @@ static bool settings_setCalibrateVIN(void) { return false; } -static bool settings_setTipGain(void) { +static bool settings_setTipGain(void) +{ OLED::setFont(0); OLED::clearScreen(); - for (;;) { + for (;;) + { OLED::setCursor(0, 0); OLED::printNumber(systemSettings.TipGain / 10, 2); OLED::print(SymbolDot); OLED::printNumber(systemSettings.TipGain % 10, 1); ButtonState buttons = getButtonState(); - switch (buttons) { + switch (buttons) + { case BUTTON_F_SHORT: systemSettings.TipGain -= 1; break; @@ -763,76 +887,94 @@ static bool settings_setTipGain(void) { osDelay(40); // Cap to sensible values - if (systemSettings.TipGain < 150) { + if (systemSettings.TipGain < 150) + { systemSettings.TipGain = 150; - } else if (systemSettings.TipGain > 300) { + } + else if (systemSettings.TipGain > 300) + { systemSettings.TipGain = 300; } } return false; } -static void settings_displayTipGain(void) { +static void settings_displayTipGain(void) +{ printShortDescription(25, 5); } -static bool settings_setReverseButtonTempChangeEnabled(void) { +static bool settings_setReverseButtonTempChangeEnabled(void) +{ systemSettings.ReverseButtonTempChangeEnabled = !systemSettings.ReverseButtonTempChangeEnabled; return false; } -static void settings_displayReverseButtonTempChangeEnabled(void) { +static void settings_displayReverseButtonTempChangeEnabled(void) +{ printShortDescription(21, 7); OLED::drawCheckbox(systemSettings.ReverseButtonTempChangeEnabled); } -static bool settings_setTempChangeShortStep(void) { +static bool settings_setTempChangeShortStep(void) +{ systemSettings.TempChangeShortStep += TEMP_CHANGE_SHORT_STEP; - if (systemSettings.TempChangeShortStep > TEMP_CHANGE_SHORT_STEP_MAX) { + if (systemSettings.TempChangeShortStep > TEMP_CHANGE_SHORT_STEP_MAX) + { systemSettings.TempChangeShortStep = TEMP_CHANGE_SHORT_STEP; // loop back at TEMP_CHANGE_SHORT_STEP_MAX } return systemSettings.TempChangeShortStep == TEMP_CHANGE_SHORT_STEP_MAX; } -static void settings_displayTempChangeShortStep(void) { +static void settings_displayTempChangeShortStep(void) +{ printShortDescription(22, 6); OLED::printNumber(systemSettings.TempChangeShortStep, 2); } -static bool settings_setTempChangeLongStep(void) { +static bool settings_setTempChangeLongStep(void) +{ systemSettings.TempChangeLongStep += TEMP_CHANGE_LONG_STEP; - if (systemSettings.TempChangeLongStep > TEMP_CHANGE_LONG_STEP_MAX) { + if (systemSettings.TempChangeLongStep > TEMP_CHANGE_LONG_STEP_MAX) + { systemSettings.TempChangeLongStep = TEMP_CHANGE_LONG_STEP; // loop back at TEMP_CHANGE_LONG_STEP_MAX } return systemSettings.TempChangeLongStep == TEMP_CHANGE_LONG_STEP_MAX; } -static void settings_displayTempChangeLongStep(void) { +static void settings_displayTempChangeLongStep(void) +{ printShortDescription(23, 6); OLED::printNumber(systemSettings.TempChangeLongStep, 2); } -static bool settings_setPowerPulse(void) { +static bool settings_setPowerPulse(void) +{ systemSettings.KeepAwakePulse += POWER_PULSE_INCREMENT; systemSettings.KeepAwakePulse %= POWER_PULSE_MAX; return systemSettings.KeepAwakePulse == POWER_PULSE_MAX - 1; } -static void settings_displayPowerPulse(void) { +static void settings_displayPowerPulse(void) +{ printShortDescription(24, 5); - if (systemSettings.KeepAwakePulse) { + if (systemSettings.KeepAwakePulse) + { OLED::printNumber(systemSettings.KeepAwakePulse / 10, 1); OLED::print(SymbolDot); OLED::printNumber(systemSettings.KeepAwakePulse % 10, 1); - } else { + } + else + { OLED::print(OffString); } - } #ifdef HALL_SENSOR -static void settings_displayHallEffect(void) { +static void settings_displayHallEffect(void) +{ printShortDescription(26, 7); - switch (systemSettings.hallEffectSensitivity) { + switch (systemSettings.hallEffectSensitivity) + { case 1: OLED::print(SettingSensitivityLow); break; @@ -848,7 +990,8 @@ static void settings_displayHallEffect(void) { break; } } -static bool settings_setHallEffect(void) { +static bool settings_setHallEffect(void) +{ //To keep life simpler for now, we have a few preset sensitivity levels // Off, Low, Medium, High systemSettings.hallEffectSensitivity++; @@ -856,52 +999,63 @@ static bool settings_setHallEffect(void) { return systemSettings.hallEffectSensitivity == 3; } #endif -static void displayMenu(size_t index) { -// Call into the menu +static void displayMenu(size_t index) +{ + // Call into the menu OLED::setFont(1); OLED::setCursor(0, 0); -// Draw title + // Draw title OLED::print(SettingsMenuEntries[index]); -// Draw symbol -// 16 pixel wide image -// 2 pixel wide scrolling indicator + // Draw symbol + // 16 pixel wide image + // 2 pixel wide scrolling indicator OLED::drawArea(96 - 16 - 2, 0, 16, 16, (&SettingsMenuIcons[(16 * 2) * index])); } -static void settings_displayCalibrateVIN(void) { +static void settings_displayCalibrateVIN(void) +{ printShortDescription(13, 5); } -static void settings_displaySolderingMenu(void) { +static void settings_displaySolderingMenu(void) +{ displayMenu(0); } -static bool settings_enterSolderingMenu(void) { +static bool settings_enterSolderingMenu(void) +{ gui_Menu(solderingMenu); return false; } -static void settings_displayPowerMenu(void) { +static void settings_displayPowerMenu(void) +{ displayMenu(1); } -static bool settings_enterPowerMenu(void) { +static bool settings_enterPowerMenu(void) +{ gui_Menu(PowerMenu); return false; } -static void settings_displayUIMenu(void) { +static void settings_displayUIMenu(void) +{ displayMenu(2); } -static bool settings_enterUIMenu(void) { +static bool settings_enterUIMenu(void) +{ gui_Menu(UIMenu); return false; } -static void settings_displayAdvancedMenu(void) { +static void settings_displayAdvancedMenu(void) +{ displayMenu(3); } -static bool settings_enterAdvancedMenu(void) { +static bool settings_enterAdvancedMenu(void) +{ gui_Menu(advancedMenu); return false; } -void gui_Menu(const menuitem *menu) { -// Draw the settings menu and provide iteration support etc +void gui_Menu(const menuitem *menu) +{ + // Draw the settings menu and provide iteration support etc uint8_t currentScreen = 0; uint32_t autoRepeatTimer = 0; uint8_t autoRepeatAcceleration = 0; @@ -916,12 +1070,14 @@ void gui_Menu(const menuitem *menu) { bool scrollBlink = false; bool lastValue = false; - for (uint8_t i = 0; menu[i].draw != NULL; i++) { + for (uint8_t i = 0; menu[i].draw != NULL; i++) + { scrollContentSize += 1; } -// Animated menu opening. - if (menu[currentScreen].draw != NULL) { + // Animated menu opening. + if (menu[currentScreen].draw != NULL) + { // This menu is drawn in a secondary framebuffer. // Then we play a transition from the current primary // framebuffer to the new buffer. @@ -935,12 +1091,14 @@ void gui_Menu(const menuitem *menu) { OLED::transitionSecondaryFramebuffer(true); } - while ((menu[currentScreen].draw != NULL) && earlyExit == false) { + while ((menu[currentScreen].draw != NULL) && earlyExit == false) + { OLED::setFont(0); OLED::setCursor(0, 0); // If the user has hesitated for >=3 seconds, show the long text // Otherwise "draw" the option - if ((xTaskGetTickCount() - lastButtonTime < 3000) || menu[currentScreen].description == NULL) { + if ((xTaskGetTickCount() - lastButtonTime < 3000) || menu[currentScreen].description == NULL) + { OLED::clearScreen(); menu[currentScreen].draw(); uint8_t indicatorHeight = OLED_HEIGHT / scrollContentSize; @@ -951,16 +1109,19 @@ void gui_Menu(const menuitem *menu) { OLED::drawScrollIndicator(position, indicatorHeight); lastOffset = -1; lcdRefresh = true; - } else { + } + else + { // Draw description if (descriptionStart == 0) descriptionStart = xTaskGetTickCount(); // lower the value - higher the speed int16_t descriptionWidth = - FONT_12_WIDTH * (strlen(menu[currentScreen].description) + 7); + FONT_12_WIDTH * (strlen(menu[currentScreen].description) + 7); int16_t descriptionOffset = ((xTaskGetTickCount() - descriptionStart) / (systemSettings.descriptionScrollSpeed == 1 ? 10 : 20)); - descriptionOffset %= descriptionWidth; // Roll around at the end - if (lastOffset != descriptionOffset) { + descriptionOffset %= descriptionWidth; // Roll around at the end + if (lastOffset != descriptionOffset) + { OLED::clearScreen(); OLED::setCursor((OLED_WIDTH - descriptionOffset), 0); OLED::print(menu[currentScreen].description); @@ -971,24 +1132,29 @@ void gui_Menu(const menuitem *menu) { ButtonState buttons = getButtonState(); - if (buttons != lastButtonState) { + if (buttons != lastButtonState) + { autoRepeatAcceleration = 0; lastButtonState = buttons; } - switch (buttons) { + switch (buttons) + { case BUTTON_BOTH: - earlyExit = true; // will make us exit next loop + earlyExit = true; // will make us exit next loop descriptionStart = 0; break; case BUTTON_F_SHORT: // increment - if (descriptionStart == 0) { - if (menu[currentScreen].incrementHandler != NULL) { + if (descriptionStart == 0) + { + if (menu[currentScreen].incrementHandler != NULL) + { enterGUIMenu = false; lastValue = menu[currentScreen].incrementHandler(); - if (enterGUIMenu) { + if (enterGUIMenu) + { OLED::useSecondaryFramebuffer(true); OLED::setFont(0); OLED::setCursor(0, 0); @@ -998,22 +1164,28 @@ void gui_Menu(const menuitem *menu) { OLED::transitionSecondaryFramebuffer(false); } enterGUIMenu = true; - } else { + } + else + { earlyExit = true; } - } else + } + else descriptionStart = 0; break; case BUTTON_B_SHORT: - if (descriptionStart == 0) { + if (descriptionStart == 0) + { currentScreen++; lastValue = false; - } else + } + else descriptionStart = 0; break; case BUTTON_F_LONG: - if ((int) (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration) > - PRESS_ACCEL_INTERVAL_MAX) { + if ((int)(xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration) > + PRESS_ACCEL_INTERVAL_MAX) + { if ((lastValue = menu[currentScreen].incrementHandler())) autoRepeatTimer = 1000; else @@ -1028,7 +1200,8 @@ void gui_Menu(const menuitem *menu) { break; case BUTTON_B_LONG: if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > - PRESS_ACCEL_INTERVAL_MAX) { + PRESS_ACCEL_INTERVAL_MAX) + { currentScreen++; autoRepeatTimer = xTaskGetTickCount(); descriptionStart = 0; @@ -1042,17 +1215,20 @@ void gui_Menu(const menuitem *menu) { } if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration) < - PRESS_ACCEL_INTERVAL_MIN) { + PRESS_ACCEL_INTERVAL_MIN) + { autoRepeatAcceleration = - PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN; + PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN; } - if (lcdRefresh) { - OLED::refresh(); // update the LCD + if (lcdRefresh) + { + OLED::refresh(); // update the LCD osDelay(40); lcdRefresh = false; } - if ((xTaskGetTickCount() - lastButtonTime) > (1000 * 30)) { + if ((xTaskGetTickCount() - lastButtonTime) > (1000 * 30)) + { // If user has not pressed any buttons in 30 seconds, exit back a menu layer // This will trickle the user back to the main screen eventually earlyExit = true; @@ -1061,7 +1237,8 @@ void gui_Menu(const menuitem *menu) { } } -void enterSettingsMenu() { - gui_Menu(rootSettingsMenu); // Call the root menu +void enterSettingsMenu() +{ + gui_Menu(rootSettingsMenu); // Call the root menu saveSettings(); } diff --git a/workspace/TS100/Core/Threads/GUIThread.cpp b/workspace/TS100/Core/Threads/GUIThread.cpp index af7d5cb7..006b0e65 100644 --- a/workspace/TS100/Core/Threads/GUIThread.cpp +++ b/workspace/TS100/Core/Threads/GUIThread.cpp @@ -432,8 +432,10 @@ static void gui_solderingMode(uint8_t jumpToSleep) { * PID control * --> Long hold back button to exit * --> Double button to exit + * --> Long hold double button to toggle key lock */ bool boostModeOn = false; + bool buttonsLocked = false; if (jumpToSleep) { if (gui_SolderingSleepingMode(jumpToSleep == 2)) { @@ -443,34 +445,86 @@ static void gui_solderingMode(uint8_t jumpToSleep) { } for (;;) { ButtonState buttons = getButtonState(); - switch (buttons) { - case BUTTON_NONE: - // stay - boostModeOn = false; - break; - case BUTTON_BOTH: - // exit - return; - break; - case BUTTON_B_LONG: - return; // exit on back long hold - break; - case BUTTON_F_LONG: - // if boost mode is enabled turn it on - if (systemSettings.BoostTemp) - boostModeOn = true; - break; - case BUTTON_F_SHORT: - case BUTTON_B_SHORT: { - uint16_t oldTemp = systemSettings.SolderingTemp; - gui_solderingTempAdjust(); // goto adjust temp mode - if (oldTemp != systemSettings.SolderingTemp) { - saveSettings(); // only save on change + if (buttonsLocked && (systemSettings.lockingMode != 0)) { // If buttons locked + switch (buttons) { + case BUTTON_NONE: + // stay + boostModeOn = false; + break; + case BUTTON_BOTH_LONG: + // Unlock buttons + buttonsLocked = false; + OLED::setCursor(0, 0); + OLED::clearScreen(); + OLED::setFont(0); + OLED::print(UnlockingKeysString); + OLED::refresh(); + waitForButtonPressOrTimeout(1000); + break; + case BUTTON_F_LONG: + // if boost mode is enabled turn it on + if (systemSettings.BoostTemp && (systemSettings.lockingMode == 1)) { + boostModeOn = true; + break; + }; + // fall through + case BUTTON_BOTH: + case BUTTON_B_LONG: + case BUTTON_F_SHORT: + case BUTTON_B_SHORT: + // Do nothing and display a lock warming + OLED::setCursor(0, 0); + OLED::clearScreen(); + OLED::setFont(0); + OLED::print(WarningKeysLockedString); + OLED::refresh(); + waitForButtonPressOrTimeout(500); + break; + default: + break; + } + } else { // Button not locked + switch (buttons) { + case BUTTON_NONE: + // stay + boostModeOn = false; + break; + case BUTTON_BOTH: + // exit + return; + break; + case BUTTON_B_LONG: + return; // exit on back long hold + break; + case BUTTON_F_LONG: + // if boost mode is enabled turn it on + if (systemSettings.BoostTemp) + boostModeOn = true; + break; + case BUTTON_F_SHORT: + case BUTTON_B_SHORT: { + uint16_t oldTemp = systemSettings.SolderingTemp; + gui_solderingTempAdjust(); // goto adjust temp mode + if (oldTemp != systemSettings.SolderingTemp) { + saveSettings(); // only save on change + } + } + break; + case BUTTON_BOTH_LONG: + if (systemSettings.lockingMode != 0) { + // Lock buttons + buttonsLocked = true; + OLED::setCursor(0, 0); + OLED::clearScreen(); + OLED::setFont(0); + OLED::print(LockingKeysString); + OLED::refresh(); + waitForButtonPressOrTimeout(1000); + } + break; + default: + break; } - } - break; - default: - break; } // else we update the screen information OLED::setCursor(0, 0); diff --git a/workspace/TS100/configuration.h b/workspace/TS100/configuration.h index 925b966e..a60d3c77 100644 --- a/workspace/TS100/configuration.h +++ b/workspace/TS100/configuration.h @@ -40,6 +40,16 @@ */ #define AUTO_START_MODE 0 // Default to none +/** + * Locking Mode + * When in soldering mode a long press on both keys toggle the lock of the buttons + * Possible values are: + * 0 - Desactivated + * 1 - Lock except boost + * 2 - Full lock + */ +#define LOCKING_MODE 0 // Default to desactivated for safety + /** * OLED Orientation *