Version bump

Cleanup menu

.gitattributes

@@ -0,0 +1,2 @@
+# Ignore all differences in line endings
+*        -crlf

.github/FUNDING.yml

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

.github/workflows/ccpp.yml

@@ -0,0 +1,77 @@
+name: C/C++ CI
+
+on: [pull_request, push]
+
+jobs:
+  build_TS80:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: chmod
+      run: chmod +x setup.sh && chmod +x workspace/TS100/build.sh
+
+    - name: setup
+      run: ./setup.sh
+
+    - name: build TS80
+      run: cd workspace/TS100 && ./build.sh -m TS80
+
+    - name: Archive TS80 artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: TS80
+        path: |
+          workspace/TS100/Hexfile/TS80_*.hex
+          workspace/TS100/Hexfile/TS80_*.bin
+        if-no-files-found: error
+  build_TS80P:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: chmod
+      run: chmod +x setup.sh && chmod +x workspace/TS100/build.sh
+
+    - name: setup
+      run: ./setup.sh
+
+    - name: build TS80P
+      run: cd workspace/TS100 && ./build.sh -m TS80P
+
+    - name: Archive TS80P artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: TS80P
+        path: |
+          workspace/TS100/Hexfile/TS80P_*.hex
+          workspace/TS100/Hexfile/TS80P_*.bin
+        if-no-files-found: error
+  build_TS100:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: chmod
+      run: chmod +x setup.sh && chmod +x workspace/TS100/build.sh
+
+    - name: setup
+      run: ./setup.sh
+
+    - name: build TS100
+      run: cd workspace/TS100 && ./build.sh -m TS100
+
+    - name: Archive TS100 artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: TS100
+        path: |
+          workspace/TS100/Hexfile/TS100_*.hex
+          workspace/TS100/Hexfile/TS100_*.bin
+        if-no-files-found: error

.gitignore

@@ -1,51 +1,193 @@
-# Object files
+# Object files
-*.o
+*.o
-*.ko
+*.ko
-*.obj
+*.obj
-*.elf
+*.elf
-*.d
+*.d
-*.DS_Store
+*.DS_Store
-# Precompiled Headers
+# Precompiled Headers
-*.gch
+*.gch
-*.pch
+*.pch
-
+
-# Libraries
+# Libraries
-*.lib
+*.lib
-*.a
+*.a
-*.la
+*.la
-*.lo
+*.lo
-
+
-# Shared objects (inc. Windows DLLs)
+# Shared objects (inc. Windows DLLs)
-*.dll
+*.dll
-*.so
+*.so
-*.so.*
+*.so.*
-*.dylib
+*.dylib
-
+
-# Executables
+# Executables
-*.exe
+*.exe
-*.out
+*.out
-*.app
+*.app
-*.i*86
+*.i*86
-*.x86_64
+*.x86_64
-workspace/*.hex
+workspace/*.hex
-
+
-# Debug files
+# Debug files
-*.dSYM/
+*.dSYM/
-*.su
+*.su
-workspace/ts100/Debug/*
+workspace/ts100/Debug/*
-workspace/.metadata/*
+workspace/.metadata/*
-
+
-workspace/ts100/.settings/language.settings.xml
+workspace/ts100/.settings/language.settings.xml
-workspace/ts100/.cproject
+workspace/ts100/.cproject
-TS100/KiCad/TS100.bak
+TS100/KiCad/TS100.bak
-Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/
+Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/
-Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
+Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
-workspace/ts100/ts100.xml
+workspace/ts100/ts100.xml
-workspace/ts100_old/*
+workspace/ts100_old/*
-*.cache
+*.cache
-workspace/TS100/.settings/language.settings.xml
+workspace/TS100/.settings/language.settings.xml
-workspace/TS100A/Release/TS100A.map
+workspace/TS100A/Release/TS100A.map
-workspace/TS100A/Release/TS100A.list
+workspace/TS100A/Release/TS100A.list
-workspace/TS100A/Release/TS100A.hex
+workspace/TS100A/Release/TS100A.hex
-workspace/TS100A/.settings/language.settings.xml
+workspace/TS100A/.settings/language.settings.xml
-workspace/TS100A/.metadata/
+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
+.vscode/settings.json

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

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

Bootup Logo/Logos/001_TS100_Left.hex

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

Bootup 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):
+def intel_hex_line(record_type, offset, data):
-    """write a line of data in Intel hex format"""
+    """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)
+    # compute and write checksum (now using unix style line endings for DFU3.45 compatibility
-    file.write("{:02X}\r\n"
+    yield "{:02X}\n".format((((sum(data,                   # sum data ...
-               .format((((sum(data,                   # sum data ...
+                                     record_length           # ... and other ...
-                              record_length           # ... and other ...
+                                     + sum(split16(offset))  # ... fields ...
-                              + sum(split16(offset))  # ... fields ...
+                                     + record_type)          # ... on line
-                              + record_type)          # ... on line
+                                 & 0xff)                     # low 8 bits
-                          & 0xff)                     # low 8 bits
+                                ^ 0xff)                      # two's ...
-                         ^ 0xff)                      # two's ...
+                               + 1)                          # ... complement
-                        + 1)                          # ... complement
+                              & 0xff)                        # low 8 bits
-                       & 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,
+    write(intel_hex_line(INTELHEX_EXTENDED_LINEAR_ADDRESS_RECORD, 0,
-                   INTELHEX_EXTENDED_LINEAR_ADDRESS_RECORD,
+                               split16(address_hi)))
-                   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,
+            write(intel_hex_line(INTELHEX_DATA_RECORD, offset,
-                           INTELHEX_DATA_RECORD,
+                                 bytes_[line_start:line_start + INTELHEX_BYTES_PER_LINE]))
-                           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,

Dockerfile

@@ -0,0 +1,21 @@
+FROM ubuntu:20.04
+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 install -y \
+  make \
+  bzip2 \
+  git \
+  python3 \
+  wget && \
+  apt-get clean
+RUN wget -qO- https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 | tar -xj
+
+# Add compiler to the path
+ENV PATH "/build/gcc-arm-none-eabi-9-2020-q2-update/bin:$PATH"
+COPY . /build/source
+COPY ./ci /build/ci

Documentation/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.

Documentation/History.md

@@ -1,5 +1,64 @@
 # Version Changes
-V2.00
+
+## V2.11
+
+* First TS80P support
+* Added in a USB-PD driver stack for the FUSB302
+* Fixed some graphical glitches
+
+## V2.10
+
+* GUI polish (animations and scroll bars)
+* Power pulse to keep power supplies alive
+* Adjustable tip response gain
+
+## V2.09
+
+* Adjustable steps in temperature adjustment
+* Git hash now in build string
+* Adjustable language to set if US units are available or not
+* Some minor QC3 improvements
+
+## V2.08
+
+* Fixes auto start in sleep mode
+* Power limiters
+
+## V2.07
+
+* QC fixes 
+* Cosmetic fixes for leading 0's
+
+## V2.06
+
+* Warning on settings reset
+* Temp temp re-write
+* Display calibration offset
+* Hide some leading 0's
+* Menu timeouts
+
+## V2.05
+
+* Language updates
+
+
+## V2.04
+
+* GUI updates
+
+## V2.03
+
+* Support for new accelerometers
+
+## V2.02
+
+* Adds small font
+
+## V2.01
+
+* Newer settings menu
+
+## V2.00
 
 * Complete re-write of the low layer system to use the STM32 HAL for easier development
 * This allowed easier setup for the new ADC auto measuring system
@@ -10,80 +69,80 @@ V2.00
 * Added smaller font for said screen views
 
 
-V1.17
+## V1.17
 
 * Added blinking cooldown display
 * Allowed smaller sleep timeout values
 * New font!
 * Automatic startup option
 
-V1.16
+## V1.16
 
 * Added automatic rotation support
 * Added power display graph
 
-V1.15
+## 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
+## 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
+## V1.13
 
 * Swapped buttons for menu to prevent accidentally changing first menu item
-* Added auto key repeat.
+* Added auto key repeat
 
-V1.12
+## 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
+## V1.11
 
 * Boost mode
 * Change sensitivity options to be 1*8
 
-V1.10
+## V1.10
 
 * Adds help text to settings
 * Improves settings for the display update rate
 
-V1.09
+## V1.09
 
 * Adds display modes, for slowing down or simplifying the display
 
-V1.08
+## V1.08
 
 * Fix settings menu not showing flip display
 
-V1.07
+## V1.07
 
 * Adds shutdown time to automatically shutdown the iron after inactivity
 
-V1.06
+## V1.06
 
 * Changes H and C when the iron is heating to the minidso chevron like images
 
-V1.05
+## V1.05
 
 * Adds ability to calibrate the input voltage measurement
 
-V1.04
+## V1.04
 
 * Increased accuracy of the temperature control
 * Improved PID response slightly
 * Allows temperature offset calibration
 * Nicer idle screen
 
-V1.03 
+## V1.03
 
 * Improved Button handling
 * Ability to set motion sensitivity
 * DC voltmeter page shows input voltage
 
-V1.02
+## V1.02
 
-* Adds hold both buttons on IDLE to access the therometer mode.
+* Adds hold both buttons on IDLE to access the therometer mode
-* Changes the exit soldering mode to be holding both buttons (Like original firmware).
+* Changes the exit soldering mode to be holding both buttons (Like original firmware)

Documentation/Menu.md

@@ -0,0 +1,77 @@
+# Menu System
+
+In this firmware for these soldering irons, all settings are adjustable on the device itself. This means you do **not** require a computer to change any settings.
+
+## 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.
+
+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.

Documentation/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

Documentation/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.

Documentation/Upgrading.md

@@ -0,0 +1,72 @@
+# Upgrading your iron
+
+## Miniware irons (TS100, TS80, TS80P)
+
+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 (use the built-in File Explorer, as alternative file managers or copy handlers like Teracopy will fail). 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. 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 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. On v2.51A PCB revision `USB_D+` is shorted to `SWDIO` and `USB_D-` is shorted to `SWCLK` so debugging works without disassembly (attach while staying in the bootloader). Installing [dapboot from eDesignOSS](https://github.com/eDesignOSS/dapboot) (`make TARGET=TS100 -C src`) is recommended as it allows reliable flashing of binary files with [dfu-util](http://dfu-util.sourceforge.net/).
+
+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.
+
+
+### FAQ
+
+#### The file is showing up with the extension `.ERR`
+
+This can occur duing the programming process if any of the checks in the bootloader fail. This is often triggered by anti-virus software or using a non-windows host OS.
+
+First, try just copying the file a second time.
+
+1. Attach the iron in DFU mode
+2. Copy the hex file to the device
+3. The device disconnects and connects with the `.ERR` file
+4. Copy the same hex file again  **DO NOT TRY AND DELETE THE OLD ONE**
+5. The device will disconnect and reconnect again
+6. The device _should_ now have the `.RDY` file
+7. Your done.
+
+If this fails, if you are on Mac or Linux reading the wiki page about programming can help. There is also a very long issue thread going through all of the different attempts around this too.
+
+If you are on windows, its often to try another computer (friends, work, partners etc).
+
+#### Device randomly disconnects or does not show up in DFU mode
+
+First, check the USB cable your using has the data pins; test it on another device. There are a surprisingly large number of usb-micro cables that are power _only_.
+
+Secondly, try other USB ports. Often different USB controllers will interact with the units differently due to design quirks in the miniware design.
+
+## 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.
+
+## Alternative bootloader
+
+If you are an advanced user, and you have used `usb-dfu` tools before, or you would like to learn; there is an alternative bootloader for these irons.
+This will **NOT** show up as a USB storage drive, but instead show up using a standard DFU protocol device. You can then use dfu tools or GUI's to upgrade the iron using the `.bin` files that are posted to the releases page.
+
+To change to dapboot based alternative bootloader, you need to flash the hex file from [here](https://github.com/eDesignOSS/ts100-bl-flasher/releases).
+`ts100-stockbl.hex` will reflash the stock bootloader, `ts100-dapboot.hex` will flash the new dapboot based usb bootloader.
+
+Note that this is only reccomended for users who know what they doing. If you dont not understand how this works; please dont flash this.

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

ISSUE_TEMPLATE.md

@@ -1,31 +1,21 @@
 Please edit this template and fill out all the information you can (where relevant). Failure to provide essential information can delay the response you receive.
 
+_This is a [Bug/Feature Request/Question/Complaint]_
 
-* **I'm submitting a ...**
+* **I have**
-  - [ ] Bug report
+  - [ ] Searched previous issues 
-  - [ ] Feature request
+  - [ ] This is in _this_ firmware, not vendor "offical" firmware
-  - [ ] Translation
+  - [ ] This is not a bug in the vendor bootloader (aka DFU)
-
+  - [ ] I have checked this is not already covered in the docs in `/Documentation`
-
-* **Do you want to request a *feature* or report a *bug*?**
-
-
 
 * **What is the current behavior?**
 
-
 * **What is the expected behavior?**
 
+***Steps to reproduce the bug:***
 
-* **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem**
+- Turn on...
-
+- Hold....
-***Steps to reproduce:***
-
-1. 
-2. 
-3. 
-
-***Video of problem if hard to reproduce***
 
 * **What is the motivation / use case for changing the behavior?**
 
@@ -33,14 +23,9 @@ Please edit this template and fill out all the information you can (where releva
 
 * **What are you running:**
 
-On the idle screen, you can hold the settings button and it will show you the firmware version.
+On the idle screen, you can hold the settings button and it will show you the firmware & PCB version.
+If using a USB-C supply please note model number
 
-  - Firmware Version: 2.x
+  - Firmware Version: 2.x?
   - PCB Version: (1/2)
-  - Power Supply (Voltage and Current Rating) :
+  - Power Supply (Voltage and Current Rating) :
-
-
-* **Other information** 
-
-If submitting graphics to go on the iron, please use BMP or PNG files over JPG.
-

PULL_REQUEST_TEMPLATE.md

@@ -2,28 +2,17 @@
 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
-- [ ] The changes have been tested locally
+- [] There are no breaking changes
-- [ ] New features have been documented in the Wiki
-- [ ] I'm willing to maintain this in the future (Totally Optional)
 
-
+* **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)
 
-
-
 * **What is the new behavior (if this is a feature change)?**
 
-
-
-* **Does this PR introduce a breaking change?** 
-(What changes might users need to make in their application due to this PR?)
-
-
 * **Other information**:

README.md

@@ -1,139 +1,79 @@
-# TS100
+![C/C++ CI](https://github.com/Ralim/ts100/workflows/C/C++%20CI/badge.svg)
 
-This is a complete rewrite of the open source software for the ts100 soldering iron.
+# Flexible Soldering iron control Firmware
-The version two fork of this code has no shared code with the original firmware from Miniware (E-design) group.
+
+*Please Note, this repo will likely be renaming soon to unire - See issue #639. Old links willcontinue to work, and should redirect. So dont panic :) This is just to better account for the newer soldeing irons being added.*
+
+Originally concieved as an alternative firmware for the TS100, this firmware has evolved into a complex soldering iron control firmware.
+
+The firmware implements all of the standard features of a "smart" soldering iron, with lots of little extras and tweaks.
+I highly reccomend reading the installation guide fully when installing on your iron.
+
+For soldering irons that are designed to be powered by "smart" power sources (QC and PD), the firmware supports settings around the negotiated power and voltage.
+For soldering irons that are designed to be powered by batteries (TS100), settings for a cutoff voltage for battery protection are supported.
+
+There are 25 languages currently supported as of present. When downloading the firmware for your soldering iron take node of the language code in the file name.
 
 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 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 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.*
+## Key Features
 
-*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.
+* PID style iron temperature control
-Please calibrate your irons voltage reading when you are using a lithium battery after any firmware upgrades.*
-
-## Features
-
-* PID iron temperature control
 * Automatic sleep with selectable sensitivity
 * Motion wake support
-* Settings menu on the unit
+* All settings exposed in intuitive menu
-* 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
-* All settings saved to flash when you exit the menu
+* (TS80) Set 18W or 24W settings for your power bank
 * 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 (i.e. raise the temperature for short periods of time)
-* Boost mode lets you temporarily change the temperature when soldering (ie raise temperature for short periods of time)
+* (TS100) Battery charge level indicator if power source set to a lipo cell count
-* Battery charge level indicatior if power source set to a lipo cell count.
+* (TS80) Power bank operating voltage is displayed
-* Custom bootup logo support
+* [Custom boot up logo support](Documentation/upgrading.md)
-* Automatic LCD rotation based on orientation
+* Automatic LCD rotation based on the orientation
-* Supports both the version 1 and version 2 hardware
+* Supports both the version 1 and version 2 hardware (different accelerometers)
 
-## Upgrading your ts100 iron
+# Menu System
-
-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.
-
-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
-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.
-
-## 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.
-
-## New 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.
+* 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 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.
+* Holding the button near the USB end will show the firmware version details
 
-## Soldering mode
+Detailed operation details are over in the [Menu information.](Documentation/menu.md)
-
-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.
 
 ## 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](https://paypal.me/RalimTek) (or email me for other options).
+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)
+* [GeminiServer](https://github.com/GeminiServer)
+* [Patrick Horlebein](https://github.com/PixelPirate)
+* [Firebie](https://github.com/Firebie)
+* [Agatti](https://github.com/agatti)
+* [Discip](https://github.com/discip)
+* [Paul Fertser](https://github.com/paulfertser)
 ## Licence
 
-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 code created by the communitiy is GNU GPLv3.
+Other components such as FreeRTOS have their own licence.
-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. 
+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.
+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.

Translation Editor/TranslationEditor.html

@@ -1,353 +1,329 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
-<html>
+<html>
-
+
-	<head>
+	<head>
-		<meta charset="UTF-8">
+		<meta charset="UTF-8">
-		<title>TS100 Translation Editor</title>
+		<title>TS100 Translation Editor</title>
-
+
-		<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+		<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
-		<script src="translations_commons.js"></script>
+		<script src="translations_commons.js"></script>
-		<script src="translations_def.js"></script>
+		<script src="translations_def.js"></script>
-		<script>
+		<script>
-
+
-	var app;
+	var app;
-	var defMap = {};
+	var defMap = {};
-	
+	
-	function save(){
+	function save(){
-		saveJSON(app.current, "translation_"+app.current.languageCode.toLowerCase()+".json");
+		saveJSON(app.current, "translation_"+app.current.languageCode.toLowerCase()+".json");
-	}
+	}
-
+
-	function view(){
+	function view(){
-		showJSON(app.current, "translation_"+app.current.languageCode.toLowerCase()+".json");
+		showJSON(app.current, "translation_"+app.current.languageCode.toLowerCase()+".json");
-	}
+	}
-
+
-	function fileChanged(e) {
+	function fileChanged(e) {
-		var target = e;
+		var target = e;
-		var id = target.id;
+		var id = target.id;
-		
+		
-		var file = target.files[0];
+		var file = target.files[0];
-		if (!file) {
+		if (!file) {
-			return;
+			return;
-		}
+		}
-		var fr = new FileReader();
+		var fr = new FileReader();
-		fr.onload = function(e) {
+		fr.onload = function(e) {
-			try {
+			try {
-				var json = JSON.parse(e.target.result);
+				var json = JSON.parse(e.target.result);
-			} catch (ex) {
+			} catch (ex) {
-				console.log(ex);
+				console.log(ex);
-				alert("Invalid JSON file: " + file.name);
+				alert("Invalid JSON file: " + file.name);
-				return;
+				return;
-			}
+			}
-				
+				
-
+
-			if (id == "referent-lang-file") {
+			if (id == "referent-lang-file") {
-				if (checkTranslationFile(file.name)) {
+				if (checkTranslationFile(file.name)) {
-					app.referent = json;
+					app.referent = json;
-					app.meta.referentLoaded = true;
+					app.meta.referentLoaded = true;
-				}
+				}
-			} else if (id == "current-lang-file") {
+			} else if (id == "current-lang-file") {
-				if (checkTranslationFile(file.name)) {
+				if (checkTranslationFile(file.name)) {
-					app.current = json;
+					app.current = json;
-					if (!app.current.cyrillicGlyphs){
+					if (!app.current.cyrillicGlyphs){
-						app.current.cyrillicGlyphs = false;
+						app.current.cyrillicGlyphs = false;
-					}
+					}
-					app.meta.currentLoaded = true;
+					app.meta.currentLoaded = true;
-				}
+				}
-			} 		
+			} 		
-			synchronizeData();
+			synchronizeData();
-		}
+		}
-		fr.readAsText(file);
+		fr.readAsText(file);
-		
+		
-	}
+	}
-	
+	
-	function synchronizeData() {
+	function synchronizeData() {
-		app.obsolete = {};
+		app.obsolete = {};
-		copyMissing(app.def.messages, app.referent.messages, app.current.messages);
+		copyMissing(app.def.messages, app.referent.messages, app.current.messages);
-		copyMissing(app.def.characters, app.referent.characters, app.current.characters);
+		copyMissing(app.def.characters, app.referent.characters, app.current.characters);
-		copyMissing(app.def.menuGroups, app.referent.menuGroups, app.current.menuGroups);
+		copyMissing(app.def.menuGroups, app.referent.menuGroups, app.current.menuGroups);
-		copyMissing(app.def.menuOptions, app.referent.menuOptions, app.current.menuOptions);
+		copyMissing(app.def.menuOptions, app.referent.menuOptions, app.current.menuOptions);
-	}
+	}
-	
+	
-	/**
+	/**
-	 * Copy all missing properties from referent to current
+	 * Copy all missing properties from referent to current
-	 * for each entry in definition
+	 * for each entry in definition
-	 */
+	 */
-	function copyMissing(defList, referentMap, currentMap) {
+	function copyMissing(defList, referentMap, currentMap) {
-		if (!isDefined(defList) || !isDefined(referentMap) || !isDefined(currentMap)) {
+		if (!isDefined(defList) || !isDefined(referentMap) || !isDefined(currentMap)) {
-			return;
+			return;
-		}
+		}
-		var len = defList.length;
+		var len = defList.length;
-		for (var i = 0; i < len; i++) {
+		for (var i = 0; i < len; i++) {
-			var id = defList[i].id;
+			var id = defList[i].id;
-			if (!isDefined(referentMap[id])) {
+			if (!isDefined(referentMap[id])) {
-				referentMap[id] = '';
+				referentMap[id] = '';
-			}
+			}
-			if (!isDefined(currentMap[id])) {
+			if (!isDefined(currentMap[id])) {
-				currentMap[id] = referentMap[id];
+				currentMap[id] = referentMap[id];
-			}
+			}
-		}
+		}
-		processObsolete(defList, currentMap);
+		processObsolete(defList, currentMap);
-	}
+	}
-
+
-	// Passes through all entries from the given map.
+	// Passes through all entries from the given map.
-	// If a corresponding entry is not found in the defList, it is removed from the map, and added into the obsolete map.
+	// If a corresponding entry is not found in the defList, it is removed from the map, and added into the obsolete map.
-	function processObsolete(defList, map) {
+	function processObsolete(defList, map) {
-		// Index list to map for faster search
+		// Index list to map for faster search
-		var defMap = copyArrayToMap(defList);
+		var defMap = copyArrayToMap(defList);
-		Object.keys(map).forEach(function(key) {
+		Object.keys(map).forEach(function(key) {
-			if (!isDefined(defMap[key])) {
+			if (!isDefined(defMap[key])) {
-				app.obsolete[key] = { id : key, value : map[key]};
+				app.obsolete[key] = { id : key, value : map[key]};
-				delete map[key];
+				delete map[key];
-			}
+			}
-		});
+		});
-	}
+	}
-
+
-	function length(obj, mode) {
+	function length(obj, mode) {
-		if (!isDefined(mode) || mode == 0) {
+		if (!isDefined(mode) || mode == 0) {
-			// return direct length
+			// return direct length
-			return obj.length;
+			return obj.length;
-		} else if (mode == 1) {
+		} 
-			// return length of text property
+		// return the longest length in text2 array
-			return obj.text.length;
+		return Math.max(isDefinedNN(obj.text2[0]) ? obj.text2[0].length : 0, isDefinedNN(obj.text2[1]) ? obj.text2[1].length : 0);
-		} else if (mode == 2) {
+	
-			// return the longest length in text2 array
+	}
-			return Math.max(isDefinedNN(obj.text2[0]) ? obj.text2[0].length : 0, isDefinedNN(obj.text2[1]) ? obj.text2[1].length : 0);
+	
-		}
+	function getAttribute(obj, attribute) {
-	}
+		var d =  "2";
-	
+		var v = obj[attribute+d];
-	function getAttribute(obj, attribute, isDouble) {
+		if (isDefined(v))
-		var d = isDouble ? "2" : "";
+			return v;
-		var v = obj[attribute+d];
+		return obj[attribute];
-		if (isDefined(v))
+	}
-			return v;
+	
-		return obj[attribute];
+	function loaded() {
-	}
+		app = new Vue({
-	
+			el : '#app',
-	function loaded() {
+			data : {
-		app = new Vue({
+				meta : {
-			el : '#app',
+					referentLoaded : false,
-			data : {
+					currentLoaded : false,
-				meta : {
+				},
-					referentLoaded : false,
+				def : {
-					currentLoaded : false,
+				},
-				},
+				referent : {
-				def : {
+					messages : {}
-				},
+				},
-				referent : {
+				current : {
-					messages : {}
+					loaded: false,
-				},
+				},
-				current : {
+				obsolete : {},
-					loaded: false,
+			},
-				},
+			methods : {
-				obsolete : {},
+				validateInput: function(valMap, id, mode) {
-				menuDouble : false
+					var d = defMap[id];
-			},
+					var vLen = 0;
-			methods : {
+					if (!isDefined(mode))
-				validateInput: function(valMap, id, mode) {
+						mode = 0;
-					var d = defMap[id];
+						
-					var vLen = 0;
+					try {
-					if (!isDefined(mode))
+						// Sum for complex length
-						mode = 0;
+						for (var i = 0; i < d.lenSum.fields.length; i++) {
-						
+							vLen += length(valMap[d.lenSum.fields[i]], mode);
-					try {
+						}
-						// Sum for complex length
+						d = d.lenSum;
-						for (var i = 0; i < d.lenSum.fields.length; i++) {
+					} catch (e) {
-							vLen += length(valMap[d.lenSum.fields[i]], mode);
+						// Single field length
-						}
+						vLen = length(valMap[id], mode);
-						d = d.lenSum;
+					}
-					} catch (e) {
+					var maxLen = getAttribute(d, 'maxLen', mode == 2);
-						// Single field length
+					var minLen = getAttribute(d, 'minLen', mode == 2);
-						vLen = length(valMap[id], mode);
+					var len = getAttribute(d, 'len', mode == 2);
-					}
+					if (isNumber(maxLen) && vLen > maxLen
-					var maxLen = getAttribute(d, 'maxLen', mode == 2);
+						|| isNumber(minLen) && vLen < minLen
-					var minLen = getAttribute(d, 'minLen', mode == 2);
+						|| isNumber(len) && vLen != len
-					var len = getAttribute(d, 'len', mode == 2);
+						) {
-					if (isNumber(maxLen) && vLen > maxLen
+						return "invalid";
-						|| isNumber(minLen) && vLen < minLen
+					}
-						|| isNumber(len) && vLen != len
+				},
-						) {
+				
-						return "invalid";
+				constraintString: function(e) {
-					}
+					var str = "";
-				},
+					var delim = "";
-				
+					var v;
-				constraintString: function(e, d) {
+					d = "2";
-					var str = "";
+					if (isDefinedNN(e.lenSum)) {
-					var delim = "";
+						str = "len("+(e.lenSum.fields+"").replace(/,/g," + ")+") -> ";
-					var v;
+						e = e.lenSum;
-					if (!isDefined(d) || d == false) {
+					}
-						d = "";
+					v = getAttribute(e, 'len', d);
-					} else {
+					if (isNumber(v)) {
-						d = "2";
+						str += delim + "len=" + v;
-					}
+						delim = " and ";
-
+					}
-					if (isDefinedNN(e.lenSum)) {
+					v = getAttribute(e, 'minLen', d);
-						str = "len("+(e.lenSum.fields+"").replace(/,/g," + ")+") -> ";
+					if (isNumber(v)) {
-						e = e.lenSum;
+						str += delim + "len>=" + v;
-					}
+						delim = " and ";
-					v = getAttribute(e, 'len', d);
+					}
-					if (isNumber(v)) {
+					v = getAttribute(e, 'maxLen', d);
-						str += delim + "len=" + v;
+					if (isNumber(v)) {
-						delim = " and ";
+						str += delim + "len<=" + v;
-					}
+						delim = " and ";
-					v = getAttribute(e, 'minLen', d);
+					}
-					if (isNumber(v)) {
+					return str;
-						str += delim + "len>=" + v;
+				}
-						delim = " and ";
+			}
-					}
+		});
-					v = getAttribute(e, 'maxLen', d);
+		app.def = def;
-					if (isNumber(v)) {
+		copyArrayToMap(app.def.messages, defMap);
-						str += delim + "len<=" + v;
+		copyArrayToMap(app.def.characters, defMap);
-						delim = " and ";
+		copyArrayToMap(app.def.menuGroups, defMap);
-					}
+		copyArrayToMap(app.def.menuOptions, defMap);
-					return str;
+	}
-				}
+	
-			}
+	window.onload=loaded;
-		});
+</script>
-		app.def = def;
+	<link href="translations.css" rel="stylesheet" type="text/css">
-		copyArrayToMap(app.def.messages, defMap);
+	</head>
-		copyArrayToMap(app.def.characters, defMap);
+	<body>
-		copyArrayToMap(app.def.menuGroups, defMap);
+
-		copyArrayToMap(app.def.menuOptions, defMap);
+		<div id="app">
-	}
+			<h1>TS100 Translation Editor<span v-if="meta.currentLoaded"> - {{ current.languageLocalName }} [{{current.languageCode}}]</span></h1>
-	
+			<table class="header data">
-	window.onload=loaded;
+				<tr>
-</script>
+					<td class="label">Referent Language</td>
-	<link href="translations.css" rel="stylesheet" type="text/css">
+					<td class="value">
-	</head>
+						<input type="file" id="referent-lang-file" onchange="fileChanged(this)" accept=".json">
-	<body>
+						<span class="selected" v-if="meta.referentLoaded">{{ referent.languageLocalName }} [{{referent.languageCode}}]</span>
-
+					</td>
-		<div id="app">
+				</tr>
-			<h1>TS100 Translation Editor<span v-if="meta.currentLoaded"> - {{ current.languageLocalName }} [{{current.languageCode}}]</span></h1>
+				<tr v-if="meta.referentLoaded">
-			<table class="header data">
+					<td class="label">Current Language</td>
-				<tr>
+					<td class="value">
-					<td class="label">Referent Language</td>
+						<input type="file" id="current-lang-file" onchange="fileChanged(this)" accept=".json">
-					<td class="value">
+						<span class="selected" v-if="meta.currentLoaded">{{ current.languageLocalName }} [{{current.languageCode}}]</span>
-						<input type="file" id="referent-lang-file" onchange="fileChanged(this)" accept=".json">
+					</td>
-						<span class="selected" v-if="meta.referentLoaded">{{ referent.languageLocalName }} [{{referent.languageCode}}]</span>
+				</tr>
-					</td>
+				<tr v-if="meta.currentLoaded">
-				</tr>
+					<td class="label">Local Language Code</td>
-				<tr v-if="meta.referentLoaded">
+					<td class="value"><input type="text" v-model="current.languageCode" maxlength="8" v-on:change="current.languageCode=current.languageCode.toUpperCase()" class="short"></td>
-					<td class="label">Current Language</td>
+				</tr>
-					<td class="value">
+				<tr v-if="meta.currentLoaded">
-						<input type="file" id="current-lang-file" onchange="fileChanged(this)" accept=".json">
+					<td class="label">Local Language Name</td>
-						<span class="selected" v-if="meta.currentLoaded">{{ current.languageLocalName }} [{{current.languageCode}}]</span>
+					<td class="value"><input type="text" v-model="current.languageLocalName" class="short"></td>
-					</td>
+				</tr>
-				</tr>
+				<tr v-if="meta.currentLoaded">
-				<tr v-if="meta.currentLoaded">
+					<td class="label">Font table to use</td>
-					<td class="label">Local Language Code</td>
+					<td class="value">
-					<td class="value"><input type="text" v-model="current.languageCode" maxlength="8" v-on:change="current.languageCode=current.languageCode.toUpperCase()" class="short"></td>
+						<select v-model="current.cyrillicGlyphs" v-on:change="current.cyrillicGlyphs = current.cyrillicGlyphs=='true'">
-				</tr>
+							<option value="false">Latin Extended</option>
-				<tr v-if="meta.currentLoaded">
+							<option value="true">Cyrillic Glyphs</option>
-					<td class="label">Local Language Name</td>
+						</select>
-					<td class="value"><input type="text" v-model="current.languageLocalName" class="short"></td>
+					</td>
-				</tr>
+				</tr>
-				<tr v-if="meta.currentLoaded">
+			</table>
-					<td class="label">Font table to use</td>
+			
-					<td class="value">
+			<div v-if="def.messages && referent.messages && current.messages">
-						<select v-model="current.cyrillicGlyphs" v-on:change="current.cyrillicGlyphs = current.cyrillicGlyphs=='true'">
+
-							<option value="false">Latin Extended</option>
+				<div class="footer">
-							<option value="true">Cyrillic Glyphs</option>
+					<input type="button" value="Save" onclick="save()">
-						</select>
+					<input type="button" value="View" onclick="view()">
-					</td>
+				</div>
-				</tr>
+				
-			</table>
+				<div v-if="Object.keys(obsolete).length > 0">
-			
+					<h2>Obsolete</h2>
-			<div v-if="def.messages && referent.messages && current.messages">
+					<table class="data">
-
+						<tr v-for="entry in obsolete">
-				<div class="footer">
+							<td class="label"><div class="stringId">{{entry.id}}</div></td>
-					<input type="button" value="Save" onclick="save()">
+							<td class="value"><div class="ref">{{entry.value}}</div></td>
-					<input type="button" value="View" onclick="view()">
+						</tr>
-				</div>
+					</table>
-				
+				</div>
-				<div v-if="Object.keys(obsolete).length > 0">
+
-					<h2>Obsolete</h2>
+				<h2>Messages and Strings</h2>
-					<table class="data">
+				<table class="data">
-						<tr v-for="entry in obsolete">
+					<tr v-for="message in def.messages" v-bind:class="validateInput(current.messages, message.id)">
-							<td class="label"><div class="stringId">{{entry.id}}</div></td>
+						<td class="label"><div class="stringId">{{message.id}}</div></td>
-							<td class="value"><div class="ref">{{entry.value}}</div></td>
+						<td class="value">
-						</tr>
+							<div class="constraint">{{constraintString(message)}}</div>
-					</table>
+							<div class="ref">{{referent.messages[message.id]}}</div>
-				</div>
+							<div class="note" v-if="message.note">{{message.note}}</div>
-
+							<div class="tran"><input :id="'in_'+message.id" type="text" v-model="current.messages[message.id]" v-bind:class="{unchanged : current.messages[message.id] == referent.messages[message.id], empty : current.messages[message.id]==''}"></div>
-				<h2>Messages and Strings</h2>
+						</td>
-				<table class="data">
+					</tr>
-					<tr v-for="message in def.messages" v-bind:class="validateInput(current.messages, message.id)">
+				</table>
-						<td class="label"><div class="stringId">{{message.id}}</div></td>
+
-						<td class="value">
+				<h2>Characters</h2>
-							<div class="constraint">{{constraintString(message)}}</div>
+				<table class="data">
-							<div class="ref">{{referent.messages[message.id]}}</div>
+					<tr v-for="char in def.characters" v-bind:class="validateInput(current.characters, char.id)">
-							<div class="note" v-if="message.note">{{message.note}}</div>
+						<td class="label"><div class="stringId">{{char.id}}</div></td>
-							<div class="tran"><input :id="'in_'+message.id" type="text" v-model="current.messages[message.id]" v-bind:class="{unchanged : current.messages[message.id] == referent.messages[message.id], empty : current.messages[message.id]==''}"></div>
+						<td class="value">
-						</td>
+							<div class="constraint">{{constraintString(char)}}</div>
-					</tr>
+							<div class="ref">{{referent.characters[char.id]}}</div>
-				</table>
+							<div class="tran"><input type="text" v-model="current.characters[char.id]" v-bind:class="{unchanged : current.characters[char.id] == referent.characters[char.id], empty : current.characters[char.id].length != 1}"></div>
-
+						</td>
-				<h2>Characters</h2>
+					</tr>
-				<table class="data">
+				</table>
-					<tr v-for="char in def.characters" v-bind:class="validateInput(current.characters, char.id)">
+
-						<td class="label"><div class="stringId">{{char.id}}</div></td>
+				<h2>Menu Groups</h2>
-						<td class="value">
+				<table class="data">
-							<div class="constraint">{{constraintString(char)}}</div>
+					<tr v-for="menu in def.menuGroups" v-bind:class="validateInput(current.menuGroups, menu.id, 2)">
-							<div class="ref">{{referent.characters[char.id]}}</div>
+						<td class="label"><div class="stringId">{{menu.id}}</div></td>
-							<div class="tran"><input type="text" v-model="current.characters[char.id]" v-bind:class="{unchanged : current.characters[char.id] == referent.characters[char.id], empty : current.characters[char.id].length != 1}"></div>
+						<td class="value">
-						</td>
+							<div class="label">Menu Name</div>
-					</tr>
+							<div class="constraint">{{constraintString(menu)}}</div>
-				</table>
+							<div class="ref">{{referent.menuGroups[menu.id].text2}}</div>
-
+							<div class="tran" v-bind:class="{unchanged : current.menuGroups[menu.id].text2[0] == referent.menuGroups[menu.id].text2[0] && current.menuGroups[menu.id].text2[1] == referent.menuGroups[menu.id].text2[1], empty : current.menuGroups[menu.id].text2[0] == '' || current.menuGroups[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuGroups[menu.id].text2[0]"><input type="text" v-model="current.menuGroups[menu.id].text2[1]"></div>
-				<h2>Menu Groups</h2>
+							<div class="label">Description</div>
-				<table class="data">
+							<div class="ref">{{referent.menuGroups[menu.id].desc}}</div>
-					<tr v-for="menu in def.menuGroups" v-bind:class="validateInput(current.menuGroups, menu.id, 2)">
+							<div class="tran"><input type="text" v-model="current.menuGroups[menu.id].desc" v-bind:class="{unchanged : current.menuGroups[menu.id].desc == referent.menuGroups[menu.id].desc, empty : current.menuGroups[menu.id].desc == ''}"></div>
-						<td class="label"><div class="stringId">{{menu.id}}</div></td>
+						</td>
-						<td class="value">
+					</tr>
-							<div class="label">Menu Name</div>
+				</table>
-							<div class="constraint">{{constraintString(menu)}}</div>
+
-							<div class="ref">{{referent.menuGroups[menu.id].text2}}</div>
+				<h2>Menu Options</h2>
-							<div class="tran" v-bind:class="{unchanged : current.menuGroups[menu.id].text2[0] == referent.menuGroups[menu.id].text2[0] && current.menuGroups[menu.id].text2[1] == referent.menuGroups[menu.id].text2[1], empty : current.menuGroups[menu.id].text2[0] == '' || current.menuGroups[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuGroups[menu.id].text2[0]"><input type="text" v-model="current.menuGroups[menu.id].text2[1]"></div>
+				<table class="data">
-							<div class="label">Description</div>
+					<tr v-for="menu in def.menuOptions" v-bind:class="validateInput(current.menuOptions, menu.id, 2)">
-							<div class="ref">{{referent.menuGroups[menu.id].desc}}</div>
+						<td class="label"><div class="stringId">{{menu.id}}</div></td>
-							<div class="tran"><input type="text" v-model="current.menuGroups[menu.id].desc" v-bind:class="{unchanged : current.menuGroups[menu.id].desc == referent.menuGroups[menu.id].desc, empty : current.menuGroups[menu.id].desc == ''}"></div>
+						<td class="value">
-						</td>
+							<div v-bind:class="{hidden : false}">
-					</tr>
+								<div class="label">Menu Name (Double-Line)</div>
-				</table>
+								<div class="constraint">{{constraintString(menu)}}</div>
-
+								<div class="ref">{{referent.menuOptions[menu.id].text2}}</div>
-				<h2>Menu Options</h2>
+								<div class="tran" v-bind:class="{unchanged : current.menuOptions[menu.id].text2[0] == referent.menuOptions[menu.id].text2[0] && current.menuOptions[menu.id].text2[1] == referent.menuOptions[menu.id].text2[1], empty : current.menuOptions[menu.id].text2[0] == '' || current.menuOptions[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuOptions[menu.id].text2[0]"><input type="text" v-model="current.menuOptions[menu.id].text2[1]"></div>
-				<table class="data">
+							</div>
-					<tr>
+							<div class="label">Description</div>
-						<td class="label">Menu Type</td>
+							<div class="ref">{{referent.menuOptions[menu.id].desc}}</div>
-						<td class="value">
+							<div class="tran"><input type="text" v-model="current.menuOptions[menu.id].desc" v-bind:class="{unchanged : current.menuOptions[menu.id].desc == referent.menuOptions[menu.id].desc, empty : current.menuOptions[menu.id].desc == ''}"></div>
-							<select v-model="current.menuDouble" v-on:change="current.menuDouble = current.menuDouble=='true'">
+						</td>
-								<option value="false">Single-Line</option>
+					</tr>
-								<option value="true">Double-Line</option>
+				</table>
-							</select>
+
-						</td>
+				<div class="footer">
-					</tr>
+					<input type="button" value="Save" onclick="save()">
-					<tr v-for="menu in def.menuOptions" v-bind:class="validateInput(current.menuOptions, menu.id, (current.menuDouble ? 2 : 1))">
+					<input type="button" value="View" onclick="view()">
-						<td class="label"><div class="stringId">{{menu.id}}</div></td>
+				</div>
-						<td class="value">
+			</div>
-							<div v-bind:class="{hidden : current.menuDouble}">
+		</div>
-								<div class="label">Menu Name (Single-Line)</div>
+	</body>
-								<div class="constraint">{{constraintString(menu, current.menuDouble)}}</div>
-								<div class="ref">{{referent.menuOptions[menu.id].text}}</div>
-								<div class="tran"><input type="text" v-model="current.menuOptions[menu.id].text" v-bind:class="{unchanged : current.menuOptions[menu.id].text == referent.menuOptions[menu.id].text, empty : current.menuOptions[menu.id].text == ''}"></div>
-							</div>
-							<div v-bind:class="{hidden : !current.menuDouble}">
-								<div class="label">Menu Name (Double-Line)</div>
-								<div class="constraint">{{constraintString(menu, current.menuDouble)}}</div>
-								<div class="ref">{{referent.menuOptions[menu.id].text2}}</div>
-								<div class="tran" v-bind:class="{unchanged : current.menuOptions[menu.id].text2[0] == referent.menuOptions[menu.id].text2[0] && current.menuOptions[menu.id].text2[1] == referent.menuOptions[menu.id].text2[1], empty : current.menuOptions[menu.id].text2[0] == '' || current.menuOptions[menu.id].text2[1] == ''}"><input type="text" v-model="current.menuOptions[menu.id].text2[0]"><input type="text" v-model="current.menuOptions[menu.id].text2[1]"></div>
-							</div>
-							<div class="label">Description</div>
-							<div class="ref">{{referent.menuOptions[menu.id].desc}}</div>
-							<div class="tran"><input type="text" v-model="current.menuOptions[menu.id].desc" v-bind:class="{unchanged : current.menuOptions[menu.id].desc == referent.menuOptions[menu.id].desc, empty : current.menuOptions[menu.id].desc == ''}"></div>
-						</td>
-					</tr>
-				</table>
-
-				<div class="footer">
-					<input type="button" value="Save" onclick="save()">
-					<input type="button" value="View" onclick="view()">
-				</div>
-			</div>
-		</div>
-	</body>
 </html>

