Update version.h

Create FUNDING.yml
Slight reqork of QC logic to bring back older style + mix in another compatability hack
2025-02-26 07:53:55 +00:00 · 2020-04-04 13:32:43 +11:00 · 2020-04-04 13:27:17 +11:00 · 2020-04-04 13:16:28 +11:00 · 2020-04-04 13:15:59 +11:00 · 2020-04-04 12:00:02 +11:00
322 changed files with 104783 additions and 316460 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Ignore all differences in line endings
+*        -crlf
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+ko_fi: ralim
+custom: https://paypal.me/RalimTek
--- a/.github/workflows/ccpp.yml
+++ b/.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
--- a/.gitignore
+++ b/.gitignore
@@ -1,51 +1,192 @@
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-*.d
-*.DS_Store
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-workspace/*.hex
-
-# Debug files
-*.dSYM/
-*.su
-workspace/ts100/Debug/*
-workspace/.metadata/*
-
-workspace/ts100/.settings/language.settings.xml
-workspace/ts100/.cproject
-TS100/KiCad/TS100.bak
-Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/
-Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
-workspace/ts100/ts100.xml
-workspace/ts100_old/*
-*.cache
-workspace/TS100/.settings/language.settings.xml
-workspace/TS100A/Release/TS100A.map
-workspace/TS100A/Release/TS100A.list
-workspace/TS100A/Release/TS100A.hex
-workspace/TS100A/.settings/language.settings.xml
-workspace/TS100A/.metadata/
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+*.d
+*.DS_Store
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+workspace/*.hex
+
+# Debug files
+*.dSYM/
+*.su
+workspace/ts100/Debug/*
+workspace/.metadata/*
+
+workspace/ts100/.settings/language.settings.xml
+workspace/ts100/.cproject
+TS100/KiCad/TS100.bak
+Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/
+Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
+workspace/ts100/ts100.xml
+workspace/ts100_old/*
+*.cache
+workspace/TS100/.settings/language.settings.xml
+workspace/TS100A/Release/TS100A.map
+workspace/TS100A/Release/TS100A.list
+workspace/TS100A/Release/TS100A.hex
+workspace/TS100A/.settings/language.settings.xml
+workspace/TS100A/.metadata/
+Translation Editor/.vscode/
+Translation Editor/__pycache__/
+*.pyc
+workspace/TS100/src/Translation.cpp
+*.lst
+*.mk
+*.list
+workspace/TS100/Release/
+workspace/TS100/Hexfile/
+workspace/RemoteSystemsTempFiles/
+workspace/TS100/.settings/
+workspace/TS100/TS80/
+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
--- a/Editor/.vs/TS100
+++ b/Editor/.vs/TS100
--- a/Editor/obj/Debug/CoreCompileInputs.cache
+++ b/Editor/obj/Debug/CoreCompileInputs.cache
@@ -1 +0,0 @@
-1f6b9b8bf2c9e759acd19ce919cfeae19b243aa0
--- a/Logo/Logos/001_TS100_Left.hex
+++ b/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
--- a/Logo/Logos/001_TS100_Left.png
+++ b/Logo/Logos/001_TS100_Left.png
--- a/Logo/python_logo_converter/img2ts100.py
+++ b/Logo/python_logo_converter/img2ts100.py
@@ -8,7 +8,7 @@ import sys
 try:
    from PIL import Image, ImageOps
 except ImportError as error:
-    raise ImportError("{}: {} requres Python Imaging Library (PIL). " 
+    raise ImportError("{}: {} requres Python Imaging Library (PIL). "
                      "Install with `pip` or OS-specific package "
                      "management tool."
                      .format(error, sys.argv[0]))
@@ -32,29 +32,32 @@ def split16(word):
    return (word >> 8) & 0xff, word & 0xff


-def intel_hex_line(file, record_type, offset, data):
-    """write a line of data in Intel hex format"""
+def intel_hex_line(record_type, offset, data):
+    """generate a line of data in Intel hex format"""
    # length, address offset, record type
    record_length = len(data)
-    file.write(':{:02X}{:04X}{:02X}'.format(record_length, offset, record_type))
+    yield ':{:02X}{:04X}{:02X}'.format(record_length, offset, record_type)

    # data
-    map(lambda byte: file.write("{:02X}".format(byte)), data)
+    for byte in data:
+        yield "{:02X}".format(byte)

-    # compute and write checksum (with DOS line ending for compatibility/safety)
-    file.write("{:02X}\r\n"
-               .format((((sum(data,                   # sum data ...
-                              record_length           # ... and other ...
-                              + sum(split16(offset))  # ... fields ...
-                              + record_type)          # ... on line
-                          & 0xff)                     # low 8 bits
-                         ^ 0xff)                      # two's ...
-                        + 1)                          # ... complement
-                       & 0xff))                       # low 8 bits
+    # compute and write checksum (now using unix style line endings for DFU3.45 compatibility
+    yield "{:02X}\n".format((((sum(data,                   # sum data ...
+                                     record_length           # ... and other ...
+                                     + sum(split16(offset))  # ... fields ...
+                                     + record_type)          # ... on line
+                                 & 0xff)                     # low 8 bits
+                                ^ 0xff)                      # two's ...
+                               + 1)                          # ... complement
+                              & 0xff)                        # low 8 bits


 def intel_hex(file, bytes_, start_address=0x0):
    """write block of data in Intel hex format"""
+    def write(generator):
+        file.write(''.join(generator))
+
    if len(bytes_) % INTELHEX_BYTES_PER_LINE != 0:
        raise ValueError("Program error: Size of LCD data is not evenly divisible by {}"
                         .format(INTELHEX_BYTES_PER_LINE))
@@ -62,25 +65,21 @@ def intel_hex(file, bytes_, start_address=0x0):
    address_lo =  start_address        & 0xffff
    address_hi = (start_address >> 16) & 0xffff

-    intel_hex_line(file,
-                   INTELHEX_EXTENDED_LINEAR_ADDRESS_RECORD,
-                   0,
-                   split16(address_hi))
+    write(intel_hex_line(INTELHEX_EXTENDED_LINEAR_ADDRESS_RECORD, 0,
+                               split16(address_hi)))

    size_written = 0
    while size_written < INTELHEX_MINIMUM_SIZE:
        offset = address_lo
        for line_start in range(0, len(bytes_), INTELHEX_BYTES_PER_LINE):
-            intel_hex_line(file,
-                           INTELHEX_DATA_RECORD,
-                           offset,
-                           bytes_[line_start:line_start + INTELHEX_BYTES_PER_LINE])
+            write(intel_hex_line(INTELHEX_DATA_RECORD, offset,
+                                 bytes_[line_start:line_start + INTELHEX_BYTES_PER_LINE]))
            size_written += INTELHEX_BYTES_PER_LINE
            if size_written >= INTELHEX_MINIMUM_SIZE:
                break
            offset += INTELHEX_BYTES_PER_LINE

-    intel_hex_line(file, INTELHEX_END_OF_FILE_RECORD, 0, ())
+    write(intel_hex_line(INTELHEX_END_OF_FILE_RECORD, 0, ()))


 def img2hex(input_filename,
@@ -230,7 +229,7 @@ if __name__ == "__main__":
        sys.exit(1)

    try:
-        with open(args.output_filename, 'w') as output:
+        with open(args.output_filename, 'w', newline='\r\n') as output:
            img2hex(args.input_filename,
                    output,
                    args.preview,
--- a/21
+++ b/21
@@ -0,0 +1,21 @@
+FROM ubuntu:rolling
+LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
+
+WORKDIR /build
+# Setup the ARM GCC toolchain
+
+# Install any needed packages specified in requirements.txt
+RUN apt-get update && \
+  apt-get upgrade -y && \
+  apt-get install -y \
+  make \
+  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
+
+# Add compiler to the path
+ENV PATH "/build/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH"
+COPY . /build/source
+COPY ./ci /build/ci
--- a/Flashing/flash_ts100_linux.sh
+++ b/Flashing/flash_ts100_linux.sh
@@ -37,7 +37,7 @@ function enable_gautomount {
 }

 function is_attached {
-    output=`lsblk -b --raw --output NAME,MODEL | grep 'DFU\\\\x20Disk'`
+    output=`lsblk -b --raw --output NAME,MODEL | grep 'DFU.*Disk'`
    if [ $? -ne 0 ]; then
      return 1
    fi
--- a/History.md
+++ b/History.md
@@ -24,21 +24,21 @@ V1.16

 V1.15

-* Added support for a custom bootup logo to be programmed via the DFU bootloader.
+* Added support for a custom bootup logo to be programmed via the DFU bootloader

 V1.14

-* Changed input voltage cutoff to be based on cell count rather than voltage.
+* Changed input voltage cutoff to be based on cell count rather than voltage

 V1.13

 * Swapped buttons for menu to prevent accidentally changing first menu item
-* Added auto key repeat.
+* Added auto key repeat

 V1.12

 * Increases sensitivity options to be 1*9 with 0 off state
-* Fixes issue where going from COOL *> soldering can leave screen off.
+* Fixes issue where going from COOL *> soldering can leave screen off

 V1.11

@@ -77,7 +77,7 @@ V1.04
 * Allows temperature offset calibration
 * Nicer idle screen

-V1.03 
+V1.03

 * Improved Button handling
 * Ability to set motion sensitivity
@@ -85,5 +85,5 @@ V1.03

 V1.02

-* Adds hold both buttons on IDLE to access the therometer mode.
-* Changes the exit soldering mode to be holding both buttons (Like original firmware).
+* Adds hold both buttons on IDLE to access the therometer mode
+* Changes the exit soldering mode to be holding both buttons (Like original firmware)
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -21,9 +21,9 @@ Please edit this template and fill out all the information you can (where releva

 ***Steps to reproduce:***

-1. 
-2. 
-3. 
+1.
+2.
+3.

 ***Video of problem if hard to reproduce***

@@ -40,7 +40,6 @@ On the idle screen, you can hold the settings button and it will show you the fi
  - Power Supply (Voltage and Current Rating) :


-* **Other information** 
+* **Other information**

 If submitting graphics to go on the iron, please use BMP or PNG files over JPG.
-
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -2,18 +2,16 @@
 Please try and fill out this template where possible, not all fields are required and can be removed.

 * **Please check if the PR fulfills these requirements**
- [ ] The commit message make sense
- [ ] The changes have been tested locally
- [ ] New features have been documented in the Wiki
- [ ] I'm willing to maintain this in the future (Totally Optional)
+- [] The commit message makes sense
+- [] The changes have been tested locally
+- [] Are there any breaking changes

-
-* **What kind of change does this PR introduce?** 
+* **What kind of change does this PR introduce?**
 (Bug fix, feature, docs update, ...)



-* **What is the current behavior?** 
+* **What is the current behavior?**
 (You can also link to an open issue here)


@@ -22,7 +20,7 @@ Please try and fill out this template where possible, not all fields are require



-* **Does this PR introduce a breaking change?** 
+* **Does this PR introduce a breaking change?**
 (What changes might users need to make in their application due to this PR?)


--- a/README.md
+++ b/README.md
@@ -1,139 +1,108 @@
-# TS100
+[![Codeship Status for ts100](https://app.codeship.com/projects/c77dbfe0-0764-0138-9520-3eb35bdb2b2c/status?branch=master)](https://app.codeship.com/projects/379118)

-This is a complete rewrite of the open source software for the ts100 soldering iron.
-The version two fork of this code has no shared code with the original firmware from Miniware (E-design) group.
+# TS100 & TS80 Firmware
+
+
+This firmware is a fresh start for these soldering irons. Designed from the ground up as fully featured control software that leaves nothing to be desired.
+It originally started back at the end of 2016 and has since seen vast improvements, especially some very smart work by community members.
+
+The firmware supports everything you would expect in the soldering iron and has the same features as the stock firmware with some nice extras packed in.
+There is a comprehensive menu system in the iron that allows for adjustment of all the settings on the unit, and support for various languages is added by the community.
+
+On the TS100 there are settings to allow you to specify a cutoff voltage for different lithium-ion battery packs to protect your power source.
+For the TS80 these are removed and replaced with the selection of 18W or 24W depending on what your QC power bank can support.
+Otherwise, both systems work very similar and should support all the features.

 This project is considered feature complete for use as a soldering iron, *so please suggest any feature improvements you would like!*

-A short(ish) video that goes through every single menu option in the firmware is available [over here](https://www.youtube.com/watch?v=WlnpboYfxNk).
-This video was created on an earlier 1.x version of the firmware, so alot has changed but should be fairly intuitive as the menu has vastly improved.
+*This firmware does **NOT** support the USB port while running for changing settings. This is done through the onscreen menu only. Logos are edited using the tool or python script and uploaded in DFU mode.*

-*This firmware does **NOT** support the usb port while running for changing settings. This is done through the onscreen menu only. Logos are edited using the tool or python script and uploaded in DFU mode.*
-
-*Please note that when running the iron off a Lithium battery pack, the Iron is only rated to 24V input. So using a fully charged 6S battery *slightly* exceeds this rating, and is done so at your own risk.
-Please calibrate your irons voltage reading when you are using a lithium battery after any firmware upgrades.*
-
-## Features
+## Core Features

 * PID iron temperature control
 * Automatic sleep with selectable sensitivity
 * Motion wake support
 * Settings menu on the unit
-* Set a voltage lower limit for Lithium batteries so you dont kill your battery pack
+* (TS100) Set a voltage lower limit for Lithium batteries so you don't kill your battery pack
+* (TS80 ) Set 18W or 24W settings for your power bank
 * All settings saved to flash when you exit the menu
 * Improved readability Fonts
 * Use hardware features to improve reliability
 * Can disable movement detection if desired
-* Calibration of the thermocouple offset
-* Boost mode lets you temporarily change the temperature when soldering (ie raise temperature for short periods of time)
-* Battery charge level indicatior if power source set to a lipo cell count.
-* Custom bootup logo support
-* Automatic LCD rotation based on orientation
-* Supports both the version 1 and version 2 hardware
+* Full tip profile calibration
+* Boost mode lets you temporarily change the temperature when soldering (ie raise the temperature for short periods of time)
+* (TS100) Battery charge level indicator if power source set to a lipo cell count
+* (TS80) Power bank operating voltage is displayed
+* Custom boot up logo support
+* Automatic LCD rotation based on the orientation
+* Supports both the version 1 and version 2 hardware (different accelerometers)

-## Upgrading your ts100 iron
+# Upgrading your iron

-This is completely safe, if it goes wrong just put the .hex file from the official website onto the unit and your back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/ts100/releases) The file you want is called *ts100_EN.hex* unless you want the translations, they are ts100_*language short name*.hex.
+This is completely safe, but if it goes wrong just put the .hex file from the official website onto the unit and you're back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/ts100/releases) The file you want is called *(MODEL)_EN.hex* unless you want the translations, they are (MODEL)_*language short name*.hex. Where (MODEL) is either TS100 or TS80.

 Officially the bootloader on the iron only works under Windows. However, users have reported that it does work under Mac, and can be made to work under Linux *sometimes*. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading-Firmware).

-1. Disable Teracopy or other Explorer replacements.
-2. Hold the button closest to the tip, and plug in the USB to the computer.
-3. The unit will appear as a USB drive.
-4. Drag the .hex file onto the USB drive.
-5. The unit will disconnect and reconnect.
-6. The filename will have changed to end in .RDY (=success) or .ERR (=error)
-7. If it ends with .RDY you're done! Otherwise something went wrong, retry. E.g. try to copy the firmware with the windows command line tool "copy" instead of explorer
+```
+1. Hold the button closest to the tip, and plug in the USB to the computer.
+2. The unit will appear as a USB drive.
+3. Drag the .hex file onto the USB drive.
+4. The unit will disconnect and reconnect.
+5. The filename will have changed to end in .RDY or .ERR
+6. If it ends with .RDY you're done! Otherwise, something went wrong.
+7. If it didn't work the first time, try copying the file again without disconnecting the iron, often it will work on the second shot.
 8. Disconnect the USB and power up the iron. You're good to go.
+```

-For the more adventurerous out there, you can also load this firmware onto the device using a SWD programmer.
-On the bottom of the MCU riser pcb, there are 4 pads for programming.
-There is a complete device flash backup included in this repository. (Note this includes the bootloader, so will need a SWD programmer to load onto the unit). Please do not use the backup of the bootloader for anything malicious, its only saved here for those who are tinkering with their iron and decide to replace it.
+
+For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer.
+On the bottom of the MCU riser PCB, there are 4 pads for programming.
+There is a complete device flash backup included in this repository. (Note this includes the bootloader, so will need an SWD programmer to load onto the unit).
+For the TS80 the SWD pins are used for the QC negotiation, so you can actually connect to the SWD power via the USB connector.

 ## Setting a custom bootup image

 This firmware uses a different method of updating the bootup image.
 This removes the need for emulating a USB drive on the iron just to allow for a bootup image to be setup.
-There are further instructions on the [wiki](https://github.com/Ralim/ts100/wiki/Logo-Editor). Instructions are kept on the wiki so that users can update the information if they find extra helpful information.
+There are further instructions on the [wiki](https://github.com/Ralim/ts100/wiki/Logo-Editor).
+Instructions are kept on the wiki so that users can update the information if they find extra helpful information.

-## New Menu System
+# Menu System

 This new firmware uses a new menu system to allow access to the settings on the device.
 When on the main screen, the unit shows prompts for the two most common operations.

 * Pressing the button near the tip enters soldering mode
-* Pressing the button near the USB enters the settings menu.
-* Holding the button near the tip will enter soldering temperature adjust mode (This is the same as the one in the soldering menu, just to let you edit before heating up).
-* Holding the button near the USB end will show the firmware version details.
+* Pressing the button near the USB enters the settings menu
+* Holding the button near the tip will enter soldering temperature adjust mode (This is the same as the one in the soldering menu, just to let you edit before heating up)
+* Holding the button near the USB end will show the firmware version details

-## Soldering mode
-
-In this mode the iron works as you would expect, pressing either button will take you to a temperature change screen.
-Use each button to go up and down in temperature. Pressing both buttons will exit you from the temperature menu (or wait 3 seconds and it will time out).
-Pressing both buttons or holding the button near the USB will exit the soldering mode.
-Holding the button at the front of the iron will enter boost mode (if enabled).
-
-## Settings Menu
-
-This menu allows you to cycle through all the options and set their values.
-The button near the USB cycles through the options, and the one near the tip changes the selected option.
-Note that settings are not saved until you exit the menu.
-If you leave the unit alone (ie don't press any buttons) on a setting, after 3 seconds the screen will scroll a rough description of the setting.
-
-The menu is arranged so that the most often used settings are first.
-With submenu's being selected to enter using the front button (as if you were going to change the setting).
-Scrolling through the submenu will return you back to its entry location after you scroll through all of the options.
-
-### Calibrating input voltage
-
-Due to the tolerance on the resistors used for the input voltage divider, some irons can be up to 0.6V out on the voltage measurement.
-Please calibrate your iron if you have any issues with the cutoff voltage.
-Note that cutoff messages can also be triggered by using a power supply that is too weak and fails under the load of the iron.
-This is more critical than before with the new cell count based cutout voltage.
-
-To calibrate your Iron:
-
-1. Measure the input voltage with a multimeter and note it down.
-2. Connect the input to your iron.
-3. Enter the settings menu
-4. Under the advanced submenu
-5. Select the calibrate voltage option
-6. Use the front and back buttons to adjust the displayed voltage to minimise the error to your origional measurement
-7. Hold both buttons to save and exit to the menu
-
-### Calibrating tip offset
-
-Some tips will have an offset on their readings, to calibrate this out perform the following steps:
-
-1. Connect power to your iron
-2. Make sure the tip is at room temperature (ie. wait for a fair while after using the iron before calibration)
-3. Enter the settings menu
-4. Scroll down to the advanced menu, and then the temperature calibration
-5. Press the button to change the option (tip button)
-6. The display will start to scroll a warning message to check that the tip is at ambient temperature!
-7. Press the button near the tip of the iron to confirm.
-8. The display will go to "...." for a short period of time as the unit measures the tip temperature and the handle temperature and compares them
-9. The display will then go back to *TMP CAL*
-10. Calibration is done, just exit the settings menu as normal
-11. You're done. Enjoy your iron.
-
-### Boost mode
-
-This allows you to change the front key (one near the tip) to become a boost button when you hold it for > 2 seconds. This allows you to set this button to change the soldering temperature for short periods. For example when soldering a big joint and you want to boost the temperature a bit.
-
-The boost temperature is set in the settings menu.
+More details are over in the [Menu information.](menu.md)

 ## Thanks

-If you love this firmware and want to continue my caffine addiction, you can do so here (or email me for other options) : https://paypal.me/RalimTek
+
+If you love this firmware and want to continue my caffeine addiction, you can do so here (or email me for other options) : https://paypal.me/RalimTek
+I also want to give a shout out to all of the [Fantastic Contributors](https://github.com/Ralim/ts100/graphs/contributors).
+
+Especially to the following users, who have helped in various ways that are massively appreciated:
+
+* [dhiltonp](https://github.com/dhiltonp)
+* [Mrkvozrout](https://github.com/Mrkvozrout)
+* [jonnieZG](https://github.com/jonnieZG)
+* [federck](https://github.com/federck)
+* [jvitkauskas](https://github.com/jvitkauskas)
+* [doegox](https://github.com/doegox)
+* [perillamint](https://github.com/perillamint)
+

 ## Licence

-The code in this repository that is based on the STM tools is under a BSD like licence.
-The code created by the communitiy is GNU GPLv3.
+The code in this repository that is based on the STM tools is under a BSD-like licence.
+The code created by the community is GNU GPLv3. Unless noted elsewhere.
 The FreeRToS is under its own licence.

 ## Commercial Use

-This software is provided as-is, so I cannot provide any commercial support for the firmware. However you are more than welcome to distribute links to the firmware, or provide irons with this software on them. 
-Please do not re-host the files, but rather link to this page, so that there are not old versions of the firmware scattered around. If this firmware does make you money, it would be nice to recieve a donation, however there is no enforcement.
+This software is provided as-is, so I cannot provide any commercial support for the firmware. However, you are more than welcome to distribute links to the firmware, or provide irons with this software on them.
+Please do not re-host the files, but rather link to this page, so that there are no old versions of the firmware scattered around. If this firmware does make you money, it would be nice to receive a donation, however, there is no enforcement.
--- a/Editor/fontTables.py
+++ b/Editor/fontTables.py
@@ -0,0 +1,844 @@
+#coding=utf-8
+def getFontMap():
+    font = {
+        " ":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,",
+        "!":"0x00,0x00,0x00,0x00,0x7C,0xFF,0xFF,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x33,0x00,0x00,0x00,0x00,0x00," ,
+        "\"":"0x00,0x00,0x00,0x3C,0x3C,0x00,0x00,0x3C,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,",
+        "#":"0x00,0x00,0x10,0x90,0xF0,0x7E,0x1E,0x90,0xF0,0x7E,0x1E,0x10,0x00,0x02,0x1E,0x1F,0x03,0x02,0x1E,0x1F,0x03,0x02,0x00,0x00," ,
+        "$":"0x00,0x00,0x78,0xFC,0xCC,0xFF,0xFF,0xCC,0xCC,0x88,0x00,0x00,0x00,0x00,0x04,0x0C,0x0C,0x3F,0x3F,0x0C,0x0F,0x07,0x00,0x00," ,
+        "%":"0x00,0x00,0x38,0x38,0x38,0x00,0x80,0xC0,0xE0,0x70,0x38,0x1C,0x00,0x30,0x38,0x1C,0x0E,0x07,0x03,0x01,0x38,0x38,0x38,0x00," ,
+        "&":"0x00,0x00,0x00,0xB8,0xFC,0xC6,0xE2,0x3E,0x1C,0x00,0x00,0x00,0x00,0x00,0x1F,0x3F,0x31,0x21,0x37,0x1E,0x1C,0x36,0x22,0x00," ,
+        "'":"0x00,0x00,0x00,0x00,0x27,0x3F,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "(":"0x00,0x00,0x00,0xF0,0xFC,0xFE,0x07,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x0F,0x1F,0x38,0x20,0x20,0x00,0x00,0x00," ,
+        "(":"0x00,0x00,0x00,0xF0,0xFC,0xFE,0x07,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x0F,0x1F,0x38,0x20,0x20,0x00,0x00,0x00," ,
+        ")":"0x00,0x00,0x00,0x01,0x01,0x07,0xFE,0xFC,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x38,0x1F,0x0F,0x03,0x00,0x00,0x00," ,
+        ")":"0x00,0x00,0x00,0x01,0x01,0x07,0xFE,0xFC,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x38,0x1F,0x0F,0x03,0x00,0x00,0x00," ,
+        "*":"0x00,0x00,0x98,0xB8,0xE0,0xF8,0xF8,0xE0,0xB8,0x98,0x00,0x00,0x00,0x00,0x0C,0x0E,0x03,0x0F,0x0F,0x03,0x0E,0x0C,0x00,0x00," ,
+        "+":"0x00,0x00,0x80,0x80,0x80,0xF0,0xF0,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x0F,0x0F,0x01,0x01,0x01,0x00,0x00," ,
+        ",":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xB8,0xF8,0x78,0x00,0x00,0x00,0x00,0x00," ,
+        "-":"0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00," ,
+        ".":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x38,0x38,0x00,0x00,0x00,0x00,0x00," ,
+        "/":"0x00,0x00,0x00,0x00,0x00,0x80,0xC0,0xE0,0x70,0x38,0x1C,0x0E,0x00,0x18,0x1C,0x0E,0x07,0x03,0x01,0x00,0x00,0x00,0x00,0x00," ,
+        "0":"0x00,0xF8,0xFE,0x06,0x03,0x83,0xC3,0x63,0x33,0x1E,0xFE,0xF8,0x00,0x07,0x1F,0x1E,0x33,0x31,0x30,0x30,0x30,0x18,0x1F,0x07," ,
+        "1":"0x00,0x00,0x00,0x0C,0x0C,0x0E,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x3F,0x3F,0x30,0x30,0x30,0x00," ,
+        "2":"0x00,0x1C,0x1E,0x07,0x03,0x03,0x83,0xC3,0xE3,0x77,0x3E,0x1C,0x00,0x30,0x38,0x3C,0x3E,0x37,0x33,0x31,0x30,0x30,0x30,0x30," ,
+        "3":"0x00,0x0C,0x0E,0x07,0xC3,0xC3,0xC3,0xC3,0xC3,0xE7,0x7E,0x3C,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0E," ,
+        "З":"0x00,0x0C,0x0E,0x07,0xC3,0xC3,0xC3,0xC3,0xC3,0xE7,0x7E,0x3C,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0E," ,
+        "4":"0x00,0xC0,0xE0,0x70,0x38,0x1C,0x0E,0x07,0xFF,0xFF,0x00,0x00,0x00,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x3F,0x3F,0x03,0x03," ,
+        "5":"0x00,0x3F,0x7F,0x63,0x63,0x63,0x63,0x63,0x63,0xE3,0xC3,0x83,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F," ,
+        "6":"0x00,0xC0,0xF0,0xF8,0xDC,0xCE,0xC7,0xC3,0xC3,0xC3,0x80,0x00,0x00,0x0F,0x1F,0x39,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F," ,
+        "7":"0x00,0x03,0x03,0x03,0x03,0x03,0x03,0xC3,0xF3,0x3F,0x0F,0x03,0x00,0x00,0x00,0x00,0x30,0x3C,0x0F,0x03,0x00,0x00,0x00,0x00," ,
+        "8":"0x00,0x00,0xBC,0xFE,0xE7,0xC3,0xC3,0xC3,0xE7,0xFE,0xBC,0x00,0x00,0x0F,0x1F,0x39,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F," ,
+        "9":"0x00,0x3C,0x7E,0xE7,0xC3,0xC3,0xC3,0xC3,0xC3,0xE7,0xFE,0xFC,0x00,0x00,0x00,0x30,0x30,0x30,0x38,0x1C,0x0E,0x07,0x03,0x00," ,
+        ":":"0x00,0x00,0x00,0x00,0x70,0x70,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x00,0x00,0x00,0x00,0x00," ,
+        ":":"0x00,0x00,0x00,0x00,0x70,0x70,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x00,0x00,0x00,0x00,0x00," ,
+        ";":"0x00,0x00,0x00,0x00,0x70,0x70,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9C,0xFC,0x7C,0x00,0x00,0x00,0x00,0x00," ,
+        "<":"0x00,0x00,0xC0,0xE0,0xF0,0x38,0x1C,0x0E,0x07,0x03,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x30,0x00,0x00," ,
+        "=":"0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x00," ,
+        ">":"0x00,0x00,0x03,0x07,0x0E,0x1C,0x38,0xF0,0xE0,0xC0,0x00,0x00,0x00,0x00,0x30,0x38,0x1C,0x0E,0x07,0x03,0x01,0x00,0x00,0x00," ,
+        "?":"0x00,0x1C,0x1E,0x07,0x03,0x83,0xC3,0xE3,0x77,0x3E,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x37,0x37,0x00,0x00,0x00,0x00,0x00," ,
+        "@":"0x00,0xF8,0xFE,0x07,0xF3,0xFB,0x1B,0xFB,0xFB,0x07,0xFE,0xF8,0x00,0x0F,0x1F,0x18,0x33,0x37,0x36,0x37,0x37,0x36,0x03,0x01," ,
+        "A":"0x00,0x00,0x00,0xE0,0xFC,0x1F,0x1F,0xFC,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x07,0x3F,0x38,0x00," ,
+        "А":"0x00,0x00,0x00,0xE0,0xFC,0x1F,0x1F,0xFC,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x07,0x3F,0x38,0x00," ,
+        "B":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xE7,0xFE,0xBC,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "C":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x03,0x07,0x0E,0x0C,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "D":"0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "E":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "E":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "F":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "G":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0xC3,0xC3,0xC3,0xC7,0xC6,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x30,0x3F,0x3F,0x00," ,
+        "H":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "I":"0x00,0x00,0x00,0x03,0x03,0xFF,0xFF,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "J":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x0E,0x1E,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "K":"0x00,0xFF,0xFF,0xC0,0xE0,0xF0,0x38,0x1C,0x0E,0x07,0x03,0x00,0x00,0x3F,0x3F,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x30,0x00," ,
+        "L":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "M":"0x00,0xFF,0xFF,0x1E,0x78,0xE0,0xE0,0x78,0x1E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x01,0x01,0x00,0x00,0x3F,0x3F,0x00," ,
+        "N":"0x00,0xFF,0xFF,0x0E,0x38,0xF0,0xC0,0x00,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x03,0x07,0x1C,0x3F,0x3F,0x00," ,
+        "O":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "P":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00," ,
+        "Р":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00," ,
+        "Q":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x36,0x3E,0x1C,0x3F,0x33,0x00," ,
+        "R":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0x03,0x07,0x0F,0x1D,0x38,0x30,0x00," ,
+        "S":"0x00,0x3C,0x7E,0xE7,0xC3,0xC3,0xC3,0xC3,0xC7,0x8E,0x0C,0x00,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "T":"0x00,0x00,0x03,0x03,0x03,0xFF,0xFF,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "U":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "V":"0x00,0x07,0x3F,0xF8,0xC0,0x00,0x00,0xC0,0xF8,0x3F,0x07,0x00,0x00,0x00,0x00,0x01,0x0F,0x3E,0x3E,0x0F,0x01,0x00,0x00,0x00," ,
+        "W":"0x00,0xFF,0xFF,0x00,0x00,0x80,0x80,0x00,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x1C,0x06,0x03,0x03,0x06,0x1C,0x3F,0x3F,0x00," ,
+        "X":"0x00,0x03,0x0F,0x1C,0x30,0xE0,0xE0,0x30,0x1C,0x0F,0x03,0x00,0x00,0x30,0x3C,0x0E,0x03,0x01,0x01,0x03,0x0E,0x3C,0x30,0x00," ,
+        "Y":"0x00,0x03,0x0F,0x3C,0xF0,0xC0,0xC0,0xF0,0x3C,0x0F,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "Z":"0x00,0x03,0x03,0x03,0x03,0xC3,0xE3,0x33,0x1F,0x0F,0x03,0x00,0x00,0x30,0x3C,0x3E,0x33,0x31,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "Z":"0x00,0x03,0x03,0x03,0x03,0xC3,0xE3,0x33,0x1F,0x0F,0x03,0x00,0x00,0x30,0x3C,0x3E,0x33,0x31,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "[":"0x00,0x00,0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x00,0x00,0x00," ,
+        "\\":"0x00,0x0E,0x1C,0x38,0x70,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0E,0x1C,0x18,",  
+        "\\":"0x00,0x0E,0x1C,0x38,0x70,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0E,0x1C,0x18,",  
+        "]":"0x00,0x00,0x00,0x03,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x30,0x3F,0x3F,0x00,0x00,0x00," ,
+        "^":"0x00,0x60,0x70,0x38,0x1C,0x0E,0x07,0x0E,0x1C,0x38,0x70,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "_":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0," ,
+        "`":"0x00,0x00,0x00,0x00,0x00,0x3E,0x7E,0x4E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "a":"0x00,0x00,0x40,0x60,0x60,0x60,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "b":"0x00,0xFF,0xFF,0xC0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "c":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "d":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0xE0,0xC0,0xFF,0xFF,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x3F,0x3F,0x00," ,
+        "e":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "f":"0x00,0xC0,0xC0,0xFC,0xFE,0xC7,0xC3,0xC3,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "g":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "h":"0x00,0xFF,0xFF,0xC0,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00," ,
+        "i":"0x00,0x00,0x00,0x00,0x60,0xEC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "j":"0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xEC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xE0,0xC0,0xC0,0xFF,0x7F,0x00,0x00,0x00," ,
+        "k":"0x00,0x00,0xFF,0xFF,0x00,0x80,0xC0,0xE0,0x60,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x03,0x07,0x0F,0x1C,0x38,0x30,0x00,0x00," ,
+        "l":"0x00,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "m":"0x00,0xE0,0xC0,0xE0,0xE0,0xC0,0xC0,0xE0,0xE0,0xC0,0x80,0x00,0x00,0x3F,0x3F,0x00,0x00,0x3F,0x3F,0x00,0x00,0x3F,0x3F,0x00," ,
+        "n":"0x00,0x00,0xE0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "o":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "p":"0x00,0xE0,0xE0,0x60,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0xFF,0xFF,0x0C,0x18,0x18,0x18,0x18,0x1C,0x0F,0x07,0x00," ,
+        "q":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xE0,0xE0,0x00,0x00,0x07,0x0F,0x1C,0x18,0x18,0x18,0x18,0x0C,0xFF,0xFF,0x00," ,
+        "r":"0x00,0x00,0xE0,0xE0,0xC0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "s":"0x00,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "t":"0x00,0x60,0x60,0xFE,0xFE,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x3F,0x30,0x30,0x30,0x30,0x00,0x00,0x00," ,
+        "u":"0x00,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "v":"0x00,0x60,0xE0,0x80,0x00,0x00,0x00,0x00,0x80,0xE0,0x60,0x00,0x00,0x00,0x01,0x07,0x1E,0x38,0x38,0x1E,0x07,0x01,0x00,0x00," ,
+        "w":"0x00,0xE0,0xE0,0x00,0x00,0xE0,0xE0,0x00,0x00,0xE0,0xE0,0x00,0x00,0x07,0x1F,0x38,0x1C,0x0F,0x0F,0x1C,0x38,0x1F,0x07,0x00," ,
+        "x":"0x00,0x60,0xE0,0xC0,0x80,0x00,0x80,0xC0,0xE0,0x60,0x00,0x00,0x00,0x30,0x38,0x1D,0x0F,0x07,0x0F,0x1D,0x38,0x30,0x00,0x00," ,
+        "y":"0x00,0x00,0x60,0xE0,0x80,0x00,0x00,0x80,0xE0,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00," ,
+        "z":"0x00,0x60,0x60,0x60,0x60,0x60,0xE0,0xE0,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "z":"0x00,0x60,0x60,0x60,0x60,0x60,0xE0,0xE0,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "{":"0x00,0x00,0x80,0xC0,0xFC,0x7E,0x07,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x01,0x1F,0x3F,0x70,0x60,0x60,0x60,0x00,0x00," ,
+        "|":"0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "}":"0x00,0x00,0x03,0x03,0x03,0x07,0x7E,0xFC,0xC0,0x80,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x70,0x3F,0x1F,0x01,0x00,0x00,0x00," ,
+        "~":"0x00,0x10,0x18,0x0C,0x04,0x0C,0x18,0x10,0x18,0x0C,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "¡":"0x00,0x00,0x00,0x00,0x80,0xF3,0xF3,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x3F,0x3F,0x0F,0x00,0x00,0x00,0x00," ,
+        "¢":"0x00,0x00,0xE0,0xF0,0x38,0xFE,0xFE,0x18,0x38,0x30,0x00,0x00,0x00,0x00,0x03,0x07,0x0E,0x3F,0x3F,0x0C,0x0E,0x06,0x00,0x00," ,
+        "£":"0x00,0x00,0x00,0x80,0xF8,0xFC,0x8C,0x8C,0x1C,0x18,0x00,0x00,0x00,0x00,0x18,0x1C,0x1F,0x0B,0x18,0x18,0x18,0x18,0x08,0x00," ,
+        "¤":"0x00,0xF6,0xFE,0x18,0x0C,0x0C,0x0C,0x0C,0x18,0xFE,0xF6,0x00,0x00,0x1B,0x1F,0x06,0x0C,0x0C,0x0C,0x0C,0x06,0x1F,0x1B,0x00," ,
+        "¥":"0x00,0x03,0x0F,0x3C,0xF0,0xC0,0xC0,0xF0,0x3C,0x0F,0x03,0x00,0x00,0x00,0x0A,0x0A,0x0A,0x3F,0x3F,0x0A,0x0A,0x0A,0x00,0x00," ,
+        "¦":"0x00,0x00,0x00,0x00,0x00,0x1F,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "§":"0x00,0x00,0xDC,0xFE,0x22,0x22,0x22,0x22,0xE6,0xC4,0x00,0x00,0x00,0x00,0x08,0x19,0x11,0x11,0x11,0x11,0x1F,0x0E,0x00,0x00," ,
+        "¨":"0x00,0x00,0x00,0x03,0x03,0x00,0x00,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "©":"0x00,0xF0,0xF8,0x1C,0xCC,0xEC,0x2C,0x6C,0x4C,0x1C,0xF8,0xF0,0x00,0x07,0x0F,0x1C,0x19,0x1B,0x1A,0x1B,0x19,0x1C,0x0F,0x07," ,
+        "«":"0x00,0x80,0xC0,0x60,0x20,0x00,0x80,0xC0,0x60,0x20,0x00,0x00,0x00,0x00,0x01,0x03,0x02,0x00,0x00,0x01,0x03,0x02,0x00,0x00," ,
+        "¬":"0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xF8,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x00," ,
+        "®":"0x00,0xF0,0xF8,0x1C,0xEC,0xEC,0xAC,0xEC,0x4C,0x1C,0xF8,0xF0,0x00,0x07,0x0F,0x1C,0x1B,0x1B,0x18,0x1B,0x1B,0x1C,0x0F,0x07," ,
+        "¯":"0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "°":"0x00,0x00,0x00,0x1E,0x3F,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "±":"0x00,0x00,0x00,0xC0,0xC0,0xF0,0xF0,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x1B,0x1B,0x18,0x18,0x00,0x00,0x00," ,
+        "²":"0x00,0x00,0x19,0x1D,0x15,0x17,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "³":"0x00,0x00,0x11,0x15,0x15,0x1F,0x0A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "´":"0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "µ":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x00,0xFF,0xFF,0x0E,0x0C,0x0C,0x0C,0x06,0x0F,0x0F,0x00,0x00," ,
+        "¶":"0x00,0x38,0x7C,0xC6,0x82,0xFE,0xFE,0x02,0xFE,0xFE,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x3F,0x3F,0x00,0x00," ,
+        "¹":"0x00,0x00,0x12,0x1F,0x1F,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "»":"0x00,0x20,0x60,0xC0,0x80,0x00,0x20,0x60,0xC0,0x80,0x00,0x00,0x00,0x02,0x03,0x01,0x00,0x00,0x02,0x03,0x01,0x00,0x00,0x00," ,
+        "¼":"0x00,0x48,0x7C,0x7C,0x40,0x80,0xC0,0x60,0x30,0x10,0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x06,0x07,0x04,0x1F,0x1F,0x00," ,
+        "½":"0x00,0x48,0x7C,0x7C,0x40,0x80,0xC0,0x60,0x30,0x10,0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x00,0x19,0x1D,0x17,0x12,0x00," ,
+        "¾":"0x00,0x44,0x54,0x7C,0x28,0x80,0xC0,0x60,0x30,0x10,0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x06,0x07,0x04,0x1F,0x1F,0x00," ,
+        "¿":"0x00,0x00,0x00,0x80,0xC0,0xFB,0x7B,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x1F,0x3B,0x31,0x30,0x30,0x30,0x38,0x1E,0x0E,0x00," ,
+        "À":"0x00,0x00,0x00,0x80,0xE1,0x7B,0x7E,0xE4,0x80,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Á":"0x00,0x00,0x00,0x80,0xE4,0x7E,0x7B,0xE1,0x80,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Â":"0x00,0x00,0x00,0x84,0xE6,0x7B,0x7B,0xE6,0x84,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Ã":"0x00,0x00,0x00,0x82,0xE3,0x79,0x7B,0xE2,0x83,0x01,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Ä":"0x00,0x00,0x00,0x83,0xE3,0x78,0x78,0xE3,0x83,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Å":"0x00,0x00,0x00,0x80,0xE2,0x75,0x75,0xE2,0x80,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Æ":"0x00,0x00,0x80,0xF0,0x7C,0x1F,0xFF,0xFF,0xC3,0xC3,0x03,0x00,0x00,0x3C,0x3F,0x07,0x06,0x06,0x3F,0x3F,0x30,0x30,0x30,0x00," ,
+        "Ç":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x03,0x07,0x1E,0x1C,0x00,0x00,0x01,0x07,0xCE,0xDC,0xF8,0xF8,0x18,0x1C,0x0E,0x06,0x00," ,
+        "È":"0x00,0xF8,0xF8,0x99,0x9B,0x9E,0x9C,0x98,0x98,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "É":"0x00,0xF8,0xF8,0x98,0x98,0x9C,0x9E,0x9B,0x99,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "Ê":"0x00,0xF8,0xF8,0x9C,0x9E,0x9B,0x9B,0x9E,0x9C,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "Ë":"0x00,0xF8,0xF8,0x9B,0x9B,0x98,0x98,0x9B,0x9B,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "Ì":"0x00,0x00,0x00,0x19,0x1B,0xFE,0xFC,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Í":"0x00,0x00,0x00,0x18,0x18,0xFC,0xFE,0x1B,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Î":"0x00,0x00,0x00,0x1C,0x1E,0xFB,0xFB,0x1E,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ï":"0x00,0x00,0x00,0x1B,0x1B,0xF8,0xF8,0x1B,0x1B,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ð":"0x00,0xC0,0xFF,0xFF,0xC3,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "Ñ":"0x00,0xF8,0xF8,0x72,0xE3,0xC1,0x83,0x02,0x03,0xF9,0xF8,0x00,0x00,0x3F,0x3F,0x00,0x00,0x01,0x03,0x07,0x0E,0x3F,0x3F,0x00," ,
+        "Ò":"0x00,0xE0,0xF0,0x39,0x1B,0x1E,0x1C,0x18,0x38,0xF0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ó":"0x00,0xE0,0xF0,0x38,0x18,0x1C,0x1E,0x1B,0x39,0xF0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ô":"0x00,0xE0,0xF0,0x3C,0x1E,0x1B,0x1B,0x1E,0x3C,0xF0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Õ":"0x00,0xE0,0xF0,0x3A,0x1B,0x19,0x1B,0x1A,0x3B,0xF1,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ö":"0x00,0xE0,0xF0,0x3B,0x1B,0x18,0x18,0x1B,0x3B,0xF0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "×":"0x00,0xF0,0xF8,0x1C,0x0C,0x8C,0xEC,0x7C,0x18,0xFC,0xF4,0x00,0x00,0x2F,0x3F,0x18,0x3E,0x37,0x31,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ù":"0x00,0xF8,0xF8,0x01,0x03,0x06,0x04,0x00,0x00,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "Ú":"0x00,0xF8,0xF8,0x00,0x00,0x04,0x06,0x03,0x01,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "Û":"0x00,0xF8,0xF8,0x04,0x06,0x03,0x03,0x06,0x04,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "Ü":"0x00,0xF8,0xF8,0x03,0x03,0x00,0x00,0x03,0x03,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "Ý":"0x00,0x08,0x18,0x30,0x60,0xC4,0xC6,0x63,0x31,0x18,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "ß":"0x00,0x00,0xC0,0xE0,0x30,0x10,0x10,0x30,0xE0,0xC0,0x00,0x00,0x00,0x00,0xFF,0xFF,0x21,0x21,0x21,0x33,0x3F,0x1E,0x00,0x00," ,
+        "à":"0x00,0x00,0x40,0x60,0x62,0x66,0x6C,0x68,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "á":"0x00,0x00,0x40,0x60,0x68,0x6C,0x66,0x62,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "â":"0x00,0x00,0x40,0x68,0x6C,0x66,0x66,0x6C,0x68,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ã":"0x00,0x00,0x40,0x68,0x6C,0x64,0x6C,0x68,0x6C,0xE4,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ä":"0x00,0x00,0x40,0x6C,0x6C,0x60,0x60,0x6C,0x6C,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "å":"0x00,0x00,0x40,0x60,0x64,0x6A,0x6A,0x64,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "æ":"0x00,0x80,0xC0,0x40,0x40,0xC0,0x80,0x40,0x40,0xC0,0x80,0x00,0x00,0x1C,0x3E,0x22,0x22,0x1F,0x3F,0x22,0x22,0x33,0x11,0x00," ,
+        "ç":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0xB8,0xB0,0xF0,0xF0,0x30,0x38,0x18,0x08,0x00," ,
+        "è":"0x00,0x80,0xC0,0xE0,0x62,0x66,0x6C,0x68,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x33,0x33,0x33,0x33,0x33,0x33,0x13,0x03,0x00," ,
+        "é":"0x00,0x80,0xC0,0xE0,0x60,0x68,0x6C,0x66,0x62,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x03,0x00," ,
+        "ê":"0x00,0x80,0xC0,0xE8,0x6C,0x66,0x66,0x6C,0x68,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x33,0x33,0x33,0x33,0x33,0x33,0x13,0x03,0x00," ,
+        "ë":"0x00,0x80,0xC0,0xEC,0x6C,0x60,0x60,0x6C,0x6C,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x33,0x33,0x33,0x33,0x33,0x33,0x13,0x03,0x00," ,
+        "ì":"0x00,0x00,0x00,0x00,0x62,0xE6,0xEC,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "í":"0x00,0x00,0x00,0x00,0x68,0xEC,0xE6,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "î":"0x00,0x00,0x00,0x08,0x6C,0xE6,0xE6,0x0C,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ï":"0x00,0x00,0x00,0x0C,0x6C,0xE0,0xEC,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ñ":"0x00,0x00,0xE0,0xE8,0x6C,0x64,0x6C,0x68,0xEC,0xC4,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "ò":"0x00,0x80,0xC0,0xE0,0x62,0x66,0x6C,0x68,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "ó":"0x00,0x80,0xC0,0xE0,0x68,0x6C,0x66,0x62,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "ô":"0x00,0x80,0xC0,0xE8,0x6C,0x66,0x66,0x6C,0xE8,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "õ":"0x00,0x80,0xC8,0xEC,0x64,0x6C,0x68,0x6C,0xE4,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "ö":"0x00,0x80,0xC0,0xEC,0x6C,0x60,0x60,0x6C,0xEC,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "÷":"0x00,0x00,0x80,0x80,0x80,0xB0,0xB0,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x0D,0x0D,0x01,0x01,0x01,0x00,0x00," ,
+        "ø":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0xE0,0xC0,0xE0,0xA0,0x00,0x00,0x2F,0x3F,0x18,0x3C,0x36,0x33,0x31,0x38,0x1F,0x0F,0x00," ,
+        "ù":"0x00,0xE0,0xE0,0x00,0x02,0x06,0x0C,0x08,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "ú":"0x00,0xE0,0xE0,0x00,0x08,0x0C,0x06,0x02,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "û":"0x00,0xE0,0xE0,0x08,0x0C,0x06,0x06,0x0C,0x08,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "ü":"0x00,0xE0,0xE0,0x0C,0x0C,0x00,0x00,0x0C,0x0C,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "ý":"0x00,0x00,0x60,0xE0,0x80,0x10,0x18,0x8C,0xE4,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00," ,
+        "þ":"0x00,0x00,0x03,0xFF,0xFF,0x1B,0x18,0x18,0xF8,0xF0,0x00,0x00,0x00,0x00,0x30,0x3F,0x3F,0x36,0x06,0x06,0x07,0x03,0x00,0x00," ,
+        "ÿ":"0x00,0x00,0x60,0xEC,0x8C,0x00,0x00,0x8C,0xEC,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00," ,
+        "Ѐ":"0x00,0xFC,0xFC,0x8D,0x8F,0x8E,0x8C,0x8C,0x8C,0x0C,0x0C,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "Ё":"0x00,0xFE,0xFE,0xC7,0xC7,0xC6,0xC6,0xC7,0xC7,0x06,0x06,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "Ђ":"0x00,0x03,0xFF,0xFF,0x83,0xC3,0xC3,0xC3,0xC0,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x01,0x00,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "Ѓ":"0x00,0xFC,0xFC,0x0C,0x0C,0x0C,0x0E,0x0F,0x0D,0x0C,0x0C,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Є":"0x00,0xF8,0xFC,0xCE,0xC7,0xC3,0xC3,0xC3,0x07,0x0E,0x0C,0x00,0x00,0x07,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "Ѕ":"0x00,0x3C,0x7E,0x67,0xE3,0xC3,0xC3,0xC3,0x87,0x8E,0x0C,0x00,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x31,0x39,0x1F,0x0F,0x00," ,
+        "І":"0x00,0x00,0x00,0x03,0x03,0xFF,0xFF,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ї":"0x00,0x00,0x00,0x0D,0x0D,0xFC,0xFC,0x0D,0x0D,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ј":"0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x0E,0x1E,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Љ":"0x00,0x00,0xFE,0xFF,0x03,0x03,0xFF,0xFF,0xC0,0xC0,0x80,0x00,0x00,0x30,0x3F,0x1F,0x00,0x00,0x3F,0x3F,0x30,0x39,0x1F,0x0F," ,
+        "Њ":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xFF,0xFF,0xC0,0xC0,0x80,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x3F,0x3F,0x30,0x39,0x1F,0x0F," ,
+        "Ћ":"0x00,0x03,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC0,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x01,0x00,0x00,0x00,0x01,0x3F,0x3F,0x00," ,
+        "Ќ":"0x00,0xFF,0xFF,0xC0,0xE2,0xF3,0x39,0x1C,0x0E,0x07,0x03,0x00,0x00,0x3F,0x3F,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x30,0x00," ,
+        "Ѝ":"0x00,0xFF,0xFF,0x00,0x01,0xC3,0xF2,0x38,0x0E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x1C,0x07,0x03,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Ў":"0x00,0x07,0x1F,0x7C,0xF1,0xC1,0xC1,0xF1,0x7C,0x1F,0x07,0x00,0x00,0x00,0x30,0x30,0x3C,0x0F,0x07,0x01,0x00,0x00,0x00,0x00," ,
+        "Џ":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x1F,0x1F,0x18,0x18,0x78,0x78,0x18,0x18,0x1F,0x1F,0x00," ,
+        #"A":"0x00,0x80,0xE0,0x78,0x1E,0x07,0x07,0x1E,0x78,0xE0,0x80,0x00,0x00,0x3F,0x3F,0x06,0x06,0x06,0x06,0x06,0x06,0x3F,0x3F,0x00," ,
+        "Б":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x83,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "В":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xE7,0xFE,0xBC,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "Г":"0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Г":"0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Д":"0x00,0x00,0xF8,0xFE,0x0F,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x00,0x70,0x7F,0x1F,0x18,0x18,0x18,0x18,0x1F,0x7F,0x70,0x00," ,
+        "Е":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "Ж":"0x00,0x03,0x0F,0xFC,0xE0,0xFF,0xFF,0xE0,0xFC,0x0F,0x03,0x00,0x00,0x38,0x3F,0x07,0x00,0x3F,0x3F,0x00,0x07,0x3F,0x38,0x00," ,
+        "Ж":"0x00,0x03,0x0F,0xFC,0xE0,0xFF,0xFF,0xE0,0xFC,0x0F,0x03,0x00,0x00,0x38,0x3F,0x07,0x00,0x3F,0x3F,0x00,0x07,0x3F,0x38,0x00," ,
+        "И":"0x00,0xFF,0xFF,0x00,0x00,0xC0,0xF0,0x38,0x0E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x1C,0x07,0x03,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Й":"0x00,0xFF,0xFF,0x00,0x02,0xC3,0xF1,0x38,0x0E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x1C,0x07,0x03,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "К":"0x00,0xFF,0xFF,0xC0,0xE0,0xF0,0x38,0x1C,0x0E,0x07,0x03,0x00,0x00,0x3F,0x3F,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x30,0x00," ,
+        "Л":"0x00,0x00,0xF0,0xFC,0x1E,0x07,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x30,0x3F,0x1F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "М":"0x00,0xFF,0xFF,0x1E,0x78,0xE0,0xE0,0x78,0x1E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x01,0x01,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Н":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "О":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "П":"0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Р":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00," ,
+        "С":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x03,0x07,0x0E,0x0C,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "Т":"0x00,0x03,0x03,0x03,0x03,0xFF,0xFF,0x03,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "У":"0x00,0x07,0x1F,0x7C,0xF0,0xC0,0xC0,0xF0,0x7C,0x1F,0x07,0x00,0x00,0x00,0x30,0x30,0x3C,0x0F,0x07,0x01,0x00,0x00,0x00,0x00," ,
+        "Ф":"0x00,0xF8,0xFC,0x0E,0x06,0xFF,0xFF,0x06,0x0E,0xFC,0xF8,0x00,0x00,0x03,0x07,0x0E,0x0C,0x3F,0x3F,0x0C,0x0E,0x07,0x03,0x00," ,
+        "Х":"0x00,0x03,0x0F,0x3C,0xF0,0xC0,0xC0,0xF0,0x3C,0x0F,0x03,0x00,0x00,0x30,0x3C,0x0F,0x03,0x00,0x00,0x03,0x0F,0x3C,0x30,0x00," ,
+        "Ц":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x1F,0x1F,0x18,0x18,0x18,0x18,0x18,0x1F,0x7F,0x78,0x00," ,
+        "Ч":"0x00,0x7F,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Ш":"0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x00," ,
+        "Щ":"0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0x1F,0x1F,0x18,0x18,0x1F,0x1F,0x18,0x18,0x1F,0x7F,0x70," ,
+        "Ъ":"0x03,0x03,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "Ы":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0x80,0x00,0x00,0xFF,0xFF,0x00,0x3F,0x3F,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00,0x3F,0x3F," ,
+        "Ь":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "Э":"0x00,0x0C,0x0E,0x07,0xC3,0xC3,0xC3,0xC7,0xCE,0xFC,0xF8,0x00,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0F,0x07,0x00," ,
+        "Ю":"0x00,0xFF,0xFF,0xC0,0xFC,0xFE,0x07,0x03,0x07,0xFE,0xFC,0x00,0x00,0x3F,0x3F,0x00,0x0F,0x1F,0x38,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Я":"0x00,0x7C,0xFE,0xC7,0x83,0x83,0x83,0x83,0x83,0xFF,0xFF,0x00,0x00,0x30,0x38,0x1D,0x0F,0x07,0x03,0x01,0x01,0x3F,0x3F,0x00," ,
+        "а":"0x00,0x00,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x1E,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "б":"0x00,0xE0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00," ,
+        "в":"0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x00,0x3F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00," ,
+        "г":"0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "д":"0x00,0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x00,0x60,0x7F,0x3F,0x30,0x30,0x30,0x30,0x3F,0x7F,0x60,0x00," ,
+        "е":"0x00,0xE0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x00," ,
+        "ж":"0x00,0x30,0xF0,0xC0,0x00,0xF0,0xF0,0x00,0xC0,0xF0,0x30,0x00,0x00,0x30,0x3C,0x0F,0x03,0x3F,0x3F,0x03,0x0F,0x3C,0x30,0x00," ,
+        "з":"0x00,0x60,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x18,0x38,0x30,0x33,0x33,0x33,0x33,0x33,0x3F,0x1D,0x00," ,
+        "З":"0x00,0x60,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x18,0x38,0x30,0x33,0x33,0x33,0x33,0x33,0x3F,0x1D,0x00," ,
+        "и":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x80,0xC0,0xE0,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x1C,0x0E,0x07,0x03,0x01,0x00,0x3F,0x3F,0x00," ,
+        "й":"0x00,0xF0,0xF0,0x00,0x04,0x08,0x88,0xC4,0xE0,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x1C,0x0E,0x07,0x03,0x01,0x00,0x3F,0x3F,0x00," ,
+        "к":"0x00,0xF0,0xF0,0x80,0x80,0xC0,0xE0,0x70,0x30,0x10,0x00,0x00,0x00,0x3F,0x3F,0x03,0x03,0x07,0x0E,0x1C,0x38,0x30,0x20,0x00," ,
+        "л":"0x00,0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x30,0x3F,0x1F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "м":"0x00,0xF0,0xF0,0xE0,0xC0,0x80,0x80,0xC0,0xE0,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x00,0x01,0x03,0x03,0x01,0x00,0x3F,0x3F,0x00," ,
+        "н":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x03,0x03,0x03,0x03,0x03,0x03,0x3F,0x3F,0x00," ,
+        "о":"0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x70,0xE0,0xC0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "п":"0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "р":"0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0x70,0xE0,0xC0,0x00,0x00,0xFF,0xFF,0x0C,0x0C,0x0C,0x0C,0x0C,0x0E,0x07,0x03,0x00," ,
+        "с":"0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x70,0x60,0x40,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x18,0x08,0x00," ,
+        "т":"0x00,0x30,0x30,0x30,0x30,0xF0,0xF0,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "у":"0x00,0x30,0xF0,0xC0,0x00,0x00,0x00,0x00,0xC0,0xF0,0x30,0x00,0x00,0x60,0xE0,0xC3,0xE7,0x7C,0x3C,0x0F,0x03,0x00,0x00,0x00," ,
+        "ф":"0x00,0x80,0xC0,0x60,0x60,0xF0,0xF0,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x30,0x30,0xFF,0xFF,0x30,0x30,0x1F,0x0F,0x00," ,
+        "х":"0x00,0x30,0x70,0xC0,0x80,0x00,0x00,0x80,0xC0,0x70,0x30,0x00,0x00,0x30,0x38,0x0C,0x07,0x03,0x03,0x07,0x0C,0x38,0x30,0x00," ,
+        "ц":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x3F,0xFF,0xF0,0x00," ,
+        "ч":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x01,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x3F,0x3F,0x00," ,
+        "ш":"0x00,0xF0,0xF0,0x00,0x00,0xE0,0xE0,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x00," ,
+        "щ":"0x00,0xF0,0xF0,0x00,0x00,0xF0,0xF0,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x30,0x30,0x3F,0xFF,0xE0," ,
+        "ъ":"0x30,0x30,0xF0,0xF0,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "ы":"0x00,0xF0,0xF0,0x80,0x80,0x80,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x31,0x31,0x3B,0x1F,0x0E,0x00,0x3F,0x3F,0x00," ,
+        "ь":"0x00,0xF0,0xF0,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "э":"0x00,0x40,0x60,0x70,0x30,0x30,0x30,0x30,0x70,0xE0,0xC0,0x00,0x00,0x08,0x18,0x38,0x30,0x33,0x33,0x33,0x3B,0x1F,0x0F,0x00," ,
+        "ю":"0x00,0xF0,0xF0,0x00,0xE0,0xF0,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x3F,0x3F,0x03,0x1F,0x3F,0x30,0x30,0x30,0x3F,0x1F,0x00," ,
+        "я":"0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x21,0x33,0x3B,0x1E,0x0E,0x06,0x06,0x06,0x3F,0x3F,0x00," ,
+        "ѐ":"0x00,0xE0,0xF0,0x32,0x36,0x36,0x34,0x30,0x30,0xF0,0xE0,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x00," ,
+        "ё":"0x00,0xE0,0xF0,0x34,0x34,0x30,0x30,0x34,0x34,0xF0,0xE0,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x00," ,
+        "ђ":"0x00,0x30,0xFC,0xFC,0x30,0xB0,0xB0,0xB0,0x80,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x07,0x03,0x01,0x01,0xC1,0xFF,0x3F,0x00," ,
+        "ѓ":"0x00,0xF0,0xF0,0x30,0x30,0x34,0x36,0x32,0x30,0x30,0x30,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "є":"0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x70,0x60,0x40,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x30,0x38,0x18,0x08,0x00," ,
+        "ѕ":"0x00,0xE0,0xF0,0xB0,0xB0,0x30,0x30,0x30,0x30,0x70,0x60,0x00,0x00,0x18,0x39,0x31,0x33,0x33,0x33,0x37,0x36,0x3E,0x1C,0x00," ,
+        "і":"0x00,0x00,0x00,0x00,0x30,0xF6,0xF6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ї":"0x00,0x00,0x00,0x04,0x34,0xF0,0xF4,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ј":"0x00,0x00,0x00,0x00,0x00,0x30,0x30,0xF6,0xF6,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xE0,0xC0,0xC0,0xFF,0x7F,0x00,0x00,0x00," ,
+        "љ":"0x00,0x00,0xE0,0xF0,0x30,0x30,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x30,0x3F,0x1F,0x00,0x00,0x3F,0x3F,0x33,0x33,0x1E,0x0C," ,
+        "њ":"0x00,0xF0,0xF0,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x03,0x03,0x03,0x3F,0x3F,0x33,0x33,0x1E,0x0C," ,
+        "ћ":"0x00,0x30,0xFC,0xFC,0xB0,0xB0,0xB0,0xB0,0x80,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x3F,0x3F,0x00," ,
+        "ќ":"0x00,0xF0,0xF0,0x80,0x88,0xCC,0xE4,0x70,0x30,0x10,0x00,0x00,0x00,0x3F,0x3F,0x03,0x03,0x07,0x0E,0x1C,0x38,0x30,0x20,0x00," ,
+        "ѝ":"0x00,0xF0,0xF0,0x00,0x06,0x0C,0x88,0xC0,0xE0,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x1C,0x0E,0x07,0x03,0x01,0x00,0x3F,0x3F,0x00," ,
+        "ў":"0x00,0x30,0xF0,0xC0,0x04,0x08,0x08,0x04,0xC0,0xF0,0x30,0x00,0x00,0x60,0xE0,0xC3,0xE7,0x7C,0x3C,0x0F,0x03,0x00,0x00,0x00," ,
+        "џ":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0xF0,0xF0,0x30,0x30,0x3F,0x3F,0x00," ,
+        "Ā":"0x00,0x00,0x00,0xE0,0xF9,0x1D,0x1D,0xF9,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x07,0x3F,0x38,0x00," ,
+        "ā":"0x00,0x00,0x40,0x60,0x68,0x68,0x68,0x68,0x68,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "Ă":"0x00,0x00,0x00,0xE0,0xF9,0x1A,0x1A,0xF9,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x07,0x3F,0x38,0x00," ,
+        "ă":"0x00,0x00,0x40,0x60,0x64,0x68,0x68,0x68,0x64,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "Ą":"0x00,0x00,0x00,0xE0,0xFC,0x1F,0x1F,0xFC,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x67,0xBF,0xB8,0x00," ,
+        "ą":"0x00,0x00,0x40,0x60,0x60,0x60,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x73,0xBF,0xBF,0x00," ,
+        "Ć":"0x00,0x80,0xE0,0x70,0x38,0x18,0x1A,0x1B,0x39,0x70,0x60,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "ć":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x68,0x6C,0x64,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "Ĉ":"0x00,0x80,0xE0,0x70,0x3A,0x1B,0x19,0x1B,0x3A,0x70,0x60,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "ĉ":"0x00,0x80,0xC0,0xE0,0x68,0x6C,0x64,0x6C,0x68,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "Ċ":"0x00,0x80,0xE0,0x70,0x38,0x18,0x1A,0x18,0x38,0x70,0x60,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "ċ":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x68,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "Č":"0x00,0x80,0xE0,0x70,0x39,0x1B,0x1A,0x1B,0x39,0x70,0x60,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "č":"0x00,0x80,0xC0,0xE0,0x64,0x6C,0x68,0x6C,0x64,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "Ď":"0x00,0xF8,0xF8,0x19,0x1B,0x1A,0x1B,0x39,0x70,0xE0,0x80,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "ď":"0x00,0x80,0xC0,0xE0,0x60,0x60,0xE0,0xFF,0xFF,0x00,0x05,0x03,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x3F,0x3F,0x00,0x00,0x00," ,
+        "Đ":"0xC0,0xFF,0xFF,0xC3,0xC3,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "đ":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0xE4,0xC4,0xFF,0xFF,0x04,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x3F,0x3F,0x00," ,
+        "Ē":"0x00,0xFC,0xFC,0x8C,0x8D,0x8D,0x8D,0x8D,0x8C,0x0C,0x0C,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "ē":"0x00,0x80,0xC0,0xE0,0x68,0x68,0x68,0x68,0x68,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "Ĕ":"0x00,0xF8,0xF8,0x98,0x99,0x9A,0x9A,0x99,0x98,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "ĕ":"0x00,0x80,0xC0,0xE0,0x64,0x68,0x68,0x68,0x64,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "Ė":"0x00,0xF8,0xF8,0x98,0x98,0x98,0x9A,0x98,0x98,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "ė":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x68,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "Ę":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x70,0xB0,0xB0,0x00," ,
+        "ę":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x73,0xB3,0xB3,0x13,0x01,0x00," ,
+        "Ě":"0x00,0xF8,0xF8,0x98,0x99,0x9B,0x9A,0x9B,0x99,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "ě":"0x00,0x80,0xC0,0xE0,0x64,0x6C,0x68,0x6C,0x64,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "Ĝ":"0x00,0x80,0xE0,0x70,0x1A,0x1B,0x19,0x1B,0x1A,0x38,0x30,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ĝ":"0x00,0x80,0xC0,0xE0,0x68,0x6C,0x64,0x6C,0x68,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "Ğ":"0x00,0x80,0xE0,0x70,0x1A,0x19,0x19,0x19,0x1A,0x38,0x30,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ğ":"0x00,0x80,0xC0,0xE0,0x68,0x64,0x64,0x64,0x68,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "Ġ":"0x00,0x80,0xE0,0x70,0x18,0x18,0x1A,0x18,0x18,0x38,0x30,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ġ":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x68,0x60,0x60,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "Ģ":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0xC3,0xC3,0xC3,0xC7,0xC6,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0xB0,0x70,0x30,0x3F,0x3F,0x00," ,
+        "ģ":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x6C,0x6A,0x60,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "Ĥ":"0x00,0xFC,0xFC,0x80,0x82,0x81,0x81,0x82,0x80,0xFC,0xFC,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x01,0x3F,0x3F,0x00," ,
+        "ĥ":"0x00,0xFE,0xFE,0xC0,0x62,0x63,0x61,0xE3,0xC2,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00," ,
+        "Ħ":"0x02,0xFF,0xFF,0xC2,0xC2,0xC2,0xC2,0xC2,0xC2,0xFF,0xFF,0x02,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "ħ":"0x04,0xFF,0xFF,0xC4,0x64,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00," ,
+        "Ĩ":"0x00,0x00,0x00,0x1A,0x19,0xFB,0xFB,0x1A,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ĩ":"0x00,0x00,0x00,0x08,0x64,0xEC,0xE8,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ī":"0x00,0x00,0x00,0x0C,0x0D,0xFD,0xFD,0x0D,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ī":"0x00,0x00,0x00,0x08,0x68,0xE8,0xE8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ĭ":"0x00,0x00,0x00,0x18,0x19,0xFA,0xFA,0x19,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ĭ":"0x00,0x00,0x00,0x00,0x64,0xE8,0xE8,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Į":"0x00,0x00,0x00,0x03,0x03,0xFF,0xFF,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x7F,0xBF,0xB0,0x30,0x00,0x00,0x00," ,
+        "į":"0x00,0x00,0x00,0x00,0x60,0xEC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x7F,0xBF,0xB0,0x30,0x00,0x00,0x00," ,
+        "İ":"0x00,0x00,0x00,0x18,0x18,0xF8,0xFA,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ı":"0x00,0x00,0x00,0x00,0x60,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ĳ":"0x00,0x03,0xFF,0xFF,0x03,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x00,0x30,0x3F,0x3F,0x30,0x0C,0x1C,0x30,0x30,0x3F,0x1F,0x00," ,
+        "ĳ":"0x00,0x00,0x20,0xEC,0xEC,0x00,0x00,0x20,0xEC,0xEC,0x00,0x00,0x00,0x00,0x30,0x3F,0x3F,0x70,0xC0,0xC0,0xFF,0x7F,0x00,0x00," ,
+        "Ĵ":"0x00,0x00,0x00,0x00,0x02,0x03,0x01,0x03,0x02,0xF8,0xF8,0x00,0x00,0x0E,0x1E,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ĵ":"0x00,0x00,0x00,0x00,0x00,0x08,0x6C,0xE4,0xEC,0x08,0x00,0x00,0x00,0x00,0x00,0x60,0xE0,0xC0,0xC0,0xFF,0x7F,0x00,0x00,0x00," ,
+        "Ķ":"0x00,0xFF,0xFF,0xC0,0xE0,0xF0,0x38,0x1C,0x0E,0x07,0x03,0x00,0x00,0x3F,0x3F,0x00,0x01,0xA3,0x67,0x0E,0x1C,0x38,0x30,0x00," ,
+        "ķ":"0x00,0x00,0xFF,0xFF,0x00,0x80,0xC0,0xE0,0x60,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x03,0xA7,0x6F,0x1C,0x38,0x30,0x00,0x00," ,
+        "ĸ":"0x00,0x00,0xE0,0xE0,0x00,0x80,0xC0,0xE0,0x60,0x20,0x00,0x00,0x00,0x00,0x3F,0x3F,0x03,0x07,0x0F,0x1C,0x38,0x30,0x00,0x00," ,
+        "Ĺ":"0x00,0xF8,0xFA,0x03,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "ĺ":"0x00,0x00,0x00,0x00,0x18,0xFA,0xFB,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ļ":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0xB0,0x70,0x30,0x30,0x30,0x30,0x00," ,
+        "ļ":"0x00,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0xBF,0x7F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ľ":"0x00,0xFF,0xFF,0x00,0x00,0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "ľ":"0x00,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ŀ":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "ŀ":"0x00,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ł":"0x80,0xFF,0xFF,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "ł":"0x00,0x00,0x00,0x00,0x83,0xFF,0xFF,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ń":"0x00,0xFF,0xFF,0x0E,0x38,0xF2,0xC3,0x01,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x03,0x07,0x1C,0x3F,0x3F,0x00," ,
+        "ń":"0x00,0x00,0xE0,0xE0,0x60,0x68,0x6C,0x64,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Ņ":"0x00,0xFF,0xFF,0x0E,0x38,0xF0,0xC0,0x00,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0xA0,0x63,0x07,0x1C,0x3F,0x3F,0x00," ,
+        "ņ":"0x00,0x00,0xE0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0xA0,0x60,0x00,0x3F,0x3F,0x00," ,
+        "Ň":"0x00,0xFF,0xFF,0x0E,0x38,0xF1,0xC2,0x01,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x03,0x07,0x1C,0x3F,0x3F,0x00," ,
+        "ň":"0x00,0x00,0xE0,0xE0,0x64,0x6C,0x68,0x6C,0xE4,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "ŉ":"0x00,0x0A,0xE6,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Ŋ":"0x00,0x00,0xFF,0xFF,0x06,0x03,0x03,0x03,0x07,0xFE,0xFC,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x20,0x20,0x30,0x1F,0x0F,0x00," ,
+        "ŋ":"0x00,0x00,0xE0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0xC0,0xC0,0xFF,0x7F,0x00," ,
+        "Ō":"0x00,0xC0,0xF0,0x38,0x1D,0x0D,0x0D,0x1D,0x38,0xF0,0xC0,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "ō":"0x00,0x80,0xC0,0xE0,0x68,0x68,0x68,0x68,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ŏ":"0x00,0x80,0xE0,0x70,0x39,0x1A,0x1A,0x39,0x70,0xE0,0x80,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "ŏ":"0x00,0x80,0xC0,0xE0,0x64,0x68,0x68,0x64,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ő":"0x00,0x80,0xE0,0x70,0x3A,0x19,0x1A,0x39,0x70,0xE0,0x80,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "ő":"0x00,0x80,0xC0,0xE0,0x68,0x64,0x68,0x64,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Œ":"0xF0,0xFC,0x0E,0x03,0x03,0x07,0xFE,0xFF,0xC3,0xC3,0xC3,0x00,0x03,0x0F,0x1C,0x30,0x30,0x38,0x1F,0x3F,0x30,0x30,0x30,0x00," ,
+        "œ":"0x80,0xC0,0xE0,0x60,0x60,0xE0,0xC0,0x60,0x60,0x60,0x40,0x80,0x0F,0x1F,0x38,0x30,0x30,0x1F,0x1F,0x3B,0x33,0x33,0x1B,0x09," ,
+        "Ŕ":"0x00,0xF8,0xF8,0x98,0x98,0x9A,0x9B,0x99,0xF8,0xF0,0x60,0x00,0x00,0x3F,0x3F,0x01,0x01,0x03,0x07,0x0F,0x1D,0x38,0x30,0x00," ,
+        "ŕ":"0x00,0x00,0xE0,0xE0,0xC0,0x60,0x68,0x6C,0x64,0xE0,0xC0,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Ŗ":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0xA3,0x67,0x0F,0x1D,0x38,0x30,0x00," ,
+        "ŗ":"0x00,0x00,0xE0,0xE0,0xC0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x00,0x3F,0x3F,0x00,0xA0,0x60,0x00,0x00,0x00,0x00,0x00," ,
+        "Ř":"0x00,0xF8,0xF8,0x99,0x9B,0x9A,0x9B,0x99,0xF8,0xF0,0x60,0x00,0x00,0x3F,0x3F,0x01,0x01,0x03,0x07,0x0F,0x1D,0x38,0x30,0x00," ,
+        "ř":"0x00,0x00,0xE0,0xE0,0xC4,0x6C,0x68,0x6C,0x64,0xE0,0xC0,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Ś":"0x00,0x60,0xF0,0xF8,0x98,0x9A,0x9B,0x99,0x98,0x30,0x20,0x00,0x00,0x0C,0x1C,0x39,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "ś":"0x00,0xC0,0xE0,0x60,0x68,0x6C,0x64,0x60,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "Ŝ":"0x00,0x60,0xF0,0xF8,0x9A,0x9B,0x99,0x9B,0x9A,0x30,0x20,0x00,0x00,0x0C,0x1C,0x39,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "ŝ":"0x00,0xC0,0xE0,0x68,0x6C,0x64,0x6C,0x68,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "Ş":"0x00,0x3C,0x7E,0xE7,0xC3,0xC3,0xC3,0xC3,0xC7,0x8E,0x0C,0x00,0x00,0x0C,0x1C,0x38,0x30,0xB0,0xF0,0x30,0x39,0x1F,0x0F,0x00," ,
+        "ş":"0x00,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0xB3,0xF3,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "Š":"0x00,0x60,0xF0,0xF8,0x99,0x9B,0x9A,0x9B,0x99,0x30,0x20,0x00,0x00,0x0C,0x1C,0x39,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "š":"0x00,0xC0,0xE0,0x64,0x6C,0x68,0x6C,0x64,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "Ţ":"0x00,0x00,0x03,0x03,0x03,0xFF,0xFF,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x60,0x00,0x00,0x00,0x00," ,
+        "ţ":"0x00,0x60,0x60,0xFE,0xFE,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x3F,0xB0,0xB0,0xF0,0x30,0x00,0x00,0x00," ,
+        "Ť":"0x00,0x00,0x18,0x19,0x1B,0xFA,0xFA,0x1B,0x19,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "ť":"0x00,0x60,0x60,0xFE,0xFE,0x60,0x65,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x3F,0x30,0x30,0x30,0x30,0x00,0x00,0x00," ,
+        "Ŧ":"0x00,0x00,0x03,0xC3,0xC3,0xFF,0xFF,0xC3,0xC3,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "ŧ":"0x00,0x30,0x30,0xFE,0xFE,0x30,0x30,0x30,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x1F,0x3F,0x33,0x33,0x30,0x30,0x00,0x00,0x00," ,
+        "Ũ":"0x00,0xF8,0xF8,0x02,0x01,0x03,0x03,0x02,0x01,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ũ":"0x00,0xE0,0xE0,0x08,0x04,0x0C,0x0C,0x08,0x04,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ū":"0x00,0xFC,0xFC,0x00,0x01,0x01,0x01,0x01,0x00,0xFC,0xFC,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ū":"0x00,0xE0,0xE0,0x00,0x08,0x08,0x08,0x08,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ŭ":"0x00,0xFC,0xFC,0x00,0x01,0x02,0x02,0x01,0x00,0xFC,0xFC,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ŭ":"0x00,0xE0,0xE0,0x00,0x04,0x08,0x08,0x04,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ů":"0x00,0xF8,0xF8,0x00,0x06,0x09,0x09,0x06,0x00,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ů":"0x00,0xE0,0xE0,0x00,0x0C,0x12,0x12,0x0C,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ű":"0x00,0xF8,0xF8,0x00,0x02,0x01,0x02,0x01,0x00,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ű":"0x00,0xE0,0xE0,0x00,0x08,0x04,0x08,0x04,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ų":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x07,0x1F,0x38,0x30,0xF0,0xB0,0xB0,0x38,0x1F,0x07,0x00," ,
+        "ų":"0x00,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0xF0,0xB0,0xB0,0x18,0x3F,0x3F,0x00," ,
+        "Ŵ":"0x00,0xFC,0xFC,0x00,0x02,0x81,0x81,0x02,0x00,0xFC,0xFC,0x00,0x00,0x3F,0x3F,0x1C,0x06,0x03,0x03,0x06,0x1C,0x3F,0x3F,0x00," ,
+        "ŵ":"0x00,0xE0,0xE0,0x00,0x04,0xE8,0xE8,0x04,0x00,0xE0,0xE0,0x00,0x00,0x07,0x1F,0x38,0x1C,0x0F,0x0F,0x1C,0x38,0x1F,0x07,0x00," ,
+        "Ŷ":"0x00,0x02,0x0E,0x3C,0xF2,0xC1,0xC1,0xF2,0x3C,0x0E,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "ŷ":"0x00,0x00,0x60,0xE0,0x88,0x04,0x04,0x88,0xE0,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00," ,
+        "Ÿ":"0x00,0x02,0x0E,0x3C,0xF1,0xC0,0xC0,0xF1,0x3C,0x0E,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "Ź":"0x00,0x18,0x18,0x18,0x18,0x1A,0x9B,0xD9,0xF8,0x78,0x38,0x00,0x00,0x30,0x38,0x3C,0x3E,0x37,0x33,0x31,0x30,0x30,0x30,0x00," ,
+        "ź":"0x00,0x60,0x60,0x60,0x68,0x6C,0xE4,0xE0,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "Ż":"0x00,0x18,0x18,0x18,0x18,0x18,0x9A,0xD8,0xF8,0x78,0x38,0x00,0x00,0x30,0x38,0x3C,0x3E,0x37,0x33,0x31,0x30,0x30,0x30,0x00," ,
+        "ż":"0x00,0x60,0x60,0x60,0x60,0x68,0xE0,0xE0,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "Ž":"0x00,0x18,0x18,0x18,0x19,0x1B,0x9A,0xDB,0xF9,0x78,0x38,0x00,0x00,0x30,0x38,0x3C,0x3E,0x37,0x33,0x31,0x30,0x30,0x30,0x00," ,
+        "ž":"0x00,0x60,0x60,0x64,0x6C,0x68,0xEC,0xE4,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "ſ":"0x00,0x00,0x00,0x00,0xFC,0xFE,0x06,0x06,0x0E,0x0C,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x00,0x00,0x00,0x00,0x00," ,
+    }
+    return font
+
+def getSmallFontMap():
+	font = {
+		" ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"!":"0x00, 0x00, 0x4f, 0x00, 0x00, 0x00,",
+		"\"":"0x00, 0x07, 0x00, 0x07, 0x00, 0x00,",
+		"#":"0x14, 0x7f, 0x14, 0x7f, 0x14, 0x00,",
+		"$":"0x24, 0x2a, 0x7f, 0x2a, 0x12, 0x00,",
+		"%":"0x23, 0x13, 0x08, 0x64, 0x62, 0x00,",
+		"&":"0x36, 0x49, 0x56, 0x20, 0x58, 0x00,",
+		"'":"0x00, 0x05, 0x03, 0x00, 0x00, 0x00,",
+		"(":"0x00, 0x1c, 0x22, 0x41, 0x00, 0x00,",
+		")":"0x00, 0x41, 0x22, 0x1c, 0x00, 0x00,",
+		"*":"0x14, 0x08, 0x3e, 0x08, 0x14, 0x00,",
+		"+":"0x08, 0x08, 0x3e, 0x08, 0x08, 0x00,",
+		",":"0x00, 0x50, 0x30, 0x00, 0x00, 0x00,",
+		"-":"0x08, 0x08, 0x08, 0x08, 0x08, 0x00,",
+		".":"0x00, 0x60, 0x60, 0x00, 0x00, 0x00,",
+		"/":"0x20, 0x10, 0x08, 0x04, 0x02, 0x00,",
+		"0":"0x3e, 0x51, 0x49, 0x45, 0x3e, 0x00,",
+		"1":"0x00, 0x42, 0x7f, 0x40, 0x00, 0x00,",
+		"2":"0x42, 0x61, 0x51, 0x49, 0x46, 0x00,",
+		"3":"0x21, 0x41, 0x45, 0x4b, 0x31, 0x00,",
+		"4":"0x18, 0x14, 0x12, 0x7f, 0x10, 0x00,",
+		"5":"0x27, 0x45, 0x45, 0x45, 0x39, 0x00,",
+		"6":"0x3c, 0x4a, 0x49, 0x49, 0x30, 0x00,",
+		"7":"0x01, 0x71, 0x09, 0x05, 0x03, 0x00,",
+		"8":"0x36, 0x49, 0x49, 0x49, 0x36, 0x00,",
+		"9":"0x06, 0x49, 0x49, 0x29, 0x1e, 0x00,",
+		":":"0x00, 0x36, 0x36, 0x00, 0x00, 0x00,",
+		";":"0x00, 0x56, 0x36, 0x00, 0x00, 0x00,",
+		"<":"0x08, 0x14, 0x22, 0x41, 0x00, 0x00,",
+		"=":"0x14, 0x14, 0x14, 0x14, 0x14, 0x00,",
+		">":"0x00, 0x41, 0x22, 0x14, 0x08, 0x00,",
+		"?":"0x02, 0x01, 0x51, 0x09, 0x06, 0x00,",
+		"@":"0x32, 0x49, 0x79, 0x41, 0x3e, 0x00,",
+		"A":"0x7e, 0x09, 0x09, 0x09, 0x7e, 0x00,",
+		"B":"0x7f, 0x49, 0x49, 0x49, 0x36, 0x00,",
+		"C":"0x3e, 0x41, 0x41, 0x41, 0x22, 0x00,",
+		"D":"0x7f, 0x41, 0x41, 0x22, 0x1c, 0x00,",
+		"E":"0x7f, 0x49, 0x49, 0x49, 0x41, 0x00,",
+		"F":"0x7f, 0x09, 0x09, 0x09, 0x01, 0x00,",
+		"G":"0x3e, 0x41, 0x41, 0x49, 0x7a, 0x00,",
+		"H":"0x7f, 0x08, 0x08, 0x08, 0x7f, 0x00,",
+		"I":"0x00, 0x41, 0x7f, 0x41, 0x00, 0x00,",
+		"J":"0x20, 0x40, 0x41, 0x3f, 0x01, 0x00,",
+		"K":"0x7f, 0x08, 0x14, 0x22, 0x41, 0x00,",
+		"L":"0x7f, 0x40, 0x40, 0x40, 0x40, 0x00,",
+		"M":"0x7f, 0x02, 0x0c, 0x02, 0x7f, 0x00,",
+		"N":"0x7f, 0x04, 0x08, 0x10, 0x7f, 0x00,",
+		"O":"0x3e, 0x41, 0x41, 0x41, 0x3e, 0x00,",
+		"P":"0x7f, 0x09, 0x09, 0x09, 0x06, 0x00,",
+		"Q":"0x3e, 0x41, 0x51, 0x21, 0x5e, 0x00,",
+		"R":"0x7f, 0x09, 0x19, 0x29, 0x46, 0x00,",
+		"S":"0x26, 0x49, 0x49, 0x49, 0x32, 0x00,",
+		"T":"0x01, 0x01, 0x7f, 0x01, 0x01, 0x00,",
+		"U":"0x3f, 0x40, 0x40, 0x40, 0x3f, 0x00,",
+		"V":"0x1f, 0x20, 0x40, 0x20, 0x1f, 0x00,",
+		"W":"0x3f, 0x40, 0x38, 0x40, 0x3f, 0x00,",
+		"X":"0x63, 0x14, 0x08, 0x14, 0x63, 0x00,",
+		"Y":"0x07, 0x08, 0x70, 0x08, 0x07, 0x00,",
+		"Z":"0x61, 0x51, 0x49, 0x45, 0x43, 0x00,",
+		"[":"0x00, 0x7f, 0x41, 0x41, 0x00, 0x00,",
+		"\\":"0x02, 0x04, 0x08, 0x10, 0x20, 0x00,",
+		"]":"0x00, 0x41, 0x41, 0x7f, 0x00, 0x00,",
+		"^":"0x04, 0x02, 0x01, 0x02, 0x04, 0x00,",
+		"_":"0x40, 0x40, 0x40, 0x40, 0x40, 0x00,",
+		"`":"0x00, 0x03, 0x05, 0x00, 0x00, 0x00,",
+		"a":"0x20, 0x54, 0x54, 0x54, 0x78, 0x00,",
+		"b":"0x7f, 0x48, 0x44, 0x44, 0x38, 0x00,",
+		"c":"0x38, 0x44, 0x44, 0x44, 0x20, 0x00,",
+		"d":"0x38, 0x44, 0x44, 0x48, 0x7f, 0x00,",
+		"e":"0x38, 0x54, 0x54, 0x54, 0x18, 0x00,",
+		"f":"0x00, 0x04, 0x7e, 0x05, 0x01, 0x00,",
+		"g":"0x08, 0x54, 0x54, 0x54, 0x3c, 0x00,",
+		"h":"0x7f, 0x08, 0x04, 0x04, 0x78, 0x00,",
+		"i":"0x00, 0x44, 0x7d, 0x40, 0x00, 0x00,",
+		"j":"0x20, 0x40, 0x44, 0x3d, 0x00, 0x00,",
+		"k":"0x00, 0x7f, 0x10, 0x28, 0x44, 0x00,",
+		"l":"0x00, 0x41, 0x7f, 0x40, 0x00, 0x00,",
+		"m":"0x7c, 0x04, 0x78, 0x04, 0x78, 0x00,",
+		"n":"0x7c, 0x08, 0x04, 0x04, 0x78, 0x00,",
+		"o":"0x38, 0x44, 0x44, 0x44, 0x38, 0x00,",
+		"p":"0x7c, 0x14, 0x14, 0x14, 0x08, 0x00,",
+		"q":"0x08, 0x14, 0x14, 0x14, 0x7c, 0x00,",
+		"r":"0x7c, 0x08, 0x04, 0x04, 0x08, 0x00,",
+		"s":"0x48, 0x54, 0x54, 0x54, 0x24, 0x00,",
+		"t":"0x04, 0x3e, 0x44, 0x40, 0x20, 0x00,",
+		"u":"0x3c, 0x40, 0x40, 0x20, 0x7c, 0x00,",
+		"v":"0x0c, 0x30, 0x40, 0x30, 0x0c, 0x00,",
+		"w":"0x3c, 0x40, 0x30, 0x40, 0x3c, 0x00,",
+		"x":"0x44, 0x24, 0x38, 0x48, 0x44, 0x00,",
+		"y":"0x44, 0x48, 0x30, 0x10, 0x0c, 0x00,",
+		"z":"0x44, 0x64, 0x54, 0x4c, 0x44, 0x00,",
+		"{":"0x08, 0x36, 0x41, 0x00, 0x00, 0x00,",
+		"|":"0x00, 0x00, 0x77, 0x00, 0x00, 0x00,",
+		"}":"0x00, 0x00, 0x41, 0x36, 0x08, 0x00,",
+		"~":"0x02, 0x01, 0x02, 0x04, 0x02, 0x00,",
+		"^":"0x04, 0x02, 0x01, 0x02, 0x04, 0x00,",
+		" ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"¡":"0x00, 0x00, 0x79, 0x00, 0x00, 0x00,",
+		"¢":"0x1c, 0x22, 0x7f, 0x22, 0x10, 0x00,",
+		"£":"0x50, 0x7e, 0x51, 0x41, 0x42, 0x00,",
+		"¤":"0x22, 0x1c, 0x14, 0x1c, 0x22, 0x00,",
+		"¥":"0x15, 0x16, 0x7c, 0x16, 0x15, 0x00,",
+		"¦":"0x00, 0x00, 0x77, 0x00, 0x00, 0x00,",
+		"§":"0x4a, 0x55, 0x55, 0x55, 0x29, 0x00,",
+		"¨":"0x00, 0x01, 0x00, 0x01, 0x00, 0x00,",
+		"©":"0x00, 0x18, 0x24, 0x24, 0x00, 0x00,",
+		"ª":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"«":"0x08, 0x14, 0x00, 0x08, 0x14, 0x00,",
+		"¬":"0x08, 0x08, 0x08, 0x08, 0x38, 0x00,",
+		"":"0x08, 0x08, 0x08, 0x08, 0x08, 0x00,",
+		"®":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"¯":"0x00, 0x01, 0x01, 0x01, 0x00, 0x00,",
+		"°":"0x00, 0x00, 0x07, 0x05, 0x07, 0x00,",
+		"±":"0x44, 0x44, 0x5f, 0x44, 0x44, 0x00,",
+		"²":"0x1d, 0x15, 0x17, 0x00, 0x00, 0x00,",
+		"³":"0x15, 0x15, 0x1f, 0x00, 0x00, 0x00,",
+		"´":"0x00, 0x04, 0x02, 0x01, 0x00, 0x00,",
+		"µ":"0x7c, 0x10, 0x10, 0x0c, 0x10, 0x00,",
+		"¶":"0x02, 0x07, 0x7f, 0x01, 0x7f, 0x00,",
+		"·":"0x00, 0x00, 0x08, 0x00, 0x00, 0x00,",
+		"¸":"0x00, 0x40, 0x60, 0x00, 0x00, 0x00,",
+		"¹":"0x12, 0x1f, 0x10, 0x00, 0x00, 0x00,",
+		"º":"0x07, 0x05, 0x07, 0x00, 0x00, 0x00,",
+		"»":"0x14, 0x08, 0x00, 0x14, 0x08, 0x00,",
+		"¼":"0x21, 0x17, 0x38, 0x24, 0x72, 0x00,",
+		"½":"0x21, 0x17, 0x78, 0x54, 0x5e, 0x00,",
+		"¾":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"¿":"0x30, 0x48, 0x45, 0x40, 0x20, 0x00,",
+		"À":"0x78, 0x15, 0x16, 0x14, 0x78, 0x00,",
+		"Á":"0x78, 0x14, 0x16, 0x15, 0x78, 0x00,",
+		"Â":"0x78, 0x16, 0x15, 0x16, 0x78, 0x00,",
+		"Ã":"0x7a, 0x29, 0x2a, 0x79, 0x00, 0x00,",
+		"Ä":"0x78, 0x15, 0x14, 0x15, 0x78, 0x00,",
+		"Å":"0x78, 0x14, 0x15, 0x14, 0x78, 0x00,",
+		"Æ":"0x7e, 0x09, 0x7f, 0x49, 0x49, 0x00,",
+		"Ç":"0x0e, 0x51, 0x71, 0x11, 0x08, 0x00,",
+		"È":"0x7c, 0x55, 0x56, 0x44, 0x44, 0x00,",
+		"É":"0x7c, 0x54, 0x56, 0x45, 0x44, 0x00,",
+		"Ê":"0x7c, 0x56, 0x55, 0x46, 0x44, 0x00,",
+		"Ë":"0x7c, 0x55, 0x54, 0x45, 0x44, 0x00,",
+		"Ì":"0x00, 0x49, 0x7a, 0x48, 0x00, 0x00,",
+		"Í":"0x00, 0x48, 0x7a, 0x49, 0x00, 0x00,",
+		"Î":"0x00, 0x4a, 0x79, 0x4a, 0x00, 0x00,",
+		"Ï":"0x44, 0x45, 0x7c, 0x45, 0x44, 0x00,",
+		"Ð":"0x08, 0x7f, 0x49, 0x22, 0x1c, 0x00,",
+		"Ñ":"0x7a, 0x11, 0x22, 0x79, 0x00, 0x00,",
+		"Ò":"0x38, 0x45, 0x46, 0x44, 0x38, 0x00,",
+		"Ó":"0x38, 0x44, 0x46, 0x45, 0x38, 0x00,",
+		"Ô":"0x38, 0x46, 0x45, 0x46, 0x38, 0x00,",
+		"Õ":"0x32, 0x49, 0x4a, 0x31, 0x00, 0x00,",
+		"Ö":"0x38, 0x45, 0x44, 0x45, 0x38, 0x00,",
+		"×":"0x22, 0x14, 0x08, 0x14, 0x22, 0x00,",
+		"Ø":"0x58, 0x24, 0x54, 0x48, 0x34, 0x00,",
+		"Ù":"0x38, 0x41, 0x42, 0x40, 0x38, 0x00,",
+		"Ú":"0x38, 0x40, 0x42, 0x41, 0x38, 0x00,",
+		"Û":"0x38, 0x42, 0x41, 0x42, 0x38, 0x00,",
+		"Ü":"0x3c, 0x41, 0x40, 0x41, 0x3c, 0x00,",
+		"Ý":"0x04, 0x08, 0x72, 0x09, 0x04, 0x00,",
+		"Þ":"0x7f, 0x22, 0x22, 0x22, 0x1c, 0x00,",
+		"ß":"0x7e, 0x11, 0x25, 0x25, 0x1a, 0x00,",
+		"à":"0x20, 0x55, 0x56, 0x54, 0x78, 0x00,",
+		"á":"0x20, 0x54, 0x56, 0x55, 0x78, 0x00,",
+		"â":"0x20, 0x56, 0x55, 0x56, 0x78, 0x00,",
+		"ã":"0x22, 0x55, 0x56, 0x55, 0x78, 0x00,",
+		"ä":"0x20, 0x55, 0x54, 0x55, 0x78, 0x00,",
+		"å":"0x20, 0x54, 0x55, 0x54, 0x78, 0x00,",
+		"æ":"0x24, 0x54, 0x7c, 0x54, 0x48, 0x00,",
+		"ç":"0x1c, 0x22, 0x62, 0x22, 0x10, 0x00,",
+		"è":"0x38, 0x55, 0x56, 0x54, 0x08, 0x00,",
+		"é":"0x38, 0x54, 0x56, 0x55, 0x08, 0x00,",
+		"ê":"0x38, 0x56, 0x55, 0x56, 0x08, 0x00,",
+		"ë":"0x38, 0x55, 0x54, 0x55, 0x08, 0x00,",
+		"ì":"0x00, 0x45, 0x7e, 0x40, 0x00, 0x00,",
+		"í":"0x00, 0x44, 0x7e, 0x41, 0x00, 0x00,",
+		"î":"0x00, 0x46, 0x7d, 0x42, 0x00, 0x00,",
+		"ï":"0x00, 0x45, 0x7c, 0x41, 0x00, 0x00,",
+		"ð":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ñ":"0x78, 0x12, 0x09, 0x0a, 0x71, 0x00,",
+		"ò":"0x38, 0x45, 0x46, 0x44, 0x38, 0x00,",
+		"ó":"0x38, 0x44, 0x46, 0x45, 0x38, 0x00,",
+		"ô":"0x38, 0x46, 0x45, 0x46, 0x38, 0x00,",
+		"õ":"0x32, 0x49, 0x4a, 0x31, 0x00, 0x00,",
+		"ö":"0x38, 0x45, 0x44, 0x45, 0x38, 0x00,",
+		"÷":"0x08, 0x08, 0x2a, 0x08, 0x08, 0x00,",
+		"ø":"0x58, 0x24, 0x54, 0x48, 0x34, 0x00,",
+		"ù":"0x3c, 0x41, 0x42, 0x20, 0x7c, 0x00,",
+		"ú":"0x3c, 0x40, 0x42, 0x21, 0x7c, 0x00,",
+		"û":"0x3c, 0x42, 0x41, 0x22, 0x7c, 0x00,",
+		"ü":"0x3c, 0x41, 0x40, 0x21, 0x5c, 0x00,",
+		"ý":"0x44, 0x48, 0x32, 0x11, 0x0c, 0x00,",
+		"þ":"0x7c, 0x28, 0x28, 0x10, 0x00, 0x00,",
+		"ÿ":"0x44, 0x49, 0x30, 0x11, 0x0c, 0x00,",
+		"Ѐ":"0x7c, 0x55, 0x56, 0x44, 0x44, 0x00,",
+		"Ё":"0x7c, 0x55, 0x54, 0x45, 0x44, 0x00,",
+		"Ђ":"0x01, 0x7f, 0x09, 0x49, 0x31, 0x00,",
+		"Ѓ":"0x7c, 0x04, 0x06, 0x05, 0x04, 0x00,",
+		"Є":"0x3e, 0x49, 0x49, 0x41, 0x00, 0x00,",
+		"Ѕ":"0x06, 0x49, 0x49, 0x49, 0x30, 0x00,",
+		"І":"0x41, 0x41, 0x7f, 0x41, 0x41, 0x00,",
+		"Ї":"0x44, 0x45, 0x7c, 0x45, 0x44, 0x00,",
+		"Ј":"0x20, 0x40, 0x41, 0x3f, 0x01, 0x00,",
+		"Љ":"0x7f, 0x01, 0x7f, 0x48, 0x30, 0x00,",
+		"Њ":"0x7f, 0x08, 0x7f, 0x48, 0x30, 0x00,",
+		"Ћ":"0x01, 0x01, 0x7f, 0x09, 0x71, 0x00,",
+		"Ќ":"0x7c, 0x12, 0x29, 0x44, 0x00, 0x00,",
+		"Ѝ":"0x7c, 0x21, 0x12, 0x08, 0x7c, 0x00,",
+		"Ў":"0x44, 0x49, 0x32, 0x09, 0x04, 0x00,",
+		"Џ":"0x3f, 0x20, 0x60, 0x20, 0x3f, 0x00,",
+		"А":"0x7e, 0x09, 0x09, 0x09, 0x7e, 0x00,",
+		"Б":"0x7f, 0x49, 0x49, 0x49, 0x31, 0x00,",
+		"В":"0x7f, 0x49, 0x49, 0x49, 0x36, 0x00,",
+		"Г":"0x7f, 0x01, 0x01, 0x01, 0x01, 0x00,",
+		"Д":"0x60, 0x3f, 0x21, 0x3f, 0x60, 0x00,",
+		"Е":"0x7f, 0x49, 0x49, 0x49, 0x41, 0x00,",
+		"Ж":"0x77, 0x08, 0x7f, 0x08, 0x77, 0x00,",
+		"З":"0x00, 0x41, 0x49, 0x49, 0x36, 0x00,",
+		"И":"0x7f, 0x10, 0x08, 0x04, 0x7f, 0x00,",
+		"Й":"0x7c, 0x21, 0x12, 0x09, 0x7c, 0x00,",
+		"К":"0x7f, 0x08, 0x14, 0x22, 0x41, 0x00,",
+		"Л":"0x40, 0x3f, 0x01, 0x01, 0x7f, 0x00,",
+		"М":"0x7f, 0x02, 0x04, 0x02, 0x7f, 0x00,",
+		"Н":"0x7f, 0x08, 0x08, 0x08, 0x7f, 0x00,",
+		"О":"0x3e, 0x41, 0x41, 0x41, 0x3e, 0x00,",
+		"П":"0x7f, 0x01, 0x01, 0x01, 0x7f, 0x00,",
+		"Р":"0x7f, 0x09, 0x09, 0x09, 0x06, 0x00,",
+		"С":"0x3e, 0x41, 0x41, 0x41, 0x22, 0x00,",
+		"Т":"0x01, 0x01, 0x7f, 0x01, 0x01, 0x00,",
+		"У":"0x47, 0x48, 0x30, 0x08, 0x07, 0x00,",
+		"Ф":"0x0c, 0x12, 0x7f, 0x12, 0x0c, 0x00,",
+		"Х":"0x63, 0x14, 0x08, 0x14, 0x63, 0x00,",
+		"Ц":"0x3f, 0x20, 0x20, 0x3f, 0x60, 0x00,",
+		"Ч":"0x07, 0x08, 0x08, 0x08, 0x7f, 0x00,",
+		"Ш":"0x3f, 0x20, 0x3f, 0x20, 0x3f, 0x00,",
+		"Щ":"0x3f, 0x20, 0x3f, 0x20, 0x3f, 0x60,",
+		"Ъ":"0x01, 0x7f, 0x48, 0x48, 0x30, 0x00,",
+		"Ы":"0x7f, 0x48, 0x30, 0x00, 0x7f, 0x00,",
+		"Ь":"0x00, 0x7f, 0x48, 0x48, 0x30, 0x00,",
+		"Э":"0x22, 0x49, 0x49, 0x2a, 0x1c, 0x00,",
+		"Ю":"0x7f, 0x08, 0x3e, 0x41, 0x3e, 0x00,",
+		"Я":"0x46, 0x29, 0x19, 0x09, 0x7f, 0x00,",
+		"а":"0x20, 0x54, 0x54, 0x54, 0x78, 0x00,",
+		"б":"0x3c, 0x4a, 0x4a, 0x4a, 0x30, 0x00,",
+		"в":"0x7c, 0x54, 0x54, 0x54, 0x28, 0x00,",
+		"г":"0x7c, 0x04, 0x04, 0x04, 0x04, 0x00,",
+		"д":"0x40, 0x3c, 0x24, 0x3c, 0x60, 0x00,",
+		"е":"0x38, 0x54, 0x54, 0x54, 0x18, 0x00,",
+		"ж":"0x6c, 0x10, 0x7c, 0x10, 0x6c, 0x00,",
+		"з":"0x28, 0x44, 0x54, 0x54, 0x28, 0x00,",
+		"и":"0x7c, 0x20, 0x10, 0x08, 0x7c, 0x00,",
+		"й":"0x7c, 0x21, 0x12, 0x09, 0x7c, 0x00,",
+		"к":"0x7c, 0x10, 0x28, 0x44, 0x00, 0x00,",
+		"л":"0x40, 0x3c, 0x04, 0x04, 0x7c, 0x00,",
+		"м":"0x7c, 0x08, 0x10, 0x08, 0x7c, 0x00,",
+		"н":"0x7c, 0x10, 0x10, 0x10, 0x7c, 0x00,",
+		"о":"0x38, 0x44, 0x44, 0x44, 0x38, 0x00,",
+		"п":"0x7c, 0x04, 0x04, 0x04, 0x7c, 0x00,",
+		"р":"0x7c, 0x14, 0x14, 0x14, 0x08, 0x00,",
+		"с":"0x38, 0x44, 0x44, 0x44, 0x20, 0x00,",
+		"т":"0x04, 0x04, 0x7c, 0x04, 0x04, 0x00,",
+		"у":"0x4c, 0x50, 0x20, 0x10, 0x0c, 0x00,",
+		"ф":"0x18, 0x24, 0x7e, 0x24, 0x18, 0x00,",
+		"х":"0x44, 0x28, 0x10, 0x28, 0x44, 0x00,",
+		"ц":"0x3c, 0x20, 0x20, 0x3c, 0x60, 0x00,",
+		"ч":"0x0c, 0x10, 0x10, 0x10, 0x7c, 0x00,",
+		"ш":"0x3c, 0x20, 0x3c, 0x20, 0x3c, 0x00,",
+		"щ":"0x3c, 0x20, 0x3c, 0x20, 0x7c, 0x00,",
+		"ъ":"0x04, 0x7c, 0x50, 0x20, 0x00, 0x00,",
+		"ы":"0x7c, 0x50, 0x20, 0x00, 0x7c, 0x00,",
+		"ь":"0x00, 0x7c, 0x50, 0x20, 0x00, 0x00,",
+		"э":"0x28, 0x44, 0x54, 0x54, 0x28, 0x00,",
+		"ю":"0x7c, 0x10, 0x38, 0x44, 0x38, 0x00,",
+		"я":"0x48, 0x34, 0x14, 0x14, 0x7c, 0x00,",
+		"ѐ":"0x38, 0x55, 0x56, 0x54, 0x08, 0x00,",
+		"ё":"0x38, 0x55, 0x54, 0x55, 0x08, 0x00,",
+		"ђ":"0x02, 0x3f, 0x12, 0x48, 0x30, 0x00,",
+		"ѓ":"0x7c, 0x04, 0x06, 0x05, 0x04, 0x00,",
+		"є":"0x38, 0x54, 0x54, 0x44, 0x28, 0x00,",
+		"ѕ":"0x08, 0x54, 0x54, 0x54, 0x20, 0x00,",
+		"і":"0x00, 0x44, 0x7d, 0x40, 0x00, 0x00,",
+		"ї":"0x00, 0x45, 0x7c, 0x41, 0x00, 0x00,",
+		"ј":"0x20, 0x40, 0x44, 0x3d, 0x00, 0x00,",
+		"љ":"0x7c, 0x04, 0x7c, 0x50, 0x20, 0x00,",
+		"њ":"0x7c, 0x10, 0x7c, 0x50, 0x20, 0x00,",
+		"ћ":"0x04, 0x7e, 0x14, 0x10, 0x60, 0x00,",
+		"ќ":"0x7c, 0x12, 0x29, 0x44, 0x00, 0x00,",
+		"ѝ":"0x7c, 0x21, 0x12, 0x08, 0x7c, 0x00,",
+		"ў":"0x4c, 0x51, 0x22, 0x11, 0x0c, 0x00,",
+		"џ":"0x3c, 0x20, 0x60, 0x20, 0x3c, 0x00,",
+		"Ā":"0x78, 0x15, 0x15, 0x15, 0x78, 0x00,",
+		"ā":"0x20, 0x55, 0x55, 0x55, 0x78, 0x00,",
+		"Ă":"0x78, 0x15, 0x16, 0x15, 0x78, 0x00,",
+		"ă":"0x20, 0x55, 0x56, 0x55, 0x78, 0x00,",
+		"Ą":"0x7e, 0x09, 0x09, 0x49, 0xbe, 0x00,",
+		"ą":"0x20, 0x54, 0x54, 0xd4, 0x78, 0x00,",
+		"Ć":"0x38, 0x44, 0x46, 0x45, 0x28, 0x00,",
+		"ć":"0x38, 0x44, 0x46, 0x45, 0x20, 0x00,",
+		"Ĉ":"0x38, 0x46, 0x45, 0x46, 0x28, 0x00,",
+		"ĉ":"0x38, 0x46, 0x45, 0x46, 0x20, 0x00,",
+		"Ċ":"0x38, 0x44, 0x45, 0x44, 0x28, 0x00,",
+		"ċ":"0x38, 0x44, 0x45, 0x44, 0x20, 0x00,",
+		"Č":"0x38, 0x45, 0x46, 0x45, 0x28, 0x00,",
+		"č":"0x38, 0x45, 0x46, 0x45, 0x20, 0x00,",
+		"Ď":"0x7c, 0x45, 0x46, 0x29, 0x10, 0x00,",
+		"ď":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Đ":"0x08, 0x7f, 0x49, 0x22, 0x1c, 0x00,",
+		"đ":"0x38, 0x44, 0x44, 0x4A, 0x7F, 0x00,",
+		"Ē":"0x7c, 0x55, 0x55, 0x55, 0x44, 0x00,",
+		"ē":"0x38, 0x55, 0x55, 0x55, 0x08, 0x00,",
+		"Ĕ":"0x7c, 0x55, 0x56, 0x55, 0x44, 0x00,",
+		"ĕ":"0x38, 0x55, 0x56, 0x55, 0x08, 0x00,",
+		"Ė":"0x7c, 0x54, 0x55, 0x54, 0x44, 0x00,",
+		"ė":"0x38, 0x54, 0x55, 0x54, 0x08, 0x00,",
+		"Ę":"0x7f, 0x49, 0x49, 0xc9, 0x41, 0x00,",
+		"ę":"0x38, 0x54, 0x54, 0xd4, 0x18, 0x00,",
+		"Ě":"0x7c, 0x55, 0x56, 0x55, 0x44, 0x00,",
+		"ě":"0x38, 0x55, 0x56, 0x55, 0x08, 0x00,",
+		"Ĝ":"0x38, 0x46, 0x55, 0x56, 0x70, 0x00,",
+		"ĝ":"0x08, 0x56, 0x55, 0x56, 0x3c, 0x00,",
+		"Ğ":"0x38, 0x45, 0x56, 0x55, 0x30, 0x00,",
+		"ğ":"0x08, 0x55, 0x56, 0x55, 0x3c, 0x00,",
+		"Ġ":"0x38, 0x44, 0x55, 0x54, 0x30, 0x00,",
+		"ġ":"0x08, 0x54, 0x55, 0x54, 0x3c, 0x00,",
+		"Ģ":"0x0e, 0x51, 0x35, 0x15, 0x1c, 0x00,",
+		"ģ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ĥ":"0x7c, 0x12, 0x11, 0x12, 0x7c, 0x00,",
+		"ĥ":"0x02, 0x79, 0x22, 0x10, 0x60, 0x00,",
+		"Ħ":"0x02, 0x7f, 0x0a, 0x7f, 0x02, 0x00,",
+		"ħ":"0x02, 0x7f, 0x12, 0x08, 0x70, 0x00,",
+		"Ĩ":"0x4a, 0x49, 0x7a, 0x49, 0x48, 0x00,",
+		"ĩ":"0x02, 0x49, 0x7a, 0x41, 0x00, 0x00,",
+		"Ī":"0x44, 0x45, 0x7d, 0x45, 0x44, 0x00,",
+		"ī":"0x00, 0x45, 0x7d, 0x41, 0x00, 0x00,",
+		"Ĭ":"0x44, 0x45, 0x7e, 0x45, 0x44, 0x00,",
+		"ĭ":"0x00, 0x45, 0x7e, 0x41, 0x00, 0x00,",
+		"Į":"0x00, 0x41, 0x7f, 0xc1, 0x00, 0x00,",
+		"į":"0x00, 0x44, 0x7d, 0xc0, 0x00, 0x00,",
+		"İ":"0x44, 0x44, 0x7d, 0x44, 0x44, 0x00,",
+		"ı":"0x00, 0x44, 0x7c, 0x40, 0x00, 0x00,",
+		"Ĳ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ĳ":"0x44, 0x7d, 0x40, 0x44, 0x3d, 0x00,",
+		"Ĵ":"0x20, 0x40, 0x46, 0x3d, 0x06, 0x00,",
+		"ĵ":"0x00, 0x20, 0x46, 0x3d, 0x02, 0x00,",
+		"Ķ":"0x1f, 0x44, 0x2a, 0x11, 0x00, 0x00,",
+		"ķ":"0x1f, 0x44, 0x2a, 0x11, 0x00, 0x00,",
+		"ĸ":"0x7c, 0x10, 0x28, 0x44, 0x00, 0x00,",
+		"Ĺ":"0x7c, 0x40, 0x42, 0x41, 0x40, 0x00,",
+		"ĺ":"0x00, 0x44, 0x7e, 0x41, 0x00, 0x00,",
+		"Ļ":"0x1f, 0x50, 0x30, 0x10, 0x10, 0x00,",
+		"ļ":"0x00, 0x51, 0x3f, 0x10, 0x00, 0x00,",
+		"Ľ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ľ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ŀ":"0x7f, 0x40, 0x40, 0x48, 0x40, 0x00,",
+		"ŀ":"0x00, 0x41, 0x7f, 0x40, 0x08, 0x00,",
+		"Ł":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ł":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ń":"0x7c, 0x08, 0x12, 0x21, 0x7c, 0x00,",
+		"ń":"0x7c, 0x08, 0x06, 0x05, 0x78, 0x00,",
+		"Ņ":"0x1f, 0x42, 0x24, 0x08, 0x1f, 0x00,",
+		"ņ":"0x1f, 0x42, 0x21, 0x01, 0x1e, 0x00,",
+		"Ň":"0x7c, 0x09, 0x12, 0x21, 0x7c, 0x00,",
+		"ň":"0x7c, 0x09, 0x06, 0x05, 0x78, 0x00,",
+		"ŉ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ŋ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ŋ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ō":"0x38, 0x45, 0x45, 0x45, 0x38, 0x00,",
+		"ō":"0x38, 0x45, 0x45, 0x45, 0x38, 0x00,",
+		"Ŏ":"0x38, 0x45, 0x46, 0x45, 0x38, 0x00,",
+		"ŏ":"0x38, 0x45, 0x46, 0x45, 0x38, 0x00,",
+		"Ő":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ő":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Œ":"0x3e, 0x41, 0x7f, 0x49, 0x49, 0x00,",
+		"œ":"0x38, 0x44, 0x7c, 0x54, 0x58, 0x00,",
+		"Ŕ":"0x7c, 0x14, 0x16, 0x15, 0x68, 0x00,",
+		"ŕ":"0x7c, 0x08, 0x06, 0x05, 0x08, 0x00,",
+		"Ŗ":"0x1f, 0x45, 0x25, 0x05, 0x1a, 0x00,",
+		"ŗ":"0x1f, 0x42, 0x21, 0x01, 0x02, 0x00,",
+		"Ř":"0x7c, 0x15, 0x16, 0x15, 0x68, 0x00,",
+		"ř":"0x7c, 0x09, 0x06, 0x05, 0x08, 0x00,",
+		"Ś":"0x08, 0x54, 0x56, 0x55, 0x20, 0x00,",
+		"ś":"0x48, 0x54, 0x56, 0x55, 0x24, 0x00,",
+		"Ŝ":"0x08, 0x56, 0x55, 0x56, 0x20, 0x00,",
+		"ŝ":"0x48, 0x56, 0x55, 0x56, 0x24, 0x00,",
+		"Ş":"0x02, 0x55, 0x35, 0x15, 0x08, 0x00,",
+		"ş":"0x12, 0x55, 0x35, 0x15, 0x09, 0x00,",
+		"Š":"0x08, 0x55, 0x56, 0x55, 0x20, 0x00,",
+		"š":"0x48, 0x55, 0x56, 0x55, 0x24, 0x00,",
+		"Ţ":"0x01, 0x41, 0x3f, 0x01, 0x01, 0x00,",
+		"ţ":"0x02, 0x4f, 0x32, 0x10, 0x08, 0x00,",
+		"Ť":"0x04, 0x05, 0x7e, 0x05, 0x04, 0x00,",
+		"ť":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ŧ":"0x01, 0x09, 0x7f, 0x09, 0x01, 0x00,",
+		"ŧ":"0x14, 0x3e, 0x54, 0x40, 0x20, 0x00,",
+		"Ũ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ũ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ū":"0x3c, 0x41, 0x41, 0x41, 0x3c, 0x00,",
+		"ū":"0x3c, 0x41, 0x41, 0x21, 0x7c, 0x00,",
+		"Ŭ":"0x3c, 0x41, 0x42, 0x41, 0x3c, 0x00,",
+		"ŭ":"0x3c, 0x41, 0x41, 0x21, 0x7c, 0x00,",
+		"Ů":"0x3c, 0x40, 0x41, 0x40, 0x3c, 0x00,",
+		"ů":"0x3c, 0x41, 0x41, 0x21, 0x7c, 0x00,",
+		"Ű":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ű":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ų":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ų":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ŵ":"0x3c, 0x42, 0x39, 0x42, 0x3c, 0x00,",
+		"ŵ":"0x3c, 0x42, 0x31, 0x42, 0x3c, 0x00,",
+		"Ŷ":"0x04, 0x0a, 0x71, 0x0a, 0x04, 0x00,",
+		"ŷ":"0x04, 0x4a, 0x31, 0x12, 0x0c, 0x00,",
+		"Ÿ":"0x04, 0x09, 0x70, 0x09, 0x04, 0x00,",
+		"Ź":"0x44, 0x64, 0x56, 0x4d, 0x44, 0x00,",
+		"ź":"0x44, 0x64, 0x56, 0x4d, 0x44, 0x00,",
+		"Ż":"0x44, 0x64, 0x55, 0x4c, 0x44, 0x00,",
+		"ż":"0x44, 0x64, 0x55, 0x4c, 0x44, 0x00,",
+		"Ž":"0x44, 0x65, 0x56, 0x4d, 0x44, 0x00,",
+		"ž":"0x44, 0x65, 0x56, 0x4d, 0x44, 0x00,",
+		"ſ":"0x00, 0x04, 0x7e, 0x01, 0x01, 0x00,",
+	}
+	return font
--- a/Editor/make_translation.py
+++ b/Editor/make_translation.py
@@ -1,246 +1,591 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-import json
-import os
-import io
-import sys
-
-TRANSLATION_CPP = "Translation.cpp"
-
-try :
-    to_unicode = unicode
-except NameError:
-    to_unicode = str
-
-
-# Loading a single JSON file
-def loadJson(fileName, skipFirstLine):
-    with io.open(fileName, mode="r", encoding="utf-8") as f:
-        if skipFirstLine:
-            f.readline()
-
-        obj = json.loads(f.read())
-
-    return obj
-
-
-# Reading all language translations into a dictionary by langCode
-def readTranslations(jsonDir):
-    langDict = {}
-    
-    # Read all translation files from the input dir
-    for fileName in os.listdir(jsonDir):
-        
-        fileWithPath = os.path.join(jsonDir, fileName)
-        lf = fileName.lower()
-    
-        # Read only translation_XX.json
-        if lf.startswith("translation_") and lf.endswith(".json"):
-            try:
-                lang = loadJson(fileWithPath, False)
-            except json.decoder.JSONDecodeError as e:
-                print("Failed to decode " + lf)
-                print(str(e))
-                sys.exit(2)
-
-            # Extract lang code from file name
-            langCode = fileName[12:-5].upper()
-            # ...and the one specified in the JSON file...
-            try:
-                langCodeFromJson = lang['languageCode']
-            except KeyError:
-                langCodeFromJson = "(missing)"
-
-            # ...cause they should be the same!
-            if langCode != langCodeFromJson:
-                raise ValueError("Invalid languageCode " + langCodeFromJson + " in file " + fileName)
-            
-            langDict[langCode] = lang
-    
-    return langDict
-
-
-def writeStart(f):
-    f.write(to_unicode("""// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT.
-
-#include "Translation.h"
-#ifndef LANG
-#define LANG_EN
-#endif
-"""))
-
-
-def escapeC(s):
-    return s.replace("\"", "\\\"")
-
-
-def writeLanguage(languageCode, defs, f):
-    print("Generating block for " + languageCode)
-    lang = langDict[languageCode]
-    
-    f.write(to_unicode("\n#ifdef LANG_" + languageCode + "\n"))
-    try:
-        langName = lang['languageLocalName']
-    except KeyError:
-        langName = languageCode
-         
-    f.write(to_unicode("// ---- " + langName + " ----\n\n"))
-
-    try:
-        cyrillic = lang['cyrillicGlyphs']
-    except KeyError:
-        cyrillic = False
-
-    if cyrillic :
-        f.write(to_unicode("#define CYRILLIC_GLYPHS\n\n"))
-        
-    # ----- Writing SettingsDescriptions
-    obj = lang['menuOptions']
-    f.write(to_unicode("const char* SettingsDescriptions[] = {\n"))
-    
-    maxLen = 25
-    for mod in defs['menuOptions']:
-        eid = mod['id']
-        if 'feature' in mod:
-            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
-        f.write(to_unicode("\"" + escapeC(obj[eid]['desc']) + "\",\n"))
-        if 'feature' in mod:
-            f.write(to_unicode("#endif\n"))
-
-    f.write(to_unicode("};\n\n"))
-    
-    # ----- Writing Message strings
-    
-    obj = lang['messages']
-    
-    for mod in defs['messages']:
-        eid = mod['id']
-        f.write(to_unicode("const char* " + eid + " = \"" + escapeC(obj[eid]) + "\";\n"))
-
-    f.write(to_unicode("\n"))
-
-    # ----- Writing Characters
-    
-    obj = lang['characters']
-    
-    for mod in defs['characters']:
-        eid = mod['id']
-        f.write(to_unicode("const char " + eid + " = '" + obj[eid] + "';\n"))
-
-    f.write(to_unicode("\n"))
-    
-    # ----- Menu Options
-
-    # Menu type
-    f.write(to_unicode("const enum ShortNameType SettingsShortNameType = SHORT_NAME_" + ("DOUBLE" if lang['menuDouble'] else "SINGLE") + "_LINE;\n"))
-
-    # ----- Writing SettingsDescriptions
-    obj = lang['menuOptions']
-    f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
-    
-    maxLen = 25
-    for mod in defs['menuOptions']:
-        eid = mod['id']
-        if 'feature' in mod:
-            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
-        if lang['menuDouble']:
-            f.write(to_unicode("{ \"" + escapeC(obj[eid]['text2'][0]) + "\", \"" + escapeC(obj[eid]['text2'][1]) + "\" },\n"))
-        else:
-            f.write(to_unicode("{ \"" + escapeC(obj[eid]['text']) + "\" },\n"))
-        if 'feature' in mod:
-            f.write(to_unicode("#endif\n"))
-                
-    f.write(to_unicode("};\n\n"))
-
-    # ----- Writing Menu Groups
-    obj = lang['menuGroups']
-    f.write(to_unicode("const char* SettingsMenuEntries[" + str(len(obj)) + "] = {\n"))
-    
-    maxLen = 25
-    for mod in defs['menuGroups']:
-        eid = mod['id']
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
-        f.write(to_unicode("\"" + escapeC(obj[eid]['text2'][0] + "\\n" + obj[eid]['text2'][1]) + "\",\n"))
-                
-    f.write(to_unicode("};\n\n"))
-
-    # ----- Writing Menu Groups Descriptions
-    obj = lang['menuGroups']
-    f.write(to_unicode("const char* SettingsMenuEntriesDescriptions[" + str(len(obj)) + "] = {\n"))
-    
-    maxLen = 25
-    for mod in defs['menuGroups']:
-        eid = mod['id']
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
-        f.write(to_unicode("\"" + escapeC(obj[eid]['desc']) + "\",\n"))
-                
-    f.write(to_unicode("};\n\n"))
-
-    # ----- Block end    
-    f.write(to_unicode("#endif\n"))
-
-
-def read_opts():
-    """ Reading input parameters
-    First parameter = json directory
-    Second parameter = target directory
-    """
-    if len(sys.argv) > 1:
-        jsonDir = sys.argv[1]
-    else:
-        jsonDir = "."
-
-    if len(sys.argv) > 2:
-        outFile = sys.argv[2]
-    else:
-        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/src/")
-        outFile = os.path.join(outDir, TRANSLATION_CPP)
-
-    if len(sys.argv) > 3:
-        raise Exception("Too many parameters!")
-
-    return jsonDir, outFile
-
-
-def orderOutput(langDict):
-    # These languages go first
-    mandatoryOrder = ['EN']
-
-    # Then add all others in alphabetical order
-    sortedKeys = sorted(langDict.keys())
-
-    # Add the rest as they come
-    for key in sortedKeys:
-        if key not in mandatoryOrder:
-            mandatoryOrder.append(key)
-
-    return mandatoryOrder
-    
-
-def writeTarget(outFile, defs, langCodes):
-    # Start writing the file
-    with io.open(outFile, 'w', encoding='utf-8', newline="\n") as f:
-        writeStart(f)
-
-        for langCode in langCodes:
-            writeLanguage(langCode, defs, f)
-
-
-if __name__ == "__main__":
-    try:
-        jsonDir, outFile = read_opts()
-    except:
-        print("usage: make_translation.py {json dir} {cpp dir}")
-        sys.exit(1)
-
-    print("Making " + outFile + " from " + jsonDir)
-
-    langDict = readTranslations(jsonDir)
-    defs = loadJson(os.path.join(jsonDir, "translations_def.js"), True)
-    langCodes = orderOutput(langDict)
-    writeTarget(outFile, defs, langCodes)
-
-    print("Done")
+#!/usr/bin/env python3
+# coding=utf-8
+from __future__ import print_function
+import json
+import os
+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
+except NameError:
+    to_unicode = str
+
+
+# Loading a single JSON file
+def loadJson(fileName, skipFirstLine):
+    with io.open(fileName, mode="r", encoding="utf-8") as f:
+        if skipFirstLine:
+            f.readline()
+
+        obj = json.loads(f.read())
+
+    return obj
+
+
+# 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):
+
+        fileWithPath = os.path.join(jsonDir, fileName)
+        lf = fileName.lower()
+
+        # Read only translation_XX.json
+        if lf.startswith("translation_") and lf.endswith(".json"):
+            try:
+                lang = loadJson(fileWithPath, False)
+            except json.decoder.JSONDecodeError as e:
+                print("Failed to decode " + lf)
+                print(str(e))
+                sys.exit(2)
+
+            # Extract lang code from file name
+            langCode = fileName[12:-5].upper()
+            # ...and the one specified in the JSON file...
+            try:
+                langCodeFromJson = lang['languageCode']
+            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
+            UnitDict[langCode] = TempUnitF_FromJson
+    return langDict, UnitDict
+
+
+def writeStart(f):
+    f.write(
+        to_unicode(
+            """// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT.
+
+#include "Translation.h"
+#ifndef LANG
+#define LANG_EN
+#endif
+"""))
+
+
+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("\"", "\\\"")
+
+
+def getConstants():
+    # Extra constants that are used in the firmware that are shared across all languages
+    consants = []
+    consants.append(('SymbolPlus', '+'))
+    consants.append(('SymbolMinus', '-'))
+    consants.append(('SymbolSpace', ' '))
+    consants.append(('SymbolDot', '.'))
+    consants.append(('SymbolDegC', 'C'))
+    consants.append(('SymbolDegF', 'F'))
+    consants.append(('SymbolMinutes', 'M'))
+    consants.append(('SymbolSeconds', 'S'))
+    consants.append(('SymbolWatts', 'W'))
+    consants.append(('SymbolVolts', 'V'))
+    consants.append(('SymbolDC', 'DC'))
+    consants.append(('SymbolCellCount', 'S'))
+    consants.append(('SymbolVersionNumber', buildVersion))
+    return consants
+
+
+def getTipModelEnumTS80():
+    constants = []
+    constants.append("B02")
+    constants.append("D25")
+    constants.append("TS80")  # end of miniware
+    constants.append("User")  # User
+    return constants
+
+
+def getTipModelEnumTS100():
+    constants = []
+    constants.append("B02")
+    constants.append("D24")
+    constants.append("BC2")
+    constants.append(" C1")
+    constants.append("TS100")  # end of miniware
+    constants.append("BC2")
+    constants.append("Hakko")  # end of hakko
+    constants.append("User")
+    return constants
+
+
+def getDebugMenu():
+    constants = []
+    constants.append(datetime.today().strftime('%d-%m-%y'))
+    constants.append("HW G ")
+    constants.append("HW M ")
+    constants.append("HW P ")
+    constants.append("Time ")
+    constants.append("Move ")
+    constants.append("RTip ")
+    constants.append("CTip ")
+    constants.append("CHan ")
+    constants.append("Vin  ")
+    constants.append("PCB  ")  # PCB Version AKA IMU version
+    return constants
+
+
+def getLetterCounts(defs, lang):
+    textList = []
+    # iterate over all strings
+    obj = lang['menuOptions']
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        textList.append(obj[eid]['desc'])
+
+    obj = lang['messages']
+    for mod in defs['messages']:
+        eid = mod['id']
+        if eid not in obj:
+            textList.append(mod['default'])
+        else:
+            textList.append(obj[eid])
+
+    obj = lang['characters']
+
+    for mod in defs['characters']:
+        eid = mod['id']
+        textList.append(obj[eid])
+
+    obj = lang['menuOptions']
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if lang['menuDouble']:
+            textList.append(obj[eid]['text2'][0])
+            textList.append(obj[eid]['text2'][1])
+        else:
+            textList.append(obj[eid]['text'])
+
+    obj = lang['menuGroups']
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        textList.append(obj[eid]['text2'][0])
+        textList.append(obj[eid]['text2'][1])
+
+    obj = lang['menuGroups']
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        textList.append(obj[eid]['desc'])
+    constants = getConstants()
+    for x in constants:
+        textList.append(x[1])
+    textList.extend(getTipModelEnumTS100())
+    textList.extend(getTipModelEnumTS80())
+    textList.extend(getDebugMenu())
+
+    # collapse all strings down into the composite letters and store totals for these
+
+    symbolCounts = {}
+    for line in textList:
+        line = line.replace('\n', '').replace('\r', '')
+        line = line.replace('\\n', '').replace('\\r', '')
+        if len(line):
+            # print(line)
+            for letter in line:
+                symbolCounts[letter] = symbolCounts.get(letter, 0) + 1
+    symbolCounts = sorted(
+        symbolCounts.items(),
+        key=lambda kv: (kv[1], kv[0]))  # swap to Big -> little sort order
+    symbolCounts = list(map(lambda x: x[0], symbolCounts))
+    symbolCounts.reverse()
+    return symbolCounts
+
+
+def getFontMapAndTable(textList):
+    # the text list is sorted
+    # allocate out these in their order as number codes
+    symbolMap = {}
+    symbolMap['\n'] = '\\x01'  # Force insert the newline char
+    index = 2  # start at 2, as 0= null terminator,1 = new line
+    forcedFirstSymbols = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
+    # enforce numbers are first
+    for sym in forcedFirstSymbols:
+        symbolMap[sym] = "\\x%0.2X" % index
+        index = index + 1
+    if len(textList) > (253 - len(forcedFirstSymbols)):
+        print('Error, too many used symbols for this version')
+        exit(1)
+    print('Generating fonts for {} symbols'.format(len(textList)))
+
+    for sym in textList:
+        if sym not in symbolMap:
+            symbolMap[sym] = "\\x%0.2X" % index
+            index = index + 1
+    # Get the font table
+    fontTableStrings = []
+    fontSmallTableStrings = []
+    fontTable = fontTables.getFontMap()
+    fontSmallTable = fontTables.getSmallFontMap()
+    for sym in forcedFirstSymbols:
+        if sym not in fontTable:
+            print('Missing Large font element for {}'.format(sym))
+            exit(1)
+        fontLine = fontTable[sym]
+        fontTableStrings.append(
+            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+        if sym not in fontSmallTable:
+            print('Missing Small font element for {}'.format(sym))
+            exit(1)
+        fontLine = fontSmallTable[sym]
+        fontSmallTableStrings.append(
+            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+
+    for sym in textList:
+        if sym not in fontTable:
+            print('Missing Large font element for {}'.format(sym))
+            exit(1)
+        if sym not in forcedFirstSymbols:
+            fontLine = fontTable[sym]
+            fontTableStrings.append(
+                fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+            if sym not in fontSmallTable:
+                print('Missing Small font element for {}'.format(sym))
+                exit(1)
+            fontLine = fontSmallTable[sym]
+            fontSmallTableStrings.append(
+                fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+    outputTable = "const uint8_t USER_FONT_12[] = {" + to_unicode("\n")
+    for line in fontTableStrings:
+        # join font table int one large string
+        outputTable = outputTable + line + to_unicode("\n")
+    outputTable = outputTable + "};" + to_unicode("\n")
+    outputTable = outputTable + "const uint8_t USER_FONT_6x8[] = {" + to_unicode(
+        "\n")
+    for line in fontSmallTableStrings:
+        # join font table int one large string
+        outputTable = outputTable + line + to_unicode("\n")
+    outputTable = outputTable + "};" + to_unicode("\n")
+    return (outputTable, symbolMap)
+
+
+def convStr(symbolConversionTable, text):
+    # convert all of the symbols from the string into escapes for their content
+    outputString = ""
+    for c in text.replace('\\r', '').replace('\\n', '\n'):
+        if c not in symbolConversionTable:
+            print('Missing font definition for {}'.format(c))
+        else:
+            outputString = outputString + symbolConversionTable[c]
+    return outputString
+
+
+def writeLanguage(languageCode, defs, f):
+    print("Generating block for " + languageCode)
+    lang = langDict[languageCode]
+    # Iterate over all of the text to build up the symbols & counts
+    textList = getLetterCounts(defs, lang)
+    # From the letter counts, need to make a symbol translator & write out the font
+    (fontTableText, symbolConversionTable) = getFontMapAndTable(textList)
+
+    f.write(to_unicode("\n#ifdef LANG_" + languageCode + "\n"))
+    f.write(fontTableText)
+    try:
+        langName = lang['languageLocalName']
+    except KeyError:
+        langName = languageCode
+
+    f.write(to_unicode("// ---- " + langName + " ----\n\n"))
+
+    # ----- Writing SettingsDescriptions
+    obj = lang['menuOptions']
+    f.write(to_unicode("const char* SettingsDescriptions[] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if 'feature' in mod:
+            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode("\"" +
+                       convStr(symbolConversionTable, (obj[eid]['desc'])) +
+                       "\"," + "//{} \n".format(obj[eid]['desc'])))
+        if 'feature' in mod:
+            f.write(to_unicode("#endif\n"))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Writing Message strings
+
+    obj = lang['messages']
+
+    for mod in defs['messages']:
+        eid = mod['id']
+        sourceText = ""
+        if 'default' in mod:
+            sourceText = (mod['default'])
+        if eid in obj:
+            sourceText = (obj[eid])
+        translatedText = convStr(symbolConversionTable, sourceText)
+        f.write(
+            to_unicode("const char* " + eid + " = \"" +
+                       translatedText + "\";" + "//{} \n".format(sourceText.replace('\n', '_'))))
+
+    f.write(to_unicode("\n"))
+
+    # ----- Writing Characters
+
+    obj = lang['characters']
+
+    for mod in defs['characters']:
+        eid = mod['id']
+        f.write(
+            to_unicode("const char* " + eid + " = \"" +
+                       convStr(symbolConversionTable, obj[eid]) + "\";" + "//{} \n".format(obj[eid])))
+
+    f.write(to_unicode("\n"))
+
+    # Write out firmware constant options
+    constants = getConstants()
+    for x in constants:
+        f.write(
+            to_unicode("const char* " + x[0] + " = \"" +
+                       convStr(symbolConversionTable, x[1]) + "\";" + "//{} \n".format(x[1])))
+
+    f.write(to_unicode("\n"))
+    # Write out tip model strings
+
+    f.write(to_unicode("const char* TipModelStrings[] = {\n"))
+    f.write(to_unicode("#ifdef MODEL_TS100\n"))
+    for c in getTipModelEnumTS100():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
+                                             c) + "\"," + "//{} \n".format(c)))
+    f.write(to_unicode("#else\n"))
+    for c in getTipModelEnumTS80():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
+                                             c) + "\"," + "//{} \n".format(c)))
+    f.write(to_unicode("#endif\n"))
+
+    f.write(to_unicode("};\n\n"))
+
+    # Debug Menu
+    f.write(to_unicode("const char* DebugMenu[] = {\n"))
+
+    for c in getDebugMenu():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
+                                             c) + "\"," + "//{} \n".format(c)))
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Menu Options
+
+    # Menu type
+    f.write(
+        to_unicode(
+            "const enum ShortNameType SettingsShortNameType = SHORT_NAME_" +
+            ("DOUBLE" if lang['menuDouble'] else "SINGLE") + "_LINE;\n"))
+
+    # ----- Writing SettingsDescriptions
+    obj = lang['menuOptions']
+    f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if 'feature' in mod:
+            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        if lang['menuDouble']:
+            f.write(
+                to_unicode(
+                    "{ \"" +
+                    convStr(symbolConversionTable, (obj[eid]['text2'][0])) +
+                    "\", \"" +
+                    convStr(symbolConversionTable, (obj[eid]['text2'][1])) +
+                    "\" }," + "//{} \n".format(obj[eid]['text2'])))
+        else:
+            f.write(
+                to_unicode("{ \"" +
+                           convStr(symbolConversionTable, (obj[eid]['text'])) +
+                           "\" }," + "//{} \n".format(obj[eid]['text'])))
+        if 'feature' in mod:
+            f.write(to_unicode("#endif\n"))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Writing Menu Groups
+    obj = lang['menuGroups']
+    f.write(
+        to_unicode("const char* SettingsMenuEntries[" + str(len(obj)) +
+                   "] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode("\"" +
+                       convStr(symbolConversionTable, (obj[eid]['text2'][0]) +
+                               "\\n" + obj[eid]['text2'][1]) + "\"," + "//{} \n".format(obj[eid]['text2'])))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Writing Menu Groups Descriptions
+    obj = lang['menuGroups']
+    f.write(
+        to_unicode("const char* SettingsMenuEntriesDescriptions[" +
+                   str(len(obj)) + "] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode("\"" +
+                       convStr(symbolConversionTable, (obj[eid]['desc'])) +
+                       "\"," + "//{} \n".format(obj[eid]['desc'])))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Block end
+    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 = translation directory
+    Third paramter = unit directory
+    """
+    if len(sys.argv) > 1:
+        jsonDir = sys.argv[1]
+    else:
+        jsonDir = "."
+
+    if len(sys.argv) > 2:
+        outFileTranslationCPP = sys.argv[2]
+    else:
+        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/Core/Src")
+        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, outFileTranslationCPP, outFileUnitH
+
+
+def orderOutput(langDict):
+    # These languages go first
+    mandatoryOrder = ['EN']
+
+    # Then add all others in alphabetical order
+    sortedKeys = sorted(langDict.keys())
+
+    # Add the rest as they come
+    for key in sortedKeys:
+        if key not in mandatoryOrder:
+            mandatoryOrder.append(key)
+
+    return mandatoryOrder
+
+
+def writeTarget(outFileTranslationCPP, outFileUnitH, defs, langCodes, UnitCodes):
+    # Start writing the file
+    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, outFileTranslationCPP, outFileUnitH = read_opts()
+    except:
+        print("usage: make_translation.py {json dir} {cpp dir}")
+        sys.exit(1)
+
+    try: buildVersion = readVersion()
+    except: print("error: could not get/extract build version"); sys.exit(1)
+
+    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)
+    UnitCodes = orderOutput(UnitDict)
+    writeTarget(outFileTranslationCPP, outFileUnitH, defs, langCodes, UnitCodes)
+
+    print("Done")
--- a/Editor/translation_bg.json
+++ b/Editor/translation_bg.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "ВРЪХ ЛОША ВРЪЗКА",
 		"SolderingAdvancedPowerPrompt": "Захранване: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"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": {
@@ -228,6 +233,46 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_cs.json
+++ b/Editor/translation_cs.json
@@ -3,31 +3,37 @@
 	"languageLocalName": "Český",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Kalibrace dokončena!",
 		"SettingsCalibrationWarning": "Ujistěte se, že hrot má pokojovou teplotu!",
 		"SettingsResetWarning": "Opravdu chcete resetovat zařízení do továrního nastavení?",
-		"UVLOWarningString": "DC LOW",
+		"UVLOWarningString": "Nízké DC",
 		"UndervoltageString": "! Nízké napětí !",
 		"InputVoltageString": "Napětí: ",
 		"WarningTipTempString": "Teplota: ",
-		"BadTipString": "BAD TIP",
+		"BadTipString": "ŠP. HROT",
 		"SleepingSimpleString": "Zzz ",
 		"SleepingAdvancedString": "Režim spánku...",
-		"WarningSimpleString": "HOT!",
+		"WarningSimpleString": "PÁLÍ",
 		"WarningAdvancedString": "!! HORKÝ HROT !!",
 		"SleepingTipAdvancedString": "Hrot:",
 		"IdleTipString": "Hrot:",
 		"IdleSetString": " Cíl:",
 		"TipDisconnectedString": "HROT NEPŘIPOJEN",
 		"SolderingAdvancedPowerPrompt": "Ohřev: ",
-		"OffString": "Off"
+		"OffString": "Vyp",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Zisk:"
 	},
 	"characters": {
 		"SettingRightChar": "P",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "P"
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -36,7 +42,7 @@
 				"Pájecí",
 				"nastavení"
 			],
-			"desc": "Nastavení pájení (boost, auto start...)"
+			"desc": "Nastavení pájení (boost, auto start...)."
 		},
 		"PowerSavingMenu": {
 			"text2": [
@@ -57,7 +63,7 @@
 				"Pokročilé",
 				"volby"
 			],
-			"desc": "Pokročilé volby (detailní obrazovky, kalibrace, tovární nastavení...)"
+			"desc": "Pokročilé volby (detailní obrazovky, kalibrace, tovární nastavení...)."
 		}
 	},
 	"menuOptions": {
@@ -67,7 +73,7 @@
 				"Zdroj",
 				"napájení"
 			],
-			"desc": "Při nižším napětí ukončí pájení <DC=10V, ?S=?x3.3V pro LiPo,LiIon...>"
+			"desc": "Při nižším napětí ukončí pájení <DC=10V, ?S=?x3.3V pro LiPo, LiIon...>."
 		},
 		"SleepTemperature": {
 			"text": "",
@@ -83,7 +89,7 @@
 				"Čas do",
 				"r. spánku"
 			],
-			"desc": "Čas do režimu spánku <Minut/Sekund>"
+			"desc": "Čas do režimu spánku <Minut/Sekund>."
 		},
 		"ShutdownTimeout": {
 			"text": "",
@@ -91,7 +97,7 @@
 				"Čas do",
 				"vypnutí"
 			],
-			"desc": "Čas do automatického vypnutí <Minut>"
+			"desc": "Čas do automatického vypnutí <Minut>."
 		},
 		"MotionSensitivity": {
 			"text": "",
@@ -99,7 +105,7 @@
 				"Citlivost",
 				"det. pohybu"
 			],
-			"desc": "Citlivost detekce pohybu <0=Vyp, 1=Min, ... 9=Max>"
+			"desc": "Citlivost detekce pohybu <0=Vyp, 1=Min, ... 9=Max>."
 		},
 		"TemperatureUnit": {
 			"text": "",
@@ -107,7 +113,7 @@
 				"Jednotky",
 				"teploty"
 			],
-			"desc": "Jednotky měření teploty <C=Celsius, F=Fahrenheit>"
+			"desc": "Jednotky měření teploty <C=Celsius, F=Fahrenheit>."
 		},
 		"AdvancedIdle": {
 			"text": "",
@@ -123,7 +129,7 @@
 				"Orientace",
 				"obrazovky"
 			],
-			"desc": "Orientace obrazovky <A=Auto, L=Levák, P=Pravák>"
+			"desc": "Orientace obrazovky <A=Auto, L=Levák, P=Pravák>."
 		},
 		"BoostEnabled": {
 			"text": "",
@@ -131,7 +137,7 @@
 				"Povolit",
 				"boost"
 			],
-			"desc": "Povolit boost držením předního tlačítka při pájení?"
+			"desc": "Povolit boost podržením předního tlačítka při pájení?"
 		},
 		"BoostTemperature": {
 			"text": "",
@@ -144,7 +150,7 @@
 		"AutoStart": {
 			"text": "",
 			"text2": [
-				"Auto",
+				"Automatický",
 				"start"
 			],
 			"desc": "Při startu ihned nahřát hrot?"
@@ -195,39 +201,79 @@
 				"Rychlost",
 				"popisků"
 			],
-			"desc": "Rychlost skrolování popisků podobných tomuto <P=Pomalu,R=Rychle>"
+			"desc": "Rychlost posuvu popisků podobných tomuto <P=Pomalu, R=Rychle>"
 		},
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
-				"Model"
+				"Model",
+				"hrotu"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Výběr modelu hrotu."
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Jednoduchá",
+				"kalibrace"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Jednoduchá kalibrace pomocí horké vody."
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Pokročilá",
+				"kalibrace"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Pokročilá kalibrace pomocí termočlánku na hrotu."
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Výkon",
+				"ve wattech"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_da.json
+++ b/Editor/translation_da.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"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": {
@@ -228,6 +233,46 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_de.json
+++ b/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ß",
@@ -20,14 +21,21 @@
 		"IdleSetString": " Soll:",
 		"TipDisconnectedString": "Spitze fehlt",
 		"SolderingAdvancedPowerPrompt": "Leistung: ",
-		"OffString": "Aus"
+		"OffString": "Aus",
+		"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": {
@@ -47,7 +55,7 @@
 		},
 		"UIMenu": {
 			"text2": [
-				"Menü-",
+				"Anzeige-",
 				"einstellungen"
 			],
 			"desc": "Menüeinstellungen"
@@ -55,14 +63,14 @@
 		"AdvancedMenu": {
 			"text2": [
 				"Erweiterte",
-				"Einstellungen"
+				"Optionen"
 			],
 			"desc": "Erweiterte Einstellungen"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+			"text": "PWRSC",
 			"text2": [
 				"Spannungs-",
 				"quelle"
@@ -70,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"
@@ -86,7 +94,7 @@
 			"desc": "Ruhemodus nach <Sekunden/Minuten>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+			"text": "SHTME",
 			"text2": [
 				"Abschalt-",
 				"zeit"
@@ -94,7 +102,7 @@
 			"desc": "Abschalten nach <Minuten>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+			"text": "MSENSE",
 			"text2": [
 				"Bewegungs-",
 				"empfindlichk."
@@ -102,7 +110,7 @@
 			"desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+			"text": "TMPUNT",
 			"text2": [
 				"Temperatur-",
 				"einheit"
@@ -110,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"
@@ -126,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"
@@ -142,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?"
@@ -166,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?"
@@ -182,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",
@@ -225,9 +233,50 @@
 			"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_en.json
+++ b/Editor/translation_en.json
@@ -1,233 +1,281 @@
-{
-	"languageCode": "EN",
-	"languageLocalName": "English",
-	"cyrillicGlyphs": false,
-	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
-		"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: ",
-		"BadTipString": "BAD TIP",
-		"SleepingSimpleString": "Zzzz",
-		"SleepingAdvancedString": "Sleeping...",
-		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "!!! TIP HOT !!!",
-		"SleepingTipAdvancedString": "Tip:",
-		"IdleTipString": "Tip:",
-		"IdleSetString": " Set:",
-		"TipDisconnectedString": "TIP DISCONNECTED",
-		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
-	},
-	"characters": {
-		"SettingRightChar": "R",
-		"SettingLeftChar": "L",
-		"SettingAutoChar": "A",
-		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
-	},
-	"menuDouble": true,
-	"menuGroups": {
-		"SolderingMenu": {
-			"text2": [
-				"Soldering",
-				"Settings"
-			],
-			"desc": "Soldering settings"
-		},
-		"PowerSavingMenu": {
-			"text2": [
-				"Sleep",
-				"Modes"
-			],
-			"desc": "Power saving settings"
-		},
-		"UIMenu": {
-			"text2": [
-				"User",
-				"Interface"
-			],
-			"desc": "User interface settings"
-		},
-		"AdvancedMenu": {
-			"text2": [
-				"Advanced",
-				"Options"
-			],
-			"desc": "Advanced options"
-		}
-	},
-	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
-			"text2": [
-				"Power",
-				"source"
-			],
-			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>"
-		},
-		"SleepTemperature": {
-			"text": "STMP",
-			"text2": [
-				"Sleep",
-				"temp"
-			],
-			"desc": "Sleep Temperature <C>"
-		},
-		"SleepTimeout": {
-			"text": "STME",
-			"text2": [
-				"Sleep",
-				"timeout"
-			],
-			"desc": "Sleep Timeout <Minutes/Seconds>"
-		},
-		"ShutdownTimeout": {
-			"text": "SHTME",
-			"text2": [
-				"Shutdown",
-				"timeout"
-			],
-			"desc": "Shutdown Timeout <Minutes>"
-		},
-		"MotionSensitivity": {
-			"text": "MSENSE",
-			"text2": [
-				"Motion",
-				"sensitivity"
-			],
-			"desc": "Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>"
-		},
-		"TemperatureUnit": {
-			"text": "TMPUNT",
-			"text2": [
-				"Temperature",
-				"units"
-			],
-			"desc": "Temperature Unit <C=Celsius F=Fahrenheit>"
-		},
-		"AdvancedIdle": {
-			"text": "ADVIDL",
-			"text2": [
-				"Detailed",
-				"idle screen"
-			],
-			"desc": "Display detailed information in a smaller font on the idle screen."
-		},
-		"DisplayRotation": {
-			"text": "DSPROT",
-			"text2": [
-				"Display",
-				"orientation"
-			],
-			"desc": "Display Orientation <A. Automatic L. Left Handed R. Right Handed>"
-		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"Boost mode",
-				"enabled"
-			],
-			"desc": "Enable front key enters boost mode 450C mode when soldering"
-		},
-		"BoostTemperature": {
-			"text": "BTMP",
-			"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Temperature when in \"boost\" mode"
-		},
-		"AutoStart": {
-			"text": "ASTART",
-			"text2": [
-				"Auto",
-				"start"
-			],
-			"desc": "Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off"
-		},
-		"CooldownBlink": {
-			"text": "CLBLNK",
-			"text2": [
-				"Cooldown",
-				"blink"
-			],
-			"desc": "Blink the temperature on the cooling screen while the tip is still hot."
-		},
-		"TemperatureCalibration": {
-			"text": "TMP CAL?",
-			"text2": [
-				"Calibrate",
-				"temperature?"
-			],
-			"desc": "Calibrate tip offset."
-		},
-		"SettingsReset": {
-			"text": "RESET?",
-			"text2": [
-				"Factory",
-				"Reset?"
-			],
-			"desc": "Reset all settings"
-		},
-		"VoltageCalibration": {
-			"text": "CAL VIN?",
-			"text2": [
-				"Calibrate",
-				"input voltage?"
-			],
-			"desc": "VIN Calibration. Buttons adjust, long press to exit"
-		},
-		"AdvancedSoldering": {
-			"text": "ADVSLD",
-			"text2": [
-				"Detailed",
-				"solder screen"
-			],
-			"desc": "Display detailed information while soldering"
-		},
-		"ScrollingSpeed": {
-			"text": "DESCSP",
-			"text2": [
-				"Scrolling",
-				"Speed"
-			],
-			"desc": "Speed this text scrolls past at"
-		},
-		"TipModel": {
-			"text": "TIPMO",
-			"text2": [
-				"Tip",
-				"Model"
-			],
-			"desc": "Tip Model selection"
-		},
-		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
-			"text2": [
-				"Simple",
-				"Calibration"
-			],
-			"desc": "Simple Calibration using Hot water"
-		},
-		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
-			"text2": [
-				"Advanced",
-				"Calibration"
-			],
-			"desc": "Advanced calibration using thermocouple on the tip"
-		},
-		"PowerInput": {
-			"text": "PWRW",
-			"text2": [
-				"Power",
-				"Wattage"
-			],
-			"desc": "Power Wattage of the power adapter used"
-		}
-	}
-}
+{
+	"languageCode": "EN",
+	"languageLocalName": "English",
+	"cyrillicGlyphs": false,
+	"tempUnitFahrenheit": true,
+	"messages": {
+		"SettingsCalibrationDone": "Calibration done!",
+		"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: ",
+		"BadTipString": "BAD TIP",
+		"SleepingSimpleString": "Zzzz",
+		"SleepingAdvancedString": "Sleeping...",
+		"WarningSimpleString": "HOT!",
+		"WarningAdvancedString": "!!! TIP HOT !!!",
+		"SleepingTipAdvancedString": "Tip:",
+		"IdleTipString": "Tip:",
+		"IdleSetString": " Set:",
+		"TipDisconnectedString": "TIP DISCONNECTED",
+		"SolderingAdvancedPowerPrompt": "Power: ",
+		"OffString": "Off",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your Gain:",
+		"SettingsResetMessage": "Settings were\nreset!"
+	},
+	"characters": {
+		"SettingRightChar": "R",
+		"SettingLeftChar": "L",
+		"SettingAutoChar": "A",
+		"SettingFastChar": "F",
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
+	},
+	"menuDouble": true,
+	"menuGroups": {
+		"SolderingMenu": {
+			"text2": [
+				"Soldering",
+				"Settings"
+			],
+			"desc": "Soldering settings"
+		},
+		"PowerSavingMenu": {
+			"text2": [
+				"Sleep",
+				"Modes"
+			],
+			"desc": "Power saving settings"
+		},
+		"UIMenu": {
+			"text2": [
+				"User",
+				"Interface"
+			],
+			"desc": "User interface settings"
+		},
+		"AdvancedMenu": {
+			"text2": [
+				"Advanced",
+				"Options"
+			],
+			"desc": "Advanced options"
+		}
+	},
+	"menuOptions": {
+		"PowerSource": {
+			"text": "PWRSC",
+			"text2": [
+				"Power",
+				"source"
+			],
+			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell, disable power limit>"
+		},
+		"SleepTemperature": {
+			"text": "STMP",
+			"text2": [
+				"Sleep",
+				"temp"
+			],
+			"desc": "Sleep Temperature"
+		},
+		"SleepTimeout": {
+			"text": "STME",
+			"text2": [
+				"Sleep",
+				"timeout"
+			],
+			"desc": "Sleep Timeout <Minutes/Seconds>"
+		},
+		"ShutdownTimeout": {
+			"text": "SHTME",
+			"text2": [
+				"Shutdown",
+				"timeout"
+			],
+			"desc": "Shutdown Timeout <Minutes>"
+		},
+		"MotionSensitivity": {
+			"text": "MSENSE",
+			"text2": [
+				"Motion",
+				"sensitivity"
+			],
+			"desc": "Motion Sensitivity <0=Off 1=Least Sensitive 9=Most Sensitive>"
+		},
+		"TemperatureUnit": {
+			"text": "TMPUNT",
+			"text2": [
+				"Temperature",
+				"units"
+			],
+			"desc": "Temperature Unit <C=Celsius F=Fahrenheit>"
+		},
+		"AdvancedIdle": {
+			"text": "ADVIDL",
+			"text2": [
+				"Detailed",
+				"idle screen"
+			],
+			"desc": "Display detailed information in a smaller font on the idle screen."
+		},
+		"DisplayRotation": {
+			"text": "DSPROT",
+			"text2": [
+				"Display",
+				"orientation"
+			],
+			"desc": "Display Orientation <A=Automatic L=Left Handed R=Right Handed>"
+		},
+		"BoostEnabled": {
+			"text": "BOOST",
+			"text2": [
+				"Boost mode",
+				"enabled"
+			],
+			"desc": "Enable front key long press \"Boost\" mode when soldering"
+		},
+		"BoostTemperature": {
+			"text": "BTMP",
+			"text2": [
+				"Boost",
+				"temp"
+			],
+			"desc": "Temperature when in \"Boost\" mode"
+		},
+		"AutoStart": {
+			"text": "ASTART",
+			"text2": [
+				"Auto",
+				"start"
+			],
+			"desc": "Automatically starts the iron into soldering on power up <T=Soldering S=Sleep F=Off>"
+		},
+		"CooldownBlink": {
+			"text": "CLBLNK",
+			"text2": [
+				"Cooldown",
+				"blink"
+			],
+			"desc": "Blink the temperature on the cooling screen while the tip is still hot."
+		},
+		"TemperatureCalibration": {
+			"text": "TMP CAL?",
+			"text2": [
+				"Calibrate",
+				"temperature?"
+			],
+			"desc": "Calibrate tip offset."
+		},
+		"SettingsReset": {
+			"text": "RESET?",
+			"text2": [
+				"Factory",
+				"Reset?"
+			],
+			"desc": "Reset all settings"
+		},
+		"VoltageCalibration": {
+			"text": "CAL VIN?",
+			"text2": [
+				"Calibrate",
+				"input voltage?"
+			],
+			"desc": "VIN Calibration. Buttons adjust, long press to exit"
+		},
+		"AdvancedSoldering": {
+			"text": "ADVSLD",
+			"text2": [
+				"Detailed",
+				"solder screen"
+			],
+			"desc": "Display detailed information while soldering"
+		},
+		"ScrollingSpeed": {
+			"text": "DESCSP",
+			"text2": [
+				"Scrolling",
+				"Speed"
+			],
+			"desc": "Speed this text scrolls past at <S=Slow F=Fast>"
+		},
+		"TipModel": {
+			"text": "TIPMO",
+			"text2": [
+				"Tip",
+				"Model"
+			],
+			"desc": "Tip Model selection"
+		},
+		"SimpleCalibrationMode": {
+			"text": "SMPCAL",
+			"text2": [
+				"Simple",
+				"Calibration"
+			],
+			"desc": "Simple Calibration using Hot water"
+		},
+		"AdvancedCalibrationMode": {
+			"text": "ADVCAL",
+			"text2": [
+				"Advanced",
+				"Calibration"
+			],
+			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"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!"
+		}
+	}
+}
--- a/Editor/translation_es.json
+++ b/Editor/translation_es.json
@@ -1,63 +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"
+		"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": {
@@ -67,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",
@@ -107,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",
@@ -123,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",
@@ -195,39 +202,79 @@
 				"Velocidad",
 				"del texto"
 			],
-			"desc": "Velocidad de desplazamiento del texto."
+			"desc": "Velocidad de desplazamiento del texto <R=rápida L=lenta>"
 		},
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
-				"Model"
+				"Modelo de",
+				"punta"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Elegir el modelo de punta actual."
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Calibración",
+				"simple"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Calibración simple con agua caliente."
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Calibración",
+				"avanzada"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Calibrar con un termopar en la punta; más difícil."
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Potencia de",
+				"entrada"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Potencia en vatios del adaptador de corriente utilizado."
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_fi.json
+++ b/Editor/translation_fi.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Asetus:",
 		"TipDisconnectedString": "KÄRKI ON IRTI",
 		"SolderingAdvancedPowerPrompt": "Teho: ",
-		"OffString": "OFF"
+		"OffString": "OFF",
+		"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": {
@@ -228,6 +233,46 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_fr.json
+++ b/Editor/translation_fr.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "PANNE DÉBRANCHÉE",
 		"SolderingAdvancedPowerPrompt": "Puissance: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"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": {
@@ -228,6 +233,46 @@
 				"l'alimentation"
 			],
 			"desc": "Puissance de l'alimentation utilisée"
+		},
+		"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!"
 		}
 	}
 }
--- a/Editor/translation_hr.json
+++ b/Editor/translation_hr.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "VRH NIJE SPOJEN!",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"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": {
@@ -228,6 +233,46 @@
 				"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!"
 		}
 	}
 }
--- a/Editor/translation_hu.json
+++ b/Editor/translation_hu.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Cél:",
 		"TipDisconnectedString": "HEGY LEVÉVE",
 		"SolderingAdvancedPowerPrompt": "Telj: ",
-		"OffString": "Ki"
+		"OffString": "Ki",
+		"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": {
@@ -228,6 +233,46 @@
 				"teljesítmény"
 			],
 			"desc": "A tápegység által leadott teljesítmény"
+		},
+		"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!"
 		}
 	}
 }
--- a/Editor/translation_it.json
+++ b/Editor/translation_it.json
@@ -16,18 +16,23 @@
 		"WarningSimpleString": "HOT!",
 		"WarningAdvancedString": "PUNTA CALDA!",
 		"SleepingTipAdvancedString": "Punta:",
-		"IdleTipString": "Punta:",
+		"IdleTipString": "T punta:",
 		"IdleSetString": "/",
 		"TipDisconnectedString": "PUNTA ASSENTE",
-		"SolderingAdvancedPowerPrompt": "Potenza:",
-		"OffString": "OFF"
+		"SolderingAdvancedPowerPrompt": "Potenz:",
+		"OffString": "OFF",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "S",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "V",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "A",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "D"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -112,10 +117,10 @@
 		"AdvancedIdle": {
 			"text": "",
 			"text2": [
-				"Mostra",
-				"dettagli"
+				"Interfaccia",
+				"testuale"
 			],
-			"desc": "Mostra informazioni dettagliate con un carattere più piccolo all'interno della schermata principale"
+			"desc": "Mostra informazioni dettagliate all'interno della schermata principale"
 		},
 		"DisplayRotation": {
 			"text": "",
@@ -131,7 +136,7 @@
 				"Funzione",
 				"«Turbo»"
 			],
-			"desc": "Il tasto superiore attiva la funzione «Turbo» durante la modalità Saldatura"
+			"desc": "Attiva la funzione «Turbo», durante la modalità Saldatura, tenendo premuto il tasto superiore"
 		},
 		"BoostTemperature": {
 			"text": "",
@@ -201,7 +206,7 @@
 			"text": "TIPMO",
 			"text2": [
 				"Modello",
-				"della punta"
+				"punta"
 			],
 			"desc": "Seleziona il modello della punta in uso"
 		},
@@ -227,7 +232,47 @@
 				"Potenza",
 				"alimentaz"
 			],
-			"desc": "Imposta la potenza dell'alimentatore in uso"
+			"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
+		},
+		"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_lt.json
+++ b/Editor/translation_lt.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Nust:",
 		"TipDisconnectedString": "ANTGAL ATJUNGTAS",
 		"SolderingAdvancedPowerPrompt": "Maitinimas: ",
-		"OffString": "Išj"
+		"OffString": "Išj",
+		"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": {
@@ -228,6 +233,46 @@
 				"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!"
 		}
 	}
 }
--- a/Editor/translation_nl.json
+++ b/Editor/translation_nl.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "TIP LOSGEKOPPELD",
 		"SolderingAdvancedPowerPrompt": "vermogen: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"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": {
@@ -228,6 +233,46 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_nl_be.json
+++ b/Editor/translation_nl_be.json
@@ -20,14 +20,19 @@
 		"IdleSetString": "Stel in:",
 		"TipDisconnectedString": "Punt ONTKOPPELD",
 		"SolderingAdvancedPowerPrompt": "Vermogen: ",
-		"OffString": "Uit"
+		"OffString": "Uit",
+		"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": {
@@ -228,6 +233,46 @@
 				"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_no.json
+++ b/Editor/translation_no.json
@@ -20,14 +20,19 @@
 		"IdleSetString": "Set:",
 		"TipDisconnectedString": "SPISS FRAKOBLET",
 		"SolderingAdvancedPowerPrompt": "Effekt: ",
-		"OffString": "Av"
+		"OffString": "Av",
+		"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": {
@@ -228,6 +233,46 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_pl.json
+++ b/Editor/translation_pl.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Ustaw:",
 		"TipDisconnectedString": "GROT ODŁĄCZONY",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Wyłącz"
+		"OffString": "Wyłącz",
+		"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": {
@@ -228,6 +233,46 @@
 				"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_pt.json
+++ b/Editor/translation_pt.json
@@ -3,9 +3,9 @@
 	"languageLocalName": "Português",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "A ponta deve estar em temperatura ambiente antes de continuar!",
-		"SettingsResetWarning": "Resetar para ajustes de fábrica?",
+		"SettingsCalibrationDone": "Calibração terminada!",
+		"SettingsCalibrationWarning": "A ponta deve estar à temperatura ambiente antes de continuar!",
+		"SettingsResetWarning": "Definições de fábrica?",
 		"UVLOWarningString": "DC BAIXO",
 		"UndervoltageString": "Subtensão",
 		"InputVoltageString": "Tensão ",
@@ -20,14 +20,19 @@
 		"IdleSetString": " Aj:",
 		"TipDisconnectedString": "SEM PONTA",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"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": {
@@ -48,9 +53,9 @@
 		"UIMenu": {
 			"text2": [
 				"Interface",
-				"Usuário"
+				"Utilizador"
 			],
-			"desc": "Configurações da interface do usuário"
+			"desc": "Configurações do interface do utilizador"
 		},
 		"AdvancedMenu": {
 			"text2": [
@@ -67,7 +72,7 @@
 				"Fonte",
 				"alimentação"
 			],
-			"desc": "nte de alimentação. Define a tensão de corte. <DC=10V> <S=3.3V/célula>"
+			"desc": "Fonte de alimentação. Define a tensão de corte. <DC=10V> <S=3.3V/célula>"
 		},
 		"SleepTemperature": {
 			"text": "TMPE",
@@ -110,12 +115,12 @@
 			"desc": "Unidade de temperatura <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "OCIOSO",
+			"text": "EM ESPERA",
 			"text2": [
 				"Tela repouso",
 				"avançada"
 			],
-			"desc": "Exibe informações avançadas quando ocioso"
+			"desc": "Exibe informações avançadas quando em espera"
 		},
 		"DisplayRotation": {
 			"text": "ORIENT",
@@ -129,9 +134,9 @@
 			"text": "TURBO",
 			"text2": [
 				"Modo turbo",
-				"ativado"
+				"activado"
 			],
-			"desc": "Tecla frontal ativa modo \"turbo\""
+			"desc": "Tecla frontal activa modo \"turbo\""
 		},
 		"BoostTemperature": {
 			"text": "TTMP",
@@ -153,9 +158,9 @@
 			"text": "RESFRI",
 			"text2": [
 				"Piscar ao",
-				"resfriar"
+				"arrefecer"
 			],
-			"desc": "Faz o valor da temperatura piscar durante o resfriamento"
+			"desc": "Faz o valor da temperatura piscar durante o arrefecimento"
 		},
 		"TemperatureCalibration": {
 			"text": "CAL.TEMP",
@@ -166,7 +171,7 @@
 			"desc": "Calibra a temperatura"
 		},
 		"SettingsReset": {
-			"text": "RESETAR",
+			"text": "RESET",
 			"text2": [
 				"Reset de",
 				"fábrica?"
@@ -179,7 +184,7 @@
 				"Calibrar",
 				"tensão"
 			],
-			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha presionado para sair"
+			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair"
 		},
 		"AdvancedSoldering": {
 			"text": "AVNCAD",
@@ -195,39 +200,79 @@
 				"Velocidade",
 				"texto ajuda"
 			],
-			"desc": "Velocidade que esse texto é exibido"
+			"desc": "Velocidade a que o texto é exibido"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+			"text": "MODPNT",
 			"text2": [
-				"Tip",
-				"Model"
+				"Ponta",
+				"Modelo"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Selecção de modelo de ponta"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Calibração",
+				"Simples"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Calibração simples com água quente"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Calibração",
+				"Avançada"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Calibração avançada com um termopar na ponta"
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Potência",
+				"Fonte"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_ru.json
+++ b/Editor/translation_ru.json
@@ -6,28 +6,35 @@
 		"SettingsCalibrationDone": "Калибровка выполнена!",
 		"SettingsCalibrationWarning": "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!",
 		"SettingsResetWarning": "Вы действительно хотите сбросить настройки до значений по умолчанию?",
-		"UVLOWarningString": "АККУМ--",
+		"UVLOWarningString": "НАПРЯЖ--",
 		"UndervoltageString": "Под питанием",
 		"InputVoltageString": "Питание B: ",
 		"WarningTipTempString": "Жало t°: ",
 		"BadTipString": "Жало--",
 		"SleepingSimpleString": "Сон ",
 		"SleepingAdvancedString": "Ожидание...",
-		"WarningSimpleString": " АЙ!",
-		"WarningAdvancedString": "ВНИМАНИЕ ГОРЯЧО",
+		"WarningSimpleString": " ГОРЯЧО!",
+		"WarningAdvancedString": "!!! ГОРЯЧЕЕ ЖАЛО !!!",
 		"SleepingTipAdvancedString": "Жало:",
 		"IdleTipString": "Жало:",
 		"IdleSetString": " ->",
-		"TipDisconnectedString": "Жало отключено",
+		"TipDisconnectedString": "ЖАЛО ОТСОЕДИНЕНО",
 		"SolderingAdvancedPowerPrompt": "Питание: ",
-		"OffString": "Off"
+		"OffString": "Выкл.",
+		"ResetOKMessage": "Сброс OK",
+		"YourGainMessage": "Прирост:",
+		"SettingsResetMessage": "Настройки \nсброшены!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "+",
-		"SettingSlowChar": "-"
+		"SettingSlowChar": "-",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -67,7 +74,7 @@
 				"Источник",
 				"питания"
 			],
-			"desc": "Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>"
+			"desc": "Источник питания. Установка напряжения отключения. <DC = 10 В, S = 3.3 В на батарею, ограничение мощности выкл.>"
 		},
 		"SleepTemperature": {
 			"text": "Тожд",
@@ -83,7 +90,7 @@
 				"Таймаут",
 				"сна"
 			],
-			"desc": "Время до перехода в режим ожидания <Минуты>"
+			"desc": "Время до перехода в режим ожидания <Минуты/Секунды>"
 		},
 		"ShutdownTimeout": {
 			"text": "Тоткл",
@@ -99,7 +106,7 @@
 				"Чувст. сенсо-",
 				"ра движения"
 			],
-			"desc": "Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>"
+			"desc": "Акселерометр <0 = Выкл, 1 = Мин. чувствительный, 9 = Макс. чувствительный>"
 		},
 		"TemperatureUnit": {
 			"text": "ЕдТемп",
@@ -107,7 +114,7 @@
 				"Формат темпе-",
 				"ратуры(C°/F°)"
 			],
-			"desc": "В чем измерять температуру"
+			"desc": "Единица измерения температуры <C = Цельсия, F = Фаренгейт>"
 		},
 		"AdvancedIdle": {
 			"text": "ИнфОжд",
@@ -123,7 +130,7 @@
 				"Автоповорот",
 				"экрана"
 			],
-			"desc": "Ориентация дисплея <A. Автоматический, Л. Левая рука, П. Правая рука>"
+			"desc": "Ориентация дисплея <A = Авто, Л = Левая рука, П = Правая рука>"
 		},
 		"BoostEnabled": {
 			"text": "Турбо",
@@ -131,7 +138,7 @@
 				"Режим",
 				"Турбо"
 			],
-			"desc": "Турбо-режим при удержании кнопки А при пайке "
+			"desc": "Активирует \"Турбо-режим\" при удержании кнопки А во время пайки"
 		},
 		"BoostTemperature": {
 			"text": "Ттур",
@@ -139,7 +146,7 @@
 				"Темпер.",
 				"Турбо"
 			],
-			"desc": "Температура в турбо-режиме"
+			"desc": "Температура в \"Турбо-режиме\""
 		},
 		"AutoStart": {
 			"text": "Астарт",
@@ -147,7 +154,7 @@
 				"Горячий",
 				"старт"
 			],
-			"desc": "Автоматический запуск паяльника при включении питания. T=Нагрев, S=Режим ожидания,F=Выкл."
+			"desc": "Автоматический запуск паяльника при включении питания <T = Нагрев, S = Режим ожидания, F = Выкл.>"
 		},
 		"CooldownBlink": {
 			"text": "Охлажд",
@@ -155,7 +162,7 @@
 				"Показ t° при",
 				"остывании"
 			],
-			"desc": "Показывать температуру на экране охлаждения, пока жало остается горячим."
+			"desc": "Показывать температуру на экране охлаждения, пока жало остается горячим"
 		},
 		"TemperatureCalibration": {
 			"text": "КалибрТ",
@@ -163,7 +170,7 @@
 				"Калибровка",
 				"температуры"
 			],
-			"desc": "Калибровка термодатчика."
+			"desc": "Калибровка термодатчика"
 		},
 		"SettingsReset": {
 			"text": "СБРОС?",
@@ -171,7 +178,7 @@
 				"Сбросить все",
 				"настройки?"
 			],
-			"desc": "Сброс всех настроек."
+			"desc": "Сброс всех настроек"
 		},
 		"VoltageCalibration": {
 			"text": "КалибрU?",
@@ -179,7 +186,7 @@
 				"Калибровка",
 				"напряжения"
 			],
-			"desc": "Калибровка напряжения входа. Настройка кнопками, нажать и удержать чтобы завершить."
+			"desc": "Калибровка входного напряжения. Настройка кнопками, нажать и удержать чтобы завершить"
 		},
 		"AdvancedSoldering": {
 			"text": "ИнфПай",
@@ -187,7 +194,7 @@
 				"Подробный ре-",
 				"жим пайки"
 			],
-			"desc": "Показывать детальную информацию при пайке."
+			"desc": "Показывать детальную информацию при пайке"
 		},
 		"ScrollingSpeed": {
 			"text": "DESCSP",
@@ -224,10 +231,50 @@
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Мощность",
+				"адаптера"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Мощность используемого адаптера питания"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Ограничение",
+				"мощности"
+			],
+			"desc": "Включает ограничение мощности потребления"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Максимальная",
+				"мощность"
+			],
+			"desc": "Макс. мощность, которую может использовать паяльник <Ватт>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
 		}
 	}
 }
--- a/Editor/translation_sk.json
+++ b/Editor/translation_sk.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"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": {
@@ -228,6 +233,46 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_sl.json
+++ b/Editor/translation_sl.json
@@ -0,0 +1,279 @@
+{
+	"languageCode": "SL",
+	"languageLocalName": "Slovensko",
+	"cyrillicGlyphs": false,
+	"messages": {
+		"SettingsCalibrationDone": "Kalibracija opravljena!",
+		"SettingsCalibrationWarning": "Preden nadaljujete, mora biti konica na sobni temperaturi!",
+		"SettingsResetWarning": "Ste prepričani, da želite ponastaviti nastavitve na privzete vrednosti?",
+		"UVLOWarningString": "NIZKA U",
+		"UndervoltageString": "Nizka napetost",
+		"InputVoltageString": "Vhodna U: ",
+		"WarningTipTempString": "Temp. kon.: ",
+		"BadTipString": "OKVARA K",
+		"SleepingSimpleString": "Zzzz",
+		"SleepingAdvancedString": "Spim...",
+		"WarningSimpleString": "HOT!",
+		"WarningAdvancedString": "!!!VROČA KON.!!!",
+		"SleepingTipAdvancedString": "Knica:",
+		"IdleTipString": "Kon:",
+		"IdleSetString": " nst.:",
+		"TipDisconnectedString": "KONICA ODSTRANJ.",
+		"SolderingAdvancedPowerPrompt": "Moč: ",
+		"OffString": "Izk",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Ojačan.:"
+	},
+	"characters": {
+		"SettingRightChar": "D",
+		"SettingLeftChar": "L",
+		"SettingAutoChar": "S",
+		"SettingFastChar": "H",
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
+	},
+	"menuDouble": true,
+	"menuGroups": {
+		"SolderingMenu": {
+			"text2": [
+				"Nastavitve",
+				"spajkanja"
+			],
+			"desc": "Nastavitve spajkanja"
+		},
+		"PowerSavingMenu": {
+			"text2": [
+				"Načini",
+				"spanja"
+			],
+			"desc": "Nastavitve varčevanja z energijo"
+		},
+		"UIMenu": {
+			"text2": [
+				"Uporabniški",
+				"vmesnik"
+			],
+			"desc": "Nastavitve uporabniškega vmesnika"
+		},
+		"AdvancedMenu": {
+			"text2": [
+				"Napredne",
+				"možnosti"
+			],
+			"desc": "Napredne možnosti"
+		}
+	},
+	"menuOptions": {
+		"PowerSource": {
+			"text": "PWRSC",
+			"text2": [
+				"Vir",
+				"napajanja"
+			],
+			"desc": "Vir napajanja. Nastavi napetost izklopa. <DC 10V> <S 3.3V na celico>"
+		},
+		"SleepTemperature": {
+			"text": "STMP",
+			"text2": [
+				"Temp. med",
+				"spanjem"
+			],
+			"desc": "Temperatura med spanjem <C>"
+		},
+		"SleepTimeout": {
+			"text": "STME",
+			"text2": [
+				"Čas do",
+				"spanja"
+			],
+			"desc": "Čas pred spanjem <minute/sekunde>"
+		},
+		"ShutdownTimeout": {
+			"text": "SHTME",
+			"text2": [
+				"Čas do",
+				"izklopa"
+			],
+			"desc": "Čas pred izklopom <minute>"
+		},
+		"MotionSensitivity": {
+			"text": "MSENSE",
+			"text2": [
+				"Občutljivost",
+				"premikanja"
+			],
+			"desc": "Občutljivost premikanja <0.izklopljeno 1.najmanj 9.najbolj občutljivo>"
+		},
+		"TemperatureUnit": {
+			"text": "TMPUNT",
+			"text2": [
+				"Enota za",
+				"temperaturo"
+			],
+			"desc": "Enota za temperaturo <C=celzija F=fahrenheita>"
+		},
+		"AdvancedIdle": {
+			"text": "ADVIDL",
+			"text2": [
+				"Več info na",
+				"zaslonu v mir"
+			],
+			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med mirovanjem."
+		},
+		"DisplayRotation": {
+			"text": "DSPROT",
+			"text2": [
+				"Orientacija",
+				"zaslona"
+			],
+			"desc": "Orientacija zaslona <S. samodejno L. levo D. desno>"
+		},
+		"BoostEnabled": {
+			"text": "BOOST",
+			"text2": [
+				"Omogoči",
+				"boost mode"
+			],
+			"desc": "Omogoči, da tipka za naprej zagreje konico na 450C."
+		},
+		"BoostTemperature": {
+			"text": "BTMP",
+			"text2": [
+				"Temperat.",
+				"v boost"
+			],
+			"desc": "Temperatura v \"boost\" načinu"
+		},
+		"AutoStart": {
+			"text": "ASTART",
+			"text2": [
+				"Samodejni",
+				"zagon"
+			],
+			"desc": "Samodejno segrej konico ob vklopu. T=segrej, S=spanje, F=izklop"
+		},
+		"CooldownBlink": {
+			"text": "CLBLNK",
+			"text2": [
+				"Utripanje med",
+				"hlajenjem"
+			],
+			"desc": "Utripaj temperaturo med hlajenjem, ko je konica še vroča."
+		},
+		"TemperatureCalibration": {
+			"text": "TMP CAL?",
+			"text2": [
+				"Kalibriram",
+				"temperaturo?"
+			],
+			"desc": "Kalibracija temperature na konici."
+		},
+		"SettingsReset": {
+			"text": "RESET?",
+			"text2": [
+				"Tovarniške",
+				"nastavitve?"
+			],
+			"desc": "Ponastavitev vseh nastavitev"
+		},
+		"VoltageCalibration": {
+			"text": "CAL VIN?",
+			"text2": [
+				"Kalibriram",
+				"vhodno napetost?"
+			],
+			"desc": "Kalibracija VIN. Nastavitve z gumbi, dolgi pritisk za izhod."
+		},
+		"AdvancedSoldering": {
+			"text": "ADVSLD",
+			"text2": [
+				"Več info na",
+				"zaslonu spaj."
+			],
+			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
+		},
+		"ScrollingSpeed": {
+			"text": "DESCSP",
+			"text2": [
+				"Hitrost",
+				"besedila"
+			],
+			"desc": "Hitrost, s katero se prikazuje besedilo"
+		},
+		"TipModel": {
+			"text": "TIPMO",
+			"text2": [
+				"Model",
+				"konice"
+			],
+			"desc": "Izbira tipa konice"
+		},
+		"SimpleCalibrationMode": {
+			"text": "SMPCAL",
+			"text2": [
+				"Preprosta",
+				"kalibracija"
+			],
+			"desc": "Preprosta kalibracija z vročo vodo."
+		},
+		"AdvancedCalibrationMode": {
+			"text": "ADVCAL",
+			"text2": [
+				"Napredna",
+				"kalibracija"
+			],
+			"desc": "Napredna kalibracija s termočlenom na konici"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Moč napajalnega",
+				"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!"
+		}
+	}
+}
--- a/Editor/translation_sr_cyrl.json
+++ b/Editor/translation_sr_cyrl.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
 		"SolderingAdvancedPowerPrompt": "Снага: ",
-		"OffString": "Иск"
+		"OffString": "Иск",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "Д",
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "А",
 		"SettingFastChar": "Б",
-		"SettingSlowChar": "С"
+		"SettingSlowChar": "С",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,46 @@
 				"снага"
 			],
 			"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_sr_latn.json
+++ b/Editor/translation_sr_latn.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "VRH NIJE SPOJEN",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
-		"OffString": "Isk"
+		"OffString": "Isk",
+		"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": {
@@ -228,6 +233,46 @@
 				"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_sv.json
+++ b/Editor/translation_sv.json
@@ -20,14 +20,19 @@
 		"IdleSetString": " Ange:",
 		"TipDisconnectedString": "SPETS URTAGEN",
 		"SolderingAdvancedPowerPrompt": "Ström: ",
-		"OffString": "Av"
+		"OffString": "Av",
+		"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": {
@@ -228,6 +233,46 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"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!"
 		}
 	}
 }
--- a/Editor/translation_tr.json
+++ b/Editor/translation_tr.json
@@ -1,63 +1,68 @@
 {
 	"languageCode": "TR",
-	"languageLocalName": "Türk",
+	"languageLocalName": "Türkçe",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Kalibrasyon tamamlandı!",
 		"SettingsCalibrationWarning": "Lütfen devam etmeden önce ucun oda sıcaklığında olduğunu garantiye alın!",
-		"SettingsResetWarning": "Are you sure to reset settings to default values?",
+		"SettingsResetWarning": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz?",
 		"UVLOWarningString": "DC LOW",
-		"UndervoltageString": "Undervoltage",
-		"InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip Temp: ",
-		"BadTipString": "BAD TIP",
+		"UndervoltageString": "Düşüş Voltaj",
+		"InputVoltageString": "Giriş V: ",
+		"WarningTipTempString": "Uç Sıcaklığı: ",
+		"BadTipString": "KÖTÜ UÇ",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Uyuyor...",
-		"WarningSimpleString": "HOT!",
+		"WarningSimpleString": "SICAK!",
 		"WarningAdvancedString": "UYARI! UÇ SICAK!",
-		"SleepingTipAdvancedString": "Tip:",
-		"IdleTipString": "Tip:",
-		"IdleSetString": " Set:",
-		"TipDisconnectedString": "TIP DISCONNECTED",
-		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"SleepingTipAdvancedString": "Uç:",
+		"IdleTipString": "Uç:",
+		"IdleSetString": " Ayarla:",
+		"TipDisconnectedString": "UÇ ÇIKARILDI",
+		"SolderingAdvancedPowerPrompt": "Güç: ",
+		"OffString": "Kapalı",
+		"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": {
 		"SolderingMenu": {
 			"text2": [
-				"Soldering",
-				"Settings"
+				"Lehimleme",
+				"Ayarları"
 			],
-			"desc": "Soldering settings"
+			"desc": "Lehimleme Ayarları"
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Sleep",
-				"Modes"
+				"Uyku",
+				"Modları"
 			],
-			"desc": "Power Saving Settings"
+			"desc": "Güç Tasarrufu Ayarları"
 		},
 		"UIMenu": {
 			"text2": [
-				"User",
-				"Interface"
+				"Kullanıcı",
+				"Arayüzü"
 			],
-			"desc": "User Interface settings"
+			"desc": "Kullanıcı Arayüzü Ayarları"
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Advanced",
-				"Options"
+				"Gelişmiş",
+				"Ayarlar"
 			],
-			"desc": "Advanced options"
+			"desc": "Gelişmiş Ayarlar"
 		}
 	},
 	"menuOptions": {
@@ -200,34 +205,74 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
-				"Model"
+				"Uç",
+				"Modeli"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Uç Modeli seçimi"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Basit",
+				"Kalibrasyon"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Sıcak su kullanarak basit kalibrasyon"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Gelişmiş",
+				"Kalibrasyon"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Uçtaki ısı sensörünü kullanarak gelişmiş kalibrasyon"
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Güç",
+				"Miktarı(W)"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"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!"
 		}
 	}
-}
+}
--- a/Editor/translation_uk.json
+++ b/Editor/translation_uk.json
@@ -3,7 +3,7 @@
 	"languageLocalName": "Українська",
 	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Калібрування виконане!",
 		"SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!",
 		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням?",
 		"UVLOWarningString": "АККУМ--",
@@ -20,28 +20,33 @@
 		"IdleSetString": " ->",
 		"TipDisconnectedString": "Жало вимкнено!",
 		"SolderingAdvancedPowerPrompt": "Живлення: ",
-		"OffString": "Вим"
+		"OffString": "Вимк",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
-		"SettingRightChar": "R",
-		"SettingLeftChar": "L",
+		"SettingRightChar": "П",
+		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "+",
-		"SettingSlowChar": "-"
+		"SettingSlowChar": "-",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Пайка",
-				""
+				"Параметри",
+				"пайки"
 			],
 			"desc": "Налаштування для режиму пайки. Діють при включеному жалі."
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Сон",
-				""
+				"Режим",
+				"сну"
 			],
 			"desc": "Налаштування при бездіяльності. Корисно що б не обпектися і з часом не спалити житло."
 		},
@@ -50,24 +55,24 @@
 				"Інтерфейс",
 				""
 			],
-			"desc": "Користувальницький інтерфейс."
+			"desc": "Параметри користувальницького інтерфейсу."
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Інші",
-				""
+				"Додаткові",
+				"параметри"
 			],
 			"desc": "Розширені налаштування. Додаткові зручності."
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+			"text": "ДжЖив",
 			"text2": [
 				"Джерело",
 				"живлення"
 			],
-			"desc": "Установка напруги відключення. <DC - 10V, 3S - 9.9V, 4S - 13.2V, 5S - 16.5V, 6S - 19.8V>"
+			"desc": "Встановлення напруги відключення. <DC - 10V, 3S - 9.9V, 4S - 13.2V, 5S - 16.5V, 6S - 19.8V>"
 		},
 		"SleepTemperature": {
 			"text": "",
@@ -80,10 +85,10 @@
 		"SleepTimeout": {
 			"text": "",
 			"text2": [
-				"Таймаут",
+				"Тайм-аут",
 				"сну"
 			],
-			"desc": "Час до переходу в режим очікування <Доступно отключение>"
+			"desc": "Час до переходу в режим очікування <Хвилини>"
 		},
 		"ShutdownTimeout": {
 			"text": "",
@@ -91,7 +96,7 @@
 				"Часу до",
 				"вимкнення"
 			],
-			"desc": "Час до відключення <Доступно відключення>"
+			"desc": "Час до відключення <Хвилини>"
 		},
 		"MotionSensitivity": {
 			"text": "",
@@ -99,7 +104,7 @@
 				"Чутл. сенсо-",
 				"ру руху"
 			],
-			"desc": "Акселерометр <0 - Викл. 1 хв. чутливості 9 - макс. чутливості>"
+			"desc": "Акселерометр <0 - Вимк. 1 хв. чутливості 9 - макс. чутливості>"
 		},
 		"TemperatureUnit": {
 			"text": "",
@@ -115,7 +120,7 @@
 				"Детальний ре-",
 				"жим очікуван."
 			],
-			"desc": "Показувати детальну в режимі налаштувань <Замість картинки>"
+			"desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
 		},
 		"DisplayRotation": {
 			"text": "",
@@ -123,7 +128,7 @@
 				"Автоповорот",
 				"екрану"
 			],
-			"desc": "Орієнтація дисплея <A - Автоповорот, L - Лівша, R - Правша>"
+			"desc": "Орієнтація дисплея <A - Автоповорот, Л - Лівша, П - Правша>"
 		},
 		"BoostEnabled": {
 			"text": "",
@@ -147,7 +152,7 @@
 				"Гарячий",
 				"старт"
 			],
-			"desc": "Автоматичний перехід в режим пайки при включенні живлення."
+			"desc": "Автоматичний перехід в режим пайки при ввімкнені живлення."
 		},
 		"CooldownBlink": {
 			"text": "",
@@ -171,13 +176,13 @@
 				"Скинути всі",
 				"налаштування?"
 			],
-			"desc": "Скидання всіх параметрів до вихідних значень."
+			"desc": "Скидання всіх параметрів до стандартних значень."
 		},
 		"VoltageCalibration": {
 			"text": "",
 			"text2": [
-				"Калібровка",
-				"напруга"
+				"Калібрування",
+				"напруги"
 			],
 			"desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
 		},
@@ -200,34 +205,74 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
-				"Model"
+				"Модель",
+				"Жало"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Вибір моделі жала"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Просте",
+				"Калібрування"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Просте калібрування з використанням гарячої води"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Детальне",
+				"Калібрування"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Калібрування за допомогою термопари"
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Потужність",
+				"дж. живл."
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Потужність джерела живлення в Ватах"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Ліміт",
+				"потужності"
+			],
+			"desc": "Вмикає обмеження потужності споживання"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Максимальна",
+				"потужність"
+			],
+			"desc": "Макс. потужність, яку може використовувати паяльник <Ват>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
 		}
 	}
 }
--- a/Editor/translations_def.js
+++ b/Editor/translations_def.js
@@ -1,232 +1,287 @@
-var def =
-{
-	"messages": [
-		{
-			"id": "SettingsCalibrationDone"
-		},
-		{
-			"id": "SettingsCalibrationWarning"
-		},
-		{
-			"id": "SettingsResetWarning"
-		},
-		{
-			"id": "UVLOWarningString",
-			"maxLen": 8
-		},
-		{
-			"id": "UndervoltageString",
-			"maxLen": 16
-		},
-		{
-			"id": "InputVoltageString",
-			"maxLen": 11,
-			"note": "Preferably end with a space"
-		},
-		{
-			"id": "WarningTipTempString",
-			"maxLen": 12,
-			"note": "Preferably end with a space"
-		},
-		{
-			"id": "BadTipString",
-			"maxLen": 8
-		},
-		{
-			"id": "SleepingSimpleString",
-			"maxLen": 4
-		},
-		{
-			"id": "SleepingAdvancedString",
-			"maxLen": 16
-		},
-		{
-			"id": "WarningSimpleString",
-			"maxLen": 4
-		},
-		{
-			"id": "WarningAdvancedString",
-			"maxLen": 16
-		},
-		{
-			"id": "SleepingTipAdvancedString",
-			"maxLen": 6
-		},
-		{
-			"id": "IdleTipString",
-			"lenSum":
-			{
-				"fields": ["IdleTipString", "IdleSetString"],
-				"maxLen": 10
-			}
-		},
-		{
-			"id": "IdleSetString",
-			"lenSum":
-			{
-				"fields": ["IdleTipString", "IdleSetString"],
-				"maxLen": 10
-			},
-			"note": "Preferably start with a space"
-		},
-		{
-			"id": "TipDisconnectedString",
-			"maxLen": 16
-		},
-		{
-			"id": "SolderingAdvancedPowerPrompt",
-			"maxLen": null
-		},
-		{
-			"id": "OffString",
-			"maxLen": 3
-		}
-	],
-	"characters": [
-		{
-			"id": "SettingRightChar",
-			"len": 1
-		},
-		{
-			"id": "SettingLeftChar",
-			"len": 1
-		},
-		{
-			"id": "SettingAutoChar",
-			"len": 1
-		},
-		{
-			"id": "SettingFastChar",
-			"len": 1
-		},
-		{
-			"id": "SettingSlowChar",
-			"len": 1
-		}
-	],
-	"menuGroups": [
-		{
-			"id": "SolderingMenu",
-			"maxLen": 11
-		},
-		{
-			"id": "PowerSavingMenu",
-			"maxLen": 11
-		},
-		{
-			"id": "UIMenu",
-			"maxLen": 11
-		},
-		{
-			"id": "AdvancedMenu",
-			"maxLen": 11
-		}
-	],
-	"menuOptions": [
-		{
-			"id": "PowerSource",
-			"maxLen": 5,
-			"maxLen2": 11
-		},
-		{
-			"id": "SleepTemperature",
-			"maxLen": 4,
-			"maxLen2": 9
-		},
-		{
-			"id": "SleepTimeout",
-			"maxLen": 4,
-			"maxLen2": 9
-		},
-		{
-			"id": "ShutdownTimeout",
-			"maxLen": 5,
-			"maxLen2": 11
-		},
-		{
-			"id": "MotionSensitivity",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "TemperatureUnit",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "AdvancedIdle",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "DisplayRotation",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "BoostEnabled",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "BoostTemperature",
-			"maxLen": 4,
-			"maxLen2": 9
-		},
-		{
-			"id": "AutoStart",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "CooldownBlink",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "TemperatureCalibration",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "SettingsReset",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "VoltageCalibration",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "AdvancedSoldering",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "ScrollingSpeed",
-			"maxLen": 6,
-			"maxLen2": 11
-		},
-		{
-			"id": "TipModel",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "SimpleCalibrationMode",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "AdvancedCalibrationMode",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "PowerInput",
-			"maxLen": 8,
-			"maxLen2": 16
-		}
-	]
-}
+var def =
+{
+	"messages": [
+		{
+			"id": "SettingsCalibrationDone"
+		},
+		{
+			"id": "SettingsCalibrationWarning"
+		},
+		{
+			"id": "SettingsResetWarning"
+		},
+		{
+			"id": "UVLOWarningString",
+			"maxLen": 8
+		},
+		{
+			"id": "UndervoltageString",
+			"maxLen": 16
+		},
+		{
+			"id": "InputVoltageString",
+			"maxLen": 11,
+			"note": "Preferably end with a space"
+		},
+		{
+			"id": "WarningTipTempString",
+			"maxLen": 12,
+			"note": "Preferably end with a space"
+		},
+		{
+			"id": "BadTipString",
+			"maxLen": 8
+		},
+		{
+			"id": "SleepingSimpleString",
+			"maxLen": 4
+		},
+		{
+			"id": "SleepingAdvancedString",
+			"maxLen": 16
+		},
+		{
+			"id": "WarningSimpleString",
+			"maxLen": 4
+		},
+		{
+			"id": "WarningAdvancedString",
+			"maxLen": 16
+		},
+		{
+			"id": "SleepingTipAdvancedString",
+			"maxLen": 6
+		},
+		{
+			"id": "IdleTipString",
+			"lenSum":
+			{
+				"fields": ["IdleTipString", "IdleSetString"],
+				"maxLen": 10
+			}
+		},
+		{
+			"id": "IdleSetString",
+			"lenSum":
+			{
+				"fields": ["IdleTipString", "IdleSetString"],
+				"maxLen": 10
+			},
+			"note": "Preferably start with a space"
+		},
+		{
+			"id": "TipDisconnectedString",
+			"maxLen": 16
+		},
+		{
+			"id": "SolderingAdvancedPowerPrompt",
+			"maxLen": null
+		},
+		{
+			"id": "OffString",
+			"maxLen": 3
+		},
+		{
+			"id": "ResetOKMessage",
+			"maxLen": 8
+		},
+		{
+			"id": "YourGainMessage",
+			"maxLen": 8,
+			"default": "Your Gain"
+		},
+		{
+			"id": "SettingsResetMessage",
+			"maxLen": 16,
+			"default": "Settings were\nreset!"
+		}
+	],
+	"characters": [
+		{
+			"id": "SettingRightChar",
+			"len": 1
+		},
+		{
+			"id": "SettingLeftChar",
+			"len": 1
+		},
+		{
+			"id": "SettingAutoChar",
+			"len": 1
+		},
+		{
+			"id": "SettingFastChar",
+			"len": 1
+		},
+		{
+			"id": "SettingSlowChar",
+			"len": 1
+		},
+		{
+			"id": "SettingStartSolderingChar",
+			"len": 1
+		},
+		{
+			"id": "SettingStartSleepChar",
+			"len": 1
+		},
+		{
+			"id": "SettingStartSleepOffChar",
+			"len": 1
+		},
+		{
+			"id": "SettingStartNoneChar",
+			"len": 1
+		}
+	],
+	"menuGroups": [
+		{
+			"id": "SolderingMenu",
+			"maxLen": 11
+		},
+		{
+			"id": "PowerSavingMenu",
+			"maxLen": 11
+		},
+		{
+			"id": "UIMenu",
+			"maxLen": 11
+		},
+		{
+			"id": "AdvancedMenu",
+			"maxLen": 11
+		}
+	],
+	"menuOptions": [
+		{
+			"id": "PowerSource",
+			"maxLen": 5,
+			"maxLen2": 11
+		},
+		{
+			"id": "SleepTemperature",
+			"maxLen": 4,
+			"maxLen2": 9
+		},
+		{
+			"id": "SleepTimeout",
+			"maxLen": 4,
+			"maxLen2": 9
+		},
+		{
+			"id": "ShutdownTimeout",
+			"maxLen": 5,
+			"maxLen2": 11
+		},
+		{
+			"id": "MotionSensitivity",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "TemperatureUnit",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "AdvancedIdle",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "DisplayRotation",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "BoostEnabled",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "BoostTemperature",
+			"maxLen": 4,
+			"maxLen2": 9
+		},
+		{
+			"id": "AutoStart",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "CooldownBlink",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "TemperatureCalibration",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "SettingsReset",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "VoltageCalibration",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "AdvancedSoldering",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "ScrollingSpeed",
+			"maxLen": 6,
+			"maxLen2": 11
+		},
+		{
+			"id": "TipModel",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "SimpleCalibrationMode",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "AdvancedCalibrationMode",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"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
+		}
+	]
+}
--- a/Translation.md
+++ b/Translation.md
@@ -3,4 +3,4 @@ If you would like to contribute a translation, use the [Translation Editor](http

 [Open a reference language file and optionally a target language file](https://github.com/Ralim/ts100/tree/master/Translation%20Editor).

-You can create an issue with your updated json translation, or make your own pull request. If you make a pull request, also run `python3 make_translation.py` to regenerate the source file.
+You can create a pull request with the new / updated json configuration file, and this will include this language into the new builds for the firmware.
--- a/build.sh
+++ b/build.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker-compose run --rm builder /bin/bash /build/ci/buildAll.sh
--- a/ci/buildAll.sh
+++ b/ci/buildAll.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+set -u
+
+mkdir -p /build/ci/artefacts
+
+# Build STM code
+cd /build/source/workspace/TS100/
+bash ./build.sh || exit 1
+echo "All Firmware built"
+# Copy out all the final resulting files we would like to store for the next op
+cp -r /build/source/workspace/TS100/Hexfile/*.hex  /build/ci/artefacts/
+cp -r /build/source/workspace/TS100/Hexfile/*.bin  /build/ci/artefacts/
--- a/ci/secrets/decrypt.sh
+++ b/ci/secrets/decrypt.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+SECRETS="$DIR/encrypted/*.encrypted"
+KEY="$DIR/../../codeship.aes"
+
+mkdir -p $DIR/unencrypted
+
+for f in $SECRETS
+do
+    out="${f/.encrypted/.secret}"
+    out="${out/encrypted/unencrypted}"
+    echo $out
+    jet decrypt $f $out --key-path $KEY
+done
+
+echo "Done"
--- a/ci/secrets/encrypted/deployment.encrypted
+++ b/ci/secrets/encrypted/deployment.encrypted
@@ -0,0 +1,2 @@
+codeship:v2
+DUgOERb8iPVn95/DKIw9M7sgNjJlIlsaeE4PFV58tmmBu2sD1ooR7Y0L23bimC9a
--- a/codeship-services.yml
+++ b/codeship-services.yml
@@ -0,0 +1,8 @@
+builder:
+  build:
+    context: .
+    dockerfile: Dockerfile
+  cached: true
+  encrypted_env_file: ci/secrets/encrypted/deployment.encrypted
+  volumes:
+    - ./ci:/ci
--- a/codeship-steps.yml
+++ b/codeship-steps.yml
@@ -0,0 +1,6 @@
+- type: parallel
+  name: Build the firmware
+  steps:
+    - name: build
+      service: builder
+      command: /build/ci/buildAll.sh
--- a/development.md
+++ b/development.md
@@ -0,0 +1,20 @@
+# Development
+
+Building this software can be performed two ways, using the STMCubeIDE or using command line tools.
+
+## STM Cube IDE
+
+The repository is setup to try and make this painless, when starting the IDE you can import the project by pointing the internal search to the workspace folder of this repository. If you start with a fresh installation, close the welcome screen tab, and then in the left sidebar, there is an option to "import". Select General -> Import existing projects -> Set the top location option to this repositories workspace -> Should find the TS100 project.
+
+## Developing with command line tools & building a release
+
+In the `workspace/TS100` folder there is a makefile that can be used to build the repository using command line tools.
+when running the `make` command, specify which model of the device & the language you would like to use.
+
+`make -j8 lang=EN model=TS80`
+
+To build a release instead, run the build.sh script. This will update translations and also build every language for both TS100 and TS80 models.
+
+## Updating languages
+
+To update the language translation files & associated font map, execute the `make_translation.py` code from the translations directory.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+services:
+  builder:
+    stdin_open: true
+    tty: true
+    build:
+      context: .
+    command: /bin/bash
+    volumes:
+      - ./ci:/build/ci
+      - ./:/build/source
--- a/menu.md
+++ b/menu.md
@@ -0,0 +1,77 @@
+# Menu System
+
+
+## Soldering mode
+
+In this mode the iron works as you would expect, pressing either button will take you to a temperature change screen.
+Use each button to go up and down in temperature. Pressing both buttons will exit you from the temperature menu (or wait 3 seconds and it will time out).
+Pressing both buttons or holding the button near the USB will exit the soldering mode.
+Holding the button at the front of the iron will enter boost mode (if enabled).
+
+## Settings Menu
+
+This menu allows you to cycle through all the options and set their values.
+The button near the USB cycles through the options, and the one near the tip changes the selected option.
+Note that settings are not saved until you exit the menu.
+If you leave the unit alone (ie don't press any buttons) on a setting, after 3 seconds the screen will scroll a rough description of the setting.
+
+The menu is arranged so that the most often used settings are first.
+With submenu's being selected to enter using the front button (as if you were going to change the setting).
+Scrolling through the submenu will return you back to its entry location after you scroll through all of the options.
+
+### Calibrating input voltage
+
+Due to the tolerance on the resistors used for the input voltage divider, some irons can be up to 0.6V out on the voltage measurement.
+Please calibrate your iron if you have any issues with the cutoff voltage.
+Note that cutoff messages can also be triggered by using a power supply that is too weak and fails under the load of the iron.
+This is more critical than before with the new cell count based cutout voltage.
+
+To calibrate your iron:
+
+1. Measure the input voltage with a multimeter and note it down.
+2. Connect the input to your iron.
+3. Enter the settings menu
+4. Under the advanced submenu
+5. Select the calibrate voltage option
+6. Use the front and back buttons to adjust the displayed voltage to minimize the error to your original measurement
+7. Hold both buttons to save and exit to the menu
+
+### Tip Model Selection
+
+The menu now lets you select which tip you are using with your iron. This lets the unit know which gain value to use for your tip, this varies slightly between models and can help with temperature accuracy.
+There is also an option for a *custom* tip. This basically means that you will tune the tip parameters yourself.
+
+### Calibrating tip offset (Set tip model)
+
+Some tips will have an offset on their readings, to calibrate this out perform the following steps:
+
+1. Connect power to your iron
+2. Make sure the tip is at room temperature (ie. wait for a fair while after using the iron before calibration)
+3. Enter the settings menu
+4. Scroll down to the advanced menu, and then the temperature calibration
+5. Press the button to change the option (tip button)
+6. The display will start to scroll a warning message to check that the tip is at ambient temperature!
+7. Press the button near the tip of the iron to confirm
+8. The display will go to "...." for a short period of time as the unit measures the tip temperature and the handle temperature and compares them
+9. The display will then go back to *TMP CAL*
+10. Calibration is done, just exit the settings menu as normal
+11. You're done, enjoy your iron!
+
+### Calibration of custom tip
+
+There are two methods to calibrate the tip, the simple mode which requires boiling water, and an advanced mode that requires a method of measuring the actual tip of the tip.
+
+Advanced mode is preffered.
+
+In simple mode you first need to have the tip at room temperature to start, and then when prompted place the tip into a cup of boiling water, wait a few seconds and then press a button to confirm.
+
+In advanced mode, follow instructions on the screen, you will need to adjust the ranges to find two calibration points by measuring the tip temperature directly. This tends to be significantly more accurate.
+
+If you do calibrate your own values for a tip because it's missing from the menu or because you think the one in the menu is really wrong, raise an issue on github and I'll be happy to look at adding it or revising the existing settings.
+
+
+### Boost mode
+
+This allows you to change the front key (one near the tip) to become a boost button when you hold it for > 2 seconds. This allows you to set this button to change the soldering temperature for short periods. For example when soldering a big joint and you want to boost the temperature a bit.
+
+The boost temperature is set in the settings menu.
--- a/power.md
+++ b/power.md
@@ -0,0 +1,24 @@
+# Power & Performance
+
+Both the TS100 and TS80 are PWM controlled resistive heating elements.
+This means that the electronics in the handle can only turn the heating element on and off.
+This *means* that the power proivded in the tip is 100% controlled by the supply voltage used.
+
+Both irons at their simplest are just a resistor connected to your power source via a switch.
+
+When the switch is on, the power in the resistor is `Current (I) times Volts (V)`.
+Current through the resistor is `Volts (V) divided by Resistance (R)`.
+Combining these two gives the common equation, power is `Volts (V) squared / Resistance (R)`.
+
+The resistance of the tip is fixed, 8.5 ohms for the TS100 and 4.5 ohms for the TS80.
+
+This means that for both irons, the power delivered to the soldering tip is proportional to the voltage used, squared.
+This is why the TS100 performs poorly when run off 12V power supplies.
+
+## Output Control & Regulation
+
+Both soldering irons use a FET to switch the power to the soldering iron tip. This is a P-MOSFET and its controlled via a small transistor circuit, which in turn is controlled via the STM32. The STM32 controls this PWM output proportional to the output from the PID control loop running in the software.
+
+To measure the tip temperature in the iron, the iron has a small op-amp connected across the terminals, this is setup to measure the voltage across the same terminals that are used the power the tip. In order to be able to read the small voltage generated by the thermocouple junction, the irons output must be turned off.
+Once the output is turned off (via the FET), the system has a recovery time as the tip capacitance discharges and the op-amp exits saturation. After this delay period, the STM32 ADC samples the output of the op-amp 8 times quickly and then sets a flag to turn the PWM output back on.
+This enforces a small dead time in the output signal while this occurs, so there is a balance between sampling the temperature often to maintain stable tip temperature control and sampling less often to increase the maximum power deliverable to the tip
--- a/start_dev.sh
+++ b/start_dev.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker-compose run --rm builder
--- a/workspace/RemoteSystemsTempFiles/.project
+++ b/workspace/RemoteSystemsTempFiles/.project
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>RemoteSystemsTempFiles</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.rse.ui.remoteSystemsTempNature</nature>
-	</natures>
-</projectDescription>
--- a/workspace/TS100/..cproject.swp
+++ b/workspace/TS100/..cproject.swp
--- a/workspace/TS100/.cproject
+++ b/workspace/TS100/.cproject
@@ -1,146 +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="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<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.GLDErrorParser" 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.debug" cleanCommand="rm -rf" description="" id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998" name="Debug" parent="fr.ac6.managedbuild.config.gnu.cross.exe.debug" postannouncebuildStep="Generating binary and Printing size information:" postbuildStep="arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.bin&quot;; arm-none-eabi-size &quot;${BuildArtifactFileName}&quot;;arm-none-eabi-objcopy -O ihex &quot;${BuildArtifactFileBaseName}.elf&quot; &quot;${BuildArtifactFileBaseName}.hex&quot;">
-					<folderInfo id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998." name="/" resourcePath="">
-						<toolChain id="fr.ac6.managedbuild.toolchain.gnu.cross.exe.debug.35243712" name="Ac6 STM32 MCU GCC" superClass="fr.ac6.managedbuild.toolchain.gnu.cross.exe.debug">
-							<option id="fr.ac6.managedbuild.option.gnu.cross.mcu.2131093113" name="Mcu" superClass="fr.ac6.managedbuild.option.gnu.cross.mcu" useByScannerDiscovery="false" value="STM32F103T8Ux" valueType="string"/>
-							<option id="fr.ac6.managedbuild.option.gnu.cross.board.1847707232" name="Board" superClass="fr.ac6.managedbuild.option.gnu.cross.board" useByScannerDiscovery="false" value="ts100" valueType="string"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="fr.ac6.managedbuild.targetPlatform.gnu.cross.317155453" isAbstract="false" osList="all" superClass="fr.ac6.managedbuild.targetPlatform.gnu.cross"/>
-							<builder buildPath="${workspace_loc:/TS100}/Debug" id="fr.ac6.managedbuild.builder.gnu.cross.910934658" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="fr.ac6.managedbuild.builder.gnu.cross"/>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.319926124" name="MCU GCC Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler">
-								<option id="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level.1178790692" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.c.optimization.level.size" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.debugging.level.1214895662" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.include.paths.1766485383" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/core&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/device&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc/Legacy&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3&quot;"/>
-								</option>
-								<option id="gnu.c.compiler.option.preprocessor.def.symbols.2127531885" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="STM32F103T8Ux"/>
-									<listOptionValue builtIn="false" value="MODEL_TS100"/>
-									<listOptionValue builtIn="false" value="STM32F1"/>
-									<listOptionValue builtIn="false" value="STM32"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
-								</option>
-								<option id="gnu.c.compiler.option.dialect.std.565083189" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
-								<option id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata.338139343" name="Place the data in their own section (-fdata-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.176392389" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s.893418158" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.s"/>
-							</tool>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.1941847243" name="MCU G++ Compiler" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler">
-								<option id="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level.1283353237" name="Optimization Level" superClass="fr.ac6.managedbuild.gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="fr.ac6.managedbuild.gnu.cpp.optimization.level.size" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.debugging.level.224874042" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.include.paths.1749257477" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/core&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/device&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc/Legacy&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3&quot;"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.preprocessor.def.766879664" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="STM32F103T8Ux"/>
-									<listOptionValue builtIn="false" value="MODEL_TS100"/>
-									<listOptionValue builtIn="false" value="STM32F1"/>
-									<listOptionValue builtIn="false" value="STM32"/>
-									<listOptionValue builtIn="false" value="DEBUG"/>
-									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
-									<listOptionValue builtIn="false" value="STM32F103xB"/>
-									<listOptionValue builtIn="false" value="USE_RTOS_SYSTICK"/>
-								</option>
-								<option id="gnu.cpp.compiler.option.dialect.std.1681974405" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" useByScannerDiscovery="true" value="gnu.cpp.compiler.dialect.default" valueType="enumerated"/>
-								<option id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata.1463726438" name="Place the data in their own section (-fdata-sections)" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.fdata" useByScannerDiscovery="false" value="true" valueType="boolean"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp.149685854" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s.1092052043" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.s"/>
-							</tool>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.c.linker.529125565" name="MCU GCC Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.c.linker"/>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker.617418615" name="MCU G++ Linker" superClass="fr.ac6.managedbuild.tool.gnu.cross.cpp.linker">
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.602897981" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="fr.ac6.managedbuild.tool.gnu.archiver.1863989965" name="MCU GCC Archiver" superClass="fr.ac6.managedbuild.tool.gnu.archiver"/>
-							<tool id="fr.ac6.managedbuild.tool.gnu.cross.assembler.2093484706" name="MCU GCC Assembler" superClass="fr.ac6.managedbuild.tool.gnu.cross.assembler">
-								<option id="gnu.both.asm.option.include.paths.1148882090" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/core&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/CMSIS/device&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc/Legacy&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/HAL_Driver/Inc&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2116244351" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-								<inputType id="fr.ac6.managedbuild.tool.gnu.cross.assembler.input.1096324633" superClass="fr.ac6.managedbuild.tool.gnu.cross.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-					<fileInfo id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998.1352310611" name="LIS2DH12.hpp" rcbsApplicability="disable" resourcePath="inc/LIS2DH12.hpp" toolsToInvoke=""/>
-					<sourceEntries>
-						<entry excluding="Src/stm32f1xx_hal_timebase_tim_template.c|Src/stm32f1xx_hal_timebase_rtc_wakeup_template.c|Src/stm32f1xx_hal_timebase_rtc_alarm_template.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="HAL_Driver"/>
-						<entry excluding="Third_Party/FreeRTOS/Source/portable/MemMang/heap_1.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_2.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_3.c|Third_Party/FreeRTOS/Source/portable/MemMang/heap_5.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="inc"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="startup"/>
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="TS100.fr.ac6.managedbuild.target.gnu.cross.exe.1768512215" name="Executable" projectType="fr.ac6.managedbuild.target.gnu.cross.exe"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="fr.ac6.managedbuild.config.gnu.cross.exe.release.723264573;fr.ac6.managedbuild.config.gnu.cross.exe.release.723264573.;fr.ac6.managedbuild.tool.gnu.cross.c.compiler.1363306495;fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.747173367">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998;fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998.;fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.1941847243;fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp.149685854">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998;fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998.;fr.ac6.managedbuild.tool.gnu.cross.c.compiler.319926124;fr.ac6.managedbuild.tool.gnu.cross.c.compiler.input.c.176392389">
-			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="fr.ac6.managedbuild.config.gnu.cross.exe.release.723264573;fr.ac6.managedbuild.config.gnu.cross.exe.release.723264573.;fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.1414722294;fr.ac6.managedbuild.tool.gnu.cross.cpp.compiler.input.cpp.688034595">
-			<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="Debug">
-			<resource resourceType="PROJECT" workspacePath="/TS100"/>
-		</configuration>
-		<configuration configurationName="Release">
-			<resource resourceType="PROJECT" workspacePath="/TS100"/>
-		</configuration>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-</cproject>
--- a/workspace/TS100/.gitignore
+++ b/workspace/TS100/.gitignore
@@ -1,5 +0,0 @@
-/Debug/
-/Release/
-/Hexfile/
-/Objects/
-
--- a/workspace/TS100/.mxproject
+++ b/workspace/TS100/.mxproject
--- a/workspace/TS100/.project
+++ b/workspace/TS100/.project
@@ -19,10 +19,13 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
 		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-		<nature>fr.ac6.mcu.ide.core.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
 	</natures>
 </projectDescription>
--- a/workspace/TS100/.settings/language.settings.xml
+++ b/workspace/TS100/.settings/language.settings.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<configuration id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998" name="Debug">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-283880394950776525" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-		</extension>
-	</configuration>
-</project>
--- a/workspace/TS100/.settings/org.eclipse.cdt.codan.core.prefs
+++ b/workspace/TS100/.settings/org.eclipse.cdt.codan.core.prefs
@@ -1,73 +0,0 @@
-eclipse.preferences.version=1
-fr.ac6.mcu.ide.source.checker.libnano.problem=Error
-fr.ac6.mcu.ide.source.checker.libnano.problem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Float formatting support\\")"}
-org.eclipse.cdt.codan.checkers.errnoreturn=Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return\\")",implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused return value\\")"}
-org.eclipse.cdt.codan.checkers.nocommentinside=-Error
-org.eclipse.cdt.codan.checkers.nocommentinside.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Nesting comments\\")"}
-org.eclipse.cdt.codan.checkers.nolinecomment=-Error
-org.eclipse.cdt.codan.checkers.nolinecomment.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Line comments\\")"}
-org.eclipse.cdt.codan.checkers.noreturn=Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return value\\")",implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Abstract class cannot be instantiated\\")"}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Ambiguous problem\\")"}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment in condition\\")"}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment to itself\\")"}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No break at end of case\\")",no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Catching by reference is recommended\\")",unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Circular inheritance\\")"}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class members should be properly initialized\\")",skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Field cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Function cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid arguments\\")"}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid template argument\\")"}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Label statement not found\\")"}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Member declaration not found\\")"}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Method cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Name convention for function\\")",pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class has a virtual method and non-virtual destructor\\")"}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid overload\\")"}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redeclaration\\")"}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redefinition\\")"}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Return with parenthesis\\")"}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Format String Vulnerability\\")"}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Statement has no effect\\")",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suggested parenthesis around expression\\")",paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suspicious semicolon\\")",else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Type cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused function declaration\\")",macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused static function\\")",macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused variable declaration in file scope\\")",macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Symbol is not resolved\\")"}
--- a/workspace/TS100/.settings/org.eclipse.core.resources.prefs
+++ b/workspace/TS100/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
--- a/workspace/TS100/.vscode/c_cpp_properties.json
+++ b/workspace/TS100/.vscode/c_cpp_properties.json
@@ -1,66 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Mac",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceFolder}"
-            ],
-            "defines": ["STM32F103T8Ux","STM32F1","STM32","USE_HAL_DRIVER","STM32F103xB","USE_RTOS_SYSTICK"],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceFolder}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "macFrameworkPath": [
-                "/System/Library/Frameworks",
-                "/Library/Frameworks"
-            ]
-        },
-        {
-            "name": "STM32",
-            "includePath": [
-                "${workspaceFolder}",
-                "/usr/include/c++/5",
-                "/usr/include/x86_64-linux-gnu/c++/5",
-                "/usr/include/c++/5/backward",
-                "/usr/lib/llvm-5.0/lib/clang/5.0.0/include",
-                "/usr/local/include",
-                "/usr/include/x86_64-linux-gnu",
-                "/usr/include",
-                "${workspaceFolder}/inc",
-                "${workspaceFolder}/HAL_Driver/Inc",
-                "${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
-                "${workspaceFolder}/CMSIS/device",
-                "${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/include",
-                "${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3"
-            ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "${workspaceFolder}",
-                    "/usr/include/c++/5",
-                    "/usr/include/x86_64-linux-gnu/c++/5",
-                    "/usr/include/c++/5/backward",
-                    "/usr/lib/llvm-5.0/lib/clang/5.0.0/include",
-                    "/usr/local/include",
-                    "/usr/include/x86_64-linux-gnu",
-                    "/usr/include"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "compilerPath": "/usr/bin/clang++-5.0",
-            "cStandard": "c11",
-            "cppStandard": "c++17"
-        }
-    ],
-    "version": 3
-}
--- a/workspace/TS100/CMSIS/device/stm32f100xb.h
+++ b/workspace/TS100/CMSIS/device/stm32f100xb.h
--- a/workspace/TS100/CMSIS/device/stm32f100xe.h
+++ b/workspace/TS100/CMSIS/device/stm32f100xe.h
--- a/workspace/TS100/CMSIS/device/stm32f101x6.h
+++ b/workspace/TS100/CMSIS/device/stm32f101x6.h
--- a/workspace/TS100/CMSIS/device/stm32f101xb.h
+++ b/workspace/TS100/CMSIS/device/stm32f101xb.h
--- a/workspace/TS100/CMSIS/device/stm32f101xe.h
+++ b/workspace/TS100/CMSIS/device/stm32f101xe.h
--- a/workspace/TS100/CMSIS/device/stm32f101xg.h
+++ b/workspace/TS100/CMSIS/device/stm32f101xg.h
--- a/workspace/TS100/CMSIS/device/stm32f102x6.h
+++ b/workspace/TS100/CMSIS/device/stm32f102x6.h
--- a/workspace/TS100/CMSIS/device/stm32f102xb.h
+++ b/workspace/TS100/CMSIS/device/stm32f102xb.h
--- a/workspace/TS100/CMSIS/device/stm32f103x6.h
+++ b/workspace/TS100/CMSIS/device/stm32f103x6.h
--- a/workspace/TS100/CMSIS/device/stm32f103xe.h
+++ b/workspace/TS100/CMSIS/device/stm32f103xe.h
--- a/workspace/TS100/CMSIS/device/stm32f103xg.h
+++ b/workspace/TS100/CMSIS/device/stm32f103xg.h
--- a/workspace/TS100/CMSIS/device/stm32f105xc.h
+++ b/workspace/TS100/CMSIS/device/stm32f105xc.h
--- a/workspace/TS100/CMSIS/device/stm32f107xc.h
+++ b/workspace/TS100/CMSIS/device/stm32f107xc.h
--- a/workspace/TS100/Core/Inc/FRToSI2C.hpp
+++ b/workspace/TS100/Core/Inc/FRToSI2C.hpp
@@ -13,18 +13,20 @@
 class FRToSI2C {
 public:

-	static void init(I2C_HandleTypeDef *i2chandle) {i2c=i2chandle;
-		I2CSemaphore=nullptr;}
+	static void init(I2C_HandleTypeDef *i2chandle) {
+		i2c = i2chandle;
+		I2CSemaphore = nullptr;
+	}

 	static void FRToSInit() {
-		I2CSemaphore = xSemaphoreCreateBinary();
+		I2CSemaphore = xSemaphoreCreateBinaryStatic(&xSemaphoreBuffer);
 		xSemaphoreGive(I2CSemaphore);
 	}

 	static void CpltCallback(); //Normal Tx Callback

-	static void Mem_Read(uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize,
-			uint8_t *pData, uint16_t Size);
+	static void Mem_Read(uint16_t DevAddress, uint16_t MemAddress,
+			uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
 	static void Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
 			uint16_t MemAddSize, uint8_t *pData, uint16_t Size);

@@ -36,6 +38,7 @@ private:
 	static I2C_HandleTypeDef *i2c;
 	static void I2C1_ClearBusyFlagErratum();
 	static SemaphoreHandle_t I2CSemaphore;
+	static StaticSemaphore_t xSemaphoreBuffer;
 };

 #endif /* FRTOSI2C_HPP_ */
