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 pull request #586 from GeminiServer/PR-#2-Temp-Steps-and-revert-buttons

Browse Source 
PR #2  - Tip temp change short and long press and reverse +- button
This commit is contained in:
Ben V. Brown
2020-03-17 23:16:47 +11:00
committed by GitHub
parent 6cfda182bd 070f909dab
commit 318b39a858
33 changed files with 6407 additions and 5524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Translation Editor/translation_bg.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_cs.json
View File

@@ -250,6 +250,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_da.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

99
Translation Editor/translation_de.json
View File

@@ -10,7 +10,7 @@
"UndervoltageString": "Unterspannung",
"InputVoltageString": "V Eingang: ",
"WarningTipTempString": "Temperatur: ",
"BadTipString": "DEFEKT",
"BadTipString": "Spitze Defekt",
"SleepingSimpleString": "Zzz ",
"SleepingAdvancedString": "Ruhemodus...",
"WarningSimpleString": "HEIß",
@@ -21,7 +21,9 @@
"TipDisconnectedString": "Spitze fehlt",
"SolderingAdvancedPowerPrompt": "Leistung: ",
"OffString": "Aus",
"ResetOKMessage": "Reset OK"
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your Gain:",
"SettingsResetMessage": "Einstellungen\nzurück gesetzt!"
},
"characters": {
"SettingRightChar": "R",
@@ -29,7 +31,7 @@
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S",
"SettingStartSolderingChar": "J",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
@@ -52,7 +54,7 @@
},
"UIMenu": {
"text2": [
"Menü-",
"Anzeige-",
"einstellungen"
],
"desc": "Menüeinstellungen"
@@ -60,14 +62,14 @@
"AdvancedMenu": {
"text2": [
"Erweiterte",
"Einstellungen"
"Optionen"
],
"desc": "Erweiterte Einstellungen"
}
},
"menuOptions": {
"PowerSource": {
"text": "",
"text": "PWRSC",
"text2": [
"Spannungs-",
"quelle"
@@ -75,15 +77,15 @@
"desc": "Spannungsquelle (Abschaltspannung) <DC=10V, nS=n*3.3V für n LiIon-Zellen>"
},
"SleepTemperature": {
"text": "",
"text": "STMP",
"text2": [
"Ruhetemp-",
"eratur"
],
"desc": "Ruhetemperatur (In der eingestellten Einheit)"
"desc": "Ruhetemperatur"
},
"SleepTimeout": {
"text": "",
"text": "STME",
"text2": [
"Ruhever-",
"zögerung"
@@ -91,7 +93,7 @@
"desc": "Ruhemodus nach <Sekunden/Minuten>"
},
"ShutdownTimeout": {
"text": "",
"text": "SHTME",
"text2": [
"Abschalt-",
"zeit"
@@ -99,7 +101,7 @@
"desc": "Abschalten nach <Minuten>"
},
"MotionSensitivity": {
"text": "",
"text": "MSENSE",
"text2": [
"Bewegungs-",
"empfindlichk."
@@ -107,7 +109,7 @@
"desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>"
},
"TemperatureUnit": {
"text": "",
"text": "TMPUNT",
"text2": [
"Temperatur-",
"einheit"
@@ -115,15 +117,15 @@
"desc": "Temperatureinheit <C=Celsius, F=Fahrenheit>"
},
"AdvancedIdle": {
"text": "",
"text": "ADVIDL",
"text2": [
"Detaillierte",
"Ruheansicht"
],
"desc": "Detaillierte Anzeige im Ruhemodus <J=An, N=Aus>"
"desc": "Detaillierte Anzeige im Ruhemodus"
},
"DisplayRotation": {
"text": "",
"text": "DSPROT",
"text2": [
"Anzeige-",
"ausrichtung"
@@ -131,15 +133,15 @@
"desc": "Ausrichtung der Anzeige <A=Automatisch, L=Linkshändig, R=Rechtshändig>"
},
"BoostEnabled": {
"text": "",
"text": "BOOST",
"text2": [
"Boosttaste",
"aktiv?"
],
"desc": "Vordere Taste für Temperaturboost verwenden <J=An, N=Aus>"
"desc": "Vordere Taste lange drücken für Temperatur-Boostmodus beim Löten"
},
"BoostTemperature": {
"text": "",
"text": "BTMP",
"text2": [
"Boosttemp-",
"eratur"
@@ -147,23 +149,23 @@
"desc": "Temperatur im Boostmodus (In der eingestellten Einheit)"
},
"AutoStart": {
"text": "",
"text": "ASTART",
"text2": [
"Start im",
"Lötmodus?"
],
"desc": "Automatischer Start des Lötmodus beim Einschalten der Spannungsversorgung. <J=An, N=Aus>"
"desc": "Automatischer Start-Modus beim Einschalten der Spannungsversorgung. <T=Lötmodus S=Ruhezustand F=Aus>"
},
"CooldownBlink": {
"text": "",
"text": "CLBLNK",
"text2": [
"Abkühl-",
"blinken?"
],
"desc": "Blinkende Temperaturanzeige beim Abkühlen, solange heiß. <J=An, N=Aus>"
"desc": "Blinkende Temperaturanzeige beim Abkühlen, solange heiß ist."
},
"TemperatureCalibration": {
"text": "",
"text": "TMP CAL?",
"text2": [
"Temperatur",
"kalibrieren?"
@@ -171,15 +173,15 @@
"desc": "Kalibrierung der Lötspitzentemperatur"
},
"SettingsReset": {
"text": "",
"text": "RESET?",
"text2": [
"Einstellungen",
"zurücksetzen?"
],
"desc": "Alle Einstellungen zurücksetzen"
"desc": "Einstellungen auf werkseinstellungen zurück setzen"
},
"VoltageCalibration": {
"text": "",
"text": "CAL VIN?",
"text2": [
"Eingangsspannung",
"kalibrieren?"
@@ -187,20 +189,20 @@
"desc": "Kalibrierung der Eingangsspannung. Kurzer Tastendruck zum Einstellen, langer Tastendruck zum Verlassen."
},
"AdvancedSoldering": {
"text": "",
"text": "ADVSLD",
"text2": [
"Detaillierte",
"Lötansicht"
],
"desc": "Detaillierte Anzeige im Lötmodus <J=An, N=Aus>"
"desc": "Detaillierte Anzeige im Lötmodus"
},
"ScrollingSpeed": {
"text": "",
"text": "DESCSP",
"text2": [
"Scroll-",
"geschw."
],
"desc": "Scrollgeschwindigkeit der Texte"
"desc": "Scrollgeschwindigkeit der Texte <S=Langsam F=Schnell>"
},
"TipModel": {
"text": "TIPMO",
@@ -230,25 +232,50 @@
"text": "PWRW",
"text2": [
"Leistungs-",
"aufnahme"
"Aufnahme"
],
"desc": "Leistungsaufnahme der verwendeten Spannungsversorgung"
},
"PowerLimitEnable": {
"text": "PLIMEN",
"text2": [
"P Limit",
"Enable"
"Leistungs-",
"Limit An"
],
"desc": "Enable power limit"
"desc": "Leistungslimit aktivieren"
},
"PowerLimit": {
"text": "PLIM",
"text2": [
"Power",
"Leistungs-",
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
"desc": "Maximale aufnahme der Lötspitze <Watt>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Taste +-",
"Umkehren?"
],
"desc": "Temperatur-Änderungs-Tasten-Belegung Plus-Minus umkehren?"
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"T. Schritt",
"Taste kurz?"
],
"desc": "Temperaturwechselschritte bei kurzem Tastendruck!"
}
,
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"T. Schritt",
"Taste Lang?"
],
"desc": "Temperaturwechselschritte bei langem Tastendruck!"
}
}
}

24
Translation Editor/translation_en.json
View File

@@ -251,6 +251,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_es.json
View File

@@ -251,6 +251,30 @@
"potenc. máx."
],
"desc": "Elige el límite de potencia máxima del soldador <en vatios>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_fi.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_fr.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_hr.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_hu.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_it.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_lt.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_nl.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_nl_be.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_no.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_pl.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_pt.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_ru.json
View File

@@ -251,6 +251,30 @@
"мощность"
],
"desc": "Макс. мощность, которую может использовать паяльник <Ватт>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_sk.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_sl.json
View File

@@ -250,6 +250,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_sr_cyrl.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_sr_latn.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_sv.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_tr.json
View File

@@ -249,6 +249,30 @@
"Limit"
],
"desc": "Maximum power the iron can use <Watts>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

24
Translation Editor/translation_uk.json
View File

@@ -249,6 +249,30 @@
"потужність"
],
"desc": "Макс. потужність, яку може використовувати паяльник <Ват>"
},
"ReverseButtonTempChange": {
"text": "RVTCHG",
"text2": [
"Key +-",
"reverse?"
],
"desc": "Reverse the tip temperature change buttons plus minus assignment."
},
"TempChangeShortStep": {
"text": "TCHGST",
"text2": [
"Temp change",
"short?"
],
"desc": "Temperature change steps on short button press!"
},
"TempChangeLongStep": {
"text": "TCHGLT",
"text2": [
"Temp change",
"long?"
],
"desc": "Temperature change steps on long button press!"
}
}
}