Translation Editor/TranslationsParser.html

@@ -1,325 +1,322 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
-<html>
+<html>
-
+
-	<head>
+	<head>
-		<meta charset="UTF-8">
+		<meta charset="UTF-8">
-		<title>TS100 Translation Parser</title>
+		<title>TS100 Translation Parser</title>
-
+
-		<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
+		<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
-		<script src="translations_commons.js"></script>
+		<script src="translations_commons.js"></script>
-		<script src="translations_def.js"></script>
+		<script src="translations_def.js"></script>
-		<script>
+		<script>
-
+
-	var app;
+	var app;
-	var defMap = {};
+	var defMap = {};
-	var langMap = {};
+	var langMap = {};
-	var lang;
+	var lang;
-
+
-	var defMsgMap;
+	var defMsgMap;
-	var defCharMap; 	
+	var defCharMap; 	
-	var defGrpMap;	
+	var defGrpMap;	
-	var defOptMap;	
+	var defOptMap;	
-	
+	
-	function save(langCode){
+	function save(langCode){
-		saveJSON(langMap[langCode], "translation_"+langCode.toLowerCase()+".json");
+		saveJSON(langMap[langCode], "translation_"+langCode.toLowerCase()+".json");
-	}
+	}
-
+
-	function view(langCode){
+	function view(langCode){
-		showJSON(langMap[langCode], "translation_"+langCode.toLowerCase()+".json");
+		showJSON(langMap[langCode], "translation_"+langCode.toLowerCase()+".json");
-	}
+	}
-
+
-	function translationFileSelected(e) {
+	function translationFileSelected(e) {
-		var target = e;
+		var target = e;
-		var id = target.id;
+		var id = target.id;
-		
+		
-		var file = target.files[0];
+		var file = target.files[0];
-		if (!file) {
+		if (!file) {
-			return;
+			return;
-		}
+		}
-		var fr = new FileReader();
+		var fr = new FileReader();
-		fr.onload = function(e) {
+		fr.onload = function(e) {
-			parseTranslationFile(file.name, e.target.result);
+			parseTranslationFile(file.name, e.target.result);
-		}
+		}
-		fr.readAsText(file);
+		fr.readAsText(file);
-		
+		
-	}
+	}
-	
+	
-	function parseTranslationFile(name, src) {
+	function parseTranslationFile(name, src) {
-		// remove multiline comments
+		// remove multiline comments
-		src = src.replace(/\/\*[\s\S.]*?\*\//mg, "");
+		src = src.replace(/\/\*[\s\S.]*?\*\//mg, "");
-		// remove single-line comments
+		// remove single-line comments
-		src = src.replace(/\/\/.*/mg, "");
+		src = src.replace(/\/\/.*/mg, "");
-		// remove empty lines
+		// remove empty lines
-		src = src.replace(/^\s*\n/gm, "");
+		src = src.replace(/^\s*\n/gm, "");
-		
+		
-		var langCode = "";
+		var langCode = "";
-		var srcLines = src.split("\n");
+		var srcLines = src.split("\n");
-
+
-		var reMessage = /const\s+char\s*\*\s+([\w\d]+)\s*=\s*"(.*)"/;
+		var reMessage = /const\s+char\s*\*\s+([\w\d]+)\s*=\s*"(.*)"/;
-		var reSettingsDescStart = /const\s+char\s*\*\s+SettingsDescriptions\[/;
+		var reSettingsDescStart = /const\s+char\s*\*\s+SettingsDescriptions\[/;
-		var reSettingsNamesStart = /const\s+char\s*\*\s+SettingsShortNames\[/;
+		var reSettingsNamesStart = /const\s+char\s*\*\s+SettingsShortNames\[/;
-		var reSettingsMenuDescStart = /const\s+char\s*\*\s+SettingsMenuEntriesDescriptions\[/;
+		var reSettingsMenuDescStart = /const\s+char\s*\*\s+SettingsMenuEntriesDescriptions\[/;
-		var reChar = /const\s+char\s+([\w\d]+)\s*=\s*'(\w)'/;
+		var reChar = /const\s+char\s+([\w\d]+)\s*=\s*'(\w)'/;
-		var reMenuMode = /SettingsShortNameType\s*=\s*SHORT_NAME_(\w+)_LINE/;
+		var reMenuMode = /SettingsShortNameType\s*=\s*SHORT_NAME_(\w+)_LINE/;
-		
+		
-		var reMenuStart = /\s*const\s+char\s*\*\s+SettingsMenuEntries\[/;
+		var reMenuStart = /\s*const\s+char\s*\*\s+SettingsMenuEntries\[/;
-
+
-//		var reString = /^\s*"(.*)"/;
+//		var reString = /^\s*"(.*)"/;
-		var reString = /"(.*)"/;
+		var reString = /"(.*)"/;
-		var reSingleLine = /{\s*"(.*)"\s*}/;
+		var reSingleLine = /{\s*"(.*)"\s*}/;
-		var reDoubleLine = /{\s*"(.*)"\s*,\s*"(.*)"\s*}/;
+		var reDoubleLine = /{\s*"(.*)"\s*,\s*"(.*)"\s*}/;
-		
+		
-		var mode = '';
+		var mode = '';
-		var entryIndex = 0;
+		var entryIndex = 0;
-		for (var li = 0; li < srcLines.length; li++) {
+		for (var li = 0; li < srcLines.length; li++) {
-			// trim lines
+			// trim lines
-			line = srcLines[li] = srcLines[li].trim();
+			line = srcLines[li] = srcLines[li].trim();
-			
+			
-			// if entering a new lang block
+			// if entering a new lang block
-			if (startsWith(line, "#ifdef LANG_")) {
+			if (startsWith(line, "#ifdef LANG_")) {
-				mode = 'new-language';
+				mode = 'new-language';
-				langCode = line.substring(12);
+				langCode = line.substring(12);
-				lang = langMap[langCode];
+				lang = langMap[langCode];
-				// use existing or instantiate new
+				// use existing or instantiate new
-				if (!isDefined(lang)) {
+				if (!isDefined(lang)) {
-					lang = {
+					lang = {
-						languageCode: langCode,
+						languageCode: langCode,
-						cyrillicGlyphs: false,
+						cyrillicGlyphs: false,
-						messages: {},
+						messages: {},
-						characters: {},
+						characters: {},
-						menuDouble : false,
+						menuGroups: {},
-						menuGroups: {},
+						menuOptions: {}
-						menuOptions: {}
+					};
-					};
+					langMap[langCode] = lang;
-					langMap[langCode] = lang;
+					app.languages[app.languages.length] = langCode;
-					app.languages[app.languages.length] = langCode;
+				}
-				}
+				entryIndex = 0;
-				entryIndex = 0;
+				continue;
-				continue;
+			}
-			}
+
-
+			// Use Cyrillic glyphs
-			// Use Cyrillic glyphs
+			if (startsWith(line, "#define CYRILLIC_GLYPHS")) {
-			if (startsWith(line, "#define CYRILLIC_GLYPHS")) {
+				lang.cyrillicGlyphs = true;
-				lang.cyrillicGlyphs = true;
+				entryIndex = 0;
-				entryIndex = 0;
+				continue;
-				continue;
+			}
-			}
+
-
+			// Menu type
-			// Menu type
+			reMenuMode.lastIndex = 0;
-			reMenuMode.lastIndex = 0;
+			match = reMenuMode.exec(line);
-			match = reMenuMode.exec(line);
+			if (match) {
-			if (match) {
+				entryIndex = 0;
-				lang.menuDouble = match[1] == 'DOUBLE';
+				continue;
-				entryIndex = 0;
+			}
-				continue;
+			
-			}
+			// Messages
-			
+			reMessage.lastIndex = 0;
-			// Messages
+			match = reMessage.exec(line);
-			reMessage.lastIndex = 0;
+			if (match) {
-			match = reMessage.exec(line);
+				lang.messages[match[1]] = xunescape(match[2]);
-			if (match) {
+				entryIndex = 0;
-				lang.messages[match[1]] = xunescape(match[2]);
+				continue;
-				entryIndex = 0;
+			}
-				continue;
+			
-			}
+			// Chars descriptions
-			
+			reChar.lastIndex = 0;
-			// Chars descriptions
+			match = reChar.exec(line);
-			reChar.lastIndex = 0;
+			if (match) {
-			match = reChar.exec(line);
+				// found description block start
-			if (match) {
+				mode = 'char';
-				// found description block start
+				lang.characters[match[1]] = xunescape(match[2]);
-				mode = 'char';
+				entryIndex = 0;
-				lang.characters[match[1]] = xunescape(match[2]);
+				continue;
-				entryIndex = 0;
+			}
-				continue;
+			// Settings descriptions
-			}
+			reSettingsDescStart.lastIndex = 0;
-			// Settings descriptions
+			match = reSettingsDescStart.exec(line);
-			reSettingsDescStart.lastIndex = 0;
+			if (match) {
-			match = reSettingsDescStart.exec(line);
+				// found description block start
-			if (match) {
+				mode = 'settingsDesc';
-				// found description block start
+				entryIndex = 0;
-				mode = 'settingsDesc';
+				continue;
-				entryIndex = 0;
+			}
-				continue;
+			reSettingsNamesStart.lastIndex = 0;
-			}
+			match = reSettingsNamesStart.exec(line);
-			reSettingsNamesStart.lastIndex = 0;
+			if (match) {
-			match = reSettingsNamesStart.exec(line);
+				// found description block start
-			if (match) {
+				mode = 'settingsNames';
-				// found description block start
+				entryIndex = 0;
-				mode = 'settingsNames';
+				continue;
-				entryIndex = 0;
+			}
-				continue;
+			reMenuStart.lastIndex = 0;
-			}
+			match = reMenuStart.exec(line);
-			reMenuStart.lastIndex = 0;
+			if (match) {
-			match = reMenuStart.exec(line);
+				// found description block start
-			if (match) {
+				mode = 'menu';
-				// found description block start
+				entryIndex = 0;
-				mode = 'menu';
+				continue;
-				entryIndex = 0;
+			}
-				continue;
+			reSettingsMenuDescStart.lastIndex = 0;
-			}
+			match = reSettingsMenuDescStart.exec(line);
-			reSettingsMenuDescStart.lastIndex = 0;
+			if (match) {
-			match = reSettingsMenuDescStart.exec(line);
+				// found description block start
-			if (match) {
+				mode = 'menuDesc';
-				// found description block start
+				entryIndex = 0;
-				mode = 'menuDesc';
+				continue;
-				entryIndex = 0;
+			}
-				continue;
+			
-			}
+			if (mode == 'menu') {
-			
+				// processing menu group names
-			if (mode == 'menu') {
+				reString.lastIndex = 0;
-				// processing menu group names
+				match = reString.exec(line);
-				reString.lastIndex = 0;
+				if (match) {
-				match = reString.exec(line);
+					// found description string
-				if (match) {
+					var entry = getMenuGroup(entryIndex);
-					// found description string
+					var m = match[1].split("\\n");
-					var entry = getMenuGroup(entryIndex);
+					entry.text2[0] = xunescape(m[0]);
-					var m = match[1].split("\\n");
+					entry.text2[1] = xunescape(m[1]);
-					entry.text2[0] = xunescape(m[0]);
+					entryIndex++;
-					entry.text2[1] = xunescape(m[1]);
+				}
-					entryIndex++;
+			} else if (mode == 'menuDesc') {
-				}
+				// processing menu group descriptions
-			} else if (mode == 'menuDesc') {
+				reString.lastIndex = 0;
-				// processing menu group descriptions
+				match = reString.exec(line);
-				reString.lastIndex = 0;
+				if (match) {
-				match = reString.exec(line);
+					// found description string
-				if (match) {
+					var entry = getMenuGroup(entryIndex);
-					// found description string
+					entry.desc = xunescape(match[1]);
-					var entry = getMenuGroup(entryIndex);
+					entryIndex++;
-					entry.desc = xunescape(match[1]);
+				}
-					entryIndex++;
+			} else if (mode == 'settingsDesc') {
-				}
+				// processing option descriptions
-			} else if (mode == 'settingsDesc') {
+				reString.lastIndex = 0;
-				// processing option descriptions
+				match = reString.exec(line);
-				reString.lastIndex = 0;
+				if (match) {
-				match = reString.exec(line);
+					// found description string
-				if (match) {
+					var entry = getMenuOption(entryIndex);
-					// found description string
+					entry.desc = xunescape(match[1]);
-					var entry = getMenuOption(entryIndex);
+					entryIndex++;
-					entry.desc = xunescape(match[1]);
+				}
-					entryIndex++;
+			} else if (mode == 'settingsNames') {
-				}
+				reDoubleLine.lastIndex = 0;
-			} else if (mode == 'settingsNames') {
+				match = reDoubleLine.exec(line);
-				reDoubleLine.lastIndex = 0;
+				if (match) {
-				match = reDoubleLine.exec(line);
+					var entry = getMenuOption(entryIndex);
-				if (match) {
+					entry.text2[0] = xunescape(match[1]);
-					var entry = getMenuOption(entryIndex);
+					entry.text2[1] = xunescape(match[2]);
-					entry.text2[0] = xunescape(match[1]);
+					entryIndex++;
-					entry.text2[1] = xunescape(match[2]);
+				} else {
-					entryIndex++;
+					reSingleLine.lastIndex = 0;
-				} else {
+					match = reSingleLine.exec(line);
-					reSingleLine.lastIndex = 0;
+					if (match) {
-					match = reSingleLine.exec(line);
+						var entry = getMenuOption(entryIndex);
-					if (match) {
+						entry.text = xunescape(match[1]);
-						var entry = getMenuOption(entryIndex);
+						entryIndex++;
-						entry.text = xunescape(match[1]);
+					}
-						entryIndex++;
+
-					}
+				}
-
+			}
-				}
+		}
-			}
+		app.done = 1;
-		}
+	}
-		app.done = 1;
+
-	}
+	function getMenuOption(entryIndex) {
-
+		var optionDef = def.menuOptions[entryIndex];
-	function getMenuOption(entryIndex) {
+		if (!isDefined(optionDef)) {
-		var optionDef = def.menuOptions[entryIndex];
+			var s = "Could not find menu option with index "+entryIndex;
-		if (!isDefined(optionDef)) {
+			alert(s);
-			var s = "Could not find menu option with index "+entryIndex;
+			throw s;
-			alert(s);
+		}
-			throw s;
+		var id = optionDef.id;
-		}
+		var entry = lang.menuOptions[id];
-		var id = optionDef.id;
+		if (!isDefined(entry)) {
-		var entry = lang.menuOptions[id];
+			entry =
-		if (!isDefined(entry)) {
+			{
-			entry =
+				"text2": ["", ""],
-			{
+				"desc": ""
-				"text": "",
+			}
-				"text2": ["", ""],
+			lang.menuOptions[id] = entry;
-				"desc": ""
+		}
-			}
+		return entry;
-			lang.menuOptions[id] = entry;
+	}
-		}
+	
-		return entry;
+	function getMenuGroup(entryIndex) {
-	}
+		var optionDef = def.menuGroups[entryIndex];
-	
+		if (!isDefined(optionDef)) {
-	function getMenuGroup(entryIndex) {
+			var s = "Could not find menu group with index "+entryIndex;
-		var optionDef = def.menuGroups[entryIndex];
+			alert(s);
-		if (!isDefined(optionDef)) {
+			throw s;
-			var s = "Could not find menu group with index "+entryIndex;
+		}
-			alert(s);
+		var id = optionDef.id;
-			throw s;
+		var entry = lang.menuGroups[id];
-		}
+		if (!isDefined(entry)) {
-		var id = optionDef.id;
+			entry =
-		var entry = lang.menuGroups[id];
+			{
-		if (!isDefined(entry)) {
+				"text2": ["", ""],
-			entry =
+				"desc": ""
-			{
+			}
-				"text2": ["", ""],
+			lang.menuGroups[id] = entry;
-				"desc": ""
+		}
-			}
+		return entry;
-			lang.menuGroups[id] = entry;
+	}
-		}
+	
-		return entry;
+	function markSaved(lang) {
-	}
+		document.getElementById("row_"+lang).classList.add("saved");
-	
+	}
-	function markSaved(lang) {
+	
-		document.getElementById("row_"+lang).classList.add("saved");
+	function loaded() {
-	}
+		app = new Vue({
-	
+			el : '#app',
-	function loaded() {
+			data : {
-		app = new Vue({
+				languages: [],
-			el : '#app',
+				done : false,
-			data : {
+				def : {
-				languages: [],
+				}
-				done : false,
+				
-				def : {
+			},
-				}
+			methods : {
-				
+				vSave : function(lang) {
-			},
+					save(lang);
-			methods : {
+					markSaved(lang);
-				vSave : function(lang) {
+				},
-					save(lang);
+				vView : function(lang) {
-					markSaved(lang);
+					view(lang);
-				},
+					markSaved(lang);
-				vView : function(lang) {
+				}
-					view(lang);
+			}
-					markSaved(lang);
+		});
-				}
+		
-			}
+		app.def = def;
-		});
+		defMsgMap = copyArrayToMap(app.def.messages);
-		
+		defCharMap = copyArrayToMap(app.def.characters);
-		app.def = def;
+		defGrpMap = copyArrayToMap(app.def.menuGroups);
-		defMsgMap = copyArrayToMap(app.def.messages);
+		defOptMap = copyArrayToMap(app.def.menuOptions);
-		defCharMap = copyArrayToMap(app.def.characters);
+	}
-		defGrpMap = copyArrayToMap(app.def.menuGroups);
+
-		defOptMap = copyArrayToMap(app.def.menuOptions);
+	window.onload=loaded;
-	}
+</script>
-
+	<link href="translations.css" rel="stylesheet" type="text/css">
-	window.onload=loaded;
+	</head>
-</script>
+	<body>
-	<link href="translations.css" rel="stylesheet" type="text/css">
+
-	</head>
+		<div id="app">
-	<body>
+			<h1>TS100 Translation Parser</h1>
-
+			<table class="header data">
-		<div id="app">
+				<tr>
-			<h1>TS100 Translation Parser</h1>
+					<td class="label">Translation.cpp</td>
-			<table class="header data">
+					<td class="value">
-				<tr>
+						<input type="file" id="translation-cpp-file" onchange="translationFileSelected(this)" accept=".cpp">
-					<td class="label">Translation.cpp</td>
+					</td>
-					<td class="value">
+				</tr>
-						<input type="file" id="translation-cpp-file" onchange="translationFileSelected(this)" accept=".cpp">
+			</table>
-					</td>
+			
-				</tr>
+			<div class="data" v-if="done">
-			</table>
+				<div class="value" v-for="lang in languages" :id="'row_'+lang">
-			
+					<input type="button" :value="'Save '+lang" v-on:click="vSave(lang)">
-			<div class="data" v-if="done">
+					<input type="button" :value="'View '+lang" v-on:click="vView(lang)">
-				<div class="value" v-for="lang in languages" :id="'row_'+lang">
+				</div>
-					<input type="button" :value="'Save '+lang" v-on:click="vSave(lang)">
+			</div>
-					<input type="button" :value="'View '+lang" v-on:click="vView(lang)">
+				
-				</div>
+		</div>
-			</div>
+	</body>
-				
-		</div>
-	</body>
 </html>

Translation 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," ,
+        "IJ":"0x00,0x03,0xFF,0xFF,0x03,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x00,0x30,0x3F,0x3F,0x30,0x0C,0x1C,0x30,0x30,0x3F,0x1F,0x00," ,
+        "ij":"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," ,
+        "ʼn":"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,",
+		"IJ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ij":"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,",
+		"ʼn":"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

Translation Editor/make_translation.py

@@ -1,246 +1,542 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
-
+# coding=utf-8
-from __future__ import print_function
+from __future__ import print_function
-import json
+import json
-import os
+import os
-import io
+import io
-import sys
+from datetime import datetime
-
+import sys
-TRANSLATION_CPP = "Translation.cpp"
+import fontTables
-
+import re
-try :
+import subprocess
-    to_unicode = unicode
+
-except NameError:
+TRANSLATION_CPP = "Translation.cpp"
-    to_unicode = str
+UNIT_H = "unit.h"
-
+
-
+try:
-# Loading a single JSON file
+    to_unicode = unicode
-def loadJson(fileName, skipFirstLine):
+except NameError:
-    with io.open(fileName, mode="r", encoding="utf-8") as f:
+    to_unicode = str
-        if skipFirstLine:
+
-            f.readline()
+
-
+# Loading a single JSON file
-        obj = json.loads(f.read())
+def loadJson(fileName, skipFirstLine):
-
+    with io.open(fileName, mode="r", encoding="utf-8") as f:
-    return obj
+        if skipFirstLine:
-
+            f.readline()
-
+
-# Reading all language translations into a dictionary by langCode
+        obj = json.loads(f.read())
-def readTranslations(jsonDir):
+
-    langDict = {}
+    return obj
-    
+
-    # Read all translation files from the input dir
+
-    for fileName in os.listdir(jsonDir):
+# Reading all language translations into a dictionary by langCode
-        
+def readTranslations(jsonDir):
-        fileWithPath = os.path.join(jsonDir, fileName)
+    langDict = {}
-        lf = fileName.lower()
+    UnitDict = {}
-    
+
-        # Read only translation_XX.json
+    # Read all translation files from the input dir
-        if lf.startswith("translation_") and lf.endswith(".json"):
+    for fileName in os.listdir(jsonDir):
-            try:
+
-                lang = loadJson(fileWithPath, False)
+        fileWithPath = os.path.join(jsonDir, fileName)
-            except json.decoder.JSONDecodeError as e:
+        lf = fileName.lower()
-                print("Failed to decode " + lf)
+
-                print(str(e))
+        # Read only translation_XX.json
-                sys.exit(2)
+        if lf.startswith("translation_") and lf.endswith(".json"):
-
+            try:
-            # Extract lang code from file name
+                lang = loadJson(fileWithPath, False)
-            langCode = fileName[12:-5].upper()
+            except json.decoder.JSONDecodeError as e:
-            # ...and the one specified in the JSON file...
+                print("Failed to decode " + lf)
-            try:
+                print(str(e))
-                langCodeFromJson = lang['languageCode']
+                sys.exit(2)
-            except KeyError:
+
-                langCodeFromJson = "(missing)"
+            # Extract lang code from file name
-
+            langCode = fileName[12:-5].upper()
-            # ...cause they should be the same!
+            # ...and the one specified in the JSON file...
-            if langCode != langCodeFromJson:
+            try:
-                raise ValueError("Invalid languageCode " + langCodeFromJson + " in file " + fileName)
+                langCodeFromJson = lang['languageCode']
-            
+            except KeyError:
-            langDict[langCode] = lang
+                langCodeFromJson = "(missing)"
-    
+
-    return langDict
+            try:
-
+                TempUnitF_FromJson = lang['tempUnitFahrenheit']
-
+            except KeyError:
-def writeStart(f):
+                TempUnitF_FromJson = True # Default to true.
-    f.write(to_unicode("""// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT.
+            
-
+            # ...cause they should be the same!
-#include "Translation.h"
+            if langCode != langCodeFromJson:
-#ifndef LANG
+                raise ValueError("Invalid languageCode " + langCodeFromJson +
-#define LANG_EN
+                                 " in file " + fileName)
-#endif
+
-"""))
+            langDict[langCode] = lang
-
+            UnitDict[langCode] = TempUnitF_FromJson
-
+    return langDict, UnitDict
-def escapeC(s):
+
-    return s.replace("\"", "\\\"")
+
-
+def writeStart(f):
-
+    f.write(
-def writeLanguage(languageCode, defs, f):
+        to_unicode(
-    print("Generating block for " + languageCode)
+            """// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT.
-    lang = langDict[languageCode]
+
-    
+#include "Translation.h"
-    f.write(to_unicode("\n#ifdef LANG_" + languageCode + "\n"))
+#ifndef LANG
-    try:
+#define LANG_EN
-        langName = lang['languageLocalName']
+#endif
-    except KeyError:
+"""))
-        langName = languageCode
+
-         
+
-    f.write(to_unicode("// ---- " + langName + " ----\n\n"))
+def writeStartUnit(f):
-
+    f.write(
-    try:
+        to_unicode(
-        cyrillic = lang['cyrillicGlyphs']
+            """// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT.
-    except KeyError:
+ 
-        cyrillic = False
+/**
-
+ * °F Fahrenheit Support
-    if cyrillic :
+ * You will find the default Fahrenheit configuration in the translation_xx.json
-        f.write(to_unicode("#define CYRILLIC_GLYPHS\n\n"))
+ * If tempUnitFahrenheit is set to:
-        
+ *    true -  you can switch in menu settings to Fahrenheit or Celsius.
-    # ----- Writing SettingsDescriptions
+ *    false - you see only Celsius. All settings are then is in Celsius only.
-    obj = lang['menuOptions']
+ */
-    f.write(to_unicode("const char* SettingsDescriptions[] = {\n"))
+
-    
+#ifndef _UNIT_H
-    maxLen = 25
+#define _UNIT_H\n
-    for mod in defs['menuOptions']:
+"""))
-        eid = mod['id']
+
-        if 'feature' in mod:
+def escapeC(s):
-            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+    return s.replace("\"", "\\\"")
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+
-        f.write(to_unicode("\"" + escapeC(obj[eid]['desc']) + "\",\n"))
+
-        if 'feature' in mod:
+def getConstants():
-            f.write(to_unicode("#endif\n"))
+    # Extra constants that are used in the firmware that are shared across all languages
-
+    consants = []
-    f.write(to_unicode("};\n\n"))
+    consants.append(('SymbolPlus', '+'))
-    
+    consants.append(('SymbolMinus', '-'))
-    # ----- Writing Message strings
+    consants.append(('SymbolSpace', ' '))
-    
+    consants.append(('SymbolDot', '.'))
-    obj = lang['messages']
+    consants.append(('SymbolDegC', 'C'))
-    
+    consants.append(('SymbolDegF', 'F'))
-    for mod in defs['messages']:
+    consants.append(('SymbolMinutes', 'M'))
-        eid = mod['id']
+    consants.append(('SymbolSeconds', 'S'))
-        f.write(to_unicode("const char* " + eid + " = \"" + escapeC(obj[eid]) + "\";\n"))
+    consants.append(('SymbolWatts', 'W'))
-
+    consants.append(('SymbolVolts', 'V'))
-    f.write(to_unicode("\n"))
+    consants.append(('SymbolDC', 'DC'))
-
+    consants.append(('SymbolCellCount', 'S'))
-    # ----- Writing Characters
+    consants.append(('SymbolVersionNumber', buildVersion))
-    
+    return consants
-    obj = lang['characters']
+
-    
+
-    for mod in defs['characters']:
+
-        eid = mod['id']
+def getDebugMenu():
-        f.write(to_unicode("const char " + eid + " = '" + obj[eid] + "';\n"))
+    constants = []
-
+    constants.append(datetime.today().strftime('%d-%m-%y'))
-    f.write(to_unicode("\n"))
+    constants.append("HW G ")
-    
+    constants.append("HW M ")
-    # ----- Menu Options
+    constants.append("HW P ")
-
+    constants.append("Time ")
-    # Menu type
+    constants.append("Move ")
-    f.write(to_unicode("const enum ShortNameType SettingsShortNameType = SHORT_NAME_" + ("DOUBLE" if lang['menuDouble'] else "SINGLE") + "_LINE;\n"))
+    constants.append("RTip ")
-
+    constants.append("CTip ")
-    # ----- Writing SettingsDescriptions
+    constants.append("CHan ")
-    obj = lang['menuOptions']
+    constants.append("Vin  ")
-    f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
+    constants.append("PCB  ")  # PCB Version AKA IMU version
-    
+    return constants
-    maxLen = 25
+
-    for mod in defs['menuOptions']:
+
-        eid = mod['id']
+def getLetterCounts(defs, lang):
-        if 'feature' in mod:
+    textList = []
-            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+    # iterate over all strings
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+    obj = lang['menuOptions']
-        if lang['menuDouble']:
+    for mod in defs['menuOptions']:
-            f.write(to_unicode("{ \"" + escapeC(obj[eid]['text2'][0]) + "\", \"" + escapeC(obj[eid]['text2'][1]) + "\" },\n"))
+        eid = mod['id']
-        else:
+        textList.append(obj[eid]['desc'])
-            f.write(to_unicode("{ \"" + escapeC(obj[eid]['text']) + "\" },\n"))
+
-        if 'feature' in mod:
+    obj = lang['messages']
-            f.write(to_unicode("#endif\n"))
+    for mod in defs['messages']:
-                
+        eid = mod['id']
-    f.write(to_unicode("};\n\n"))
+        if eid not in obj:
-
+            textList.append(mod['default'])
-    # ----- Writing Menu Groups
+        else:
-    obj = lang['menuGroups']
+            textList.append(obj[eid])
-    f.write(to_unicode("const char* SettingsMenuEntries[" + str(len(obj)) + "] = {\n"))
+
-    
+    obj = lang['characters']
-    maxLen = 25
+
-    for mod in defs['menuGroups']:
+    for mod in defs['characters']:
-        eid = mod['id']
+        eid = mod['id']
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        textList.append(obj[eid])
-        f.write(to_unicode("\"" + escapeC(obj[eid]['text2'][0] + "\\n" + obj[eid]['text2'][1]) + "\",\n"))
+
-                
+    obj = lang['menuOptions']
-    f.write(to_unicode("};\n\n"))
+    for mod in defs['menuOptions']:
-
+        eid = mod['id']
-    # ----- Writing Menu Groups Descriptions
+        textList.append(obj[eid]['text2'][0])
-    obj = lang['menuGroups']
+        textList.append(obj[eid]['text2'][1])
-    f.write(to_unicode("const char* SettingsMenuEntriesDescriptions[" + str(len(obj)) + "] = {\n"))
+
-    
+    obj = lang['menuGroups']
-    maxLen = 25
+    for mod in defs['menuGroups']:
-    for mod in defs['menuGroups']:
+        eid = mod['id']
-        eid = mod['id']
+        textList.append(obj[eid]['text2'][0])
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        textList.append(obj[eid]['text2'][1])
-        f.write(to_unicode("\"" + escapeC(obj[eid]['desc']) + "\",\n"))
+
-                
+    obj = lang['menuGroups']
-    f.write(to_unicode("};\n\n"))
+    for mod in defs['menuGroups']:
-
+        eid = mod['id']
-    # ----- Block end    
+        textList.append(obj[eid]['desc'])
-    f.write(to_unicode("#endif\n"))
+    constants = getConstants()
-
+    for x in constants:
-
+        textList.append(x[1])
-def read_opts():
+    textList.extend(getDebugMenu())
-    """ Reading input parameters
+
-    First parameter = json directory
+    # collapse all strings down into the composite letters and store totals for these
-    Second parameter = target directory
+
-    """
+    symbolCounts = {}
-    if len(sys.argv) > 1:
+    for line in textList:
-        jsonDir = sys.argv[1]
+        line = line.replace('\n', '').replace('\r', '')
-    else:
+        line = line.replace('\\n', '').replace('\\r', '')
-        jsonDir = "."
+        if len(line):
-
+            # print(line)
-    if len(sys.argv) > 2:
+            for letter in line:
-        outFile = sys.argv[2]
+                symbolCounts[letter] = symbolCounts.get(letter, 0) + 1
-    else:
+    symbolCounts = sorted(
-        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/src/")
+        symbolCounts.items(),
-        outFile = os.path.join(outDir, TRANSLATION_CPP)
+        key=lambda kv: (kv[1], kv[0]))  # swap to Big -> little sort order
-
+    symbolCounts = list(map(lambda x: x[0], symbolCounts))
-    if len(sys.argv) > 3:
+    symbolCounts.reverse()
-        raise Exception("Too many parameters!")
+    return symbolCounts
-
+
-    return jsonDir, outFile
+
-
+def getFontMapAndTable(textList):
-
+    # the text list is sorted
-def orderOutput(langDict):
+    # allocate out these in their order as number codes
-    # These languages go first
+    symbolMap = {}
-    mandatoryOrder = ['EN']
+    symbolMap['\n'] = '\\x01'  # Force insert the newline char
-
+    index = 2  # start at 2, as 0= null terminator,1 = new line
-    # Then add all others in alphabetical order
+    forcedFirstSymbols = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
-    sortedKeys = sorted(langDict.keys())
+    # enforce numbers are first
-
+    for sym in forcedFirstSymbols:
-    # Add the rest as they come
+        symbolMap[sym] = "\\x%0.2X" % index
-    for key in sortedKeys:
+        index = index + 1
-        if key not in mandatoryOrder:
+    if len(textList) > (253 - len(forcedFirstSymbols)):
-            mandatoryOrder.append(key)
+        print('Error, too many used symbols for this version')
-
+        exit(1)
-    return mandatoryOrder
+    print('Generating fonts for {} symbols'.format(len(textList)))
-    
+
-
+    for sym in textList:
-def writeTarget(outFile, defs, langCodes):
+        if sym not in symbolMap:
-    # Start writing the file
+            symbolMap[sym] = "\\x%0.2X" % index
-    with io.open(outFile, 'w', encoding='utf-8', newline="\n") as f:
+            index = index + 1
-        writeStart(f)
+    # Get the font table
-
+    fontTableStrings = []
-        for langCode in langCodes:
+    fontSmallTableStrings = []
-            writeLanguage(langCode, defs, f)
+    fontTable = fontTables.getFontMap()
-
+    fontSmallTable = fontTables.getSmallFontMap()
-
+    for sym in forcedFirstSymbols:
-if __name__ == "__main__":
+        if sym not in fontTable:
-    try:
+            print('Missing Large font element for {}'.format(sym))
-        jsonDir, outFile = read_opts()
+            exit(1)
-    except:
+        fontLine = fontTable[sym]
-        print("usage: make_translation.py {json dir} {cpp dir}")
+        fontTableStrings.append(
-        sys.exit(1)
+            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
-
+        if sym not in fontSmallTable:
-    print("Making " + outFile + " from " + jsonDir)
+            print('Missing Small font element for {}'.format(sym))
-
+            exit(1)
-    langDict = readTranslations(jsonDir)
+        fontLine = fontSmallTable[sym]
-    defs = loadJson(os.path.join(jsonDir, "translations_def.js"), True)
+        fontSmallTableStrings.append(
-    langCodes = orderOutput(langDict)
+            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
-    writeTarget(outFile, defs, langCodes)
+
-
+    for sym in textList:
-    print("Done")
+        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
+    index =0
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if 'feature' in mod:
+            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+        f.write(to_unicode("  /* ["+"{:02d}".format(index)+"] " + 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"))
+        index=index+1
+
+    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"))
+
+    # 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"))
+
+    # ----- Writing SettingsDescriptions
+    obj = lang['menuOptions']
+    f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
+
+    maxLen = 25
+    index = 0
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if 'feature' in mod:
+            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+        f.write(to_unicode("  /* ["+"{:02d}".format(index)+"] "   + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode(
+                "{ \"" +
+                convStr(symbolConversionTable, (obj[eid]['text2'][0])) +
+                "\", \"" +
+                convStr(symbolConversionTable, (obj[eid]['text2'][1])) +
+                "\" }," + "//{} \n".format(obj[eid]['text2'])))
+        
+        if 'feature' in mod:
+            f.write(to_unicode("#endif\n"))
+        index = index + 1 
+
+    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")

Translation Editor/translation_bg.json

@@ -3,10 +3,10 @@
 	"languageLocalName": "Български",
 	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Калибрацията завършена!",
-		"SettingsCalibrationWarning": "Уверете се, че човката на поялника е със стайна температура преди да продължите!",
+		"SettingsCalibrationWarning": "Уверете се, че върха на поялника е със стайна температура преди да продължите!",
 		"SettingsResetWarning": "Сигурни ли сте, че искате да върнете фабричните настройки?",
-		"UVLOWarningString": "Ниско V!",
+		"UVLOWarningString": "Ниско DC Напрежение",
 		"UndervoltageString": "Ниско Напрежение",
 		"InputVoltageString": "Входно V: ",
 		"WarningTipTempString": "Темп.: ",
@@ -17,19 +17,25 @@
 		"WarningAdvancedString": "ВНИМАНИЕ! ТОПЛО!",
 		"SleepingTipAdvancedString": "Връх:",
 		"IdleTipString": "Връх:",
-		"IdleSetString": " Set:",
+		"IdleSetString": " Настройка:",
-		"TipDisconnectedString": "ВРЪХ ЛОША ВРЪЗКА",
+		"TipDisconnectedString": "ПРЕКЪСНАТ ВРЪХ",
 		"SolderingAdvancedPowerPrompt": "Захранване: ",
-		"OffString": "Off"
+		"OffString": "Изкл.",
+		"ResetOKMessage": "Нулиране завършено",
+		"YourGainMessage": "Усилване:",
+		"SettingsResetMessage": "Настройките бяха\nнулирани!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +68,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Източник",
 				"захранване"
 			],
 			"desc": "Източник на захранване. Минимално напрежение. <DC 10V> <S 3.3V за клетка>"
 		},
 		"SleepTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Темп.",
 				"сън"
 			],
 			"desc": "Температура при режим \"сън\" <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Време",
 				"сън"
 			],
 			"desc": "Включване в режим \"сън\" след: <Минути/Секунди>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Време",
 				"изкл."
 			],
 			"desc": "Изключване след <Минути>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Усещане",
 				"за движение"
 			],
 			"desc": "Усещане за движение <0.Изключено 1.Слабо 9.Силно>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Единици за",
 				"температура"
 			],
 			"desc": "Единици за температура <C=Целзии F=Фаренхайт>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Детайлен",
 				"екран в покой"
 			],
 			"desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой."
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Ориентация",
 				"на дисплея"
 			],
 			"desc": "Ориентация на дисплея <A. Автоматично L. Лява Ръка R. Дясна Ръка>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Турбо режим",
-				"пуснат"
-			],
-			"desc": "Ползвай предния бутон за \"турбо\" режим с температура до 450C при запояване"
-		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Турбо",
 				"темп."
 			],
 			"desc": "Температура за \"турбо\" режим"
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Автоматичен",
 				"работен режим"
 			],
 			"desc": "Режим на поялника при включване на захранването. T=Работен, S=Сън, F=Изключен"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Мигай при",
 				"топъл поялник"
 			],
 			"desc": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла"
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Калибриране",
 				"температура?"
 			],
 			"desc": "Калибриране на температурата"
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Фабрични",
 				"настройки?"
 			],
 			"desc": "Връщане на фабрични настройки"
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Калибриране",
 				"напрежение?"
 			],
