Update version for release

Update to newest compiler from ARM

.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

@@ -65,3 +65,128 @@ ci/artefacts/
 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/*
+..cproject.swp
+
+# Visual Studios
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# Eclipse
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Jetbrains
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+CoreCompileInputs.cache

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/Debug/CoreCompileInputs.cache

@@ -1 +0,0 @@
-1f6b9b8bf2c9e759acd19ce919cfeae19b243aa0

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:rolling
+FROM ubuntu:20.04
 LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
 
 WORKDIR /build
@@ -12,10 +12,10 @@ RUN apt-get update && \
   bzip2 \
   python3 \
   wget && \
-  apt-get clean && \
-  wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 | tar -xj
+  apt-get clean
+RUN wget -qO- https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 | tar -xj
 
 # Add compiler to the path
-ENV PATH "/build/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH"
+ENV PATH "/build/gcc-arm-none-eabi-9-2020-q2-update/bin:$PATH"
 COPY . /build/source
 COPY ./ci /build/ci

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,7 +121,7 @@ def getConstants():
     consants.append(('SymbolVolts', 'V'))
     consants.append(('SymbolDC', 'DC'))
     consants.append(('SymbolCellCount', 'S'))
-    consants.append(('SymbolVersionNumber', 'V2.06'))
+    consants.append(('SymbolVersionNumber', buildVersion))
     return consants
 
 
@@ -451,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]
@@ -462,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):
@@ -488,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,6 +233,62 @@
 				"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>"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -230,6 +234,62 @@
 				"ve wattech"
 			],
 			"desc": "Výkon použítého napájecího adaptéru ve wattech."
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"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>"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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,9 +233,66 @@
 			"text": "PWRW",
 			"text2": [
 				"Leistungs-",
-				"aufnahme"
+				"Aufnahme"
 			],
 			"desc": "Leistungsaufnahme der verwendeten Spannungsversorgung"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Leistungs-",
+				"Limit An"
+			],
+			"desc": "Leistungslimit aktivieren"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Leistungs-",
+				"Limit"
+			],
+			"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_en.json

@@ -2,14 +2,15 @@
 	"languageCode": "EN",
 	"languageLocalName": "English",
 	"cyrillicGlyphs": false,
+	"tempUnitFahrenheit": true,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
+		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature, before continuing!",
 		"SettingsResetWarning": "Are you sure you want to reset settings to default values?",
 		"UVLOWarningString": "DC LOW",
 		"UndervoltageString": "Undervoltage",
 		"InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip Temp: ",
+		"WarningTipTempString": "Tip temp: ",
 		"BadTipString": "BAD TIP",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Sleeping...",
@@ -22,7 +23,7 @@
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
 		"ResetOKMessage": "Reset OK",
-		"YourGainMessage": "Your Gain:",
+		"YourGainMessage": "Your gain:",
 		"SettingsResetMessage": "Settings were\nreset!"
 	},
 	"characters": {
@@ -30,35 +31,39 @@
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
 				"Soldering",
-				"Settings"
+				"settings"
 			],
 			"desc": "Soldering settings"
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Sleep",
-				"Modes"
+				"modes"
 			],
 			"desc": "Power saving settings"
 		},
 		"UIMenu": {
 			"text2": [
 				"User",
-				"Interface"
+				"interface"
 			],
 			"desc": "User interface settings"
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Advanced",
-				"Options"
+				"options"
 			],
 			"desc": "Advanced options"
 		}
@@ -70,7 +75,7 @@
 				"Power",
 				"source"
 			],
-			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>"
+			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell, disable power limit>"
 		},
 		"SleepTemperature": {
 			"text": "STMP",
@@ -78,7 +83,7 @@
 				"Sleep",
 				"temp"
 			],
-			"desc": "Sleep Temperature <C>"
+			"desc": "Sleep temperature"
 		},
 		"SleepTimeout": {
 			"text": "STME",
@@ -86,7 +91,7 @@
 				"Sleep",
 				"timeout"
 			],
-			"desc": "Sleep Timeout <Minutes/Seconds>"
+			"desc": "Sleep timeout <Minutes/Seconds>"
 		},
 		"ShutdownTimeout": {
 			"text": "SHTME",
@@ -94,7 +99,7 @@
 				"Shutdown",
 				"timeout"
 			],
-			"desc": "Shutdown Timeout <Minutes>"
+			"desc": "Shutdown timeout <Minutes>"
 		},
 		"MotionSensitivity": {
 			"text": "MSENSE",
@@ -102,15 +107,15 @@
 				"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",
 			"text2": [
 				"Temperature",
-				"units"
+				"unit"
 			],
-			"desc": "Temperature Unit <C=Celsius F=Fahrenheit>"
+			"desc": "Temperature unit <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
 			"text": "ADVIDL",
@@ -118,7 +123,7 @@
 				"Detailed",
 				"idle screen"
 			],
-			"desc": "Display detailed information in a smaller font on the idle screen."
+			"desc": "Display detailed information in a smaller font on the idle screen"
 		},
 		"DisplayRotation": {
 			"text": "DSPROT",
@@ -126,15 +131,15 @@
 				"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",
 			"text2": [
-				"Boost mode",
-				"enabled"
+				"Boost",
+				"mode"
 			],
-			"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 <F=Off T=Soldering S=Sleep O=Sleep at room temperature>"
 		},
 		"CooldownBlink": {
 			"text": "CLBLNK",
@@ -158,7 +163,7 @@
 				"Cooldown",
 				"blink"
 			],
-			"desc": "Blink the temperature on the cooling screen while the tip is still hot."
+			"desc": "Blink the temperature on the cooling screen while the tip is still hot"
 		},
 		"TemperatureCalibration": {
 			"text": "TMP CAL?",
@@ -166,7 +171,7 @@
 				"Calibrate",
 				"temperature?"
 			],
-			"desc": "Calibrate tip offset."
+			"desc": "Calibrate tip offset?"
 		},
 		"SettingsReset": {
 			"text": "RESET?",
@@ -174,7 +179,7 @@
 				"Factory",
 				"Reset?"
 			],
-			"desc": "Reset all settings"
+			"desc": "Reset all settings!"
 		},
 		"VoltageCalibration": {
 			"text": "CAL VIN?",
@@ -182,7 +187,7 @@
 				"Calibrate",
 				"input voltage?"
 			],
-			"desc": "VIN Calibration. Buttons adjust, long press to exit"
+			"desc": "VIN Calibration <long press to exit>"
 		},
 		"AdvancedSoldering": {
 			"text": "ADVSLD",
@@ -196,31 +201,31 @@
 			"text": "DESCSP",
 			"text2": [
 				"Scrolling",
-				"Speed"
+				"speed"
 			],
-			"desc": "Speed this text scrolls past at"
+			"desc": "Speed this text scrolls past at <S=Slow F=Fast>"
 		},
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
 				"Tip",
-				"Model"
+				"model"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Tip model selection"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
 				"Simple",
-				"Calibration"
+				"calibration"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Simple calibration using hot water"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
 				"Advanced",
-				"Calibration"
+				"calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
@@ -228,9 +233,65 @@
 			"text": "PWRW",
 			"text2": [
 				"Power",
-				"Wattage"
+				"wattage"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Power wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Enable power",
+				"limit"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Reverse",
+				"+ - keys"
+			],
+			"desc": "Reverse assignment of temperature adjustment buttons"
+		},
+		"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"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

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,39 +202,95 @@
 				"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": [
+				"Limitar la",
+				"potenc. máx."
+			],
+			"desc": "Activa el límite de potencia máxima."
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Ajustar la",
+				"potenc. máx."
+			],
+			"desc": "Elige el límite de potencia máxima del soldador <en vatios>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"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>"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_fr.json

@@ -13,22 +13,26 @@
 		"BadTipString": "PANNE HS",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "En veille...",
-		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "ATTENTION! CHAUD",
+		"WarningSimpleString": "CHAUD!",
+		"WarningAdvancedString": "ATTENTION! CHAUD!",
 		"SleepingTipAdvancedString": "Panne:",
 		"IdleTipString": "Tip:",
 		"IdleSetString": " Set:",
 		"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": {
@@ -229,6 +233,62 @@
 				"l'alimentation"
 			],
 			"desc": "Puissance de l'alimentation utilisée"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Activer?"
+			],
+			"desc": "Activer la limite de puissance"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Puissance",
+				"Limite"
+			],
+			"desc": "Puissance maximale utilisable <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"Inverser?"
+			],
+			"desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"Court?"
+			],
+			"desc": "Incrément de changement de température sur appui court."
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"Long?"
+			],
+			"desc": "Incrément de changement de température sur appui long."
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

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": {
@@ -229,6 +233,62 @@
 				"napajanja"
 			],
 			"desc": "Snaga modula za napajanje"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

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": {
@@ -229,6 +233,62 @@
 				"teljesítmény"
 			],
 			"desc": "A tápegység által leadott teljesítmény"
+		},
+		"PowerLimitEnable": {
+			"text": "TELJH",
+			"text2": [
+				"Telj H",
+				"Bekapcsolva"
+			],
+			"desc": "Bemeneti teljesitmény korlátozása"
+		},
+		"PowerLimit": {
+			"text": "TELJM",
+			"text2": [
+				"Telj",
+				"maximum"
+			],
+			"desc": "Maximális teljesitmény beállitása <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "HÖVÁLT",
+			"text2": [
+				"GOMB +-",
+				"Felcseréled?"
+			],
+			"desc": "A páka hömérséklet növelés csökkentési gombok felcserélése."
+		},
+		"TempChangeShortStep": {
+			"text": "HÖRÖV",
+			"text2": [
+				"Hömérséklet",
+				"váltás rövid?"
+			],
+			"desc": "Hömérséklet váltás rövid gombnyomásrs bekapcsolva!"
+		},
+		"TempChangeLongStep": {
+			"text": "HÖHOS",
+			"text2": [
+				"Hömérséklet",
+				"váltás hosszú?"
+			],
+			"desc": "Hömérséklet váltás hosszú gombnyomásrs bekapcsolva!"
+		},
+		"PowerPulsePower":{
+			"text": "TELJP",
+			"text2": [
+				"Telj power",
+				"bank üzem W"
+			],
+			"desc": "Powerbank üzemnél nem engedi a powerbankot kikapcsolni idönkénti áram felvételt generál. "
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_it.json

@@ -21,14 +21,20 @@
 		"TipDisconnectedString": "PUNTA ASSENTE",
 		"SolderingAdvancedPowerPrompt": "Potenz:",
 		"OffString": "OFF",
-		"ResetOKMessage":"Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Guad.: ",
+		"SettingsResetMessage": "Reset effettuato"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "S",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "V",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "A",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "D"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -156,7 +162,7 @@
 				"Avviso",
 				"punta calda"
 			],
-			"desc": "Mostra, lampeggiante, la temperatura durante il raffreddamento se la punta è ancora calda"
+			"desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda"
 		},
 		"TemperatureCalibration": {
 			"text": "",
@@ -229,6 +235,62 @@
 				"alimentaz"
 			],
 			"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Limitatore",
+				"di potenza"
+			],
+			"desc": "Abilita un limitatore per la potenza massima erogabile al saldatore"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Limite",
+				"di potenza"
+			],
+			"desc": "Imposta il valore di potenza massima erogabile al saldatore <watt>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Inversione",
+				"tasti"
+			],
+			"desc": "Inverti i tasti per impostare la temperatura della punta "
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Cambio temp",
+				"pressione breve"
+			],
+			"desc": "Varia la temperatura della punta attraverso una breve pressione dei tasti"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Cambio temp",
+				"pressione lunga"
+			],
+			"desc": "Varia la temperatura della punta attraverso una lunga pressione dei tasti"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"vatais"
 			],
 			"desc": "Maitinimo bloko galia vatais"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

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": {
@@ -229,6 +233,62 @@
 				"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>"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"Watt"
 			],
 			"desc": "Vermogen van de adapter"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"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>"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"Wattach"
 			],
 			"desc": "Moc używanego zasilacza w Watach"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"Fonte"
 			],
 			"desc": "Potência da fonte usada (Watt)"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_ru.json

@@ -3,32 +3,38 @@
 	"languageLocalName": "Русский",
 	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Калибровка выполнена!",
-		"SettingsCalibrationWarning": "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!",
-		"SettingsResetWarning": "Вы действительно хотите сбросить настройки до значений по умолчанию?",
-		"UVLOWarningString": "АККУМ--",
-		"UndervoltageString": "Под питанием",
-		"InputVoltageString": "Питание B: ",
-		"WarningTipTempString": "Жало t°: ",
-		"BadTipString": "Жало--",
-		"SleepingSimpleString": "Сон ",
+		"SettingsCalibrationDone": "Калибровка завершена!",
+		"SettingsCalibrationWarning": "Прежде чем продолжить, пожалуйста, убедитесь что жало имеет комнатную температуру!",
+		"SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по-умолчанию?",
+		"UVLOWarningString": "НАПРЯЖ--",
+		"UndervoltageString": "Низк. напряжение",
+		"InputVoltageString": "Питание В: ",
+		"WarningTipTempString": "Темп. жала: ",
+		"BadTipString": "ЖАЛО--",
+		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Ожидание...",
-		"WarningSimpleString": " АЙ!",
-		"WarningAdvancedString": "ВНИМАНИЕ ГОРЯЧО",
+		"WarningSimpleString": "ГОРЯЧО!",
+		"WarningAdvancedString": "!!! ГОРЯЧЕЕ ЖАЛО !!!",
 		"SleepingTipAdvancedString": "Жало:",
 		"IdleTipString": "Жало:",
 		"IdleSetString": " ->",
-		"TipDisconnectedString": "Жало отключено",
+		"TipDisconnectedString": "ЖАЛО ОТСОЕДИНЕНО",
 		"SolderingAdvancedPowerPrompt": "Питание: ",
-		"OffString": "Off",
-		"ResetOKMessage":"Reset OK"
+		"OffString": "Выкл.",
+		"ResetOKMessage": "Сброс OK",
+		"YourGainMessage": "Прирост:",
+		"SettingsResetMessage": "Настройки сброшены!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
 		"SettingLeftChar": "Л",
-		"SettingAutoChar": "A",
-		"SettingFastChar": "+",
-		"SettingSlowChar": "-"
+		"SettingAutoChar": "А",
+		"SettingFastChar": "Б",
+		"SettingSlowChar": "М",
+		"SettingStartSolderingChar": "П",
+		"SettingStartSleepChar": "О",
+		"SettingStartSleepOffChar": "К",
+		"SettingStartNoneChar": "В"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -41,194 +47,250 @@
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Режим",
+				"Режимы",
 				"сна"
 			],
-			"desc": "Параметры экономии энергии"
+			"desc": "Найстроки режима ожидания"
 		},
 		"UIMenu": {
 			"text2": [
-				"Пользовател",
-				"интерфейс"
+				"Параметры",
+				"интерфейса"
 			],
-			"desc": "Параметры пользовательского интерфейса"
+			"desc": "Найстройки пользовательского интерфейса"
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Дополнител.",
-				"параметры"
+				"найстройки"
 			],
-			"desc": "Дополнительные параметры"
+			"desc": "Дополнительные настройки"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "ИстП",
+			"text": "ИстчнПит",
 			"text2": [
 				"Источник",
 				"питания"
 			],
-			"desc": "Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>"
+			"desc": "Источник питания. Устанавливает напряжение отсечки. <DC 10В> <S 3.3В на ячейку, без лимита мощности>"
 		},
 		"SleepTemperature": {
-			"text": "Тожд",
+			"text": "ТмпОжд",
 			"text2": [
-				"Темпер.",
-				"сна"
+				"Темп.",
+				"ожидания"
 			],
-			"desc": "Температура режима ожидания <С>"
+			"desc": "Температура режима ожидания"
 		},
 		"SleepTimeout": {
-			"text": "Вожд",
+			"text": "ВрмОжид",
 			"text2": [
 				"Таймаут",
-				"сна"
+				"ожидания"
 			],
-			"desc": "Время до перехода в режим ожидания <Минуты>"
+			"desc": "Время до перехода в режим ожидания <Минуты/Секунды>"
 		},
 		"ShutdownTimeout": {
-			"text": "Тоткл",
+			"text": "ВрмОткл",
 			"text2": [
-				"Время до",
-				"отключения"
+				"Таймаут",
+				"выключения"
 			],
-			"desc": "Время до отключения <Минуты>"
+			"desc": "Время до отключения паяльника <Минуты>"
 		},
 		"MotionSensitivity": {
-			"text": "ЧувсДв",
+			"text": "ЧувсАксл",
 			"text2": [
-				"Чувст. сенсо-",
-				"ра движения"
+				"Чувствительн.",
+				"акселерометра"
 			],
-			"desc": "Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>"
+			"desc": "Чувствительность акселерометра <0=Выкл., 1=Мин., 9=Макс.>"
 		},
 		"TemperatureUnit": {
 			"text": "ЕдТемп",
 			"text2": [
-				"Формат темпе-",
-				"ратуры(C°/F°)"
+				"Единицы",
+				"температуры"
 			],
-			"desc": "В чем измерять температуру"
+			"desc": "Единицы изменения температуры <C=Цельция, F=Фаренгейта>"
 		},
 		"AdvancedIdle": {
 			"text": "ИнфОжд",
 			"text2": [
-				"Подробный ре-",
-				"жим ожидания"
+				"Подробный",
+				"реж. ожидания"
 			],
-			"desc": "Показывать детальную информацию маленьким шрифтом на домашнем экране"
+			"desc": "Отображать детальную информацию уменьшенным шрифтом на домашнем экране"
 		},
 		"DisplayRotation": {
 			"text": "ПовЭкр",
 			"text2": [
-				"Автоповорот",
+				"Ориентация",
 				"экрана"
 			],
-			"desc": "Ориентация дисплея <A. Автоматический, Л. Левая рука, П. Правая рука>"
+			"desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>"
 		},
 		"BoostEnabled": {
-			"text": "Турбо",
+			"text": "Турб",
 			"text2": [
-				"Режим",
-				"Турбо"
+				"Турбо",
+				"режим"
 			],
-			"desc": "Турбо-режим при удержании кнопки А при пайке "
+			"desc": "Включить активацию турбо-режма, при удержании ближней к жалу кнопки во время пайки"
 		},
 		"BoostTemperature": {
-			"text": "Ттур",
+			"text": "ТемпТурб",
 			"text2": [
-				"Темпер.",
-				"Турбо"
+				"t° турбо",
+				"режима"
 			],
-			"desc": "Температура в турбо-режиме"
+			"desc": "Температура жала в турбо режиме"
 		},
 		"AutoStart": {
-			"text": "Астарт",
+			"text": "АвтоРеж",
 			"text2": [
-				"Горячий",
+				"Авто",
 				"старт"
 			],
-			"desc": "Автоматический запуск паяльника при включении питания. T=Нагрев, S=Режим ожидания,F=Выкл."
+			"desc": "Режим с которым запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>"
 		},
 		"CooldownBlink": {
-			"text": "Охлажд",
+			"text": "МигТемп",
 			"text2": [
-				"Показ t° при",
-				"остывании"
+				"Мигание t°",
+				"при остывании"
 			],
-			"desc": "Показывать температуру на экране охлаждения, пока жало остается горячим."
+			"desc": "Мигать температурой на экране охлаждения, пока жало еще горячее"
 		},
 		"TemperatureCalibration": {
-			"text": "КалибрТ",
+			"text": "КалТемп?",
 			"text2": [
 				"Калибровка",
 				"температуры"
 			],
-			"desc": "Калибровка термодатчика."
+			"desc": "Калибровка термодатчика жала"
 		},
 		"SettingsReset": {
-			"text": "СБРОС?",
+			"text": "Сброс?",
 			"text2": [
-				"Сбросить все",
-				"настройки?"
+				"Сброс",
+				"Настроек"
 			],
-			"desc": "Сброс всех настроек."
+			"desc": "Сброс настроек к значеням по-умолчанию"
 		},
 		"VoltageCalibration": {
-			"text": "КалибрU?",
+			"text": "КалНапр",
 			"text2": [
 				"Калибровка",
 				"напряжения"
 			],
-			"desc": "Калибровка напряжения входа. Настройка кнопками, нажать и удержать чтобы завершить."
+			"desc": "Калибровка входного напряжения <длинное нажатие для выхода>"
 		},
 		"AdvancedSoldering": {
-			"text": "ИнфПай",
+			"text": "ИнфПайк",
 			"text2": [
-				"Подробный ре-",
-				"жим пайки"
+				"Подробный",
+				"экран пайки"
 			],
-			"desc": "Показывать детальную информацию при пайке."
+			"desc": "Показывать детальную информацию на экране пайки"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+			"text": "СкорТекс",
 			"text2": [
 				"Скорость",
 				"текста"
 			],
-			"desc": "Скорость прокрутки текста"
+			"desc": "Скорость прокрутки текста <М=медленно, Б=быстро>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+			"text": "МодЖала",
 			"text2": [
 				"Модель",
-				"жало"
+				"жала"
 			],
-			"desc": "Выбор модели жало"
+			"desc": "Выбор модели жала"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+			"text": "УпрКал",
 			"text2": [
-				"Простая",
+				"Упрощенная",
 				"калибровка"
 			],
-			"desc": "Простая калибровка с использованием горячей воды"
+			"desc": "Упрощенная калибровка с использованием горячей воды"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+			"text": "УлучшКал",
 			"text2": [
-				"Подробная",
+				"Улучшенная",
 				"калибровка"
 			],
-			"desc": "Калибровка с помощью термопары"
+			"desc": "Улучшенная калибровка с импользованием термопары жала"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+			"text": "МощнИст",
+			"text2": [
+				"Мощность",
+				"питания"
+			],
+			"desc": "Мощность используемого источника питания"
+		},
+		"PowerLimitEnable": {
+			"text": "ВклЛимW",
+			"text2": [
+				"Ограничение",
+				"мощности"
+			],
+			"desc": "Включить лимит потреблямой мощности"
+		},
+		"PowerLimit": {
+			"text": "ЗначЛимW",
+			"text2": [
+				"Максимальная",
+				"мощность"
+			],
+			"desc": "Максимальная мощность которую может использовать паяльник <Ватт>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "ИнвКноп",
+			"text2": [
+				"Инвертировать",
+				"кнопки"
+			],
+			"desc": "Инвертировать кнопки изменения температуры"
+		},
+		"TempChangeShortStep": {
+			"text": "ШагКорт",
+			"text2": [
+				"Шаг темп.",
+				"кор. наж."
+			],
+			"desc": "Шаг изменения температуры при коротком нажатии кнопок"
+		},
+		"TempChangeLongStep": {
+			"text": "ШагДлин",
+			"text2": [
+				"Шаг темп.",
+				"длин. наж."
+			],
+			"desc": "Шаг изменения температуры при длинном нажатии кнопок"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
 			"text2": [
 				"Power",
-				"Wattage"
+				"Pulse W"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Keep awake pulse power intensity"			
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"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>"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -230,6 +234,62 @@
 				"vira"
 			],
 			"desc": "Moč v W napajalnega vira"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

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": {
@@ -229,6 +233,62 @@
 				"снага"
 			],
 			"desc": "Снага напајања у ватима."
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"snaga"
 			],
 			"desc": "Snaga napajanja u vatima."
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": {
@@ -229,6 +233,62 @@
 				"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>"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

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": {
@@ -229,6 +233,62 @@
 				"Miktarı(W)"
 			],
 			"desc": "Kullanılan adaptörün güç miktarı"
+		},
+		"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!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
@@ -229,6 +233,62 @@
 				"дж. живл."
 			],
 			"desc": "Потужність джерела живлення в Ватах"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Ліміт",
+				"потужності"
+			],
+			"desc": "Вмикає обмеження потужності споживання"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Максимальна",
+				"потужність"
+			],
+			"desc": "Макс. потужність, яку може використовувати паяльник <Ват>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Інвертувати",
+				"кнопки +-?"
+			],
+			"desc": "Інвертувати кнопки зміни температури."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Зміна темп.",
+				"коротко?"
+			],
+			"desc": "Змінювати температуру при короткому натисканні!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Зміна темп.",
+				"довго?"
+			],
+			"desc": "Змінювати температуру при довгому натисканні!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

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": [
@@ -241,6 +257,41 @@ var def =
 			"id": "PowerInput",
 			"maxLen": 8,
 			"maxLen2": 16
+		},
+		{
+			"id": "PowerLimitEnable",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "PowerLimit",
+			"maxLen": 5,
+			"maxLen2": 11
+		},
+		{
+			"id": "ReverseButtonTempChange",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "TempChangeShortStep",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "TempChangeLongStep",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "PowerPulsePower",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "TipGain",
+			"maxLen": 6,
+			"maxLen2": 8
 		}
 	]
 }

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 services:
   builder:
     stdin_open: true

workspace/TS100/.cproject

@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604" moduleId="org.eclipse.cdt.core.settings" name="Release">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.371966959" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.268924932" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1807761944" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.16668176" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32F103T8Ux" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1774243727" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1519200339" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2085586885" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1101562931" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.0 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32F103T8Ux || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3 || ../ ||  || USE_HAL_DRIVER | STM32F103xB ||  || Startup || Drivers | Middlewares | Core ||  || ${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld} || true" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1139950997" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1111393917" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/TS100}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.382006335" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.2103323603" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1096256111" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths.1236938233" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1567896324" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="MODEL_TS100"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1462975681" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.30611156" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1339073625" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.635455407" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.803860120" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="MODEL_TS100"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.830444742" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra.831438684" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.209834308" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-write-strings"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1520167136" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1389226967" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.320699143" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1467281053" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.786921488" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="MODEL_TS100"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.1822309991" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra.2125869818" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags.1596069067" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-fno-rtti"/>
-									<listOptionValue builtIn="false" value="-Wno-write-strings"/>
-									<listOptionValue builtIn="false" value="-fno-exceptions"/>
-									<listOptionValue builtIn="false" value="-fno-non-call-exceptions"/>
-									<listOptionValue builtIn="false" value="-fno-use-cxa-atexit"/>
-									<listOptionValue builtIn="false" value="-fno-strict-aliasing"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1159197200" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1444632567" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.270389521" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1357582083" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1902507185" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.752998" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" useByScannerDiscovery="false" value="C:\Users\Ralim.DESKTOP-R877O7F\Documents\GitHub\ts100\workspace\TS100\LinkerScript.ld" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags.329644110" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-flto"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref.145186443" name="Add symbol cross reference table to map file (-Wl,--cref)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input.1684195922" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1875744128" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.684181602" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.719558919" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.202432297" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.796590488" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.566015042" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1489612670" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1442634952" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Startup"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551" moduleId="org.eclipse.cdt.core.settings" name="TS80">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551" name="TS80" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551." name="/" resourcePath="">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.119279677" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.849152425" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.159605979" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1536164180" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32F103T8Ux" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1370739571" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.295605019" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.973266354" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.464348240" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.0 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32F103T8Ux || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3 || ../ ||  || USE_HAL_DRIVER | STM32F103xB ||  || Startup || Drivers | Middlewares | Core ||  || ${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld} || true" valueType="string"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1607101911" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1970014216" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<builder buildPath="${workspace_loc:/TS100}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1807978370" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.832589290" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2021461351" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths.1740040757" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1866744147" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="MODEL_TS80"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1978031483" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1462185687" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1548601111" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.457682077" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1260353799" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="MODEL_TS80"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.540768214" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra.1574359913" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1077707594" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-Wno-write-strings"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1813870546" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1660249714" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.16251983" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1224833714" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.1599760897" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="MODEL_TS80"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-								</option>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.925084011" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra.110760609" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags.834159935" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-fno-rtti"/>
-									<listOptionValue builtIn="false" value="-Wno-write-strings"/>
-									<listOptionValue builtIn="false" value="-fno-exceptions"/>
-									<listOptionValue builtIn="false" value="-fno-non-call-exceptions"/>
-									<listOptionValue builtIn="false" value="-fno-use-cxa-atexit"/>
-									<listOptionValue builtIn="false" value="-fno-strict-aliasing"/>
-								</option>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1576964672" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1130643119" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.215123120" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld}" valueType="string"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.300729142" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.227435340" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.830347551" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" useByScannerDiscovery="false" value="C:\Users\Ralim.DESKTOP-R877O7F\Documents\GitHub\ts100\workspace\TS100\LinkerScript.ld" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags.2106114007" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
-									<listOptionValue builtIn="false" value="-flto"/>
-								</option>
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref.1223102617" name="Add symbol cross reference table to map file (-Wl,--cref)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input.1693496005" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1793875206" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.2031511845" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1883149988" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1503571164" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1574630014" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.948380741" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.260468267" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.984915652" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Startup"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="TS100.null.5136256" name="TS100"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.606095682;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.606095682.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1328412936;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.405681469">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.30611156;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1520167136">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/TS100"/>
-		</configuration>
-	</storageModule>
-</cproject>

workspace/TS100/Core/BSP/BSP.h

@@ -0,0 +1,55 @@
+#include "BSP_Flash.h"
+#include "BSP_Power.h"
+#include "BSP_QC.h"
+#include "Defines.h"
+#include "UnitSettings.h"
+#include "stdint.h"
+/*
+ * BSP.h -- Board Support
+ *
+ * This exposes functions that are expected to be implemented to add support for different hardware
+ */
+
+#ifndef BSP_BSP_H_
+#define BSP_BSP_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Called first thing in main() to init the hardware
+void preRToSInit();
+// Called once the RToS has started for any extra work
+void postRToSInit();
+
+// Called to reset the hardware watchdog unit
+void resetWatchdog();
+// Accepts a output level of 0.. to use to control the tip output PWM
+void setTipPWM(uint8_t pulse);
+// Returns the Handle temp in C, X10
+uint16_t getHandleTemperature();
+// Returns the Tip temperature ADC reading in raw units
+uint16_t getTipRawTemp(uint8_t refresh);
+// Returns the main DC input voltage, using the adjustable divisor + sample flag
+uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample);
+
+// Readers for the two buttons
+// !! Returns 1 if held down, 0 if released
+uint8_t getButtonA();
+uint8_t getButtonB();
+
+// This is a work around that will be called if I2C starts to bug out
+// This should toggle the SCL line until SDA goes high to end the current transaction
+void unstick_I2C();
+
+// Reboot the IC when things go seriously wrong
+void reboot();
+
+// If the user has programmed in a bootup logo, draw it to the screen from flash
+// Returns 1 if the logo was printed so that the unit waits for the timeout or button
+uint8_t showBootLogoIfavailable();
+
+void delay_ms(uint16_t count);
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_BSP_H_ */

