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

Locking Mode

Browse Source
This commit is contained in:
Mel-kior
2020-10-11 00:07:34 +02:00
parent 2112173214
commit f9813ec494
34 changed files with 1197 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Translation Editor/translation_bg.json
View File

@@ -23,7 +23,10 @@
"OffString": "Изкл.",
"ResetOKMessage": "Нулиране завършено",
"YourGainMessage": "Усилване:",
"SettingsResetMessage": "Настройките бяха\nнулирани!"
"SettingsResetMessage": "Настройките бяха\nнулирани!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
},
"characters": {
"SettingRightChar": "R",
@@ -34,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -248,6 +254,13 @@
"сила връх"
],
"desc": "Усилване на върха на поялника"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

17
Translation Editor/translation_cs.json
View File

@@ -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",
@@ -34,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -248,6 +254,13 @@
"zisk hr."
],
"desc": "Zisk hrotu (měření)"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_da.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "L",
"SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "S"
"SettingStartNoneChar": "S",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

20
Translation Editor/translation_de.json
View File

@@ -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",
@@ -35,7 +38,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -228,8 +234,7 @@
"Taste kurz?"
],
"desc": "Temperaturwechselschritte bei kurzem Tastendruck!"
}
,
},
"TempChangeLongStep": {
"text2": [
"T. Schritt",
@@ -250,6 +255,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

17
Translation Editor/translation_en.json
View File

@@ -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",
@@ -35,7 +38,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -249,6 +255,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

17
Translation Editor/translation_es.json
View File

@@ -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",
@@ -34,7 +37,10 @@
"SettingStartSolderingChar": "S",
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "F",
"SettingStartNoneChar": "N"
"SettingStartNoneChar": "N",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -248,6 +254,13 @@
"de punta"
],
"desc": "Modificar el valor de ganancia de la punta."
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_fi.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

53
Translation Editor/translation_fr.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "A",
"SettingStartSleepChar": "V",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "D"
"SettingStartNoneChar": "D",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
},
"menuGroups": {
"SolderingMenu": {
@@ -179,8 +187,8 @@
},
"TipModel": {
"text2": [
"Panne",
"Modèle"
"Modèle de",
"la panne"
],
"desc": "Sélection du modèle de la panne"
},
@@ -208,44 +216,51 @@
"PowerLimit": {
"text2": [
"Puissance",
"Limite"
"limite"
],
"desc": "Puissance maximale utilisable <Watts>"
},
"ReverseButtonTempChange": {
"text2": [
"Key +-",
"Inverser?"
"Inverser les",
"touches + - ?"
],
"desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe."
},
"TempChangeShortStep": {
"text2": [
"Temp change",
"Court?"
"Incrément",
"appui court"
],
"desc": "Incrément de changement de température sur appui court."
},
"TempChangeLongStep": {
"text2": [
"Temp change",
"Long?"
"Incrément",
"appui long"
],
"desc": "Incrément de changement de température sur appui long."
},
"PowerPulsePower": {
"text2": [
"Power",
"Pulse W"
"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"
"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 <D=Désactiver, B=Boost seulement, V=Verr. total>"
}
}
}

19
Translation Editor/translation_hr.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_hu.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

17
Translation Editor/translation_it.json
View File

@@ -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",
@@ -34,7 +37,10 @@
"SettingStartSolderingChar": "A",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "D"
"SettingStartNoneChar": "D",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -248,6 +254,13 @@
"punta"
],
"desc": "Varia il guadagno della punta"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_lt.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_nl.json
View File

@@ -21,7 +21,12 @@
"TipDisconnectedString": "TIP LOSGEKOPPELD",
"SolderingAdvancedPowerPrompt": "vermogen: ",
"OffString": "Off",
"ResetOKMessage": "Reset OK"
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
},
"characters": {
"SettingRightChar": "R",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_nl_be.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_no.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "L",
"SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "I"
"SettingStartNoneChar": "I",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

17
Translation Editor/translation_pl.json
View File

@@ -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",
@@ -35,7 +38,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "B"
"SettingStartNoneChar": "B",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -249,6 +255,13 @@
"zysk grotu"
],
"desc": "Zysk grotu"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_pt.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

17
Translation Editor/translation_ru.json
View File

@@ -23,7 +23,10 @@
"OffString": "Выкл.",
"ResetOKMessage": "Сброс OK",
"YourGainMessage": "Прирост:",
"SettingsResetMessage": "Настройки сброшены!"
"SettingsResetMessage": "Настройки сброшены!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
},
"characters": {
"SettingRightChar": "П",
@@ -34,7 +37,10 @@
"SettingStartSolderingChar": "П",
"SettingStartSleepChar": "О",
"SettingStartSleepOffChar": "К",
"SettingStartNoneChar": "В"
"SettingStartNoneChar": "В",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -248,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

17
Translation Editor/translation_sk.json
View File

@@ -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",
@@ -34,7 +37,10 @@
"SettingStartSolderingChar": "S",
"SettingStartSleepChar": "K",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "N"
"SettingStartNoneChar": "N",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -248,6 +254,13 @@
"hrotu"
],
"desc": "Úprava zisku hrotu"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

