Update version.h

Update comments

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+ko_fi: ralim
+custom: https://paypal.me/RalimTek

.github/workflows/ccpp.yml

@@ -0,0 +1,24 @@
+name: C/C++ CI
+
+on: [pull_request, push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+    - name: chmod
+      run: chmod +x build.sh
+    - name: translation
+      run: |
+        cd Translation\ Editor
+        python3 make_translation.py
+    - name: make
+      run: ./build.sh
+    - name: Archive production artifacts
+      uses: actions/upload-artifact@v1
+      with:
+        name: compiled
+        path: ci/artefacts

.gitignore

@@ -66,10 +66,12 @@ ci/secrets/unencrypted/
 codeship.aes
 .vscode/settings.json
 
+# Auto generated files
+workspace/TS100/Core/Src/Translation.cpp
+workspace/TS100/Core/Inc/unit.h
 # IDE configs
 .vs/*
 .settings/*
-.project
 ..cproject.swp
 
 # Visual Studios
@@ -101,9 +103,6 @@ local.properties
 # PyDev specific (Python IDE for Eclipse)
 *.pydevproject
 
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
 # CDT- autotools
 .autotools
 
@@ -190,5 +189,4 @@ fabric.properties
 # Editor-based Rest Client
 .idea/httpRequests
 
-.mxproject
-CoreCompileInputs.cache
+CoreCompileInputs.cache

Bootup Logo/Logos/001_TS100_Left.hex

@@ -0,0 +1,258 @@
+:020000040800F2
+:10F8000055AA0DF0F800E808A8A8AC28ECACC80888
+:10F81000A828A8A848A88808284808E828C828A828
+:10F8200008C828C828A80CC80C0C0C0C0808080824
+:10F830000C0C0C0C080C0808080810102020C02024
+:10F840002040804000000000000000008080808098
+:10F850008080808080808080808080808180158210
+:10F86000542A00801F0020202F202F282020252010
+:10F870002A2A2A2A27282120282F202F2827282B08
+:10F8800020272827282B2027202020202020202048
+:10F8900020202020202020204020404040401F20C9
+:10F8A0002010081005050505050505050908090AC4
+:10F8B000090A090A080A08080808080808080508C3
+:10F8C000020500020000000000000000000000002F
+:10F8D0000000000000000000000000000000000028
+:10F8E0000000000000000000000000000000000018
+:10F8F0000000000000000000000000000000000008
+:10F9000000000000000000000000000000000000F7
+:10F9100000000000000000000000000000000000E7
+:10F9200000000000000000000000000000000000D7
+:10F9300000000000000000000000000000000000C7
+:10F9400000000000000000000000000000000000B7
+:10F9500000000000000000000000000000000000A7
+:10F960000000000000000000000000000000000097
+:10F970000000000000000000000000000000000087
+:10F980000000000000000000000000000000000077
+:10F990000000000000000000000000000000000067
+:10F9A0000000000000000000000000000000000057
+:10F9B0000000000000000000000000000000000047
+:10F9C0000000000000000000000000000000000037
+:10F9D0000000000000000000000000000000000027
+:10F9E0000000000000000000000000000000000017
+:10F9F0000000000000000000000000000000000007
+:10FA000000000000000000000000000000000000F6
+:10FA100000000000000000000000000000000000E6
+:10FA200000000000000000000000000000000000D6
+:10FA300000000000000000000000000000000000C6
+:10FA400000000000000000000000000000000000B6
+:10FA500000000000000000000000000000000000A6
+:10FA60000000000000000000000000000000000096
+:10FA70000000000000000000000000000000000086
+:10FA80000000000000000000000000000000000076
+:10FA90000000000000000000000000000000000066
+:10FAA0000000000000000000000000000000000056
+:10FAB0000000000000000000000000000000000046
+:10FAC0000000000000000000000000000000000036
+:10FAD0000000000000000000000000000000000026
+:10FAE0000000000000000000000000000000000016
+:10FAF0000000000000000000000000000000000006
+:10FB000000000000000000000000000000000000F5
+:10FB100000000000000000000000000000000000E5
+:10FB200000000000000000000000000000000000D5
+:10FB300000000000000000000000000000000000C5
+:10FB400000000000000000000000000000000000B5
+:10FB500000000000000000000000000000000000A5
+:10FB60000000000000000000000000000000000095
+:10FB70000000000000000000000000000000000085
+:10FB80000000000000000000000000000000000075
+:10FB90000000000000000000000000000000000065
+:10FBA0000000000000000000000000000000000055
+:10FBB0000000000000000000000000000000000045
+:10FBC0000000000000000000000000000000000035
+:10FBD0000000000000000000000000000000000025
+:10FBE0000000000000000000000000000000000015
+:10FBF0000000000000000000000000000000000005
+:10F8000055AA0DF0F800E808A8A8AC28ECACC80888
+:10F81000A828A8A848A88808284808E828C828A828
+:10F8200008C828C828A80CC80C0C0C0C0808080824
+:10F830000C0C0C0C080C0808080810102020C02024
+:10F840002040804000000000000000008080808098
+:10F850008080808080808080808080808180158210
+:10F86000542A00801F0020202F202F282020252010
+:10F870002A2A2A2A27282120282F202F2827282B08
+:10F8800020272827282B2027202020202020202048
+:10F8900020202020202020204020404040401F20C9
+:10F8A0002010081005050505050505050908090AC4
+:10F8B000090A090A080A08080808080808080508C3
+:10F8C000020500020000000000000000000000002F
+:10F8D0000000000000000000000000000000000028
+:10F8E0000000000000000000000000000000000018
+:10F8F0000000000000000000000000000000000008
+:10F9000000000000000000000000000000000000F7
+:10F9100000000000000000000000000000000000E7
+:10F9200000000000000000000000000000000000D7
+:10F9300000000000000000000000000000000000C7
+:10F9400000000000000000000000000000000000B7
+:10F9500000000000000000000000000000000000A7
+:10F960000000000000000000000000000000000097
+:10F970000000000000000000000000000000000087
+:10F980000000000000000000000000000000000077
+:10F990000000000000000000000000000000000067
+:10F9A0000000000000000000000000000000000057
+:10F9B0000000000000000000000000000000000047
+:10F9C0000000000000000000000000000000000037
+:10F9D0000000000000000000000000000000000027
+:10F9E0000000000000000000000000000000000017
+:10F9F0000000000000000000000000000000000007
+:10FA000000000000000000000000000000000000F6
+:10FA100000000000000000000000000000000000E6
+:10FA200000000000000000000000000000000000D6
+:10FA300000000000000000000000000000000000C6
+:10FA400000000000000000000000000000000000B6
+:10FA500000000000000000000000000000000000A6
+:10FA60000000000000000000000000000000000096
+:10FA70000000000000000000000000000000000086
+:10FA80000000000000000000000000000000000076
+:10FA90000000000000000000000000000000000066
+:10FAA0000000000000000000000000000000000056
+:10FAB0000000000000000000000000000000000046
+:10FAC0000000000000000000000000000000000036
+:10FAD0000000000000000000000000000000000026
+:10FAE0000000000000000000000000000000000016
+:10FAF0000000000000000000000000000000000006
+:10FB000000000000000000000000000000000000F5
+:10FB100000000000000000000000000000000000E5
+:10FB200000000000000000000000000000000000D5
+:10FB300000000000000000000000000000000000C5
+:10FB400000000000000000000000000000000000B5
+:10FB500000000000000000000000000000000000A5
+:10FB60000000000000000000000000000000000095
+:10FB70000000000000000000000000000000000085
+:10FB80000000000000000000000000000000000075
+:10FB90000000000000000000000000000000000065
+:10FBA0000000000000000000000000000000000055
+:10FBB0000000000000000000000000000000000045
+:10FBC0000000000000000000000000000000000035
+:10FBD0000000000000000000000000000000000025
+:10FBE0000000000000000000000000000000000015
+:10FBF0000000000000000000000000000000000005
+:10F8000055AA0DF0F800E808A8A8AC28ECACC80888
+:10F81000A828A8A848A88808284808E828C828A828
+:10F8200008C828C828A80CC80C0C0C0C0808080824
+:10F830000C0C0C0C080C0808080810102020C02024
+:10F840002040804000000000000000008080808098
+:10F850008080808080808080808080808180158210
+:10F86000542A00801F0020202F202F282020252010
+:10F870002A2A2A2A27282120282F202F2827282B08
+:10F8800020272827282B2027202020202020202048
+:10F8900020202020202020204020404040401F20C9
+:10F8A0002010081005050505050505050908090AC4
+:10F8B000090A090A080A08080808080808080508C3
+:10F8C000020500020000000000000000000000002F
+:10F8D0000000000000000000000000000000000028
+:10F8E0000000000000000000000000000000000018
+:10F8F0000000000000000000000000000000000008
+:10F9000000000000000000000000000000000000F7
+:10F9100000000000000000000000000000000000E7
+:10F9200000000000000000000000000000000000D7
+:10F9300000000000000000000000000000000000C7
+:10F9400000000000000000000000000000000000B7
+:10F9500000000000000000000000000000000000A7
+:10F960000000000000000000000000000000000097
+:10F970000000000000000000000000000000000087
+:10F980000000000000000000000000000000000077
+:10F990000000000000000000000000000000000067
+:10F9A0000000000000000000000000000000000057
+:10F9B0000000000000000000000000000000000047
+:10F9C0000000000000000000000000000000000037
+:10F9D0000000000000000000000000000000000027
+:10F9E0000000000000000000000000000000000017
+:10F9F0000000000000000000000000000000000007
+:10FA000000000000000000000000000000000000F6
+:10FA100000000000000000000000000000000000E6
+:10FA200000000000000000000000000000000000D6
+:10FA300000000000000000000000000000000000C6
+:10FA400000000000000000000000000000000000B6
+:10FA500000000000000000000000000000000000A6
+:10FA60000000000000000000000000000000000096
+:10FA70000000000000000000000000000000000086
+:10FA80000000000000000000000000000000000076
+:10FA90000000000000000000000000000000000066
+:10FAA0000000000000000000000000000000000056
+:10FAB0000000000000000000000000000000000046
+:10FAC0000000000000000000000000000000000036
+:10FAD0000000000000000000000000000000000026
+:10FAE0000000000000000000000000000000000016
+:10FAF0000000000000000000000000000000000006
+:10FB000000000000000000000000000000000000F5
+:10FB100000000000000000000000000000000000E5
+:10FB200000000000000000000000000000000000D5
+:10FB300000000000000000000000000000000000C5
+:10FB400000000000000000000000000000000000B5
+:10FB500000000000000000000000000000000000A5
+:10FB60000000000000000000000000000000000095
+:10FB70000000000000000000000000000000000085
+:10FB80000000000000000000000000000000000075
+:10FB90000000000000000000000000000000000065
+:10FBA0000000000000000000000000000000000055
+:10FBB0000000000000000000000000000000000045
+:10FBC0000000000000000000000000000000000035
+:10FBD0000000000000000000000000000000000025
+:10FBE0000000000000000000000000000000000015
+:10FBF0000000000000000000000000000000000005
+:10F8000055AA0DF0F800E808A8A8AC28ECACC80888
+:10F81000A828A8A848A88808284808E828C828A828
+:10F8200008C828C828A80CC80C0C0C0C0808080824
+:10F830000C0C0C0C080C0808080810102020C02024
+:10F840002040804000000000000000008080808098
+:10F850008080808080808080808080808180158210
+:10F86000542A00801F0020202F202F282020252010
+:10F870002A2A2A2A27282120282F202F2827282B08
+:10F8800020272827282B2027202020202020202048
+:10F8900020202020202020204020404040401F20C9
+:10F8A0002010081005050505050505050908090AC4
+:10F8B000090A090A080A08080808080808080508C3
+:10F8C000020500020000000000000000000000002F
+:10F8D0000000000000000000000000000000000028
+:10F8E0000000000000000000000000000000000018
+:10F8F0000000000000000000000000000000000008
+:10F9000000000000000000000000000000000000F7
+:10F9100000000000000000000000000000000000E7
+:10F9200000000000000000000000000000000000D7
+:10F9300000000000000000000000000000000000C7
+:10F9400000000000000000000000000000000000B7
+:10F9500000000000000000000000000000000000A7
+:10F960000000000000000000000000000000000097
+:10F970000000000000000000000000000000000087
+:10F980000000000000000000000000000000000077
+:10F990000000000000000000000000000000000067
+:10F9A0000000000000000000000000000000000057
+:10F9B0000000000000000000000000000000000047
+:10F9C0000000000000000000000000000000000037
+:10F9D0000000000000000000000000000000000027
+:10F9E0000000000000000000000000000000000017
+:10F9F0000000000000000000000000000000000007
+:10FA000000000000000000000000000000000000F6
+:10FA100000000000000000000000000000000000E6
+:10FA200000000000000000000000000000000000D6
+:10FA300000000000000000000000000000000000C6
+:10FA400000000000000000000000000000000000B6
+:10FA500000000000000000000000000000000000A6
+:10FA60000000000000000000000000000000000096
+:10FA70000000000000000000000000000000000086
+:10FA80000000000000000000000000000000000076
+:10FA90000000000000000000000000000000000066
+:10FAA0000000000000000000000000000000000056
+:10FAB0000000000000000000000000000000000046
+:10FAC0000000000000000000000000000000000036
+:10FAD0000000000000000000000000000000000026
+:10FAE0000000000000000000000000000000000016
+:10FAF0000000000000000000000000000000000006
+:10FB000000000000000000000000000000000000F5
+:10FB100000000000000000000000000000000000E5
+:10FB200000000000000000000000000000000000D5
+:10FB300000000000000000000000000000000000C5
+:10FB400000000000000000000000000000000000B5
+:10FB500000000000000000000000000000000000A5
+:10FB60000000000000000000000000000000000095
+:10FB70000000000000000000000000000000000085
+:10FB80000000000000000000000000000000000075
+:10FB90000000000000000000000000000000000065
+:10FBA0000000000000000000000000000000000055
+:10FBB0000000000000000000000000000000000045
+:10FBC0000000000000000000000000000000000035
+:10FBD0000000000000000000000000000000000025
+:10FBE0000000000000000000000000000000000015
+:10FBF0000000000000000000000000000000000005
+:00000001FF

Translation Editor/make_translation.py

@@ -7,7 +7,11 @@ import io
 from datetime import datetime
 import sys
 import fontTables
+import re
+import subprocess
+
 TRANSLATION_CPP = "Translation.cpp"
+UNIT_H = "unit.h"
 
 try:
     to_unicode = unicode
@@ -29,6 +33,7 @@ def loadJson(fileName, skipFirstLine):
 # Reading all language translations into a dictionary by langCode
 def readTranslations(jsonDir):
     langDict = {}
+    UnitDict = {}
 
     # Read all translation files from the input dir
     for fileName in os.listdir(jsonDir):
@@ -53,14 +58,19 @@ def readTranslations(jsonDir):
             except KeyError:
                 langCodeFromJson = "(missing)"
 
+            try:
+                TempUnitF_FromJson = lang['tempUnitFahrenheit']
+            except KeyError:
+                TempUnitF_FromJson = True # Default to true.
+            
             # ...cause they should be the same!
             if langCode != langCodeFromJson:
                 raise ValueError("Invalid languageCode " + langCodeFromJson +
                                  " in file " + fileName)
 
             langDict[langCode] = lang
-
-    return langDict
+            UnitDict[langCode] = TempUnitF_FromJson
+    return langDict, UnitDict
 
 
 def writeStart(f):
@@ -75,6 +85,23 @@ def writeStart(f):
 """))
 
 
+def writeStartUnit(f):
+    f.write(
+        to_unicode(
+            """// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT.
+ 
+/**
+ * °F Fahrenheit Support
+ * You will find the default Fahrenheit configuration in the translation_xx.json
+ * If tempUnitFahrenheit is set to:
+ *    true -  you can switch in menu settings to Fahrenheit or Celsius.
+ *    false - you see only Celsius. All settings are then is in Celsius only.
+ */
+
+#ifndef _UNIT_H
+#define _UNIT_H\n
+"""))
+
 def escapeC(s):
     return s.replace("\"", "\\\"")
 
@@ -94,10 +121,7 @@ def getConstants():
     consants.append(('SymbolVolts', 'V'))
     consants.append(('SymbolDC', 'DC'))
     consants.append(('SymbolCellCount', 'S'))
-    consants.append(('SymbolVersionNumber', 'V2.08'))
-    consants.append(('SymbolManual', 'M'))
-    consants.append(('SymbolAuto', 'A'))
-    consants.append(('SymbolSleep', 'S'))
+    consants.append(('SymbolVersionNumber', buildVersion))
     return consants
 
 
@@ -454,10 +478,44 @@ def writeLanguage(languageCode, defs, f):
     f.write(to_unicode("#endif\n"))
 
 
+def writeUnit(languageCode, defs, f, UnitCodes):
+    print("Generating unit block for " + languageCode)
+    lang = langDict[languageCode]
+    unit = UnitDict[UnitCodes]
+    try:
+        langName = lang['languageLocalName']
+    except KeyError:
+        langName = languageCode
+    f.write(to_unicode("  #ifdef LANG_" + languageCode + "\n"))
+    if unit: 
+        f.write(to_unicode("    #define  ENABLED_FAHRENHEIT_SUPPORT" + "\n"))
+    else: f.write(to_unicode("    //#define  ENABLED_FAHRENHEIT_SUPPORT" + "\n"))
+    # ----- Block end
+    f.write(to_unicode("  #endif /* ---- " + langName + " ---- */\n"))
+
+def readVersion():
+    with open(os.path.relpath(jsonDir + 
+    "/../workspace/TS100/version.h"),"r") as version_file:
+        try: 
+            for line in version_file:
+                if re.findall(r'^.*(?<=(#define)).*(?<=(BUILD_VERSION))', line):
+                    line = re.findall(r'\"(.+?)\"',line)
+                    if line: 
+                        version = line[0]
+                        try: version += "."+ subprocess.check_output(
+                            ["git","rev-parse", "--short=7", "HEAD"]).strip().decode('ascii').upper()
+                            # --short=7: the shorted hash with 7 digits. Increase/decrease if needed!
+                        except OSError: version += " git"
+        finally: 
+            if version_file: 
+                version_file.close(); 
+                return version
+
 def read_opts():
     """ Reading input parameters
     First parameter = json directory
-    Second parameter = target directory
+    Second parameter = translation directory
+    Third paramter = unit directory
     """
     if len(sys.argv) > 1:
         jsonDir = sys.argv[1]
@@ -465,15 +523,21 @@ def read_opts():
         jsonDir = "."
 
     if len(sys.argv) > 2:
-        outFile = sys.argv[2]
+        outFileTranslationCPP = sys.argv[2]
     else:
         outDir = os.path.relpath(jsonDir + "/../workspace/TS100/Core/Src")
-        outFile = os.path.join(outDir, TRANSLATION_CPP)
-
+        outFileTranslationCPP = os.path.join(outDir, TRANSLATION_CPP)
+    
     if len(sys.argv) > 3:
+        outFileUnitH = sys.argv[3]
+    else:
+        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/Core/Inc")
+        outFileUnitH = os.path.join(outDir,UNIT_H)
+
+    if len(sys.argv) > 4:
         raise Exception("Too many parameters!")
 
-    return jsonDir, outFile
+    return jsonDir, outFileTranslationCPP, outFileUnitH
 
 
 def orderOutput(langDict):
@@ -491,27 +555,37 @@ def orderOutput(langDict):
     return mandatoryOrder
 
 
-def writeTarget(outFile, defs, langCodes):
+def writeTarget(outFileTranslationCPP, outFileUnitH, defs, langCodes, UnitCodes):
     # Start writing the file
-    with io.open(outFile, 'w', encoding='utf-8', newline="\n") as f:
+    with io.open(outFileTranslationCPP, 'w', encoding='utf-8', newline="\n") as f:
         writeStart(f)
-
         for langCode in langCodes:
             writeLanguage(langCode, defs, f)
 
+    with io.open(outFileUnitH, 'w', encoding='utf-8', newline="\n") as f:
+        writeStartUnit(f)
+        for langCode, UnitCode in zip(langCodes, UnitCodes):
+            writeUnit(langCode, defs, f, UnitCode)
+        f.write(to_unicode("\n#endif /* _UNIT_H */\n"))
 
 if __name__ == "__main__":
     try:
-        jsonDir, outFile = read_opts()
+        jsonDir, outFileTranslationCPP, outFileUnitH = read_opts()
     except:
         print("usage: make_translation.py {json dir} {cpp dir}")
         sys.exit(1)
 
-    print("Making " + outFile + " from " + jsonDir)
+    try: buildVersion = readVersion()
+    except: print("error: could not get/extract build version"); sys.exit(1)
 
-    langDict = readTranslations(jsonDir)
+    print("Build version: " + buildVersion)
+    print("Making " + outFileTranslationCPP + " from " + jsonDir)
+    print("Making " + outFileUnitH + " from " + jsonDir)
+
+    langDict, UnitDict = readTranslations(jsonDir)
     defs = loadJson(os.path.join(jsonDir, "translations_def.js"), True)
     langCodes = orderOutput(langDict)
-    writeTarget(outFile, defs, langCodes)
+    UnitCodes = orderOutput(UnitDict)
+    writeTarget(outFileTranslationCPP, outFileUnitH, defs, langCodes, UnitCodes)
 
     print("Done")

Translation Editor/translation_bg.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "ВРЪХ ЛОША ВРЪЗКА",
 		"SolderingAdvancedPowerPrompt": "Захранване: ",
 		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -229,22 +233,46 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
-   },
-    "PowerLimitEnable": {
-      "text": "PLIMEN",
-      "text2": [
-        "P Limit",
-        "Enable"
-      ],
-      "desc": "Enable power limit"
-    },
-    "PowerLimit": {
-      "text": "PLIM",
-      "text2": [
-        "Power",
-        "Limit"
-      ],
-      "desc": "Maximum power the iron can use <Watts>"
-    }
-  }
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"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!"
+		}
+	}
 }

Translation Editor/translation_cs.json

@@ -29,7 +29,11 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "P"
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -246,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!"
 		}
 	}
 }

Translation Editor/translation_da.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "H",
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "L",
+		"SettingStartSleepChar": "D",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "S"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_de.json

@@ -2,6 +2,7 @@
 	"languageCode": "DE",
 	"languageLocalName": "Deutsch",
 	"cyrillicGlyphs": false,
+	"tempUnitFahrenheit": false,
 	"messages": {
 		"SettingsCalibrationDone": "Kalibrierung abgeschlossen!",
 		"SettingsCalibrationWarning": "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!",
@@ -10,7 +11,7 @@
 		"UndervoltageString": "Unterspannung",
 		"InputVoltageString": "V Eingang: ",
 		"WarningTipTempString": "Temperatur: ",
-		"BadTipString": "DEFEKT",
+		"BadTipString": "Spitze Defekt",
 		"SleepingSimpleString": "Zzz ",
 		"SleepingAdvancedString": "Ruhemodus...",
 		"WarningSimpleString": "HEIß",
@@ -21,14 +22,20 @@
 		"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"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -48,7 +55,7 @@
 		},
 		"UIMenu": {
 			"text2": [
-				"Menü-",
+				"Anzeige-",
 				"einstellungen"
 			],
 			"desc": "Menüeinstellungen"
@@ -56,14 +63,14 @@
 		"AdvancedMenu": {
 			"text2": [
 				"Erweiterte",
-				"Einstellungen"
+				"Optionen"
 			],
 			"desc": "Erweiterte Einstellungen"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+			"text": "PWRSC",
 			"text2": [
 				"Spannungs-",
 				"quelle"
@@ -71,15 +78,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"
@@ -87,7 +94,7 @@
 			"desc": "Ruhemodus nach <Sekunden/Minuten>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+			"text": "SHTME",
 			"text2": [
 				"Abschalt-",
 				"zeit"
@@ -95,7 +102,7 @@
 			"desc": "Abschalten nach <Minuten>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+			"text": "MSENSE",
 			"text2": [
 				"Bewegungs-",
 				"empfindlichk."
@@ -103,7 +110,7 @@
 			"desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+			"text": "TMPUNT",
 			"text2": [
 				"Temperatur-",
 				"einheit"
@@ -111,15 +118,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"
@@ -127,15 +134,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"
@@ -143,23 +150,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?"
@@ -167,15 +174,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?"
@@ -183,20 +190,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",
@@ -226,25 +233,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!"
 		}
 	}
 }

Translation Editor/translation_en.json

@@ -2,6 +2,7 @@
 	"languageCode": "EN",
 	"languageLocalName": "English",
 	"cyrillicGlyphs": false,
+	"tempUnitFahrenheit": true,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
 		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
@@ -30,7 +31,11 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -78,7 +83,7 @@
 				"Sleep",
 				"temp"
 			],
-			"desc": "Sleep Temperature <C>"
+			"desc": "Sleep Temperature"
 		},
 		"SleepTimeout": {
 			"text": "STME",
@@ -102,7 +107,7 @@
 				"Motion",
 				"sensitivity"
 			],
-			"desc": "Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>"
+			"desc": "Motion Sensitivity <0=Off 1=Least Sensitive 9=Most Sensitive>"
 		},
 		"TemperatureUnit": {
 			"text": "TMPUNT",
@@ -126,7 +131,7 @@
 				"Display",
 				"orientation"
 			],
-			"desc": "Display Orientation <A. Automatic L. Left Handed R. Right Handed>"
+			"desc": "Display Orientation <A=Automatic L=Left Handed R=Right Handed>"
 		},
 		"BoostEnabled": {
 			"text": "BOOST",
@@ -134,7 +139,7 @@
 				"Boost mode",
 				"enabled"
 			],
-			"desc": "Enable front key enters boost mode 450C mode when soldering"
+			"desc": "Enable front key long press \"Boost\" mode when soldering"
 		},
 		"BoostTemperature": {
 			"text": "BTMP",
@@ -142,7 +147,7 @@
 				"Boost",
 				"temp"
 			],
-			"desc": "Temperature when in \"boost\" mode"
+			"desc": "Temperature when in \"Boost\" mode"
 		},
 		"AutoStart": {
 			"text": "ASTART",
@@ -150,7 +155,7 @@
 				"Auto",
 				"start"
 			],
-			"desc": "Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off"
+			"desc": "Automatically starts the iron into soldering on power up <T=Soldering S=Sleep F=Off>"
 		},
 		"CooldownBlink": {
 			"text": "CLBLNK",
@@ -198,7 +203,7 @@
 				"Scrolling",
 				"Speed"
 			],
-			"desc": "Speed this text scrolls past at"
+			"desc": "Speed this text scrolls past at <S=Slow F=Fast>"
 		},
 		"TipModel": {
 			"text": "TIPMO",
@@ -247,6 +252,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!"
 		}
 	}
-}
+}

Translation Editor/translation_es.json

@@ -1,64 +1,70 @@
 {
 	"languageCode": "ES",
-	"languageLocalName": "Español",
+	"languageLocalName": "Castellano",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "¡Asegúrese que la punta esté a temperatura ambiente antes de proceder!",
-		"SettingsResetWarning": "¿Está seguro de volver a estado de fábrica?",
-		"UVLOWarningString": "DC BAJO",
-		"UndervoltageString": "Subtensión",
-		"InputVoltageString": "V entrada: ",
-		"WarningTipTempString": "Temp Punta: ",
-		"BadTipString": "ER PUNTA",
+		"SettingsCalibrationDone": "¡Calibrada!",
+		"SettingsCalibrationWarning": "¡Asegúrate que la punta esté a temperatura ambiente antes de empezar!",
+		"SettingsResetWarning": "¿Quieres restablecer los ajustes?",
+		"UVLOWarningString": "CC BAJA",
+		"UndervoltageString": "Voltaje bajo",
+		"InputVoltageString": "Voltaje: ",
+		"WarningTipTempString": "Temp punta: ",
+		"BadTipString": "PT. ROTA",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "En reposo...",
-		"WarningSimpleString": "TEMP",
-		"WarningAdvancedString": "¡PUNTA CALIENTE!",
+		"WarningSimpleString": "QUEMA",
+		"WarningAdvancedString": "¡LA PUNTA QUEMA!",
 		"SleepingTipAdvancedString": "Punta:",
 		"IdleTipString": "Punta:",
 		"IdleSetString": " Aj:",
-		"TipDisconnectedString": "SIN PUNTA",
-		"SolderingAdvancedPowerPrompt": "POTENCIA: ",
-		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"TipDisconnectedString": "NO HAY PUNTA",
+		"SolderingAdvancedPowerPrompt": "Potencia: ",
+		"OffString": " No",
+		"ResetOKMessage": "Hecho.       ",
+		"YourGainMessage": "Gananc.:",
+		"SettingsResetMessage": "Restablecidos."
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "I",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "S",
+		"SettingStartSleepChar": "R",
+		"SettingStartSleepOffChar": "F",
+		"SettingStartNoneChar": "N"
 	},
 	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Opciones de",
-				"Soldadura"
+				"Ajustes de",
+				"soldadura"
 			],
-			"desc": "Opciones de Soldadura"
+			"desc": "Ajustes para soldar."
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Modos de",
-				"Reposo"
+				"reposo"
 			],
-			"desc": "Opciones de ahorro energético"
+			"desc": "Ajustes de ahorro energético."
 		},
 		"UIMenu": {
 			"text2": [
 				"Interfaz",
-				"de Usuario"
+				"de usuario"
 			],
-			"desc": "Opciones de interfaz de usuario"
+			"desc": "Ajustes de interfaz de usuario."
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Opciones",
-				"Avanzadas"
+				"Ajustes",
+				"avanzados"
 			],
-			"desc": "Opciones avanzadas"
+			"desc": "Ajustes avanzados."
 		}
 	},
 	"menuOptions": {
@@ -68,39 +74,39 @@
 				"Fuente",
 				"de energía"
 			],
-			"desc": "Fuente de energía. Ajusta el límite inferior de voltaje. <DC=10V S=3.3V por celda>"
+			"desc": "Elige el tipo de fuente para limitar el voltaje <DC 10V> <S 3,3V por pila, ilimitado>"
 		},
 		"SleepTemperature": {
 			"text": "STMP",
 			"text2": [
-				"Temp en",
-				"reposo"
+				"Temperatura",
+				"en reposo"
 			],
-			"desc": "Temperatura en reposo. <C>"
+			"desc": "Temperatura de la punta en reposo."
 		},
 		"SleepTimeout": {
 			"text": "STME",
 			"text2": [
-				"Tiempo h.",
-				"reposo"
+				"Entrar",
+				"en reposo"
 			],
-			"desc": "Tiempo hasta activar reposo. <Minutos>"
+			"desc": "Tiempo de inactividad para entrar en reposo <min/seg>"
 		},
 		"ShutdownTimeout": {
 			"text": "SHTME",
 			"text2": [
-				"Tiempo h.",
+				"Tiempo de",
 				"apagado"
 			],
-			"desc": "Tiempo hasta apagado. <Minutos>"
+			"desc": "Tiempo de inactividad para apagarse <en minutos>"
 		},
 		"MotionSensitivity": {
 			"text": "MSENSE",
 			"text2": [
-				"Sensibilidad",
-				"al movimiento"
+				"Detección de",
+				"movimiento"
 			],
-			"desc": "Sensibilidad del movimiento. <0=Apagado 1=El menos sensible 9=El más sensible>"
+			"desc": "Tiempo de reacción al agarrar <0=no 1=menos sensible 9=más sensible>"
 		},
 		"TemperatureUnit": {
 			"text": "TMPUNT",
@@ -108,15 +114,15 @@
 				"Unidad de",
 				"temperatura"
 			],
-			"desc": "Unidad de temperatura."
+			"desc": "Unidad de temperatura <C=centígrados F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
 			"text": "ADVIDL",
 			"text2": [
-				"Más info en",
-				"modo inactivo"
+				"Info extra en",
+				"modo reposo"
 			],
-			"desc": "Muestra información detallada pequena en la pantalla inactiva."
+			"desc": "Muestra información detallada en letra pequeña al reposar."
 		},
 		"DisplayRotation": {
 			"text": "DSPROT",
@@ -124,71 +130,71 @@
 				"Orientación",
 				"de pantalla"
 			],
-			"desc": "Orientación de la pantalla <A=Automático I=Mano izquierda D=Mano derecha>"
+			"desc": "Orientación de la pantalla <A=automático I=zurdo D=diestro>"
 		},
 		"BoostEnabled": {
 			"text": "BOOST",
 			"text2": [
-				"Boost botón",
-				"activado"
+				"Con botón de",
+				"temp. extra"
 			],
-			"desc": "Activar el botón \"Boost\" en modo soldadura."
+			"desc": "Permite mantener pulsado el primer botón (A) al soldar y calentar momentáneamente un poco más."
 		},
 		"BoostTemperature": {
 			"text": "BTMP",
 			"text2": [
-				"Temp en",
-				"Boost"
+				"Ajustar la",
+				"temp. extra"
 			],
-			"desc": "Temperatura en modo \"Boost\". <C>"
+			"desc": "Temperatura momentánea que se alcanza al apretar el botón del modo extra."
 		},
 		"AutoStart": {
 			"text": "ASTART",
 			"text2": [
-				"Soldadura",
+				"Calentar",
 				"al enchufar"
 			],
-			"desc": "Iniciar modo soldadura en el encendido. <V=Sí S=Modo reposo F=No>"
+			"desc": "Se calienta él solo al arrancar <S=entrar en modo soldar R=solo entrar en reposo F=en reposo pero mantiene la punta fría N=no>"
 		},
 		"CooldownBlink": {
 			"text": "CLBLNK",
 			"text2": [
-				"Parpadea m.",
-				"enfriamiento"
+				"Parpadear",
+				"al enfriar"
 			],
-			"desc": "Parpadea la temperatura en el enfriamiento si la punta sigue caliente."
+			"desc": "La temperatura en pantalla parpadea mientras la punta siga caliente."
 		},
 		"TemperatureCalibration": {
 			"text": "TMP CAL?",
 			"text2": [
-				"Calibrar temp",
+				"Calibrar temp.",
 				"de la punta"
 			],
-			"desc": "Calibrar desviación térmica de la punta."
+			"desc": "Calibra la desviación térmica de la punta."
 		},
 		"SettingsReset": {
 			"text": "RESET?",
 			"text2": [
-				"Estado de",
-				"fábrica"
+				"Volver a ajustes",
+				"de fábrica"
 			],
-			"desc": "Volver a estado de fábrica."
+			"desc": "Restablece todos los ajustes a los valores originales."
 		},
 		"VoltageCalibration": {
 			"text": "CAL VIN?",
 			"text2": [
-				"Calibrar",
-				"V entrada"
+				"Calibrar voltaje",
+				"de entrada"
 			],
-			"desc": "Calibración VIN (Voltaje de entrada). Ajuste con ambos botones, pulsación larga para salir."
+			"desc": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir."
 		},
 		"AdvancedSoldering": {
 			"text": "ADVSLD",
 			"text2": [
-				"Inf detallada",
-				"del soldadura"
+				"Info extra",
+				"al soldar"
 			],
-			"desc": "Mostrar información detallada mientras suelda."
+			"desc": "Muestra más datos por pantalla cuando se está soldando."
 		},
 		"ScrollingSpeed": {
 			"text": "DESCSP",
@@ -196,55 +202,79 @@
 				"Velocidad",
 				"del texto"
 			],
-			"desc": "Velocidad de desplazamiento del texto."
+			"desc": "Velocidad de desplazamiento del texto <R=rápida L=lenta>"
 		},
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
-				"Model"
+				"Modelo de",
+				"punta"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Elegir el modelo de punta actual."
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Calibración",
+				"simple"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Calibración simple con agua caliente."
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Calibración",
+				"avanzada"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Calibrar con un termopar en la punta; más difícil."
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Potencia de",
+				"entrada"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Potencia en vatios del adaptador de corriente utilizado."
 		},
 		"PowerLimitEnable": {
 			"text": "PLIMEN",
 			"text2": [
-				"P Limit",
-				"Enable"
+				"Limitar la",
+				"potenc. máx."
 			],
-			"desc": "Enable power limit"
+			"desc": "Activa el límite de potencia máxima."
 		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Ajustar la",
+				"potenc. máx."
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"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!"
 		}
 	}
 }

Translation Editor/translation_fi.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "KÄRKI ON IRTI",
 		"SolderingAdvancedPowerPrompt": "Teho: ",
 		"OffString": "OFF",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "O",
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "N",
-		"SettingSlowChar": "H"
+		"SettingSlowChar": "H",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_fr.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "PANNE DÉBRANCHÉE",
 		"SolderingAdvancedPowerPrompt": "Puissance: ",
 		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "G",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "A",
+		"SettingStartSleepChar": "V",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "D"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_hr.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "VRH NIJE SPOJEN!",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
 		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "B",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_hu.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "HEGY LEVÉVE",
 		"SolderingAdvancedPowerPrompt": "Telj: ",
 		"OffString": "Ki",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "J",
 		"SettingLeftChar": "B",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "G",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_it.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "PUNTA ASSENTE",
 		"SolderingAdvancedPowerPrompt": "Potenz:",
 		"OffString": "OFF",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "S",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "V",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "A",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "D"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_lt.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "ANTGAL ATJUNGTAS",
 		"SolderingAdvancedPowerPrompt": "Maitinimas: ",
 		"OffString": "Išj",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "K",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "T",
-		"SettingSlowChar": "N"
+		"SettingSlowChar": "N",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_nl.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "TIP LOSGEKOPPELD",
 		"SolderingAdvancedPowerPrompt": "vermogen: ",
 		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_nl_be.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "Punt ONTKOPPELD",
 		"SolderingAdvancedPowerPrompt": "Vermogen: ",
 		"OffString": "Uit",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "S",
-		"SettingSlowChar": "T"
+		"SettingSlowChar": "T",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_no.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "SPISS FRAKOBLET",
 		"SolderingAdvancedPowerPrompt": "Effekt: ",
 		"OffString": "Av",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "H",
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "H",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "L",
+		"SettingStartSleepChar": "D",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "I"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_pl.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "GROT ODŁĄCZONY",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Wyłącz",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "P",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "N"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_pt.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "SEM PONTA",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "C",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_ru.json

@@ -6,29 +6,35 @@
 		"SettingsCalibrationDone": "Калибровка выполнена!",
 		"SettingsCalibrationWarning": "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!",
 		"SettingsResetWarning": "Вы действительно хотите сбросить настройки до значений по умолчанию?",
-		"UVLOWarningString": "АККУМ--",
+		"UVLOWarningString": "НАПРЯЖ--",
 		"UndervoltageString": "Под питанием",
 		"InputVoltageString": "Питание B: ",
 		"WarningTipTempString": "Жало t°: ",
 		"BadTipString": "Жало--",
 		"SleepingSimpleString": "Сон ",
 		"SleepingAdvancedString": "Ожидание...",
-		"WarningSimpleString": " АЙ!",
-		"WarningAdvancedString": "ВНИМАНИЕ ГОРЯЧО",
+		"WarningSimpleString": " ГОРЯЧО!",
+		"WarningAdvancedString": "!!! ГОРЯЧЕЕ ЖАЛО !!!",
 		"SleepingTipAdvancedString": "Жало:",
 		"IdleTipString": "Жало:",
 		"IdleSetString": " ->",
-		"TipDisconnectedString": "Жало отключено",
+		"TipDisconnectedString": "ЖАЛО ОТСОЕДИНЕНО",
 		"SolderingAdvancedPowerPrompt": "Питание: ",
-		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"OffString": "Выкл.",
+		"ResetOKMessage": "Сброс OK",
+		"YourGainMessage": "Прирост:",
+		"SettingsResetMessage": "Настройки \nсброшены!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "+",
-		"SettingSlowChar": "-"
+		"SettingSlowChar": "-",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -68,7 +74,7 @@
 				"Источник",
 				"питания"
 			],
-			"desc": "Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>"
+			"desc": "Источник питания. Установка напряжения отключения. <DC = 10 В, S = 3.3 В на батарею, ограничение мощности выкл.>"
 		},
 		"SleepTemperature": {
 			"text": "Тожд",
@@ -84,7 +90,7 @@
 				"Таймаут",
 				"сна"
 			],
-			"desc": "Время до перехода в режим ожидания <Минуты>"
+			"desc": "Время до перехода в режим ожидания <Минуты/Секунды>"
 		},
 		"ShutdownTimeout": {
 			"text": "Тоткл",
@@ -100,7 +106,7 @@
 				"Чувст. сенсо-",
 				"ра движения"
 			],
-			"desc": "Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>"
+			"desc": "Акселерометр <0 = Выкл, 1 = Мин. чувствительный, 9 = Макс. чувствительный>"
 		},
 		"TemperatureUnit": {
 			"text": "ЕдТемп",
@@ -108,7 +114,7 @@
 				"Формат темпе-",
 				"ратуры(C°/F°)"
 			],
-			"desc": "В чем измерять температуру"
+			"desc": "Единица измерения температуры <C = Цельсия, F = Фаренгейт>"
 		},
 		"AdvancedIdle": {
 			"text": "ИнфОжд",
@@ -124,7 +130,7 @@
 				"Автоповорот",
 				"экрана"
 			],
-			"desc": "Ориентация дисплея <A. Автоматический, Л. Левая рука, П. Правая рука>"
+			"desc": "Ориентация дисплея <A = Авто, Л = Левая рука, П = Правая рука>"
 		},
 		"BoostEnabled": {
 			"text": "Турбо",
@@ -132,7 +138,7 @@
 				"Режим",
 				"Турбо"
 			],
-			"desc": "Турбо-режим при удержании кнопки А при пайке "
+			"desc": "Активирует \"Турбо-режим\" при удержании кнопки А во время пайки"
 		},
 		"BoostTemperature": {
 			"text": "Ттур",
@@ -140,7 +146,7 @@
 				"Темпер.",
 				"Турбо"
 			],
-			"desc": "Температура в турбо-режиме"
+			"desc": "Температура в \"Турбо-режиме\""
 		},
 		"AutoStart": {
 			"text": "Астарт",
@@ -148,7 +154,7 @@
 				"Горячий",
 				"старт"
 			],
-			"desc": "Автоматический запуск паяльника при включении питания. T=Нагрев, S=Режим ожидания,F=Выкл."
+			"desc": "Автоматический запуск паяльника при включении питания <T = Нагрев, S = Режим ожидания, F = Выкл.>"
 		},
 		"CooldownBlink": {
 			"text": "Охлажд",
@@ -156,7 +162,7 @@
 				"Показ t° при",
 				"остывании"
 			],
-			"desc": "Показывать температуру на экране охлаждения, пока жало остается горячим."
+			"desc": "Показывать температуру на экране охлаждения, пока жало остается горячим"
 		},
 		"TemperatureCalibration": {
 			"text": "КалибрТ",
@@ -164,7 +170,7 @@
 				"Калибровка",
 				"температуры"
 			],
-			"desc": "Калибровка термодатчика."
+			"desc": "Калибровка термодатчика"
 		},
 		"SettingsReset": {
 			"text": "СБРОС?",
@@ -172,7 +178,7 @@
 				"Сбросить все",
 				"настройки?"
 			],
-			"desc": "Сброс всех настроек."
+			"desc": "Сброс всех настроек"
 		},
 		"VoltageCalibration": {
 			"text": "КалибрU?",
@@ -180,7 +186,7 @@
 				"Калибровка",
 				"напряжения"
 			],
-			"desc": "Калибровка напряжения входа. Настройка кнопками, нажать и удержать чтобы завершить."
+			"desc": "Калибровка входного напряжения. Настройка кнопками, нажать и удержать чтобы завершить"
 		},
 		"AdvancedSoldering": {
 			"text": "ИнфПай",
@@ -188,7 +194,7 @@
 				"Подробный ре-",
 				"жим пайки"
 			],
-			"desc": "Показывать детальную информацию при пайке."
+			"desc": "Показывать детальную информацию при пайке"
 		},
 		"ScrollingSpeed": {
 			"text": "DESCSP",
@@ -225,26 +231,50 @@
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Мощность",
+				"адаптера"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Мощность используемого адаптера питания"
 		},
 		"PowerLimitEnable": {
 			"text": "PLIMEN",
 			"text2": [
-				"P Limit",
-				"Enable"
+				"Ограничение",
+				"мощности"
 			],
-			"desc": "Enable power limit"
+			"desc": "Включает ограничение мощности потребления"
 		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Максимальная",
+				"мощность"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"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!"
 		}
 	}
 }

Translation Editor/translation_sk.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_sl.json

@@ -29,7 +29,11 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "S",
 		"SettingFastChar": "H",
-		"SettingSlowChar": "P"
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -246,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!"
 		}
 	}
 }

Translation Editor/translation_sr_cyrl.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
 		"SolderingAdvancedPowerPrompt": "Снага: ",
 		"OffString": "Иск",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "Д",
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "А",
 		"SettingFastChar": "Б",
-		"SettingSlowChar": "С"
+		"SettingSlowChar": "С",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_sr_latn.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "VRH NIJE SPOJEN",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
 		"OffString": "Isk",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "B",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_sv.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "SPETS URTAGEN",
 		"SolderingAdvancedPowerPrompt": "Ström: ",
 		"OffString": "Av",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "H",
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "S",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_tr.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "UÇ ÇIKARILDI",
 		"SolderingAdvancedPowerPrompt": "Güç: ",
 		"OffString": "Kapalı",
-		"ResetOKMessage":"Reset Tamam"
+		"ResetOKMessage": "Reset Tamam"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -245,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!"
 		}
 	}
 }

Translation Editor/translation_uk.json

@@ -21,14 +21,18 @@
 		"TipDisconnectedString": "Жало вимкнено!",
 		"SolderingAdvancedPowerPrompt": "Живлення: ",
 		"OffString": "Вимк",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "П",
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "+",
-		"SettingSlowChar": "-"
+		"SettingSlowChar": "-",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -177,7 +181,7 @@
 		"VoltageCalibration": {
 			"text": "",
 			"text2": [
-				"Калібровка",
+				"Калібрування",
 				"напруги"
 			],
 			"desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
@@ -233,18 +237,42 @@
 		"PowerLimitEnable": {
 			"text": "PLIMEN",
 			"text2": [
-				"P Limit",
-				"Enable"
+				"Ліміт",
+				"потужності"
 			],
-			"desc": "Enable power limit"
+			"desc": "Вмикає обмеження потужності споживання"
 		},
 		"PowerLimit": {
 			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Максимальна",
+				"потужність"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"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!"
 		}
 	}
-}
+}

Translation Editor/translations_def.js

@@ -116,6 +116,22 @@ var def =
 		{
 			"id": "SettingSlowChar",
 			"len": 1
+		},
+		{
+			"id": "SettingStartSolderingChar",
+			"len": 1
+		},
+		{
+			"id": "SettingStartSleepChar",
+			"len": 1
+		},
+		{
+			"id": "SettingStartSleepOffChar",
+			"len": 1
+		},
+		{
+			"id": "SettingStartNoneChar",
+			"len": 1
 		}
 	],
 	"menuGroups": [
@@ -251,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
 		}
 	]
 }

workspace/TS100/.project

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>TS100</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+	</natures>
+</projectDescription>

workspace/TS100/Core/Inc/Settings.h

@@ -11,7 +11,8 @@
 #define SETTINGS_H_
 #include <stdint.h>
 #include "stm32f1xx_hal.h"
-#define SETTINGSVERSION   ( 0x1C )
+#include "unit.h"
+#define SETTINGSVERSION   ( 0x1E )
 /*Change this if you change the struct below to prevent people getting \
           out of sync*/
 
@@ -35,7 +36,9 @@ typedef struct {
 								  // down screen until its <50C
 	uint8_t detailedIDLE :1;       // Detailed idle screen
 	uint8_t detailedSoldering :1;  // Detailed soldering screens
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 	uint8_t temperatureInF;         // Should the temp be in F or C (true is F)
+#endif
 	uint8_t descriptionScrollSpeed :1;  // Description scroll speed
 	uint16_t voltageDiv;                 // Voltage divisor factor
 	uint16_t BoostTemp;                  // Boost mode set point for the iron
@@ -50,6 +53,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;

workspace/TS100/Core/Inc/Translation.h

@@ -8,6 +8,7 @@
 #ifndef TRANSLATION_H_
 #define TRANSLATION_H_
 #include "stm32f1xx_hal.h"
+#include "unit.h"
 enum ShortNameType {
 	SHORT_NAME_SINGLE_LINE = 1, SHORT_NAME_DOUBLE_LINE = 2,
 };
@@ -18,59 +19,62 @@ 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* SettingsMenuEntries[4];
+extern const char *SettingsShortNames[26][2];
+extern const char *SettingsDescriptions[26];
+extern const char *SettingsMenuEntries[4];
 
-extern const char* SettingsCalibrationDone;
-extern const char* SettingsCalibrationWarning;
-extern const char* SettingsResetWarning;
-extern const char* UVLOWarningString;
-extern const char* UndervoltageString;
-extern const char* InputVoltageString;
-extern const char* WarningTipTempString;
-extern const char* BadTipString;
+extern const char *SettingsCalibrationDone;
+extern const char *SettingsCalibrationWarning;
+extern const char *SettingsResetWarning;
+extern const char *UVLOWarningString;
+extern const char *UndervoltageString;
+extern const char *InputVoltageString;
+extern const char *WarningTipTempString;
+extern const char *BadTipString;
 
-extern const char* SleepingSimpleString;
-extern const char* SleepingAdvancedString;
-extern const char* WarningSimpleString;
-extern const char* WarningAdvancedString;
-extern const char* SleepingTipAdvancedString;
-extern const char* IdleTipString;
-extern const char* IdleSetString;
-extern const char* TipDisconnectedString;
-extern const char* SolderingAdvancedPowerPrompt;
-extern const char* OffString;
-extern const char* ResetOKMessage;
-extern const char* YourGainMessage;
-extern const char* SettingsResetMessage;
+extern const char *SleepingSimpleString;
+extern const char *SleepingAdvancedString;
+extern const char *WarningSimpleString;
+extern const char *WarningAdvancedString;
+extern const char *SleepingTipAdvancedString;
+extern const char *IdleTipString;
+extern const char *IdleSetString;
+extern const char *TipDisconnectedString;
+extern const char *SolderingAdvancedPowerPrompt;
+extern const char *OffString;
+extern const char *ResetOKMessage;
+extern const char *YourGainMessage;
+extern const char *SettingsResetMessage;
 
-extern const char* SettingTrueChar;
-extern const char* SettingFalseChar;
-extern const char* SettingRightChar;
-extern const char* SettingLeftChar;
-extern const char* SettingAutoChar;
+extern const char *SettingTrueChar;
+extern const char *SettingFalseChar;
+extern const char *SettingRightChar;
+extern const char *SettingLeftChar;
+extern const char *SettingAutoChar;
+extern const char *SettingStartSolderingChar;
+extern const char *SettingStartSleepChar;
+extern const char *SettingStartSleepOffChar;
+extern const char *SettingStartNoneChar;
 
-extern const char* SettingFastChar;
-extern const char* SettingSlowChar;
-extern const char*  TipModelStrings[];
-extern const char* DebugMenu[];
-extern const char* SymbolPlus;
-extern const char* SymbolMinus;
-extern const char* SymbolSpace;
-extern const char* SymbolDot;
-extern const char* SymbolDegC;
-extern const char* SymbolDegF;
-extern const char* SymbolMinutes;
-extern const char* SymbolSeconds;
-extern const char* SymbolWatts;
-extern const char* SymbolVolts;
-extern const char* SymbolDC;
-extern const char* SymbolCellCount;
-extern const char* SymbolManual;
-extern const char* SymbolAuto;
-extern const char* SymbolSleep;
-extern const char* SymbolVersionNumber;
+extern const char *SettingFastChar;
+extern const char *SettingSlowChar;
+extern const char *TipModelStrings[];
+extern const char *DebugMenu[];
+extern const char *SymbolPlus;
+extern const char *SymbolMinus;
+extern const char *SymbolSpace;
+extern const char *SymbolDot;
+extern const char *SymbolDegC;
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
+	extern const char *SymbolDegF;
+#endif
+extern const char *SymbolMinutes;
+extern const char *SymbolSeconds;
+extern const char *SymbolWatts;
+extern const char *SymbolVolts;
+extern const char *SymbolDC;
+extern const char *SymbolCellCount;
+extern const char *SymbolVersionNumber;
 
-extern const char* DebugMenu[];
+extern const char *DebugMenu[];
 #endif /* TRANSLATION_H_ */

workspace/TS100/Core/Inc/hardware.h

@@ -12,6 +12,7 @@
 #include "FreeRTOS.h"
 #include "stm32f1xx_hal.h"
 #include "cmsis_os.h"
+#include "unit.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -124,7 +125,9 @@ void setTipPWM(uint8_t pulse);
 uint16_t ctoTipMeasurement(uint16_t temp);
 uint16_t tipMeasurementToC(uint16_t raw);
 uint16_t ftoTipMeasurement(uint16_t temp);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 uint16_t tipMeasurementToF(uint16_t raw);
+#endif
 void seekQC(int16_t Vx10, uint16_t divisor);
 void setCalibrationOffset(int16_t offSet);
 void setTipType(enum TipType tipType, uint8_t manualCalGain);

workspace/TS100/Core/Src/GUIThread.cpp

@@ -17,9 +17,13 @@
 #include "stm32f1xx_hal.h"
 #include "string.h"
 #include "TipThermoModel.h"
+#include "unit.h"
+#include "../../configuration.h"
+
 extern uint8_t PCBVersion;
 // File local variables
 extern uint32_t currentTempTargetDegC;
+extern uint8_t accelInit;
 extern uint32_t lastMovementTime;
 extern int16_t idealQCVoltage;
 uint32_t lastButtonTime = 0;
@@ -55,25 +59,30 @@ void GUIDelay() {
 void gui_drawTipTemp(bool symbol) {
 	// Draw tip temp handling unit conversion & tolerance near setpoint
 	uint16_t Temp = 0;
-
-	if (systemSettings.temperatureInF)
-		Temp = TipThermoModel::getTipInF();
-	else
-		Temp = TipThermoModel::getTipInC();
+	#ifdef ENABLED_FAHRENHEIT_SUPPORT
+		if (systemSettings.temperatureInF)
+			Temp = TipThermoModel::getTipInF();
+		else
+	#endif
+			Temp = TipThermoModel::getTipInC();
 
 	OLED::printNumber(Temp, 3);  // Draw the tip temp out finally
 	if (symbol) {
 		if (OLED::getFont() == 0) {
 			//Big font, can draw nice symbols
-			if (systemSettings.temperatureInF)
-				OLED::drawSymbol(0);
-			else
-				OLED::drawSymbol(1);
+			#ifdef ENABLED_FAHRENHEIT_SUPPORT
+				if (systemSettings.temperatureInF)
+					OLED::drawSymbol(0);
+				else
+			#endif
+					OLED::drawSymbol(1);
 		} else {
 			//Otherwise fall back to chars
-			if (systemSettings.temperatureInF)
-				OLED::print(SymbolDegF);
-			else
+			#ifdef ENABLED_FAHRENHEIT_SUPPORT
+				if (systemSettings.temperatureInF)
+					OLED::print(SymbolDegF);
+				else
+			#endif
 				OLED::print(SymbolDegC);
 		}
 	}
@@ -202,7 +211,7 @@ static bool checkVoltageForExit() {
 				OLED::setCursor(0, 8);
 				OLED::print(InputVoltageString);
 				printVoltage();
-				OLED::print("V");
+				OLED::print(SymbolVolts);
 
 			} else {
 				OLED::setFont(0);
@@ -277,27 +286,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;
@@ -308,12 +326,16 @@ static void gui_solderingTempAdjust() {
 					- PRESS_ACCEL_INTERVAL_MIN;
 		}
 		// constrain between 50-450 C
+		#ifdef ENABLED_FAHRENHEIT_SUPPORT
 		if (systemSettings.temperatureInF) {
 			if (systemSettings.SolderingTemp > 850)
 				systemSettings.SolderingTemp = 850;
 			if (systemSettings.SolderingTemp < 120)
 				systemSettings.SolderingTemp = 120;
-		} else {
+		} 
+		else 
+		#endif
+		{
 			if (systemSettings.SolderingTemp > 450)
 				systemSettings.SolderingTemp = 450;
 			if (systemSettings.SolderingTemp < 50)
@@ -324,62 +346,77 @@ 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);
+		#ifdef ENABLED_FAHRENHEIT_SUPPORT
 		if (systemSettings.temperatureInF)
 			OLED::drawSymbol(0);
 		else
+		#endif
+		{
 			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();
 	}
 }
 
-static int gui_SolderingSleepingMode() {
+static int gui_SolderingSleepingMode(bool stayOff) {
 	// Drop to sleep temperature and display until movement or button press
 
 	for (;;) {
 		ButtonState buttons = getButtonState();
 		if (buttons)
 			return 0;
-		if ((xTaskGetTickCount() - lastMovementTime < 100)
-				|| (xTaskGetTickCount() - lastButtonTime < 100))
+		if ((xTaskGetTickCount() > 100)
+			&& ((accelInit && (xTaskGetTickCount() - lastMovementTime < 100))
+				|| (xTaskGetTickCount() - lastButtonTime < 100)))
 			return 0;  // user moved or pressed a button, go back to soldering
 #ifdef MODEL_TS100
 		if (checkVoltageForExit())
 			return 1; // return non-zero on error
 #endif
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 		if (systemSettings.temperatureInF) {
-			currentTempTargetDegC = TipThermoModel::convertFtoC(
+			currentTempTargetDegC = stayOff ? 0 : TipThermoModel::convertFtoC(
 					min(systemSettings.SleepTemp,
 							systemSettings.SolderingTemp));
-		} else {
-			currentTempTargetDegC = (min(systemSettings.SleepTemp,
-					systemSettings.SolderingTemp));
+		} else 
+#endif
+		{
+			currentTempTargetDegC = stayOff ? 0 : min(systemSettings.SleepTemp,
+					systemSettings.SolderingTemp);
 		}
 		// draw the lcd
 		uint16_t tipTemp;
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 		if (systemSettings.temperatureInF)
 			tipTemp = TipThermoModel::getTipInF();
 		else
+#endif
+		{
 			tipTemp = TipThermoModel::getTipInC();
+		}
 
 		OLED::clearScreen();
 		OLED::setCursor(0, 0);
@@ -389,10 +426,14 @@ static int gui_SolderingSleepingMode() {
 			OLED::setCursor(0, 8);
 			OLED::print(SleepingTipAdvancedString);
 			OLED::printNumber(tipTemp, 3);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 			if (systemSettings.temperatureInF)
 				OLED::print(SymbolDegF);
 			else
+#endif
+			{
 				OLED::print(SymbolDegC);
+			}
 
 			OLED::print(SymbolSpace);
 			printVoltage();
@@ -401,10 +442,14 @@ static int gui_SolderingSleepingMode() {
 			OLED::setFont(0);
 			OLED::print(SleepingSimpleString);
 			OLED::printNumber(tipTemp, 3);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 			if (systemSettings.temperatureInF)
 				OLED::drawSymbol(0);
 			else
+#endif
+			{
 				OLED::drawSymbol(1);
+			}
 		}
 		if (systemSettings.ShutdownTime) // only allow shutdown exit if time > 0
 			if (lastMovementTime)
@@ -460,7 +505,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 	else
 		sleepThres = (systemSettings.SleepTime - 5) * 60 * 100;
 	if (jumpToSleep) {
-		if (gui_SolderingSleepingMode()) {
+		if (gui_SolderingSleepingMode(jumpToSleep == 2)) {
 			lastButtonTime = xTaskGetTickCount();
 			return;  // If the function returns non-0 then exit
 		}
@@ -501,7 +546,6 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 		OLED::setCursor(0, 0);
 		OLED::clearScreen();
 		OLED::setFont(0);
-		uint16_t tipTemp = getTipRawTemp(0);
 		//Draw in the screen details
 		if (systemSettings.detailedSoldering) {
 			OLED::setFont(1);
@@ -563,18 +607,25 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 
 		// Update the setpoints for the temperature
 		if (boostModeOn) {
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 			if (systemSettings.temperatureInF)
 				currentTempTargetDegC = TipThermoModel::convertFtoC(
 						systemSettings.BoostTemp);
 			else
+#endif
+			{
 				currentTempTargetDegC = (systemSettings.BoostTemp);
-
+			}
 		} else {
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 			if (systemSettings.temperatureInF)
 				currentTempTargetDegC = TipThermoModel::convertFtoC(
 						systemSettings.SolderingTemp);
 			else
+#endif
+			{
 				currentTempTargetDegC = (systemSettings.SolderingTemp);
+			}
 		}
 
 #ifdef MODEL_TS100
@@ -595,7 +646,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 		if (systemSettings.sensitivity && systemSettings.SleepTime)
 			if (xTaskGetTickCount() - lastMovementTime > sleepThres
 					&& xTaskGetTickCount() - lastButtonTime > sleepThres) {
-				if (gui_SolderingSleepingMode()) {
+				if (gui_SolderingSleepingMode(false)) {
 					return;  // If the function returns non-0 then exit
 				}
 			}
@@ -700,6 +751,7 @@ void startGUITask(void const *argument __unused) {
 
 	if (settingsWereReset) {
 		//Display alert settings were reset
+		OLED::clearScreen();
 		OLED::setFont(1);
 		OLED::setCursor(0, 0);
 		OLED::print(SettingsResetMessage);
@@ -711,9 +763,20 @@ void startGUITask(void const *argument __unused) {
 	if (systemSettings.autoStartMode) {
 		// jump directly to the autostart mode
 		if (systemSettings.autoStartMode == 1)
+		{
 			gui_solderingMode(0);
-		if (systemSettings.autoStartMode == 2)
+			buttonLockout = true;
+		}
+		else if (systemSettings.autoStartMode == 2)
+		{
 			gui_solderingMode(1);
+			buttonLockout = true;
+		}
+		else if (systemSettings.autoStartMode == 3)
+		{
+			gui_solderingMode(2);
+			buttonLockout = true;
+		}
 	}
 
 #ifdef ACCELDEBUG

workspace/TS100/Core/Src/OLED.cpp

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include "Translation.h"
 #include "cmsis_os.h"
+#include "../../configuration.h"
 
 const uint8_t *OLED::currentFont;  // Pointer to the current font used for
 // rendering to the buffer

workspace/TS100/Core/Src/Settings.cpp

@@ -10,6 +10,7 @@
 
 #include "Settings.h"
 #include "Setup.h"
+#include "../../configuration.h"
 #define FLASH_ADDR \
   (0x8000000 |     \
    0xFC00) /*Flash start OR'ed with the maximum amount of flash - 1024 bytes*/
@@ -77,40 +78,33 @@ uint8_t lookupVoltageLevel(uint8_t level) {
 }
 void resetSettings() {
 	memset((void*) &systemSettings, 0, sizeof(systemSettingsType));
-	systemSettings.SleepTemp = 150; // Temperature the iron sleeps at - default 150.0 C
-	systemSettings.SleepTime = 6; // How many seconds/minutes we wait until going
+	systemSettings.SleepTemp = SLEEP_TEMP; // Temperature the iron sleeps at - default 150.0 C
+	systemSettings.SleepTime = SLEEP_TIME; // How many seconds/minutes we wait until going
 								  // to sleep - default 1 min
-	systemSettings.SolderingTemp = 320;  // Default soldering temp is 320.0 C
-	systemSettings.cutoutSetting = 0; // default to no cut-off voltage (or 18W for TS80)
+	systemSettings.SolderingTemp = SOLDERING_TEMP;  // Default soldering temp is 320.0 C
+	systemSettings.cutoutSetting = CUT_OUT_SETTING; // default to no cut-off voltage (or 18W for TS80)
 	systemSettings.version =
 	SETTINGSVERSION;  // Store the version number to allow for easier upgrades
-	systemSettings.detailedSoldering = 0;  // Detailed soldering screen
-	systemSettings.detailedIDLE = 0; // Detailed idle screen (off for first time users)
-	systemSettings.OrientationMode = 2;  // Default to automatic
-	systemSettings.sensitivity = 7;      // Default high sensitivity
-#ifdef MODEL_TS80
-	systemSettings.voltageDiv = 780;  // Default divider from schematic
-
-#else
-  systemSettings.voltageDiv = 467;  // Default divider from schematic
-#endif
-	systemSettings.ShutdownTime = 10; // How many minutes until the unit turns itself off
-	systemSettings.boostModeEnabled = 1; // Default to having boost mode on as most people prefer it
-	systemSettings.BoostTemp = 420;    // default to 400C
-	systemSettings.autoStartMode = 0;  // Auto start off for safety
-	systemSettings.coolingTempBlink = 0; // Blink the temperature on the cooling screen when its > 50C
-	systemSettings.temperatureInF = 0;          // default to 0
-	systemSettings.descriptionScrollSpeed = 0;  // default to slow
-  systemSettings.powerLimitEnable = 0; // Default to no power limit
-#ifdef MODEL_TS100
-	systemSettings.CalibrationOffset = 900;  // the adc offset in uV
-	systemSettings.pidPowerLimit = 70;  // Sets the max pwm power limit
-	systemSettings.powerLimit = 30; // 30 watts default limit
-#endif
-#ifdef MODEL_TS80
-	systemSettings.pidPowerLimit = 24;  // Sets the max pwm power limit
-	systemSettings.CalibrationOffset = 900;  // the adc offset in uV
-	systemSettings.powerLimit = 24; // 24 watts default power limit
+	systemSettings.detailedSoldering = DETAILED_SOLDERING;  // Detailed soldering screen
+	systemSettings.detailedIDLE = DETAILED_IDLE; // Detailed idle screen (off for first time users)
+	systemSettings.OrientationMode = ORIENTATION_MODE;  // Default to automatic
+	systemSettings.sensitivity = SENSITIVITY;      // Default high sensitivity
+	systemSettings.voltageDiv = VOLTAGE_DIV;  // Default divider from schematic
+	systemSettings.ShutdownTime = SHUTDOWN_TIME; // How many minutes until the unit turns itself off
+	systemSettings.boostModeEnabled = BOOST_MODE_ENABLED; // Default to having boost mode on as most people prefer it
+	systemSettings.BoostTemp = BOOST_TEMP;    // default to 400C
+	systemSettings.autoStartMode = AUTO_START_MODE;  // Auto start off for safety
+	systemSettings.coolingTempBlink = COOLING_TEMP_BLINK; // Blink the temperature on the cooling screen when its > 50C
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
+	systemSettings.temperatureInF = TEMPERATURE_INF;          // default to 0
 #endif
+	systemSettings.descriptionScrollSpeed = DESCRIPTION_SCROLL_SPEED;  // default to slow
+	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
 }

workspace/TS100/Core/Src/TipThermoModel.cpp

@@ -8,6 +8,7 @@
 #include "TipThermoModel.h"
 #include "Settings.h"
 #include "hardware.h"
+#include "../../configuration.h"
 
 /*
  * The hardware is laid out  as a non-inverting op-amp
@@ -26,24 +27,12 @@
  * This was bought to my attention by <Kuba Sztandera>
  */
 
-// TIP_GAIN =  TIP_GAIN/1000 == uV per deg C constant of the tip
-#ifdef MODEL_TS100
-#define OP_AMP_Rf 		750*1000 		/*750  Kilo-ohms -> From schematic, R1*/
-#define OP_AMP_Rin 		2370			/*2.37 Kilo-ohms -> From schematic, R2*/
-#define TIP_GAIN 405
-#else
-#define OP_AMP_Rf 		180*1000 		/*180  Kilo-ohms -> From schematic, R6*/
-#define OP_AMP_Rin 		2000			/*2.0  Kilo-ohms -> From schematic, R3*/
-#define TIP_GAIN 115
-
-#endif
-
 #define  op_amp_gain_stage  (1+(OP_AMP_Rf/OP_AMP_Rin))
 uint32_t TipThermoModel::convertTipRawADCTouV(uint16_t rawADC) {
 	// This takes the raw ADC samples, converts these to uV
 	// Then divides this down by the gain to convert to the uV on the input to the op-amp (A+B terminals)
 	// Then remove the calibration value that is stored as a tip offset
-	uint32_t vddRailmVX10 = 33000;	//TODO use ADC Vref to calculate this
+	uint32_t vddRailmVX10 = 33000;	//The vreg is +-2%, but we have no higher accuracy available
 	// 4096 * 8 readings for full scale
 	// Convert the input ADC reading back into mV times 10 format.
 	uint32_t rawInputmVX10 = (rawADC * vddRailmVX10) / (4096 * 8);
@@ -63,9 +52,11 @@ uint32_t TipThermoModel::convertTipRawADCTouV(uint16_t rawADC) {
 uint32_t TipThermoModel::convertTipRawADCToDegC(uint16_t rawADC) {
 	return convertuVToDegC(convertTipRawADCTouV(rawADC));
 }
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 uint32_t TipThermoModel::convertTipRawADCToDegF(uint16_t rawADC) {
 	return convertuVToDegF(convertTipRawADCTouV(rawADC));
 }
+#endif
 
 //Table that is designed to be walked to find the best sample for the lookup
 
@@ -80,13 +71,14 @@ int32_t LinearInterpolate(int32_t x1, int32_t y1, int32_t x2, int32_t y2,
 }
 
 uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) {
-	//based on new measurements, tip is quite linear at 24.9uV per deg C = 2.49 per 0.1C
+	//based on new measurements, tip is quite linear
 	//
 	tipuVDelta *= TIP_GAIN;
 	tipuVDelta /= 10000;
 	return tipuVDelta;
 }
 
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 uint32_t TipThermoModel::convertuVToDegF(uint32_t tipuVDelta) {
 	tipuVDelta *= TIP_GAIN;
 	tipuVDelta /= 1000;
@@ -105,6 +97,7 @@ uint32_t TipThermoModel::convertFtoC(uint32_t degF) {
 		return 0;
 	return ((degF - 32) * 5) / 9;
 }
+#endif
 
 uint32_t TipThermoModel::getTipInC(bool sampleNow) {
 	uint32_t currentTipTempInC = TipThermoModel::convertTipRawADCToDegC(
@@ -112,17 +105,18 @@ uint32_t TipThermoModel::getTipInC(bool sampleNow) {
 	currentTipTempInC += getHandleTemperature() / 10; //Add handle offset
 	return currentTipTempInC;
 }
-
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 uint32_t TipThermoModel::getTipInF(bool sampleNow) {
 	uint32_t currentTipTempInF = TipThermoModel::convertTipRawADCToDegF(
 			getTipRawTemp(sampleNow));
 	currentTipTempInF += convertCtoF(getHandleTemperature() / 10); //Add handle offset
 	return currentTipTempInF;
 }
+#endif
 
 uint32_t TipThermoModel::getTipMaxInC() {
 	uint32_t maximumTipTemp = TipThermoModel::convertTipRawADCToDegC(
-			0x7FFF - 10);
+			0x7FFF - (80 * 5)); //back off approx 5 deg c from ADC max
 	maximumTipTemp += getHandleTemperature() / 10; //Add handle offset
-	return maximumTipTemp;
+	return maximumTipTemp - 1;
 }

workspace/TS100/Core/Src/TipThermoModel.h

@@ -9,25 +9,34 @@
 #define SRC_TIPTHERMOMODEL_H_
 #include "stdint.h"
 #include "hardware.h"
+#include "unit.h"
 class TipThermoModel {
 public:
 	//These are the main two functions
 	static uint32_t getTipInC(bool sampleNow = false);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 	static uint32_t getTipInF(bool sampleNow = false);
+#endif
 
 	//Calculates the maximum temperature can can be read by the ADC range
 	static uint32_t getTipMaxInC();
 
 	static uint32_t convertTipRawADCToDegC(uint16_t rawADC);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 	static uint32_t convertTipRawADCToDegF(uint16_t rawADC);
+#endif
 	//Returns the uV of the tip reading before the op-amp compensating for pullups
 	static uint32_t convertTipRawADCTouV(uint16_t rawADC);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 	static uint32_t convertCtoF(uint32_t degC);
 	static uint32_t convertFtoC(uint32_t degF);
+#endif
 
 private:
 	static uint32_t convertuVToDegC(uint32_t tipuVDelta);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 	static uint32_t convertuVToDegF(uint32_t tipuVDelta);
+#endif
 };
 
 #endif /* SRC_TIPTHERMOMODEL_H_ */

workspace/TS100/Core/Src/gui.cpp

@@ -11,15 +11,18 @@
 #include "main.hpp"
 #include "TipThermoModel.h"
 #include "string.h"
+#include "unit.h"
+#include "../../configuration.h"
+
 extern uint32_t lastButtonTime;
 void gui_Menu(const menuitem *menu);
-#ifdef MODEL_TS100
-static void settings_setInputVRange(void);
-static void settings_displayInputVRange(void);
-#else
-static void settings_setInputPRange(void);
-static void settings_displayInputPRange(void);
 
+#ifdef MODEL_TS100
+  static void settings_setInputVRange(void);
+  static void settings_displayInputVRange(void);
+#else
+  static void settings_setInputPRange(void);
+  static void settings_displayInputPRange(void);
 #endif
 static void settings_setSleepTemp(void);
 static void settings_displaySleepTemp(void);
@@ -29,8 +32,10 @@ static void settings_setShutdownTime(void);
 static void settings_displayShutdownTime(void);
 static void settings_setSensitivity(void);
 static void settings_displaySensitivity(void);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 static void settings_setTempF(void);
 static void settings_displayTempF(void);
+#endif
 static void settings_setAdvancedSolderingScreens(void);
 static void settings_displayAdvancedSolderingScreens(void);
 static void settings_setAdvancedIDLEScreens(void);
@@ -57,6 +62,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);
@@ -75,6 +86,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
@@ -88,6 +102,7 @@ static void settings_enterAdvancedMenu(void);
  *  Temperature Unit
  *  Display orientation
  *  Cooldown blink
+ *  Reverse Temp change buttons + - 
  *
  * Advanced
  *  Enable Power Limit
@@ -132,6 +147,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*/
@@ -139,6 +156,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[] = {
@@ -148,15 +169,20 @@ const menuitem UIMenu[] = {
  *  Temperature Unit
  *  Display orientation
  *  Cooldown blink
+ *  Reverse Temp change buttons + - 
  */
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 { (const char*) SettingsDescriptions[5], { settings_setTempF }, {
 		settings_displayTempF } }, /* Temperature units*/
+#endif
 { (const char*) SettingsDescriptions[7], { settings_setDisplayRotation }, {
 		settings_displayDisplayRotation } }, /*Display Rotation*/
 { (const char*) SettingsDescriptions[11], { settings_setCoolingBlinkEnabled }, {
 		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[] = {
@@ -333,11 +359,15 @@ static void settings_displayInputPRange(void) {
 #endif
 static void settings_setSleepTemp(void) {
 	// If in C, 10 deg, if in F 20 deg
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 	if (systemSettings.temperatureInF) {
 		systemSettings.SleepTemp += 20;
 		if (systemSettings.SleepTemp > 580)
 			systemSettings.SleepTemp = 120;
-	} else {
+	} 
+	else
+#endif
+	{
 		systemSettings.SleepTemp += 10;
 		if (systemSettings.SleepTemp > 300)
 			systemSettings.SleepTemp = 50;
@@ -390,7 +420,7 @@ static void settings_displayShutdownTime(void) {
 		OLED::print(SymbolMinutes);
 	}
 }
-
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 static void settings_setTempF(void) {
 	systemSettings.temperatureInF = !systemSettings.temperatureInF;
 	if (systemSettings.temperatureInF) {
@@ -422,6 +452,7 @@ static void settings_displayTempF(void) {
 
 	OLED::print((systemSettings.temperatureInF) ? SymbolDegF : SymbolDegC);
 }
+#endif
 
 static void settings_setSensitivity(void) {
 	systemSettings.sensitivity++;
@@ -463,18 +494,10 @@ static void settings_displayPowerLimitEnable(void) {
 }
 
 static void settings_setPowerLimit(void) {
-#ifdef MODEL_TS100
-	if (systemSettings.powerLimit >= 65)
-		systemSettings.powerLimit = 5;
+	if (systemSettings.powerLimit >= MAX_POWER_LIMIT)
+		systemSettings.powerLimit = POWER_LIMIT_STEPS;
 	else
-		systemSettings.powerLimit += 5;
-#endif
-#ifdef MODEL_TS80
-	if(systemSettings.powerLimit >= 30)
-		systemSettings.powerLimit = 2;
-	else
-		systemSettings.powerLimit += 2;
-#endif
+		systemSettings.powerLimit += POWER_LIMIT_STEPS;
 }
 
 static void settings_displayPowerLimit(void) {
@@ -544,12 +567,15 @@ static void settings_displayBoostModeEnabled(void) {
 }
 
 static void settings_setBoostTemp(void) {
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 	if (systemSettings.temperatureInF) {
 		systemSettings.BoostTemp += 20;  // Go up 20F at a time
 		if (systemSettings.BoostTemp > 850) {
 			systemSettings.BoostTemp = 480;  // loop back at 250
 		}
-	} else {
+	} else 
+#endif
+	{
 		systemSettings.BoostTemp += 10;  // Go up 10C at a time
 		if (systemSettings.BoostTemp > 450) {
 			systemSettings.BoostTemp = 250;  // loop back at 250
@@ -564,7 +590,7 @@ static void settings_displayBoostTemp(void) {
 
 static void settings_setAutomaticStartMode(void) {
 	systemSettings.autoStartMode++;
-	systemSettings.autoStartMode %= 3;
+	systemSettings.autoStartMode %= 4;
 }
 
 static void settings_displayAutomaticStartMode(void) {
@@ -572,16 +598,19 @@ static void settings_displayAutomaticStartMode(void) {
 
 	switch (systemSettings.autoStartMode) {
 	case 0:
-		OLED::print(SymbolManual);
+		OLED::print(SettingStartNoneChar);
 		break;
 	case 1:
-		OLED::print(SymbolAuto);
+		OLED::print(SettingStartSolderingChar);
 		break;
 	case 2:
-		OLED::print(SymbolSleep);
+		OLED::print(SettingStartSleepChar);
+		break;
+	case 3:
+		OLED::print(SettingStartSleepOffChar);
 		break;
 	default:
-		OLED::print(SymbolManual);
+		OLED::print(SettingStartNoneChar);
 		break;
 	}
 }
@@ -714,6 +743,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);

workspace/TS100/Core/Src/hardware.cpp

@@ -233,10 +233,25 @@ void startQC(uint16_t divisor) {
 
 	// Delay 1.25 seconds
 	uint8_t enteredQC = 0;
-	vTaskDelay(125);
-	// Check if D- is low to spot a QC charger
-	if (HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO_PIN_RESET)
-		enteredQC = 1;
+	for (uint16_t i = 0; i < 200 && enteredQC == 0; i++) {
+		vTaskDelay(1);	//10mS pause
+		if (i > 130) {
+			if (HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO_PIN_RESET) {
+				enteredQC = 1;
+			}
+			if (i == 140) {
+				//For some marginal QC chargers, we try adding a pulldown
+				GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+				GPIO_InitStruct.Pull = GPIO_PULLDOWN;
+				GPIO_InitStruct.Pin = GPIO_PIN_11;
+				HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+			}
+		}
+	}
+	GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+	GPIO_InitStruct.Pull = GPIO_NOPULL;
+	GPIO_InitStruct.Pin = GPIO_PIN_11;
+	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 	if (enteredQC) {
 		// We have a QC capable charger
 		QC_Seek9V();
@@ -280,19 +295,19 @@ static unsigned int sqrt32(unsigned long n) {
 	}
 }
 int16_t calculateMaxVoltage(uint8_t useHP) {
-	// This measures the tip resistance, then it calculates the appropriate
-	// voltage To stay under ~18W. Mosfet is "9A", so no issues there
-	// QC3.0 supports up to 18W, which is 2A @9V and 1.5A @12V
+// This measures the tip resistance, then it calculates the appropriate
+// voltage To stay under ~18W. Mosfet is "9A", so no issues there
+// QC3.0 supports up to 18W, which is 2A @9V and 1.5A @12V
 	uint32_t milliOhms = 4500;
-	// Check no tip
+// Check no tip
 	if (milliOhms > 10000)
 		return -1;
-	//Because of tolerance, if a user has asked for the higher power mode, then just goto 12V and call it a day
+//Because of tolerance, if a user has asked for the higher power mode, then just goto 12V and call it a day
 	if (useHP)
 		return 120;
-	//
-	// V = sqrt(18W*R)
-	// Convert this to sqrt(18W)*sqrt(milli ohms)*sqrt(1/1000)
+//
+// V = sqrt(18W*R)
+// Convert this to sqrt(18W)*sqrt(milli ohms)*sqrt(1/1000)
 
 	uint32_t Vx = sqrt32(milliOhms);
 	if (useHP)
@@ -300,17 +315,17 @@ int16_t calculateMaxVoltage(uint8_t useHP) {
 	else
 		Vx *= 1342;	// sqrt(18) * sqrt(1/1000)*10000
 
-	// Round to nearest 200mV,
-	// So divide by 100 to start, to get in Vxx
+// Round to nearest 200mV,
+// So divide by 100 to start, to get in Vxx
 	Vx /= 100;
 	if (Vx % 10 >= 5)
 		Vx += 10;
 	Vx /= 10;
-	// Round to nearest increment of 2
+// Round to nearest increment of 2
 	if (Vx % 2 == 1)
 		Vx++;
-	//Because of how bad the tolerance is on detecting the tip resistance is
-	//Its more functional to bin this
+//Because of how bad the tolerance is on detecting the tip resistance is
+//Its more functional to bin this
 	if (Vx < 90)
 		Vx = 90;
 	else if (Vx >= 105)
@@ -332,7 +347,7 @@ void setTipPWM(uint8_t pulse) {
 // timers.
 
 void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
-	// Period has elapsed
+// Period has elapsed
 	if (htim->Instance == TIM2) {
 		// we want to turn on the output again
 		PWMSafetyTimer--;
@@ -354,7 +369,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
 }
 
 void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) {
-	// This was a when the PWM for the output has timed out
+// This was a when the PWM for the output has timed out
 	if (htim->Channel == HAL_TIM_ACTIVE_CHANNEL_4) {
 		HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
 	}

workspace/TS100/Core/Src/main.cpp

@@ -15,6 +15,7 @@
 uint8_t PCBVersion = 0;
 // File local variables
 uint32_t currentTempTargetDegC = 0; // Current temperature target in C
+uint8_t accelInit = 0;
 uint32_t lastMovementTime = 0;
 
 bool settingsWereReset = false;
@@ -124,6 +125,7 @@ void startPIDTask(void const *argument __unused) {
 	currentTempTargetDegC = 0; // Force start with no output (off). If in sleep / soldering this will
 							   // be over-ridden rapidly
 	pidTaskNotification = xTaskGetCurrentTaskHandle();
+	uint32_t PIDTempTarget = 0;
 	for (;;) {
 
 		if (ulTaskNotifyTake(pdTRUE, 2000)) {
@@ -131,15 +133,16 @@ void startPIDTask(void const *argument __unused) {
 			int32_t x10WattsOut = 0;
 			// Do the reading here to keep the temp calculations churning along
 			uint32_t currentTipTempInC = TipThermoModel::getTipInC(true);
-
-			if (currentTempTargetDegC) {
+			PIDTempTarget = currentTempTargetDegC;
+			if (PIDTempTarget) {
 				// Cap the max set point to 450C
-				if (currentTempTargetDegC > (450)) {
+				if (PIDTempTarget > (450)) {
 					//Maximum allowed output
-					currentTempTargetDegC = (450);
+					PIDTempTarget = (450);
 				}
-				if (currentTempTargetDegC > TipThermoModel::getTipMaxInC()) {
-					currentTempTargetDegC = TipThermoModel::getTipMaxInC();
+				//Safety check that not aiming higher than current tip can measure
+				if (PIDTempTarget > TipThermoModel::getTipMaxInC()) {
+					PIDTempTarget = TipThermoModel::getTipMaxInC();
 				}
 				// Convert the current tip to degree's C
 
@@ -147,7 +150,7 @@ void startPIDTask(void const *argument __unused) {
 				//  to be unstable. Use a rolling average to dampen it.
 				// We overshoot by roughly 1 degree C.
 				//  This helps stabilize the display.
-				int32_t tError = currentTempTargetDegC - currentTipTempInC + 1;
+				int32_t tError = PIDTempTarget - currentTipTempInC + 1;
 				tError = tError > INT16_MAX ? INT16_MAX : tError;
 				tError = tError < INT16_MIN ? INT16_MIN : tError;
 				tempError.update(tError);
@@ -192,18 +195,20 @@ void startPIDTask(void const *argument __unused) {
 				lastPowerPulse = xTaskGetTickCount();
 			}
 #endif
-
+			//Secondary safety check to forcefully disable header when within ADC noise of top of ADC
+			if (getTipRawTemp(0) > (0x7FFF - 150)) {
+				x10WattsOut = 0;
+			}
 			if (systemSettings.powerLimitEnable
-					&& x10WattsOut > (systemSettings.powerLimit * 10))
+					&& x10WattsOut > (systemSettings.powerLimit * 10)) {
 				setTipX10Watts(systemSettings.powerLimit * 10);
-			else
+			} else {
 				setTipX10Watts(x10WattsOut);
+			}
 
 			HAL_IWDG_Refresh(&hiwdg);
 		} else {
-			asm("bkpt");
-
-//ADC interrupt timeout
+			//ADC interrupt timeout
 			setTipPWM(0);
 		}
 	}
@@ -258,6 +263,15 @@ void startMOVTask(void const *argument __unused) {
 		datax[currentPointer] = (int32_t) tx;
 		datay[currentPointer] = (int32_t) ty;
 		dataz[currentPointer] = (int32_t) tz;
+		if (!accelInit)
+		{
+			for (uint8_t i = currentPointer + 1; i < MOVFilter; i++) {
+				datax[i] = (int32_t) tx;
+				datay[i] = (int32_t) ty;
+				dataz[i] = (int32_t) tz;
+			}
+			accelInit = 1;
+		}
 		currentPointer = (currentPointer + 1) % MOVFilter;
 		avgx = avgy = avgz = 0;
 		// calculate averages

workspace/TS100/build.sh

@@ -78,6 +78,7 @@ echo "             Builder for the"
 echo "      Alternate Open Source Firmware"
 echo "        for Miniware TS100 or TS80"
 echo "                                     by Ralim"
+echo "                                             "
 echo "*********************************************"
 
 # Calculate available languages

workspace/TS100/configuration.h

@@ -0,0 +1,108 @@
+#pragma once
+/**
+ * Configuration.h
+ * Define here your default pre settings for TS80 or TS100
+ * 
+ */
+
+//===========================================================================
+//============================= Default Settings ============================
+//===========================================================================
+/**
+ * Default soldering temp is 320.0 C
+ * Temperature the iron sleeps at - default 150.0 C
+ */
+#define SOLDERING_TEMP           320        // Default soldering temp is 320.0 °C
+#define SLEEP_TEMP               150        // Default sleep temperature
+#define BOOST_TEMP               420        // Default boost temp. 
+#define BOOST_MODE_ENABLED       1          // 0: Disable 1: Enable
+
+/**
+ * Blink the temperature on the cooling screen when its > 50C 
+ */
+#define COOLING_TEMP_BLINK       0          // 0: Disable 1: Enable
+
+/**
+ * How many seconds/minutes we wait until going to sleep/shutdown.
+ * Values -> SLEEP_TIME * 10; i.e. 5*10 = 50 Seconds! 
+ */
+#define SLEEP_TIME                5         // x10 Seconds
+#define SHUTDOWN_TIME            10         // Minutes
+
+/**
+ * Auto start off for safety.
+ * Pissible values are:  
+ *  0 - none 
+ *  1 - Soldering Temperature
+ *  2 - Sleep Temperature 
+ *  3 - Sleep Off Temperature 
+ */
+#define AUTO_START_MODE           0         // Default to none
+
+/**
+ * OLED Orientation
+ * 
+ */
+#define ORIENTATION_MODE            0         // 0: Right 1:Left 2:Automatic - Default right
+#define REVERSE_BUTTON_TEMP_CHANGE  0         // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperatur change
+
+/**
+ * Temp change settings
+ */
+#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!
+ * Motion Sensitivity <0=Off 1=Least Sensitive 9=Most Sensitive>
+ */
+#define SENSITIVITY               7         // Default 7
+
+/**
+ * Detailed soldering screen
+ * Detailed idle screen (off for first time users)
+ */
+#define DETAILED_SOLDERING        0         // 0: Disable 1: Enable - Default 0
+#define DETAILED_IDLE             0         // 0: Disable 1: Enable - Default 0
+
+
+#define CUT_OUT_SETTING           0         // default to no cut-off voltage (or 18W for TS80)
+#define TEMPERATURE_INF           0         // default to 0
+#define DESCRIPTION_SCROLL_SPEED  0         // 0: Slow 1: Fast - default to slow
+#define POWER_LIMIT_ENABLE        0         // 0: Disable 1: Enable - Default disabled power limit
+
+#ifdef MODEL_TS100
+  #define VOLTAGE_DIV             467       // 467 - Default divider from schematic
+  #define CALIBRATION_OFFSET      900       // 900 - Default adc offset in uV
+  #define PID_POWER_LIMIT         70        // Sets the max pwm power limit
+  #define POWER_LIMIT             30        // 30 watts default limit
+  #define MAX_POWER_LIMIT         65        //
+  #define POWER_LIMIT_STEPS        5        //
+  
+  /**
+   *  TIP_GAIN =  TIP_GAIN/1000 == uV per deg C constant of the tip
+   */
+  #define OP_AMP_Rf               750*1000  // 750  Kilo-ohms -> From schematic, R1
+  #define OP_AMP_Rin              2370      // 2.37 Kilo-ohms -> From schematic, R2
+  #define TIP_GAIN                405
+
+#endif
+
+#ifdef MODEL_TS80
+  #define VOLTAGE_DIV             780       // Default divider from schematic
+  #define PID_POWER_LIMIT         24        // Sets the max pwm power limit
+  #define CALIBRATION_OFFSET      900       // the adc offset in uV
+  #define POWER_LIMIT             24        // 24 watts default power limit
+  #define MAX_POWER_LIMIT         30        //
+  #define POWER_LIMIT_STEPS       2
+
+  /**
+   *  TIP_GAIN =  TIP_GAIN/1000 == uV per deg C constant of the tip
+   */
+  #define OP_AMP_Rf               180*1000  //  180  Kilo-ohms -> From schematic, R6
+  #define OP_AMP_Rin              2000      //  2.0  Kilo-ohms -> From schematic, R3
+  #define TIP_GAIN                115
+#endif

workspace/TS100/version.h

@@ -0,0 +1,7 @@
+/**
+ * Firmware build version - format: xx.yy.zzzzzz 
+ * x: Major  -  y: Minor  -  z: git short hash generated automaticaly from git
+ * i.e.: BUILD_VERSION = 'Rel. v2.08' --> Will generated to: 'v2.08.1a2b3c4' 
+ */
+
+#define BUILD_VERSION "v2.09"