workspace/TS100/Core/BSP/BSP_Flash.h

@@ -0,0 +1,26 @@
+/*
+ * BSP_Flash.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+#include "stdint.h"
+#ifndef BSP_BSP_FLASH_H_
+#define BSP_BSP_FLASH_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Wrappers to allow read/writing to a sector of flash that we use to store all of the user settings
+ *
+ * Should allow reading and writing to the flash
+ */
+
+//Erase the flash, then save the buffer. Returns 1 if worked
+uint8_t flash_save_buffer(const uint8_t *buffer, const uint16_t length);
+
+void flash_read_buffer(uint8_t *buffer, const uint16_t length);
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_BSP_FLASH_H_ */

workspace/TS100/Core/BSP/BSP_Power.h

@@ -0,0 +1,27 @@
+#include "stdint.h"
+/*
+ * BSP_Power.h -- Board Support for Power control
+ *
+ * These functions are hooks used to allow for power control
+ *
+ */
+
+#ifndef BSP_POWER_H_
+#define BSP_POWER_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Called once at startup, after RToS
+// This can handle negotiations for QC/PD etc
+void power_probe();
+
+// Called periodically in the movement handling thread
+// Can be used to check any details for the power system
+void power_check();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

workspace/TS100/Core/BSP/BSP_QC.h