-			"desc": "Калибриране на входното напрежение (VIN). Задръжте бутонa за изход"
+			"desc": "Калибриране на входното напрежение. Задръжте бутонa за изход"
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Детайлен",
 				"работен екран"
 			],
 			"desc": "Детайлна информация в работен режим при запояване"
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Скорост",
 				"на текста"
 			],
 			"desc": "Скорост на движение на този текст"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
+				"Модел",
-				"Tip",
+				"на връх"
-				"Model"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Избор на модел на връх"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
+				"Бърза",
-				"Simple",
+				"калибрация"
-				"Calibration"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Бърза калибрация с използване на гореща вода"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
+				"Прецизна",
-				"Advanced",
+				"калибрация"
-				"Calibration"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Прецизна калибрация с използване на термо-двойка на върха на поялника"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
+				"Мощност на",
-				"Power",
+				"захранване"
-				"Wattage"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Мощност на избраното захранване"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Лимит на",
+				"мощност"
+			],
+			"desc": "Максимална мощност на поялника <W>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Размяна",
+				"бутони +-?"
+			],
+			"desc": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника"
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Промяна T",
+				"бързо?"
+			],
+			"desc": "Промяна на температура при бързо натискане на бутон!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Промяна Т",
+				"задържане?"
+			],
+			"desc": "Промяна на температура при задържане на бутон!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Захранващ",
+				"импулс"
+			],
+			"desc": "Поддържане на интензивност на захранващия импулс"
+		},
+		"TipGain": {
+						"text2": [
+				"Промяна",
+				"сила връх"
+			],
+			"desc": "Усилване на върха на поялника"
 		}
 	}
 }

Translation Editor/translation_cs.json

@@ -3,40 +3,46 @@
 	"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:",
+		"SettingsResetMessage": "Tov. nas. obnov."
 	},
 	"characters": {
 		"SettingRightChar": "P",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "P"
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
 				"Pájecí",
 				"nastavení"
 			],
-			"desc": "Nastavení pájení (boost, auto start...)"
+			"desc": "Nastavení pájení (boost, auto start...)."
 		},
 		"PowerSavingMenu": {
 			"text2": [
@@ -57,177 +63,191 @@
 				"Pokročilé",
 				"volby"
 			],
-			"desc": "Pokročilé volby (detailní obrazovky, kalibrace, tovární nastavení...)"
+			"desc": "Pokročilé volby (detailní obrazovky, kalibrace, tovární nastavení...)."
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"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": "",
+						"text2": [
-			"text2": [
 				"Teplota v",
 				"r. spánku"
 			],
 			"desc": "Teplota v režimu spánku."
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Č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": "",
+						"text2": [
-			"text2": [
 				"Čas do",
 				"vypnutí"
 			],
-			"desc": "Čas do automatického vypnutí <Minut>"
+			"desc": "Čas do automatického vypnutí <Minut>."
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"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": "",
+						"text2": [
-			"text2": [
 				"Jednotky",
 				"teploty"
 			],
-			"desc": "Jednotky měření teploty <C=Celsius, F=Fahrenheit>"
+			"desc": "Jednotky měření teploty <C=Celsius, F=Fahrenheit>."
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Podrobnosti",
 				"na vých. obr."
 			],
 			"desc": "Zobrazit podrobnosti na výchozí obrazovce?"
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"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": "",
-			"text2": [
-				"Povolit",
-				"boost"
-			],
-			"desc": "Povolit boost držením předního tlačítka při pájení?"
 		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Teplota v",
 				"r. boost"
 			],
 			"desc": "Teplota v režimu boost."
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
+				"Automatický",
-				"Auto",
 				"start"
 			],
 			"desc": "Při startu ihned nahřát hrot?"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Blikáni při",
 				"chladnutí"
 			],
 			"desc": "Blikání teploty při chladnutí, dokud je hrot horký?"
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Kalibrovat",
 				"teplotu?"
 			],
 			"desc": "Kalibrace měření teploty."
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Tovární",
 				"nastavení?"
 			],
 			"desc": "Obnovení továrního nastavení."
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Kalibrovat",
 				"vstupní napětí?"
 			],
 			"desc": "Kalibrace vstupního napětí. Tlačítky uprav, podržením potvrď."
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Podrobnosti",
 				"při pájení"
 			],
 			"desc": "Zobrazit podrobnosti při pájení?"
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"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",
+				"Jednoduchá",
-				"Calibration"
+				"kalibrace"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Jednoduchá kalibrace pomocí horké vody."
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Pokročilá",
-				"Calibration"
+				"kalibrace"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Pokročilá kalibrace pomocí termočlánku na hrotu."
 		},
 		"PowerInput": {
-			"text": "PWRW",
 			"text2": [
-				"Power",
+				"Výkon",
-				"Wattage"
+				"ve wattech"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Výkon použítého napájecího adaptéru ve wattech."
+		},
+		"PowerLimit": {
+			"text2": [
+				"Omezení",
+				"Výkonu"
+			],
+			"desc": "Maximální příkon <Watty>"
+		},
+		"ReverseButtonTempChange": {
+			"text2": [
+				"Prohodit",
+				"tl. +-?"
+			],
+			"desc": "Prohodí tlačítka plus a minus pro změnu teploty hrotu."
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Krok teploty",
+				"krátký?"
+			],
+			"desc": "Velikost skoku při změně teploty krátkým stiskem tlačítka!"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Krok teploty",
+				"dlouhý?"
+			],
+			"desc": "Velikost skoku při změně teploty dlouhým stiskem tlačítka!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Intenzita",
+				"Výkon. pulsu"
+			],
+			"desc": "Puls pro udržení zařízení v chodu (kvůli power bankám)."
+		},
+		"TipGain": {
+			"text2": [
+				"Změnit",
+				"zisk hr."
+			],
+			"desc": "Zisk hrotu (měření)"
 		}
 	}