15
Translation Editor/translations_def.js
View File

@@ -267,6 +267,21 @@ var def =
"id": "PowerLimit",
"maxLen": 5,
"maxLen2": 11
},
{
"id": "ReverseButtonTempChange",
"maxLen": 6,
"maxLen2": 16
},
{
"id": "TempChangeShortStep",
"maxLen": 8,
"maxLen2": 16
},
{
"id": "TempChangeLongStep",
"maxLen": 6,
"maxLen2": 16
}
]
}

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

@@ -11,7 +11,7 @@
#define SETTINGS_H_
#include <stdint.h>
#include "stm32f1xx_hal.h"
#define SETTINGSVERSION ( 0x1C )
#define SETTINGSVERSION ( 0x1D )
/*Change this if you change the struct below to prevent people getting \
out of sync*/
@@ -50,6 +50,10 @@ typedef struct {
uint8_t version; // Used to track if a reset is needed on firmware upgrade
uint32_t padding; // This is here for in case we are not an even divisor so
// that nothing gets cut off
uint8_t ReverseButtonTempChangeEnabled; // Change the plus and minus button assigment
uint16_t TempChangeLongStep; // Change the plus and minus button assigment
uint16_t TempChangeShortStep; // Change the plus and minus button assigment
} systemSettingsType;
extern volatile systemSettingsType systemSettings;

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

