Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR #3 - Firmware build version with short git hash suffix #587

Merged
merged 12 commits into from
Mar 19, 2020
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Translation Editor/make_translation.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
from datetime import datetime
import sys
import fontTables

# To cause no confusion with the original firmware version of TS100,
# which actually has the latest firmware version 2.18
# Lets go ahead start with version 2.20.0001 BETA
# Version String: xx.yy.zzzz TAG --> x:Major y:Minor z:Build TAG: REL | BETA | ALPHA
BUILD_VERSION = 'V2.20.0001 BETA'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any chance you feel like swapping out the REL/Beta/Alpha + build numbers to instead be major.minor.git short hash

To make it clear where it came from ?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea to use the git short hash instead a build number.


TRANSLATION_CPP = "Translation.cpp"

try:
Expand Down Expand Up @@ -94,7 +101,7 @@ def getConstants():
consants.append(('SymbolVolts', 'V'))
consants.append(('SymbolDC', 'DC'))
consants.append(('SymbolCellCount', 'S'))
consants.append(('SymbolVersionNumber', 'V2.08'))
consants.append(('SymbolVersionNumber', BUILD_VERSION))
return consants


Expand Down
24 changes: 24 additions & 0 deletions Translation Editor/translation_bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 24 additions & 0 deletions Translation Editor/translation_cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 24 additions & 0 deletions Translation Editor/translation_da.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 63 additions & 36 deletions Translation Editor/translation_de.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"UndervoltageString": "Unterspannung",
"InputVoltageString": "V Eingang: ",
"WarningTipTempString": "Temperatur: ",
"BadTipString": "DEFEKT",
"BadTipString": "Spitze Defekt",
"SleepingSimpleString": "Zzz ",
"SleepingAdvancedString": "Ruhemodus...",
"WarningSimpleString": "HEIß",
Expand All @@ -21,15 +21,17 @@
"TipDisconnectedString": "Spitze fehlt",
"SolderingAdvancedPowerPrompt": "Leistung: ",
"OffString": "Aus",
"ResetOKMessage": "Reset OK"
"ResetOKMessage": "Reset OK",
"YourGainMessage": "Your Gain:",
"SettingsResetMessage": "Einstellungen\nzurück gesetzt!"
},
"characters": {
"SettingRightChar": "R",
"SettingLeftChar": "L",
"SettingAutoChar": "A",
"SettingFastChar": "F",
"SettingSlowChar": "S",
"SettingStartSolderingChar": "J",
"SettingStartSolderingChar": "T",
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "O",
"SettingStartNoneChar": "F"
Expand All @@ -52,155 +54,155 @@
},
"UIMenu": {
"text2": [
"Menü-",
"Anzeige-",
"einstellungen"
],
"desc": "Menüeinstellungen"
},
"AdvancedMenu": {
"text2": [
"Erweiterte",
"Einstellungen"
"Optionen"
],
"desc": "Erweiterte Einstellungen"
}
},
"menuOptions": {
"PowerSource": {
"text": "",
"text": "PWRSC",
"text2": [
"Spannungs-",
"quelle"
],
"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"
],
"desc": "Ruhemodus nach <Sekunden/Minuten>"
},
"ShutdownTimeout": {
"text": "",
"text": "SHTME",
"text2": [
"Abschalt-",
"zeit"
],
"desc": "Abschalten nach <Minuten>"
},
"MotionSensitivity": {
"text": "",
"text": "MSENSE",
"text2": [
"Bewegungs-",
"empfindlichk."
],
"desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>"
},
"TemperatureUnit": {
"text": "",
"text": "TMPUNT",
"text2": [
"Temperatur-",
"einheit"
],
"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"
],
"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"
],
"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?"
],
"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?"
],
"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",
Expand Down Expand Up @@ -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!"
}
}
}
Loading