18
Translation Editor/translation_sl.json
View File

@@ -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",
@@ -33,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -247,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_sr_cyrl.json
View File

@@ -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": "Д",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_sr_latn.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_sv.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

19
Translation Editor/translation_tr.json
View File

@@ -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",
@@ -32,7 +37,10 @@
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
"SettingStartNoneChar": "F",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -246,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

17
Translation Editor/translation_uk.json
View File

@@ -23,7 +23,10 @@
"OffString": "Вимк",
"ResetOKMessage": "Скидання OK",
"YourGainMessage": "Приріст:",
"SettingsResetMessage": "Налаштування скинуті!"
"SettingsResetMessage": "Налаштування скинуті!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
},
"characters": {
"SettingRightChar": "П",
@@ -34,7 +37,10 @@
"SettingStartSolderingChar": "П",
"SettingStartSleepChar": "О",
"SettingStartSleepOffChar": "К",
"SettingStartNoneChar": "В"
"SettingStartNoneChar": "В",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
},
"menuGroups": {
"SolderingMenu": {
@@ -248,6 +254,13 @@
"tip gain"
],
"desc": "Tip gain"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
}
}
}

35
Translation Editor/translations_def.js
View File

@@ -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": [
@@ -132,6 +147,21 @@ var def =
{
"id": "SettingStartNoneChar",
"len": 1
},
{
"id": "SettingLockDisableChar",
"len": 1,
"default": "D"
},
{
"id": "SettingLockBoostChar",
"len": 1,
"default": "B"
},
{
"id": "SettingLockFullChar",
"len": 1,
"default": "F"
}
],
"menuGroups": [
@@ -282,6 +312,11 @@ var def =
"id": "TipGain",
"maxLen": 6,
"maxLen2": 8
},
{
"id": "LockingMode",
"maxLen": 6,
"maxLen2": 13
}
]
}

2
workspace/TS100/Core/Drivers/Buttons.cpp
View File

@@ -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 {

1
workspace/TS100/Core/Drivers/Buttons.hpp
View File

@@ -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:

4
workspace/TS100/Core/Inc/Settings.h
View File

@@ -12,7 +12,7 @@
#include <stdint.h>
#include "stm32f1xx_hal.h"
#include "unit.h"
#define SETTINGSVERSION ( 0x21 )
#define SETTINGSVERSION ( 0x22 )
/*Change this if you change the struct below to prevent people getting \
out of sync*/
@@ -41,6 +41,7 @@ typedef struct {
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 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
@@ -56,6 +57,7 @@ typedef struct {
uint16_t TempChangeLongStep; // Change the plus and minus button assigment
uint16_t TempChangeShortStep; // Change the plus and minus button assigment
uint32_t padding; // This is here for in case we are not an even divisor so
// that nothing gets cut off
//MUST BE LAST

10
workspace/TS100/Core/Inc/Translation.h
View File

@@ -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;
@@ -51,6 +54,9 @@ extern const char *SettingStartSolderingChar;
extern const char *SettingStartSleepChar;
extern const char *SettingStartSleepOffChar;
extern const char *SettingStartNoneChar;
extern const char *SettingLockDisableChar;
extern const char *SettingLockBoostChar;
extern const char *SettingLockFullChar;
extern const char *SettingFastChar;
extern const char *SettingSlowChar;

1
workspace/TS100/Core/Src/Settings.cpp
View File

@@ -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

30
workspace/TS100/Core/Src/gui.cpp
View File

@@ -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);
@@ -88,6 +90,7 @@ static bool settings_enterAdvancedMenu(void);
* Auto Start
* Temp change short step
* Temp change long step
* Locking Mode
*
* Power Saving
@@ -156,6 +159,8 @@ const menuitem solderingMenu[] = {
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[] = {
@@ -620,6 +625,31 @@ static void settings_displayAutomaticStartMode(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;

54
workspace/TS100/Core/Threads/GUIThread.cpp
View File

@@ -409,8 +409,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;
uint32_t sleepThres = 0;
if (systemSettings.SleepTime < 6)
@@ -425,6 +427,45 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
}
for (;;) {
ButtonState buttons = getButtonState();
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
@@ -451,9 +492,22 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
}
}
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;
}
}
// else we update the screen information
OLED::setCursor(0, 0);
OLED::clearScreen();

10
workspace/TS100/configuration.h
View File

@@ -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
*