-}
+}

Translation Editor/translation_da.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,143 +66,118 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "PWRSC",
 			"text2": [
-				"",
+				"Power",
-				""
+				"source"
 			],
 			"desc": "Strømforsyning. Indstil Cutoff Spændingen. <DC 10V <S 3.3V per cell"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
-				"",
+				"Sleep",
-				""
+				"temp"
 			],
-			"desc": "Dvale Temperatur <C"
+			"desc": "Dvale Temperatur <C>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
-				"",
+				"Sleep",
-				""
+				"timeout"
 			],
 			"desc": "Dvale Timeout <Minutter/Sekunder"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
-				"",
+				"Shutdown",
-				""
+				"timeout"
 			],
 			"desc": "sluknings Timeout <Minutter"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
-				"",
+				"Motion",
-				""
+				"sensitivity"
 			],
 			"desc": "Bevægelsesfølsomhed <0.Slukket 1.Mindst følsom 9.Mest følsom"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
-				"",
+				"Temperature",
-				""
+				"unit"
 			],
 			"desc": "Temperatur Enhed <C=Celsius F=Fahrenheit"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
-				"",
+				"Detailed",
-				""
+				"idle screen"
 			],
 			"desc": "Vis detialieret information med en mindre skriftstørrelse på standby skærmen."
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
 			"text2": [
-				"",
+				"Display",
-				""
+				"orientation"
 			],
 			"desc": "Skærm Orientering <A. Automatisk V. Venstre Håndet H. Højre Håndet"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"",
-				""
-			],
-			"desc": "Ved tryk på front knap Aktiveres boost-funktionen, 450C tilstand når der loddes"
-		},
 		"BoostTemperature": {
-			"text": "BTMP",
 			"text2": [
-				"",
+				"Boost",
-				""
+				"temp"
 			],
 			"desc": "Temperatur i \"boost\" mode"
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
-				"",
+				"Auto",
-				""
+				"start"
 			],
 			"desc": "Start automatisk med lodning når strøm sættes til. L=Lodning, D= Dvale tilstand,S=Slukket"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
-				"",
+				"Cooldown",
-				""
+				"blink"
 			],
 			"desc": "Blink temperaturen på skærmen, mens spidsen stadig er varm."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
-				"",
+				"Calibrate",
-				""
+				"temperature?"
 			],
 			"desc": "kalibrere spids temperatur."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
-				"",
+				"Factory",
-				""
+				"Reset?"
 			],
 			"desc": "Gendan alle indstillinger"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
-				"",
+				"Calibrate",
-				""
+				"input voltage?"
 			],
 			"desc": "VIN kalibrering. Knapperne justere, Lang tryk for at gå ud"
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
-				"",
+				"Detailed",
-				""
+				"solder screen"
 			],
 			"desc": "Vis detialieret information mens der loddes"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
-				"",
+				"Scrolling",
-				""
+				"speed"
 			],
 			"desc": "Speed this text scrolls past at"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Tip",
 				"Model"
@@ -206,7 +185,6 @@
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Simple",
 				"Calibration"
@@ -214,7 +192,6 @@
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Advanced",
 				"Calibration"
@@ -222,12 +199,53 @@
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
 		"PowerInput": {
-			"text": "PWRW",
 			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_de.json

@@ -2,6 +2,7 @@
 	"languageCode": "DE",
 	"languageLocalName": "Deutsch",
 	"cyrillicGlyphs": false,
+	"tempUnitFahrenheit": false,
 	"messages": {
 		"SettingsCalibrationDone": "Kalibrierung abgeschlossen!",
 		"SettingsCalibrationWarning": "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!",
@@ -10,7 +11,7 @@
 		"UndervoltageString": "Unterspannung",
 		"InputVoltageString": "V Eingang: ",
 		"WarningTipTempString": "Temperatur: ",
-		"BadTipString": "DEFEKT",
+		"BadTipString": "Spitze Defekt",
 		"SleepingSimpleString": "Zzz ",
 		"SleepingAdvancedString": "Ruhemodus...",
 		"WarningSimpleString": "HEIß",
@@ -20,16 +21,22 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -47,7 +54,7 @@
 		},
 		"UIMenu": {
 			"text2": [
-				"Menü-",
+				"Anzeige-",
 				"einstellungen"
 			],
 			"desc": "Menüeinstellungen"
@@ -55,179 +62,194 @@
 		"AdvancedMenu": {
 			"text2": [
 				"Erweiterte",
-				"Einstellungen"
+				"Optionen"
 			],
 			"desc": "Erweiterte Einstellungen"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Spannungs-",
 				"quelle"
 			],
 			"desc": "Spannungsquelle (Abschaltspannung) <DC=10V, nS=n*3.3V für n LiIon-Zellen>"
 		},
 		"SleepTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Ruhetemp-",
 				"eratur"
 			],
-			"desc": "Ruhetemperatur (In der eingestellten Einheit)"
+			"desc": "Ruhetemperatur"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Ruhever-",
 				"zögerung"
 			],
 			"desc": "Ruhemodus nach <Sekunden/Minuten>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Abschalt-",
 				"zeit"
 			],
 			"desc": "Abschalten nach <Minuten>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Bewegungs-",
 				"empfindlichk."
 			],
 			"desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Temperatur-",
 				"einheit"
 			],
 			"desc": "Temperatureinheit <C=Celsius, F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Detaillierte",
 				"Ruheansicht"
 			],
-			"desc": "Detaillierte Anzeige im Ruhemodus <J=An, N=Aus>"
+			"desc": "Detaillierte Anzeige im Ruhemodus"
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Anzeige-",
 				"ausrichtung"
 			],
 			"desc": "Ausrichtung der Anzeige <A=Automatisch, L=Linkshändig, R=Rechtshändig>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Boosttaste",
-				"aktiv?"
-			],
-			"desc": "Vordere Taste für Temperaturboost verwenden <J=An, N=Aus>"
-		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Boosttemp-",
 				"eratur"
 			],
 			"desc": "Temperatur im Boostmodus  (In der eingestellten Einheit)"
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"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": "",
+						"text2": [
-			"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": "",
+						"text2": [
-			"text2": [
 				"Temperatur",
 				"kalibrieren?"
 			],
 			"desc": "Kalibrierung der Lötspitzentemperatur"
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Einstellungen",
 				"zurücksetzen?"
 			],
-			"desc": "Alle Einstellungen zurücksetzen"
+			"desc": "Einstellungen auf werkseinstellungen zurück setzen"
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Eingangsspannung",
 				"kalibrieren?"
 			],
 			"desc": "Kalibrierung der Eingangsspannung. Kurzer Tastendruck zum Einstellen, langer Tastendruck zum Verlassen."
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Detaillierte",
 				"Lötansicht"
 			],
-			"desc": "Detaillierte Anzeige im Lötmodus <J=An, N=Aus>"
+			"desc": "Detaillierte Anzeige im Lötmodus"
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Scroll-",
 				"geschw."
 			],
-			"desc": "Scrollgeschwindigkeit der Texte"
+			"desc": "Scrollgeschwindigkeit der Texte <S=Langsam F=Schnell>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Löt-",
 				"spitze"
 			],
 			"desc": "Auswahl der Lötspitze"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Einfache",
 				"Kalibrierung"
 			],
 			"desc": "Einfache Kalibrierung mittels heißem Wasser"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Erweiterte",
 				"Kalibrierung"
 			],
 			"desc": "Erweiterte Kalibrierung mittels eines Thermoelements an der Lötspitze"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Leistungs-",
-				"aufnahme"
+				"Aufnahme"
 			],
 			"desc": "Leistungsaufnahme der verwendeten Spannungsversorgung"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Leistungs-",
+				"Limit"
+			],
+			"desc": "Maximale aufnahme der Lötspitze <Watt>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Taste +-",
+				"Umkehren?"
+			],
+			"desc": "Temperatur-Änderungs-Tasten-Belegung Plus-Minus umkehren?"
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"T. Schritt",
+				"Taste kurz?"
+			],
+			"desc": "Temperaturwechselschritte bei kurzem Tastendruck!"
+		}
+		,
+		"TempChangeLongStep": {
+						"text2": [
+				"T. Schritt",
+				"Taste Lang?"
+			],
+			"desc": "Temperaturwechselschritte bei langem Tastendruck!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_en.json

@@ -1,233 +1,254 @@
-{
+{
-	"languageCode": "EN",
+	"languageCode": "EN",
-	"languageLocalName": "English",
+	"languageLocalName": "English",
-	"cyrillicGlyphs": false,
+	"cyrillicGlyphs": false,
-	"messages": {
+	"tempUnitFahrenheit": true,
-		"SettingsCalibrationDone": "Calibration done!",
+	"messages": {
-		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
+		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsResetWarning": "Are you sure you want to reset settings to default values?",
+		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature, before continuing!",
-		"UVLOWarningString": "DC LOW",
+		"SettingsResetWarning": "Are you sure you want to reset settings to default values?",
-		"UndervoltageString": "Undervoltage",
+		"UVLOWarningString": "DC LOW",
-		"InputVoltageString": "Input V: ",
+		"UndervoltageString": "Undervoltage",
-		"WarningTipTempString": "Tip Temp: ",
+		"InputVoltageString": "Input V: ",
-		"BadTipString": "BAD TIP",
+		"WarningTipTempString": "Tip temp: ",
-		"SleepingSimpleString": "Zzzz",
+		"BadTipString": "BAD TIP",
-		"SleepingAdvancedString": "Sleeping...",
+		"SleepingSimpleString": "Zzzz",
-		"WarningSimpleString": "HOT!",
+		"SleepingAdvancedString": "Sleeping...",
-		"WarningAdvancedString": "!!! TIP HOT !!!",
+		"WarningSimpleString": "HOT!",
-		"SleepingTipAdvancedString": "Tip:",
+		"WarningAdvancedString": "!!! TIP HOT !!!",
-		"IdleTipString": "Tip:",
+		"SleepingTipAdvancedString": "Tip:",
-		"IdleSetString": " Set:",
+		"IdleTipString": "Tip:",
-		"TipDisconnectedString": "TIP DISCONNECTED",
+		"IdleSetString": " Set:",
-		"SolderingAdvancedPowerPrompt": "Power: ",
+		"TipDisconnectedString": "TIP DISCONNECTED",
-		"OffString": "Off"
+		"SolderingAdvancedPowerPrompt": "Power: ",
-	},
+		"OffString": "Off",
-	"characters": {
+		"ResetOKMessage": "Reset OK",
-		"SettingRightChar": "R",
+		"YourGainMessage": "Your gain:",
-		"SettingLeftChar": "L",
+		"SettingsResetMessage": "Settings were\nreset!"
-		"SettingAutoChar": "A",
+	},
-		"SettingFastChar": "F",
+	"characters": {
-		"SettingSlowChar": "S"
+		"SettingRightChar": "R",
-	},
+		"SettingLeftChar": "L",
-	"menuDouble": true,
+		"SettingAutoChar": "A",
-	"menuGroups": {
+		"SettingFastChar": "F",
-		"SolderingMenu": {
+		"SettingSlowChar": "S",
-			"text2": [
+		"SettingStartSolderingChar": "T",
-				"Soldering",
+		"SettingStartSleepChar": "S",
-				"Settings"
+		"SettingStartSleepOffChar": "O",
-			],
+		"SettingStartNoneChar": "F"
-			"desc": "Soldering settings"
+	},
-		},
+	"menuGroups": {
-		"PowerSavingMenu": {
+		"SolderingMenu": {
-			"text2": [
+			"text2": [
-				"Sleep",
+				"Soldering",
-				"Modes"
+				"settings"
-			],
+			],
-			"desc": "Power saving settings"
+			"desc": "Soldering settings"
-		},
+		},
-		"UIMenu": {
+		"PowerSavingMenu": {
-			"text2": [
+			"text2": [
-				"User",
+				"Sleep",
-				"Interface"
+				"modes"
-			],
+			],
-			"desc": "User interface settings"
+			"desc": "Power saving settings"
-		},
+		},
-		"AdvancedMenu": {
+		"UIMenu": {
-			"text2": [
+			"text2": [
-				"Advanced",
+				"User",
-				"Options"
+				"interface"
-			],
+			],
-			"desc": "Advanced options"
+			"desc": "User interface settings"
-		}
+		},
-	},
+		"AdvancedMenu": {
-	"menuOptions": {
+			"text2": [
-		"PowerSource": {
+				"Advanced",
-			"text": "PWRSC",
+				"options"
-			"text2": [
+			],
-				"Power",
+			"desc": "Advanced options"
-				"source"
+		}
-			],
+	},
-			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>"
+	"menuOptions": {
-		},
+		"PowerSource": {
-		"SleepTemperature": {
+						"text2": [
-			"text": "STMP",
+				"Power",
-			"text2": [
+				"source"
-				"Sleep",
+			],
-				"temp"
+			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell, disable power limit>"
-			],
+		},
-			"desc": "Sleep Temperature <C>"
+		"SleepTemperature": {
-		},
+						"text2": [
-		"SleepTimeout": {
+				"Sleep",
-			"text": "STME",
+				"temp"
-			"text2": [
+			],
-				"Sleep",
+			"desc": "Sleep temperature"
-				"timeout"
+		},
-			],
+		"SleepTimeout": {
-			"desc": "Sleep Timeout <Minutes/Seconds>"
+						"text2": [
-		},
+				"Sleep",
-		"ShutdownTimeout": {
+				"timeout"
-			"text": "SHTME",
+			],
-			"text2": [
+			"desc": "Sleep timeout <Minutes/Seconds>"
-				"Shutdown",
+		},
-				"timeout"
+		"ShutdownTimeout": {
-			],
+						"text2": [
-			"desc": "Shutdown Timeout <Minutes>"
+				"Shutdown",
-		},
+				"timeout"
-		"MotionSensitivity": {
+			],
-			"text": "MSENSE",
+			"desc": "Shutdown timeout <Minutes>"
-			"text2": [
+		},
-				"Motion",
+		"MotionSensitivity": {
-				"sensitivity"
+						"text2": [
-			],
+				"Motion",
-			"desc": "Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>"
+				"sensitivity"
-		},
+			],
-		"TemperatureUnit": {
+			"desc": "Motion sensitivity <0=Off 1=Least sensitive 9=Most sensitive>"
-			"text": "TMPUNT",
+		},
-			"text2": [
+		"TemperatureUnit": {
-				"Temperature",
+						"text2": [
-				"units"
+				"Temperature",
-			],
+				"unit"
-			"desc": "Temperature Unit <C=Celsius F=Fahrenheit>"
+			],
-		},
+			"desc": "Temperature unit <C=Celsius F=Fahrenheit>"
-		"AdvancedIdle": {
+		},
-			"text": "ADVIDL",
+		"AdvancedIdle": {
-			"text2": [
+						"text2": [
-				"Detailed",
+				"Detailed",
-				"idle screen"
+				"idle screen"
-			],
+			],
-			"desc": "Display detailed information in a smaller font on the idle screen."
+			"desc": "Display detailed information in a smaller font on the idle screen"
-		},
+		},
-		"DisplayRotation": {
+		"DisplayRotation": {
-			"text": "DSPROT",
+						"text2": [
-			"text2": [
+				"Display",
-				"Display",
+				"orientation"
-				"orientation"
+			],
-			],
+			"desc": "Display orientation <A=Automatic L=Left-handed R=Right-handed>"
-			"desc": "Display Orientation <A. Automatic L. Left Handed R. Right Handed>"
+		},
-		},
+		"BoostTemperature": {
-		"BoostEnabled": {
+						"text2": [
-			"text": "BOOST",
+				"Boost",
-			"text2": [
+				"temp"
-				"Boost mode",
+			],
-				"enabled"
+			"desc": "Temperature when in \"boost mode\""
-			],
+		},
-			"desc": "Enable front key enters boost mode 450C mode when soldering"
+		"AutoStart": {
-		},
+						"text2": [
-		"BoostTemperature": {
+				"Auto",
-			"text": "BTMP",
+				"start"
-			"text2": [
+			],
-				"Boost",
+			"desc": "Automatically starts the iron into soldering on power up <F=Off T=Soldering S=Sleep O=Sleep at room temperature>"
-				"temp"
+		},
-			],
+		"CooldownBlink": {
-			"desc": "Temperature when in \"boost\" mode"
+						"text2": [
-		},
+				"Cooldown",
-		"AutoStart": {
+				"blink"
-			"text": "ASTART",
+			],
-			"text2": [
+			"desc": "Blink the temperature on the cooling screen while the tip is still hot"
-				"Auto",
+		},
-				"start"
+		"TemperatureCalibration": {
-			],
+						"text2": [
-			"desc": "Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off"
+				"Calibrate",
-		},
+				"temperature?"
-		"CooldownBlink": {
+			],
-			"text": "CLBLNK",
+			"desc": "Calibrate tip offset?"
-			"text2": [
+		},
-				"Cooldown",
+		"SettingsReset": {
-				"blink"
+						"text2": [
-			],
+				"Factory",
-			"desc": "Blink the temperature on the cooling screen while the tip is still hot."
+				"Reset?"
-		},
+			],
-		"TemperatureCalibration": {
+			"desc": "Reset all settings!"
-			"text": "TMP CAL?",
+		},
-			"text2": [
+		"VoltageCalibration": {
-				"Calibrate",
+						"text2": [
-				"temperature?"
+				"Calibrate",
-			],
+				"input voltage?"
-			"desc": "Calibrate tip offset."
+			],
-		},
+			"desc": "VIN Calibration <long press to exit>"
-		"SettingsReset": {
+		},
-			"text": "RESET?",
+		"AdvancedSoldering": {
-			"text2": [
+						"text2": [
-				"Factory",
+				"Detailed",
-				"Reset?"
+				"solder screen"
-			],
+			],
-			"desc": "Reset all settings"
+			"desc": "Display detailed information while soldering"
-		},
+		},
-		"VoltageCalibration": {
+		"ScrollingSpeed": {
-			"text": "CAL VIN?",
+						"text2": [
-			"text2": [
+				"Scrolling",
-				"Calibrate",
+				"speed"
-				"input voltage?"
+			],
-			],
+			"desc": "Speed this text scrolls past at <S=Slow F=Fast>"
-			"desc": "VIN Calibration. Buttons adjust, long press to exit"
+		},
-		},
+		"TipModel": {
-		"AdvancedSoldering": {
+						"text2": [
-			"text": "ADVSLD",
+				"Tip",
-			"text2": [
+				"model"
-				"Detailed",
+			],
-				"solder screen"
+			"desc": "Tip model selection"
-			],
+		},
-			"desc": "Display detailed information while soldering"
+		"SimpleCalibrationMode": {
-		},
+						"text2": [
-		"ScrollingSpeed": {
+				"Simple",
-			"text": "DESCSP",
+				"calibration"
-			"text2": [
+			],
-				"Scrolling",
+			"desc": "Simple calibration using hot water"
-				"Speed"
+		},
-			],
+		"AdvancedCalibrationMode": {
-			"desc": "Speed this text scrolls past at"
+						"text2": [
-		},
+				"Advanced",
-		"TipModel": {
+				"calibration"
-			"text": "TIPMO",
+			],
-			"text2": [
+			"desc": "Advanced calibration using thermocouple on the tip"
-				"Tip",
+		},
-				"Model"
+		"PowerInput": {
-			],
+						"text2": [
-			"desc": "Tip Model selection"
+				"Power",
-		},
+				"wattage"
-		"SimpleCalibrationMode": {
+			],
-			"text": "SMPCAL",
+			"desc": "Power wattage of the power adapter used"
-			"text2": [
+		},
-				"Simple",
+		"PowerLimit": {
-				"Calibration"
+						"text2": [
-			],
+				"Power",
-			"desc": "Simple Calibration using Hot water"
+				"limit"
-		},
+			],
-		"AdvancedCalibrationMode": {
+			"desc": "Maximum power the iron can use <Watts>"
-			"text": "ADVCAL",
+		},
-			"text2": [
+		"ReverseButtonTempChange": {
-				"Advanced",
+						"text2": [
-				"Calibration"
+				"Reverse",
-			],
+				"+ - keys"
-			"desc": "Advanced calibration using thermocouple on the tip"
+			],
-		},
+			"desc": "Reverse assignment of temperature adjustment buttons"
-		"PowerInput": {
+		},
-			"text": "PWRW",
+		"TempChangeShortStep": {
-			"text2": [
+						"text2": [
-				"Power",
+				"Temp change",
-				"Wattage"
+				"short"
-			],
+			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Temperature change steps on short button press"
-		}
+		},
-	}
+		"TempChangeLongStep": {
-}
+						"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature change steps on long button press"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		}
+	}
+}

Translation Editor/translation_es.json

@@ -1,233 +1,253 @@
 {
 	"languageCode": "ES",
-	"languageLocalName": "Español",
+	"languageLocalName": "Castellano",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "¡Calibrada!",
-		"SettingsCalibrationWarning": "¡Asegúrese que la punta esté a temperatura ambiente antes de proceder!",
+		"SettingsCalibrationWarning": "¡Asegúrate que la punta esté a temperatura ambiente antes de empezar!",
-		"SettingsResetWarning": "¿Está seguro de volver a estado de fábrica?",
+		"SettingsResetWarning": "¿Quieres restablecer los ajustes?",
-		"UVLOWarningString": "DC BAJO",
+		"UVLOWarningString": "CC BAJA",
-		"UndervoltageString": "Subtensión",
+		"UndervoltageString": "Voltaje bajo",
-		"InputVoltageString": "V entrada: ",
+		"InputVoltageString": "Voltaje: ",
-		"WarningTipTempString": "Temp Punta: ",
+		"WarningTipTempString": "Temp punta: ",
-		"BadTipString": "ER PUNTA",
+		"BadTipString": "PT. ROTA",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "En reposo...",
-		"WarningSimpleString": "TEMP",
+		"WarningSimpleString": "QUEMA",
-		"WarningAdvancedString": "¡PUNTA CALIENTE!",
+		"WarningAdvancedString": "¡LA PUNTA QUEMA!",
 		"SleepingTipAdvancedString": "Punta:",
 		"IdleTipString": "Punta:",
 		"IdleSetString": " Aj:",
-		"TipDisconnectedString": "SIN PUNTA",
+		"TipDisconnectedString": "NO HAY PUNTA",
-		"SolderingAdvancedPowerPrompt": "POTENCIA: ",
+		"SolderingAdvancedPowerPrompt": "Potencia: ",
-		"OffString": "Off"
+		"OffString": " No",
+		"ResetOKMessage": "Hecho.       ",
+		"YourGainMessage": "Gananc.:",
+		"SettingsResetMessage": "Ajustes borrados"
 	},
 	"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",
+				"Ajustes de",
-				"Soldadura"
+				"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",
+				"Ajustes",
-				"Avanzadas"
+				"avanzados"
 			],
-			"desc": "Opciones avanzadas"
+			"desc": "Ajustes avanzados."
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "PWRSC",
+						"text2": [
-			"text2": [
 				"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": [
-			"text2": [
+				"Temperatura",
-				"Temp en",
+				"en reposo"
-				"reposo"
 			],
-			"desc": "Temperatura en reposo. <C>"
+			"desc": "Temperatura de la punta en reposo."
 		},
 		"SleepTimeout": {
-			"text": "STME",
+						"text2": [
-			"text2": [
+				"Entrar",
-				"Tiempo h.",
+				"en reposo"
-				"reposo"
 			],
-			"desc": "Tiempo hasta activar reposo. <Minutos>"
+			"desc": "Tiempo de inactividad para entrar en reposo <min/seg>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
+						"text2": [
-			"text2": [
+				"Tiempo de",
-				"Tiempo h.",
 				"apagado"
 			],
-			"desc": "Tiempo hasta apagado. <Minutos>"
+			"desc": "Tiempo de inactividad para apagarse <en minutos>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
+						"text2": [
-			"text2": [
+				"Detección de",
-				"Sensibilidad",
+				"movimiento"
-				"al 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",
+						"text2": [
-			"text2": [
 				"Unidad de",
 				"temperatura"
 			],
-			"desc": "Unidad de temperatura."
+			"desc": "Unidad de temperatura <C=centígrados F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
+						"text2": [
-			"text2": [
+				"Info extra en",
-				"Más info en",
+				"modo reposo"
-				"modo inactivo"
 			],
-			"desc": "Muestra información detallada pequena en la pantalla inactiva."
+			"desc": "Muestra información detallada en letra pequeña al reposar."
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
+						"text2": [
-			"text2": [
 				"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"
-			],
-			"desc": "Activar el botón \"Boost\" en modo soldadura."
 		},
 		"BoostTemperature": {
-			"text": "BTMP",
+						"text2": [
-			"text2": [
+				"Ajustar la",
-				"Temp en",
+				"temp. extra"
-				"Boost"
 			],
-			"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": [
-			"text2": [
+				"Calentar",
-				"Soldadura",
 				"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": [
-			"text2": [
+				"Parpadear",
-				"Parpadea m.",
+				"al enfriar"
-				"enfriamiento"
 			],
-			"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": [
-			"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": [
-			"text2": [
+				"Volver a ajustes",
-				"Estado de",
+				"de fábrica"
-				"fábrica"
 			],
-			"desc": "Volver a estado de fábrica."
+			"desc": "Restablece todos los ajustes a los valores originales."
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
+						"text2": [
-			"text2": [
+				"Calibrar voltaje",
-				"Calibrar",
+				"de entrada"
-				"V 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": [
-			"text2": [
+				"Info extra",
-				"Inf detallada",
+				"al soldar"
-				"del soldadura"
 			],
-			"desc": "Mostrar información detallada mientras suelda."
+			"desc": "Muestra más datos por pantalla cuando se está soldando."
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+						"text2": [
-			"text2": [
 				"Velocidad",
 				"del texto"
 			],
-			"desc": "Velocidad de desplazamiento del texto."
+			"desc": "Velocidad de desplazamiento del texto <R=rápida L=lenta>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
+				"Modelo de",
-				"Tip",
+				"punta"
-				"Model"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Elegir el modelo de punta actual."
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
+				"Calibración",
-				"Simple",
+				"simple"
-				"Calibration"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Calibración simple con agua caliente."
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
+				"Calibración",
-				"Advanced",
+				"avanzada"
-				"Calibration"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Calibrar con un termopar en la punta; más difícil."
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
+				"Potencia de",
-				"Power",
+				"entrada"
-				"Wattage"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Potencia en vatios del adaptador de corriente utilizado."
+		},
+		"PowerLimit": {
+						"text2": [
+				"Ajustar la",
+				"potenc. máx."
+			],
+			"desc": "Elige el límite de potencia máxima del soldador <en vatios>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Invertir",
+				"botones +/-"
+			],
+			"desc": "Intercambia las funciones de subir y bajar la temperatura de los botones +/- para que funcionen al revés."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Cambio temp.",
+				"puls. cortas"
+			],
+			"desc": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-."
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Cambio temp.",
+				"puls. largas"
+			],
+			"desc": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-."
+		},
+		"PowerPulsePower": {
+						"text2": [
+				"Pulsos bat.",
+				"constantes"
+			],
+			"desc": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios."
+		},
+		"TipGain": {
+						"text2": [
+				"Ajustar ganancia",
+				"de punta"
+			],
+			"desc": "Modificar el valor de ganancia de la punta."
 		}
 	}
-}
+}

Translation Editor/translation_fi.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Virtalähde",
 				"DC"
 			],
 			"desc": "Käytettävä virtalähde. Asettaa katkaisujänniteen. <DC 10V, 3S=9.9V, 4S=13.2V, 5S=16.5V, 6S=19.8V>"
 		},
 		"SleepTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Lepotilan",
 				"lämpötila"
 			],
 			"desc": "Lepotilan lämpötila. <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Lepotilan",
 				"viive"
 			],
 			"desc": "Lepotilan viive. <minuuttia/sekuntia>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Sammutus",
 				"viive"
 			],
 			"desc": "Automaattisen sammutuksen aikaviive. <minuuttia>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Liikkeen",
 				"herkkyys"
 			],
 			"desc": "Liikkeentunnistuksen herkkyys. <0=pois, 1=epäherkin, 9=herkin>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Lämpötilan",
 				"yksikkö"
 			],
 			"desc": "Lämpötilan yksikkö. <C=celsius, F=fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Tiedot",
 				"lepotilassa"
 			],
 			"desc": "Näyttää yksityiskohtaisemmat tiedot lepotilassa."
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Näytön",
 				"kierto"
 			],
 			"desc": "Näytön kierto. <A=automaattinen O=oikeakätinen V=vasenkätinen>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Tehostus",
-				"käytössä"
-			],
-			"desc": "Etupainikeella siirrytään juotettaessa tehostustilaan."
-		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Tehostus-",
 				"lämpötila"
 			],
 			"desc": "Tehostustilan lämpötila"
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Autom.",
 				"käynnistys"
 			],
 			"desc": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. T=juotostila, S=Lepotila, F=Ei käytössä"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Jäähdytyksen",
 				"vilkutus"
 			],
 			"desc": "Vilkuttaa jäähtyessä juotoskärjen lämpötilaa sen ollessa vielä vaarallisen kuuma."
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Kalibroi",
 				"lämpötila?"
 			],
 			"desc": "Kalibroi kärjen lämpötilaeron."
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Palauta",
 				"tehdasasetukset?"
 			],
 			"desc": "Palauta kaikki asetukset oletusarvoihin."
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Kalibroi",
 				"tulojännite?"
 			],
 			"desc": "Tulojännitten kalibrointi (VIN). Painikkeilla säädetään ja pitkään painamalla poistutaan."
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Tarkempi",
 				"juotosnäyttö"
 			],
 			"desc": "Näyttää yksityiskohtaisemmat tiedot juotostilassa."
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Tietojen",
 				"näyttönopeus"
 			],
 			"desc": "Näiden selitetekstien vieritysnopeus."
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Tip",
 				"Model"
 			],
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Simple",
 				"Calibration"
 			],
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_fr.json