@@ -0,0 +1,42 @@
+/*
+ * BSP_QC.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_BSP_QC_H_
+#define BSP_BSP_QC_H_
+#include "stdint.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Init GPIO for QC neg
+void QC_Init_GPIO();
+// Set the DP pin to 0.6V
+void QC_DPlusZero_Six();
+// Set the DM pin to 0.6V
+void QC_DNegZero_Six();
+// Set the DP pin to 3.3V
+void QC_DPlusThree_Three();
+// Set the DM pin to 3.3V
+void QC_DNegThree_Three();
+// Turn on weak pulldown on the DM pin
+// This is used as a helper for some power banks
+void QC_DM_PullDown();
+// Turn off the pulldown
+void QC_DM_No_PullDown();
+// Turn on output drivers that were initally disabled to prevent spike through QC disable mode
+void QC_Post_Probe_En();
+// Check if DM was pulled down
+// 1=Pulled down, 0 == pulled high
+uint8_t QC_DM_PulledDown();
+
+// Re-sync if required
+void QC_resync();
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BSP_BSP_QC_H_ */

workspace/TS100/Core/BSP/Defines.h

@@ -0,0 +1,19 @@
+/*
+ * Defines.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_DEFINES_H_
+#define BSP_DEFINES_H_
+
+
+enum Orientation {
+	ORIENTATION_LEFT_HAND = 0, ORIENTATION_RIGHT_HAND = 1, ORIENTATION_FLAT = 3
+};
+
+//It is assumed that all hardware implements an 8Hz update period at this time
+#define PID_TIM_HZ (8)
+
+#endif /* BSP_DEFINES_H_ */