--- a/workspace/TS100/Core/Inc/Font.h
+++ b/workspace/TS100/Core/Inc/Font.h
@@ -0,0 +1,192 @@
+/*
+ * Font.h
+ *
+ *  Created on: 17 Sep 2016
+ *      Author: Ralim
+ *
+ *      ... This file contains the font...
+ */
+
+#ifndef FONT_H_
+#define FONT_H_
+#include "Translation.h"
+
+#define FONT_12_WIDTH   12
+// FONTS ARE NO LONGER HERE, MOVED TO PYTHON AUTO GEN
+
+
+const uint8_t ExtraFontChars[] = {
+		//width = 12
+		//height = 16
+		0x00,0x18,0x24,0x24,0x18,0xC0,0x40,0x40,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x02,0x02,0x02,0x00,0x00,0x00, // Degrees F
+		0x00,0x18,0x24,0x24,0x18,0x80,0x40,0x20,0x20,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x08,0x10,0x10,0x10,0x00,0x00, // Degrees C
+		0x00,0x00,0x20,0x30,0x38,0xFC,0xFE,0xFC,0x38,0x30,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x7F,0x7F,0x7F,0x00,0x00,0x00,0x00, // UP arrow
+
+		0x00,0xF0,0x08,0x0E,0x02,0x02,0x02,0x02,0x0E,0x08,0xF0,0x00,0x00,0x3F,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x3F,0x00, // Battery Empty
+		0x00,0xF0,0x08,0x0E,0x02,0x02,0x02,0x02,0x0E,0x08,0xF0,0x00,0x00,0x3F,0x40,0x50,0x50,0x50,0x50,0x50,0x50,0x40,0x3F,0x00, // Battery 1*/
+		0x00,0xF0,0x08,0x0E,0x02,0x02,0x02,0x02,0x0E,0x08,0xF0,0x00,0x00,0x3F,0x40,0x58,0x58,0x58,0x58,0x58,0x58,0x40,0x3F,0x00, // Battery 2*/
+		0x00,0xF0,0x08,0x0E,0x02,0x02,0x02,0x02,0x0E,0x08,0xF0,0x00,0x00,0x3F,0x40,0x5C,0x5C,0x5C,0x5C,0x5C,0x5C,0x40,0x3F,0x00, // Battery 3*/
+		0x00,0xF0,0x08,0x0E,0x02,0x02,0x02,0x02,0x0E,0x08,0xF0,0x00,0x00,0x3F,0x40,0x5E,0x5E,0x5E,0x5E,0x5E,0x5E,0x40,0x3F,0x00, // Battery 4*/
+		0x00,0xF0,0x08,0x0E,0x02,0x02,0x02,0x02,0x0E,0x08,0xF0,0x00,0x00,0x3F,0x40,0x5F,0x5F,0x5F,0x5F,0x5F,0x5F,0x40,0x3F,0x00, // Battery 5*/
+		0x00,0xF0,0x08,0x8E,0x82,0x82,0x82,0x82,0x8E,0x08,0xF0,0x00,0x00,0x3F,0x40,0x5F,0x5F,0x5F,0x5F,0x5F,0x5F,0x40,0x3F,0x00, // Battery 6*/
+		0x00,0xF0,0x08,0xCE,0xC2,0xC2,0xC2,0xC2,0xCE,0x08,0xF0,0x00,0x00,0x3F,0x40,0x5F,0x5F,0x5F,0x5F,0x5F,0x5F,0x40,0x3F,0x00, // Battery 7*/
+		0x00,0xF0,0x08,0xEE,0xE2,0xE2,0xE2,0xE2,0xEE,0x08,0xF0,0x00,0x00,0x3F,0x40,0x5F,0x5F,0x5F,0x5F,0x5F,0x5F,0x40,0x3F,0x00, // Battery 8*/
+		0x00,0xF0,0x08,0xEE,0xE2,0xF2,0xF2,0xE2,0xEE,0x08,0xF0,0x00,0x00,0x3F,0x40,0x5F,0x5F,0x5F,0x5F,0x5F,0x5F,0x40,0x3F,0x00, // Battery 9*/
+		0x00,0xF0,0x08,0xEE,0xE2,0xFA,0xFA,0xE2,0xEE,0x08,0xF0,0x00,0x00,0x3F,0x40,0x5F,0x5F,0x5F,0x5F,0x5F,0x5F,0x40,0x3F,0x00, // Battery 10*/
+
+		0x00,0x00,0x38,0xC4,0x00,0x38,0xC4,0x00,0x38,0xC4,0x00,0x00,0x00,0x38,0x3A,0x39,0x38,0x3A,0x39,0x38,0x3A,0x39,0x10,0x10, // heating
+		0x00,0x60,0xE0,0xFE,0xE0,0xE0,0xE0,0xE0,0xFE,0xE0,0x60,0x00,0x00,0x00,0x00,0x01,0x03,0xFF,0xFF,0x03,0x01,0x00,0x00,0x00, // AC
+
+		0xFC,0x02,0x02,0x02,0x02,0x02,0x02,0x82,0x62,0x1A,0x02,0xFC,0x3F,0x40,0x42,0x46,0x4C,0x58,0x46,0x41,0x40,0x40,0x40,0x3F, // ☑ (check box on, menu true)
+		0xFC,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0x02,0xFC,0x3F,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x3F, // ☐ (check box off, menu false)
+
+		/*
+		0x00,0x00,0x00,0x80,0x80,0xFE,0xFF,0x83,0x87,0x06,0x00,0x00,0x00,0x00,0x30,0x70,0x60,0x7F,0x3F,0x00,0x00,0x00,0x00,0x00, // Function?
+		0x00,0x70,0xFA,0xDB,0xDB,0xDB,0xDB,0xDB,0xDB,0xFF,0xFE,0x00,0x00,0x00,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x00,0x00, // a_
+		0x00,0x3C,0x7E,0xE7,0xC3,0xC3,0xC3,0xC3,0xE7,0x7E,0x3C,0x00,0x00,0x00,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x00,0x00, // 0_
+		0x55,0x00,0xAA,0x00,0x55,0x00,0xAA,0x00,0x55,0x00,0xAA,0x00,0x55,0x00,0xAA,0x00,0x55,0x00,0xAA,0x00,0x55,0x00,0xAA,0x00, // 25%  block
+		0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55, // 50% pipe
+		0xAA,0xFF,0x55,0xFF,0xAA,0xFF,0x55,0xFF,0xAA,0xFF,0x55,0xFF,0xAA,0xFF,0x55,0xFF,0xAA,0xFF,0x55,0xFF,0xAA,0xFF,0x55,0xFF, // 75% block
+		0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00, // | pipe
+		0x80,0x80,0x80,0x80,0x80,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00, // T pipe ,|
+		0xC0,0xC0,0xFF,0xFF,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x06,0x06,0xFE,0xFE,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00, // ,| double pipe
+		0x00,0x00,0xFF,0xFF,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00, //  || double pipe
+		0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x06,0x06,0xFE,0xFE,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00, // #NAME?//#NAME?
+		0xC0,0xC0,0xFF,0xFF,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x06,0x06,0x06,0x06,0x06,0x07,0x07,0x00,0x00,0x00,0x00,0x00, // ,^ double pupe
+		0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00, // #NAME?//#NAME?
+		0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01, // ,> pipe
+		0x80,0x80,0x80,0x80,0x80,0xFF,0xFF,0x80,0x80,0x80,0x80,0x80,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, // _|_ pipe
+		0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x01,0x01,0x01,0x01,0x01,0xFF,0xFF,0x01,0x01,0x01,0x01,0x01, // ,|, pipe
+		0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x01,0x01,0x01,0x01,0x01, // |, pipe
+		0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, // #NAME?//#NAME?
+		0x80,0x80,0x80,0x80,0x80,0xFF,0xFF,0x80,0x80,0x80,0x80,0x80,0x01,0x01,0x01,0x01,0x01,0xFF,0xFF,0x01,0x01,0x01,0x01,0x01, // #NAME?//#NAME?
+		0x00,0x00,0xFF,0xFF,0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0x00,0x00,0x07,0x07,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06, // ,> double pipe
+		0x00,0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x00,0x00,0xFF,0xFF,0x00,0xFE,0xFE,0x06,0x06,0x06,0x06,0x06, // ^, double pipe
+		0xC0,0xC0,0xFF,0xFF,0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06, // _|_ double pipe
+		0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x06,0x06,0xFE,0xFE,0x00,0xFE,0xFE,0x06,0x06,0x06,0x06,0x06, // ,|, double pipe
+		0x00,0x00,0xFF,0xFF,0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0x00,0x00,0xFF,0xFF,0x00,0xFE,0xFE,0x06,0x06,0x06,0x06,0x06, // |, double pipe
+		0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06, // == double pipe
+		0xC0,0xC0,0xFF,0xFF,0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0x06,0x06,0xFE,0xFE,0x00,0xFE,0xFE,0x06,0x06,0x06,0x06,0x06, // #NAME?//#NAME?
+		0x00,0x00,0x00,0x78,0xFC,0xCC,0x8C,0x0C,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x3E,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00, // Delta lowercase
+		0x00,0x00,0x00,0x00,0x00,0x7E,0x7E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 27 (')
+		0x80,0x80,0x80,0x80,0x80,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00, // ,^ pipe
+		0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x01,0x01,0x01,0x01,0x01, // | , pipe
+		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, // solid block
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, // half block bottom
+		0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00, // 7C (|)
+		0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // top half solid block
+		0x00,0x00,0x0C,0xFC,0xFC,0x6C,0x60,0x60,0xE0,0xC0,0x00,0x00,0x00,0x00,0x30,0x3F,0x3F,0x36,0x06,0x06,0x07,0x03,0x00,0x00, // DE small
+		0x00,0x00,0x03,0xFF,0xFF,0x1B,0x18,0x18,0xF8,0xF0,0x00,0x00,0x00,0x00,0x30,0x3F,0x3F,0x36,0x06,0x06,0x07,0x03,0x00,0x00, // DE large
+		0x00,0x00,0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // ? (,)
+		0x00,0x00,0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x06,0x06,0x06,0x06,0x06,0x00,0x00,0x00, // =
+		0x00,0x00,0x00,0x40,0x80,0x80,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // sideways comma
+		0x00,0x00,0x80,0xC0,0x80,0x00,0x00,0x80,0xC0,0x80,0x00,0x00,0x00,0x00,0x01,0x03,0x01,0x00,0x00,0x01,0x03,0x01,0x00,0x00, // ..
+		0x00,0x00,0x00,0x00,0x00,0x80,0xC0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x01,0x00,0x00,0x00,0x00, // .
+		0x00,0x00,0x02,0x1F,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // tiny 1
+		0x00,0x00,0x00,0x00,0xF0,0xF0,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x03,0x03,0x00,0x00,0x00,0x00, // small block
+		*/
+};
+
+const uint8_t FontSymbols[] = {
+		0x00,0x00,0x00,0xFC,0xF8,0xF0,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x0F,0x07,0x03,0x01,0x00,0x00,0x00,0x00, // Right block
+		0x00,0x00,0x00,0x80,0xC0,0xE0,0xF0,0xF8,0xFC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0F,0x1F,0x00,0x00,0x00, // left block
+		0x00,0x00,0x00,0x10,0x18,0x1C,0xFE,0x1C,0x18,0x10,0x00,0x00,0x00,0x00,0x00,0x04,0x0C,0x1C,0x3F,0x1C,0x0C,0x04,0x00,0x00, // UD arrow
+		0x00,0x00,0x00,0xFE,0xFE,0x00,0x00,0xFE,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x37,0x37,0x00,0x00,0x37,0x37,0x00,0x00,0x00, // !!
+		0x00,0x38,0x7C,0xC6,0x82,0xFE,0xFE,0x02,0xFE,0xFE,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x3F,0x3F,0x00,0x00, // paragraph
+		0x00,0x00,0xDC,0xFE,0x22,0x22,0x22,0x22,0xE6,0xC4,0x00,0x00,0x00,0x00,0x08,0x19,0x11,0x11,0x11,0x11,0x1F,0x0E,0x00,0x00, // section
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x38,0x00, // cursor
+		0x00,0x00,0x00,0x08,0x0C,0x0E,0xFF,0x0E,0x0C,0x08,0x00,0x00,0x00,0x00,0x00,0x44,0x4C,0x5C,0x7F,0x5C,0x4C,0x44,0x00,0x00, // UD arrow
+		0x00,0x00,0x00,0x10,0x18,0x1C,0xFE,0x1C,0x18,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x00,0x00, // UP arrow
+		0x00,0x00,0x00,0x00,0x00,0x00,0xFE,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x0C,0x1C,0x3F,0x1C,0x0C,0x04,0x00,0x00, // Down arrow
+		0x00,0x00,0x80,0x80,0x80,0x80,0x80,0xF0,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x07,0x03,0x01,0x00,0x00, // right arrow
+		0x00,0x00,0x80,0xC0,0xE0,0xF0,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x00,0x00,0x00,0x00,0x00,0x00, // left arrow
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,
+		0x00,0x80,0xC0,0xE0,0xF0,0x80,0x80,0x80,0xF0,0xE0,0xC0,0x80,0x00,0x00,0x01,0x03,0x07,0x00,0x00,0x00,0x07,0x03,0x01,0x00, // LR arrow
+		0x00,0x00,0x00,0x00,0x80,0xC0,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00,0x04,0x06,0x07,0x07,0x07,0x07,0x07,0x07,0x07,0x06,0x04, // UP block
+		0x00,0x20,0x60,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0x60,0x20,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x03,0x01,0x00,0x00,0x00  // Down block
+};
+
+const uint8_t WarningBlock24[] = {
+		//width = 24
+		//height = 16
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0x30,0x0C,0x02,0xF1,0xF1,0xF1,0x02,0x0C,0x30,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0xC0,0xB0,0x8C,0x83,0x80,0x80,0x80,0x80,0xB3,0xB3,0xB3,0x80,0x80,0x80,0x80,0x83,0x8C,0xB0,0xC0,0x00,0x00
+};
+
+const uint8_t idleScreenBG[] = {
+		//width = 84
+		//height = 16
+		0x00,0xE0,0x18,0x04,0x02,0x02,0x01,0x41,0x61,0x61,0x61,0xE1,0xC1,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,
+		0x81,0x81,0x81,0x81,0xC1,0xE1,0x61,0x61,0x61,0x41,0x01,0x01,0x02,0x02,0x04,0x18,0xE0,0x00,0x00,0xE0,0x18,0x04,0x02,0x02,
+		0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
+		0x99,0x65,0x01,0x01,0x81,0x41,0x01,0x02,0x02,0x04,0x18,0xE0,
+		0x00,0x07,0x18,0x20,0x40,0x40,0x80,0x82,0x86,0x86,0x86,0x87,0x83,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,
+		0x81,0x81,0x81,0x81,0x83,0x87,0x86,0x86,0x86,0x82,0x80,0x80,0x40,0x40,0x20,0x18,0x07,0x00,0x00,0x07,0x18,0x20,0x40,0x40,
+		0x80,0x82,0x87,0x85,0x85,0x85,0x85,0x87,0x87,0x85,0x87,0x85,0x87,0x87,0x82,0x82,0x82,0x80,0x82,0x80,0x82,0x82,0x82,0x92,
+		0x8A,0x84,0x82,0x81,0x80,0x80,0x80,0x40,0x40,0x20,0x18,0x07
+};
+
+const uint8_t idleScreenBGF[] = {
+		//width = 84
+		//height = 16
+		0xE0,0x18,0x04,0x02,0x02,0x01,0x41,0x81,0x01,0x01,0x65,0x99,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,
+		0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x02,0x02,0x04,0x18,0xE0,0x00,0x00,0xE0,0x18,0x04,0x02,0x02,
+		0x01,0x01,0x41,0x61,0x61,0x61,0xE1,0xC1,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0xC1,
+		0xE1,0x61,0x61,0x61,0x41,0x01,0x02,0x02,0x04,0x18,0xE0,0x00,
+		0x07,0x18,0x20,0x40,0x40,0x80,0x80,0x80,0x81,0x82,0x84,0x8A,0x92,0x82,0x82,0x82,0x80,0x82,0x80,0x82,0x82,0x82,0x87,0x87,
+		0x85,0x87,0x85,0x87,0x87,0x85,0x85,0x85,0x85,0x87,0x82,0x80,0x40,0x40,0x20,0x18,0x07,0x00,0x00,0x07,0x18,0x20,0x40,0x40,
+		0x80,0x80,0x82,0x86,0x86,0x86,0x87,0x83,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x83,
+		0x87,0x86,0x86,0x86,0x82,0x80,0x40,0x40,0x20,0x18,0x07,0x00
+};
+
+/*
+ * 16x16 icons
+ * */
+const uint8_t SettingsMenuIcons[] = {
+
+	// Soldering
+	//width = 16
+	//height = 16
+		0x00, 0x02, 0x04, 0x08, 0x12, 0x24, 0xC4, 0x42, 0x82, 0x04,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x01, 0x02, 0x07, 0x0A, 0x14, 0x28, 0x50,
+		0x60, 0x00,
+
+
+
+	//Sleep
+	//width = 16
+	//height = 16
+	0x00, 0xC6, 0xE6, 0xF6, 0xBE, 0x9E, 0x8E, 0x86, 0x00, 0x00,
+	0x40, 0x40, 0xC0, 0xC0, 0xC0, 0x00, 0x00, 0x01, 0x01, 0x01,
+	0x45, 0x65, 0x75, 0x5D, 0x4C, 0x00, 0x06, 0x07, 0x07, 0x05,
+	0x04, 0x00,
+
+
+
+	//Menu
+	//width = 16
+	//height = 16
+	0x00,0x80,0x06,0x86,0x46,0x06,0x86,0x86,0x86,0x86,0x86,0x86,0x86,0x86,0x86,0x00,
+	0x00,0x00,0x61,0x60,0x00,0x00,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x61,0x00,
+
+	//Wrench
+	///width = 16
+	//height = 16
+	0x00, 0x18, 0x30, 0x32, 0x7E, 0x7C, 0xF0, 0xC0, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0x03, 0x0F, 0x3E, 0x7E, 0x4C, 0x0C,
+	0x18, 0x00,
+	#ifdef NOTUSED
+	//Calibration (Not used, kept for future menu layouts)
+		//width = 16
+		//height = 16
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC0, 0xE8, 0x70,
+	0x7A, 0x5E, 0x8E, 0x1C, 0x30, 0x00, 0x00, 0x10, 0x38, 0x1C,
+	0x0E, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00,
+	#endif
+};
+
+
+#endif /* FONT_H_ */
--- a/workspace/TS100/Core/Inc/FreeRTOSConfig.h
+++ b/workspace/TS100/Core/Inc/FreeRTOSConfig.h
@@ -93,9 +93,9 @@
 #endif

 #define configUSE_PREEMPTION                     1