@@ -18,8 +18,8 @@ extern const uint8_t USER_FONT_6x8[];
* use SettingsShortNames as SettingsShortNames[16][1].. second column undefined
*/
extern const enum ShortNameType SettingsShortNameType;
extern const char *SettingsShortNames[23][2];
extern const char *SettingsDescriptions[23];
extern const char *SettingsShortNames[26][2];
extern const char *SettingsDescriptions[26];
extern const char *SettingsMenuEntries[4];
extern const char *SettingsCalibrationDone;

48
workspace/TS100/Core/Src/GUIThread.cpp
View File

@@ -17,6 +17,8 @@
#include "stm32f1xx_hal.h"
#include "string.h"
#include "TipThermoModel.h"
#include "../../configuration.h"
extern uint8_t PCBVersion;
// File local variables
extern uint32_t currentTempTargetDegC;
@@ -278,27 +280,36 @@ static void gui_solderingTempAdjust() {
// exit
return;
break;
case BUTTON_B_LONG:
case BUTTON_B_LONG:
if (xTaskGetTickCount() - autoRepeatTimer
+ autoRepeatAcceleration> PRESS_ACCEL_INTERVAL_MAX) {
systemSettings.SolderingTemp -= 10; // sub 10
if(systemSettings.ReverseButtonTempChangeEnabled) {
systemSettings.SolderingTemp += systemSettings.TempChangeLongStep;
} else systemSettings.SolderingTemp -= systemSettings.TempChangeLongStep;
autoRepeatTimer = xTaskGetTickCount();
autoRepeatAcceleration += PRESS_ACCEL_STEP;
}
break;
case BUTTON_B_SHORT:
if(systemSettings.ReverseButtonTempChangeEnabled) {
systemSettings.SolderingTemp += systemSettings.TempChangeShortStep;
} else systemSettings.SolderingTemp -= systemSettings.TempChangeShortStep;
break;
case BUTTON_F_LONG:
if (xTaskGetTickCount() - autoRepeatTimer
+ autoRepeatAcceleration> PRESS_ACCEL_INTERVAL_MAX) {
systemSettings.SolderingTemp += 10;
if(systemSettings.ReverseButtonTempChangeEnabled) {
systemSettings.SolderingTemp -= systemSettings.TempChangeLongStep;
} else systemSettings.SolderingTemp += systemSettings.TempChangeLongStep;
autoRepeatTimer = xTaskGetTickCount();
autoRepeatAcceleration += PRESS_ACCEL_STEP;
}
break;
case BUTTON_F_SHORT:
systemSettings.SolderingTemp += 10; // add 10
break;
case BUTTON_B_SHORT:
systemSettings.SolderingTemp -= 10; // sub 10
if(systemSettings.ReverseButtonTempChangeEnabled) {
systemSettings.SolderingTemp -= systemSettings.TempChangeShortStep; // add 10
} else systemSettings.SolderingTemp += systemSettings.TempChangeShortStep; // add 10
break;
default:
break;
@@ -325,13 +336,15 @@ static void gui_solderingTempAdjust() {
return; // exit if user just doesn't press anything for a bit
#ifdef MODEL_TS80
if (!OLED::getRotation())
if (!OLED::getRotation()) {
#else
if (OLED::getRotation())
if (OLED::getRotation()) {
#endif
OLED::print(SymbolMinus);
else
OLED::print(SymbolPlus);
OLED::print(systemSettings.ReverseButtonTempChangeEnabled ? SymbolPlus:SymbolMinus);
} else {
OLED::print(systemSettings.ReverseButtonTempChangeEnabled ? SymbolMinus:SymbolPlus);
}
OLED::print(SymbolSpace);
OLED::printNumber(systemSettings.SolderingTemp, 3);
@@ -341,13 +354,14 @@ static void gui_solderingTempAdjust() {
OLED::drawSymbol(1);
OLED::print(SymbolSpace);
#ifdef MODEL_TS80
if (!OLED::getRotation())
if (!OLED::getRotation()) {
#else
if (OLED::getRotation())
if (OLED::getRotation()) {
#endif
OLED::print(SymbolPlus);
else
OLED::print(SymbolMinus);
OLED::print(systemSettings.ReverseButtonTempChangeEnabled ? SymbolMinus:SymbolPlus);
} else {
OLED::print(systemSettings.ReverseButtonTempChangeEnabled ? SymbolPlus:SymbolMinus);
}
OLED::refresh();
GUIDelay();
}

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

@@ -97,9 +97,12 @@ void resetSettings() {
systemSettings.coolingTempBlink = COOLING_TEMP_BLINK; // Blink the temperature on the cooling screen when its > 50C
systemSettings.temperatureInF = TEMPERATURE_INF; // default to 0
systemSettings.descriptionScrollSpeed = DESCRIPTION_SCROLL_SPEED; // default to slow
systemSettings.powerLimitEnable = POWER_LIMIT_ENABLE; // Default to no power limit
systemSettings.powerLimitEnable = POWER_LIMIT_ENABLE; // Default to no power limit
systemSettings.CalibrationOffset = CALIBRATION_OFFSET; // the adc offset in uV
systemSettings.pidPowerLimit = PID_POWER_LIMIT; // Sets the max pwm power limit
systemSettings.powerLimit = POWER_LIMIT; // 30 watts default limit
systemSettings.ReverseButtonTempChangeEnabled = REVERSE_BUTTON_TEMP_CHANGE; //
systemSettings.TempChangeShortStep = TEMP_CHANGE_SHORT_STEP; //
systemSettings.TempChangeLongStep = TEMP_CHANGE_LONG_STEP; //
saveSettings(); // Save defaults
}

11112
workspace/TS100/Core/Src/Translation.cpp
View File

File diff suppressed because it is too large Load Diff

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

@@ -17,13 +17,12 @@ extern uint32_t lastButtonTime;
void gui_Menu(const menuitem *menu);
#ifdef MODEL_TS100
static void settings_setInputVRange(void);
static void settings_displayInputVRange(void);
static void settings_setInputVRange(void);
static void settings_displayInputVRange(void);
#else
static void settings_setInputPRange(void);
static void settings_displayInputPRange(void);
static void settings_setInputPRange(void);
static void settings_displayInputPRange(void);
#endif
static void settings_setSleepTemp(void);
static void settings_displaySleepTemp(void);
static void settings_setSleepTime(void);
@@ -60,6 +59,12 @@ static void settings_setCalibrate(void);
static void settings_displayCalibrate(void);
static void settings_setCalibrateVIN(void);
static void settings_displayCalibrateVIN(void);
static void settings_displayReverseButtonTempChangeEnabled(void);
static void settings_setReverseButtonTempChangeEnabled(void);
static void settings_displayTempChangeShortStep(void);
static void settings_setTempChangeShortStep(void);
static void settings_displayTempChangeLongStep(void);
static void settings_setTempChangeLongStep(void);
// Menu functions
static void settings_displaySolderingMenu(void);
@@ -78,6 +83,9 @@ static void settings_enterAdvancedMenu(void);
* Boost Mode Enabled
* Boost Mode Temp
* Auto Start
* Temp change short step
* Temp change long step
*
* Power Saving
* Sleep Temp
@@ -91,6 +99,7 @@ static void settings_enterAdvancedMenu(void);
* Temperature Unit
* Display orientation
* Cooldown blink
* Reverse Temp change buttons + -
*
* Advanced
* Enable Power Limit
@@ -135,6 +144,8 @@ const menuitem solderingMenu[] = {
* Boost Mode Enabled
* Boost Mode Temp
* Auto Start
* Temp change short step
* Temp change long step
*/
{ (const char*) SettingsDescriptions[8], { settings_setBoostModeEnabled }, {
settings_displayBoostModeEnabled } }, /*Enable Boost*/
@@ -142,6 +153,10 @@ const menuitem solderingMenu[] = {
settings_displayBoostTemp } }, /*Boost Temp*/
{ (const char*) SettingsDescriptions[10], { settings_setAutomaticStartMode }, {
settings_displayAutomaticStartMode } }, /*Auto start*/
{ (const char*) SettingsDescriptions[24], { settings_setTempChangeShortStep }, {
settings_displayTempChangeShortStep } }, /*Temp change short step*/
{ (const char*) SettingsDescriptions[25], { settings_setTempChangeLongStep }, {
settings_displayTempChangeLongStep } }, /*Temp change long step*/
{ NULL, { NULL }, { NULL } } // end of menu marker. DO NOT REMOVE
};
const menuitem UIMenu[] = {
@@ -151,6 +166,7 @@ const menuitem UIMenu[] = {
* Temperature Unit
* Display orientation
* Cooldown blink
* Reverse Temp change buttons + -
*/
{ (const char*) SettingsDescriptions[5], { settings_setTempF }, {
settings_displayTempF } }, /* Temperature units*/
@@ -160,6 +176,8 @@ const menuitem UIMenu[] = {
settings_displayCoolingBlinkEnabled } }, /*Cooling blink warning*/
{ (const char*) SettingsDescriptions[16], { settings_setScrollSpeed }, {
settings_displayScrollSpeed } }, /*Scroll Speed for descriptions*/
{ (const char*) SettingsDescriptions[23], { settings_setReverseButtonTempChangeEnabled }, {
settings_displayReverseButtonTempChangeEnabled } }, /* Reverse Temp change buttons + - */
{ NULL, { NULL }, { NULL } } // end of menu marker. DO NOT REMOVE
};
const menuitem PowerMenu[] = {
@@ -712,6 +730,37 @@ static void settings_setCalibrateVIN(void) {
}
}
static void settings_setReverseButtonTempChangeEnabled(void) {
systemSettings.ReverseButtonTempChangeEnabled = !systemSettings.ReverseButtonTempChangeEnabled;
}
static void settings_displayReverseButtonTempChangeEnabled(void){
printShortDescription(23, 7);
OLED::drawCheckbox(systemSettings.ReverseButtonTempChangeEnabled);
}
static void settings_setTempChangeShortStep(void) {
systemSettings.TempChangeShortStep += TEMP_CHANGE_SHORT_STEP;
if (systemSettings.TempChangeShortStep > TEMP_CHANGE_SHORT_STEP_MAX) {
systemSettings.TempChangeShortStep = TEMP_CHANGE_SHORT_STEP; // loop back at TEMP_CHANGE_SHORT_STEP_MAX
}
}
static void settings_displayTempChangeShortStep(void) {
printShortDescription(24, 5);
OLED::printNumber(systemSettings.TempChangeShortStep, 3);
}
static void settings_setTempChangeLongStep(void) {
systemSettings.TempChangeLongStep += TEMP_CHANGE_LONG_STEP;
if (systemSettings.TempChangeLongStep > TEMP_CHANGE_LONG_STEP_MAX) {
systemSettings.TempChangeLongStep = TEMP_CHANGE_LONG_STEP; // loop back at TEMP_CHANGE_LONG_STEP_MAX
}
}
static void settings_displayTempChangeLongStep(void) {
printShortDescription(25, 5);
OLED::printNumber(systemSettings.TempChangeLongStep, 3);
}
static void displayMenu(size_t index) {
// Call into the menu
OLED::setFont(1);

7
workspace/TS100/configuration.h
View File

@@ -45,6 +45,13 @@
*/
#define ORIENTATION_MODE 0 // 0: Right 1:Left 2:Automatic - Default right
#define IN_LEFT_HANDED_MODE 0 // 0:FALSE 1:TRUE - Default false
#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperatur change
#define TEMP_CHANGE_SHORT_STEP 1 // Default temp change short step +1
#define TEMP_CHANGE_LONG_STEP 10 // Default temp change long step +10
#define TEMP_CHANGE_SHORT_STEP_MAX 50 // Temp change short step MAX value
#define TEMP_CHANGE_LONG_STEP_MAX 100 // Temp change long step MAX value
/**
* OLED Orientation Sensitivity on Automatic mode!