workspace/TS100/Core/BSP/Miniware/BSP.cpp

@@ -0,0 +1,256 @@
+//BSP mapping functions
+
+#include "BSP.h"
+#include "Setup.h"
+#include "history.hpp"
+#include "Pins.h"
+#include "main.hpp"
+#include "history.hpp"
+#include "I2C_Wrapper.hpp"
+volatile uint16_t PWMSafetyTimer = 0;
+volatile uint8_t pendingPWM = 0;
+
+//2 second filter (ADC is PID_TIM_HZ Hz)
+history<uint16_t, PID_TIM_HZ> rawTempFilter = { { 0 }, 0, 0 };
+void resetWatchdog() {
+	HAL_IWDG_Refresh(&hiwdg);
+}
+
+uint16_t getHandleTemperature() {
+	// We return the current handle temperature in X10 C
+	// TMP36 in handle, 0.5V offset and then 10mV per deg C (0.75V @ 25C for
+	// example) STM32 = 4096 count @ 3.3V input -> But We oversample by 32/(2^2) =
+	// 8 times oversampling Therefore 32768 is the 3.3V input, so 0.1007080078125
+	// mV per count So we need to subtract an offset of 0.5V to center on 0C
+	// (4964.8 counts)
+	//
+	int32_t result = getADC(0);
+	result -= 4965;  // remove 0.5V offset
+	// 10mV per C
+	// 99.29 counts per Deg C above 0C
+	result *= 100;
+	result /= 993;
+	return result;
+}
+
+uint16_t getTipInstantTemperature() {
+	uint16_t sum = 0;	// 12 bit readings * 8 -> 15 bits
+	uint16_t readings[8];
+	//Looking to reject the highest outlier readings.
+	//As on some hardware these samples can run into the op-amp recovery time
+	//Once this time is up the signal stabilises quickly, so no need to reject minimums
+	readings[0] = hadc1.Instance->JDR1;
+	readings[1] = hadc1.Instance->JDR2;
+	readings[2] = hadc1.Instance->JDR3;
+	readings[3] = hadc1.Instance->JDR4;
+	readings[4] = hadc2.Instance->JDR1;
+	readings[5] = hadc2.Instance->JDR2;
+	readings[6] = hadc2.Instance->JDR3;
+	readings[7] = hadc2.Instance->JDR4;
+
+	for (int i = 0; i < 8; i++) {
+		sum += readings[i];
+	}
+	return sum;  // 8x over sample
+}
+
+uint16_t getTipRawTemp(uint8_t refresh) {
+	if (refresh) {
+		uint16_t lastSample = getTipInstantTemperature();
+		rawTempFilter.update(lastSample);
+		return lastSample;
+	} else {
+		return rawTempFilter.average();
+	}
+}
+
+uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
+	// ADC maximum is 32767 == 3.3V at input == 28.05V at VIN
+	// Therefore we can divide down from there
+	// Multiplying ADC max by 4 for additional calibration options,
+	// ideal term is 467
+#ifdef MODEL_TS100
+#define BATTFILTERDEPTH 32
+#else
+#define BATTFILTERDEPTH 8
+
+#endif
+	static uint8_t preFillneeded = 10;
+	static uint32_t samples[BATTFILTERDEPTH];
+	static uint8_t index = 0;
+	if (preFillneeded) {
+		for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
+			samples[i] = getADC(1);
+		preFillneeded--;
+	}
+	if (sample) {
+		samples[index] = getADC(1);
+		index = (index + 1) % BATTFILTERDEPTH;
+	}
+	uint32_t sum = 0;
+
+	for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
+		sum += samples[i];
+
+	sum /= BATTFILTERDEPTH;
+	return sum * 4 / divisor;
+}
+
+void setTipPWM(uint8_t pulse) {
+	PWMSafetyTimer = 10; // This is decremented in the handler for PWM so that the tip pwm is
+						 // disabled if the PID task is not scheduled often enough.
+
+	pendingPWM = pulse;
+}
+
+// These are called by the HAL after the corresponding events from the system
+// timers.
+
+void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
+// Period has elapsed
+	if (htim->Instance == TIM2) {
+		// we want to turn on the output again
+		PWMSafetyTimer--;
+		// We decrement this safety value so that lockups in the
+		// scheduler will not cause the PWM to become locked in an
+		// active driving state.
+		// While we could assume this could never happen, its a small price for
+		// increased safety
+		htim2.Instance->CCR4 = pendingPWM;
+		if (htim2.Instance->CCR4 && PWMSafetyTimer) {
+			HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_1);
+		} else {
+			HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
+		}
+	} else if (htim->Instance == TIM1) {
+		// STM uses this for internal functions as a counter for timeouts
+		HAL_IncTick();
+	}
+}
+
+void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) {
+// 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);
+	}
+}
+void unstick_I2C() {
+	GPIO_InitTypeDef GPIO_InitStruct;
+	int timeout = 100;
+	int timeout_cnt = 0;
+
+	// 1. Clear PE bit.
+	hi2c1.Instance->CR1 &= ~(0x0001);
+	/**I2C1 GPIO Configuration
+	 PB6     ------> I2C1_SCL
+	 PB7     ------> I2C1_SDA
+	 */
+	//  2. Configure the SCL and SDA I/Os as General Purpose Output Open-Drain, High level (Write 1 to GPIOx_ODR).
+	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
+	GPIO_InitStruct.Pull = GPIO_PULLUP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+
+	GPIO_InitStruct.Pin = SCL_Pin;
+	HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
+	HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
+
+	GPIO_InitStruct.Pin = SDA_Pin;
+	HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
+	HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
+
+	while (GPIO_PIN_SET != HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin)) {
+		//Move clock to release I2C
+		HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET);
+		asm("nop");
+		asm("nop");
+		asm("nop");
+		asm("nop");
+		HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
+
+		timeout_cnt++;
+		if (timeout_cnt > timeout)
+			return;
+	}
+
+	// 12. Configure the SCL and SDA I/Os as Alternate function Open-Drain.
+	GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
+	GPIO_InitStruct.Pull = GPIO_PULLUP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+
+	GPIO_InitStruct.Pin = SCL_Pin;
+	HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
+
+	GPIO_InitStruct.Pin = SDA_Pin;
+	HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
+
+	HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
+	HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
+
+	// 13. Set SWRST bit in I2Cx_CR1 register.
+	hi2c1.Instance->CR1 |= 0x8000;
+
+	asm("nop");
+
+	// 14. Clear SWRST bit in I2Cx_CR1 register.
+	hi2c1.Instance->CR1 &= ~0x8000;
+
+	asm("nop");
+
+	// 15. Enable the I2C peripheral by setting the PE bit in I2Cx_CR1 register
+	hi2c1.Instance->CR1 |= 0x0001;
+
+	// Call initialization function.
+	HAL_I2C_Init(&hi2c1);
+}
+
+uint8_t getButtonA() {
+	return HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ?
+			1 : 0;
+}
+uint8_t getButtonB() {
+	return HAL_GPIO_ReadPin(KEY_B_GPIO_Port, KEY_B_Pin) == GPIO_PIN_RESET ?
+			1 : 0;
+}
+
+/*
+ * Catch the IRQ that says that the conversion is done on the temperature
+ * readings coming in Once these have come in we can unblock the PID so that it
+ * runs again
+ */
+void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc) {
+	BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+	if (hadc == &hadc1) {
+		if (pidTaskNotification) {
+			vTaskNotifyGiveFromISR(pidTaskNotification,
+					&xHigherPriorityTaskWoken);
+			portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+		}
+	}
+}
+void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) {
+
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void reboot() {
+	NVIC_SystemReset();
+}
+
+void delay_ms(uint16_t count) {
+	HAL_Delay(count);
+}

workspace/TS100/Core/BSP/Miniware/I2C_Wrapper.cpp

@@ -0,0 +1,142 @@
+/*
+ * FRToSI2C.cpp
+ *
+ *  Created on: 14Apr.,2018
+ *      Author: Ralim
+ */
+#include <I2C_Wrapper.hpp>
+#include "BSP.h"
+#include "Setup.h"
+#define I2CUSESDMA
+SemaphoreHandle_t FRToSI2C::I2CSemaphore;
+StaticSemaphore_t FRToSI2C::xSemaphoreBuffer;
+
+void FRToSI2C::CpltCallback() {
+	hi2c1.State = HAL_I2C_STATE_READY;  // Force state reset (even if tx error)
+	if (I2CSemaphore) {
+		xSemaphoreGiveFromISR(I2CSemaphore, NULL);
+	}
+}
+
+bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress,
+		uint8_t *pData, uint16_t Size) {
+
+	if (I2CSemaphore == NULL) {
+		// no RToS, run blocking code
+		HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT,
+				pData, Size, 5000);
+		return true;
+	} else {
+		// RToS is active, run threading
+		// Get the mutex so we can use the I2C port
+		// Wait up to 1 second for the mutex
+		if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
+#ifdef I2CUSESDMA
+			if (HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress,
+					I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
+
+				I2C_Unstick();
+				xSemaphoreGive(I2CSemaphore);
+				return false;
+			} else {
+				xSemaphoreGive(I2CSemaphore);
+				return true;
+			}
+#else
+
+			if (HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData, Size,
+					5000)==HAL_OK){
+				xSemaphoreGive(I2CSemaphore);
+				return true;
+			}
+			xSemaphoreGive(I2CSemaphore);
+			return false;
+#endif
+		} else {
+			return false;
+		}
+	}
+
+}
+void FRToSI2C::I2C_RegisterWrite(uint8_t address, uint8_t reg, uint8_t data) {
+	Mem_Write(address, reg, &data, 1);
+}
+
+uint8_t FRToSI2C::I2C_RegisterRead(uint8_t add, uint8_t reg) {
+	uint8_t tx_data[1];
+	Mem_Read(add, reg, tx_data, 1);
+	return tx_data[0];
+}
+void FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
+		uint8_t *pData, uint16_t Size) {
+
+	if (I2CSemaphore == NULL) {
+		// no RToS, run blocking code
+		HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT,
+				pData, Size, 5000);
+	} else {
+		// RToS is active, run threading
+		// Get the mutex so we can use the I2C port
+		// Wait up to 1 second for the mutex
+		if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
+#ifdef I2CUSESDMA
+			if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress,
+					I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
+
+				I2C_Unstick();
+				xSemaphoreGive(I2CSemaphore);
+			}
+			xSemaphoreGive(I2CSemaphore);
+#else
+			if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT, pData,
+							Size, 5000) != HAL_OK) {
+			}
+			xSemaphoreGive(I2CSemaphore);
+#endif
+		} else {
+		}
+	}
+
+}
+
+void FRToSI2C::Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size) {
+	if (I2CSemaphore == NULL) {
+		// no RToS, run blocking code
+		HAL_I2C_Master_Transmit(&hi2c1, DevAddress, pData, Size, 5000);
+	} else {
+		// RToS is active, run threading
+		// Get the mutex so we can use the I2C port
+		// Wait up to 1 second for the mutex
+		if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
+#ifdef I2CUSESDMA
+
+			if (HAL_I2C_Master_Transmit_DMA(&hi2c1, DevAddress, pData, Size)
+					!= HAL_OK) {
+
+				I2C_Unstick();
+				xSemaphoreGive(I2CSemaphore);
+
+			}
+#else
+			HAL_I2C_Master_Transmit(&hi2c1, DevAddress, pData, Size, 5000);
+			xSemaphoreGive(I2CSemaphore);
+#endif
+
+		} else {
+		}
+	}
+
+}
+
+bool FRToSI2C::probe(uint16_t DevAddress) {
+	uint8_t buffer[1];
+	if (Mem_Read(DevAddress, 0,  buffer, 1)) {
+		//ACK'd
+		return true;
+	}
+	return false;
+}
+
+void FRToSI2C::I2C_Unstick() {
+	unstick_I2C();
+}