-#define configSUPPORT_STATIC_ALLOCATION          0
-#define configSUPPORT_DYNAMIC_ALLOCATION         1
-#define configUSE_IDLE_HOOK                      0
+#define configSUPPORT_STATIC_ALLOCATION          1
+#define configSUPPORT_DYNAMIC_ALLOCATION         0
+#define configUSE_IDLE_HOOK                      1
 #define configUSE_TICK_HOOK                      0
 #define configCPU_CLOCK_HZ                       ( SystemCoreClock )
 #define configTICK_RATE_HZ                       ((TickType_t)100)
--- a/workspace/TS100/Core/Inc/LIS2DH12.hpp
+++ b/workspace/TS100/Core/Inc/LIS2DH12.hpp
@@ -19,22 +19,22 @@ public:
 	static Orientation getOrientation() {
 #ifdef MODEL_TS80
 		uint8_t val = (FRToSI2C::I2C_RegisterRead(LIS2DH_I2C_ADDRESS,
-				LIS_INT2_SRC) >> 2);
+		LIS_INT2_SRC) >> 2);
 		if (val == 8)
 			val = 3;
-		else if (val==1)
-			val=0;
-		else if(val==2)
-			val=1;
+		else if (val == 1)
+			val = 1;
+		else if (val == 2)
+			val = 0;
 		else