@@ -13,23 +13,27 @@
 		"BadTipString": "PANNE HS",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "En veille...",
-		"WarningSimpleString": "HOT!",
+		"WarningSimpleString": "CHAUD!",
-		"WarningAdvancedString": "ATTENTION! CHAUD",
+		"WarningAdvancedString": "ATTENTION! CHAUD!",
 		"SleepingTipAdvancedString": "Panne:",
 		"IdleTipString": "Tip:",
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Source",
 				"d'alim"
 			],
 			"desc": "Source d'alimentation. Règle la tension de coupure <DC=10V S=3.3V par cellules>"
 		},
 		"SleepTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Temp.",
 				"veille"
 			],
 			"desc": "Température en veille <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Délai",
 				"veille"
 			],
 			"desc": "Délai avant mise en veille <Minutes>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Délai",
 				"extinction"
 			],
 			"desc": "Délai avant extinction <Minutes>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Sensibilité",
 				"au mouvement"
 			],
 			"desc": "Sensibilité du capteur de mouvement <0=Inactif 1=Peu sensible 9=Tres sensible>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Unité de",
 				"température"
 			],
 			"desc": "Unité de température <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Écran veille",
 				"détaillé"
 			],
 			"desc": "Afficher des informations détaillées lors de la veille."
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Orientation",
 				"de l'écran"
 			],
 			"desc": "Orientation de l'affichage <A=Automatique G=Gaucher D=Droitier>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Activation du",
-				"mode Boost"
-			],
-			"desc": "Activer le mode \"Boost\" en maintenant le bouton de devant pendant la soudure"
-		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Temp.",
 				"Boost"
 			],
 			"desc": "Température du mode \"Boost\""
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Démarrage",
 				"automatique"
 			],
 			"desc": "Démarrer automatiquement la soudure a l'allumage <A=Activé, V=Mode Veille, D=Désactivé>"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Refroidir en",
 				"clignotant"
 			],
 			"desc": "Faire clignoter la température lors du refroidissement tant que la panne est chaude."
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Étalonner",
 				"température"
 			],
 			"desc": "Étalonner température de la panne."
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Réinitialisation",
 				"d'usine"
 			],
 			"desc": "Réinitialiser tous les réglages"
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Étalonner",
 				"tension d'entrée"
 			],
 			"desc": "Étalonner tension d'entrée. Boutons pour ajuster, appui long pour quitter"
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Écran soudure",
 				"détaillé"
 			],
 			"desc": "Afficher des informations détaillées pendant la soudure"
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Vitesse de",
 				"défilement"
 			],
 			"desc": "Vitesse de défilement de ce texte en <R=Rapide L=Lent>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Panne",
 				"Modèle"
 			],
 			"desc": "Sélection du modèle de la panne"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Calibration",
 				"simple"
 			],
 			"desc": "Calibration simple à l'aide d'eau chaude"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Calibration",
 				"avancées"
 			],
 			"desc": "Calibration avancées à l'aide d'un thermocouple sur la panne"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Puissance de",
 				"l'alimentation"
 			],
 			"desc": "Puissance de l'alimentation utilisée"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Puissance",
+				"Limite"
+			],
+			"desc": "Puissance maximale utilisable <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"Inverser?"
+			],
+			"desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"Court?"
+			],
+			"desc": "Incrément de changement de température sur appui court."
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"Long?"
+			],
+			"desc": "Incrément de changement de température sur appui long."
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_hr.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "PWRSC",
+						"text2": [
-			"text2": [
 				"Izvor",
 				"napajanja"
 			],
 			"desc": "Izvor napajanja. Postavlja napon isključivanja. <DC 10V> <S 3.3V po ćeliji>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
+						"text2": [
-			"text2": [
 				"Temp",
 				"spavanja"
 			],
 			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
+						"text2": [
-			"text2": [
 				"Vrijeme",
 				"spavanja"
 			],
 			"desc": "Vrijeme mirovanja nakon kojega lemilica spušta temperaturu. <Minute/Sekunde>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
+						"text2": [
-			"text2": [
 				"Vrijeme",
 				"gašenja"
 			],
 			"desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti. <Minute>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
+						"text2": [
-			"text2": [
 				"Osjetljivost",
 				"pokreta"
 			],
 			"desc": "Osjetljivost prepoznavanja pokreta. <0=Ugašeno, 1=Najmanje osjetljivo, 9=Najosjetljivije>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
+						"text2": [
-			"text2": [
 				"Jedinica",
 				"temperature"
 			],
 			"desc": "Jedinica temperature. <C=Celzij, F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
+						"text2": [
-			"text2": [
 				"Detalji",
 				"pri čekanju"
 			],
 			"desc": "Prikazivanje detaljnih informacija tijekom čekanja."
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
+						"text2": [
-			"text2": [
 				"Rotacija",
 				"ekrana"
 			],
 			"desc": "Orijentacija ekrana. <A=Automatski, L=Ljevoruki, D=Desnoruki>"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"Boost",
-				"način"
-			],
-			"desc": "Držanjem prednjeg gumba prilikom lemljenja aktivira se pojačani (Boost) način."
-		},
 		"BoostTemperature": {
-			"text": "BTMP",
+						"text2": [
-			"text2": [
 				"Boost",
 				"temp"
 			],
 			"desc": "Temperatura u pojačanom (Boost) načinu."
 		},
 		"AutoStart": {
-			"text": "ASTART",
+						"text2": [
-			"text2": [
 				"Auto",
 				"start"
 			],
 			"desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati."
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
+						"text2": [
-			"text2": [
 				"Upozorenje",
 				"pri hlađenju"
 			],
 			"desc": "Bljeskanje temperature prilikom hlađenja, ako je lemilica vruća."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
+						"text2": [
-			"text2": [
 				"Kalibracija",
 				"temperature"
 			],
 			"desc": "Kalibriranje temperature mjeri razliku temperatura vrška i drške, dok je lemilica hladna."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
+						"text2": [
-			"text2": [
 				"Tvorničke",
 				"postavke"
 			],
 			"desc": "Vraćanje svih postavki na tvorničke vrijednosti."
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
+						"text2": [
-			"text2": [
 				"Kalibracija",
 				"napona napajanja"
 			],
 			"desc": "Kalibracija ulaznog napona. Podešavanje gumbima, dugački pritisak za kraj."
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
+						"text2": [
-			"text2": [
 				"Detalji",
 				"pri lemljenju"
 			],
 			"desc": "Prikazivanje detaljnih informacija tijekom lemljenja."
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+						"text2": [
-			"text2": [
 				"Brzina",
 				"poruka"
 			],
 			"desc": "Brzina kretanja dugačkih poruka. <B=brzo, S=sporo>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Model",
 				"Vrha"
 			],
 			"desc": "Odabir modela lemnog vrha"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Jednostavna",
 				"kalibracija"
 			],
 			"desc": "Kalibracija kipućom vodom"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Napredna",
 				"kalibracija"
 			],
 			"desc": "Kalibracija korištenjem termo-elementa"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Snaga",
 				"napajanja"
 			],
 			"desc": "Snaga modula za napajanje"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_hu.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "ÁRAMF",
+						"text2": [
-			"text2": [
 				"Áram",
 				"forrás"
 			],
 			"desc": "Áramforrás. Beállítja a lekapcsolási feszültséget. <DC 10V> <S 3.3V cellánként>"
 		},
 		"SleepTemperature": {
-			"text": "AHŐM",
+						"text2": [
-			"text2": [
 				"Alvási",
 				"hőfok"
 			],
 			"desc": "Alvási hőmérséklet <C>"
 		},
 		"SleepTimeout": {
-			"text": "AIDŐ",
+						"text2": [
-			"text2": [
 				"Alvás",
 				"időzítő"
 			],
 			"desc": "Alvás időzítő <perc/másodperc>"
 		},
 		"ShutdownTimeout": {
-			"text": "KIIDŐ",
+						"text2": [
-			"text2": [
 				"Kikapcsolás",
 				"időzítő"
 			],
 			"desc": "Kikapcsolási időzítő <perc>"
 		},
 		"MotionSensitivity": {
-			"text": "MOZGÉR",
+						"text2": [
-			"text2": [
 				"Mozgás",
 				"érzékenység"
 			],
 			"desc": "Mozgás érzékenység beállítása. <0.kikapcsolva 1.legkevésbé érzékeny 9.legérzékenyebb>"
 		},
 		"TemperatureUnit": {
-			"text": "HŐEGYS",
+						"text2": [
-			"text2": [
 				"Hőmérséklet",
 				"mértékegysége"
 			],
 			"desc": "Hőmérséklet mértékegysége <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "RÉSZLI",
+						"text2": [
-			"text2": [
 				"Részletes",
 				"készenlét"
 			],
 			"desc": "Részletes információ megjelenítése kisebb betűméretben a készenléti képernyőn."
 		},
 		"DisplayRotation": {
-			"text": "KIJTÁJ",
+						"text2": [
-			"text2": [
 				"Kijelző",
 				"tájolása"
 			],
 			"desc": "Kijelző tájolása <A. automatikus B. balkezes J. jobbkezes>"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"Boost",
-				"mód"
-			],
-			"desc": "Elülső gombbal boost módba (450C) lép forrasztás közben"
-		},
 		"BoostTemperature": {
-			"text": "BHŐ",
+						"text2": [
-			"text2": [
 				"Boost",
 				"hőfok"
 			],
 			"desc": "Hőmérséklet \"boost\" módban"
 		},
 		"AutoStart": {
-			"text": "ASTART",
+						"text2": [
-			"text2": [
 				"Automatikus",
 				"indítás"
 			],
 			"desc": "Bekapcsolás után automatikusan lépjen forrasztás módba. T=forrasztás, S=alvó mód, F=ki"
 		},
 		"CooldownBlink": {
-			"text": "HŰLÉSV",
+						"text2": [
-			"text2": [
 				"Villogás",
 				"hűléskor"
 			],
 			"desc": "Villogjon a hőmérséklet hűlés közben, amíg a hegy forró."
 		},
 		"TemperatureCalibration": {
-			"text": "HŐM KAL?",
+						"text2": [
-			"text2": [
 				"Hőmérséklet",
 				"kalibrálása?"
 			],
 			"desc": "Hegy hőmérséklet-különbségének kalibrálása."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
+						"text2": [
-			"text2": [
 				"Gyári",
 				"beállítások?"
 			],
 			"desc": "Beállítások alaphelyzetbe állítása"
 		},
 		"VoltageCalibration": {
-			"text": "VIN KAL?",
+						"text2": [
-			"text2": [
 				"Bemeneti fesz",
 				"kalibrálása?"
 			],
 			"desc": "Bemeneti feszültség kalibrálása. Röviden megnyomva módosítás, hosszan megnyomva kilépés"
 		},
 		"AdvancedSoldering": {
-			"text": "HALKÉP",
+						"text2": [
-			"text2": [
 				"Részletes",
 				"forr. kép."
 			],
 			"desc": "Részletes információk megjelenítése forrasztás közben"
 		},
 		"ScrollingSpeed": {
-			"text": "GÖRGS",
+						"text2": [
-			"text2": [
 				"Görgetés",
 				"sebessége"
 			],
 			"desc": "Szöveggörgetés sebessége"
 		},
 		"TipModel": {
-			"text": "HEGYMOD",
+						"text2": [
-			"text2": [
 				"Forrasztóhegy",
 				"modell"
 			],
 			"desc": "Forrasztóhegy modell kiválasztása"
 		},
 		"SimpleCalibrationMode": {
-			"text": "EGYSZKAL",
+						"text2": [
-			"text2": [
 				"Egyszerű",
 				"kalibráció"
 			],
 			"desc": "Egyszerű kalibrálás forró víz segítségével"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "HALKAL",
+						"text2": [
-			"text2": [
 				"Haladó",
 				"Kalibráció"
 			],
 			"desc": "Haladó kalibrálás hegyre helyezett hőelem segítségével"
 		},
 		"PowerInput": {
-			"text": "TELJW",
+						"text2": [
-			"text2": [
 				"Bemeneti",
 				"teljesítmény"
 			],
 			"desc": "A tápegység által leadott teljesítmény"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Telj",
+				"maximum"
+			],
+			"desc": "Maximális teljesitmény beállitása <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"GOMB +-",
+				"Felcseréled?"
+			],
+			"desc": "A páka hömérséklet növelés csökkentési gombok felcserélése."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Hömérséklet",
+				"váltás rövid?"
+			],
+			"desc": "Hömérséklet váltás rövid gombnyomásrs bekapcsolva!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Hömérséklet",
+				"váltás hosszú?"
+			],
+			"desc": "Hömérséklet váltás hosszú gombnyomásrs bekapcsolva!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Telj power",
+				"bank üzem W"
+			],
+			"desc": "Powerbank üzemnél nem engedi a powerbankot kikapcsolni idönkénti áram felvételt generál. "
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_it.json

@@ -16,20 +16,26 @@
 		"WarningSimpleString": "HOT!",
 		"WarningAdvancedString": "PUNTA CALDA!",
 		"SleepingTipAdvancedString": "Punta:",
-		"IdleTipString": "Punta:",
+		"IdleTipString": "T punta:",
 		"IdleSetString": "/",
 		"TipDisconnectedString": "PUNTA ASSENTE",
-		"SolderingAdvancedPowerPrompt": "Potenza:",
+		"SolderingAdvancedPowerPrompt": "Potenz:",
-		"OffString": "OFF"
+		"OffString": "OFF",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Guad.: ",
+		"SettingsResetMessage": "Reset effettuato"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "S",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "V",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "A",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "D"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +68,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Sorgente",
 				"alimentaz"
 			],
 			"desc": "Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia <DC: 10V; S: 3,3V per cella>"
 		},
 		"SleepTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Temp",
 				"standby"
 			],
 			"desc": "Imposta la temperatura da mantenere in modalità Standby <°C/°F>"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Timer",
 				"standby"
 			],
 			"desc": "Imposta il timer per entrare in modalità Standby <minuti/secondi>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Timer",
 				"spegnimento"
 			],
 			"desc": "Imposta il timer per lo spegnimento <minuti>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Sensibilità",
 				"al movimento"
 			],
 			"desc": "Imposta la sensibilità al movimento per uscire dalla modalità Standby <0: nessuna; 1: minima; 9: massima>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Unità di",
 				"temperatura"
 			],
 			"desc": "Scegli l'unità di misura per la temperatura <C: grado Celsius; F: grado Farenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
+				"Interfaccia",
-				"Mostra",
+				"testuale"
-				"dettagli"
 			],
-			"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": "",
+						"text2": [
-			"text2": [
 				"Orientamento",
 				"display"
 			],
 			"desc": "Imposta l'orientamento del display <A: automatico; S: mano sinistra; D: mano destra>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Funzione",
-				"«Turbo»"
-			],
-			"desc": "Il tasto superiore attiva la funzione «Turbo» durante la modalità Saldatura"
-		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Temp",
 				"«Turbo»"
 			],
 			"desc": "Imposta la temperatura della funzione «Turbo»"
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Avvio",
 				"automatico"
 			],
 			"desc": "Attiva automaticamente il saldatore quando viene alimentato <A: saldatura; S: standby; D: disattiva>"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Avviso",
 				"punta calda"
 			],
-			"desc": "Mostra, lampeggiante, la temperatura durante il raffreddamento se la punta è ancora calda"
+			"desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda"
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Calibrazione",
 				"temperatura"
 			],
 			"desc": "Calibra le rilevazioni di temperatura"
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Ripristino",
 				"impostazioni"
 			],
 			"desc": "Ripristina tutte le impostazioni"
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Calibrazione",
 				"tensione"
 			],
 			"desc": "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire"
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Dettagli",
 				"saldatura"
 			],
 			"desc": "Mostra informazioni dettagliate durante la modalità Saldatura"
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Velocità",
 				"testo"
 			],
 			"desc": "Imposta la velocità di scorrimento del testo <L: lento; V: veloce>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Modello",
-				"della punta"
+				"punta"
 			],
 			"desc": "Seleziona il modello della punta in uso"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Calibrazione",
 				"semplice"
 			],
 			"desc": "Calibra le rilevazioni di temperatura tramite l'utilizzo di acqua calda"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Calibrazione",
 				"avanzata"
 			],
 			"desc": "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Potenza",
 				"alimentaz"
 			],
-			"desc": "Imposta la potenza dell'alimentatore in uso"
+			"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Limite",
+				"di potenza"
+			],
+			"desc": "Imposta il valore di potenza massima erogabile al saldatore <watt>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Inversione",
+				"tasti"
+			],
+			"desc": "Inverti i tasti per impostare la temperatura della punta "
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Cambio temp",
+				"pressione breve"
+			],
+			"desc": "Varia la temperatura della punta attraverso una breve pressione dei tasti"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Cambio temp",
+				"pressione lunga"
+			],
+			"desc": "Varia la temperatura della punta attraverso una lunga pressione dei tasti"
+		},
+		"PowerPulsePower": {
+						"text2": [
+				"Potenza impulso",
+				"«Keep-Alive»"
+			],
+			"desc": "Regola la potenza d'impulso in ingresso al saldatore per prevenire lo standby eventuale dell'alimentatore <watt>"
+		},
+		"TipGain": {
+						"text2": [
+				"Guadagno",
+				"punta"
+			],
+			"desc": "Varia il guadagno della punta"
 		}
 	}
 }

Translation Editor/translation_lt.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Maitinimo",
 				"šaltinis"
 			],
 			"desc": "Išjungimo įtampa. <DC 10V arba celių (S) kiekis (3.3V per celę)>"
 		},
 		"SleepTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Miego",
 				"temperat."
 			],
 			"desc": "Miego temperatūra <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Miego",
 				"laikas"
 			],
 			"desc": "Miego laikas <minutės/sekundės>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Išjungimo",
 				"laikas"
 			],
 			"desc": "Išjungimo laikas <minutės>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Jautrumas",
 				"judesiui"
 			],
 			"desc": "Jautrumas judesiui <0 - išjungta, 1 - mažiausias, 9 - didžiausias>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Temperatūros",
 				"vienetai"
 			],
 			"desc": "Temperatūros vienetai <C - Celsijus, F - Farenheitas>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Detalus lauki",
 				"mo ekranas"
 			],
 			"desc": "Ar rodyti papildomą informaciją mažesniu šriftu laukimo ekrane"
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Ekrano",
 				"orientacija"
 			],
 			"desc": "Ekrano orientacija <A - automatinė, K - kairiarankiams, D - dešiniarankiams>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Turbo režimas",
-				"įjungtas"
-			],
-			"desc": "Ar lituojant viršutinis mygtukas įjungia turbo režimą"
-		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Turbo",
 				"temperat."
 			],
 			"desc": "Temperatūra turbo režimu"
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Auto",
 				"paleidimas"
 			],
 			"desc": "Ar pradėti kaitininti iš karto įjungus lituoklį"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Atvėsimo",
 				"mirksėjimas"
 			],
 			"desc": "Ar mirksėti temperatūrą ekrane kol vėstantis antgalis vis dar karštas"
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Kalibruoti",
 				"temperatūrą?"
 			],
 			"desc": "Antgalio temperatūros kalibravimas"
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Atstatyti",
 				"nustatymus?"
 			],
 			"desc": "Nustatyti nustatymus iš naujo"
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Kalibruoti",
 				"įvesties įtampą?"
 			],
 			"desc": "Įvesties įtampos kalibravimas. Trumpai paspauskite, norėdami nustatyti, ilgai paspauskite, kad išeitumėte"
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Detalus lita-",
 				"vimo ekranas"
 			],
 			"desc": "Ar rodyti išsamią informaciją lituojant"
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Greitas apr",
 				"ašym. slink"
 			],
 			"desc": "Greitis, kuriuo šis tekstas slenka"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Antgalio",
 				"modelis"
 			],
 			"desc": "Antgalio modelio pasirinkimas"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Paprasta",
 				"kalibracija"
 			],
 			"desc": "Paprasta kalibracija naudojant karštą vandienį"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Išplėstinė",
 				"kalibracija"
 			],
 			"desc": "Išplėstinė kalibracija naudojant termoelementą"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Galia",
 				"vatais"
 			],
 			"desc": "Maitinimo bloko galia vatais"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_nl.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Spannings-",
 				"bron"
 			],
 			"desc": "Spanningsbron. Stelt drempelspanning in. <DC 10V> <S 3.3V per cel>"
 		},
 		"SleepTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Slaap",
 				"temp"
 			],
 			"desc": "Temperatuur in slaapstand <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Slaap",
 				"time-out"
 			],
 			"desc": "Slaapstand time-out <Minuten/Seconden>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Uitschakel",
 				"time-out"
 			],
 			"desc": "Automatisch afsluiten time-out <Minuten>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Bewegings-",
 				"gevoeligheid"
 			],
 			"desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Temperatuur",
 				"eenheid"
 			],
 			"desc": "Temperatuureenheid <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Gedetailleerd",
 				"slaapscherm"
 			],
 			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het slaapscherm."
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Scherm-",
 				"oriëntatie"
 			],
 			"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Boostmodes",
-				"ingeschakeld?"
-			],
-			"desc": "Soldeerbout gaat naar een hogere boost-temperatuur wanneer de voorste knop ingedrukt is."
-		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Boost",
 				"temp"
 			],
 			"desc": "Temperatuur in boostmodes"
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Auto",
 				"start"
 			],
 			"desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Afkoel",
 				"flikker"
 			],
 			"desc": "Temperatuur laten flikkeren in het hoofdmenu als de soldeerpunt aan het afkoelen is."
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Calibreer",
 				"temperatuur?"
 			],
 			"desc": "Temperatuursafwijking van de soldeerpunt calibreren."
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Instellingen",
 				"resetten?"
 			],
 			"desc": "Alle instellingen terugzetten."
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Calibreer",
 				"input-voltage?"
 			],
 			"desc": "VIN Calibreren. Knoppen lang ingedrukt houden om te bevestigen."
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Gedetailleerd",
 				"soldeerscherm"
 			],
 			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm."
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Scroll",
 				"snelheid"
 			],
 			"desc": "Snelheid waarmee de tekst scrolt."
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Tip",
 				"Model"
 			],
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Simple",
 				"Calibration"
 			],
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_nl_be.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Spannings-",
 				"bron"
 			],
 			"desc": "Spanningsbron. Stelt minimumspanning in. <DC 10V> <S 3.3V per cel>"
 		},
 		"SleepTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Slaap",
 				"temp"
 			],
 			"desc": "Temperatuur in slaapstand <°C>"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Slaap",
 				"time-out"
 			],
 			"desc": "Slaapstand time-out <Minuten/Seconden>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Uitschakel",
 				"time-out"
 			],
 			"desc": "Automatisch afsluiten time-out <Minuten>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Bewegings-",
 				"gevoeligheid"
 			],
 			"desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Temperatuur",
 				"schaal"
 			],
 			"desc": "Temperatuurschaal <°C=Celsius °F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Gedetailleerd",
 				"slaapscherm"
 			],
 			"desc": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm."
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Scherm-",
 				"oriëntatie"
 			],
 			"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Temperatuurverhoging",
-				"ingeschakeld?"
-			],
-			"desc": "Temperatuur verhoogt als voorste knop is ingedrukt"
-		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Verhogings",
 				"temp"
 			],
 			"desc": "Verhogingstemperatuur"
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Auto",
 				"start"
 			],
 			"desc": "Breng de soldeerbout op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Afkoel",
 				"knipper"
 			],
 			"desc": "Temperatuur knippert in hoofdmenu tijdens afkoeling."
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Calibreer",
 				"temperatuur?"
 			],
 			"desc": "Temperatuur van de punt calibreren."
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Instellingen",
 				"resetten?"
 			],
 			"desc": "Alle instellingen resetten."
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Calibreer",
 				"voedingsspanning?"
 			],
 			"desc": "VIN Calibreren. Bevestigen door knoppen lang in te drukken."
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Gedetailleerd",
 				"soldeerscherm"
 			],
 			"desc": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Scrol",
 				"snelheid"
 			],
 			"desc": "Scrolsnelheid van de tekst."
 		},
 		"TipModel": {
-			"text": "PUNTMO",
+						"text2": [
-			"text2": [
 				"Punt",
 				"Model"
 			],
 			"desc": "Gekozen punt"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Eenvoudige",
 				"Calibrering"
 			],
 			"desc": "Calibrering met heet water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Gevorderde",
 				"Calibrering"
 			],
 			"desc": "Calibrering met thermokoppel"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Vermogen",
 				"Watt"
 			],
 			"desc": "Vermogen van de adapter"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_no.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "Kilde",
