me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pinecil

Browse Source
This commit is contained in:
Ben V. Brown
2020-11-01 14:16:00 +11:00
parent 7e4187e62d 0ffef8fd2d
commit 3aeab055bf
34 changed files with 1935 additions and 1297 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": "Изкл.", "OffString": "Изкл.",
"ResetOKMessage": "Нулиране завършено", "ResetOKMessage": "Нулиране завършено",
"YourGainMessage": "Усилване:", "YourGainMessage": "Усилване:",
"SettingsResetMessage": "Настройките бяха\nнулирани!" "SettingsResetMessage": "Настройките бяха\nнулирани!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "R", "SettingRightChar": "R",
@@ -38,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -259,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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 Executable file → Normal file
View File

@@ -23,7 +23,10 @@
"OffString": "Vyp", "OffString": "Vyp",
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Zisk:", "YourGainMessage": "Zisk:",
"SettingsResetMessage": "Tov. nas. obnov." "SettingsResetMessage": "Tov. nas. obnov.",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "P", "SettingRightChar": "P",
@@ -38,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -259,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "TipDisconnectedString": "TIP DISCONNECTED",
"SolderingAdvancedPowerPrompt": "Power: ", "SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off", "OffString": "Off",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "H", "SettingRightChar": "H",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "OffString": "Aus",
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your Gain:", "YourGainMessage": "Your Gain:",
"SettingsResetMessage": "Einstellungen\nzurück gesetzt!" "SettingsResetMessage": "Einstellungen\nzurück gesetzt!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "R", "SettingRightChar": "R",
@@ -39,7 +42,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -232,8 +238,7 @@
"Taste kurz?" "Taste kurz?"
], ],
"desc": "Temperaturwechselschritte bei kurzem Tastendruck!" "desc": "Temperaturwechselschritte bei kurzem Tastendruck!"
} },
,
"TempChangeLongStep": { "TempChangeLongStep": {
"text2": [ "text2": [
"T. Schritt", "T. Schritt",
@@ -261,6 +266,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "OffString": "Off",
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:", "YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!" "SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "R", "SettingRightChar": "R",
@@ -39,7 +42,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -260,6 +266,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "OffString": " No",
"ResetOKMessage": "Hecho. ", "ResetOKMessage": "Hecho. ",
"YourGainMessage": "Gananc.:", "YourGainMessage": "Gananc.:",
"SettingsResetMessage": "Ajustes borrados" "SettingsResetMessage": "Ajustes borrados",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "D", "SettingRightChar": "D",
@@ -38,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -259,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "TipDisconnectedString": "KÄRKI ON IRTI",
"SolderingAdvancedPowerPrompt": "Teho: ", "SolderingAdvancedPowerPrompt": "Teho: ",
"OffString": "OFF", "OffString": "OFF",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "O", "SettingRightChar": "O",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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!", "WarningSimpleString": "CHAUD!",
"WarningAdvancedString": "ATTENTION! CHAUD!", "WarningAdvancedString": "ATTENTION! CHAUD!",
"SleepingTipAdvancedString": "Panne:", "SleepingTipAdvancedString": "Panne:",
"IdleTipString": "Tip:", "IdleTipString": "Act:",
"IdleSetString": " Set:", "IdleSetString": " Reg:",
"TipDisconnectedString": "PANNE DÉBRANCHÉE", "TipDisconnectedString": "PANNE DÉBRANCHÉE",
"SolderingAdvancedPowerPrompt": "Puissance: ", "SolderingAdvancedPowerPrompt": "Puissance: ",
"OffString": "Off", "OffString": "Off",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Gain:",
"SettingsResetMessage": "Réglage réinit.!",
"LockingKeysString": "VERROUIL",
"UnlockingKeysString": "DEVERROU",
"WarningKeysLockedString": "! VERR.!"
}, },
"characters": { "characters": {
"SettingRightChar": "D", "SettingRightChar": "D",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -183,8 +191,8 @@
}, },
"TipModel": { "TipModel": {
"text2": [ "text2": [
"Panne", "Modèle de",
"Modèle" "la panne"
], ],
"desc": "Sélection du modèle de la panne" "desc": "Sélection du modèle de la panne"
}, },
@@ -212,44 +220,51 @@
"PowerLimit": { "PowerLimit": {
"text2": [ "text2": [
"Puissance", "Puissance",
"Limite" "limite"
], ],
"desc": "Puissance maximale utilisable <Watts>" "desc": "Puissance maximale utilisable <Watts>"
}, },
"ReverseButtonTempChange": { "ReverseButtonTempChange": {
"text2": [ "text2": [
"Key +-", "Inverser les",
"Inverser?" "touches + - ?"
], ],
"desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe." "desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe."
}, },
"TempChangeShortStep": { "TempChangeShortStep": {
"text2": [ "text2": [
"Temp change", "Incrément",
"Court?" "appui court"
], ],
"desc": "Incrément de changement de température sur appui court." "desc": "Incrément de changement de température sur appui court."
}, },
"TempChangeLongStep": { "TempChangeLongStep": {
"text2": [ "text2": [
"Temp change", "Incrément",
"Long?" "appui long"
], ],
"desc": "Incrément de changement de température sur appui long." "desc": "Incrément de changement de température sur appui long."
}, },
"PowerPulsePower": { "PowerPulsePower": {
"text2": [ "text2": [
"Power", "Puissance des",
"Pulse W" "impulsion W"
], ],
"desc": "Keep awake pulse power intensity" "desc": "Puissance des impulsions pour éviter la mise en veille des batteries"
}, },
"TipGain": { "TipGain": {
"text2": [ "text2": [
"Modify", "Modifier",
"tip gain" "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>"
}, },
"HallEffSensitivity": { "HallEffSensitivity": {
"text2": [ "text2": [

19
Translation Editor/translation_hr.json
View File

@@ -21,7 +21,12 @@
"TipDisconnectedString": "VRH NIJE SPOJEN!", "TipDisconnectedString": "VRH NIJE SPOJEN!",
"SolderingAdvancedPowerPrompt": "Snaga: ", "SolderingAdvancedPowerPrompt": "Snaga: ",
"OffString": "Off", "OffString": "Off",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "D", "SettingRightChar": "D",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "TipDisconnectedString": "HEGY LEVÉVE",
"SolderingAdvancedPowerPrompt": "Telj: ", "SolderingAdvancedPowerPrompt": "Telj: ",
"OffString": "Ki", "OffString": "Ki",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "J", "SettingRightChar": "J",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "OffString": "OFF",
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Guad.: ", "YourGainMessage": "Guad.: ",
"SettingsResetMessage": "Reset effettuato" "SettingsResetMessage": "Reset effettuato",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "D", "SettingRightChar": "D",
@@ -38,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -259,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "TipDisconnectedString": "ANTGAL ATJUNGTAS",
"SolderingAdvancedPowerPrompt": "Maitinimas: ", "SolderingAdvancedPowerPrompt": "Maitinimas: ",
"OffString": "Išj", "OffString": "Išj",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "D", "SettingRightChar": "D",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
} }
} }
} }

129
Translation Editor/translation_nl.json
View File

@@ -3,25 +3,30 @@
"languageLocalName": "Nederlands", "languageLocalName": "Nederlands",
"cyrillicGlyphs": false, "cyrillicGlyphs": false,
"messages": { "messages": {
"SettingsCalibrationDone": "Calibration done!", "SettingsCalibrationDone": "Calibratie klaar!",
"SettingsCalibrationWarning": "Zorg ervoor dat de soldeerpunt op kamertemperatuur is voor je verdergaat!", "SettingsCalibrationWarning": "Zorg ervoor dat te punt op kamertemperatuur is voor je verder gaat!",
"SettingsResetWarning": "Ben je zeker dat je alle instellingen naar de standaardwaardes wilt terugzetten?", "SettingsResetWarning": "Weet je zeker dat je de fabrieksinstellingen terug wil zetten?",
"UVLOWarningString": "DC LAAG", "UVLOWarningString": "DC Laag",
"UndervoltageString": "Onderspanning", "UndervoltageString": "Onderspanning",
"InputVoltageString": "Input V: ", "InputVoltageString": "Input V: ",
"WarningTipTempString": "Tip Temp: ", "WarningTipTempString": "Punt temp: ",
"BadTipString": "DEFECT", "BadTipString": "DEFECTE PUNT",
"SleepingSimpleString": "Zzz ", "SleepingSimpleString": "Zzzz",
"SleepingAdvancedString": "Slaapstand...", "SleepingAdvancedString": "Slaapstand...",
"WarningSimpleString": "HEET", "WarningSimpleString": "HEET!",
"WarningAdvancedString": "!!! TIP HEET !!!", "WarningAdvancedString": "!!! PUNT HOT !!!",
"SleepingTipAdvancedString": "Tip:", "SleepingTipAdvancedString": "Punt:",
"IdleTipString": "Tip:", "IdleTipString": "Punt:",
"IdleSetString": " Set:", "IdleSetString": " Zet:",
"TipDisconnectedString": "TIP LOSGEKOPPELD", "TipDisconnectedString": "PUNT LOSGEKOPPELT",
"SolderingAdvancedPowerPrompt": "vermogen: ", "SolderingAdvancedPowerPrompt": "Vermogen: ",
"OffString": "Off", "OffString": "Uit",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Niveau:",
"SettingsResetMessage": "Instellingen zijn\ngereset!",
"LockingKeysString": " GEBLOKKEERD",
"UnlockingKeysString": "GEDEBLOKKEERD",
"WarningKeysLockedString": "!GEBLOKKEERD!"
}, },
"characters": { "characters": {
"SettingRightChar": "R", "SettingRightChar": "R",
@@ -33,6 +38,9 @@
"SettingStartSleepChar": "S", "SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O", "SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F", "SettingStartNoneChar": "F",
"SettingLockDisableChar": "U",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V",
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
@@ -51,21 +59,21 @@
"Slaap", "Slaap",
"Modes" "Modes"
], ],
"desc": "Batterijbesparingsinstellingen" "desc": "Stroom besparings instellingen"
}, },
"UIMenu": { "UIMenu": {
"text2": [ "text2": [
"Gebruikers-", "Gebruikers-",
"Interface" "interface"
], ],
"desc": "Gebruikersinterface Instellingen" "desc": "Gebruikers-interface instellingen"
}, },
"AdvancedMenu": { "AdvancedMenu": {
"text2": [ "text2": [
"geavanceerde", "Geavanceerde",
"Instellingen" "Instellingen"
], ],
"desc": "geavanceerde Instellingen" "desc": "Geavanceerde Instellingen"
} }
}, },
"menuOptions": { "menuOptions": {
@@ -81,14 +89,14 @@
"Slaap", "Slaap",
"temp" "temp"
], ],
"desc": "Temperatuur in slaapstand <C>" "desc": "Temperatuur in slaapstand"
}, },
"SleepTimeout": { "SleepTimeout": {
"text2": [ "text2": [
"Slaap", "Slaap",
"time-out" "time-out"
], ],
"desc": "Slaapstand time-out <Minuten/Seconden>" "desc": "Slaap time-out <Minuten/Seconden>"
}, },
"ShutdownTimeout": { "ShutdownTimeout": {
"text2": [ "text2": [
@@ -102,7 +110,7 @@
"Bewegings-", "Bewegings-",
"gevoeligheid" "gevoeligheid"
], ],
"desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>" "desc": "Bewegingsgevoeligheid <0=uit 1=minst gevoelig 9=meest gevoelig>"
}, },
"TemperatureUnit": { "TemperatureUnit": {
"text2": [ "text2": [
@@ -114,30 +122,30 @@
"AdvancedIdle": { "AdvancedIdle": {
"text2": [ "text2": [
"Gedetailleerd", "Gedetailleerd",
"slaapscherm" "startscherm"
], ],
"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het slaapscherm." "desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het startscherm."
}, },
"DisplayRotation": { "DisplayRotation": {
"text2": [ "text2": [
"Scherm-", "Scherm-",
"oriëntatie" "oriëntatie"
], ],
"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>" "desc": "Schermoriëntatie <A=Automatisch L=Linkshandig R=Rechtshandig>"
}, },
"BoostTemperature": { "BoostTemperature": {
"text2": [ "text2": [
"Boost", "Boost",
"temp" "temp"
], ],
"desc": "Temperatuur in boostmodes" "desc": "Temperatuur in boostmode"
}, },
"AutoStart": { "AutoStart": {
"text2": [ "text2": [
"Auto", "Auto",
"start" "start"
], ],
"desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit" "desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. <T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit>"
}, },
"CooldownBlink": { "CooldownBlink": {
"text2": [ "text2": [
@@ -165,7 +173,7 @@
"Calibreer", "Calibreer",
"input-voltage?" "input-voltage?"
], ],
"desc": "VIN Calibreren. Knoppen lang ingedrukt houden om te bevestigen." "desc": "VIN Calibreren. <druk lang om te sluiten>."
}, },
"AdvancedSoldering": { "AdvancedSoldering": {
"text2": [ "text2": [
@@ -183,73 +191,73 @@
}, },
"TipModel": { "TipModel": {
"text2": [ "text2": [
"Tip", "Punt",
"Model" "Model"
], ],
"desc": "Tip Model selection" "desc": "Punt Model selecteren"
}, },
"SimpleCalibrationMode": { "SimpleCalibrationMode": {
"text2": [ "text2": [
"Simple", "Simpele",
"Calibration" "Calibratie"
], ],
"desc": "Simple Calibration using Hot water" "desc": "Simpele Calibratie met warm water"
}, },
"AdvancedCalibrationMode": { "AdvancedCalibrationMode": {
"text2": [ "text2": [
"Advanced", "Geavanceerde",
"Calibration" "Calibratie"
], ],
"desc": "Advanced calibration using thermocouple on the tip" "desc": "Geavanceerde calibratie met een thermokoppel op de punt"
}, },
"PowerInput": { "PowerInput": {
"text2": [ "text2": [
"Power", "Power",
"Wattage" "Wattage"
], ],
"desc": "Power Wattage of the power adapter used" "desc": "Wattage van de gebruikte voeding"
}, },
"PowerLimit": { "PowerLimit": {
"text2": [ "text2": [
"Power", "Vermogen",
"Limit" "limiet"
], ],
"desc": "Maximum power the iron can use <Watts>" "desc": "Maximaal vermogen <Watts>"
}, },
"ReverseButtonTempChange": { "ReverseButtonTempChange": {
"text2": [ "text2": [
"Key +-", "Draai",
"reverse?" "+ - knoppen om"
], ],
"desc": "Reverse the tip temperature change buttons plus minus assignment." "desc": "Keer de +- knoppen om de termperatuur van de punt te regelen om."
}, },
"TempChangeShortStep": { "TempChangeShortStep": {
"text2": [ "text2": [
"Temp change", "Temp veranderen",
"short?" "kort"
], ],
"desc": "Temperature change steps on short button press!" "desc": "Temperatuur verandering bij kort drukken"
}, },
"TempChangeLongStep": { "TempChangeLongStep": {
"text2": [ "text2": [
"Temp change", "Temp veranderen",
"long?" "lang"
], ],
"desc": "Temperature change steps on long button press!" "desc": "Temperatuur verandering bij lang drukken"
}, },
"PowerPulsePower": { "PowerPulsePower": {
"text2": [ "text2": [
"Power", "Vermogen",
"Pulse W" "Puls W"
], ],
"desc": "Keep awake pulse power intensity" "desc": "Vermogen van puls om soldeerbout aan te houden"
}, },
"TipGain": { "TipGain": {
"text2": [ "text2": [
"Modify", "Verander",
"tip gain" "punt gain"
], ],
"desc": "Tip gain" "desc": "Punt gain"
}, },
"HallEffSensitivity": { "HallEffSensitivity": {
"text2": [ "text2": [
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"LockingMode": {
"text2": [
"Blokkeer",
"knoppen"
],
"desc": "Tijdens solderen lang op beide knoppen drukken, blokkeert ze. <U=Uit, B=Alleen boost, V=Volledig blokkeren>"
} }
} }
} }

19
Translation Editor/translation_nl_be.json
View File

@@ -21,7 +21,12 @@
"TipDisconnectedString": "Punt ONTKOPPELD", "TipDisconnectedString": "Punt ONTKOPPELD",
"SolderingAdvancedPowerPrompt": "Vermogen: ", "SolderingAdvancedPowerPrompt": "Vermogen: ",
"OffString": "Uit", "OffString": "Uit",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "R", "SettingRightChar": "R",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "TipDisconnectedString": "SPISS FRAKOBLET",
"SolderingAdvancedPowerPrompt": "Effekt: ", "SolderingAdvancedPowerPrompt": "Effekt: ",
"OffString": "Av", "OffString": "Av",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "H", "SettingRightChar": "H",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "OffString": "Wyłącz",
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Twój zysk:", "YourGainMessage": "Twój zysk:",
"SettingsResetMessage": "Ustawienia zostały\nzresetowane!" "SettingsResetMessage": "Ustawienia zostały\nzresetowane!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "P", "SettingRightChar": "P",
@@ -39,7 +42,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -260,6 +266,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "TipDisconnectedString": "SEM PONTA",
"SolderingAdvancedPowerPrompt": "Power: ", "SolderingAdvancedPowerPrompt": "Power: ",
"OffString": "Off", "OffString": "Off",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "D", "SettingRightChar": "D",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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": "Выкл.", "OffString": "Выкл.",
"ResetOKMessage": "Сброс OK", "ResetOKMessage": "Сброс OK",
"YourGainMessage": "Прирост:", "YourGainMessage": "Прирост:",
"SettingsResetMessage": "Настройки сброшены!" "SettingsResetMessage": "Настройки сброшены!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "П", "SettingRightChar": "П",
@@ -38,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -259,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "OffString": "Vyp",
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Zisk:", "YourGainMessage": "Zisk:",
"SettingsResetMessage": "Nast. Obnovené!" "SettingsResetMessage": "Nast. Obnovené!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "P", "SettingRightChar": "P",
@@ -38,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -259,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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č: ", "SolderingAdvancedPowerPrompt": "Moč: ",
"OffString": "Izk", "OffString": "Izk",
"ResetOKMessage": "Reset OK", "ResetOKMessage": "Reset OK",
"YourGainMessage": "Ojačan.:" "YourGainMessage": "Ojačan.:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "D", "SettingRightChar": "D",
@@ -37,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -258,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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": "ВРХ НИЈЕ СПОЈЕН", "TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
"SolderingAdvancedPowerPrompt": "Снага: ", "SolderingAdvancedPowerPrompt": "Снага: ",
"OffString": "Иск", "OffString": "Иск",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "Д", "SettingRightChar": "Д",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "TipDisconnectedString": "VRH NIJE SPOJEN",
"SolderingAdvancedPowerPrompt": "Snaga: ", "SolderingAdvancedPowerPrompt": "Snaga: ",
"OffString": "Isk", "OffString": "Isk",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "D", "SettingRightChar": "D",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "TipDisconnectedString": "SPETS URTAGEN",
"SolderingAdvancedPowerPrompt": "Ström: ", "SolderingAdvancedPowerPrompt": "Ström: ",
"OffString": "Av", "OffString": "Av",
"ResetOKMessage": "Reset OK" "ResetOKMessage": "Reset OK",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "H", "SettingRightChar": "H",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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", "TipDisconnectedString": "UÇ ÇIKARILDI",
"SolderingAdvancedPowerPrompt": "Güç: ", "SolderingAdvancedPowerPrompt": "Güç: ",
"OffString": "Kapalı", "OffString": "Kapalı",
"ResetOKMessage": "Reset Tamam" "ResetOKMessage": "Reset Tamam",
"YourGainMessage": "Your gain:",
"SettingsResetMessage": "Settings were\nreset!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "R", "SettingRightChar": "R",
@@ -36,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -257,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"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": "Вимк", "OffString": "Вимк",
"ResetOKMessage": "Скидання OK", "ResetOKMessage": "Скидання OK",
"YourGainMessage": "Приріст:", "YourGainMessage": "Приріст:",
"SettingsResetMessage": "Налаштування скинуті!" "SettingsResetMessage": "Налаштування скинуті!",
"LockingKeysString": " LOCKED",
"UnlockingKeysString": "UNLOCKED",
"WarningKeysLockedString": "!LOCKED!"
}, },
"characters": { "characters": {
"SettingRightChar": "П", "SettingRightChar": "П",
@@ -38,7 +41,10 @@
"SettingSensitivityOff": "O", "SettingSensitivityOff": "O",
"SettingSensitivityLow": "L", "SettingSensitivityLow": "L",
"SettingSensitivityMedium": "M", "SettingSensitivityMedium": "M",
"SettingSensitivityHigh":"H" "SettingSensitivityHigh": "H",
"SettingLockDisableChar": "D",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
}, },
"menuGroups": { "menuGroups": {
"SolderingMenu": { "SolderingMenu": {
@@ -259,6 +265,13 @@
"Sensitivity" "Sensitivity"
], ],
"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>" "desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
},
"LockingMode": {
"text2": [
"Allow buttons",
"locking"
],
"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
} }
} }
} }