-			val=3;
+			val = 3;
 		return static_cast<Orientation>(val);
 #endif
 #ifdef MODEL_TS100
 		return static_cast<Orientation>((FRToSI2C::I2C_RegisterRead(LIS2DH_I2C_ADDRESS,LIS_INT2_SRC) >> 2) - 1);
 #endif
 	}
-	static void getAxisReadings(int16_t *x, int16_t *y, int16_t *z);
+	static void getAxisReadings(int16_t& x, int16_t& y, int16_t& z);

 private:
 };
--- a/workspace/TS100/Core/Inc/LIS2DH12_defines.hpp
+++ b/workspace/TS100/Core/Inc/LIS2DH12_defines.hpp
--- a/workspace/TS100/Core/Inc/MMA8652FC.hpp
+++ b/workspace/TS100/Core/Inc/MMA8652FC.hpp
@@ -19,7 +19,7 @@ public:

 	static void initalize();		// Initalize the system
 	static Orientation getOrientation();// Reads the I2C register and returns the orientation (true == left)
-	static void getAxisReadings(int16_t *x, int16_t *y, int16_t *z);
+	static void getAxisReadings(int16_t& x, int16_t& y, int16_t& z);

 private:
 };
--- a/workspace/TS100/Core/Inc/MMA8652FC_defines.h
+++ b/workspace/TS100/Core/Inc/MMA8652FC_defines.h
--- a/workspace/TS100/Core/Inc/OLED.hpp
+++ b/workspace/TS100/Core/Inc/OLED.hpp
@@ -1,109 +1,115 @@
-/*
- * OLED.hpp
- *
- *  Created on: 20Jan.,2017
- *      Author: Ben V. Brown <Ralim>
- *      Designed for the SSD1307
- *      Cleared for release for TS100 2017/08/20
- */
-
-#ifndef OLED_HPP_
-#define OLED_HPP_
-#include <hardware.h>
-#include "stm32f1xx_hal.h"
-#include <stdbool.h>
-#include <string.h>
-#include "FRToSI2C.hpp"
-#include "Font.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "FreeRTOS.h"
-#ifdef __cplusplus
-}
-#endif
-#define DEVICEADDR_OLED   (0x3c<<1)
-#define OLED_WIDTH        96
-#define FRAMEBUFFER_START 17
-
-class OLED {
-public:
-	static void initialize(); // Startup the I2C coms (brings screen out of reset etc)
-
-	// Draw the buffer out to the LCD using the DMA Channel
-	static void refresh() {
-		FRToSI2C::Transmit( DEVICEADDR_OLED, screenBuffer,
-				FRAMEBUFFER_START + (OLED_WIDTH * 2));
-		//DMA tx time is ~ 20mS Ensure after calling this you delay for at least 25ms
-		//or we need to goto double buffering
-	}
-
-	static void drawChar(char c, char preCursorCommand = '\0'); // Draw a character to a specific location
-	// Turn the screen on or not
-	static void displayOnOff(bool on) {
-		displayOnOffState = on;
-		screenBuffer[1] = on ? 0xAF : 0xAE;
-	}
-	static void setRotation(bool leftHanded); // Set the rotation for the screen
-	// Get the current rotation of the LCD
-	static bool getRotation()  {
-		return inLeftHandedMode;
-	}
-	static int16_t getCursorX() {
-		return cursor_x;
-	}
-	static void print(const char* string);// Draw a string to the current location, with current font
-	// Set the cursor location by pixels
-	static void setCursor(int16_t x, int16_t y) {
-		cursor_x = x;
-		cursor_y = y;
-	}
-	//Set cursor location by chars in current font
-	static void setCharCursor(int16_t x, int16_t y) {
-		cursor_x = x * fontWidth;
-		cursor_y = y * fontHeight;
-	}
-	static void setFont(uint8_t fontNumber); // (Future) Set the font that is being used
-	static void drawImage(const uint8_t* buffer, uint8_t x, uint8_t width) {
-		drawArea(x, 0, width, 16, buffer);
-	}
-	// Draws an image to the buffer, at x offset from top to bottom (fixed height renders)
-	static void printNumber(uint16_t number, uint8_t places);
-	// Draws a number at the current cursor location
-	// Clears the buffer
-	static void clearScreen() {
-		memset(&screenBuffer[FRAMEBUFFER_START], 0, OLED_WIDTH * 2);
-	}
-	// Draws the battery level symbol
-	static void drawBattery(uint8_t state) {
-		drawSymbol(3 + (state > 10 ? 10 : state));
-	}
-	// Draws a checkbox
-	static void drawCheckbox(bool state) {
-		drawSymbol((state) ? 16 : 17);
-	}
-	static void debugNumber(int32_t val);
-	static void drawSymbol(uint8_t symbolID);//Used for drawing symbols of a predictable width
-	static void drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
-			const uint8_t* ptr); //Draw an area, but y must be aligned on 0/8 offset
-	static void fillArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
-			const uint8_t value); //Fill an area, but y must be aligned on 0/8 offset
-	static void drawFilledRect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1,
-			bool clear);
-	static void drawHeatSymbol(uint8_t state);
-private:
-
-	//Draw a buffer to the screen buffer
-
-	static const uint8_t* currentFont;// Pointer to the current font used for rendering to the buffer
-	static uint8_t* firstStripPtr; // Pointers to the strips to allow for buffer having extra content
-	static uint8_t* secondStripPtr;	//Pointers to the strips
-	static bool inLeftHandedMode; // Whether the screen is in left or not (used for offsets in GRAM)
-	static bool displayOnOffState;				// If the display is on or not
-	static uint8_t fontWidth, fontHeight;
-	static int16_t cursor_x, cursor_y;
-	static uint8_t displayOffset;
-	static uint8_t screenBuffer[16 + (OLED_WIDTH * 2) + 10];  // The data buffer
-};
-
-#endif /* OLED_HPP_ */
+/*
+ * OLED.hpp
+ *
+ *  Created on: 20Jan.,2017
+ *      Author: Ben V. Brown <Ralim>
+ *      Designed for the SSD1307
+ *      Cleared for release for TS100 2017/08/20
+ */
+
+#ifndef OLED_HPP_
+#define OLED_HPP_
+#include <hardware.h>
+#include "stm32f1xx_hal.h"
+#include <stdbool.h>
+#include <string.h>
+#include "FRToSI2C.hpp"
+#include "Font.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "FreeRTOS.h"
+#ifdef __cplusplus
+}
+#endif
+#define DEVICEADDR_OLED   (0x3c<<1)
+#define OLED_WIDTH        96
+#define FRAMEBUFFER_START 17
+
+class OLED {	
+public:
+
+	enum DisplayState : bool {
+		OFF = false,
+		ON  = true
+	};
+
+	static void initialize(); // Startup the I2C coms (brings screen out of reset etc)
+
+	// Draw the buffer out to the LCD using the DMA Channel
+	static void refresh() {
+		FRToSI2C::Transmit( DEVICEADDR_OLED, screenBuffer,
+				FRAMEBUFFER_START + (OLED_WIDTH * 2));
+		//DMA tx time is ~ 20mS Ensure after calling this you delay for at least 25ms
+		//or we need to goto double buffering
+	}
+
+	static void setDisplayState(DisplayState state) {
+		displayState = state;
+		screenBuffer[1] = (state == ON) ? 0xAF : 0xAE;
+	}
+	
+	static void setRotation(bool leftHanded); // Set the rotation for the screen
+	// Get the current rotation of the LCD
+	static bool getRotation()  {
+		return inLeftHandedMode;
+	}
+	static int16_t getCursorX() {
+		return cursor_x;
+	}
+	static void print(const char* string);// Draw a string to the current location, with current font
+	// Set the cursor location by pixels
+	static void setCursor(int16_t x, int16_t y) {
+		cursor_x = x;
+		cursor_y = y;
+	}
+	//Set cursor location by chars in current font
+	static void setCharCursor(int16_t x, int16_t y) {
+		cursor_x = x * fontWidth;
+		cursor_y = y * fontHeight;
+	}
+	static void setFont(uint8_t fontNumber); // (Future) Set the font that is being used
+	static uint8_t getFont();
+	static void drawImage(const uint8_t* buffer, uint8_t x, uint8_t width) {
+		drawArea(x, 0, width, 16, buffer);
+	}
+	// Draws an image to the buffer, at x offset from top to bottom (fixed height renders)
+	static void printNumber(uint16_t number, uint8_t places,bool noLeaderZeros=true);
+	// Draws a number at the current cursor location
+	// Clears the buffer
+	static void clearScreen() {
+		memset(&screenBuffer[FRAMEBUFFER_START], 0, OLED_WIDTH * 2);
+	}
+	// Draws the battery level symbol
+	static void drawBattery(uint8_t state) {
+		drawSymbol(3 + (state > 10 ? 10 : state));
+	}
+	// Draws a checkbox
+	static void drawCheckbox(bool state) {
+		drawSymbol((state) ? 16 : 17);
+	}
+	static void debugNumber(int32_t val);
+	static void drawSymbol(uint8_t symbolID);//Used for drawing symbols of a predictable width
+	static void drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
+			const uint8_t* ptr); //Draw an area, but y must be aligned on 0/8 offset
+	static void drawAreaSwapped(int16_t x, int8_t y, uint8_t wide, uint8_t height,
+			const uint8_t* ptr); //Draw an area, but y must be aligned on 0/8 offset
+	static void fillArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
+			const uint8_t value); //Fill an area, but y must be aligned on 0/8 offset
+	static void drawFilledRect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1,
+			bool clear);
+	static void drawHeatSymbol(uint8_t state);
+private:
+	static void drawChar(char c); // Draw a character to a specific location
+	static const uint8_t* currentFont;// Pointer to the current font used for rendering to the buffer
+	static uint8_t* firstStripPtr; // Pointers to the strips to allow for buffer having extra content
+	static uint8_t* secondStripPtr;	//Pointers to the strips
+	static bool inLeftHandedMode; // Whether the screen is in left or not (used for offsets in GRAM)
+	static DisplayState displayState;
+	static uint8_t fontWidth, fontHeight;
+	static int16_t cursor_x, cursor_y;
+	static uint8_t displayOffset;
+	static uint8_t screenBuffer[16 + (OLED_WIDTH * 2) + 10];  // The data buffer
+};
+
+#endif /* OLED_HPP_ */
--- a/workspace/TS100/Core/Inc/Settings.h
+++ b/workspace/TS100/Core/Inc/Settings.h
@@ -11,8 +11,9 @@
 #define SETTINGS_H_
 #include <stdint.h>
 #include "stm32f1xx_hal.h"