+						"text2": [
-			"text2": [
+				"Kilde",
-				"",
 				""
 			],
 			"desc": "Strømforsyning. Sett nedre spenning for automatisk nedstenging. <DC 10V <S 3.3V per celle"
 		},
 		"SleepTemperature": {
-			"text": "DTmp",
+						"text2": [
-			"text2": [
+				"DTmp",
-				"",
 				""
 			],
-			"desc": "Dvaletemperatur <C"
+			"desc": "Dvaletemperatur <C>"
 		},
 		"SleepTimeout": {
-			"text": "DTid",
+						"text2": [
-			"text2": [
 				"",
 				""
 			],
 			"desc": "Tid før dvale <Minutter/Sekunder"
 		},
 		"ShutdownTimeout": {
-			"text": "AvTid",
+						"text2": [
-			"text2": [
+				"AvTid",
-				"",
 				""
 			],
 			"desc": "Tid før automatisk nedstenging <Minutter"
 		},
 		"MotionSensitivity": {
-			"text": "BSensr",
+						"text2": [
-			"text2": [
+				"BSensr",
-				"",
 				""
 			],
 			"desc": "Bevegelsesfølsomhet <0.Inaktiv 1.Minst følsom 9.Mest følsom"
 		},
 		"TemperatureUnit": {
-			"text": "TmpEnh",
+						"text2": [
-			"text2": [
+				"TmpEnh",
-				"",
 				""
 			],
 			"desc": "Temperaturskala <C=Celsius F=Fahrenheit"
 		},
 		"AdvancedIdle": {
-			"text": "AvDvSk",
+						"text2": [
-			"text2": [
+				"AvDvSk",
-				"",
 				""
 			],
 			"desc": "Vis detaljert informasjon med liten skrift på dvaleskjermen."
 		},
 		"DisplayRotation": {
-			"text": "SkRetn",
+						"text2": [
-			"text2": [
+				"SkRetn",
-				"",
 				""
 			],
 			"desc": "Skjermretning <A. Automatisk V. Venstrehendt H. Høyrehendt"
 		},
-		"BoostEnabled": {
-			"text": "Kraft",
-			"text2": [
-				"",
-				""
-			],
-			"desc": "Frontknappen aktiverer kraftfunksjonen, 450C ved lodding"
-		},
 		"BoostTemperature": {
-			"text": "KTmp",
+						"text2": [
-			"text2": [
+				"KTmp",
-				"",
 				""
 			],
 			"desc": "Temperatur i \"kraft\"-modus"
 		},
 		"AutoStart": {
-			"text": "AStart",
+						"text2": [
-			"text2": [
+				"AStart",
-				"",
 				""
 			],
 			"desc": "Start automatisk med lodding når strøm kobles til. L=Lodding, D=Dvale, I=Inaktiv"
 		},
 		"CooldownBlink": {
-			"text": "KjBlnk",
+						"text2": [
-			"text2": [
+				"KjBlnk",
-				"",
 				""
 			],
 			"desc": "Blink temperaturen på skjermen mens spissen fortsatt er varm."
 		},
 		"TemperatureCalibration": {
-			"text": "TempKal?",
+						"text2": [
-			"text2": [
+				"TempKal?",
-				"",
 				""
 			],
 			"desc": "Kalibrer spiss-temperatur."
 		},
 		"SettingsReset": {
-			"text": "TilbStl?",
+						"text2": [
-			"text2": [
+				"TilbStl?",
-				"",
 				""
 			],
 			"desc": "Tilbakestill alle innstillinger"
 		},
 		"VoltageCalibration": {
-			"text": "KalSpIn?",
+						"text2": [
-			"text2": [
+				"KalSpIn?",
-				"",
 				""
 			],
 			"desc": "Kalibrer spenning. Knappene justerer. Langt trykk for å gå ut"
 		},
 		"AdvancedSoldering": {
-			"text": "AvLdSk",
+						"text2": [
-			"text2": [
+				"AvLdSk",
-				"",
 				""
 			],
 			"desc": "Vis detaljert informasjon ved lodding"
 		},
 		"ScrollingSpeed": {
-			"text": "RullHa",
+						"text2": [
-			"text2": [
+				"RullHa",
-				"",
 				""
 			],
 			"desc": "Hastigheten på rulletekst"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Tip",
 				"Model"
 			],
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Simple",
 				"Calibration"
 			],
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_pl.json

@@ -2,9 +2,10 @@
 	"languageCode": "PL",
 	"languageLocalName": "Polski",
 	"cyrillicGlyphs": false,
+	"tempUnitFahrenheit": false,
 	"messages": {
 		"SettingsCalibrationDone": "Kalibracja udana!",
-		"SettingsCalibrationWarning": "Przed kontynuowaniem upewnij się, że końcówka osiągnela temperature pokojowa!",
+		"SettingsCalibrationWarning": "Przed kontynuowaniem upewnij się, że końcówka osiągnęła temperaturę pokojową!",
 		"SettingsResetWarning": "Czy na pewno chcesz przywrócić ustawienia fabryczne?",
 		"UVLOWarningString": "NISKIE DC",
 		"UndervoltageString": "Pod napięciem",
@@ -12,7 +13,7 @@
 		"WarningTipTempString": "Temperatura grota: ",
 		"BadTipString": "ZŁY GROT",
 		"SleepingSimpleString": "Zzz!",
-		"SleepingAdvancedString": "Uspienie...",
+		"SleepingAdvancedString": "Uśpienie...",
 		"WarningSimpleString": "HOT!",
 		"WarningAdvancedString": "GORĄCA KOŃCÓWKA!",
 		"SleepingTipAdvancedString": "Grot:",
@@ -20,16 +21,22 @@
 		"IdleSetString": " Ustaw:",
 		"TipDisconnectedString": "GROT ODŁĄCZONY",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Wyłącz"
+		"OffString": "Wyłącz",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Twój zysk:",
+		"SettingsResetMessage": "Ustawienia zostały\nzresetowane!"
 	},
 	"characters": {
 		"SettingRightChar": "P",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "F",
+		"SettingFastChar": "S",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "W",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "Z",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "B"
 	},
-	"menuDouble": false,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +69,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "PWRSC",
+						"text2": [
-			"text2": [
 				"Źródło",
 				"zasilania"
 			],
 			"desc": "Źródło zasilania. Ustaw napięcie odcięcia. <DC 10V> <S 3.3V dla ogniw Li>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
+						"text2": [
-			"text2": [
 				"Temperatura",
 				"uśpienia"
 			],
 			"desc": "Temperatura uśpienia <°C>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
+						"text2": [
-			"text2": [
 				"Czas",
 				"uśpienia"
 			],
-			"desc": "Czas uśpienia <Minuty/Sekundy>"
+			"desc": "Czas uśpienia <minuty/sekundy>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
+						"text2": [
-			"text2": [
 				"Czas",
 				"wyłączenia"
 			],
-			"desc": "Czas wyłączenia <Minuty>"
+			"desc": "Czas wyłączenia <minuty>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
+						"text2": [
-			"text2": [
 				"Czułość",
 				"ruchu"
 			],
-			"desc": "Czułość ruchu <0.Wyłączona 1.minimalna 9.maksymalna>"
+			"desc": "Czułość ruchu <0.Wyłączona 1.Minimalna 9.Maksymalna>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
+						"text2": [
-			"text2": [
 				"Jednostka",
 				"temperatury"
 			],
 			"desc": "Jednostka temperatury <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
+						"text2": [
-			"text2": [
 				"Mniejsza",
 				"czcionka"
 			],
-			"desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynnośći <T = wł., N = wył.>"
+			"desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynności"
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
+						"text2": [
-			"text2": [
 				"Orientacja",
 				"wyświetlacza"
 			],
-			"desc": "Orientacja wyświetlacza <A. Automatyczna L. Leworęczna P. Praworęczna>"
+			"desc": "Orientacja wyświetlacza <A - automatyczna, L - leworęczna, P - praworęczna>"
-		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"",
-				""
-			],
-			"desc": "Użyj przycisku przedniego w celu zwiększenia temperatury <T = wł., N = wył.>"
 		},
 		"BoostTemperature": {
-			"text": "BTMP",
+						"text2": [
-			"text2": [
 				"Temperatura",
 				"w trybie boost"
 			],
 			"desc": "Temperatura w trybie \"boost\" "
 		},
 		"AutoStart": {
-			"text": "ASTART",
+						"text2": [
-			"text2": [
 				"Automatyczne",
 				"uruchamianie"
 			],
-			"desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania. T=Lutowanie, S= Tryb Uspienia ,N=Wyłącz"
+			"desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania.<B - wyłączone, T - lutowanie, Z - uśpienie, O - uśpienie w temp. pokojowej"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
+						"text2": [
-			"text2": [
 				"Migająca",
 				"temperatura"
 			],
-			"desc": "Temperatura na ekranie miga, gdy grot jest jeszcze gorący. <T = wł., N = wył.>"
+			"desc": "Temperatura na ekranie miga, gdy grot jest jeszcze gorący."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
+						"text2": [
-			"text2": [
 				"Kalibracja",
 				"temp. grota"
 			],
 			"desc": "Kalibracja temperatury grota lutownicy"
 		},
 		"SettingsReset": {
-			"text": "RESET?",
+						"text2": [
-			"text2": [
+				"Ustawienia",
-				"",
+				"fabryczne"
-				""
 			],
-			"desc": "Zresetuj wszystkie ustawienia"
+			"desc": "Zresetuje wszystkie ustawienia!"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
+						"text2": [
-			"text2": [
 				"Kalibracja",
 				"napięcia"
 			],
 			"desc": "Kalibracja napięcia wejściowego. Krótkie naciśnięcie, aby ustawić, długie naciśnięcie, aby wyjść."
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
+						"text2": [
-			"text2": [
 				"Szczegółowe",
 				"informacje"
 			],
-			"desc": "Wyświetl szczegółowe informacje podczas lutowania <T = wł., N = wył.>"
+			"desc": "Wyświetl szczegółowe informacje podczas lutowania"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+						"text2": [
-			"text2": [
 				"Szybkość",
 				"tekstu"
 			],
 			"desc": "Szybkość przewijania tekstu"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Model",
 				"grota"
 			],
 			"desc": "Wybór grotu"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Prosta",
-				"Kalibracja"
+				"kalibracja"
 			],
-			"desc": "Prosta kalibracja używając gorącej wody"
+			"desc": "Prosta kalibracja, używając gorącej wody"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Zaawansowana",
-				"Kalibracja"
+				"kalibracja"
 			],
-			"desc": "Zaawansowana kalibracja za pomocy termopoary na grocie"
+			"desc": "Zaawansowana kalibracja za pomocą termoelementu na grocie"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Moc",
-				"Wattach"
+				"w W"
 			],
-			"desc": "Moc używanego zasilacza w Watach"
+			"desc": "Moc używanego zasilacza w Wattach"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Limit",
+				"mocy"
+			],
+			"desc": "Maksymalna moc w W, jakiej może użyć lutownica"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Zamień przyciski",
+				"+ -"
+			],
+			"desc": "Zamienia działanie przycisków zmiany temperatury grotu"
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Szybka zmiana",
+				"temperatury"
+			],
+			"desc": "Zmiany temperatury krok po korku, po krótkim naciśnięciu przycisku"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Wolna zmiana",
+				"temperatury"
+			],
+			"desc": "Zmiany temperatury krok po korku, po długim naciśnięciu przycisku"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Moc pulsu",
+				"w W"
+			],
+			"desc": "Utrzymuj intensywność mocy pulsu"
+		},
+		"TipGain": {
+						"text2": [
+				"Zmodyfikowany",
+				"zysk grotu"
+			],
+			"desc": "Zysk grotu"
 		}
 	}
 }

Translation Editor/translation_pt.json

@@ -3,9 +3,9 @@
 	"languageLocalName": "Português",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Calibração terminada!",
-		"SettingsCalibrationWarning": "A ponta deve estar em temperatura ambiente antes de continuar!",
+		"SettingsCalibrationWarning": "A ponta deve estar à temperatura ambiente antes de continuar!",
-		"SettingsResetWarning": "Resetar para ajustes de fábrica?",
+		"SettingsResetWarning": "Definições de fábrica?",
 		"UVLOWarningString": "DC BAIXO",
 		"UndervoltageString": "Subtensão",
 		"InputVoltageString": "Tensão ",
@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -48,9 +52,9 @@
 		"UIMenu": {
 			"text2": [
 				"Interface",
-				"Usuário"
+				"Utilizador"
 			],
-			"desc": "Configurações da interface do usuário"
+			"desc": "Configurações do interface do utilizador"
 		},
 		"AdvancedMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "FONTE",
+						"text2": [
-			"text2": [
 				"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",
+						"text2": [
-			"text2": [
 				"Temperat.",
 				"repouso"
 			],
 			"desc": "Temperatura de repouso <C>"
 		},
 		"SleepTimeout": {
-			"text": "TMPO",
+						"text2": [
-			"text2": [
 				"Tempo",
 				"repouso"
 			],
 			"desc": "Tempo para repouso <Minutos/Segundos>"
 		},
 		"ShutdownTimeout": {
-			"text": "DESLI",
+						"text2": [
-			"text2": [
 				"Tempo",
 				"desligam."
 			],
 			"desc": "Tempo para desligamento <Minutos>"
 		},
 		"MotionSensitivity": {
-			"text": "MOVIME",
+						"text2": [
-			"text2": [
 				"Sensibilidade",
 				"movimento"
 			],
 			"desc": "Sensibilidade ao movimento <0=Desligado 1=Menor 9=Maior>"
 		},
 		"TemperatureUnit": {
-			"text": "UNIDAD",
+						"text2": [
-			"text2": [
 				"Unidade",
 				"temperatura"
 			],
 			"desc": "Unidade de temperatura <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "OCIOSO",
+						"text2": [
-			"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",
+						"text2": [
-			"text2": [
 				"Orientação",
 				"tela"
 			],
 			"desc": "Orientação da tela <A.utomática C.anhoto D.estro>"
 		},
-		"BoostEnabled": {
-			"text": "TURBO",
-			"text2": [
-				"Modo turbo",
-				"ativado"
-			],
-			"desc": "Tecla frontal ativa modo \"turbo\""
-		},
 		"BoostTemperature": {
-			"text": "TTMP",
+						"text2": [
-			"text2": [
 				"Modo turbo",
 				"temperat."
 			],
 			"desc": "Ajuste de temperatura do modo \"turbo\""
 		},
 		"AutoStart": {
-			"text": "MODOAT",
+						"text2": [
-			"text2": [
 				"Partida",
 				"automática"
 			],
 			"desc": "Aquece a ponta automaticamente ao ligar"
 		},
 		"CooldownBlink": {
-			"text": "RESFRI",
+						"text2": [
-			"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",
+						"text2": [
-			"text2": [
 				"Calibrar",
 				"temperatura"
 			],
 			"desc": "Calibra a temperatura"
 		},
 		"SettingsReset": {
-			"text": "RESETAR",
+						"text2": [
-			"text2": [
 				"Reset de",
 				"fábrica?"
 			],
 			"desc": "Reverte todos ajustes"
 		},
 		"VoltageCalibration": {
-			"text": "CAL.VOLT",
+						"text2": [
-			"text2": [
 				"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",
+						"text2": [
-			"text2": [
 				"Tela trabalho",
 				"avançada"
 			],
 			"desc": "Exibe informações avançadas durante o uso"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+						"text2": [
-			"text2": [
 				"Velocidade",
 				"texto ajuda"
 			],
-			"desc": "Velocidade que esse texto é exibido"
+			"desc": "Velocidade a que o texto é exibido"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
+				"Ponta",
-				"Tip",
+				"Modelo"
-				"Model"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Selecção de modelo de ponta"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
+				"Calibração",
-				"Simple",
+				"Simples"
-				"Calibration"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Calibração simples com água quente"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
+				"Calibração",
-				"Advanced",
+				"Avançada"
-				"Calibration"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Calibração avançada com um termopar na ponta"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
+				"Potência",
-				"Power",
+				"Fonte"
-				"Wattage"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Potência da fonte usada (Watt)"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_ru.json

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

Translation Editor/translation_sk.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "PWRSC",
+						"text2": [
-			"text2": [
+				"PWRSC",
-				"",
 				""
 			],
 			"desc": "Zdroj napatia. Nastavit napatie pre vypnutie (cutoff)  <DC=10V, nS=n*3.3V pre LiIon clanky>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
+						"text2": [
-			"text2": [
+				"STMP",
-				"",
 				""
 			],
 			"desc": "Kludova teplota (v nastavenych jednotkach)"
 		},
 		"SleepTimeout": {
-			"text": "STME",
+						"text2": [
-			"text2": [
+				"STME",
-				"",
 				""
 			],
 			"desc": "Kludovy rezim po <sekundach/minutach>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
+						"text2": [
-			"text2": [
+				"SHTME",
-				"",
 				""
 			],
 			"desc": "Cas na vypnutie <minuty>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
+						"text2": [
-			"text2": [
+				"MSENSE",
-				"",
 				""
 			],
 			"desc": "Citlivost detekcie pohybu <0=Vyp, 1=Min ... 9=Max>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
+						"text2": [
-			"text2": [
+				"TMPUNT",
-				"",
 				""
 			],
 			"desc": "Jednotky merania teploty <C=stupne Celzia, F=stupne Fahrenheita>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
+						"text2": [
-			"text2": [
+				"ADVIDL",
-				"",
 				""
 			],
 			"desc": "Zobrazit detailne informacie v kludovom rezime <T=Zap, F=Vyp>"
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
+						"text2": [
-			"text2": [
+				"DSPROT",
-				"",
 				""
 			],
 			"desc": "Orientacia displeja <A=Auto, L=Lavak, R=Pravak>"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"",
-				""
-			],
-			"desc": "Povolit tlacidlo pre prudky nahrev <T=Zap, F=Vyp>"
-		},
 		"BoostTemperature": {
-			"text": "BTMP",
+						"text2": [
-			"text2": [
+				"BTMP",
-				"",
 				""
 			],
 			"desc": "Cielova teplota pre prudky nahrev (v nastavenych jednotkach)"
 		},
 		"AutoStart": {
-			"text": "ASTART",
+						"text2": [
-			"text2": [
+				"ASTART",
-				"",
 				""
 			],
 			"desc": "Pri starte spustit rezim spajkovania <T=Zap, F=Vyp, S=Spanok>"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
+						"text2": [
-			"text2": [
+				"CLBLNK",
-				"",
 				""
 			],
 			"desc": "Blikanie ukazovatela teploty pocas chladnutia hrotu <T=Zap, F=Vyp>"
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
+						"text2": [
-			"text2": [
+				"TMP CAL?",
-				"",
 				""
 			],
 			"desc": "Kalibracia posunu hrotu"
 		},
 		"SettingsReset": {
-			"text": "RESET?",
+						"text2": [
-			"text2": [
+				"RESET?",
-				"",
 				""
 			],
 			"desc": "Tovarenske nastavenia"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
+						"text2": [
-			"text2": [
+				"CAL VIN?",
-				"",
 				""
 			],
 			"desc": "Kalibracia VIN. Kratke stlacenie meni nastavenie, dlhe stlacenie pre navrat"
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
+						"text2": [
-			"text2": [
+				"ADVSLD",
-				"",
 				""
 			],
 			"desc": "Zobrazenie detailov pocas spajkovania <T=Zap, F=Vyp>"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+						"text2": [
-			"text2": [
+				"DESCSP",
-				"",
 				""
 			],
 			"desc": "Speed this text scrolls past at"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Tip",
 				"Model"
 			],
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Simple",
 				"Calibration"
 			],
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_sl.json

@@ -0,0 +1,252 @@
+{
+	"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"
+	},
+	"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": {
+						"text2": [
+				"Vir",
+				"napajanja"
+			],
+			"desc": "Vir napajanja. Nastavi napetost izklopa. <DC 10V> <S 3.3V na celico>"
+		},
+		"SleepTemperature": {
+						"text2": [
+				"Temp. med",
+				"spanjem"
+			],
+			"desc": "Temperatura med spanjem <C>"
+		},
+		"SleepTimeout": {
+						"text2": [
+				"Čas do",
+				"spanja"
+			],
+			"desc": "Čas pred spanjem <minute/sekunde>"
+		},
+		"ShutdownTimeout": {
+						"text2": [
+				"Čas do",
+				"izklopa"
+			],
+			"desc": "Čas pred izklopom <minute>"
+		},
+		"MotionSensitivity": {
+						"text2": [
+				"Občutljivost",
+				"premikanja"
+			],
+			"desc": "Občutljivost premikanja <0.izklopljeno 1.najmanj 9.najbolj občutljivo>"
+		},
+		"TemperatureUnit": {
+						"text2": [
+				"Enota za",
+				"temperaturo"
+			],
+			"desc": "Enota za temperaturo <C=celzija F=fahrenheita>"
+		},
+		"AdvancedIdle": {
+						"text2": [
+				"Več info na",
+				"zaslonu v mir"
+			],
+			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med mirovanjem."
+		},
+		"DisplayRotation": {
+						"text2": [
+				"Orientacija",
+				"zaslona"
+			],
+			"desc": "Orientacija zaslona <S. samodejno L. levo D. desno>"
+		},
+		"BoostTemperature": {
+						"text2": [
+				"Temperat.",
+				"v boost"
+			],
+			"desc": "Temperatura v \"boost\" načinu"
+		},
+		"AutoStart": {
+						"text2": [
+				"Samodejni",
+				"zagon"
+			],
+			"desc": "Samodejno segrej konico ob vklopu. T=segrej, S=spanje, F=izklop"
+		},
+		"CooldownBlink": {
+						"text2": [
+				"Utripanje med",
+				"hlajenjem"
+			],
+			"desc": "Utripaj temperaturo med hlajenjem, ko je konica še vroča."
+		},
+		"TemperatureCalibration": {
+						"text2": [
+				"Kalibriram",
+				"temperaturo?"
+			],
+			"desc": "Kalibracija temperature na konici."
+		},
+		"SettingsReset": {
+						"text2": [
+				"Tovarniške",
+				"nastavitve?"
+			],
+			"desc": "Ponastavitev vseh nastavitev"
+		},
+		"VoltageCalibration": {
+						"text2": [
+				"Kalibriram",
+				"vhodno napetost?"
+			],
+			"desc": "Kalibracija VIN. Nastavitve z gumbi, dolgi pritisk za izhod."
+		},
+		"AdvancedSoldering": {
+						"text2": [
+				"Več info na",
+				"zaslonu spaj."
+			],
+			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
+		},
+		"ScrollingSpeed": {
+						"text2": [
+				"Hitrost",
+				"besedila"
+			],
+			"desc": "Hitrost, s katero se prikazuje besedilo"
+		},
+		"TipModel": {
+						"text2": [
+				"Model",
+				"konice"
+			],
+			"desc": "Izbira tipa konice"
+		},
+		"SimpleCalibrationMode": {
+						"text2": [
+				"Preprosta",
+				"kalibracija"
+			],
+			"desc": "Preprosta kalibracija z vročo vodo."
+		},
+		"AdvancedCalibrationMode": {
+						"text2": [
+				"Napredna",
+				"kalibracija"
+			],
+			"desc": "Napredna kalibracija s termočlenom na konici"
+		},
+		"PowerInput": {
+						"text2": [
+				"Moč napajalnega",
+				"vira"
+			],
+			"desc": "Moč v W napajalnega vira"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		}
+	}
+}

Translation Editor/translation_sr_cyrl.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "Нпјње",
+						"text2": [
-			"text2": [
 				"Врста",
 				"напајања"
 			],
 			"desc": "Тип напајања; одређује најнижи радни напон. <DC=адаптер (10V), S=батерија (3,3V по ћелији)>"
 		},
 		"SleepTemperature": {
-			"text": "ТСпв",
+						"text2": [
-			"text2": [
 				"Темп.",
 				"спавања"
 			],
 			"desc": "Температура на коју се спушта лемилица након одређеног времена мировања. <C/F>"
 		},
 		"SleepTimeout": {
-			"text": "ВСпв",
+						"text2": [
-			"text2": [
 				"Време до",
 				"спавања"
 			],
 			"desc": "Време мировања након кога лемилица спушта температуру. <M=минути, S=секунде>"
 		},
 		"ShutdownTimeout": {
-			"text": "ВГшњ",
+						"text2": [
-			"text2": [
 				"Време до",
 				"гашења"
 			],
 			"desc": "Време мировања након кога се лемилица гаси. <M=минути>"
 		},
 		"MotionSensitivity": {
-			"text": "ОстПкр",
+						"text2": [
-			"text2": [
 				"Осетљивост",
 				"на покрет"
 			],
 			"desc": "Осетљивост сензора покрета. <0=искључено, 1=најмање осетљиво, 9=најосетљивије>"
 		},
 		"TemperatureUnit": {
-			"text": "ЈедТмп",
+						"text2": [
-			"text2": [
 				"Јединица",
 				"температуре"
 			],
 			"desc": "Јединице у којима се приказује температура. <C=целзијус, F=фаренхајт>"
 		},
 		"AdvancedIdle": {
-			"text": "ДтљМир",
+						"text2": [
-			"text2": [
 				"Детаљи током",
 				"мировања"
 			],
 			"desc": "Приказивање детаљних информација на екрану током мировања."
 		},
 		"DisplayRotation": {
-			"text": "ОрјЕкр",
+						"text2": [
-			"text2": [
 				"Оријентација",
 				"екрана"
 			],
 			"desc": "Како је окренут екран. <А=аутоматски, Л=за леворуке, Д=за десноруке>"
 		},
-		"BoostEnabled": {
-			"text": "Пјчње",
-			"text2": [
-				"Појачање",
-				"омогућено"
-			],
-			"desc": "Држање предњег тастера током лемљења додатно појачава температуру врха."
-		},
 		"BoostTemperature": {
-			"text": "ТПјч",
+						"text2": [
-			"text2": [
 				"Темп.",
 				"појачања"
 			],
 			"desc": "Температура врха лемилице у току појачања."
 		},
 		"AutoStart": {
-			"text": "ВрћСта",
+						"text2": [
-			"text2": [
 				"Врући",
 				"старт"
 			],
 			"desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се."
 		},
 		"CooldownBlink": {
-			"text": "УпзХла",
+						"text2": [
-			"text2": [
 				"Упозорење",
 				"при хлађењу"
 			],
 			"desc": "Приказ температуре трепће приликом хлађења докле год је врх и даље врућ."
 		},
 		"TemperatureCalibration": {
-			"text": "КалбрТмп",
+						"text2": [
-			"text2": [
 				"Калибрација",
 				"температуре"
 			],
 			"desc": "Калибрисање одступања температуре врха у односу на дршку."
 		},
 		"SettingsReset": {
-			"text": "ФабрПост",
+						"text2": [
-			"text2": [
 				"Фабричке",
 				"поставке"
 			],
 			"desc": "Враћање свих поставки на фабричке вредности."
 		},
 		"VoltageCalibration": {
-			"text": "КалбрНап",
+						"text2": [
-			"text2": [
 				"Калибрација",
 				"улазног напона"
 			],
 			"desc": "Калибрисање улазног напона. Подешава се на тастере; дуги притисак за крај."
 		},
 		"AdvancedSoldering": {
-			"text": "ДтљЛем",
+						"text2": [
-			"text2": [
 				"Детаљи током",
 				"лемљења"
 			],
 			"desc": "Приказивање детаљних информација на екрану током лемљења."
 		},
 		"ScrollingSpeed": {
-			"text": "БрзПор",
+						"text2": [
-			"text2": [
 				"Брзина",
 				"порука"
 			],
 			"desc": "Брзина кретања описних порука попут ове. <С=споро, Б=брзо>"
 		},
 		"TipModel": {
-			"text": "МоделВрх",
+						"text2": [
-			"text2": [
 				"Модел",
 				"врха"
 			],
 			"desc": "Одабир модела лемног врха."
 		},
 		"SimpleCalibrationMode": {
-			"text": "ЈедКалбр",
+						"text2": [
-			"text2": [
 				"Једноставна",
 				"калибрација"
 			],
 			"desc": "Једноставна калибрација кипућом водом."
 		},
 		"AdvancedCalibrationMode": {
-			"text": "НапКалбр",
+						"text2": [
-			"text2": [
 				"Напредна",
 				"калибрација"
 			],
 			"desc": "Напредна калибрација помоћу термопара."
 		},
 		"PowerInput": {
-			"text": "УлазСнаг",
+						"text2": [
-			"text2": [
 				"Улазна",
 				"снага"
 			],
 			"desc": "Снага напајања у ватима."
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_sr_latn.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "Npjnj",
+						"text2": [
-			"text2": [
 				"Vrsta",
 				"napajanja"
 			],
 			"desc": "Tip napajanja; određuje najniži radni napon. <DC=adapter (10V), S=baterija (3,3V po ćeliji)>"
 		},
 		"SleepTemperature": {
-			"text": "TSpv",
+						"text2": [
-			"text2": [
 				"Temp.",
 				"spavanja"
 			],
 			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
 		},
 		"SleepTimeout": {
-			"text": "VSpv",
+						"text2": [
-			"text2": [
 				"Vreme do",
 				"spavanja"
 			],
 			"desc": "Vreme mirovanja nakon koga lemilica spušta temperaturu. <M=minuti, S=sekunde>"
 		},
 		"ShutdownTimeout": {
-			"text": "VGšnj",
+						"text2": [
-			"text2": [
 				"Vreme do",
 				"gašenja"
 			],
 			"desc": "Vreme mirovanja nakon koga se lemilica gasi. <M=minuti>"
 		},
 		"MotionSensitivity": {
-			"text": "OstPkr",
+						"text2": [
-			"text2": [
 				"Osetljivost",
 				"na pokret"
 			],
 			"desc": "Osetljivost senzora pokreta. <0=isključeno, 1=najmanje osetljivo, 9=najosetljivije>"
 		},
 		"TemperatureUnit": {
-			"text": "JedTmp",
+						"text2": [
-			"text2": [
 				"Jedinica",
 				"temperature"
 			],
 			"desc": "Jedinice u kojima se prikazuje temperatura. <C=celzijus, F=farenhajt>"
 		},
 		"AdvancedIdle": {
-			"text": "DtlMir",
+						"text2": [
-			"text2": [
 				"Detalji tokom",
 				"mirovanja"
 			],
 			"desc": "Prikazivanje detaljnih informacija na ekranu tokom mirovanja."
 		},
 		"DisplayRotation": {
-			"text": "OrjEkr",
+						"text2": [
-			"text2": [
 				"Orijentacija",
 				"ekrana"
 			],
 			"desc": "Kako je okrenut ekran. <A=automatski, L=za levoruke, D=za desnoruke>"
 		},
-		"BoostEnabled": {
-			"text": "Pjčnj",
-			"text2": [
-				"Pojačanje",
-				"omogućeno"
-			],
-			"desc": "Držanje prednjeg tastera tokom lemljenja dodatno pojačava temperaturu vrha."
-		},
 		"BoostTemperature": {
-			"text": "TPjč",
+						"text2": [
-			"text2": [
 				"Temp.",
 				"pojačanja"
 			],
 			"desc": "Temperatura vrha lemilice u toku pojačanja."
 		},
 		"AutoStart": {
-			"text": "VrćSta",
+						"text2": [
-			"text2": [
 				"Vrući",
 				"start"
 			],
 			"desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se."
 		},
 		"CooldownBlink": {
-			"text": "UpzHla",
+						"text2": [
-			"text2": [
 				"Upozorenje",
 				"pri hlađenju"
 			],
 			"desc": "Prikaz temperature trepće prilikom hlađenja dokle god je vrh i dalje vruć."
 		},
 		"TemperatureCalibration": {
-			"text": "KalbrTmp",
+						"text2": [
-			"text2": [
 				"Kalibracija",
 				"temperature"
 			],
 			"desc": "Kalibrisanje odstupanja temperature vrha u odnosu na dršku."
 		},
 		"SettingsReset": {
-			"text": "FabrPost",
+						"text2": [
-			"text2": [
 				"Fabričke",
 				"postavke"
 			],
 			"desc": "Vraćanje svih postavki na fabričke vrednosti."
 		},
 		"VoltageCalibration": {
-			"text": "KalbrNap",
+						"text2": [
-			"text2": [
 				"Kalibracija",
 				"ulaznog napona"
 			],
 			"desc": "Kalibrisanje ulaznog napona. Podešava se na tastere; dugi pritisak za kraj."
 		},
 		"AdvancedSoldering": {
-			"text": "DtlLem",
+						"text2": [
-			"text2": [
 				"Detalji tokom",
 				"lemljenja"
 			],
 			"desc": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja."
 		},
 		"ScrollingSpeed": {
-			"text": "BrzPor",
+						"text2": [
-			"text2": [
 				"Brzina",
 				"poruka"
 			],
 			"desc": "Brzina kretanja opisnih poruka poput ove. <S=sporo, B=brzo>"
 		},
 		"TipModel": {
-			"text": "ModelVrh",
+						"text2": [
-			"text2": [
 				"Model",
 				"vrha"
 			],
 			"desc": "Odabir modela lemnog vrha."
 		},
 		"SimpleCalibrationMode": {
-			"text": "JedKalbr",
+						"text2": [
-			"text2": [
 				"Jednostavna",
 				"kalibracija"
 			],
 			"desc": "Jednostavna kalibracija kipućom vodom."
 		},
 		"AdvancedCalibrationMode": {
-			"text": "NapKalbr",
+						"text2": [
-			"text2": [
 				"Napredna",
 				"kalibracija"
 			],
 			"desc": "Napredna kalibracija pomoću termopara."
 		},
 		"PowerInput": {
-			"text": "UlazSnag",
+						"text2": [
-			"text2": [
 				"Ulazna",
 				"snaga"
 			],
 			"desc": "Snaga napajanja u vatima."
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_sv.json

@@ -20,16 +20,20 @@
 		"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": {
 		"SolderingMenu": {
 			"text2": [
@@ -62,172 +66,186 @@
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Ström-",
 				"källa"
 			],
 			"desc": "Strömkälla. Anger lägsta spänning. <DC 10V> <S 3.3V per cell>"
 		},
 		"SleepTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Vilo-",
 				"temp"
 			],
 			"desc": "Vilotemperatur <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Vilo-",
 				"timeout"
 			],
 			"desc": "Vilo-timeout <Minuter/Seconder>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Avstängn.",
 				"timeout"
 			],
 			"desc": "Avstängnings-timeout <Minuter>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Rörelse-",
 				"känslighet"
 			],
 			"desc": "Rörelsekänslighet <0.Av 1.minst känslig 9.mest känslig>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Temperatur-",
 				"enheter"
 			],
 			"desc": "Temperaturenhet <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Detaljerad",
 				"vid inaktiv"
 			],
 			"desc": "Visa detaljerad information i mindre typsnitt när inaktiv."
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Visnings",
 				"läge"
 			],
 			"desc": "Visningsläge <A. Automatisk V. Vänsterhänt H. Högerhänt>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Turboläge",
-				"aktiverat"
-			],
-			"desc": "Aktivera främre knappen för turboläge (temperaturhöjning) vid lödning"
-		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Turbo-",
 				"temp"
 			],
 			"desc": "Temperatur i \"turbo\"-läge"
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Auto",
 				"start"
 			],
 			"desc": "Startar automatiskt lödpennan vid uppstart. T=Lödning, S=Viloläge, F=Av"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Nedkylnings-",
 				"blink"
 			],
 			"desc": "Blinka temperaturen medan spetsen kyls av och fortfarande är varm."
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Kalibrera",
 				"temperatur?"
 			],
 			"desc": "Kalibrera spets-kompensation."
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Fabriks-",
 				"inställ?"
 			],
 			"desc": "Återställ alla inställningar"
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Kalibrera",
 				"inspänning?"
 			],
 			"desc": "Inspänningskalibrering. Knapparna justerar, håll inne för avslut"
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Detaljerad",
 				"lödng.skärm"
 			],
 			"desc": "Visa detaljerad information vid lödning"
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Beskrivning",
 				"rullhast."
 			],
 			"desc": "Hastighet som den här texten rullar i"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
 				"Tip",
 				"Model"
 			],
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
 				"Simple",
 				"Calibration"
 			],
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_tr.json

@@ -1,233 +1,251 @@
 {
 	"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",
+		"UndervoltageString": "Düşüş Voltaj",
-		"InputVoltageString": "Input V: ",
+		"InputVoltageString": "Giriş V: ",
-		"WarningTipTempString": "Tip Temp: ",
+		"WarningTipTempString": "Uç Sıcaklığı: ",
-		"BadTipString": "BAD TIP",
+		"BadTipString": "KÖTÜ UÇ",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Uyuyor...",
-		"WarningSimpleString": "HOT!",
+		"WarningSimpleString": "SICAK!",
 		"WarningAdvancedString": "UYARI! UÇ SICAK!",
-		"SleepingTipAdvancedString": "Tip:",
+		"SleepingTipAdvancedString": "Uç:",
-		"IdleTipString": "Tip:",
+		"IdleTipString": "Uç:",
-		"IdleSetString": " Set:",
+		"IdleSetString": " Ayarla:",
-		"TipDisconnectedString": "TIP DISCONNECTED",
+		"TipDisconnectedString": "UÇ ÇIKARILDI",
-		"SolderingAdvancedPowerPrompt": "Power: ",
+		"SolderingAdvancedPowerPrompt": "Güç: ",
-		"OffString": "Off"
+		"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",
+				"Lehimleme",
-				"Settings"
+				"Ayarları"
 			],
-			"desc": "Soldering settings"
+			"desc": "Lehimleme Ayarları"
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Sleep",
+				"Uyku",
-				"Modes"
+				"Modları"
 			],
-			"desc": "Power Saving Settings"
+			"desc": "Güç Tasarrufu Ayarları"
 		},
 		"UIMenu": {
 			"text2": [
-				"User",
+				"Kullanıcı",
-				"Interface"
+				"Arayüzü"
 			],
-			"desc": "User Interface settings"
+			"desc": "Kullanıcı Arayüzü Ayarları"
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Advanced",
+				"Gelişmiş",
-				"Options"
+				"Ayarlar"
 			],
-			"desc": "Advanced options"
+			"desc": "Gelişmiş Ayarlar"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "PWRSC",
+						"text2": [
-			"text2": [
+				"PWRSC",
-				"",
 				""
 			],
 			"desc": "Güç Kaynağı. kesim geriliminı ayarlar. <DC 10V> <S 3.3V hücre başına>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
+						"text2": [
-			"text2": [
+				"STMP",
-				"",
 				""
 			],
 			"desc": "Uyku Sıcaklığı <C>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
+						"text2": [
-			"text2": [
+				"STME",
-				"",
 				""
 			],
 			"desc": "Uyku Zaman Aşımı <Dakika/Saniye>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
+						"text2": [
-			"text2": [
+				"SHTME",
-				"",
 				""
 			],
 			"desc": "Kapatma Zaman Aşımı <Dakika>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
+						"text2": [
-			"text2": [
+				"MSENSE",
-				"",
 				""
 			],
 			"desc": "Hareket Hassasiyeti <0.Kapalı 1.En az duyarlı 9.En duyarlı>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
+						"text2": [
-			"text2": [
+				"TMPUNT",
-				"",
 				""
 			],
 			"desc": "Sıcaklık Ünitesi <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
+						"text2": [
-			"text2": [
+				"ADVIDL",
-				"",
 				""
 			],
 			"desc": "Boş ekranda ayrıntılı bilgileri daha küçük bir yazı tipi ile göster."
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
+						"text2": [
-			"text2": [
+				"DSPROT",
-				"",
 				""
 			],
 			"desc": "Görüntü Yönlendirme <A. Otomatik L. Solak R. Sağlak>"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"",
-				""
-			],
-			"desc": "Lehimleme yaparken ön tuşa basmak Boost moduna sokar(450C)"
-		},
 		"BoostTemperature": {
-			"text": "BTMP",
+						"text2": [
-			"text2": [
+				"BTMP",
-				"",
 				""
 			],
 			"desc": "\"boost\" Modu Derecesi"
 		},
 		"AutoStart": {
-			"text": "ASTART",
+						"text2": [
-			"text2": [
+				"ASTART",
-				"",
 				""
 			],
 			"desc": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. T=Lehimleme Modu, S= Uyku Modu,F=Kapalı"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
+						"text2": [
-			"text2": [
+				"CLBLNK",
-				"",
 				""
 			],
 			"desc": "Soğutma ekranında uç hala sıcakken derece yanıp sönsün."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
+						"text2": [
-			"text2": [
+				"TMP CAL?",
-				"",
 				""
 			],
 			"desc": "Ucu kalibre et."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
+						"text2": [
-			"text2": [
+				"RESET?",
-				"",
 				""
 			],
 			"desc": "Bütün ayarları sıfırla"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
+						"text2": [
-			"text2": [
+				"CAL VIN?",
-				"",
 				""
 			],
 			"desc": "VIN Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas."
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
+						"text2": [
-			"text2": [
+				"ADVSLD",
-				"",
 				""
 			],
 			"desc": "Lehimleme yaparken detaylı bilgi göster"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+						"text2": [
-			"text2": [
+				"DESCSP",
-				"",
 				""
 			],
 			"desc": "Speed this text scrolls past at"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
+				"Uç",
-				"Tip",
+				"Modeli"
-				"Model"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Uç Modeli seçimi"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
+				"Basit",
-				"Simple",
+				"Kalibrasyon"
-				"Calibration"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Sıcak su kullanarak basit kalibrasyon"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
+				"Gelişmiş",
-				"Advanced",
+				"Kalibrasyon"
-				"Calibration"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Uçtaki ısı sensörünü kullanarak gelişmiş kalibrasyon"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
+				"Güç",
-				"Power",
+				"Miktarı(W)"
-				"Wattage"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Kullanılan adaptörün güç miktarı"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_uk.json

@@ -3,45 +3,51 @@
 	"languageLocalName": "Українська",
 	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Калібрування виконане!",
 		"SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!",
-		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням?",
+		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? <A - Так, В - Ні>",
 		"UVLOWarningString": "АККУМ--",
-		"UndervoltageString": "Під живленням",
+		"UndervoltageString": "Низ. напруга",
 		"InputVoltageString": "Жив.(B): ",
 		"WarningTipTempString": "Жало t°: ",
-		"BadTipString": "Жало--",
+		"BadTipString": "ЖАЛО--",
-		"SleepingSimpleString": "Сон ",
+		"SleepingSimpleString": "ZzZzz",
 		"SleepingAdvancedString": "Очікування...",
-		"WarningSimpleString": "АЙ!",
+		"WarningSimpleString": "ГАРЯЧЕ!",
-		"WarningAdvancedString": "УВАГА ГАРЯЧЕ!",
+		"WarningAdvancedString": "!!! ГАРЯЧЕ ЖАЛО !!!",
 		"SleepingTipAdvancedString": "Жало:",
 		"IdleTipString": "Жало:",
 		"IdleSetString": " ->",
 		"TipDisconnectedString": "Жало вимкнено!",
 		"SolderingAdvancedPowerPrompt": "Живлення: ",
-		"OffString": "Вим"
+		"OffString": "Вимк",
+		"ResetOKMessage": "Скидання OK",
+		"YourGainMessage": "Приріст:",
+		"SettingsResetMessage": "Налаштування скинуті!"
 	},
 	"characters": {
-		"SettingRightChar": "R",
+		"SettingRightChar": "П",
-		"SettingLeftChar": "L",
+		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "+",
+		"SettingFastChar": "Ш",
-		"SettingSlowChar": "-"
+		"SettingSlowChar": "П",
+		"SettingStartSolderingChar": "П",
+		"SettingStartSleepChar": "О",
+		"SettingStartSleepOffChar": "К",
+		"SettingStartNoneChar": "В"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Пайка",
+				"Параметри",
-				""
+				"пайки"
 			],
 			"desc": "Налаштування для режиму пайки. Діють при включеному жалі."
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Сон",
+				"Режим",
-				""
+				"сну"
 			],
 			"desc": "Налаштування при бездіяльності. Корисно що б не обпектися і з часом не спалити житло."
 		},
@@ -50,184 +56,198 @@
 				"Інтерфейс",
 				""
 			],
-			"desc": "Користувальницький інтерфейс."
+			"desc": "Параметри користувальницького інтерфейсу."
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Інші",
+				"Додаткові",
-				""
+				"параметри"
 			],
 			"desc": "Розширені налаштування. Додаткові зручності."
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+						"text2": [
-			"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": "",
+						"text2": [
-			"text2": [
 				"Темпер.",
 				"сну"
 			],
 			"desc": "Температура режиму очікування <C°/F°>"
 		},
 		"SleepTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
+				"Тайм-аут",
-				"Таймаут",
 				"сну"
 			],
-			"desc": "Час до переходу в режим очікування <Доступно отключение>"
+			"desc": "Час до переходу в режим очікування <Хвилини/Секунди>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Часу до",
 				"вимкнення"
 			],
-			"desc": "Час до відключення <Доступно відключення>"
+			"desc": "Час до відключення <Хвилини>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Чутл. сенсо-",
 				"ру руху"
 			],
-			"desc": "Акселерометр <0 - Викл. 1 хв. чутливості 9 - макс. чутливості>"
+			"desc": "Акселерометр <0 - Вимк. 1 - мін. чутливості 9 - макс. чутливості>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Формат темпе-",
 				"ратури(C°/F°)"
 			],
 			"desc": "Одиниця виміру температури <C - Цельсій, F - Фаренгейт>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Детальний ре-",
 				"жим очікуван."
 			],
-			"desc": "Показувати детальну в режимі налаштувань <Замість картинки>"
+			"desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
 		},
 		"DisplayRotation": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Автоповорот",
 				"екрану"
 			],
-			"desc": "Орієнтація дисплея <A - Автоповорот, L - Лівша, R - Правша>"
+			"desc": "Орієнтація дисплея <A - Автоповорот, Л - Лівша, П - Правша>"
-		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Режим",
-				"Турбо"
-			],
-			"desc": "Турбо-режим при утриманні кнопки А при пайці"
 		},
 		"BoostTemperature": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Темпер.",
 				"Турбо"
 			],
 			"desc": "Температура в Турбо-режимі"
 		},
 		"AutoStart": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Гарячий",
 				"старт"
 			],
-			"desc": "Автоматичний перехід в режим пайки при включенні живлення."
+			"desc": "Режим з яким запускається паяльник при подачі живлення <П=Пайка, О=Очікування, К=Очікування при кімн. темп., В=Вимк.>"
 		},
 		"CooldownBlink": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Показ t° при",
 				"охолодж."
 			],
 			"desc": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран моргає"
 		},
 		"TemperatureCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Калібровка",
 				"температури"
 			],
 			"desc": "Калібрування температурного датчика."
 		},
 		"SettingsReset": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Скинути всі",
 				"налаштування?"
 			],
-			"desc": "Скидання всіх параметрів до вихідних значень."
+			"desc": "Скидання всіх параметрів до стандартних значень."
 		},
 		"VoltageCalibration": {
-			"text": "",
+						"text2": [
-			"text2": [
+				"Калібрування",
-				"Калібровка",
+				"напруги"
-				"напруга"
 			],
 			"desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
 		},
 		"AdvancedSoldering": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Детальний ре-",
 				"жим пайки"
 			],
 			"desc": "Показувати детальну інформацію при пайці."
 		},
 		"ScrollingSpeed": {
-			"text": "",
+						"text2": [
-			"text2": [
 				"Швидкість",
 				"тексту"
 			],
-			"desc": "Швидкість прокрутки тексту"
+			"desc": "Швидкість прокрутки тексту <П=повільно, Ш=швидко>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+						"text2": [
-			"text2": [
+				"Модель",
-				"Tip",
+				"Жало"
-				"Model"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Вибір моделі жала"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+						"text2": [
-			"text2": [
+				"Просте",
-				"Simple",
+				"Калібрування"
-				"Calibration"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Просте калібрування з використанням гарячої води"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+						"text2": [
-			"text2": [
+				"Детальне",
-				"Advanced",
+				"Калібрування"
-				"Calibration"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Калібрування за допомогою термопари"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+						"text2": [
-			"text2": [
+				"Потужність",
-				"Power",
+				"дж. живл."
-				"Wattage"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Потужність джерела живлення в Ватах"
+		},
+		"PowerLimit": {
+						"text2": [
+				"Макс.",
+				"потуж."
+			],
+			"desc": "Макс. потужність, яку може використовувати паяльник <Ват>"
+		},
+		"ReverseButtonTempChange": {
+						"text2": [
+				"Інвертувати",
+				"кнопки +-?"
+			],
+			"desc": "Інвертувати кнопки зміни температури."
+		},
+		"TempChangeShortStep": {
+						"text2": [
+				"Зм. темп.",
+				"коротко?"
+			],
+			"desc": "Змінювати температуру при короткому натисканні!"
+		},
+		"TempChangeLongStep": {
+						"text2": [
+				"Зм. темп.",
+				"довго?"
+			],
+			"desc": "Змінювати температуру при довгому натисканні!"
+		},
+		"PowerPulsePower":{
+						"text2": [
+				"Пульс.",
+				"Навантаж."
+			],
+			"desc": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії (це потрібно щоб паяльник не вимкнувся з часом)"
+		},
+		"TipGain": {
+						"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translations_def.js

@@ -1,232 +1,287 @@
-var def =
+var def =
-{
+{
-	"messages": [
+	"messages": [
-		{
+		{
-			"id": "SettingsCalibrationDone"
+			"id": "SettingsCalibrationDone"
-		},
+		},
-		{
+		{
-			"id": "SettingsCalibrationWarning"
+			"id": "SettingsCalibrationWarning"
-		},
+		},
-		{
+		{
-			"id": "SettingsResetWarning"
+			"id": "SettingsResetWarning"
-		},
+		},
-		{
+		{
-			"id": "UVLOWarningString",
+			"id": "UVLOWarningString",
-			"maxLen": 8
+			"maxLen": 8
-		},
+		},
-		{
+		{
-			"id": "UndervoltageString",
+			"id": "UndervoltageString",
-			"maxLen": 16
+			"maxLen": 16
-		},
+		},
-		{
+		{
-			"id": "InputVoltageString",
+			"id": "InputVoltageString",
-			"maxLen": 11,
+			"maxLen": 11,
-			"note": "Preferably end with a space"
+			"note": "Preferably end with a space"
-		},
+		},
-		{
+		{
-			"id": "WarningTipTempString",
+			"id": "WarningTipTempString",
-			"maxLen": 12,
+			"maxLen": 12,
-			"note": "Preferably end with a space"
+			"note": "Preferably end with a space"
-		},
+		},
-		{
+		{
-			"id": "BadTipString",
+			"id": "BadTipString",
-			"maxLen": 8
+			"maxLen": 8
-		},
+		},
-		{
+		{
-			"id": "SleepingSimpleString",
+			"id": "SleepingSimpleString",
-			"maxLen": 4
+			"maxLen": 4
-		},
+		},
-		{
+		{
-			"id": "SleepingAdvancedString",
+			"id": "SleepingAdvancedString",
-			"maxLen": 16
+			"maxLen": 16
-		},
+		},
-		{
+		{
-			"id": "WarningSimpleString",
+			"id": "WarningSimpleString",
-			"maxLen": 4
+			"maxLen": 4
-		},
+		},
-		{
+		{
-			"id": "WarningAdvancedString",
+			"id": "WarningAdvancedString",
-			"maxLen": 16
+			"maxLen": 16
-		},
+		},
-		{
+		{
-			"id": "SleepingTipAdvancedString",
+			"id": "SleepingTipAdvancedString",
-			"maxLen": 6
+			"maxLen": 6
-		},
+		},
-		{
+		{
-			"id": "IdleTipString",
+			"id": "IdleTipString",
-			"lenSum":
+			"lenSum":
-			{
+			{
-				"fields": ["IdleTipString", "IdleSetString"],
+				"fields": ["IdleTipString", "IdleSetString"],
-				"maxLen": 10
+				"maxLen": 10
-			}
+			}
-		},
+		},
-		{
+		{
-			"id": "IdleSetString",
+			"id": "IdleSetString",
-			"lenSum":
+			"lenSum":
-			{
+			{
-				"fields": ["IdleTipString", "IdleSetString"],
+				"fields": ["IdleTipString", "IdleSetString"],
-				"maxLen": 10
+				"maxLen": 10
-			},
+			},
-			"note": "Preferably start with a space"
+			"note": "Preferably start with a space"
-		},
+		},
-		{
+		{
-			"id": "TipDisconnectedString",
+			"id": "TipDisconnectedString",
-			"maxLen": 16
+			"maxLen": 16
-		},
+		},
-		{
+		{
-			"id": "SolderingAdvancedPowerPrompt",
+			"id": "SolderingAdvancedPowerPrompt",
-			"maxLen": null
+			"maxLen": null
-		},
+		},
-		{
+		{
-			"id": "OffString",
+			"id": "OffString",
-			"maxLen": 3
+			"maxLen": 3
-		}
+		},
-	],
+		{
-	"characters": [
+			"id": "ResetOKMessage",
-		{
+			"maxLen": 8
-			"id": "SettingRightChar",
+		},
-			"len": 1
+		{
-		},
+			"id": "YourGainMessage",
-		{
+			"maxLen": 8,
-			"id": "SettingLeftChar",
+			"default": "Your Gain"
-			"len": 1
+		},
-		},
+		{
-		{
+			"id": "SettingsResetMessage",
-			"id": "SettingAutoChar",
+			"maxLen": 16,
-			"len": 1
+			"default": "Settings were\nreset!"
-		},
+		}
-		{
+	],
-			"id": "SettingFastChar",
+	"characters": [
-			"len": 1
+		{
-		},
+			"id": "SettingRightChar",
-		{
+			"len": 1
-			"id": "SettingSlowChar",
+		},
-			"len": 1
+		{
-		}
+			"id": "SettingLeftChar",
-	],
+			"len": 1
-	"menuGroups": [
+		},
-		{
+		{
-			"id": "SolderingMenu",
+			"id": "SettingAutoChar",
-			"maxLen": 11
+			"len": 1
-		},
+		},
-		{
+		{
-			"id": "PowerSavingMenu",
+			"id": "SettingFastChar",
-			"maxLen": 11
+			"len": 1
-		},
+		},
-		{
+		{
-			"id": "UIMenu",
+			"id": "SettingSlowChar",
-			"maxLen": 11
+			"len": 1
-		},
+		},
-		{
+		{
-			"id": "AdvancedMenu",
+			"id": "SettingStartSolderingChar",
-			"maxLen": 11
+			"len": 1
-		}
+		},
-	],
+		{
-	"menuOptions": [
+			"id": "SettingStartSleepChar",
-		{
+			"len": 1
-			"id": "PowerSource",
+		},
-			"maxLen": 5,
+		{
-			"maxLen2": 11
+			"id": "SettingStartSleepOffChar",
-		},
+			"len": 1
-		{
+		},
-			"id": "SleepTemperature",
+		{
-			"maxLen": 4,
+			"id": "SettingStartNoneChar",
-			"maxLen2": 9
+			"len": 1
-		},
+		}
-		{
+	],
-			"id": "SleepTimeout",
+	"menuGroups": [
-			"maxLen": 4,
+		{
-			"maxLen2": 9
+			"id": "SolderingMenu",
-		},
+			"maxLen": 11
-		{
+		},
-			"id": "ShutdownTimeout",
+		{
-			"maxLen": 5,
+			"id": "PowerSavingMenu",
-			"maxLen2": 11
+			"maxLen": 11
-		},
+		},
-		{
+		{
-			"id": "MotionSensitivity",
+			"id": "UIMenu",
-			"maxLen": 6,
+			"maxLen": 11
-			"maxLen2": 13
+		},
-		},
+		{
-		{
+			"id": "AdvancedMenu",
-			"id": "TemperatureUnit",
+			"maxLen": 11
-			"maxLen": 6,
+		}
-			"maxLen2": 13
+	],
-		},
+	"menuOptions": [
-		{
+		{
-			"id": "AdvancedIdle",
+			"id": "PowerSource",
-			"maxLen": 6,
+			"maxLen": 5,
-			"maxLen2": 13
+			"maxLen2": 11
-		},
+		},
-		{
+		{
-			"id": "DisplayRotation",
+			"id": "SleepTemperature",
-			"maxLen": 6,
+			"maxLen": 4,
-			"maxLen2": 13
+			"maxLen2": 9
-		},
+		},
-		{
+		{
-			"id": "BoostEnabled",
+			"id": "SleepTimeout",
-			"maxLen": 6,
+			"maxLen": 4,
-			"maxLen2": 13
+			"maxLen2": 9
-		},
+		},
-		{
+		{
-			"id": "BoostTemperature",
+			"id": "ShutdownTimeout",
-			"maxLen": 4,
+			"maxLen": 5,
-			"maxLen2": 9
+			"maxLen2": 11
-		},
+		},
-		{
+		{
-			"id": "AutoStart",
+			"id": "MotionSensitivity",
-			"maxLen": 6,
+			"maxLen": 6,
-			"maxLen2": 13
+			"maxLen2": 13
-		},
+		},
-		{
+		{
-			"id": "CooldownBlink",
+			"id": "TemperatureUnit",
-			"maxLen": 6,
+			"maxLen": 6,
-			"maxLen2": 13
+			"maxLen2": 13
-		},
+		},
-		{
+		{
-			"id": "TemperatureCalibration",
+			"id": "AdvancedIdle",
-			"maxLen": 8,
+			"maxLen": 6,
-			"maxLen2": 16
+			"maxLen2": 13
-		},
+		},
-		{
+		{
-			"id": "SettingsReset",
+			"id": "DisplayRotation",
-			"maxLen": 8,
+			"maxLen": 6,
-			"maxLen2": 16
+			"maxLen2": 13
-		},
+		},
-		{
+		{
-			"id": "VoltageCalibration",
+			"id": "BoostTemperature",
-			"maxLen": 8,
+			"maxLen": 4,
-			"maxLen2": 16
+			"maxLen2": 9
-		},
+		},
-		{
+		{
-			"id": "AdvancedSoldering",
+			"id": "AutoStart",
-			"maxLen": 6,
+			"maxLen": 6,
-			"maxLen2": 13
+			"maxLen2": 13
-		},
+		},
-		{
+		{
-			"id": "ScrollingSpeed",
+			"id": "CooldownBlink",
-			"maxLen": 6,
+			"maxLen": 6,
-			"maxLen2": 11
+			"maxLen2": 13
-		},
+		},
-		{
+		{
-			"id": "TipModel",
+			"id": "TemperatureCalibration",
-			"maxLen": 8,
+			"maxLen": 8,
-			"maxLen2": 16
+			"maxLen2": 16
-		},
+		},
-		{
+		{
-			"id": "SimpleCalibrationMode",
+			"id": "SettingsReset",
-			"maxLen": 8,
+			"maxLen": 8,
-			"maxLen2": 16
+			"maxLen2": 16
-		},
+		},
-		{
+		{
-			"id": "AdvancedCalibrationMode",
+			"id": "VoltageCalibration",
-			"maxLen": 8,
+			"maxLen": 8,
-			"maxLen2": 16
+			"maxLen2": 16
-		},
+		},
-		{
+		{
-			"id": "PowerInput",
+			"id": "AdvancedSoldering",
-			"maxLen": 8,
+			"maxLen": 6,
-			"maxLen2": 16
+			"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": "PowerLimit",
+			"maxLen": 5,
+			"maxLen2": 11
+		},
+		{
+			"id": "ReverseButtonTempChange",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "TempChangeShortStep",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "TempChangeLongStep",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "PowerPulsePower",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "TipGain",
+			"maxLen": 6,
+			"maxLen2": 8
+		}
+	]
+}

build.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker-compose run --rm builder /bin/bash /build/ci/buildAll.sh

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/

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"

ci/secrets/encrypted/deployment.encrypted

@@ -0,0 +1,2 @@
+codeship:v2
+DUgOERb8iPVn95/DKIw9M7sgNjJlIlsaeE4PFV58tmmBu2sD1ooR7Y0L23bimC9a

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

setup.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+# Setup shell file to setup the environment on an ubuntu machine
+sudo apt-get update
+sudo apt-get install -y make bzip2 git python3 wget 
+sudo mkdir /build
+cd /build
+
+sudo wget -qO- https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 | sudo tar -xj
+
+# Add compiler to the path
+
+sudo ln -s /build/gcc-arm-none-eabi-9-2020-q2-update/bin/* /usr/local/bin

start_dev.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker-compose run --rm builder

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>

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>

workspace/TS100/.gitignore

@@ -1,5 +0,0 @@
-/Debug/
-/Release/
-/Hexfile/
-/Objects/
-

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>

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>

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\\")"}

workspace/TS100/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

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
-}

workspace/TS100/Core/BSP/BSP.h

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

workspace/TS100/Core/BSP/BSP_Flash.h

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

workspace/TS100/Core/BSP/BSP_PD.h

@@ -0,0 +1,16 @@
+/*
+ * BSP_PD.h
+ *
+ *  Created on: 21 Jul 2020
+ *      Author: Ralim
+ */
+
+#ifndef USER_BSP_PD_H_
+#define USER_BSP_PD_H_
+#include "BSP.h"
+/*
+ * An array of all of the desired voltages & minimum currents in preferred order
+ */
+extern const uint16_t USB_PD_Desired_Levels[];
+extern const uint8_t USB_PD_Desired_Levels_Len;
+#endif /* USER_BSP_PD_H_ */

workspace/TS100/Core/BSP/BSP_Power.h

@@ -0,0 +1,24 @@
+#include "stdint.h"
+/*
+ * BSP_Power.h -- Board Support for Power control
+ *
+ * These functions are hooks used to allow for power control
+ *
+ */
+
+#ifndef BSP_POWER_H_
+#define BSP_POWER_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+// Called periodically in the movement handling thread
+// Can be used to check any details for the power system
+void power_check();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

workspace/TS100/Core/BSP/BSP_QC.h

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

workspace/TS100/Core/BSP/Defines.h

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

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

@@ -0,0 +1,309 @@
+//BSP mapping functions
+
+#include <IRQ.h>
+#include "BSP.h"
+#include "Setup.h"
+#include "history.hpp"
+#include "Pins.h"
+#include "main.hpp"
+#include "history.hpp"
+#include "Model_Config.h"
+#include "I2C_Wrapper.hpp"
+volatile uint16_t PWMSafetyTimer = 0;
+volatile uint8_t pendingPWM = 0;
+
+//2 second filter (ADC is PID_TIM_HZ Hz)
+history<uint16_t, PID_TIM_HZ> rawTempFilter = { { 0 }, 0, 0 };
+void resetWatchdog() {
+	HAL_IWDG_Refresh(&hiwdg);
+}
+#ifdef TEMP_NTC
+//Lookup table for the NTC
+//Stored as ADCReading,Temp in degC
+static const uint16_t NTCHandleLookup[] = {
+//ADC Reading , Temp in C
+		29189, 0, //
+		29014, 1, //
+		28832, 2, //
+		28644, 3, //
+		28450, 4, //
+		28249, 5, //
+		28042, 6, //
+		27828, 7, //
+		27607, 8, //
+		27380, 9, //
+		27146, 10, //
+		26906, 11, //
+		26660, 12, //
+		26407, 13, //
+		26147, 14, //
+		25882, 15, //
+		25610, 16, //
+		25332, 17, //
+		25049, 18, //
+		24759, 19, //
+		24465, 20, //
+		24164, 21, //
+		23859, 22, //
+		23549, 23, //
+		23234, 24, //
+		22915, 25, //
+		22591, 26, //
+		22264, 27, //
+		21933, 28, //
+		21599, 29, //
+//		21261, 30, //
+//		20921, 31, //
+//		20579, 32, //
+//		20234, 33, //
+//		19888, 34, //
+//		19541, 35, //
+//		19192, 36, //
+//		18843, 37, //
+//		18493, 38, //
+//		18143, 39, //
+//		17793, 40, //
+//		17444, 41, //
+//		17096, 42, //
+//		16750, 43, //
+//		16404, 44, //
+//		16061, 45, //
+//		15719, 46, //
+//		15380, 47, //
+//		15044, 48, //
+//		14710, 49, //
+//		14380, 50, //
+//		14053, 51, //
+//		13729, 52, //
+//		13410, 53, //
+//		13094, 54, //
+//		12782, 55, //
+//		12475, 56, //
+//		12172, 57, //
+//		11874, 58, //
+//		11580, 59, //
+//		11292, 60, //
+		};
+#endif
+uint16_t getHandleTemperature() {
+#ifdef TEMP_NTC
+	//TS80P uses 100k NTC resistors instead
+	//NTCG104EF104FT1X from TDK
+	//For now not doing interpolation
+	int32_t result = getADC(0);
+	for (uint32_t i = 0; i < (sizeof(NTCHandleLookup) / (2 * sizeof(uint16_t)));
+			i++) {
+		if (result > NTCHandleLookup[(i * 2) + 0]) {
+			return NTCHandleLookup[(i * 2) + 1] * 10;
+		}
+	}
+	return 0;
+#endif
+#ifdef TEMP_TMP36
+	// We return the current handle temperature in X10 C
+	// TMP36 in handle, 0.5V offset and then 10mV per deg C (0.75V @ 25C for
+	// example) STM32 = 4096 count @ 3.3V input -> But We oversample by 32/(2^2) =
+	// 8 times oversampling Therefore 32768 is the 3.3V input, so 0.1007080078125
+	// mV per count So we need to subtract an offset of 0.5V to center on 0C
+	// (4964.8 counts)
+	//
+	int32_t result = getADC(0);
+	result -= 4965;  // remove 0.5V offset
+	// 10mV per C
+	// 99.29 counts per Deg C above 0C
+	result *= 100;
+	result /= 993;
+	return result;
+#endif
+}
+
+uint16_t getTipInstantTemperature() {
+	uint16_t sum = 0;	// 12 bit readings * 8 -> 15 bits
+	uint16_t readings[8];
+//Looking to reject the highest outlier readings.
+//As on some hardware these samples can run into the op-amp recovery time
+//Once this time is up the signal stabilises quickly, so no need to reject minimums
+	readings[0] = hadc1.Instance->JDR1;
+	readings[1] = hadc1.Instance->JDR2;
+	readings[2] = hadc1.Instance->JDR3;
+	readings[3] = hadc1.Instance->JDR4;
+	readings[4] = hadc2.Instance->JDR1;
+	readings[5] = hadc2.Instance->JDR2;
+	readings[6] = hadc2.Instance->JDR3;
+	readings[7] = hadc2.Instance->JDR4;
+
+	for (int i = 0; i < 8; i++) {
+		sum += readings[i];
+	}
+	return sum;  // 8x over sample
+}
+
+uint16_t getTipRawTemp(uint8_t refresh) {
+	if (refresh) {
+		uint16_t lastSample = getTipInstantTemperature();
+		rawTempFilter.update(lastSample);
+		return lastSample;
+	} else {
+		return rawTempFilter.average();
+	}
+}
+
+uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
+// ADC maximum is 32767 == 3.3V at input == 28.05V at VIN
+// Therefore we can divide down from there
+// Multiplying ADC max by 4 for additional calibration options,
+// ideal term is 467
+#ifdef MODEL_TS100
+#define BATTFILTERDEPTH 32
+#else
+#define BATTFILTERDEPTH 8
+
+#endif
+	static uint8_t preFillneeded = 10;
+	static uint32_t samples[BATTFILTERDEPTH];
+	static uint8_t index = 0;
+	if (preFillneeded) {
+		for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
+			samples[i] = getADC(1);
+		preFillneeded--;
+	}
+	if (sample) {
+		samples[index] = getADC(1);
+		index = (index + 1) % BATTFILTERDEPTH;
+	}
+	uint32_t sum = 0;
+
+	for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
+		sum += samples[i];
+
+	sum /= BATTFILTERDEPTH;
+	if (divisor == 0) {
+		divisor = 1;
+	}
+	return sum * 4 / divisor;
+}
+
+void setTipPWM(uint8_t pulse) {
+	PWMSafetyTimer = 10; // This is decremented in the handler for PWM so that the tip pwm is
+						 // disabled if the PID task is not scheduled often enough.
+
+	pendingPWM = pulse;
+}
+
+// These are called by the HAL after the corresponding events from the system
+// timers.
+
+void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
+// Period has elapsed
+	if (htim->Instance == TIM2) {
+		// we want to turn on the output again
+		PWMSafetyTimer--;
+		// We decrement this safety value so that lockups in the
+		// scheduler will not cause the PWM to become locked in an
+		// active driving state.
+		// While we could assume this could never happen, its a small price for
+		// increased safety
+		htim2.Instance->CCR4 = pendingPWM;
+		if (htim2.Instance->CCR4 && PWMSafetyTimer) {
+			HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_1);
+		} else {
+			HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
+		}
+	} else if (htim->Instance == TIM1) {
+		// STM uses this for internal functions as a counter for timeouts
+		HAL_IncTick();
+	}
+}
+
+void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) {
+// This was a when the PWM for the output has timed out
+	if (htim->Channel == HAL_TIM_ACTIVE_CHANNEL_4) {
+		HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
+	}
+}
+void unstick_I2C() {
+	GPIO_InitTypeDef GPIO_InitStruct;
+	int timeout = 100;
+	int timeout_cnt = 0;
+
+// 1. Clear PE bit.
+	hi2c1.Instance->CR1 &= ~(0x0001);
+	/**I2C1 GPIO Configuration
+	 PB6     ------> I2C1_SCL
+	 PB7     ------> I2C1_SDA
+	 */
+//  2. Configure the SCL and SDA I/Os as General Purpose Output Open-Drain, High level (Write 1 to GPIOx_ODR).
+	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
+	GPIO_InitStruct.Pull = GPIO_PULLUP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+
+	GPIO_InitStruct.Pin = SCL_Pin;
+	HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
+	HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
+
+	GPIO_InitStruct.Pin = SDA_Pin;
+	HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
+	HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
+
+	while (GPIO_PIN_SET != HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin)) {
+		//Move clock to release I2C
+		HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET);
+		asm("nop");
+		asm("nop");
+		asm("nop");
+		asm("nop");
+		HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
+
+		timeout_cnt++;
+		if (timeout_cnt > timeout)
+			return;
+	}
+
+// 12. Configure the SCL and SDA I/Os as Alternate function Open-Drain.
+	GPIO_InitStruct.Mode = GPIO_MODE_AF_OD;
+	GPIO_InitStruct.Pull = GPIO_PULLUP;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+
+	GPIO_InitStruct.Pin = SCL_Pin;
+	HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
+
+	GPIO_InitStruct.Pin = SDA_Pin;
+	HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
+
+	HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
+	HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
+
+// 13. Set SWRST bit in I2Cx_CR1 register.
+	hi2c1.Instance->CR1 |= 0x8000;
+
+	asm("nop");
+
+// 14. Clear SWRST bit in I2Cx_CR1 register.
+	hi2c1.Instance->CR1 &= ~0x8000;
+
+	asm("nop");
+
+// 15. Enable the I2C peripheral by setting the PE bit in I2Cx_CR1 register
+	hi2c1.Instance->CR1 |= 0x0001;
+
+// Call initialization function.
+	HAL_I2C_Init(&hi2c1);
+}
+
+uint8_t getButtonA() {
+	return HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ?
+			1 : 0;
+}
+uint8_t getButtonB() {
+	return HAL_GPIO_ReadPin(KEY_B_GPIO_Port, KEY_B_Pin) == GPIO_PIN_RESET ?
+			1 : 0;
+}
+
+void reboot() {
+
+	NVIC_SystemReset();
+}
+
+void delay_ms(uint16_t count) {
+	HAL_Delay(count);
+}

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

@@ -0,0 +1,22 @@
+/*
+ * BSP_PD.c
+ *
+ *  Created on: 21 Jul 2020
+ *      Author: Ralim
+ */
+
+#include "BSP_PD.h"
+#include "Model_Config.h"
+#ifdef POW_PD
+/*
+ * An array of all of the desired voltages & minimum currents in preferred order
+ */
+const uint16_t USB_PD_Desired_Levels[] = {
+//mV desired input, mA minimum required current
+		12000, 2400, //12V @ 2.4A
+		9000, 2000, //9V @ 2A
+		5000, 100, //5V @ whatever
+
+		};
+const uint8_t USB_PD_Desired_Levels_Len = 3;
+#endif

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

@@ -0,0 +1,97 @@
+/*
+ * FRToSI2C.cpp
+ *
+ *  Created on: 14Apr.,2018
+ *      Author: Ralim
+ */
+#include <I2C_Wrapper.hpp>
+#include "BSP.h"
+#include "Setup.h"
+SemaphoreHandle_t FRToSI2C::I2CSemaphore = nullptr;
+StaticSemaphore_t FRToSI2C::xSemaphoreBuffer;
+
+void FRToSI2C::CpltCallback() {
+	hi2c1.State = HAL_I2C_STATE_READY;  // Force state reset (even if tx error)
+	if (I2CSemaphore) {
+		xSemaphoreGiveFromISR(I2CSemaphore, NULL);
+	}
+}
+
+bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress,
+		uint8_t *pData, uint16_t Size) {
+
+	if (!lock())
+		return false;
+	if (HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress,
+	I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
+
+		I2C_Unstick();
+		unlock();
+		return false;
+	}
+
+	unlock();
+	return true;
+
+}
+bool FRToSI2C::I2C_RegisterWrite(uint8_t address, uint8_t reg, uint8_t data) {
+	return Mem_Write(address, reg, &data, 1);
+}
+
+uint8_t FRToSI2C::I2C_RegisterRead(uint8_t add, uint8_t reg) {
+	uint8_t tx_data[1];
+	Mem_Read(add, reg, tx_data, 1);
+	return tx_data[0];
+}
+bool FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
+		uint8_t *pData, uint16_t Size) {
+
+	if (!lock())
+		return false;
+	if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress,
+	I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
+
+		I2C_Unstick();
+		unlock();
+		return false;
+	}
+
+	unlock();
+	return true;
+}
+
+bool FRToSI2C::Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size) {
+	if (!lock())
+		return false;
+	if (HAL_I2C_Master_Transmit_DMA(&hi2c1, DevAddress, pData, Size)
+			!= HAL_OK) {
+		I2C_Unstick();
+		unlock();
+		return false;
+	}
+	return true;
+}
+
+bool FRToSI2C::probe(uint16_t DevAddress) {
+	if (!lock())
+		return false;
+	uint8_t buffer[1];
+	bool worked = HAL_I2C_Mem_Read(&hi2c1, DevAddress, 0x0F,
+			I2C_MEMADD_SIZE_8BIT, buffer, 1, 1000) == HAL_OK;
+	unlock();
+	return worked;
+}
+
+void FRToSI2C::I2C_Unstick() {
+	unstick_I2C();
+}
+
+void FRToSI2C::unlock() {
+
+	xSemaphoreGive(I2CSemaphore);
+}
+
+bool FRToSI2C::lock() {
+
+	return xSemaphoreTake(I2CSemaphore, (TickType_t)50) == pdTRUE;
+}

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

@@ -0,0 +1,49 @@
+/*
+ * IRQ.c
+ *
+ *  Created on: 30 May 2020
+ *      Author: Ralim
+ */
+
+#include "IRQ.h"
+#include "int_n.h"
+/*
+ * Catch the IRQ that says that the conversion is done on the temperature
+ * readings coming in Once these have come in we can unblock the PID so that it
+ * runs again
+ */
+void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc) {
+	BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+	if (hadc == &hadc1) {
+		if (pidTaskNotification) {
+			vTaskNotifyGiveFromISR(pidTaskNotification,
+					&xHigherPriorityTaskWoken);
+			portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+		}
+	}
+}
+void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) {
+
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+
+	FRToSI2C::CpltCallback();
+}
+void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
+	FRToSI2C::CpltCallback();
+}
+
+void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
+	(void)GPIO_Pin;
+	InterruptHandler::irqCallback();
+}

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

@@ -0,0 +1,32 @@
+/*
+ * Irqs.h
+ *
+ *  Created on: 30 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_MINIWARE_IRQ_H_
+#define BSP_MINIWARE_IRQ_H_
+
+#include "BSP.h"
+#include "stm32f1xx_hal.h"
+#include "I2C_Wrapper.hpp"
+#include "Setup.h"
+#include "main.hpp"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc);
+void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
+void HAL_GPIO_EXTI_Callback(uint16_t);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_MINIWARE_IRQ_H_ */

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

@@ -0,0 +1,44 @@
+/*
+ * Model_Config.h
+ *
+ *  Created on: 25 Jul 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_MINIWARE_MODEL_CONFIG_H_
+#define BSP_MINIWARE_MODEL_CONFIG_H_
+/*
+ * Lookup for mapping features <-> Models
+ */
+
+#if defined(MODEL_TS100) + defined(MODEL_TS80)+defined(MODEL_TS80P) > 1
+#error "Multiple models defined!"
+#elif defined(MODEL_TS100) + defined(MODEL_TS80)+ defined(MODEL_TS80P) == 0
+#error "No model defined!"
+#endif
+
+#ifdef MODEL_TS100
+#define ACCEL_MMA
+#define ACCEL_LIS
+#define TEMP_TMP36
+#endif
+
+#ifdef MODEL_TS80
+#define ACCEL_LIS
+#define POW_QC
+#define TEMP_TMP36
+#define LIS_ORI_FLIP
+#define OLED_FLIP
+#endif
+
+#ifdef MODEL_TS80P
+#define ACCEL_LIS
+#define POW_PD
+#define POW_QC
+#define TEMP_NTC
+#define I2C_SOFT
+#define LIS_ORI_FLIP
+#define OLED_FLIP
+#endif
+
+#endif /* BSP_MINIWARE_MODEL_CONFIG_H_ */

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

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

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

@@ -0,0 +1,36 @@
+#include "BSP.h"
+#include "BSP_Power.h"
+#include "QC3.h"
+#include "Settings.h"
+#include "Pins.h"
+#include "fusbpd.h"
+#include "Model_Config.h"
+#include "policy_engine.h"
+#include "int_n.h"
+bool FUSB302_present = false;
+
+void power_check() {
+#ifdef POW_PD
+	if (FUSB302_present) {
+		//Cant start QC until either PD works or fails
+		if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+			return;
+		}
+		if (PolicyEngine::pdHasNegotiated()) {
+			return;
+		}
+	}
+#endif
+#ifdef POW_QC
+	QC_resync();
+#endif
+}
+uint8_t usb_pd_detect() {
+#ifdef POW_PD
+	FUSB302_present = fusb302_detect();
+
+	return FUSB302_present;
+#endif
+	return false;
+}
+

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

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

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

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

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

@@ -5,6 +5,7 @@
  *      Author: Ben V. Brown
  */
 #include "Setup.h"
+#include "Pins.h"
 ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
@@ -29,11 +30,16 @@ static void MX_TIM2_Init(void);
 static void MX_DMA_Init(void);
 static void MX_GPIO_Init(void);
 static void MX_ADC2_Init(void);
-
+#define SWD_ENABLE
 void Setup_HAL() {
 	SystemClock_Config();
-	__HAL_AFIO_REMAP_SWJ_DISABLE()
+
-	;
+#ifndef SWD_ENABLE
+	__HAL_AFIO_REMAP_SWJ_DISABLE();
+#else
+	__HAL_AFIO_REMAP_SWJ_NOJTAG();
+#endif
+
 	MX_GPIO_Init();
 	MX_DMA_Init();
 	MX_I2C1_Init();
@@ -44,8 +50,8 @@ void Setup_HAL() {
 	MX_IWDG_Init();
 	HAL_ADC_Start(&hadc2);
 	HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t*) ADCReadings, 64); // start DMA of normal readings
-	HAL_ADCEx_InjectedStart(&hadc1);   // enable injected  readings
+	HAL_ADCEx_InjectedStart(&hadc1);   // enable injected readings
-	HAL_ADCEx_InjectedStart(&hadc2);   // enable injected  readings
+	HAL_ADCEx_InjectedStart(&hadc2);   // enable injected readings
 }
 
 // channel 0 -> temperature sensor, 1-> VIN
@@ -131,7 +137,7 @@ static void MX_ADC1_Init(void) {
 	 */
 	sConfig.Channel = TMP36_ADC1_CHANNEL;
 	sConfig.Rank = 1;
-	sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
+	sConfig.SamplingTime = ADC_SAMPLETIME_71CYCLES_5;
 	HAL_ADC_ConfigChannel(&hadc1, &sConfig);
 
 	/**Configure Regular Channel
@@ -192,11 +198,10 @@ static void MX_ADC2_Init(void) {
 	 */
 	sConfig.Channel = TIP_TEMP_ADC2_CHANNEL;
 	sConfig.Rank = ADC_REGULAR_RANK_1;
-	sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
+	sConfig.SamplingTime = ADC_SAMPLETIME_71CYCLES_5;
 	HAL_ADC_ConfigChannel(&hadc2, &sConfig);
 	sConfig.Channel = VIN_ADC2_CHANNEL;
 	sConfig.Rank = ADC_REGULAR_RANK_2;
-	sConfig.SamplingTime = ADC_SAMPLETIME_239CYCLES_5;
 	HAL_ADC_ConfigChannel(&hadc2, &sConfig);
 
 	/**Configure Injected Channel
@@ -226,7 +231,7 @@ static void MX_ADC2_Init(void) {
 /* I2C1 init function */
 static void MX_I2C1_Init(void) {
 	hi2c1.Instance = I2C1;
-	hi2c1.Init.ClockSpeed = 50000;
+	hi2c1.Init.ClockSpeed = 75000;
 	// OLED doesnt handle >100k when its asleep (off).
 	hi2c1.Init.DutyCycle = I2C_DUTYCYCLE_2;
 	hi2c1.Init.OwnAddress1 = 0;
@@ -243,7 +248,9 @@ static void MX_IWDG_Init(void) {
 	hiwdg.Instance = IWDG;
 	hiwdg.Init.Prescaler = IWDG_PRESCALER_256;
 	hiwdg.Init.Reload = 100;
+#ifndef SWD_ENABLE
 	HAL_IWDG_Init(&hiwdg);
+#endif
 }
 
 /* TIM3 init function */
@@ -253,11 +260,11 @@ static void MX_TIM3_Init(void) {
 	TIM_OC_InitTypeDef sConfigOC;
 
 	htim3.Instance = TIM3;
-	htim3.Init.Prescaler = 4;
+	htim3.Init.Prescaler = 8;
 	htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
-	htim3.Init.Period = 100;                            // 10 Khz PWM freq
+	htim3.Init.Period = 100;                            // 5 Khz PWM freq
 	htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;  // 4mhz before div
-	htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+	htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE; //Preload the ARR register (though we dont use this)
 	HAL_TIM_Base_Init(&htim3);
 
 	sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
@@ -272,7 +279,7 @@ static void MX_TIM3_Init(void) {
 	HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig);
 
 	sConfigOC.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 50;
+	sConfigOC.Pulse = 80;  //80% duty cycle, that is AC coupled through the cap
 	sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
 	sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
 	HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, PWM_Out_CHANNEL);
@@ -284,11 +291,12 @@ static void MX_TIM3_Init(void) {
 	 */
 	GPIO_InitStruct.Pin = PWM_Out_Pin;
 	GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; //We would like sharp rising edges
 	HAL_GPIO_Init(PWM_Out_GPIO_Port, &GPIO_InitStruct);
 #ifdef MODEL_TS100
-	// Remap TIM3_CH1 to be on pB4
+	// Remap TIM3_CH1 to be on PB4
-	__HAL_AFIO_REMAP_TIM3_PARTIAL();
+	__HAL_AFIO_REMAP_TIM3_PARTIAL()
+	;
 #else
 	// No re-map required
 #endif
@@ -307,14 +315,15 @@ static void MX_TIM2_Init(void) {
 	// Timer 2 is fairly slow as its being used to run the PWM and trigger the ADC
 	// in the PWM off time.
 	htim2.Instance = TIM2;
-	htim2.Init.Prescaler = 785; // pwm out is 10k from tim3, we want to run our PWM at around 10hz or slower on the output stage
+	htim2.Init.Prescaler = 4000; //1mhz tick rate/800 = 1.25 KHz tick rate
-	// The input is 1mhz after the div/4, so divide this by 785 to give around 4Hz output change rate
+
-	//Trade off is the slower the PWM output the slower we can respond and we gain temperature accuracy in settling time,
+	// pwm out is 10k from tim3, we want to run our PWM at around 10hz or slower on the output stage
-	//But it increases the time delay between the heat cycle and the measurement and calculate cycle
+	// These values give a rate of around 8Hz
 	htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
-	htim2.Init.Period = 255 + 60;
+	htim2.Init.Period = 255 + 17;
 	htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;  // 4mhz before divide
 	htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+	htim2.Init.RepetitionCounter = 0;
 	HAL_TIM_Base_Init(&htim2);
 
 	sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
@@ -328,7 +337,8 @@ static void MX_TIM2_Init(void) {
 	HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
 
 	sConfigOC.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 255 + 50; //255 is the largest time period of the drive signal, and the 50 offsets this around 5ms afterwards
+	sConfigOC.Pulse = 255 + 13;  //13 -> Delay of 5ms
+	//255 is the largest time period of the drive signal, and then offset ADC sample to be a bit delayed after this
 	/*
 	 * It takes 4 milliseconds for output to be stable after PWM turns off.
 	 * Assume ADC samples in 0.5ms
@@ -337,11 +347,7 @@ static void MX_TIM2_Init(void) {
 	sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
 	sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
 	HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_1);
-
+	sConfigOC.Pulse = 0;  //default to entirely off
-	sConfigOC.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 0;
-	sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
-	sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
 	HAL_TIM_OC_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_4);
 
 	HAL_TIM_Base_Start_IT(&htim2);
@@ -361,13 +367,13 @@ static void MX_DMA_Init(void) {
 
 	/* DMA interrupt init */
 	/* DMA1_Channel1_IRQn interrupt configuration */
-	HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 15, 0);
+	HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 5, 0);
 	HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
 	/* DMA1_Channel6_IRQn interrupt configuration */
-	HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 15, 0);
+	HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 5, 0);
 	HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
 	/* DMA1_Channel7_IRQn interrupt configuration */
-	HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 15, 0);
+	HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 5, 0);
 	HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
 }
 
@@ -423,8 +429,10 @@ static void MX_GPIO_Init(void) {
 	HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
 #ifdef MODEL_TS100
-	/* Pull USB lines low to disable, pull down debug too*/
+#ifndef SWD_ENABLE
-	GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13;
+	/* Pull USB and SWD lines low to prevent enumeration attempts and EMI affecting
+	 * the debug core */
+	GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_13 | GPIO_PIN_14;
 	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
 	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
 	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@@ -432,6 +440,12 @@ static void MX_GPIO_Init(void) {
 	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
 	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_13, GPIO_PIN_RESET);
 	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_14, GPIO_PIN_RESET);
+#else
+	/* Make all lines affecting SWD floating to allow debugging */
+	GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13;
+	GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+#endif
 #else
 	/* TS80 */
 	/* Leave USB lines open circuit*/
@@ -456,3 +470,8 @@ static void MX_GPIO_Init(void) {
 	HAL_Delay(30);
 	HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_SET);
 }
+#ifdef  USE_FULL_ASSERT
+void assert_failed(uint8_t* file, uint32_t line){
+	asm("bkpt");
+}
+#endif

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

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

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

@@ -0,0 +1,27 @@
+/*
+ * Software_I2C.h
+ *
+ *  Created on: 25 Jul 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_MINIWARE_SOFTWARE_I2C_H_
+#define BSP_MINIWARE_SOFTWARE_I2C_H_
+#include "Model_Config.h"
+#include "BSP.h"
+#include "stm32f1xx_hal.h"
+#ifdef I2C_SOFT
+
+#define SOFT_SCL_HIGH() 	HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_SET)
+#define SOFT_SCL_LOW() 	HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA_HIGH() 	HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_SET)
+#define SOFT_SDA_LOW() 	HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA_READ()  (HAL_GPIO_ReadPin(SDA2_GPIO_Port,SDA2_Pin)==GPIO_PIN_SET?1:0)
+#define SOFT_SCL_READ()  (HAL_GPIO_ReadPin(SCL2_GPIO_Port,SCL2_Pin)==GPIO_PIN_SET?1:0)
+#define SOFT_I2C_DELAY() {for(int xx=0;xx<40;xx++){asm("nop");}}
+
+#endif
+
+
+
+#endif /* BSP_MINIWARE_SOFTWARE_I2C_H_ */