33
Translation Editor/translations_def.js
View File

@@ -94,6 +94,21 @@ var def =
"id": "SettingsResetMessage", "id": "SettingsResetMessage",
"maxLen": 16, "maxLen": 16,
"default": "Settings were\nreset!" "default": "Settings were\nreset!"
},
{
"id": "LockingKeysString",
"maxLen": 8,
"default": "LOCKING"
},
{
"id": "UnlockingKeysString",
"maxLen": 8,
"default": "UNLOCK"
},
{
"id": "WarningKeysLockedString",
"maxLen": 8,
"default": "LOCKED!"
} }
], ],
"characters": [ "characters": [
@@ -148,6 +163,20 @@ var def =
{ {
"id": "SettingSensitivityHigh", "id": "SettingSensitivityHigh",
"len": 1 "len": 1
}, {
"id": "SettingLockDisableChar",
"len": 1,
"default": "D"
},
{
"id": "SettingLockBoostChar",
"len": 1,
"default": "B"
},
{
"id": "SettingLockFullChar",
"len": 1,
"default": "F"
} }
], ],
"menuGroups": [ "menuGroups": [
@@ -303,6 +332,10 @@ var def =
"id": "HallEffSensitivity", "id": "HallEffSensitivity",
"maxLen": 6, "maxLen": 6,
"maxLen2": 8 "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) else if (currentState == 0x02)
return BUTTON_B_LONG; return BUTTON_B_LONG;
else else
return BUTTON_NONE; // Both being held case, we dont long hold this return BUTTON_BOTH_LONG; // Both being held case
} else } else
return BUTTON_NONE; return BUTTON_NONE;
} else { } 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_F_LONG = 4, /* User is holding the front button*/
BUTTON_B_LONG = 8, /* User is holding the back button*/ BUTTON_B_LONG = 8, /* User is holding the back button*/
BUTTON_BOTH = 16, /* User has pressed both buttons*/ BUTTON_BOTH = 16, /* User has pressed both buttons*/
BUTTON_BOTH_LONG = 32, /* User is holding both buttons*/
/* /*
* Note: * Note:

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

@@ -11,7 +11,7 @@
#define SETTINGS_H_ #define SETTINGS_H_
#include <stdint.h> #include <stdint.h>
#include "unit.h" #include "unit.h"
#define SETTINGSVERSION ( 0x21 ) #define SETTINGSVERSION (0x22)
/*Change this if you change the struct below to prevent people getting \ /*Change this if you change the struct below to prevent people getting \
out of sync*/ out of sync*/
@@ -19,7 +19,8 @@
* This struct must be a multiple of 2 bytes as it is saved / restored from * This struct must be a multiple of 2 bytes as it is saved / restored from
* flash in uint16_t chunks * flash in uint16_t chunks
*/ */
typedef struct { typedef struct
{
uint8_t version; // Used to track if a reset is needed on firmware upgrade 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 SolderingTemp; // current set point for the iron
@@ -40,6 +41,7 @@ typedef struct {
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 #endif
uint8_t descriptionScrollSpeed : 1; // Description scroll speed 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) uint8_t KeepAwakePulse; // Keep Awake pulse power in 0.1 watts (10 = 1Watt)
uint16_t voltageDiv; // Voltage divisor factor uint16_t voltageDiv; // Voltage divisor factor
@@ -55,6 +57,7 @@ typedef struct {
uint16_t TempChangeLongStep; // 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 uint16_t TempChangeShortStep; // Change the plus and minus button assigment
uint8_t hallEffectSensitivity; //Operating mode of the hall effect sensor 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 uint32_t padding; // This is here for in case we are not an even divisor so
// that nothing gets cut off // that nothing gets cut off
//MUST BE LAST //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 * When SettingsShortNameType is SHORT_NAME_SINGLE_LINE
* use SettingsShortNames as SettingsShortNames[16][1].. second column undefined * use SettingsShortNames as SettingsShortNames[16][1].. second column undefined
*/ */
extern const char *SettingsShortNames[28][2]; extern const char *SettingsShortNames[29][2];
extern const char *SettingsDescriptions[28]; extern const char *SettingsDescriptions[29];
extern const char *SettingsMenuEntries[4]; extern const char *SettingsMenuEntries[4];
extern const char *SettingsCalibrationDone; extern const char *SettingsCalibrationDone;
@@ -41,6 +41,9 @@ extern const char *OffString;
extern const char *ResetOKMessage; extern const char *ResetOKMessage;
extern const char *YourGainMessage; extern const char *YourGainMessage;
extern const char *SettingsResetMessage; extern const char *SettingsResetMessage;
extern const char *LockingKeysString;
extern const char *UnlockingKeysString;
extern const char *WarningKeysLockedString;
extern const char *SettingTrueChar; extern const char *SettingTrueChar;
extern const char *SettingFalseChar; extern const char *SettingFalseChar;
@@ -55,6 +58,9 @@ extern const char *SettingSensitivityOff;
extern const char *SettingSensitivityLow; extern const char *SettingSensitivityLow;
extern const char *SettingSensitivityMedium; extern const char *SettingSensitivityMedium;
extern const char *SettingSensitivityHigh; extern const char *SettingSensitivityHigh;
extern const char *SettingLockDisableChar;
extern const char *SettingLockBoostChar;
extern const char *SettingLockFullChar;
extern const char *SettingFastChar; extern const char *SettingFastChar;
extern const char *SettingSlowChar; 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.ShutdownTime = SHUTDOWN_TIME; // How many minutes until the unit turns itself off
systemSettings.BoostTemp = BOOST_TEMP; // default to 400C systemSettings.BoostTemp = BOOST_TEMP; // default to 400C
systemSettings.autoStartMode = AUTO_START_MODE; // Auto start off for safety 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 systemSettings.coolingTempBlink = COOLING_TEMP_BLINK; // Blink the temperature on the cooling screen when its > 50C
#ifdef ENABLED_FAHRENHEIT_SUPPORT #ifdef ENABLED_FAHRENHEIT_SUPPORT
systemSettings.temperatureInF = TEMPERATURE_INF; // default to 0 systemSettings.temperatureInF = TEMPERATURE_INF; // default to 0

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

@@ -50,6 +50,8 @@ static bool settings_setBoostTemp(void);
static void settings_displayBoostTemp(void); static void settings_displayBoostTemp(void);
static bool settings_setAutomaticStartMode(void); static bool settings_setAutomaticStartMode(void);
static void settings_displayAutomaticStartMode(void); static void settings_displayAutomaticStartMode(void);
static bool settings_setLockingMode(void);
static void settings_displayLockingMode(void);
static bool settings_setCoolingBlinkEnabled(void); static bool settings_setCoolingBlinkEnabled(void);
static void settings_displayCoolingBlinkEnabled(void); static void settings_displayCoolingBlinkEnabled(void);
static bool settings_setResetSettings(void); static bool settings_setResetSettings(void);
@@ -91,6 +93,7 @@ static bool settings_enterAdvancedMenu(void);
* Auto Start * Auto Start
* Temp change short step * Temp change short step
* Temp change long step * Temp change long step
* Locking Mode
* *
* Power Saving * Power Saving
@@ -152,6 +155,7 @@ const menuitem solderingMenu[] = {
{(const char *)SettingsDescriptions[9], settings_setAutomaticStartMode, settings_displayAutomaticStartMode}, /*Auto start*/ {(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[22], settings_setTempChangeShortStep, settings_displayTempChangeShortStep}, /*Temp change short step*/
{(const char *)SettingsDescriptions[23], settings_setTempChangeLongStep, settings_displayTempChangeLongStep}, /*Temp change long 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 {NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE
}; };
const menuitem UIMenu[] = { const menuitem UIMenu[] = {
@@ -211,7 +215,8 @@ const menuitem advancedMenu[] = {
{NULL, NULL, NULL} // end of menu marker. DO NOT REMOVE {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::setFont(1);
OLED::setCharCursor(0, 0); OLED::setCharCursor(0, 0);
OLED::print(SettingsShortNames[shortDescIndex][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 * @param cursorCharPosition Custom cursor char position to set after printing
* description. * 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) // print short description (default single line, explicit double line)
printShortDescriptionDoubleLine(shortDescIndex); printShortDescriptionDoubleLine(shortDescIndex);
@@ -237,7 +243,8 @@ static void printShortDescription(uint32_t shortDescIndex, uint16_t cursorCharPo
OLED::setCursor(OLED::getCursorX() - 2, 0); 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); uint16_t messageWidth = FONT_12_WIDTH * (strlen(message) + 7);
uint32_t messageStart = xTaskGetTickCount(); uint32_t messageStart = xTaskGetTickCount();
@@ -246,11 +253,13 @@ static int userConfirmation(const char *message) {
int16_t lastOffset = -1; int16_t lastOffset = -1;
bool lcdRefresh = true; bool lcdRefresh = true;
for (;;) { for (;;)
{
int16_t messageOffset = ((xTaskGetTickCount() - messageStart) / (systemSettings.descriptionScrollSpeed == 1 ? 10 : 20)); 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(); OLED::clearScreen();
//^ Rolling offset based on time //^ Rolling offset based on time
@@ -261,7 +270,8 @@ static int userConfirmation(const char *message) {
} }
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
switch (buttons) { switch (buttons)
{
case BUTTON_F_SHORT: case BUTTON_F_SHORT:
// User confirmed // User confirmed
return 1; return 1;
@@ -276,7 +286,8 @@ static int userConfirmation(const char *message) {
return 0; return 0;
} }
if (lcdRefresh) { if (lcdRefresh)
{
OLED::refresh(); OLED::refresh();
osDelay(40); osDelay(40);
lcdRefresh = false; lcdRefresh = false;
@@ -285,34 +296,42 @@ static int userConfirmation(const char *message) {
return 0; return 0;
} }
#ifdef MODEL_TS100 #ifdef MODEL_TS100
static bool settings_setInputVRange(void) { static bool settings_setInputVRange(void)
{
systemSettings.cutoutSetting = (systemSettings.cutoutSetting + 1) % 5; systemSettings.cutoutSetting = (systemSettings.cutoutSetting + 1) % 5;
if (systemSettings.cutoutSetting) 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; return systemSettings.cutoutSetting == 4;
} }
static void settings_displayInputVRange(void) { static void settings_displayInputVRange(void)
{
printShortDescription(0, 6); printShortDescription(0, 6);
if (systemSettings.cutoutSetting) { if (systemSettings.cutoutSetting)
{
OLED::printNumber(2 + systemSettings.cutoutSetting, 1); OLED::printNumber(2 + systemSettings.cutoutSetting, 1);
OLED::print(SymbolCellCount); OLED::print(SymbolCellCount);
} else { }
else
{
OLED::print(SymbolDC); OLED::print(SymbolDC);
} }
} }
#else #else
static bool settings_setInputPRange(void) { static bool settings_setInputPRange(void)
{
systemSettings.cutoutSetting = (systemSettings.cutoutSetting + 1) % 2; systemSettings.cutoutSetting = (systemSettings.cutoutSetting + 1) % 2;
return false; return false;
} }
static void settings_displayInputPRange(void) { static void settings_displayInputPRange(void)
{
printShortDescription(0, 5); printShortDescription(0, 5);
//0 = 9V, 1=12V (Fixed Voltages, these imply 1.5A limits) //0 = 9V, 1=12V (Fixed Voltages, these imply 1.5A limits)
// These are only used in QC3.0 modes // These are only used in QC3.0 modes
switch (systemSettings.cutoutSetting) { switch (systemSettings.cutoutSetting)
{
case 0: case 0:
OLED::printNumber(9, 2); OLED::printNumber(9, 2);
OLED::print(SymbolVolts); OLED::print(SymbolVolts);
@@ -324,19 +343,21 @@ static void settings_displayInputPRange(void) {
default: default:
break; break;
} }
} }
#endif #endif
static bool settings_setSleepTemp(void) { static bool settings_setSleepTemp(void)
{
// If in C, 10 deg, if in F 20 deg // If in C, 10 deg, if in F 20 deg
#ifdef ENABLED_FAHRENHEIT_SUPPORT #ifdef ENABLED_FAHRENHEIT_SUPPORT
if (systemSettings.temperatureInF) { if (systemSettings.temperatureInF)
{
systemSettings.SleepTemp += 20; systemSettings.SleepTemp += 20;
if (systemSettings.SleepTemp > 580) if (systemSettings.SleepTemp > 580)
systemSettings.SleepTemp = 60; systemSettings.SleepTemp = 60;
return systemSettings.SleepTemp == 580; return systemSettings.SleepTemp == 580;
} else }
else
#endif #endif
{ {
systemSettings.SleepTemp += 10; systemSettings.SleepTemp += 10;
@@ -346,14 +367,17 @@ static bool settings_setSleepTemp(void) {
} }
} }
static void settings_displaySleepTemp(void) { static void settings_displaySleepTemp(void)
{
printShortDescription(1, 5); printShortDescription(1, 5);
OLED::printNumber(systemSettings.SleepTemp, 3); OLED::printNumber(systemSettings.SleepTemp, 3);
} }
static bool settings_setSleepTime(void) { static bool settings_setSleepTime(void)
{
systemSettings.SleepTime++; // Go up 1 minute at a time systemSettings.SleepTime++; // Go up 1 minute at a time
if (systemSettings.SleepTime >= 16) { if (systemSettings.SleepTime >= 16)
{
systemSettings.SleepTime = 0; // can't set time over 10 mins systemSettings.SleepTime = 0; // can't set time over 10 mins
} }
// Remember that ^ is the time of no movement // Remember that ^ is the time of no movement
@@ -362,22 +386,30 @@ static bool settings_setSleepTime(void) {
return systemSettings.SleepTime == 15; return systemSettings.SleepTime == 15;
} }
static void settings_displaySleepTime(void) { static void settings_displaySleepTime(void)
{
printShortDescription(2, 5); printShortDescription(2, 5);
if (systemSettings.SleepTime == 0) { if (systemSettings.SleepTime == 0)
{
OLED::print(OffString); OLED::print(OffString);
} else if (systemSettings.SleepTime < 6) { }
else if (systemSettings.SleepTime < 6)
{
OLED::printNumber(systemSettings.SleepTime * 10, 2); OLED::printNumber(systemSettings.SleepTime * 10, 2);
OLED::print(SymbolSeconds); OLED::print(SymbolSeconds);
} else { }
else
{
OLED::printNumber(systemSettings.SleepTime - 5, 2); OLED::printNumber(systemSettings.SleepTime - 5, 2);
OLED::print(SymbolMinutes); OLED::print(SymbolMinutes);
} }
} }
static bool settings_setShutdownTime(void) { static bool settings_setShutdownTime(void)
{
systemSettings.ShutdownTime++; systemSettings.ShutdownTime++;
if (systemSettings.ShutdownTime > 60) { if (systemSettings.ShutdownTime > 60)
{
systemSettings.ShutdownTime = 0; // wrap to off systemSettings.ShutdownTime = 0; // wrap to off
} }
if (PCBVersion == 3) if (PCBVersion == 3)
@@ -385,31 +417,38 @@ static bool settings_setShutdownTime(void) {
return systemSettings.ShutdownTime == 60; return systemSettings.ShutdownTime == 60;
} }
static void settings_displayShutdownTime(void) { static void settings_displayShutdownTime(void)
{
printShortDescription(3, 5); printShortDescription(3, 5);
if (systemSettings.ShutdownTime == 0) { if (systemSettings.ShutdownTime == 0)
{
OLED::print(OffString); OLED::print(OffString);
} else { }
else
{
OLED::printNumber(systemSettings.ShutdownTime, 2); OLED::printNumber(systemSettings.ShutdownTime, 2);
OLED::print(SymbolMinutes); OLED::print(SymbolMinutes);
} }
} }
#ifdef ENABLED_FAHRENHEIT_SUPPORT #ifdef ENABLED_FAHRENHEIT_SUPPORT
static bool settings_setTempF(void) { static bool settings_setTempF(void)
{
systemSettings.temperatureInF = !systemSettings.temperatureInF; systemSettings.temperatureInF = !systemSettings.temperatureInF;
if (systemSettings.temperatureInF) { if (systemSettings.temperatureInF)
{
// Change sleep, boost and soldering temps to the F equiv // Change sleep, boost and soldering temps to the F equiv
// C to F == F= ( (C*9) +160)/5 // C to F == F= ( (C*9) +160)/5
systemSettings.BoostTemp = ((systemSettings.BoostTemp * 9) + 160) / 5; systemSettings.BoostTemp = ((systemSettings.BoostTemp * 9) + 160) / 5;
systemSettings.SolderingTemp = systemSettings.SolderingTemp =
((systemSettings.SolderingTemp * 9) + 160) / 5; ((systemSettings.SolderingTemp * 9) + 160) / 5;
systemSettings.SleepTemp = ((systemSettings.SleepTemp * 9) + 160) / 5; systemSettings.SleepTemp = ((systemSettings.SleepTemp * 9) + 160) / 5;
} else { }
else
{
// Change sleep, boost and soldering temps to the C equiv // Change sleep, boost and soldering temps to the C equiv
// F->C == C = ((F-32)*5)/9 // F->C == C = ((F-32)*5)/9
systemSettings.BoostTemp = ((systemSettings.BoostTemp - 32) * 5) / 9; systemSettings.BoostTemp = ((systemSettings.BoostTemp - 32) * 5) / 9;
systemSettings.SolderingTemp = ((systemSettings.SolderingTemp - 32) * 5) systemSettings.SolderingTemp = ((systemSettings.SolderingTemp - 32) * 5) / 9;
/ 9;
systemSettings.SleepTemp = ((systemSettings.SleepTemp - 32) * 5) / 9; systemSettings.SleepTemp = ((systemSettings.SleepTemp - 32) * 5) / 9;
} }
// Rescale both to be multiples of 10 // Rescale both to be multiples of 10
@@ -422,64 +461,77 @@ static bool settings_setTempF(void) {
return false; return false;
} }
static void settings_displayTempF(void) { static void settings_displayTempF(void)
{
printShortDescription(5, 7); printShortDescription(5, 7);
OLED::print((systemSettings.temperatureInF) ? SymbolDegF : SymbolDegC); OLED::print((systemSettings.temperatureInF) ? SymbolDegF : SymbolDegC);
} }
#endif #endif
static bool settings_setSensitivity(void) { static bool settings_setSensitivity(void)
{
systemSettings.sensitivity++; systemSettings.sensitivity++;
systemSettings.sensitivity = systemSettings.sensitivity % 10; systemSettings.sensitivity = systemSettings.sensitivity % 10;
return systemSettings.sensitivity == 9; return systemSettings.sensitivity == 9;
} }
static void settings_displaySensitivity(void) { static void settings_displaySensitivity(void)
{
printShortDescription(4, 7); printShortDescription(4, 7);
OLED::printNumber(systemSettings.sensitivity, 1, false); OLED::printNumber(systemSettings.sensitivity, 1, false);
} }
static bool settings_setAdvancedSolderingScreens(void) { static bool settings_setAdvancedSolderingScreens(void)
{
systemSettings.detailedSoldering = !systemSettings.detailedSoldering; systemSettings.detailedSoldering = !systemSettings.detailedSoldering;
return false; return false;
} }
static void settings_displayAdvancedSolderingScreens(void) { static void settings_displayAdvancedSolderingScreens(void)
{
printShortDescription(14, 7); printShortDescription(14, 7);
OLED::drawCheckbox(systemSettings.detailedSoldering); OLED::drawCheckbox(systemSettings.detailedSoldering);
} }
static bool settings_setAdvancedIDLEScreens(void) { static bool settings_setAdvancedIDLEScreens(void)
{
systemSettings.detailedIDLE = !systemSettings.detailedIDLE; systemSettings.detailedIDLE = !systemSettings.detailedIDLE;
return false; return false;
} }
static void settings_displayAdvancedIDLEScreens(void) { static void settings_displayAdvancedIDLEScreens(void)
{
printShortDescription(6, 7); printShortDescription(6, 7);
OLED::drawCheckbox(systemSettings.detailedIDLE); OLED::drawCheckbox(systemSettings.detailedIDLE);
} }
static bool settings_setPowerLimit(void) { static bool settings_setPowerLimit(void)
{
systemSettings.powerLimit += POWER_LIMIT_STEPS; systemSettings.powerLimit += POWER_LIMIT_STEPS;
if (systemSettings.powerLimit > MAX_POWER_LIMIT) if (systemSettings.powerLimit > MAX_POWER_LIMIT)
systemSettings.powerLimit = 0; systemSettings.powerLimit = 0;
return systemSettings.powerLimit + POWER_LIMIT_STEPS > MAX_POWER_LIMIT; return systemSettings.powerLimit + POWER_LIMIT_STEPS > MAX_POWER_LIMIT;
} }
static void settings_displayPowerLimit(void) { static void settings_displayPowerLimit(void)
{
printShortDescription(20, 5); printShortDescription(20, 5);
if (systemSettings.powerLimit == 0) { if (systemSettings.powerLimit == 0)
{
OLED::print(OffString); OLED::print(OffString);
} else { }
else
{
OLED::printNumber(systemSettings.powerLimit, 2); OLED::printNumber(systemSettings.powerLimit, 2);
OLED::print(SymbolWatts); OLED::print(SymbolWatts);
} }
} }
static bool settings_setScrollSpeed(void) { static bool settings_setScrollSpeed(void)
{
if (systemSettings.descriptionScrollSpeed == 0) if (systemSettings.descriptionScrollSpeed == 0)
systemSettings.descriptionScrollSpeed = 1; systemSettings.descriptionScrollSpeed = 1;
else else
@@ -487,15 +539,18 @@ static bool settings_setScrollSpeed(void) {
return false; return false;
} }
static void settings_displayScrollSpeed(void) { static void settings_displayScrollSpeed(void)
{
printShortDescription(15, 7); printShortDescription(15, 7);
OLED::print((systemSettings.descriptionScrollSpeed) ? SettingFastChar : SettingSlowChar); OLED::print((systemSettings.descriptionScrollSpeed) ? SettingFastChar : SettingSlowChar);
} }
static bool settings_setDisplayRotation(void) { static bool settings_setDisplayRotation(void)
{
systemSettings.OrientationMode++; systemSettings.OrientationMode++;
systemSettings.OrientationMode = systemSettings.OrientationMode % 3; systemSettings.OrientationMode = systemSettings.OrientationMode % 3;
switch (systemSettings.OrientationMode) { switch (systemSettings.OrientationMode)
{
case 0: case 0:
OLED::setRotation(false); OLED::setRotation(false);
break; break;
@@ -511,10 +566,12 @@ static bool settings_setDisplayRotation(void) {
return systemSettings.OrientationMode == 2; return systemSettings.OrientationMode == 2;
} }
static void settings_displayDisplayRotation(void) { static void settings_displayDisplayRotation(void)
{
printShortDescription(7, 7); printShortDescription(7, 7);
switch (systemSettings.OrientationMode) { switch (systemSettings.OrientationMode)
{
case 0: case 0:
OLED::print(SettingRightChar); OLED::print(SettingRightChar);
break; break;
@@ -530,55 +587,71 @@ static void settings_displayDisplayRotation(void) {
} }
} }
static bool settings_setBoostTemp(void) { static bool settings_setBoostTemp(void)
{
#ifdef ENABLED_FAHRENHEIT_SUPPORT #ifdef ENABLED_FAHRENHEIT_SUPPORT
if (systemSettings.temperatureInF) { if (systemSettings.temperatureInF)
if (systemSettings.BoostTemp == 0) { {
if (systemSettings.BoostTemp == 0)
{
systemSettings.BoostTemp = 480; // loop back at 480 systemSettings.BoostTemp = 480; // loop back at 480
} else { }
else
{
systemSettings.BoostTemp += 20; // Go up 20F at a time systemSettings.BoostTemp += 20; // Go up 20F at a time
} }
if (systemSettings.BoostTemp > 850) { if (systemSettings.BoostTemp > 850)
{
systemSettings.BoostTemp = 0; // jump to off systemSettings.BoostTemp = 0; // jump to off
} }
return systemSettings.BoostTemp == 840; return systemSettings.BoostTemp == 840;
} else }
else
#endif #endif
{ {
if (systemSettings.BoostTemp == 0) { if (systemSettings.BoostTemp == 0)
{
systemSettings.BoostTemp = 250; // loop back at 250 systemSettings.BoostTemp = 250; // loop back at 250
}
} else { else
{
systemSettings.BoostTemp += 10; // Go up 10C at a time systemSettings.BoostTemp += 10; // Go up 10C at a time
} }
if (systemSettings.BoostTemp > 450) { if (systemSettings.BoostTemp > 450)
{
systemSettings.BoostTemp = 0; //Go to off state systemSettings.BoostTemp = 0; //Go to off state
} }
return systemSettings.BoostTemp == 450; return systemSettings.BoostTemp == 450;
} }
} }
static void settings_displayBoostTemp(void) { static void settings_displayBoostTemp(void)
{
printShortDescription(8, 5); printShortDescription(8, 5);
if (systemSettings.BoostTemp) { if (systemSettings.BoostTemp)
{
OLED::printNumber(systemSettings.BoostTemp, 3); OLED::printNumber(systemSettings.BoostTemp, 3);
} else { }
else
{
OLED::print(OffString); OLED::print(OffString);
} }
} }
static bool settings_setAutomaticStartMode(void) { static bool settings_setAutomaticStartMode(void)
{
systemSettings.autoStartMode++; systemSettings.autoStartMode++;
systemSettings.autoStartMode %= 4; systemSettings.autoStartMode %= 4;
return systemSettings.autoStartMode == 3; return systemSettings.autoStartMode == 3;
} }
static void settings_displayAutomaticStartMode(void) { static void settings_displayAutomaticStartMode(void)
{
printShortDescription(9, 7); printShortDescription(9, 7);
switch (systemSettings.autoStartMode) { switch (systemSettings.autoStartMode)
{
case 0: case 0:
OLED::print(SettingStartNoneChar); OLED::print(SettingStartNoneChar);
break; 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; systemSettings.coolingTempBlink = !systemSettings.coolingTempBlink;
return false; return false;
} }
static void settings_displayCoolingBlinkEnabled(void) { static void settings_displayCoolingBlinkEnabled(void)
{
printShortDescription(10, 7); printShortDescription(10, 7);
OLED::drawCheckbox(systemSettings.coolingTempBlink); OLED::drawCheckbox(systemSettings.coolingTempBlink);
} }
static bool settings_setResetSettings(void) { static bool settings_setResetSettings(void)
if (userConfirmation(SettingsResetWarning)) { {
if (userConfirmation(SettingsResetWarning))
{
resetSettings(); resetSettings();
OLED::setFont(0); OLED::setFont(0);
@@ -622,19 +727,23 @@ static bool settings_setResetSettings(void) {
return false; return false;
} }
static void settings_displayResetSettings(void) { static void settings_displayResetSettings(void)
{
printShortDescription(12, 7); printShortDescription(12, 7);
} }
static void setTipOffset() { static void setTipOffset()
{
systemSettings.CalibrationOffset = 0; systemSettings.CalibrationOffset = 0;
// If the thermo-couple at the end of the tip, and the handle are at // 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 // equilibrium, then the output should be zero, as there is no temperature
// differential. // differential.
while (systemSettings.CalibrationOffset == 0) { while (systemSettings.CalibrationOffset == 0)
{
uint32_t offset = 0; uint32_t offset = 0;
for (uint8_t i = 0; i < 16; i++) { for (uint8_t i = 0; i < 16; i++)
{
offset += getTipRawTemp(1); offset += getTipRawTemp(1);
// cycle through the filter a fair bit to ensure we're stable. // cycle through the filter a fair bit to ensure we're stable.
OLED::clearScreen(); OLED::clearScreen();
@@ -657,9 +766,11 @@ static void setTipOffset() {
//Provide the user the option to tune their own tip if custom is selected //Provide the user the option to tune their own tip if custom is selected
//If not only do single point tuning as per usual //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 // User confirmed
// So we now perform the actual calculation // So we now perform the actual calculation
setTipOffset(); setTipOffset();
@@ -667,17 +778,20 @@ static bool settings_setCalibrate(void) {
return false; return false;
} }
static void settings_displayCalibrate(void) { static void settings_displayCalibrate(void)
{
printShortDescription(11, 5); printShortDescription(11, 5);
} }
static bool settings_setCalibrateVIN(void) { static bool settings_setCalibrateVIN(void)
{
// Jump to the voltage calibration subscreen // Jump to the voltage calibration subscreen
OLED::setFont(0); OLED::setFont(0);
OLED::clearScreen(); OLED::clearScreen();
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
for (;;) { for (;;)
{
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) / 10, 2); OLED::printNumber(getInputVoltageX10(systemSettings.voltageDiv, 0) / 10, 2);
OLED::print(SymbolDot); OLED::print(SymbolDot);
@@ -685,7 +799,8 @@ static bool settings_setCalibrateVIN(void) {
OLED::print(SymbolVolts); OLED::print(SymbolVolts);
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
switch (buttons) { switch (buttons)
{
case BUTTON_F_SHORT: case BUTTON_F_SHORT:
systemSettings.voltageDiv++; systemSettings.voltageDiv++;
break; break;
@@ -713,15 +828,21 @@ static bool settings_setCalibrateVIN(void) {
// Cap to sensible values // Cap to sensible values
#if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0 #if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0
if (systemSettings.voltageDiv < 500) { if (systemSettings.voltageDiv < 500)
{
systemSettings.voltageDiv = 500; systemSettings.voltageDiv = 500;
} else if (systemSettings.voltageDiv > 900) { }
else if (systemSettings.voltageDiv > 900)
{
systemSettings.voltageDiv = 900; systemSettings.voltageDiv = 900;
} }
#else #else
if (systemSettings.voltageDiv < 360) { if (systemSettings.voltageDiv < 360)
{
systemSettings.voltageDiv = 360; systemSettings.voltageDiv = 360;
} else if (systemSettings.voltageDiv > 520) { }
else if (systemSettings.voltageDiv > 520)
{
systemSettings.voltageDiv = 520; systemSettings.voltageDiv = 520;
} }
#endif #endif
@@ -729,18 +850,21 @@ static bool settings_setCalibrateVIN(void) {
return false; return false;
} }
static bool settings_setTipGain(void) { static bool settings_setTipGain(void)
{
OLED::setFont(0); OLED::setFont(0);
OLED::clearScreen(); OLED::clearScreen();
for (;;) { for (;;)
{
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
OLED::printNumber(systemSettings.TipGain / 10, 2); OLED::printNumber(systemSettings.TipGain / 10, 2);
OLED::print(SymbolDot); OLED::print(SymbolDot);
OLED::printNumber(systemSettings.TipGain % 10, 1); OLED::printNumber(systemSettings.TipGain % 10, 1);
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
switch (buttons) { switch (buttons)
{
case BUTTON_F_SHORT: case BUTTON_F_SHORT:
systemSettings.TipGain -= 1; systemSettings.TipGain -= 1;
break; break;
@@ -763,76 +887,94 @@ static bool settings_setTipGain(void) {
osDelay(40); osDelay(40);
// Cap to sensible values // Cap to sensible values
if (systemSettings.TipGain < 150) { if (systemSettings.TipGain < 150)
{
systemSettings.TipGain = 150; systemSettings.TipGain = 150;
} else if (systemSettings.TipGain > 300) { }
else if (systemSettings.TipGain > 300)
{
systemSettings.TipGain = 300; systemSettings.TipGain = 300;
} }
} }
return false; return false;
} }
static void settings_displayTipGain(void) { static void settings_displayTipGain(void)
{
printShortDescription(25, 5); printShortDescription(25, 5);
} }
static bool settings_setReverseButtonTempChangeEnabled(void) { static bool settings_setReverseButtonTempChangeEnabled(void)
{
systemSettings.ReverseButtonTempChangeEnabled = !systemSettings.ReverseButtonTempChangeEnabled; systemSettings.ReverseButtonTempChangeEnabled = !systemSettings.ReverseButtonTempChangeEnabled;
return false; return false;
} }
static void settings_displayReverseButtonTempChangeEnabled(void) { static void settings_displayReverseButtonTempChangeEnabled(void)
{
printShortDescription(21, 7); printShortDescription(21, 7);
OLED::drawCheckbox(systemSettings.ReverseButtonTempChangeEnabled); OLED::drawCheckbox(systemSettings.ReverseButtonTempChangeEnabled);
} }
static bool settings_setTempChangeShortStep(void) { static bool settings_setTempChangeShortStep(void)
{
systemSettings.TempChangeShortStep += TEMP_CHANGE_SHORT_STEP; 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 systemSettings.TempChangeShortStep = TEMP_CHANGE_SHORT_STEP; // loop back at TEMP_CHANGE_SHORT_STEP_MAX
} }
return systemSettings.TempChangeShortStep == 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); printShortDescription(22, 6);
OLED::printNumber(systemSettings.TempChangeShortStep, 2); OLED::printNumber(systemSettings.TempChangeShortStep, 2);
} }
static bool settings_setTempChangeLongStep(void) { static bool settings_setTempChangeLongStep(void)
{
systemSettings.TempChangeLongStep += TEMP_CHANGE_LONG_STEP; 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 systemSettings.TempChangeLongStep = TEMP_CHANGE_LONG_STEP; // loop back at TEMP_CHANGE_LONG_STEP_MAX
} }
return systemSettings.TempChangeLongStep == 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); printShortDescription(23, 6);
OLED::printNumber(systemSettings.TempChangeLongStep, 2); OLED::printNumber(systemSettings.TempChangeLongStep, 2);
} }
static bool settings_setPowerPulse(void) { static bool settings_setPowerPulse(void)
{
systemSettings.KeepAwakePulse += POWER_PULSE_INCREMENT; systemSettings.KeepAwakePulse += POWER_PULSE_INCREMENT;
systemSettings.KeepAwakePulse %= POWER_PULSE_MAX; systemSettings.KeepAwakePulse %= POWER_PULSE_MAX;
return systemSettings.KeepAwakePulse == POWER_PULSE_MAX - 1; return systemSettings.KeepAwakePulse == POWER_PULSE_MAX - 1;
} }
static void settings_displayPowerPulse(void) { static void settings_displayPowerPulse(void)
{
printShortDescription(24, 5); printShortDescription(24, 5);
if (systemSettings.KeepAwakePulse) { if (systemSettings.KeepAwakePulse)
{
OLED::printNumber(systemSettings.KeepAwakePulse / 10, 1); OLED::printNumber(systemSettings.KeepAwakePulse / 10, 1);
OLED::print(SymbolDot); OLED::print(SymbolDot);
OLED::printNumber(systemSettings.KeepAwakePulse % 10, 1); OLED::printNumber(systemSettings.KeepAwakePulse % 10, 1);
} else { }
else
{
OLED::print(OffString); OLED::print(OffString);
} }
} }
#ifdef HALL_SENSOR #ifdef HALL_SENSOR
static void settings_displayHallEffect(void) { static void settings_displayHallEffect(void)
{
printShortDescription(26, 7); printShortDescription(26, 7);
switch (systemSettings.hallEffectSensitivity) { switch (systemSettings.hallEffectSensitivity)
{
case 1: case 1:
OLED::print(SettingSensitivityLow); OLED::print(SettingSensitivityLow);
break; break;
@@ -848,7 +990,8 @@ static void settings_displayHallEffect(void) {
break; break;
} }
} }
static bool settings_setHallEffect(void) { static bool settings_setHallEffect(void)
{
//To keep life simpler for now, we have a few preset sensitivity levels //To keep life simpler for now, we have a few preset sensitivity levels
// Off, Low, Medium, High // Off, Low, Medium, High
systemSettings.hallEffectSensitivity++; systemSettings.hallEffectSensitivity++;
@@ -856,7 +999,8 @@ static bool settings_setHallEffect(void) {
return systemSettings.hallEffectSensitivity == 3; return systemSettings.hallEffectSensitivity == 3;
} }
#endif #endif
static void displayMenu(size_t index) { static void displayMenu(size_t index)
{
// Call into the menu // Call into the menu
OLED::setFont(1); OLED::setFont(1);
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
@@ -868,39 +1012,49 @@ static void displayMenu(size_t index) {
OLED::drawArea(96 - 16 - 2, 0, 16, 16, (&SettingsMenuIcons[(16 * 2) * index])); 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); printShortDescription(13, 5);
} }
static void settings_displaySolderingMenu(void) { static void settings_displaySolderingMenu(void)
{
displayMenu(0); displayMenu(0);
} }
static bool settings_enterSolderingMenu(void) { static bool settings_enterSolderingMenu(void)
{
gui_Menu(solderingMenu); gui_Menu(solderingMenu);
return false; return false;
} }
static void settings_displayPowerMenu(void) { static void settings_displayPowerMenu(void)
{
displayMenu(1); displayMenu(1);
} }
static bool settings_enterPowerMenu(void) { static bool settings_enterPowerMenu(void)
{
gui_Menu(PowerMenu); gui_Menu(PowerMenu);
return false; return false;
} }
static void settings_displayUIMenu(void) { static void settings_displayUIMenu(void)
{
displayMenu(2); displayMenu(2);
} }
static bool settings_enterUIMenu(void) { static bool settings_enterUIMenu(void)
{
gui_Menu(UIMenu); gui_Menu(UIMenu);
return false; return false;
} }
static void settings_displayAdvancedMenu(void) { static void settings_displayAdvancedMenu(void)
{
displayMenu(3); displayMenu(3);
} }
static bool settings_enterAdvancedMenu(void) { static bool settings_enterAdvancedMenu(void)
{
gui_Menu(advancedMenu); gui_Menu(advancedMenu);
return false; return false;
} }
void gui_Menu(const menuitem *menu) { void gui_Menu(const menuitem *menu)
{
// Draw the settings menu and provide iteration support etc // Draw the settings menu and provide iteration support etc
uint8_t currentScreen = 0; uint8_t currentScreen = 0;
uint32_t autoRepeatTimer = 0; uint32_t autoRepeatTimer = 0;
@@ -916,12 +1070,14 @@ void gui_Menu(const menuitem *menu) {
bool scrollBlink = false; bool scrollBlink = false;
bool lastValue = 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; scrollContentSize += 1;
} }
// Animated menu opening. // Animated menu opening.
if (menu[currentScreen].draw != NULL) { if (menu[currentScreen].draw != NULL)
{
// This menu is drawn in a secondary framebuffer. // This menu is drawn in a secondary framebuffer.
// Then we play a transition from the current primary // Then we play a transition from the current primary
// framebuffer to the new buffer. // framebuffer to the new buffer.
@@ -935,12 +1091,14 @@ void gui_Menu(const menuitem *menu) {
OLED::transitionSecondaryFramebuffer(true); OLED::transitionSecondaryFramebuffer(true);
} }
while ((menu[currentScreen].draw != NULL) && earlyExit == false) { while ((menu[currentScreen].draw != NULL) && earlyExit == false)
{
OLED::setFont(0); OLED::setFont(0);
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
// If the user has hesitated for >=3 seconds, show the long text // If the user has hesitated for >=3 seconds, show the long text
// Otherwise "draw" the option // Otherwise "draw" the option
if ((xTaskGetTickCount() - lastButtonTime < 3000) || menu[currentScreen].description == NULL) { if ((xTaskGetTickCount() - lastButtonTime < 3000) || menu[currentScreen].description == NULL)
{
OLED::clearScreen(); OLED::clearScreen();
menu[currentScreen].draw(); menu[currentScreen].draw();
uint8_t indicatorHeight = OLED_HEIGHT / scrollContentSize; uint8_t indicatorHeight = OLED_HEIGHT / scrollContentSize;
@@ -951,7 +1109,9 @@ void gui_Menu(const menuitem *menu) {
OLED::drawScrollIndicator(position, indicatorHeight); OLED::drawScrollIndicator(position, indicatorHeight);
lastOffset = -1; lastOffset = -1;
lcdRefresh = true; lcdRefresh = true;
} else { }
else
{
// Draw description // Draw description
if (descriptionStart == 0) if (descriptionStart == 0)
descriptionStart = xTaskGetTickCount(); descriptionStart = xTaskGetTickCount();
@@ -960,7 +1120,8 @@ void gui_Menu(const menuitem *menu) {
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)); int16_t descriptionOffset = ((xTaskGetTickCount() - descriptionStart) / (systemSettings.descriptionScrollSpeed == 1 ? 10 : 20));
descriptionOffset %= descriptionWidth; // Roll around at the end descriptionOffset %= descriptionWidth; // Roll around at the end
if (lastOffset != descriptionOffset) { if (lastOffset != descriptionOffset)
{
OLED::clearScreen(); OLED::clearScreen();
OLED::setCursor((OLED_WIDTH - descriptionOffset), 0); OLED::setCursor((OLED_WIDTH - descriptionOffset), 0);
OLED::print(menu[currentScreen].description); OLED::print(menu[currentScreen].description);
@@ -971,24 +1132,29 @@ void gui_Menu(const menuitem *menu) {
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
if (buttons != lastButtonState) { if (buttons != lastButtonState)
{
autoRepeatAcceleration = 0; autoRepeatAcceleration = 0;
lastButtonState = buttons; lastButtonState = buttons;
} }
switch (buttons) { switch (buttons)
{
case BUTTON_BOTH: case BUTTON_BOTH:
earlyExit = true; // will make us exit next loop earlyExit = true; // will make us exit next loop
descriptionStart = 0; descriptionStart = 0;
break; break;
case BUTTON_F_SHORT: case BUTTON_F_SHORT:
// increment // increment
if (descriptionStart == 0) { if (descriptionStart == 0)
if (menu[currentScreen].incrementHandler != NULL) { {
if (menu[currentScreen].incrementHandler != NULL)
{
enterGUIMenu = false; enterGUIMenu = false;
lastValue = menu[currentScreen].incrementHandler(); lastValue = menu[currentScreen].incrementHandler();
if (enterGUIMenu) { if (enterGUIMenu)
{
OLED::useSecondaryFramebuffer(true); OLED::useSecondaryFramebuffer(true);
OLED::setFont(0); OLED::setFont(0);
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
@@ -998,22 +1164,28 @@ void gui_Menu(const menuitem *menu) {
OLED::transitionSecondaryFramebuffer(false); OLED::transitionSecondaryFramebuffer(false);
} }
enterGUIMenu = true; enterGUIMenu = true;
} else { }
else
{
earlyExit = true; earlyExit = true;
} }
} else }
else
descriptionStart = 0; descriptionStart = 0;
break; break;
case BUTTON_B_SHORT: case BUTTON_B_SHORT:
if (descriptionStart == 0) { if (descriptionStart == 0)
{
currentScreen++; currentScreen++;
lastValue = false; lastValue = false;
} else }
else
descriptionStart = 0; descriptionStart = 0;
break; break;
case BUTTON_F_LONG: case BUTTON_F_LONG:
if ((int)(xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration) > if ((int)(xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration) >
PRESS_ACCEL_INTERVAL_MAX) { PRESS_ACCEL_INTERVAL_MAX)
{
if ((lastValue = menu[currentScreen].incrementHandler())) if ((lastValue = menu[currentScreen].incrementHandler()))
autoRepeatTimer = 1000; autoRepeatTimer = 1000;
else else
@@ -1028,7 +1200,8 @@ void gui_Menu(const menuitem *menu) {
break; break;
case BUTTON_B_LONG: case BUTTON_B_LONG:
if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration >
PRESS_ACCEL_INTERVAL_MAX) { PRESS_ACCEL_INTERVAL_MAX)
{
currentScreen++; currentScreen++;
autoRepeatTimer = xTaskGetTickCount(); autoRepeatTimer = xTaskGetTickCount();
descriptionStart = 0; descriptionStart = 0;
@@ -1042,17 +1215,20 @@ void gui_Menu(const menuitem *menu) {
} }
if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration) < if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration) <
PRESS_ACCEL_INTERVAL_MIN) { PRESS_ACCEL_INTERVAL_MIN)
{
autoRepeatAcceleration = autoRepeatAcceleration =
PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN; PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
} }
if (lcdRefresh) { if (lcdRefresh)
{
OLED::refresh(); // update the LCD OLED::refresh(); // update the LCD
osDelay(40); osDelay(40);
lcdRefresh = false; 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 // 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 // This will trickle the user back to the main screen eventually
earlyExit = true; earlyExit = true;
@@ -1061,7 +1237,8 @@ void gui_Menu(const menuitem *menu) {
} }
} }
void enterSettingsMenu() { void enterSettingsMenu()
{
gui_Menu(rootSettingsMenu); // Call the root menu gui_Menu(rootSettingsMenu); // Call the root menu
saveSettings(); saveSettings();
} }

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

@@ -432,8 +432,10 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
* PID control * PID control
* --> Long hold back button to exit * --> Long hold back button to exit
* --> Double button to exit * --> Double button to exit
* --> Long hold double button to toggle key lock
*/ */
bool boostModeOn = false; bool boostModeOn = false;
bool buttonsLocked = false;
if (jumpToSleep) { if (jumpToSleep) {
if (gui_SolderingSleepingMode(jumpToSleep == 2)) { if (gui_SolderingSleepingMode(jumpToSleep == 2)) {
@@ -443,6 +445,45 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
} }
for (;;) { for (;;) {
ButtonState buttons = getButtonState(); 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) { switch (buttons) {
case BUTTON_NONE: case BUTTON_NONE:
// stay // stay
@@ -469,9 +510,22 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
} }
} }
break; 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: default:
break; break;
} }
}
// else we update the screen information // else we update the screen information
OLED::setCursor(0, 0); OLED::setCursor(0, 0);
OLED::clearScreen(); OLED::clearScreen();

10
workspace/TS100/configuration.h
View File

@@ -40,6 +40,16 @@
*/ */
#define AUTO_START_MODE 0 // Default to none #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 * OLED Orientation
* *