-#define SETTINGSVERSION                                                       \
-  0x18 /*Change this if you change the struct below to prevent people getting \
+#include "unit.h"
+#define SETTINGSVERSION   ( 0x1E )
+/*Change this if you change the struct below to prevent people getting \
          out of sync*/

 /*
@@ -23,7 +24,7 @@ typedef struct {
 	uint16_t SolderingTemp;  // current set point for the iron
 	uint16_t SleepTemp;      // temp to drop to in sleep
 	uint8_t SleepTime;       // minutes timeout to sleep
-	uint8_t cutoutSetting;   // The voltage we cut out at for under voltage OR Power level for TS80
+	uint8_t cutoutSetting; // The voltage we cut out at for under voltage OR Power level for TS80
 	uint8_t OrientationMode :2; // If true we want to invert the display for lefties
 	uint8_t sensitivity :4;  // Sensitivity of accelerometer (5 bits)
 	uint8_t autoStartMode :2;  // Should the unit automatically jump straight
@@ -35,27 +36,33 @@ typedef struct {
 								  // down screen until its <50C
 	uint8_t detailedIDLE :1;       // Detailed idle screen
 	uint8_t detailedSoldering :1;  // Detailed soldering screens
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 	uint8_t temperatureInF;         // Should the temp be in F or C (true is F)
+#endif
 	uint8_t descriptionScrollSpeed :1;  // Description scroll speed
 	uint16_t voltageDiv;                 // Voltage divisor factor
 	uint16_t BoostTemp;                  // Boost mode set point for the iron
-	int16_t CalibrationOffset; // This stores the temperature offset for this tip
-							   // in the iron.
-	uint8_t PID_P;    // PID P Term
-	uint8_t PID_I;    // PID I Term
-	uint8_t PID_D;    // PID D Term
+	uint16_t CalibrationOffset; // This stores the temperature offset for this tip
+								// in the iron.
+
+	uint8_t pidPowerLimit;
+
+	uint8_t powerLimitEnable; // Allow toggling of power limit without changing value
+	uint8_t powerLimit;       // Maximum power iron allowed to output
+
 	uint8_t version;  // Used to track if a reset is needed on firmware upgrade
-	uint8_t customTipGain;  // Tip gain value if custom tuned, or 0 if using a
-							// tipType param
-	uint8_t tipType;
 	uint32_t padding;  // This is here for in case we are not an even divisor so
 					   // that nothing gets cut off
+  uint8_t ReverseButtonTempChangeEnabled;   // Change the plus and minus button assigment
+  uint16_t TempChangeLongStep;              // Change the plus and minus button assigment
+  uint16_t TempChangeShortStep;             // Change the plus and minus button assigment
+
 } systemSettingsType;

 extern volatile systemSettingsType systemSettings;

 void saveSettings();
-void restoreSettings();
+bool restoreSettings();
 uint8_t lookupVoltageLevel(uint8_t level);
 void resetSettings();
 bool showBootLogoIfavailable();
--- a/workspace/TS100/Core/Inc/Setup.h
+++ b/workspace/TS100/Core/Inc/Setup.h
--- a/workspace/TS100/Core/Inc/Translation.h
+++ b/workspace/TS100/Core/Inc/Translation.h
@@ -0,0 +1,80 @@
+/*
+ * Translation.h
+ *
+ *  Created on: 31Aug.,2017
+ *      Author: Ben V. Brown
+ */
+
+#ifndef TRANSLATION_H_
+#define TRANSLATION_H_
+#include "stm32f1xx_hal.h"
+#include "unit.h"
+enum ShortNameType {
+	SHORT_NAME_SINGLE_LINE = 1, SHORT_NAME_DOUBLE_LINE = 2,
+};
+extern const uint8_t USER_FONT_12[];
+extern const uint8_t USER_FONT_6x8[];
+/*
+ * When SettingsShortNameType is SHORT_NAME_SINGLE_LINE
+ * use SettingsShortNames as SettingsShortNames[16][1].. second column undefined
+ */
+extern const enum ShortNameType SettingsShortNameType;
+extern const char *SettingsShortNames[26][2];
+extern const char *SettingsDescriptions[26];
+extern const char *SettingsMenuEntries[4];
+
+extern const char *SettingsCalibrationDone;
+extern const char *SettingsCalibrationWarning;
+extern const char *SettingsResetWarning;
+extern const char *UVLOWarningString;
+extern const char *UndervoltageString;
+extern const char *InputVoltageString;
+extern const char *WarningTipTempString;
+extern const char *BadTipString;
+
+extern const char *SleepingSimpleString;
+extern const char *SleepingAdvancedString;
+extern const char *WarningSimpleString;
+extern const char *WarningAdvancedString;
+extern const char *SleepingTipAdvancedString;
+extern const char *IdleTipString;
+extern const char *IdleSetString;
+extern const char *TipDisconnectedString;
+extern const char *SolderingAdvancedPowerPrompt;
+extern const char *OffString;
+extern const char *ResetOKMessage;
+extern const char *YourGainMessage;
+extern const char *SettingsResetMessage;
+
+extern const char *SettingTrueChar;
+extern const char *SettingFalseChar;
+extern const char *SettingRightChar;
+extern const char *SettingLeftChar;
+extern const char *SettingAutoChar;
+extern const char *SettingStartSolderingChar;
+extern const char *SettingStartSleepChar;
+extern const char *SettingStartSleepOffChar;
+extern const char *SettingStartNoneChar;
+
+extern const char *SettingFastChar;
+extern const char *SettingSlowChar;
+extern const char *TipModelStrings[];
+extern const char *DebugMenu[];
+extern const char *SymbolPlus;
+extern const char *SymbolMinus;
+extern const char *SymbolSpace;
+extern const char *SymbolDot;
+extern const char *SymbolDegC;
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
+	extern const char *SymbolDegF;
+#endif
+extern const char *SymbolMinutes;
+extern const char *SymbolSeconds;
+extern const char *SymbolWatts;
+extern const char *SymbolVolts;
+extern const char *SymbolDC;
+extern const char *SymbolCellCount;
+extern const char *SymbolVersionNumber;
+
+extern const char *DebugMenu[];
+#endif /* TRANSLATION_H_ */
--- a/workspace/TS100/Core/Inc/expMovingAverage.h
+++ b/workspace/TS100/Core/Inc/expMovingAverage.h
@@ -0,0 +1,24 @@
+/*
+ * expMovingAverage.h
+ *
+ *  Created on: 8 Oct 2019
+ *      Author: ralim
+ */
+
+#ifndef INC_EXPMOVINGAVERAGE_H_
+#define INC_EXPMOVINGAVERAGE_H_
+
+// max size = 127
+template<class T, uint8_t weighting>
+struct expMovingAverage {
+	int32_t sum;
+	void update(T const val) {
+		sum = ((val * weighting) + (sum * (256 - weighting))) / 256;
+	}
+
+	T average() const {
+		return sum;
+	}
+};
+
+#endif /* INC_EXPMOVINGAVERAGE_H_ */
--- a/workspace/TS100/Core/Inc/gui.hpp
+++ b/workspace/TS100/Core/Inc/gui.hpp
--- a/workspace/TS100/Core/Inc/hardware.h
+++ b/workspace/TS100/Core/Inc/hardware.h
@@ -9,6 +9,11 @@
 #define HARDWARE_H_
 #include "Setup.h"
 #include "stm32f1xx_hal.h"
