Tip temp change short and long press and reverse +- button to ui configurations

Temperature change short and long press step to UI Soldering settings menu
Reverse button tip temperature plus minus assignment to UI Menu.
This commit is contained in:
GeminiServer
2020-03-15 15:50:11 +01:00
parent 0461fd0a26
commit 2d0e07266e
33 changed files with 6407 additions and 5523 deletions

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -250,6 +250,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

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

View File

@@ -251,6 +251,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -251,6 +251,30 @@
"potenc. máx." "potenc. máx."
], ],
"desc": "Elige el límite de potencia máxima del soldador <en vatios>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -251,6 +251,30 @@
"мощность" "мощность"
], ],
"desc": "Макс. мощность, которую может использовать паяльник <Ватт>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -250,6 +250,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"Limit" "Limit"
], ],
"desc": "Maximum power the iron can use <Watts>" "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!"
} }
} }
} }

View File

@@ -249,6 +249,30 @@
"потужність" "потужність"
], ],
"desc": "Макс. потужність, яку може використовувати паяльник <Ват>" "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!"
} }
} }
} }

View File

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

View File

@@ -11,7 +11,7 @@
#define SETTINGS_H_ #define SETTINGS_H_
#include <stdint.h> #include <stdint.h>
#include "stm32f1xx_hal.h" #include "stm32f1xx_hal.h"
#define SETTINGSVERSION ( 0x1C ) #define SETTINGSVERSION ( 0x1D )
/*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*/
@@ -50,6 +50,10 @@ 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
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
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; } systemSettingsType;
extern volatile systemSettingsType systemSettings; extern volatile systemSettingsType systemSettings;

View File

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

View File

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

View File

@@ -121,6 +121,10 @@ void resetSettings() {
systemSettings.CalibrationOffset = CALIBRATION_OFFSET; // the adc offset in uV systemSettings.CalibrationOffset = CALIBRATION_OFFSET; // the adc offset in uV
systemSettings.pidPowerLimit = PID_POWER_LIMIT; // Sets the max pwm power limit systemSettings.pidPowerLimit = PID_POWER_LIMIT; // Sets the max pwm power limit
systemSettings.powerLimit = POWER_LIMIT; // 30 watts default 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 default settings saveSettings(); // Save default settings
} }

File diff suppressed because it is too large Load Diff

View File

@@ -17,13 +17,12 @@ extern uint32_t lastButtonTime;
void gui_Menu(const menuitem *menu); void gui_Menu(const menuitem *menu);
#ifdef MODEL_TS100 #ifdef MODEL_TS100
static void settings_setInputVRange(void); static void settings_setInputVRange(void);
static void settings_displayInputVRange(void); static void settings_displayInputVRange(void);
#else #else
static void settings_setInputPRange(void); static void settings_setInputPRange(void);
static void settings_displayInputPRange(void); static void settings_displayInputPRange(void);
#endif #endif
static void settings_setSleepTemp(void); static void settings_setSleepTemp(void);
static void settings_displaySleepTemp(void); static void settings_displaySleepTemp(void);
static void settings_setSleepTime(void); static void settings_setSleepTime(void);
@@ -60,6 +59,12 @@ static void settings_setCalibrate(void);
static void settings_displayCalibrate(void); static void settings_displayCalibrate(void);
static void settings_setCalibrateVIN(void); static void settings_setCalibrateVIN(void);
static void settings_displayCalibrateVIN(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 // Menu functions
static void settings_displaySolderingMenu(void); static void settings_displaySolderingMenu(void);
@@ -78,6 +83,9 @@ static void settings_enterAdvancedMenu(void);
* Boost Mode Enabled * Boost Mode Enabled
* Boost Mode Temp * Boost Mode Temp
* Auto Start * Auto Start
* Temp change short step
* Temp change long step
* *
* Power Saving * Power Saving
* Sleep Temp * Sleep Temp
@@ -91,6 +99,7 @@ static void settings_enterAdvancedMenu(void);
* Temperature Unit * Temperature Unit
* Display orientation * Display orientation
* Cooldown blink * Cooldown blink
* Reverse Temp change buttons + -
* *
* Advanced * Advanced
* Enable Power Limit * Enable Power Limit
@@ -135,6 +144,8 @@ const menuitem solderingMenu[] = {
* Boost Mode Enabled * Boost Mode Enabled
* Boost Mode Temp * Boost Mode Temp
* Auto Start * Auto Start
* Temp change short step
* Temp change long step
*/ */
{ (const char*) SettingsDescriptions[8], { settings_setBoostModeEnabled }, { { (const char*) SettingsDescriptions[8], { settings_setBoostModeEnabled }, {
settings_displayBoostModeEnabled } }, /*Enable Boost*/ settings_displayBoostModeEnabled } }, /*Enable Boost*/
@@ -142,6 +153,10 @@ const menuitem solderingMenu[] = {
settings_displayBoostTemp } }, /*Boost Temp*/ settings_displayBoostTemp } }, /*Boost Temp*/
{ (const char*) SettingsDescriptions[10], { settings_setAutomaticStartMode }, { { (const char*) SettingsDescriptions[10], { settings_setAutomaticStartMode }, {
settings_displayAutomaticStartMode } }, /*Auto start*/ 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 { NULL, { NULL }, { NULL } } // end of menu marker. DO NOT REMOVE
}; };
const menuitem UIMenu[] = { const menuitem UIMenu[] = {
@@ -151,6 +166,7 @@ const menuitem UIMenu[] = {
* Temperature Unit * Temperature Unit
* Display orientation * Display orientation
* Cooldown blink * Cooldown blink
* Reverse Temp change buttons + -
*/ */
{ (const char*) SettingsDescriptions[5], { settings_setTempF }, { { (const char*) SettingsDescriptions[5], { settings_setTempF }, {
settings_displayTempF } }, /* Temperature units*/ settings_displayTempF } }, /* Temperature units*/
@@ -160,6 +176,8 @@ const menuitem UIMenu[] = {
settings_displayCoolingBlinkEnabled } }, /*Cooling blink warning*/ settings_displayCoolingBlinkEnabled } }, /*Cooling blink warning*/
{ (const char*) SettingsDescriptions[16], { settings_setScrollSpeed }, { { (const char*) SettingsDescriptions[16], { settings_setScrollSpeed }, {
settings_displayScrollSpeed } }, /*Scroll Speed for descriptions*/ 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 { NULL, { NULL }, { NULL } } // end of menu marker. DO NOT REMOVE
}; };
const menuitem PowerMenu[] = { 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) { static void displayMenu(size_t index) {
// Call into the menu // Call into the menu
OLED::setFont(1); OLED::setFont(1);

View File

@@ -45,6 +45,13 @@
*/ */
#define ORIENTATION_MODE 0 // 0: Right 1:Left 2:Automatic - Default right #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 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! * OLED Orientation Sensitivity on Automatic mode!