workspace/TS100/Core/BSP/Miniware/Pins.h

@@ -1,145 +1,83 @@
-/*
- * Hardware.h
- *
- *  Created on: 29Aug.,2017
- *      Author: Ben V. Brown
- */
-
-#ifndef HARDWARE_H_
-#define HARDWARE_H_
-#include "Setup.h"
-#include "stm32f1xx_hal.h"
-#include "FreeRTOS.h"
-#include "stm32f1xx_hal.h"
-#include "cmsis_os.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum Orientation {
-	ORIENTATION_LEFT_HAND = 0, ORIENTATION_RIGHT_HAND = 1, ORIENTATION_FLAT = 3
-};
-#define PID_TIM_HZ (8)
-#if defined(MODEL_TS100) + defined(MODEL_TS80) > 1
-#error "Multiple models defined!"
-#elif defined(MODEL_TS100) + defined(MODEL_TS80) == 0
-#error "No model defined!"
-#endif
-
-#ifdef MODEL_TS100
-
-#define KEY_B_Pin GPIO_PIN_6
-#define KEY_B_GPIO_Port GPIOA
-#define TMP36_INPUT_Pin GPIO_PIN_7
-#define TMP36_INPUT_GPIO_Port GPIOA
-#define TMP36_ADC1_CHANNEL ADC_CHANNEL_7
-#define TIP_TEMP_Pin GPIO_PIN_0
-#define TIP_TEMP_GPIO_Port GPIOB
-#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_8
-#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_8
-#define VIN_Pin GPIO_PIN_1
-#define VIN_GPIO_Port GPIOB
-#define VIN_ADC1_CHANNEL ADC_CHANNEL_9
-#define VIN_ADC2_CHANNEL ADC_CHANNEL_9
-#define OLED_RESET_Pin GPIO_PIN_8
-#define OLED_RESET_GPIO_Port GPIOA
-#define KEY_A_Pin GPIO_PIN_9
-#define KEY_A_GPIO_Port GPIOA
-#define INT_Orientation_Pin GPIO_PIN_3
-#define INT_Orientation_GPIO_Port GPIOB
-#define PWM_Out_Pin GPIO_PIN_4
-#define PWM_Out_GPIO_Port GPIOB
-#define PWM_Out_CHANNEL TIM_CHANNEL_1
-#define PWM_Out_CCR
-#define INT_Movement_Pin GPIO_PIN_5
-#define INT_Movement_GPIO_Port GPIOB
-#define SCL_Pin GPIO_PIN_6
-#define SCL_GPIO_Port GPIOB
-#define SDA_Pin GPIO_PIN_7
-#define SDA_GPIO_Port GPIOB
-
-#else
-// TS80 pin map
-#define KEY_B_Pin GPIO_PIN_0
-#define KEY_B_GPIO_Port GPIOB
-#define TMP36_INPUT_Pin GPIO_PIN_4
-#define TMP36_INPUT_GPIO_Port GPIOA
-#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
-#define TIP_TEMP_Pin GPIO_PIN_3
-#define TIP_TEMP_GPIO_Port GPIOA
-#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3
-#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3
-
-#define VIN_Pin GPIO_PIN_2
-#define VIN_GPIO_Port GPIOA
-#define VIN_ADC1_CHANNEL ADC_CHANNEL_2
-#define VIN_ADC2_CHANNEL ADC_CHANNEL_2
-#define OLED_RESET_Pin GPIO_PIN_15
-#define OLED_RESET_GPIO_Port GPIOA
-#define KEY_A_Pin GPIO_PIN_1
-#define KEY_A_GPIO_Port GPIOB
-#define INT_Orientation_Pin GPIO_PIN_4
-#define INT_Orientation_GPIO_Port GPIOB
-#define PWM_Out_Pin GPIO_PIN_6
-#define PWM_Out_GPIO_Port GPIOA
-#define PWM_Out_CHANNEL TIM_CHANNEL_1
-#define INT_Movement_Pin GPIO_PIN_5
-#define INT_Movement_GPIO_Port GPIOB
-#define SCL_Pin GPIO_PIN_6
-#define SCL_GPIO_Port GPIOB
-#define SDA_Pin GPIO_PIN_7
-#define SDA_GPIO_Port GPIOB
-
-#endif
-
-/*
- * Keep in a uint8_t range for the ID's
- */
-#ifdef MODEL_TS100
-enum TipType {
-	TS_B2 = 0,
-	TS_D24 = 1,
-	TS_BC2 = 2,
-	TS_C1 = 3,
-	Tip_MiniWare = 4,
-	HAKKO_BC2 = 4,
-	Tip_Hakko = 5,
-	Tip_Custom = 5,
-};
-#endif
-#ifdef MODEL_TS80
-enum TipType {
-	TS_B02 = 0, TS_D25 = 1, Tip_MiniWare = 2, Tip_Custom = 3,
-};
-#endif
-extern uint16_t tipGainCalValue ;
-
-uint16_t lookupTipDefaultCalValue(enum TipType tipID);
- uint16_t getHandleTemperature();
-uint16_t getTipRawTemp(uint8_t refresh);
-uint16_t getInputVoltageX10(uint16_t divisor,uint8_t sample);
-
-void setTipPWM(uint8_t pulse);
-uint16_t ctoTipMeasurement(uint16_t temp);
-uint16_t tipMeasurementToC(uint16_t raw);
-uint16_t ftoTipMeasurement(uint16_t temp);
-uint16_t tipMeasurementToF(uint16_t raw);
-void seekQC(int16_t Vx10, uint16_t divisor);
-void setCalibrationOffset(int16_t offSet);
-void setTipType(enum TipType tipType, uint8_t manualCalGain);
-uint32_t calculateTipR();
-int16_t calculateMaxVoltage(uint8_t useHP);
-void startQC(uint16_t divisor); // Tries to negotiate QC for highest voltage, must be run after
-// RToS
-// This will try for 12V, failing that 9V, failing that 5V
-// If input is over 12V returns -1
-// If the input is [5-12] Will return the value.
-void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer,
-		StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize) ;
-void vApplicationIdleHook(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* HARDWARE_H_ */
+/*
+ * Pins.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_MINIWARE_PINS_H_
+#define BSP_MINIWARE_PINS_H_
+
+#if defined(MODEL_TS100) + defined(MODEL_TS80) > 1
+#error "Multiple models defined!"
+#elif defined(MODEL_TS100) + defined(MODEL_TS80) == 0
+#error "No model defined!"
+#endif
+
+#ifdef MODEL_TS100
+
+#define KEY_B_Pin GPIO_PIN_6
+#define KEY_B_GPIO_Port GPIOA
+#define TMP36_INPUT_Pin GPIO_PIN_7
+#define TMP36_INPUT_GPIO_Port GPIOA
+#define TMP36_ADC1_CHANNEL ADC_CHANNEL_7
+#define TIP_TEMP_Pin GPIO_PIN_0
+#define TIP_TEMP_GPIO_Port GPIOB
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_8
+#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_8
+#define VIN_Pin GPIO_PIN_1
+#define VIN_GPIO_Port GPIOB
+#define VIN_ADC1_CHANNEL ADC_CHANNEL_9
+#define VIN_ADC2_CHANNEL ADC_CHANNEL_9
+#define OLED_RESET_Pin GPIO_PIN_8
+#define OLED_RESET_GPIO_Port GPIOA
+#define KEY_A_Pin GPIO_PIN_9
+#define KEY_A_GPIO_Port GPIOA
+#define INT_Orientation_Pin GPIO_PIN_3
+#define INT_Orientation_GPIO_Port GPIOB
+#define PWM_Out_Pin GPIO_PIN_4
+#define PWM_Out_GPIO_Port GPIOB
+#define PWM_Out_CHANNEL TIM_CHANNEL_1
+#define PWM_Out_CCR
+#define INT_Movement_Pin GPIO_PIN_5
+#define INT_Movement_GPIO_Port GPIOB
+#define SCL_Pin GPIO_PIN_6
+#define SCL_GPIO_Port GPIOB
+#define SDA_Pin GPIO_PIN_7
+#define SDA_GPIO_Port GPIOB
+
+#else
+// TS80 pin map
+#define KEY_B_Pin GPIO_PIN_0
+#define KEY_B_GPIO_Port GPIOB
+#define TMP36_INPUT_Pin GPIO_PIN_4
+#define TMP36_INPUT_GPIO_Port GPIOA
+#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
+#define TIP_TEMP_Pin GPIO_PIN_3
+#define TIP_TEMP_GPIO_Port GPIOA
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3
+#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3
+
+#define VIN_Pin GPIO_PIN_2
+#define VIN_GPIO_Port GPIOA
+#define VIN_ADC1_CHANNEL ADC_CHANNEL_2
+#define VIN_ADC2_CHANNEL ADC_CHANNEL_2
+#define OLED_RESET_Pin GPIO_PIN_15
+#define OLED_RESET_GPIO_Port GPIOA
+#define KEY_A_Pin GPIO_PIN_1
+#define KEY_A_GPIO_Port GPIOB
+#define INT_Orientation_Pin GPIO_PIN_4
+#define INT_Orientation_GPIO_Port GPIOB
+#define PWM_Out_Pin GPIO_PIN_6
+#define PWM_Out_GPIO_Port GPIOA
+#define PWM_Out_CHANNEL TIM_CHANNEL_1
+#define INT_Movement_Pin GPIO_PIN_5
+#define INT_Movement_GPIO_Port GPIOB
+#define SCL_Pin GPIO_PIN_6
+#define SCL_GPIO_Port GPIOB
+#define SDA_Pin GPIO_PIN_7
+#define SDA_GPIO_Port GPIOB
+
+#endif
+
+#endif /* BSP_MINIWARE_PINS_H_ */

workspace/TS100/Core/BSP/Miniware/Power.cpp

@@ -0,0 +1,21 @@
+#include "BSP.h"
+#include "BSP_Power.h"
+#include "QC3.h"
+#include "Settings.h"
+void power_probe() {
+// If TS80 probe for QC
+// If TS100 - noop
+#ifdef MODEL_TS80
+    startQC(systemSettings.voltageDiv);
+
+    seekQC((systemSettings.cutoutSetting) ? 120 : 90,
+           systemSettings.voltageDiv);  // this will move the QC output to the preferred voltage to start with
+
+#endif
+}
+
+void power_check() {
+#ifdef MODEL_TS80
+    QC_resync();
+#endif
+}

workspace/TS100/Core/BSP/Miniware/QC_GPIO.cpp

@@ -0,0 +1,74 @@
+/*
+ * QC.c
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+#include "BSP.h"
+#include "Pins.h"
+#include "QC3.h"
+#include "Settings.h"
+#include "stm32f1xx_hal.h"
+void QC_DPlusZero_Six() {
+    HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);  // pull down D+
+}
+void QC_DNegZero_Six() {
+    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
+    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
+}
+void QC_DPlusThree_Three() {
+    HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET);  // pull up D+
+}
+void QC_DNegThree_Three() {
+    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
+    HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET);
+}
+void QC_DM_PullDown() {
+    GPIO_InitTypeDef GPIO_InitStruct;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_PULLDOWN;
+    GPIO_InitStruct.Pin = GPIO_PIN_11;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
+void QC_DM_No_PullDown() {
+    GPIO_InitTypeDef GPIO_InitStruct;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pin = GPIO_PIN_11;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
+void QC_Init_GPIO() {
+    // Setup any GPIO into the right states for QC
+    GPIO_InitTypeDef GPIO_InitStruct;
+    GPIO_InitStruct.Pin = GPIO_PIN_3;
+    GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_10;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+    // Turn off output mode on pins that we can
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
+void QC_Post_Probe_En() {
+    GPIO_InitTypeDef GPIO_InitStruct;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+    GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_10;
+    GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
+
+uint8_t QC_DM_PulledDown() { return HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO_PIN_RESET ? 1 : 0; }
+
+void QC_resync() {
+#ifdef MODEL_TS80
+    seekQC((systemSettings.cutoutSetting) ? 120 : 90,
+           systemSettings.voltageDiv);  // Run the QC seek again if we have drifted too much
+#endif
+}

workspace/TS100/Core/BSP/Miniware/README.md

@@ -0,0 +1,12 @@
+# BSP section for STM32F103 based Miniware products
+
+This folder contains the hardware abstractions required for the TS100, TS80 and probably TS80P soldering irons.
+
+## Main abstractions
+
+* Hardware Init
+* -> Should contain all bootstrap to bring the hardware up to an operating point
+* -> Two functions are required, a pre and post FreeRToS call
+* I2C read/write
+* Set PWM for the tip
+* Links between IRQ's on the system and the calls in the rest of the firmware

workspace/TS100/Core/BSP/Miniware/Setup.c

@@ -5,6 +5,7 @@
  *      Author: Ben V. Brown
  */
 #include "Setup.h"
+#include "Pins.h"
 ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
@@ -32,12 +33,8 @@ static void MX_ADC2_Init(void);
 
 void Setup_HAL() {
 	SystemClock_Config();
-#ifndef LOCAL_BUILD
 	__HAL_AFIO_REMAP_SWJ_DISABLE()
 	;
-#else
-	__HAL_AFIO_REMAP_SWJ_NOJTAG();
-#endif
 
 	MX_GPIO_Init();
 	MX_DMA_Init();
@@ -49,8 +46,8 @@ void Setup_HAL() {
 	MX_IWDG_Init();
 	HAL_ADC_Start(&hadc2);
 	HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t*) ADCReadings, 64); // start DMA of normal readings
-	HAL_ADCEx_InjectedStart(&hadc1);   // enable injected  readings
-	HAL_ADCEx_InjectedStart(&hadc2);   // enable injected  readings
+	HAL_ADCEx_InjectedStart(&hadc1);   // enable injected readings
+	HAL_ADCEx_InjectedStart(&hadc2);   // enable injected readings
 }
 
 // channel 0 -> temperature sensor, 1-> VIN