+#include "FreeRTOS.h"
+#include "stm32f1xx_hal.h"
+#include "cmsis_os.h"
+#include "unit.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -16,7 +21,7 @@ extern "C" {
 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
@@ -106,7 +111,7 @@ enum TipType {
 #endif
 #ifdef MODEL_TS80
 enum TipType {
-	TS_B02 = 0, TS_D25 = 1, Tip_MiniWare = 2, Tip_Custom = 2,
+	TS_B02 = 0, TS_D25 = 1, Tip_MiniWare = 2, Tip_Custom = 3,
 };
 #endif
 extern uint16_t tipGainCalValue ;
@@ -120,7 +125,9 @@ void setTipPWM(uint8_t pulse);
 uint16_t ctoTipMeasurement(uint16_t temp);
 uint16_t tipMeasurementToC(uint16_t raw);
 uint16_t ftoTipMeasurement(uint16_t temp);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
 uint16_t tipMeasurementToF(uint16_t raw);
+#endif
 void seekQC(int16_t Vx10, uint16_t divisor);
 void setCalibrationOffset(int16_t offSet);
 void setTipType(enum TipType tipType, uint8_t manualCalGain);
@@ -131,7 +138,9 @@ void startQC(uint16_t divisor); // Tries to negotiate QC for highest voltage, mu
 // 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
--- a/workspace/TS100/Core/Inc/history.hpp
+++ b/workspace/TS100/Core/Inc/history.hpp
@@ -11,25 +11,25 @@
 #include <stdint.h>

 // max size = 127
-template <class T=uint16_t, uint8_t SIZE=15>
+template<class T, uint8_t SIZE>
 struct history {
-    static const uint8_t size = SIZE;
+	static const uint8_t size = SIZE;
 	T buf[size];
 	int32_t sum;
 	uint8_t loc;

 	void update(T const val) {
 		// step backwards so i+1 is the previous value.
-		loc = (size+loc-1) % size;

 		sum -= buf[loc];
 		sum += val;
 		buf[loc] = val;
+		loc = (loc + 1) % size;
 	}

-	T operator[] (uint8_t i) const {
+	T operator[](uint8_t i) const {
 		// 0 = newest, size-1 = oldest.
-		i = (i+loc) % size;
+		i = (i + loc) % size;
 		return buf[i];
 	}

--- a/workspace/TS100/Core/Inc/main.hpp
+++ b/workspace/TS100/Core/Inc/main.hpp
@@ -5,20 +5,21 @@
 #include "OLED.hpp"
 #include "Setup.h"
 extern uint8_t PCBVersion;
-extern uint32_t currentlyActiveTemperatureTarget;
+extern uint32_t currentTempTargetDegC;
+extern bool settingsWereReset;
 enum ButtonState {
-  BUTTON_NONE = 0,    /* No buttons pressed / < filter time*/
-  BUTTON_F_SHORT = 1, /* User has pressed the front button*/
-  BUTTON_B_SHORT = 2, /* User has pressed the back  button*/
-  BUTTON_F_LONG = 4,  /* User is  holding the front button*/
-  BUTTON_B_LONG = 8,  /* User is  holding the back button*/
-  BUTTON_BOTH = 16,   /* User has pressed both buttons*/
+	BUTTON_NONE = 0, /* No buttons pressed / < filter time*/
+	BUTTON_F_SHORT = 1, /* User has pressed the front button*/
+	BUTTON_B_SHORT = 2, /* User has pressed the back  button*/
+	BUTTON_F_LONG = 4, /* User is  holding the front button*/
+	BUTTON_B_LONG = 8, /* User is  holding the back button*/
+	BUTTON_BOTH = 16, /* User has pressed both buttons*/

-  /*
-   * Note:
-   * Pressed means press + release, we trigger on a full \__/ pulse
-   * holding means it has gone low, and been low for longer than filter time
-   */
+/*
+ * Note:
+ * Pressed means press + release, we trigger on a full \__/ pulse
+ * holding means it has gone low, and been low for longer than filter time
+ */
 };

 ButtonState getButtonState();
@@ -37,7 +38,7 @@ void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
 void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
 void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
 void vApplicationStackOverflowHook(xTaskHandle *pxTask,
-                                   signed portCHAR *pcTaskName);
+		signed portCHAR *pcTaskName);

 #ifdef __cplusplus
 }
--- a/workspace/TS100/Core/Inc/power.hpp
+++ b/workspace/TS100/Core/Inc/power.hpp
@@ -0,0 +1,39 @@
+/*
+ * Power.hpp
+ *
+ *  Created on: 28 Oct, 2018
+ *     Authors: Ben V. Brown, David Hilton (David's Idea)
+ */
+
+#include "stdint.h"
+#include <history.hpp>
+#include "hardware.h"
+#include "expMovingAverage.h"
+#ifndef POWER_HPP_
+#define POWER_HPP_
+
+// thermal mass = 1690 milliJ/*C for my tip.
+//  ->  Wattsx10*Seconds to raise Temp from room temp to +100*C, divided by 100*C.
+// we divide mass by 20 to let the I term dominate near the set point.
+//  This is necessary because of the temp noise and thermal lag in the system.
+// Once we have feed-forward temp estimation we should be able to better tune this.
+
+#ifdef MODEL_TS100
+const int32_t tipMass = 45; // X10 watts to raise 1 deg C in 1 second
+const uint8_t tipResistance = 85; //x10 ohms, 8.5 typical for ts100, 4.5 typical for ts80
+
+#endif
+#ifdef MODEL_TS80
+const uint32_t tipMass = 40;
+const uint8_t tipResistance = 45; //x10 ohms, 8.5 typical for ts100, 4.5 typical for ts80
+
+#endif
+const uint8_t wattHistoryFilter = 24; // I term look back weighting
+extern expMovingAverage<uint32_t, wattHistoryFilter> x10WattHistory;
+
+int32_t tempToX10Watts(int32_t rawTemp);
+void setTipX10Watts(int32_t mw);
+uint8_t X10WattsToPWM(int32_t milliWatts, uint8_t sample = 0);
+int32_t PWMToX10Watts(uint8_t pwm, uint8_t sample = 0);
+uint32_t availableW10(uint8_t sample) ;
+#endif /* POWER_HPP_ */
--- a/workspace/TS100/Core/Inc/stm32f1xx_hal_conf.h
+++ b/workspace/TS100/Core/Inc/stm32f1xx_hal_conf.h
--- a/workspace/TS100/Core/Inc/stm32f1xx_it.h
+++ b/workspace/TS100/Core/Inc/stm32f1xx_it.h
--- a/workspace/TS100/Core/Src/FRToSI2C.cpp
+++ b/workspace/TS100/Core/Src/FRToSI2C.cpp
@@ -9,6 +9,8 @@
 #define I2CUSESDMA
 I2C_HandleTypeDef* FRToSI2C::i2c;
 SemaphoreHandle_t FRToSI2C::I2CSemaphore;
+StaticSemaphore_t FRToSI2C::xSemaphoreBuffer;
+
 void FRToSI2C::CpltCallback() {
 	i2c->State = HAL_I2C_STATE_READY;  // Force state reset (even if tx error)
 	if (I2CSemaphore) {
@@ -29,8 +31,8 @@ void FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress,
 		// Wait up to 1 second for the mutex
 		if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
 #ifdef I2CUSESDMA
-			if (HAL_I2C_Mem_Read(i2c, DevAddress, MemAddress, MemAddSize,
-					pData, Size,500) != HAL_OK) {
+			if (HAL_I2C_Mem_Read(i2c, DevAddress, MemAddress, MemAddSize, pData,
+					Size, 500) != HAL_OK) {

 				I2C1_ClearBusyFlagErratum();
 				xSemaphoreGive(I2CSemaphore);
@@ -70,7 +72,7 @@ void FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
 		if (xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE) {
 #ifdef I2CUSESDMA
 			if (HAL_I2C_Mem_Write(i2c, DevAddress, MemAddress, MemAddSize,
-					pData, Size,500) != HAL_OK) {
+					pData, Size, 500) != HAL_OK) {

 				I2C1_ClearBusyFlagErratum();
 				xSemaphoreGive(I2CSemaphore);
--- a/workspace/TS100/Core/Src/GUIThread.cpp
+++ b/workspace/TS100/Core/Src/GUIThread.cpp
@@ -0,0 +1,915 @@
+/*
+ * GUIThread.cpp
+ *
+ *  Created on: 19 Aug 2019
+ *      Author: ralim
+ */
+#include <MMA8652FC.hpp>
+#include <gui.hpp>
+#include <main.hpp>
+#include "LIS2DH12.hpp"
+#include <history.hpp>
+#include <power.hpp>
+#include "Settings.h"
+#include "Translation.h"
+#include "cmsis_os.h"
+#include "stdlib.h"
+#include "stm32f1xx_hal.h"
+#include "string.h"
+#include "TipThermoModel.h"
+#include "unit.h"
+#include "../../configuration.h"
+
+extern uint8_t PCBVersion;
+// File local variables
+extern uint32_t currentTempTargetDegC;
+extern uint8_t accelInit;
+extern uint32_t lastMovementTime;
+extern int16_t idealQCVoltage;
+uint32_t lastButtonTime = 0;
+extern osThreadId GUITaskHandle;
+extern osThreadId MOVTaskHandle;
+extern osThreadId PIDTaskHandle;
+
+// TODO: express time constants in terms of dividends of portTICK_RATE_MS
+
+#define MOVEMENT_INACTIVITY_TIME 6000
+#define BUTTON_INACTIVITY_TIME   6000
+
+static uint16_t min(uint16_t a, uint16_t b) {
+	if (a > b)
+		return b;
+	else
+		return a;
+}
+
+void printVoltage() {
+	uint32_t volt = getInputVoltageX10(systemSettings.voltageDiv, 0);
+	OLED::printNumber(volt / 10, 2);
+	OLED::print(SymbolDot);
+	OLED::printNumber(volt % 10, 1);
+}
+void GUIDelay() {
+	// Called in all UI looping tasks,
+	// This limits the re-draw rate to the LCD and also lets the DMA run
+	// As the gui task can very easily fill this bus with transactions, which will
+	// prevent the movement detection from running
+	osDelay(50);
+}
+void gui_drawTipTemp(bool symbol) {
+	// Draw tip temp handling unit conversion & tolerance near setpoint
+	uint16_t Temp = 0;
+	#ifdef ENABLED_FAHRENHEIT_SUPPORT
+		if (systemSettings.temperatureInF)
+			Temp = TipThermoModel::getTipInF();
+		else
+	#endif
+			Temp = TipThermoModel::getTipInC();
+
+	OLED::printNumber(Temp, 3);  // Draw the tip temp out finally
+	if (symbol) {
+		if (OLED::getFont() == 0) {
+			//Big font, can draw nice symbols
+			#ifdef ENABLED_FAHRENHEIT_SUPPORT
+				if (systemSettings.temperatureInF)
+					OLED::drawSymbol(0);
+				else
+			#endif
+					OLED::drawSymbol(1);
+		} else {
+			//Otherwise fall back to chars
+			#ifdef ENABLED_FAHRENHEIT_SUPPORT
+				if (systemSettings.temperatureInF)
+					OLED::print(SymbolDegF);
+				else
+			#endif
+				OLED::print(SymbolDegC);
+		}
+	}
+}
+ButtonState getButtonState() {
+	/*
+	 * Read in the buttons and then determine if a state change needs to occur
+	 */
+
+	/*
+	 * If the previous state was  00 Then we want to latch the new state if
+	 * different & update time
+	 * If the previous state was !00 Then we want to search if we trigger long
+	 * press (buttons still down), or if release we trigger press
+	 * (downtime>filter)
+	 */
+	static uint8_t previousState = 0;
+	static uint32_t previousStateChange = 0;
+	const uint16_t timeout = 40;
+	uint8_t currentState;
+	currentState = (
+			HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ?
+					1 : 0) << 0;
+	currentState |= (
+			HAL_GPIO_ReadPin(KEY_B_GPIO_Port, KEY_B_Pin) == GPIO_PIN_RESET ?
+					1 : 0) << 1;
+
+	if (currentState)
+		lastButtonTime = xTaskGetTickCount();
+	if (currentState == previousState) {
+		if (currentState == 0)
+			return BUTTON_NONE;
+		if ((xTaskGetTickCount() - previousStateChange) > timeout) {
+			// User has been holding the button down
+			// We want to send a buttong is held message
+			if (currentState == 0x01)
+				return BUTTON_F_LONG;
+			else if (currentState == 0x02)
+				return BUTTON_B_LONG;
+			else
+				return BUTTON_NONE; // Both being held case, we dont long hold this
+		} else
+			return BUTTON_NONE;
+	} else {
+		// A change in button state has occurred
+		ButtonState retVal = BUTTON_NONE;
+		if (currentState) {
+			// User has pressed a button down (nothing done on down)
+			if (currentState != previousState) {
+				// There has been a change in the button states
+				// If there is a rising edge on one of the buttons from double press we
+				// want to mask that out As users are having issues with not release
+				// both at once
+				if (previousState == 0x03)
+					currentState = 0x03;
+			}
+		} else {
+			// User has released buttons
+			// If they previously had the buttons down we want to check if they were <
+			// long hold and trigger a press
+			if ((xTaskGetTickCount() - previousStateChange) < timeout) {
+				// The user didn't hold the button for long
+				// So we send button press
+
+				if (previousState == 0x01)
+					retVal = BUTTON_F_SHORT;
+				else if (previousState == 0x02)
+					retVal = BUTTON_B_SHORT;
+				else
+					retVal = BUTTON_BOTH;  // Both being held case
+			}
+		}
+		previousState = currentState;
+		previousStateChange = xTaskGetTickCount();
+		return retVal;
+	}
+	return BUTTON_NONE;
+}
+
+void waitForButtonPress() {
+	// we are just lazy and sleep until user confirms button press
+	// This also eats the button press event!
+	ButtonState buttons = getButtonState();
+	while (buttons) {
+		buttons = getButtonState();
+		GUIDelay();
+	}
+	while (!buttons) {
+		buttons = getButtonState();
+		GUIDelay();
+	}
+}
+
+void waitForButtonPressOrTimeout(uint32_t timeout) {
+	timeout += xTaskGetTickCount();
+	// calculate the exit point
+
+	ButtonState buttons = getButtonState();
+	while (buttons) {
+		buttons = getButtonState();
+		GUIDelay();
+		if (xTaskGetTickCount() > timeout)
+			return;
+	}
+	while (!buttons) {
+		buttons = getButtonState();
+		GUIDelay();
+		if (xTaskGetTickCount() > timeout)
+			return;
+	}
+}
+#ifdef MODEL_TS100
+// returns true if undervoltage has occured
+static bool checkVoltageForExit() {
+	uint16_t v = getInputVoltageX10(systemSettings.voltageDiv, 0);
+
+	//Dont check for first 1.5 seconds while the ADC stabilizes and the DMA fills the buffer
+	if (xTaskGetTickCount() > 150) {
+		if ((v < lookupVoltageLevel(systemSettings.cutoutSetting))) {
+			GUIDelay();
+			OLED::clearScreen();
+			OLED::setCursor(0, 0);
+			if (systemSettings.detailedSoldering) {
+				OLED::setFont(1);
+				OLED::print(UndervoltageString);
+				OLED::setCursor(0, 8);
+				OLED::print(InputVoltageString);
+				printVoltage();
+				OLED::print(SymbolVolts);
+
+			} else {
+				OLED::setFont(0);
+				OLED::print(UVLOWarningString);
+			}
+
+			OLED::refresh();
+			currentTempTargetDegC = 0;
+			waitForButtonPress();
+			return true;
+		}
+	}
+	return false;
+}
+#endif
+static void gui_drawBatteryIcon() {
+#ifdef MODEL_TS100
+	if (systemSettings.cutoutSetting) {
+		// User is on a lithium battery
+		// we need to calculate which of the 10 levels they are on
+		uint8_t cellCount = systemSettings.cutoutSetting + 2;
+		uint32_t cellV = getInputVoltageX10(systemSettings.voltageDiv, 0)
+				/ cellCount;
+		// Should give us approx cell voltage X10
+		// Range is 42 -> 33 = 9 steps therefore we will use battery 1-10
+		if (cellV < 33)
+			cellV = 33;
+		cellV -= 33;		// Should leave us a number of 0-9
+		if (cellV > 9)
+			cellV = 9;
+		OLED::drawBattery(cellV + 1);
+	} else
+		OLED::drawSymbol(15);  // Draw the DC Logo
+#else
+	// On TS80 we replace this symbol with the voltage we are operating on
+	// If <9V then show single digit, if not show duals
+	uint8_t V = getInputVoltageX10(systemSettings.voltageDiv, 0);
+	if (V % 10 >= 5)
+		V = V / 10 + 1;				// round up
+	else
+		V = V / 10;
+	if (V >= 10) {
+		int16_t xPos = OLED::getCursorX();
+		OLED::setFont(1);
+		OLED::printNumber(1, 1);
+		OLED::setCursor(xPos, 8);
+		OLED::printNumber(V % 10, 1);
+		OLED::setFont(0);
+		OLED::setCursor(xPos + 12, 0); // need to reset this as if we drew a wide char
+	} else {
+		OLED::printNumber(V, 1);
+	}
+#endif
+}
+static void gui_solderingTempAdjust() {
+	uint32_t lastChange = xTaskGetTickCount();
+	currentTempTargetDegC = 0;
+	uint32_t autoRepeatTimer = 0;
+	uint8_t autoRepeatAcceleration = 0;
+	for (;;) {
+		OLED::setCursor(0, 0);
+		OLED::clearScreen();
+		OLED::setFont(0);
+		ButtonState buttons = getButtonState();
+		if (buttons)
+			lastChange = xTaskGetTickCount();
+		switch (buttons) {
+		case BUTTON_NONE:
+			// stay
+			break;
+		case BUTTON_BOTH:
+			// exit
+			return;
+			break;
+case BUTTON_B_LONG:
+			if (xTaskGetTickCount() - autoRepeatTimer
+					+ autoRepeatAcceleration> PRESS_ACCEL_INTERVAL_MAX) {
+        if(systemSettings.ReverseButtonTempChangeEnabled) {
+          systemSettings.SolderingTemp += systemSettings.TempChangeLongStep;
+        } else systemSettings.SolderingTemp -= systemSettings.TempChangeLongStep;
+        
+				autoRepeatTimer = xTaskGetTickCount();
+				autoRepeatAcceleration += PRESS_ACCEL_STEP;
+			}
+			break;
+    case BUTTON_B_SHORT:
+       if(systemSettings.ReverseButtonTempChangeEnabled) {
+        systemSettings.SolderingTemp += systemSettings.TempChangeShortStep;
+       } else systemSettings.SolderingTemp -= systemSettings.TempChangeShortStep;
+      break;
+		case BUTTON_F_LONG:
+			if (xTaskGetTickCount() - autoRepeatTimer
+					+ autoRepeatAcceleration> PRESS_ACCEL_INTERVAL_MAX) {
+        if(systemSettings.ReverseButtonTempChangeEnabled) {
+          systemSettings.SolderingTemp -= systemSettings.TempChangeLongStep;
+        } else systemSettings.SolderingTemp += systemSettings.TempChangeLongStep;
+				autoRepeatTimer = xTaskGetTickCount();
+				autoRepeatAcceleration += PRESS_ACCEL_STEP;
+			}
+			break;
+		case BUTTON_F_SHORT:
+      if(systemSettings.ReverseButtonTempChangeEnabled) {
+        systemSettings.SolderingTemp -= systemSettings.TempChangeShortStep;  // add 10
+      } else systemSettings.SolderingTemp += systemSettings.TempChangeShortStep;  // add 10
+			break;
+		default:
+			break;
+		}
+		if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration)
+				< PRESS_ACCEL_INTERVAL_MIN) {
+			autoRepeatAcceleration = PRESS_ACCEL_INTERVAL_MAX
+					- PRESS_ACCEL_INTERVAL_MIN;
+		}
+		// constrain between 50-450 C
+		#ifdef ENABLED_FAHRENHEIT_SUPPORT
+		if (systemSettings.temperatureInF) {
+			if (systemSettings.SolderingTemp > 850)
+				systemSettings.SolderingTemp = 850;
+			if (systemSettings.SolderingTemp < 120)
+				systemSettings.SolderingTemp = 120;
+		} 
+		else 
+		#endif
+		{
+			if (systemSettings.SolderingTemp > 450)
+				systemSettings.SolderingTemp = 450;
+			if (systemSettings.SolderingTemp < 50)
+				systemSettings.SolderingTemp = 50;
+		}
+
+		if (xTaskGetTickCount() - lastChange > 200)
+			return;  // exit if user just doesn't press anything for a bit
+
+#ifdef MODEL_TS80
+		if (!OLED::getRotation()) {
+#else
+		if (OLED::getRotation()) {
+#endif
+    	OLED::print(systemSettings.ReverseButtonTempChangeEnabled ? SymbolPlus:SymbolMinus);
+		} else { 
+			OLED::print(systemSettings.ReverseButtonTempChangeEnabled ? SymbolMinus:SymbolPlus);
+		}
+
+
+		OLED::print(SymbolSpace);
+		OLED::printNumber(systemSettings.SolderingTemp, 3);
+		#ifdef ENABLED_FAHRENHEIT_SUPPORT
+		if (systemSettings.temperatureInF)
+			OLED::drawSymbol(0);
+		else
+		#endif
+		{
+			OLED::drawSymbol(1);
+		}
+		OLED::print(SymbolSpace);
+#ifdef MODEL_TS80
+		if (!OLED::getRotation()) {
+#else
+		if (OLED::getRotation()) {
+#endif
+			OLED::print(systemSettings.ReverseButtonTempChangeEnabled ? SymbolMinus:SymbolPlus);
+		} else {
+			OLED::print(systemSettings.ReverseButtonTempChangeEnabled ? SymbolPlus:SymbolMinus);
+		}
+		OLED::refresh();
+		GUIDelay();
+	}
+}
+
+static int gui_SolderingSleepingMode(bool stayOff) {
+	// Drop to sleep temperature and display until movement or button press
+
+	for (;;) {
+		ButtonState buttons = getButtonState();
+		if (buttons)
+			return 0;
+		if ((xTaskGetTickCount() > 100)
+			&& ((accelInit && (xTaskGetTickCount() - lastMovementTime < 100))
+				|| (xTaskGetTickCount() - lastButtonTime < 100)))
+			return 0;  // user moved or pressed a button, go back to soldering
+#ifdef MODEL_TS100
+		if (checkVoltageForExit())
+			return 1; // return non-zero on error
+#endif
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
+		if (systemSettings.temperatureInF) {
+			currentTempTargetDegC = stayOff ? 0 : TipThermoModel::convertFtoC(
+					min(systemSettings.SleepTemp,
+							systemSettings.SolderingTemp));
+		} else 
+#endif
+		{
+			currentTempTargetDegC = stayOff ? 0 : min(systemSettings.SleepTemp,
+					systemSettings.SolderingTemp);
+		}
+		// draw the lcd
+		uint16_t tipTemp;
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
+		if (systemSettings.temperatureInF)
+			tipTemp = TipThermoModel::getTipInF();
+		else
+#endif
+		{
+			tipTemp = TipThermoModel::getTipInC();
+		}
+
+		OLED::clearScreen();
+		OLED::setCursor(0, 0);
+		if (systemSettings.detailedSoldering) {
+			OLED::setFont(1);
+			OLED::print(SleepingAdvancedString);
+			OLED::setCursor(0, 8);
+			OLED::print(SleepingTipAdvancedString);
+			OLED::printNumber(tipTemp, 3);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
+			if (systemSettings.temperatureInF)
+				OLED::print(SymbolDegF);
+			else
+#endif
+			{
+				OLED::print(SymbolDegC);
+			}
+
+			OLED::print(SymbolSpace);
+			printVoltage();
+			OLED::print(SymbolVolts);
+		} else {
+			OLED::setFont(0);
+			OLED::print(SleepingSimpleString);
+			OLED::printNumber(tipTemp, 3);
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
+			if (systemSettings.temperatureInF)
+				OLED::drawSymbol(0);
+			else
+#endif
+			{
+				OLED::drawSymbol(1);
+			}
+		}
+		if (systemSettings.ShutdownTime) // only allow shutdown exit if time > 0
+			if (lastMovementTime)
+				if (((uint32_t) (xTaskGetTickCount() - lastMovementTime))
+						> (uint32_t) (systemSettings.ShutdownTime * 60 * 100)) {
+					// shutdown
+					currentTempTargetDegC = 0;
+					return 1;  // we want to exit soldering mode
+				}
+		OLED::refresh();
+		GUIDelay();
+	}
+	return 0;
+}
+
+static void display_countdown(int sleepThres) {
+	/*
+	 * Print seconds or minutes (if > 99 seconds) until sleep
+	 * mode is triggered.
+	 */
+	int lastEventTime =
+			lastButtonTime < lastMovementTime ?
+					lastMovementTime : lastButtonTime;
+	int downCount = sleepThres - xTaskGetTickCount() + lastEventTime;
+	if (downCount > 9900) {
+		OLED::printNumber(downCount / 6000 + 1, 2);
+		OLED::print(SymbolMinutes);
+	} else {
+		OLED::printNumber(downCount / 100 + 1, 2);
+		OLED::print(SymbolSeconds);
+	}
+}
+
+static void gui_solderingMode(uint8_t jumpToSleep) {
+	/*
+	 * * Soldering (gui_solderingMode)
+	 * -> Main loop where we draw temp, and animations
+	 * --> User presses buttons and they goto the temperature adjust screen
+	 * ---> Display the current setpoint temperature
+	 * ---> Use buttons to change forward and back on temperature
+	 * ---> Both buttons or timeout for exiting
+	 * --> Long hold front button to enter boost mode
+	 * ---> Just temporarily sets the system into the alternate temperature for
+	 * PID control
+	 * --> Long hold back button to exit
+	 * --> Double button to exit
+	 */
+	bool boostModeOn = false;
+
+	uint32_t sleepThres = 0;
+	if (systemSettings.SleepTime < 6)
+		sleepThres = systemSettings.SleepTime * 10 * 100;
+	else
+		sleepThres = (systemSettings.SleepTime - 5) * 60 * 100;
+	if (jumpToSleep) {
+		if (gui_SolderingSleepingMode(jumpToSleep == 2)) {
+			lastButtonTime = xTaskGetTickCount();
+			return;  // If the function returns non-0 then exit
+		}
+	}
+	for (;;) {
+
+		ButtonState buttons = getButtonState();
+		switch (buttons) {
+		case BUTTON_NONE:
+			// stay
+			boostModeOn = false;
+			break;
+		case BUTTON_BOTH:
+			// exit
+			return;
+			break;
+		case BUTTON_B_LONG:
+			return;  // exit on back long hold
+			break;
+		case BUTTON_F_LONG:
+			// if boost mode is enabled turn it on
+			if (systemSettings.boostModeEnabled)
+				boostModeOn = true;
+			break;
+		case BUTTON_F_SHORT:
+		case BUTTON_B_SHORT: {
+			uint16_t oldTemp = systemSettings.SolderingTemp;
+			gui_solderingTempAdjust();  // goto adjust temp mode
+			if (oldTemp != systemSettings.SolderingTemp) {
+				saveSettings();  // only save on change
+			}
+		}
+			break;
+		default:
+			break;
+		}
+		// else we update the screen information
+		OLED::setCursor(0, 0);
+		OLED::clearScreen();
+		OLED::setFont(0);
+		//Draw in the screen details
+		if (systemSettings.detailedSoldering) {
+			OLED::setFont(1);
+			OLED::print(SolderingAdvancedPowerPrompt);  // Power:
+			OLED::printNumber(x10WattHistory.average() / 10, 2);
+			OLED::print(SymbolDot);
+			OLED::printNumber(x10WattHistory.average() % 10, 1);
+			OLED::print(SymbolWatts);
+
+			if (systemSettings.sensitivity && systemSettings.SleepTime) {
+				OLED::print(SymbolSpace);
+				display_countdown(sleepThres);
+			}
+
+			OLED::setCursor(0, 8);
+			OLED::print(SleepingTipAdvancedString);
+			//OLED::printNumber(
+			//		TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0)), 5); // Draw the tip temp out finally
+
+			gui_drawTipTemp(true);
+			OLED::print(SymbolSpace);
+			printVoltage();
+			OLED::print(SymbolVolts);
+		} else {
+			// We switch the layout direction depending on the orientation of the
+			// OLED::
+			if (OLED::getRotation()) {
+				// battery
+				gui_drawBatteryIcon();
+				OLED::print(SymbolSpace); // Space out gap between battery <-> temp
+				gui_drawTipTemp(true);  // Draw current tip temp
+
+				// We draw boost arrow if boosting, or else gap temp <-> heat
+				// indicator
+				if (boostModeOn)
+					OLED::drawSymbol(2);
+				else
+					OLED::print(SymbolSpace);
+
+				// Draw heating/cooling symbols
+				OLED::drawHeatSymbol(X10WattsToPWM(x10WattHistory.average()));
+			} else {
+				// Draw heating/cooling symbols
+				OLED::drawHeatSymbol(X10WattsToPWM(x10WattHistory.average()));
+				// We draw boost arrow if boosting, or else gap temp <-> heat
+				// indicator
+				if (boostModeOn)
+					OLED::drawSymbol(2);
+				else
+					OLED::print(SymbolSpace);
+				gui_drawTipTemp(true);  // Draw current tip temp
+
+				OLED::print(SymbolSpace); // Space out gap between battery <-> temp
+
+				gui_drawBatteryIcon();
+			}
+		}
+		OLED::refresh();
+
+		// Update the setpoints for the temperature
+		if (boostModeOn) {
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
+			if (systemSettings.temperatureInF)
+				currentTempTargetDegC = TipThermoModel::convertFtoC(
+						systemSettings.BoostTemp);
+			else
+#endif
+			{
+				currentTempTargetDegC = (systemSettings.BoostTemp);
+			}
+		} else {
+#ifdef ENABLED_FAHRENHEIT_SUPPORT
+			if (systemSettings.temperatureInF)
+				currentTempTargetDegC = TipThermoModel::convertFtoC(
+						systemSettings.SolderingTemp);
+			else
+#endif
+			{
+				currentTempTargetDegC = (systemSettings.SolderingTemp);
+			}
+		}
+
+#ifdef MODEL_TS100
+		// Undervoltage test
+		if (checkVoltageForExit()) {
+			lastButtonTime = xTaskGetTickCount();
+			return;
+		}
+#else
+		// on the TS80 we only want to check for over voltage to prevent tip damage
+		/*if (getInputVoltageX10(systemSettings.voltageDiv, 1) > 150) {
+		 lastButtonTime = xTaskGetTickCount();
+		 currentlyActiveTemperatureTarget = 0;
+		 return;  // Over voltage
+		 }*/
+#endif
+
+		if (systemSettings.sensitivity && systemSettings.SleepTime)
+			if (xTaskGetTickCount() - lastMovementTime > sleepThres
+					&& xTaskGetTickCount() - lastButtonTime > sleepThres) {
+				if (gui_SolderingSleepingMode(false)) {
+					return;  // If the function returns non-0 then exit
+				}
+			}
+		//slow down ui update rate
+		GUIDelay();
+	}
+}
+
+void showDebugMenu(void) {
+	uint8_t screen = 0;
+	ButtonState b;
+	for (;;) {
+		OLED::clearScreen();    // Ensure the buffer starts clean
+		OLED::setCursor(0, 0);  // Position the cursor at the 0,0 (top left)
+		OLED::setFont(1);       // small font
+		OLED::print(SymbolVersionNumber);  // Print version number
+		OLED::setCursor(0, 8);  // second line
+		OLED::print(DebugMenu[screen]);
+		switch (screen) {
+		case 0:  //Just prints date
+			break;
+		case 1:
+			//High water mark for GUI
+			OLED::printNumber(uxTaskGetStackHighWaterMark(GUITaskHandle), 5);
+			break;
+		case 2:
+			//High water mark for the Movement task
+			OLED::printNumber(uxTaskGetStackHighWaterMark(MOVTaskHandle), 5);
+			break;
+		case 3:
+			//High water mark for the PID task
+			OLED::printNumber(uxTaskGetStackHighWaterMark(PIDTaskHandle), 5);
+			break;
+		case 4:
+			//system up time stamp
+			OLED::printNumber(xTaskGetTickCount() / 100, 5);
+			break;
+		case 5:
+			//Movement time stamp
+			OLED::printNumber(lastMovementTime / 100, 5);
+			break;
+		case 6:
+			//Raw Tip
+		{
+			uint32_t temp = systemSettings.CalibrationOffset;
+			systemSettings.CalibrationOffset = 0;
+			OLED::printNumber(
+					TipThermoModel::convertTipRawADCTouV(getTipRawTemp(1)), 6);
+			systemSettings.CalibrationOffset = temp;
+		}
+			break;
+		case 7:
+			//Temp in C
+			OLED::printNumber(TipThermoModel::getTipInC(1), 5);
+			break;
+		case 8:
+			//Handle Temp
+			OLED::printNumber(getHandleTemperature(), 3);
+			break;
+		case 9:
+			//Voltage input
+			printVoltage();
+			break;
+		case 10:
+			// Print PCB ID number
+			OLED::printNumber(PCBVersion, 1);
+			break;
+		default:
+			break;
+		}
+
+		OLED::refresh();
+		b = getButtonState();
+		if (b == BUTTON_B_SHORT)
+			return;
+		else if (b == BUTTON_F_SHORT) {
+			screen++;
+			screen = screen % 11;
+		}
+		GUIDelay();
+	}
+}
+
+/* StartGUITask function */
+void startGUITask(void const *argument __unused) {
+	FRToSI2C::FRToSInit();
+	uint8_t tempWarningState = 0;
+	bool buttonLockout = false;
+	bool tempOnDisplay = false;
+	getTipRawTemp(1);  // reset filter
+	OLED::setRotation(systemSettings.OrientationMode & 1);
+	uint32_t ticks = xTaskGetTickCount();
+	ticks += 400;  // 4 seconds from now
+	while (xTaskGetTickCount() < ticks) {
+		if (showBootLogoIfavailable() == false)
+			ticks = xTaskGetTickCount();
+		ButtonState buttons = getButtonState();
+		if (buttons)
+			ticks = xTaskGetTickCount();  // make timeout now so we will exit
+		GUIDelay();
+	}
+
+	if (settingsWereReset) {
+		//Display alert settings were reset
+		OLED::clearScreen();
+		OLED::setFont(1);
+		OLED::setCursor(0, 0);
+		OLED::print(SettingsResetMessage);
+		OLED::refresh();
+		waitForButtonPressOrTimeout(1000);
+
+	}
+
+	if (systemSettings.autoStartMode) {
+		// jump directly to the autostart mode
+		if (systemSettings.autoStartMode == 1)
+		{
+			gui_solderingMode(0);
+			buttonLockout = true;
+		}
+		else if (systemSettings.autoStartMode == 2)
+		{
+			gui_solderingMode(1);
+			buttonLockout = true;
+		}
+		else if (systemSettings.autoStartMode == 3)
+		{
+			gui_solderingMode(2);
+			buttonLockout = true;
+		}
+	}
+
+#ifdef ACCELDEBUG
+
+	for (;;) {
+		HAL_IWDG_Refresh(&hiwdg);
+		osDelay(100);
+	}
+//^ Kept here for a way to block this thread
+#endif
+
+	for (;;) {
+		ButtonState buttons = getButtonState();
+		if (buttons != BUTTON_NONE) {
+			OLED::setDisplayState(OLED::DisplayState::ON);
+			OLED::setFont(0);
+		}
+		if (tempWarningState == 2)
+			buttons = BUTTON_F_SHORT;
+		if (buttons != BUTTON_NONE && buttonLockout)
+			buttons = BUTTON_NONE;
+		else
+			buttonLockout = false;
+
+		switch (buttons) {
+		case BUTTON_NONE:
+			// Do nothing
+			break;
+		case BUTTON_BOTH:
+			// Not used yet
+			// In multi-language this might be used to reset language on a long hold
+			// or some such
+			break;
+
+		case BUTTON_B_LONG:
+			// Show the version information
+			showDebugMenu();
+			break;
+		case BUTTON_F_LONG:
+			gui_solderingTempAdjust();
+			saveSettings();
+			break;
+		case BUTTON_F_SHORT:
+			gui_solderingMode(0);  // enter soldering mode
+			buttonLockout = true;
+			break;
+		case BUTTON_B_SHORT:
+			enterSettingsMenu();       // enter the settings menu
+			buttonLockout = true;
+			break;
+		default:
+			break;
+		}
+
+		currentTempTargetDegC = 0;  // ensure tip is off
+		getInputVoltageX10(systemSettings.voltageDiv, 0);
+		uint16_t tipTemp = TipThermoModel::getTipInC();
+
+		// Preemptively turn the display on.  Turn it off if and only if
+		// the tip temperature is below 50 degrees C *and* motion sleep
+		// detection is enabled *and* there has been no activity (movement or
+		// button presses) in a while.
+		OLED::setDisplayState(OLED::DisplayState::ON);
+
+		if ((tipTemp < 50) && systemSettings.sensitivity
+				&& (((xTaskGetTickCount() - lastMovementTime)
+						> MOVEMENT_INACTIVITY_TIME)
+						&& ((xTaskGetTickCount() - lastButtonTime)
+								> BUTTON_INACTIVITY_TIME))) {
+			OLED::setDisplayState(OLED::DisplayState::OFF);
+		}
+
+		// Clear the lcd buffer
+		OLED::clearScreen();
+		OLED::setCursor(0, 0);
+		if (systemSettings.detailedIDLE) {
+			OLED::setFont(1);
+			if (tipTemp > 470) {
+				OLED::print(TipDisconnectedString);
+			} else {
+				OLED::print(IdleTipString);
+				gui_drawTipTemp(false);
+				OLED::print(IdleSetString);
+				OLED::printNumber(systemSettings.SolderingTemp, 3);
+			}
+			OLED::setCursor(0, 8);
+
+			OLED::print(InputVoltageString);
+			printVoltage();
+
+		} else {
+			OLED::setFont(0);
+#ifdef MODEL_TS80
+			if (!OLED::getRotation()) {
+#else
+			if (OLED::getRotation()) {
+#endif
+				OLED::drawArea(12, 0, 84, 16, idleScreenBG);
+				OLED::setCursor(0, 0);
+				gui_drawBatteryIcon();
+			} else {
+				OLED::drawArea(0, 0, 84, 16, idleScreenBGF); // Needs to be flipped so button ends up
+															 // on right side of screen
+				OLED::setCursor(84, 0);
+				gui_drawBatteryIcon();
+			}
+			if (tipTemp > 55)
+				tempOnDisplay = true;
+			else if (tipTemp < 45)
+				tempOnDisplay = false;
+			if (tempOnDisplay) {
+				// draw temp over the start soldering button
+				// Location changes on screen rotation
+#ifdef MODEL_TS80
+				if (!OLED::getRotation()) {
+#else
+				if (OLED::getRotation()) {
+#endif
+					// in right handed mode we want to draw over the first part
+					OLED::fillArea(55, 0, 41, 16, 0); // clear the area for the temp
+					OLED::setCursor(56, 0);
+
+				} else {
+					OLED::fillArea(0, 0, 41, 16, 0);  // clear the area
+					OLED::setCursor(0, 0);
+				}
+				// draw in the temp
+				if (!(systemSettings.coolingTempBlink
+						&& (xTaskGetTickCount() % 25 < 16)))
+					gui_drawTipTemp(false);  // draw in the temp
+			}
+		}
+		OLED::refresh();
+		GUIDelay();
+	}
+}
--- a/workspace/TS100/Core/Src/LIS2DH12.cpp
+++ b/workspace/TS100/Core/Src/LIS2DH12.cpp
@@ -5,9 +5,10 @@
 *      Author: Ralim
 */

-#include <LIS2DH12.hpp>
-#include "cmsis_os.h"
+#include <array>

+#include "LIS2DH12.hpp"
+#include "cmsis_os.h"

 typedef struct {
        const uint8_t reg;
@@ -36,14 +37,14 @@ void LIS2DH12::initalize() {
    }
 }

-void LIS2DH12::getAxisReadings(int16_t* x, int16_t* y, int16_t* z) {
-	uint8_t tempArr[6];
-FRToSI2C::Mem_Read(LIS2DH_I2C_ADDRESS, 0xA8, I2C_MEMADD_SIZE_8BIT,
-			(uint8_t*) tempArr, 6);
+void LIS2DH12::getAxisReadings(int16_t& x, int16_t& y, int16_t& z) {
+    std::array<int16_t, 3> sensorData;

-	(*x) = ((uint16_t) (tempArr[1] << 8 | tempArr[0]));
-	(*y) = ((uint16_t) (tempArr[3] << 8 | tempArr[2]));
-	(*z) = ((uint16_t) (tempArr[5] << 8 | tempArr[4]));
+    FRToSI2C::Mem_Read(LIS2DH_I2C_ADDRESS, 0xA8, I2C_MEMADD_SIZE_8BIT,
+        reinterpret_cast<uint8_t*>(sensorData.begin()),
+        sensorData.size() * sizeof(int16_t));
+
+    x = sensorData[0];
+    y = sensorData[1];
+    z = sensorData[2];
 }
-
-
--- a/Show More
+++ b/Show More