@@ -336,7 +333,7 @@ static void MX_TIM2_Init(void) {
 	HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
 
 	sConfigOC.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 255 + 13;//13 -> Delay of 5ms
+	sConfigOC.Pulse = 255 + 13;  //13 -> Delay of 5ms
 	//255 is the largest time period of the drive signal, and then offset ADC sample to be a bit delayed after this
 	/*
 	 * It takes 4 milliseconds for output to be stable after PWM turns off.

workspace/TS100/Core/BSP/Miniware/Setup.h

@@ -1,38 +1,38 @@
-/*
- * Setup.h
- *
- *  Created on: 29Aug.,2017
- *      Author: Ben V. Brown
- */
-
-#ifndef SETUP_H_
-#define SETUP_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <hardware.h>
-#include "stm32f1xx_hal.h"
-
-extern ADC_HandleTypeDef hadc1;
-extern ADC_HandleTypeDef hadc2;
-extern DMA_HandleTypeDef hdma_adc1;
-
-extern DMA_HandleTypeDef hdma_i2c1_rx;
-extern DMA_HandleTypeDef hdma_i2c1_tx;
-extern I2C_HandleTypeDef hi2c1;
-
-extern IWDG_HandleTypeDef hiwdg;
-
-extern TIM_HandleTypeDef htim2;
-extern TIM_HandleTypeDef htim3;
-void Setup_HAL();
-uint16_t getADC(uint8_t channel);
-
-void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim);    //Since the hal header file does not define this one
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SETUP_H_ */
+/*
+ * Setup.h
+ *
+ *  Created on: 29Aug.,2017
+ *      Author: Ben V. Brown
+ */
+
+#ifndef SETUP_H_
+#define SETUP_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "stm32f1xx_hal.h"
+
+extern ADC_HandleTypeDef hadc1;
+extern ADC_HandleTypeDef hadc2;
+extern DMA_HandleTypeDef hdma_adc1;
+
+extern DMA_HandleTypeDef hdma_i2c1_rx;
+extern DMA_HandleTypeDef hdma_i2c1_tx;
+extern I2C_HandleTypeDef hi2c1;
+
+extern IWDG_HandleTypeDef hiwdg;
+
+extern TIM_HandleTypeDef htim2;
+extern TIM_HandleTypeDef htim3;
+void Setup_HAL();
+uint16_t getADC(uint8_t channel);
+
+void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); //Since the hal header file does not define this one
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* SETUP_H_ */

workspace/TS100/Core/BSP/Miniware/UnitSettings.h

@@ -0,0 +1,18 @@
+/*
+ * UnitSettings.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_MINIWARE_UNITSETTINGS_H_
+#define BSP_MINIWARE_UNITSETTINGS_H_
+//On the TS80, the LIS accel is mounted backwards
+#ifdef MODEL_TS80
+#define LIS_ORI_FLIP
+#endif
+
+
+
+
+#endif /* BSP_MINIWARE_UNITSETTINGS_H_ */