Update version for release

Update to newest compiler from ARM

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

.gitignore

@@ -1,51 +1,192 @@
-# 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

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 upgrade -y && \
+  apt-get install -y \
+  make \
+  bzip2 \
+  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

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

History.md

@@ -24,21 +24,21 @@ V1.16
 
 V1.15
 
-* Added support for a custom bootup logo to be programmed via the DFU bootloader.
+* Added support for a custom bootup logo to be programmed via the DFU bootloader
 
 V1.14
 
-* Changed input voltage cutoff to be based on cell count rather than voltage.
+* Changed input voltage cutoff to be based on cell count rather than voltage
 
 V1.13
 
 * Swapped buttons for menu to prevent accidentally changing first menu item
-* Added auto key repeat.
+* Added auto key repeat
 
 V1.12
 
 * Increases sensitivity options to be 1*9 with 0 off state
-* Fixes issue where going from COOL *> soldering can leave screen off.
+* Fixes issue where going from COOL *> soldering can leave screen off
 
 V1.11
 
@@ -77,7 +77,7 @@ V1.04
 * Allows temperature offset calibration
 * Nicer idle screen
 
-V1.03 
+V1.03
 
 * Improved Button handling
 * Ability to set motion sensitivity
@@ -85,5 +85,5 @@ V1.03
 
 V1.02
 
-* Adds hold both buttons on IDLE to access the therometer mode.
+* 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)

ISSUE_TEMPLATE.md

@@ -21,9 +21,9 @@ Please edit this template and fill out all the information you can (where releva
 
 ***Steps to reproduce:***
 
-1. 
+1.
-2. 
+2.
-3. 
+3.
 
 ***Video of problem if hard to reproduce***
 
@@ -40,7 +40,6 @@ On the idle screen, you can hold the settings button and it will show you the fi
   - Power Supply (Voltage and Current Rating) :
 
 
-* **Other information** 
+* **Other information**
 
 If submitting graphics to go on the iron, please use BMP or PNG files over JPG.
-

PULL_REQUEST_TEMPLATE.md

@@ -2,18 +2,16 @@
 Please try and fill out this template where possible, not all fields are required and can be removed.
 
 * **Please check if the PR fulfills these requirements**
-- [ ] The commit message make sense
+- [] The commit message makes sense
-- [ ] The changes have been tested locally
+- [] The changes have been tested locally
-- [ ] New features have been documented in the Wiki
+- [] Are there any breaking changes
-- [ ] 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)
 
 
@@ -22,7 +20,7 @@ Please try and fill out this template where possible, not all fields are require
 
 
 
-* **Does this PR introduce a breaking change?** 
+* **Does this PR introduce a breaking change?**
 (What changes might users need to make in their application due to this PR?)
 
 

README.md

@@ -1,139 +1,108 @@
-# TS100
+[![Codeship Status for ts100](https://app.codeship.com/projects/c77dbfe0-0764-0138-9520-3eb35bdb2b2c/status?branch=master)](https://app.codeship.com/projects/379118)
 
-This is a complete rewrite of the open source software for the ts100 soldering iron.
+# TS100 & TS80 Firmware
-The version two fork of this code has no shared code with the original firmware from Miniware (E-design) group.
+
+
+This firmware is a fresh start for these soldering irons. Designed from the ground up as fully featured control software that leaves nothing to be desired.
+It originally started back at the end of 2016 and has since seen vast improvements, especially some very smart work by community members.
+
+The firmware supports everything you would expect in the soldering iron and has the same features as the stock firmware with some nice extras packed in.
+There is a comprehensive menu system in the iron that allows for adjustment of all the settings on the unit, and support for various languages is added by the community.
+
+On the TS100 there are settings to allow you to specify a cutoff voltage for different lithium-ion battery packs to protect your power source.
+For the TS80 these are removed and replaced with the selection of 18W or 24W depending on what your QC power bank can support.
+Otherwise, both systems work very similar and should support all the features.
 
 This project is considered feature complete for use as a soldering iron, *so please suggest any feature improvements you would like!*
 
-A short(ish) video that goes through every single menu option in the firmware is available [over here](https://www.youtube.com/watch?v=WlnpboYfxNk).
+*This 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.*
+## Core 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.
-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
-* Set a voltage lower limit for Lithium batteries so you dont kill your battery pack
+* (TS100) Set a voltage lower limit for Lithium batteries so you don't kill your battery pack
+* (TS80 ) Set 18W or 24W settings for your power bank
 * All settings saved to flash when you exit the menu
 * Improved readability Fonts
 * Use hardware features to improve reliability
 * Can disable movement detection if desired
-* Calibration of the thermocouple offset
+* Full tip profile calibration
-* Boost mode lets you temporarily change the temperature when soldering (ie raise temperature for short periods of time)
+* Boost mode lets you temporarily change the temperature when soldering (ie raise the temperature for short periods of time)
-* Battery charge level indicatior if power source set to a lipo cell count.
+* (TS100) Battery charge level indicator if power source set to a lipo cell count
-* Custom bootup logo support
+* (TS80) Power bank operating voltage is displayed
-* Automatic LCD rotation based on orientation
+* Custom boot up logo support
-* Supports both the version 1 and version 2 hardware
+* Automatic LCD rotation based on the orientation
+* Supports both the version 1 and version 2 hardware (different accelerometers)
 
-## Upgrading your ts100 iron
+# Upgrading your iron
 
-This is completely safe, if it goes wrong just put the .hex file from the official website onto the unit and your back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/ts100/releases) The file you want is called *ts100_EN.hex* unless you want the translations, they are ts100_*language short name*.hex.
+This is completely safe, but if it goes wrong just put the .hex file from the official website onto the unit and you're back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/ts100/releases) The file you want is called *(MODEL)_EN.hex* unless you want the translations, they are (MODEL)_*language short name*.hex. Where (MODEL) is either TS100 or TS80.
 
 Officially the bootloader on the iron only works under Windows. However, users have reported that it does work under Mac, and can be made to work under Linux *sometimes*. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading-Firmware).
 
-1. Disable Teracopy or other Explorer replacements.
+```
-2. Hold the button closest to the tip, and plug in the USB to the computer.
+1. Hold the button closest to the tip, and plug in the USB to the computer.
-3. The unit will appear as a USB drive.
+2. The unit will appear as a USB drive.
-4. Drag the .hex file onto the USB drive.
+3. Drag the .hex file onto the USB drive.
-5. The unit will disconnect and reconnect.
+4. The unit will disconnect and reconnect.
-6. The filename will have changed to end in .RDY (=success) or .ERR (=error)
+5. The filename will have changed to end in .RDY or .ERR
-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
+6. If it ends with .RDY you're done! Otherwise, something went wrong.
+7. If it didn't work the first time, try copying the file again without disconnecting the iron, often it will work on the second shot.
 8. Disconnect the USB and power up the iron. You're good to go.
+```
 
-For the more adventurerous out there, you can also load this firmware onto the device using a SWD programmer.
+
-On the bottom of the MCU riser pcb, there are 4 pads for programming.
+For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer.
-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.
+On the bottom of the MCU riser PCB, there are 4 pads for programming.
+There is a complete device flash backup included in this repository. (Note this includes the bootloader, so will need an SWD programmer to load onto the unit).
+For the TS80 the SWD pins are used for the QC negotiation, so you can actually connect to the SWD power via the USB connector.
 
 ## Setting a custom bootup image
 
 This firmware uses a different method of updating the bootup image.
 This removes the need for emulating a USB drive on the iron just to allow for a bootup image to be setup.
-There are further instructions on the [wiki](https://github.com/Ralim/ts100/wiki/Logo-Editor). Instructions are kept on the wiki so that users can update the information if they find extra helpful information.
+There are further instructions on the [wiki](https://github.com/Ralim/ts100/wiki/Logo-Editor).
+Instructions are kept on the wiki so that users can update the information if they find extra helpful information.
 
-## New Menu System
+# Menu System
 
 This new firmware uses a new menu system to allow access to the settings on the device.
 When on the main screen, the unit shows prompts for the two most common operations.
 
 * Pressing the button near the tip enters soldering mode
-* Pressing the button near the USB enters the settings menu.
+* 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
+More details are over in the [Menu information.](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 (or email me for other options) : https://paypal.me/RalimTek
+I also want to give a shout out to all of the [Fantastic Contributors](https://github.com/Ralim/ts100/graphs/contributors).
+
+Especially to the following users, who have helped in various ways that are massively appreciated:
+
+* [dhiltonp](https://github.com/dhiltonp)
+* [Mrkvozrout](https://github.com/Mrkvozrout)
+* [jonnieZG](https://github.com/jonnieZG)
+* [federck](https://github.com/federck)
+* [jvitkauskas](https://github.com/jvitkauskas)
+* [doegox](https://github.com/doegox)
+* [perillamint](https://github.com/perillamint)
+
 
 ## Licence
 
-The code in this repository that is based on the STM tools is under a BSD like licence.
+The code in this repository that is based on the STM tools is under a BSD-like licence.
-The code created by the communitiy is GNU GPLv3.
+The code created by the community is GNU GPLv3. Unless noted elsewhere.
 The FreeRToS is under its own licence.
 
 ## Commercial Use
 
-This software is provided as-is, so I cannot provide any commercial support for the firmware. However you are more than welcome to distribute links to the firmware, or provide irons with this software on them. 
+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. If this firmware does make you money, it would be nice to receive a donation, however, there is no enforcement.

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,591 @@
-#!/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']:
+def getTipModelEnumTS80():
-        eid = mod['id']
+    constants = []
-        f.write(to_unicode("const char " + eid + " = '" + obj[eid] + "';\n"))
+    constants.append("B02")
-
+    constants.append("D25")
-    f.write(to_unicode("\n"))
+    constants.append("TS80")  # end of miniware
-    
+    constants.append("User")  # User
-    # ----- Menu Options
+    return constants
-
+
-    # Menu type
+
-    f.write(to_unicode("const enum ShortNameType SettingsShortNameType = SHORT_NAME_" + ("DOUBLE" if lang['menuDouble'] else "SINGLE") + "_LINE;\n"))
+def getTipModelEnumTS100():
-
+    constants = []
-    # ----- Writing SettingsDescriptions
+    constants.append("B02")
-    obj = lang['menuOptions']
+    constants.append("D24")
-    f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
+    constants.append("BC2")
-    
+    constants.append(" C1")
-    maxLen = 25
+    constants.append("TS100")  # end of miniware
-    for mod in defs['menuOptions']:
+    constants.append("BC2")
-        eid = mod['id']
+    constants.append("Hakko")  # end of hakko
-        if 'feature' in mod:
+    constants.append("User")
-            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+    return constants
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+
-        if lang['menuDouble']:
+
-            f.write(to_unicode("{ \"" + escapeC(obj[eid]['text2'][0]) + "\", \"" + escapeC(obj[eid]['text2'][1]) + "\" },\n"))
+def getDebugMenu():
-        else:
+    constants = []
-            f.write(to_unicode("{ \"" + escapeC(obj[eid]['text']) + "\" },\n"))
+    constants.append(datetime.today().strftime('%d-%m-%y'))
-        if 'feature' in mod:
+    constants.append("HW G ")
-            f.write(to_unicode("#endif\n"))
+    constants.append("HW M ")
-                
+    constants.append("HW P ")
-    f.write(to_unicode("};\n\n"))
+    constants.append("Time ")
-
+    constants.append("Move ")
-    # ----- Writing Menu Groups
+    constants.append("RTip ")
-    obj = lang['menuGroups']
+    constants.append("CTip ")
-    f.write(to_unicode("const char* SettingsMenuEntries[" + str(len(obj)) + "] = {\n"))
+    constants.append("CHan ")
-    
+    constants.append("Vin  ")
-    maxLen = 25
+    constants.append("PCB  ")  # PCB Version AKA IMU version
-    for mod in defs['menuGroups']:
+    return constants
-        eid = mod['id']
+
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+
-        f.write(to_unicode("\"" + escapeC(obj[eid]['text2'][0] + "\\n" + obj[eid]['text2'][1]) + "\",\n"))
+def getLetterCounts(defs, lang):
-                
+    textList = []
-    f.write(to_unicode("};\n\n"))
+    # iterate over all strings
-
+    obj = lang['menuOptions']
-    # ----- Writing Menu Groups Descriptions
+    for mod in defs['menuOptions']:
-    obj = lang['menuGroups']
+        eid = mod['id']
-    f.write(to_unicode("const char* SettingsMenuEntriesDescriptions[" + str(len(obj)) + "] = {\n"))
+        textList.append(obj[eid]['desc'])
-    
+
-    maxLen = 25
+    obj = lang['messages']
-    for mod in defs['menuGroups']:
+    for mod in defs['messages']:
-        eid = mod['id']
+        eid = mod['id']
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        if eid not in obj:
-        f.write(to_unicode("\"" + escapeC(obj[eid]['desc']) + "\",\n"))
+            textList.append(mod['default'])
-                
+        else:
-    f.write(to_unicode("};\n\n"))
+            textList.append(obj[eid])
-
+
-    # ----- Block end    
+    obj = lang['characters']
-    f.write(to_unicode("#endif\n"))
+
-
+    for mod in defs['characters']:
-
+        eid = mod['id']
-def read_opts():
+        textList.append(obj[eid])
-    """ Reading input parameters
+
-    First parameter = json directory
+    obj = lang['menuOptions']
-    Second parameter = target directory
+    for mod in defs['menuOptions']:
-    """
+        eid = mod['id']
-    if len(sys.argv) > 1:
+        if lang['menuDouble']:
-        jsonDir = sys.argv[1]
+            textList.append(obj[eid]['text2'][0])
-    else:
+            textList.append(obj[eid]['text2'][1])
-        jsonDir = "."
+        else:
-
+            textList.append(obj[eid]['text'])
-    if len(sys.argv) > 2:
+
-        outFile = sys.argv[2]
+    obj = lang['menuGroups']
-    else:
+    for mod in defs['menuGroups']:
-        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/src/")
+        eid = mod['id']
-        outFile = os.path.join(outDir, TRANSLATION_CPP)
+        textList.append(obj[eid]['text2'][0])
-
+        textList.append(obj[eid]['text2'][1])
-    if len(sys.argv) > 3:
+
-        raise Exception("Too many parameters!")
+    obj = lang['menuGroups']
-
+    for mod in defs['menuGroups']:
-    return jsonDir, outFile
+        eid = mod['id']
-
+        textList.append(obj[eid]['desc'])
-
+    constants = getConstants()
-def orderOutput(langDict):
+    for x in constants:
-    # These languages go first
+        textList.append(x[1])
-    mandatoryOrder = ['EN']
+    textList.extend(getTipModelEnumTS100())
-
+    textList.extend(getTipModelEnumTS80())
-    # Then add all others in alphabetical order
+    textList.extend(getDebugMenu())
-    sortedKeys = sorted(langDict.keys())
+
-
+    # collapse all strings down into the composite letters and store totals for these
-    # Add the rest as they come
+
-    for key in sortedKeys:
+    symbolCounts = {}
-        if key not in mandatoryOrder:
+    for line in textList:
-            mandatoryOrder.append(key)
+        line = line.replace('\n', '').replace('\r', '')
-
+        line = line.replace('\\n', '').replace('\\r', '')
-    return mandatoryOrder
+        if len(line):
-    
+            # print(line)
-
+            for letter in line:
-def writeTarget(outFile, defs, langCodes):
+                symbolCounts[letter] = symbolCounts.get(letter, 0) + 1
-    # Start writing the file
+    symbolCounts = sorted(
-    with io.open(outFile, 'w', encoding='utf-8', newline="\n") as f:
+        symbolCounts.items(),
-        writeStart(f)
+        key=lambda kv: (kv[1], kv[0]))  # swap to Big -> little sort order
-
+    symbolCounts = list(map(lambda x: x[0], symbolCounts))
-        for langCode in langCodes:
+    symbolCounts.reverse()
-            writeLanguage(langCode, defs, f)
+    return symbolCounts
-
+
-
+
-if __name__ == "__main__":
+def getFontMapAndTable(textList):
-    try:
+    # the text list is sorted
-        jsonDir, outFile = read_opts()
+    # allocate out these in their order as number codes
-    except:
+    symbolMap = {}
-        print("usage: make_translation.py {json dir} {cpp dir}")
+    symbolMap['\n'] = '\\x01'  # Force insert the newline char
-        sys.exit(1)
+    index = 2  # start at 2, as 0= null terminator,1 = new line
-
+    forcedFirstSymbols = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
-    print("Making " + outFile + " from " + jsonDir)
+    # enforce numbers are first
-
+    for sym in forcedFirstSymbols:
-    langDict = readTranslations(jsonDir)
+        symbolMap[sym] = "\\x%0.2X" % index
-    defs = loadJson(os.path.join(jsonDir, "translations_def.js"), True)
+        index = index + 1
-    langCodes = orderOutput(langDict)
+    if len(textList) > (253 - len(forcedFirstSymbols)):
-    writeTarget(outFile, defs, langCodes)
+        print('Error, too many used symbols for this version')
-
+        exit(1)
-    print("Done")
+    print('Generating fonts for {} symbols'.format(len(textList)))
+
+    for sym in textList:
+        if sym not in symbolMap:
+            symbolMap[sym] = "\\x%0.2X" % index
+            index = index + 1
+    # Get the font table
+    fontTableStrings = []
+    fontSmallTableStrings = []
+    fontTable = fontTables.getFontMap()
+    fontSmallTable = fontTables.getSmallFontMap()
+    for sym in forcedFirstSymbols:
+        if sym not in fontTable:
+            print('Missing Large font element for {}'.format(sym))
+            exit(1)
+        fontLine = fontTable[sym]
+        fontTableStrings.append(
+            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+        if sym not in fontSmallTable:
+            print('Missing Small font element for {}'.format(sym))
+            exit(1)
+        fontLine = fontSmallTable[sym]
+        fontSmallTableStrings.append(
+            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+
+    for sym in textList:
+        if sym not in fontTable:
+            print('Missing Large font element for {}'.format(sym))
+            exit(1)
+        if sym not in forcedFirstSymbols:
+            fontLine = fontTable[sym]
+            fontTableStrings.append(
+                fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+            if sym not in fontSmallTable:
+                print('Missing Small font element for {}'.format(sym))
+                exit(1)
+            fontLine = fontSmallTable[sym]
+            fontSmallTableStrings.append(
+                fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+    outputTable = "const uint8_t USER_FONT_12[] = {" + to_unicode("\n")
+    for line in fontTableStrings:
+        # join font table int one large string
+        outputTable = outputTable + line + to_unicode("\n")
+    outputTable = outputTable + "};" + to_unicode("\n")
+    outputTable = outputTable + "const uint8_t USER_FONT_6x8[] = {" + to_unicode(
+        "\n")
+    for line in fontSmallTableStrings:
+        # join font table int one large string
+        outputTable = outputTable + line + to_unicode("\n")
+    outputTable = outputTable + "};" + to_unicode("\n")
+    return (outputTable, symbolMap)
+
+
+def convStr(symbolConversionTable, text):
+    # convert all of the symbols from the string into escapes for their content
+    outputString = ""
+    for c in text.replace('\\r', '').replace('\\n', '\n'):
+        if c not in symbolConversionTable:
+            print('Missing font definition for {}'.format(c))
+        else:
+            outputString = outputString + symbolConversionTable[c]
+    return outputString
+
+
+def writeLanguage(languageCode, defs, f):
+    print("Generating block for " + languageCode)
+    lang = langDict[languageCode]
+    # Iterate over all of the text to build up the symbols & counts
+    textList = getLetterCounts(defs, lang)
+    # From the letter counts, need to make a symbol translator & write out the font
+    (fontTableText, symbolConversionTable) = getFontMapAndTable(textList)
+
+    f.write(to_unicode("\n#ifdef LANG_" + languageCode + "\n"))
+    f.write(fontTableText)
+    try:
+        langName = lang['languageLocalName']
+    except KeyError:
+        langName = languageCode
+
+    f.write(to_unicode("// ---- " + langName + " ----\n\n"))
+
+    # ----- Writing SettingsDescriptions
+    obj = lang['menuOptions']
+    f.write(to_unicode("const char* SettingsDescriptions[] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if 'feature' in mod:
+            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode("\"" +
+                       convStr(symbolConversionTable, (obj[eid]['desc'])) +
+                       "\"," + "//{} \n".format(obj[eid]['desc'])))
+        if 'feature' in mod:
+            f.write(to_unicode("#endif\n"))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Writing Message strings
+
+    obj = lang['messages']
+
+    for mod in defs['messages']:
+        eid = mod['id']
+        sourceText = ""
+        if 'default' in mod:
+            sourceText = (mod['default'])
+        if eid in obj:
+            sourceText = (obj[eid])
+        translatedText = convStr(symbolConversionTable, sourceText)
+        f.write(
+            to_unicode("const char* " + eid + " = \"" +
+                       translatedText + "\";" + "//{} \n".format(sourceText.replace('\n', '_'))))
+
+    f.write(to_unicode("\n"))
+
+    # ----- Writing Characters
+
+    obj = lang['characters']
+
+    for mod in defs['characters']:
+        eid = mod['id']
+        f.write(
+            to_unicode("const char* " + eid + " = \"" +
+                       convStr(symbolConversionTable, obj[eid]) + "\";" + "//{} \n".format(obj[eid])))
+
+    f.write(to_unicode("\n"))
+
+    # Write out firmware constant options
+    constants = getConstants()
+    for x in constants:
+        f.write(
+            to_unicode("const char* " + x[0] + " = \"" +
+                       convStr(symbolConversionTable, x[1]) + "\";" + "//{} \n".format(x[1])))
+
+    f.write(to_unicode("\n"))
+    # Write out tip model strings
+
+    f.write(to_unicode("const char* TipModelStrings[] = {\n"))
+    f.write(to_unicode("#ifdef MODEL_TS100\n"))
+    for c in getTipModelEnumTS100():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
+                                             c) + "\"," + "//{} \n".format(c)))
+    f.write(to_unicode("#else\n"))
+    for c in getTipModelEnumTS80():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
+                                             c) + "\"," + "//{} \n".format(c)))
+    f.write(to_unicode("#endif\n"))
+
+    f.write(to_unicode("};\n\n"))
+
+    # Debug Menu
+    f.write(to_unicode("const char* DebugMenu[] = {\n"))
+
+    for c in getDebugMenu():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
+                                             c) + "\"," + "//{} \n".format(c)))
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Menu Options
+
+    # Menu type
+    f.write(
+        to_unicode(
+            "const enum ShortNameType SettingsShortNameType = SHORT_NAME_" +
+            ("DOUBLE" if lang['menuDouble'] else "SINGLE") + "_LINE;\n"))
+
+    # ----- Writing SettingsDescriptions
+    obj = lang['menuOptions']
+    f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if 'feature' in mod:
+            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        if lang['menuDouble']:
+            f.write(
+                to_unicode(
+                    "{ \"" +
+                    convStr(symbolConversionTable, (obj[eid]['text2'][0])) +
+                    "\", \"" +
+                    convStr(symbolConversionTable, (obj[eid]['text2'][1])) +
+                    "\" }," + "//{} \n".format(obj[eid]['text2'])))
+        else:
+            f.write(
+                to_unicode("{ \"" +
+                           convStr(symbolConversionTable, (obj[eid]['text'])) +
+                           "\" }," + "//{} \n".format(obj[eid]['text'])))
+        if 'feature' in mod:
+            f.write(to_unicode("#endif\n"))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Writing Menu Groups
+    obj = lang['menuGroups']
+    f.write(
+        to_unicode("const char* SettingsMenuEntries[" + str(len(obj)) +
+                   "] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode("\"" +
+                       convStr(symbolConversionTable, (obj[eid]['text2'][0]) +
+                               "\\n" + obj[eid]['text2'][1]) + "\"," + "//{} \n".format(obj[eid]['text2'])))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Writing Menu Groups Descriptions
+    obj = lang['menuGroups']
+    f.write(
+        to_unicode("const char* SettingsMenuEntriesDescriptions[" +
+                   str(len(obj)) + "] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode("\"" +
+                       convStr(symbolConversionTable, (obj[eid]['desc'])) +
+                       "\"," + "//{} \n".format(obj[eid]['desc'])))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Block end
+    f.write(to_unicode("#endif\n"))
+
+
+def writeUnit(languageCode, defs, f, UnitCodes):
+    print("Generating unit block for " + languageCode)
+    lang = langDict[languageCode]
+    unit = UnitDict[UnitCodes]
+    try:
+        langName = lang['languageLocalName']
+    except KeyError:
+        langName = languageCode
+    f.write(to_unicode("  #ifdef LANG_" + languageCode + "\n"))
+    if unit: 
+        f.write(to_unicode("    #define  ENABLED_FAHRENHEIT_SUPPORT" + "\n"))
+    else: f.write(to_unicode("    //#define  ENABLED_FAHRENHEIT_SUPPORT" + "\n"))
+    # ----- Block end
+    f.write(to_unicode("  #endif /* ---- " + langName + " ---- */\n"))
+
+def readVersion():
+    with open(os.path.relpath(jsonDir + 
+    "/../workspace/TS100/version.h"),"r") as version_file:
+        try: 
+            for line in version_file:
+                if re.findall(r'^.*(?<=(#define)).*(?<=(BUILD_VERSION))', line):
+                    line = re.findall(r'\"(.+?)\"',line)
+                    if line: 
+                        version = line[0]
+                        try: version += "."+ subprocess.check_output(
+                            ["git","rev-parse", "--short=7", "HEAD"]).strip().decode('ascii').upper()
+                            # --short=7: the shorted hash with 7 digits. Increase/decrease if needed!
+                        except OSError: version += " git"
+        finally: 
+            if version_file: 
+                version_file.close(); 
+                return version
+
+def read_opts():
+    """ Reading input parameters
+    First parameter = json directory
+    Second parameter = translation directory
+    Third paramter = unit directory
+    """
+    if len(sys.argv) > 1:
+        jsonDir = sys.argv[1]
+    else:
+        jsonDir = "."
+
+    if len(sys.argv) > 2:
+        outFileTranslationCPP = sys.argv[2]
+    else:
+        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/Core/Src")
+        outFileTranslationCPP = os.path.join(outDir, TRANSLATION_CPP)
+    
+    if len(sys.argv) > 3:
+        outFileUnitH = sys.argv[3]
+    else:
+        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/Core/Inc")
+        outFileUnitH = os.path.join(outDir,UNIT_H)
+
+    if len(sys.argv) > 4:
+        raise Exception("Too many parameters!")
+
+    return jsonDir, outFileTranslationCPP, outFileUnitH
+
+
+def orderOutput(langDict):
+    # These languages go first
+    mandatoryOrder = ['EN']
+
+    # Then add all others in alphabetical order
+    sortedKeys = sorted(langDict.keys())
+
+    # Add the rest as they come
+    for key in sortedKeys:
+        if key not in mandatoryOrder:
+            mandatoryOrder.append(key)
+
+    return mandatoryOrder
+
+
+def writeTarget(outFileTranslationCPP, outFileUnitH, defs, langCodes, UnitCodes):
+    # Start writing the file
+    with io.open(outFileTranslationCPP, 'w', encoding='utf-8', newline="\n") as f:
+        writeStart(f)
+        for langCode in langCodes:
+            writeLanguage(langCode, defs, f)
+
+    with io.open(outFileUnitH, 'w', encoding='utf-8', newline="\n") as f:
+        writeStartUnit(f)
+        for langCode, UnitCode in zip(langCodes, UnitCodes):
+            writeUnit(langCode, defs, f, UnitCode)
+        f.write(to_unicode("\n#endif /* _UNIT_H */\n"))
+
+if __name__ == "__main__":
+    try:
+        jsonDir, outFileTranslationCPP, outFileUnitH = read_opts()
+    except:
+        print("usage: make_translation.py {json dir} {cpp dir}")
+        sys.exit(1)
+
+    try: buildVersion = readVersion()
+    except: print("error: could not get/extract build version"); sys.exit(1)
+
+    print("Build version: " + buildVersion)
+    print("Making " + outFileTranslationCPP + " from " + jsonDir)
+    print("Making " + outFileUnitH + " from " + jsonDir)
+
+    langDict, UnitDict = readTranslations(jsonDir)
+    defs = loadJson(os.path.join(jsonDir, "translations_def.js"), True)
+    langCodes = orderOutput(langDict)
+    UnitCodes = orderOutput(UnitDict)
+    writeTarget(outFileTranslationCPP, outFileUnitH, defs, langCodes, UnitCodes)
+
+    print("Done")

Translation Editor/translation_bg.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "ВРЪХ ЛОША ВРЪЗКА",
 		"SolderingAdvancedPowerPrompt": "Захранване: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_cs.json

@@ -3,31 +3,37 @@
 	"languageLocalName": "Český",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Kalibrace dokončena!",
 		"SettingsCalibrationWarning": "Ujistěte se, že hrot má pokojovou teplotu!",
 		"SettingsResetWarning": "Opravdu chcete resetovat zařízení do továrního nastavení?",
-		"UVLOWarningString": "DC LOW",
+		"UVLOWarningString": "Nízké DC",
 		"UndervoltageString": "! Nízké napětí !",
 		"InputVoltageString": "Napětí: ",
 		"WarningTipTempString": "Teplota: ",
-		"BadTipString": "BAD TIP",
+		"BadTipString": "ŠP. HROT",
 		"SleepingSimpleString": "Zzz ",
 		"SleepingAdvancedString": "Režim spánku...",
-		"WarningSimpleString": "HOT!",
+		"WarningSimpleString": "PÁLÍ",
 		"WarningAdvancedString": "!! HORKÝ HROT !!",
 		"SleepingTipAdvancedString": "Hrot:",
 		"IdleTipString": "Hrot:",
 		"IdleSetString": " Cíl:",
 		"TipDisconnectedString": "HROT NEPŘIPOJEN",
 		"SolderingAdvancedPowerPrompt": "Ohřev: ",
-		"OffString": "Off"
+		"OffString": "Vyp",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Zisk:"
 	},
 	"characters": {
 		"SettingRightChar": "P",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "P"
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -36,7 +42,7 @@
 				"Pájecí",
 				"nastavení"
 			],
-			"desc": "Nastavení pájení (boost, auto start...)"
+			"desc": "Nastavení pájení (boost, auto start...)."
 		},
 		"PowerSavingMenu": {
 			"text2": [
@@ -57,7 +63,7 @@
 				"Pokročilé",
 				"volby"
 			],
-			"desc": "Pokročilé volby (detailní obrazovky, kalibrace, tovární nastavení...)"
+			"desc": "Pokročilé volby (detailní obrazovky, kalibrace, tovární nastavení...)."
 		}
 	},
 	"menuOptions": {
@@ -67,7 +73,7 @@
 				"Zdroj",
 				"napájení"
 			],
-			"desc": "Při nižším napětí ukončí pájení <DC=10V, ?S=?x3.3V pro LiPo,LiIon...>"
+			"desc": "Při nižším napětí ukončí pájení <DC=10V, ?S=?x3.3V pro LiPo, LiIon...>."
 		},
 		"SleepTemperature": {
 			"text": "",
@@ -83,7 +89,7 @@
 				"Čas do",
 				"r. spánku"
 			],
-			"desc": "Čas do režimu spánku <Minut/Sekund>"
+			"desc": "Čas do režimu spánku <Minut/Sekund>."
 		},
 		"ShutdownTimeout": {
 			"text": "",
@@ -91,7 +97,7 @@
 				"Čas do",
 				"vypnutí"
 			],
-			"desc": "Čas do automatického vypnutí <Minut>"
+			"desc": "Čas do automatického vypnutí <Minut>."
 		},
 		"MotionSensitivity": {
 			"text": "",
@@ -99,7 +105,7 @@
 				"Citlivost",
 				"det. pohybu"
 			],
-			"desc": "Citlivost detekce pohybu <0=Vyp, 1=Min, ... 9=Max>"
+			"desc": "Citlivost detekce pohybu <0=Vyp, 1=Min, ... 9=Max>."
 		},
 		"TemperatureUnit": {
 			"text": "",
@@ -107,7 +113,7 @@
 				"Jednotky",
 				"teploty"
 			],
-			"desc": "Jednotky měření teploty <C=Celsius, F=Fahrenheit>"
+			"desc": "Jednotky měření teploty <C=Celsius, F=Fahrenheit>."
 		},
 		"AdvancedIdle": {
 			"text": "",
@@ -123,7 +129,7 @@
 				"Orientace",
 				"obrazovky"
 			],
-			"desc": "Orientace obrazovky <A=Auto, L=Levák, P=Pravák>"
+			"desc": "Orientace obrazovky <A=Auto, L=Levák, P=Pravák>."
 		},
 		"BoostEnabled": {
 			"text": "",
@@ -131,7 +137,7 @@
 				"Povolit",
 				"boost"
 			],
-			"desc": "Povolit boost držením předního tlačítka při pájení?"
+			"desc": "Povolit boost podržením předního tlačítka při pájení?"
 		},
 		"BoostTemperature": {
 			"text": "",
@@ -144,7 +150,7 @@
 		"AutoStart": {
 			"text": "",
 			"text2": [
-				"Auto",
+				"Automatický",
 				"start"
 			],
 			"desc": "Při startu ihned nahřát hrot?"
@@ -195,39 +201,95 @@
 				"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."
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_da.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "H",
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "L",
+		"SettingStartSleepChar": "D",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "S"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_de.json

@@ -2,6 +2,7 @@
 	"languageCode": "DE",
 	"languageLocalName": "Deutsch",
 	"cyrillicGlyphs": false,
+	"tempUnitFahrenheit": false,
 	"messages": {
 		"SettingsCalibrationDone": "Kalibrierung abgeschlossen!",
 		"SettingsCalibrationWarning": "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!",
@@ -10,7 +11,7 @@
 		"UndervoltageString": "Unterspannung",
 		"InputVoltageString": "V Eingang: ",
 		"WarningTipTempString": "Temperatur: ",
-		"BadTipString": "DEFEKT",
+		"BadTipString": "Spitze Defekt",
 		"SleepingSimpleString": "Zzz ",
 		"SleepingAdvancedString": "Ruhemodus...",
 		"WarningSimpleString": "HEIß",
@@ -20,14 +21,21 @@
 		"IdleSetString": " Soll:",
 		"TipDisconnectedString": "Spitze fehlt",
 		"SolderingAdvancedPowerPrompt": "Leistung: ",
-		"OffString": "Aus"
+		"OffString": "Aus",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your Gain:",
+		"SettingsResetMessage": "Einstellungen\nzurück gesetzt!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -47,7 +55,7 @@
 		},
 		"UIMenu": {
 			"text2": [
-				"Menü-",
+				"Anzeige-",
 				"einstellungen"
 			],
 			"desc": "Menüeinstellungen"
@@ -55,14 +63,14 @@
 		"AdvancedMenu": {
 			"text2": [
 				"Erweiterte",
-				"Einstellungen"
+				"Optionen"
 			],
 			"desc": "Erweiterte Einstellungen"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+			"text": "PWRSC",
 			"text2": [
 				"Spannungs-",
 				"quelle"
@@ -70,15 +78,15 @@
 			"desc": "Spannungsquelle (Abschaltspannung) <DC=10V, nS=n*3.3V für n LiIon-Zellen>"
 		},
 		"SleepTemperature": {
-			"text": "",
+			"text": "STMP",
 			"text2": [
 				"Ruhetemp-",
 				"eratur"
 			],
-			"desc": "Ruhetemperatur (In der eingestellten Einheit)"
+			"desc": "Ruhetemperatur"
 		},
 		"SleepTimeout": {
-			"text": "",
+			"text": "STME",
 			"text2": [
 				"Ruhever-",
 				"zögerung"
@@ -86,7 +94,7 @@
 			"desc": "Ruhemodus nach <Sekunden/Minuten>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
+			"text": "SHTME",
 			"text2": [
 				"Abschalt-",
 				"zeit"
@@ -94,7 +102,7 @@
 			"desc": "Abschalten nach <Minuten>"
 		},
 		"MotionSensitivity": {
-			"text": "",
+			"text": "MSENSE",
 			"text2": [
 				"Bewegungs-",
 				"empfindlichk."
@@ -102,7 +110,7 @@
 			"desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>"
 		},
 		"TemperatureUnit": {
-			"text": "",
+			"text": "TMPUNT",
 			"text2": [
 				"Temperatur-",
 				"einheit"
@@ -110,15 +118,15 @@
 			"desc": "Temperatureinheit <C=Celsius, F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
+			"text": "ADVIDL",
 			"text2": [
 				"Detaillierte",
 				"Ruheansicht"
 			],
-			"desc": "Detaillierte Anzeige im Ruhemodus <J=An, N=Aus>"
+			"desc": "Detaillierte Anzeige im Ruhemodus"
 		},
 		"DisplayRotation": {
-			"text": "",
+			"text": "DSPROT",
 			"text2": [
 				"Anzeige-",
 				"ausrichtung"
@@ -126,15 +134,15 @@
 			"desc": "Ausrichtung der Anzeige <A=Automatisch, L=Linkshändig, R=Rechtshändig>"
 		},
 		"BoostEnabled": {
-			"text": "",
+			"text": "BOOST",
 			"text2": [
 				"Boosttaste",
 				"aktiv?"
 			],
-			"desc": "Vordere Taste für Temperaturboost verwenden <J=An, N=Aus>"
+			"desc": "Vordere Taste lange drücken für Temperatur-Boostmodus beim Löten"
 		},
 		"BoostTemperature": {
-			"text": "",
+			"text": "BTMP",
 			"text2": [
 				"Boosttemp-",
 				"eratur"
@@ -142,23 +150,23 @@
 			"desc": "Temperatur im Boostmodus  (In der eingestellten Einheit)"
 		},
 		"AutoStart": {
-			"text": "",
+			"text": "ASTART",
 			"text2": [
 				"Start im",
 				"Lötmodus?"
 			],
-			"desc": "Automatischer Start des Lötmodus beim Einschalten der Spannungsversorgung. <J=An, N=Aus>"
+			"desc": "Automatischer Start-Modus beim Einschalten der Spannungsversorgung. <T=Lötmodus S=Ruhezustand F=Aus>"
 		},
 		"CooldownBlink": {
-			"text": "",
+			"text": "CLBLNK",
 			"text2": [
 				"Abkühl-",
 				"blinken?"
 			],
-			"desc": "Blinkende Temperaturanzeige beim Abkühlen, solange heiß. <J=An, N=Aus>"
+			"desc": "Blinkende Temperaturanzeige beim Abkühlen, solange heiß ist."
 		},
 		"TemperatureCalibration": {
-			"text": "",
+			"text": "TMP CAL?",
 			"text2": [
 				"Temperatur",
 				"kalibrieren?"
@@ -166,15 +174,15 @@
 			"desc": "Kalibrierung der Lötspitzentemperatur"
 		},
 		"SettingsReset": {
-			"text": "",
+			"text": "RESET?",
 			"text2": [
 				"Einstellungen",
 				"zurücksetzen?"
 			],
-			"desc": "Alle Einstellungen zurücksetzen"
+			"desc": "Einstellungen auf werkseinstellungen zurück setzen"
 		},
 		"VoltageCalibration": {
-			"text": "",
+			"text": "CAL VIN?",
 			"text2": [
 				"Eingangsspannung",
 				"kalibrieren?"
@@ -182,20 +190,20 @@
 			"desc": "Kalibrierung der Eingangsspannung. Kurzer Tastendruck zum Einstellen, langer Tastendruck zum Verlassen."
 		},
 		"AdvancedSoldering": {
-			"text": "",
+			"text": "ADVSLD",
 			"text2": [
 				"Detaillierte",
 				"Lötansicht"
 			],
-			"desc": "Detaillierte Anzeige im Lötmodus <J=An, N=Aus>"
+			"desc": "Detaillierte Anzeige im Lötmodus"
 		},
 		"ScrollingSpeed": {
-			"text": "",
+			"text": "DESCSP",
 			"text2": [
 				"Scroll-",
 				"geschw."
 			],
-			"desc": "Scrollgeschwindigkeit der Texte"
+			"desc": "Scrollgeschwindigkeit der Texte <S=Langsam F=Schnell>"
 		},
 		"TipModel": {
 			"text": "TIPMO",
@@ -225,9 +233,66 @@
 			"text": "PWRW",
 			"text2": [
 				"Leistungs-",
-				"aufnahme"
+				"Aufnahme"
 			],
 			"desc": "Leistungsaufnahme der verwendeten Spannungsversorgung"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Leistungs-",
+				"Limit An"
+			],
+			"desc": "Leistungslimit aktivieren"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Leistungs-",
+				"Limit"
+			],
+			"desc": "Maximale aufnahme der Lötspitze <Watt>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Taste +-",
+				"Umkehren?"
+			],
+			"desc": "Temperatur-Änderungs-Tasten-Belegung Plus-Minus umkehren?"
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"T. Schritt",
+				"Taste kurz?"
+			],
+			"desc": "Temperaturwechselschritte bei kurzem Tastendruck!"
+		}
+		,
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"T. Schritt",
+				"Taste Lang?"
+			],
+			"desc": "Temperaturwechselschritte bei langem Tastendruck!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_en.json

@@ -1,233 +1,297 @@
-{
+{
-	"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"
+	},
-		},
+	"menuDouble": true,
-		"PowerSavingMenu": {
+	"menuGroups": {
-			"text2": [
+		"SolderingMenu": {
-				"Sleep",
+			"text2": [
-				"Modes"
+				"Soldering",
-			],
+				"settings"
-			"desc": "Power saving settings"
+			],
-		},
+			"desc": "Soldering settings"
-		"UIMenu": {
+		},
-			"text2": [
+		"PowerSavingMenu": {
-				"User",
+			"text2": [
-				"Interface"
+				"Sleep",
-			],
+				"modes"
-			"desc": "User interface settings"
+			],
-		},
+			"desc": "Power saving settings"
-		"AdvancedMenu": {
+		},
-			"text2": [
+		"UIMenu": {
-				"Advanced",
+			"text2": [
-				"Options"
+				"User",
-			],
+				"interface"
-			"desc": "Advanced options"
+			],
-		}
+			"desc": "User interface settings"
-	},
+		},
-	"menuOptions": {
+		"AdvancedMenu": {
-		"PowerSource": {
+			"text2": [
-			"text": "PWRSC",
+				"Advanced",
-			"text2": [
+				"options"
-				"Power",
+			],
-				"source"
+			"desc": "Advanced options"
-			],
+		}
-			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>"
+	},
-		},
+	"menuOptions": {
-		"SleepTemperature": {
+		"PowerSource": {
-			"text": "STMP",
+			"text": "PWRSC",
-			"text2": [
+			"text2": [
-				"Sleep",
+				"Power",
-				"temp"
+				"source"
-			],
+			],
-			"desc": "Sleep Temperature <C>"
+			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell, disable power limit>"
-		},
+		},
-		"SleepTimeout": {
+		"SleepTemperature": {
-			"text": "STME",
+			"text": "STMP",
-			"text2": [
+			"text2": [
-				"Sleep",
+				"Sleep",
-				"timeout"
+				"temp"
-			],
+			],
-			"desc": "Sleep Timeout <Minutes/Seconds>"
+			"desc": "Sleep temperature"
-		},
+		},
-		"ShutdownTimeout": {
+		"SleepTimeout": {
-			"text": "SHTME",
+			"text": "STME",
-			"text2": [
+			"text2": [
-				"Shutdown",
+				"Sleep",
-				"timeout"
+				"timeout"
-			],
+			],
-			"desc": "Shutdown Timeout <Minutes>"
+			"desc": "Sleep timeout <Minutes/Seconds>"
-		},
+		},
-		"MotionSensitivity": {
+		"ShutdownTimeout": {
-			"text": "MSENSE",
+			"text": "SHTME",
-			"text2": [
+			"text2": [
-				"Motion",
+				"Shutdown",
-				"sensitivity"
+				"timeout"
-			],
+			],
-			"desc": "Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>"
+			"desc": "Shutdown timeout <Minutes>"
-		},
+		},
-		"TemperatureUnit": {
+		"MotionSensitivity": {
-			"text": "TMPUNT",
+			"text": "MSENSE",
-			"text2": [
+			"text2": [
-				"Temperature",
+				"Motion",
-				"units"
+				"sensitivity"
-			],
+			],
-			"desc": "Temperature Unit <C=Celsius F=Fahrenheit>"
+			"desc": "Motion sensitivity <0=Off 1=Least sensitive 9=Most sensitive>"
-		},
+		},
-		"AdvancedIdle": {
+		"TemperatureUnit": {
-			"text": "ADVIDL",
+			"text": "TMPUNT",
-			"text2": [
+			"text2": [
-				"Detailed",
+				"Temperature",
-				"idle screen"
+				"unit"
-			],
+			],
-			"desc": "Display detailed information in a smaller font on the idle screen."
+			"desc": "Temperature unit <C=Celsius F=Fahrenheit>"
-		},
+		},
-		"DisplayRotation": {
+		"AdvancedIdle": {
-			"text": "DSPROT",
+			"text": "ADVIDL",
-			"text2": [
+			"text2": [
-				"Display",
+				"Detailed",
-				"orientation"
+				"idle screen"
-			],
+			],
-			"desc": "Display Orientation <A. Automatic L. Left Handed R. Right Handed>"
+			"desc": "Display detailed information in a smaller font on the idle screen"
-		},
+		},
-		"BoostEnabled": {
+		"DisplayRotation": {
-			"text": "BOOST",
+			"text": "DSPROT",
-			"text2": [
+			"text2": [
-				"Boost mode",
+				"Display",
-				"enabled"
+				"orientation"
-			],
+			],
-			"desc": "Enable front key enters boost mode 450C mode when soldering"
+			"desc": "Display orientation <A=Automatic L=Left-handed R=Right-handed>"
-		},
+		},
-		"BoostTemperature": {
+		"BoostEnabled": {
-			"text": "BTMP",
+			"text": "BOOST",
-			"text2": [
+			"text2": [
-				"Boost",
+				"Boost",
-				"temp"
+				"mode"
-			],
+			],
-			"desc": "Temperature when in \"boost\" mode"
+			"desc": "Enable front key long press \"boost mode\" when soldering"
-		},
+		},
-		"AutoStart": {
+		"BoostTemperature": {
-			"text": "ASTART",
+			"text": "BTMP",
-			"text2": [
+			"text2": [
-				"Auto",
+				"Boost",
-				"start"
+				"temp"
-			],
+			],
-			"desc": "Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off"
+			"desc": "Temperature when in \"boost mode\""
-		},
+		},
-		"CooldownBlink": {
+		"AutoStart": {
-			"text": "CLBLNK",
+			"text": "ASTART",
-			"text2": [
+			"text2": [
-				"Cooldown",
+				"Auto",
-				"blink"
+				"start"
-			],
+			],
-			"desc": "Blink the temperature on the cooling screen while the tip is still hot."
+			"desc": "Automatically starts the iron into soldering on power up <F=Off T=Soldering S=Sleep O=Sleep at room temperature>"
-		},
+		},
-		"TemperatureCalibration": {
+		"CooldownBlink": {
-			"text": "TMP CAL?",
+			"text": "CLBLNK",
-			"text2": [
+			"text2": [
-				"Calibrate",
+				"Cooldown",
-				"temperature?"
+				"blink"
-			],
+			],
-			"desc": "Calibrate tip offset."
+			"desc": "Blink the temperature on the cooling screen while the tip is still hot"
-		},
+		},
-		"SettingsReset": {
+		"TemperatureCalibration": {
-			"text": "RESET?",
+			"text": "TMP CAL?",
-			"text2": [
+			"text2": [
-				"Factory",
+				"Calibrate",
-				"Reset?"
+				"temperature?"
-			],
+			],
-			"desc": "Reset all settings"
+			"desc": "Calibrate tip offset?"
-		},
+		},
-		"VoltageCalibration": {
+		"SettingsReset": {
-			"text": "CAL VIN?",
+			"text": "RESET?",
-			"text2": [
+			"text2": [
-				"Calibrate",
+				"Factory",
-				"input voltage?"
+				"Reset?"
-			],
+			],
-			"desc": "VIN Calibration. Buttons adjust, long press to exit"
+			"desc": "Reset all settings!"
-		},
+		},
-		"AdvancedSoldering": {
+		"VoltageCalibration": {
-			"text": "ADVSLD",
+			"text": "CAL VIN?",
-			"text2": [
+			"text2": [
-				"Detailed",
+				"Calibrate",
-				"solder screen"
+				"input voltage?"
-			],
+			],
-			"desc": "Display detailed information while soldering"
+			"desc": "VIN Calibration <long press to exit>"
-		},
+		},
-		"ScrollingSpeed": {
+		"AdvancedSoldering": {
-			"text": "DESCSP",
+			"text": "ADVSLD",
-			"text2": [
+			"text2": [
-				"Scrolling",
+				"Detailed",
-				"Speed"
+				"solder screen"
-			],
+			],
-			"desc": "Speed this text scrolls past at"
+			"desc": "Display detailed information while soldering"
-		},
+		},
-		"TipModel": {
+		"ScrollingSpeed": {
-			"text": "TIPMO",
+			"text": "DESCSP",
-			"text2": [
+			"text2": [
-				"Tip",
+				"Scrolling",
-				"Model"
+				"speed"
-			],
+			],
-			"desc": "Tip Model selection"
+			"desc": "Speed this text scrolls past at <S=Slow F=Fast>"
-		},
+		},
-		"SimpleCalibrationMode": {
+		"TipModel": {
-			"text": "SMPCAL",
+			"text": "TIPMO",
-			"text2": [
+			"text2": [
-				"Simple",
+				"Tip",
-				"Calibration"
+				"model"
-			],
+			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Tip model selection"
-		},
+		},
-		"AdvancedCalibrationMode": {
+		"SimpleCalibrationMode": {
-			"text": "ADVCAL",
+			"text": "SMPCAL",
-			"text2": [
+			"text2": [
-				"Advanced",
+				"Simple",
-				"Calibration"
+				"calibration"
-			],
+			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Simple calibration using hot water"
-		},
+		},
-		"PowerInput": {
+		"AdvancedCalibrationMode": {
-			"text": "PWRW",
+			"text": "ADVCAL",
-			"text2": [
+			"text2": [
-				"Power",
+				"Advanced",
-				"Wattage"
+				"calibration"
-			],
+			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Advanced calibration using thermocouple on the tip"
-		}
+		},
-	}
+		"PowerInput": {
-}
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"wattage"
+			],
+			"desc": "Power wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Enable power",
+				"limit"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Reverse",
+				"+ - keys"
+			],
+			"desc": "Reverse assignment of temperature adjustment buttons"
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short"
+			],
+			"desc": "Temperature change steps on short button press"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long"
+			],
+			"desc": "Temperature change steps on long button press"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		}
+	}
+}

Translation Editor/translation_es.json

@@ -1,63 +1,70 @@
 {
 	"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": "Restablecidos."
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "I",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "S",
+		"SettingStartSleepChar": "R",
+		"SettingStartSleepOffChar": "F",
+		"SettingStartNoneChar": "N"
 	},
 	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Opciones de",
+				"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": {
@@ -67,39 +74,39 @@
 				"Fuente",
 				"de energía"
 			],
-			"desc": "Fuente de energía. Ajusta el límite inferior de voltaje. <DC=10V S=3.3V por celda>"
+			"desc": "Elige el tipo de fuente para limitar el voltaje <DC 10V> <S 3,3V por pila, ilimitado>"
 		},
 		"SleepTemperature": {
 			"text": "STMP",
 			"text2": [
-				"Temp en",
+				"Temperatura",
-				"reposo"
+				"en reposo"
 			],
-			"desc": "Temperatura en reposo. <C>"
+			"desc": "Temperatura de la punta en reposo."
 		},
 		"SleepTimeout": {
 			"text": "STME",
 			"text2": [
-				"Tiempo h.",
+				"Entrar",
-				"reposo"
+				"en reposo"
 			],
-			"desc": "Tiempo hasta activar reposo. <Minutos>"
+			"desc": "Tiempo de inactividad para entrar en reposo <min/seg>"
 		},
 		"ShutdownTimeout": {
 			"text": "SHTME",
 			"text2": [
-				"Tiempo h.",
+				"Tiempo de",
 				"apagado"
 			],
-			"desc": "Tiempo hasta apagado. <Minutos>"
+			"desc": "Tiempo de inactividad para apagarse <en minutos>"
 		},
 		"MotionSensitivity": {
 			"text": "MSENSE",
 			"text2": [
-				"Sensibilidad",
+				"Detección de",
-				"al movimiento"
+				"movimiento"
 			],
-			"desc": "Sensibilidad del movimiento. <0=Apagado 1=El menos sensible 9=El más sensible>"
+			"desc": "Tiempo de reacción al agarrar <0=no 1=menos sensible 9=más sensible>"
 		},
 		"TemperatureUnit": {
 			"text": "TMPUNT",
@@ -107,15 +114,15 @@
 				"Unidad de",
 				"temperatura"
 			],
-			"desc": "Unidad de temperatura."
+			"desc": "Unidad de temperatura <C=centígrados F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
 			"text": "ADVIDL",
 			"text2": [
-				"Más info en",
+				"Info extra en",
-				"modo inactivo"
+				"modo reposo"
 			],
-			"desc": "Muestra información detallada pequena en la pantalla inactiva."
+			"desc": "Muestra información detallada en letra pequeña al reposar."
 		},
 		"DisplayRotation": {
 			"text": "DSPROT",
@@ -123,71 +130,71 @@
 				"Orientación",
 				"de pantalla"
 			],
-			"desc": "Orientación de la pantalla <A=Automático I=Mano izquierda D=Mano derecha>"
+			"desc": "Orientación de la pantalla <A=automático I=zurdo D=diestro>"
 		},
 		"BoostEnabled": {
 			"text": "BOOST",
 			"text2": [
-				"Boost botón",
+				"Con botón de",
-				"activado"
+				"temp. extra"
 			],
-			"desc": "Activar el botón \"Boost\" en modo soldadura."
+			"desc": "Permite mantener pulsado el primer botón (A) al soldar y calentar momentáneamente un poco más."
 		},
 		"BoostTemperature": {
 			"text": "BTMP",
 			"text2": [
-				"Temp en",
+				"Ajustar la",
-				"Boost"
+				"temp. extra"
 			],
-			"desc": "Temperatura en modo \"Boost\". <C>"
+			"desc": "Temperatura momentánea que se alcanza al apretar el botón del modo extra."
 		},
 		"AutoStart": {
 			"text": "ASTART",
 			"text2": [
-				"Soldadura",
+				"Calentar",
 				"al enchufar"
 			],
-			"desc": "Iniciar modo soldadura en el encendido. <V=Sí S=Modo reposo F=No>"
+			"desc": "Se calienta él solo al arrancar <S=entrar en modo soldar R=solo entrar en reposo F=en reposo pero mantiene la punta fría N=no>"
 		},
 		"CooldownBlink": {
 			"text": "CLBLNK",
 			"text2": [
-				"Parpadea m.",
+				"Parpadear",
-				"enfriamiento"
+				"al enfriar"
 			],
-			"desc": "Parpadea la temperatura en el enfriamiento si la punta sigue caliente."
+			"desc": "La temperatura en pantalla parpadea mientras la punta siga caliente."
 		},
 		"TemperatureCalibration": {
 			"text": "TMP CAL?",
 			"text2": [
-				"Calibrar temp",
+				"Calibrar temp.",
 				"de la punta"
 			],
-			"desc": "Calibrar desviación térmica de la punta."
+			"desc": "Calibra la desviación térmica de la punta."
 		},
 		"SettingsReset": {
 			"text": "RESET?",
 			"text2": [
-				"Estado de",
+				"Volver a ajustes",
-				"fábrica"
+				"de fábrica"
 			],
-			"desc": "Volver a estado de fábrica."
+			"desc": "Restablece todos los ajustes a los valores originales."
 		},
 		"VoltageCalibration": {
 			"text": "CAL VIN?",
 			"text2": [
-				"Calibrar",
+				"Calibrar voltaje",
-				"V entrada"
+				"de entrada"
 			],
-			"desc": "Calibración VIN (Voltaje de entrada). Ajuste con ambos botones, pulsación larga para salir."
+			"desc": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir."
 		},
 		"AdvancedSoldering": {
 			"text": "ADVSLD",
 			"text2": [
-				"Inf detallada",
+				"Info extra",
-				"del soldadura"
+				"al soldar"
 			],
-			"desc": "Mostrar información detallada mientras suelda."
+			"desc": "Muestra más datos por pantalla cuando se está soldando."
 		},
 		"ScrollingSpeed": {
 			"text": "DESCSP",
@@ -195,39 +202,95 @@
 				"Velocidad",
 				"del texto"
 			],
-			"desc": "Velocidad de desplazamiento del texto."
+			"desc": "Velocidad de desplazamiento del texto <R=rápida L=lenta>"
 		},
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
+				"Modelo de",
-				"Model"
+				"punta"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Elegir el modelo de punta actual."
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
+				"Calibración",
-				"Calibration"
+				"simple"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Calibración simple con agua caliente."
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Calibración",
-				"Calibration"
+				"avanzada"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Calibrar con un termopar en la punta; más difícil."
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
+				"Potencia de",
-				"Wattage"
+				"entrada"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Potencia en vatios del adaptador de corriente utilizado."
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Limitar la",
+				"potenc. máx."
+			],
+			"desc": "Activa el límite de potencia máxima."
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Ajustar la",
+				"potenc. máx."
+			],
+			"desc": "Elige el límite de potencia máxima del soldador <en vatios>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_fi.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Asetus:",
 		"TipDisconnectedString": "KÄRKI ON IRTI",
 		"SolderingAdvancedPowerPrompt": "Teho: ",
-		"OffString": "OFF"
+		"OffString": "OFF",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "O",
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "N",
-		"SettingSlowChar": "H"
+		"SettingSlowChar": "H",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_fr.json

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

Translation Editor/translation_hr.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "VRH NIJE SPOJEN!",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "B",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"napajanja"
 			],
 			"desc": "Snaga modula za napajanje"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_hu.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Cél:",
 		"TipDisconnectedString": "HEGY LEVÉVE",
 		"SolderingAdvancedPowerPrompt": "Telj: ",
-		"OffString": "Ki"
+		"OffString": "Ki",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "J",
 		"SettingLeftChar": "B",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "G",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"teljesítmény"
 			],
 			"desc": "A tápegység által leadott teljesítmény"
+		},
+		"PowerLimitEnable": {
+			"text": "TELJH",
+			"text2": [
+				"Telj H",
+				"Bekapcsolva"
+			],
+			"desc": "Bemeneti teljesitmény korlátozása"
+		},
+		"PowerLimit": {
+			"text": "TELJM",
+			"text2": [
+				"Telj",
+				"maximum"
+			],
+			"desc": "Maximális teljesitmény beállitása <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "HÖVÁLT",
+			"text2": [
+				"GOMB +-",
+				"Felcseréled?"
+			],
+			"desc": "A páka hömérséklet növelés csökkentési gombok felcserélése."
+		},
+		"TempChangeShortStep": {
+			"text": "HÖRÖV",
+			"text2": [
+				"Hömérséklet",
+				"váltás rövid?"
+			],
+			"desc": "Hömérséklet váltás rövid gombnyomásrs bekapcsolva!"
+		},
+		"TempChangeLongStep": {
+			"text": "HÖHOS",
+			"text2": [
+				"Hömérséklet",
+				"váltás hosszú?"
+			],
+			"desc": "Hömérséklet váltás hosszú gombnyomásrs bekapcsolva!"
+		},
+		"PowerPulsePower":{
+			"text": "TELJP",
+			"text2": [
+				"Telj power",
+				"bank üzem W"
+			],
+			"desc": "Powerbank üzemnél nem engedi a powerbankot kikapcsolni idönkénti áram felvételt generál. "
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_it.json

@@ -16,18 +16,25 @@
 		"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": {
@@ -112,10 +119,10 @@
 		"AdvancedIdle": {
 			"text": "",
 			"text2": [
-				"Mostra",
+				"Interfaccia",
-				"dettagli"
+				"testuale"
 			],
-			"desc": "Mostra informazioni dettagliate con un carattere più piccolo all'interno della schermata principale"
+			"desc": "Mostra informazioni dettagliate all'interno della schermata principale"
 		},
 		"DisplayRotation": {
 			"text": "",
@@ -131,7 +138,7 @@
 				"Funzione",
 				"«Turbo»"
 			],
-			"desc": "Il tasto superiore attiva la funzione «Turbo» durante la modalità Saldatura"
+			"desc": "Attiva la funzione «Turbo», durante la modalità Saldatura, tenendo premuto il tasto superiore"
 		},
 		"BoostTemperature": {
 			"text": "",
@@ -155,7 +162,7 @@
 				"Avviso",
 				"punta calda"
 			],
-			"desc": "Mostra, lampeggiante, la temperatura durante il raffreddamento se la punta è ancora calda"
+			"desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda"
 		},
 		"TemperatureCalibration": {
 			"text": "",
@@ -201,7 +208,7 @@
 			"text": "TIPMO",
 			"text2": [
 				"Modello",
-				"della punta"
+				"punta"
 			],
 			"desc": "Seleziona il modello della punta in uso"
 		},
@@ -227,7 +234,63 @@
 				"Potenza",
 				"alimentaz"
 			],
-			"desc": "Imposta la potenza dell'alimentatore in uso"
+			"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Limitatore",
+				"di potenza"
+			],
+			"desc": "Abilita un limitatore per la potenza massima erogabile al saldatore"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Limite",
+				"di potenza"
+			],
+			"desc": "Imposta il valore di potenza massima erogabile al saldatore <watt>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Inversione",
+				"tasti"
+			],
+			"desc": "Inverti i tasti per impostare la temperatura della punta "
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Cambio temp",
+				"pressione breve"
+			],
+			"desc": "Varia la temperatura della punta attraverso una breve pressione dei tasti"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Cambio temp",
+				"pressione lunga"
+			],
+			"desc": "Varia la temperatura della punta attraverso una lunga pressione dei tasti"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_lt.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Nust:",
 		"TipDisconnectedString": "ANTGAL ATJUNGTAS",
 		"SolderingAdvancedPowerPrompt": "Maitinimas: ",
-		"OffString": "Išj"
+		"OffString": "Išj",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "K",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "T",
-		"SettingSlowChar": "N"
+		"SettingSlowChar": "N",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"vatais"
 			],
 			"desc": "Maitinimo bloko galia vatais"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_nl.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "TIP LOSGEKOPPELD",
 		"SolderingAdvancedPowerPrompt": "vermogen: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_nl_be.json

@@ -20,14 +20,19 @@
 		"IdleSetString": "Stel in:",
 		"TipDisconnectedString": "Punt ONTKOPPELD",
 		"SolderingAdvancedPowerPrompt": "Vermogen: ",
-		"OffString": "Uit"
+		"OffString": "Uit",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "S",
-		"SettingSlowChar": "T"
+		"SettingSlowChar": "T",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Watt"
 			],
 			"desc": "Vermogen van de adapter"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_no.json

@@ -20,14 +20,19 @@
 		"IdleSetString": "Set:",
 		"TipDisconnectedString": "SPISS FRAKOBLET",
 		"SolderingAdvancedPowerPrompt": "Effekt: ",
-		"OffString": "Av"
+		"OffString": "Av",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "H",
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "H",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "L",
+		"SettingStartSleepChar": "D",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "I"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_pl.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Ustaw:",
 		"TipDisconnectedString": "GROT ODŁĄCZONY",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Wyłącz"
+		"OffString": "Wyłącz",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "P",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "N"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Wattach"
 			],
 			"desc": "Moc używanego zasilacza w Watach"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_pt.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Aj:",
 		"TipDisconnectedString": "SEM PONTA",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "C",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "R",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Fonte"
 			],
 			"desc": "Potência da fonte usada (Watt)"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_ru.json

@@ -3,31 +3,38 @@
 	"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": {
@@ -40,194 +47,250 @@
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Режим",
+				"Режимы",
 				"сна"
 			],
-			"desc": "Параметры экономии энергии"
+			"desc": "Найстроки режима ожидания"
 		},
 		"UIMenu": {
 			"text2": [
-				"Пользовател",
+				"Параметры",
-				"интерфейс"
+				"интерфейса"
 			],
-			"desc": "Параметры пользовательского интерфейса"
+			"desc": "Найстройки пользовательского интерфейса"
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Дополнител.",
-				"параметры"
+				"найстройки"
 			],
-			"desc": "Дополнительные параметры"
+			"desc": "Дополнительные настройки"
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "ИстП",
+			"text": "ИстчнПит",
 			"text2": [
 				"Источник",
 				"питания"
 			],
-			"desc": "Источник питания. Установка напряжения отключения. <DC 10V> <S 3.3 V на батарею>"
+			"desc": "Источник питания. Устанавливает напряжение отсечки. <DC 10В> <S 3.3В на ячейку, без лимита мощности>"
 		},
 		"SleepTemperature": {
-			"text": "Тожд",
+			"text": "ТмпОжд",
 			"text2": [
-				"Темпер.",
+				"Темп.",
-				"сна"
+				"ожидания"
 			],
-			"desc": "Температура режима ожидания <С>"
+			"desc": "Температура режима ожидания"
 		},
 		"SleepTimeout": {
-			"text": "Вожд",
+			"text": "ВрмОжид",
 			"text2": [
 				"Таймаут",
-				"сна"
+				"ожидания"
 			],
-			"desc": "Время до перехода в режим ожидания <Минуты>"
+			"desc": "Время до перехода в режим ожидания <Минуты/Секунды>"
 		},
 		"ShutdownTimeout": {
-			"text": "Тоткл",
+			"text": "ВрмОткл",
 			"text2": [
-				"Время до",
+				"Таймаут",
-				"отключения"
+				"выключения"
 			],
-			"desc": "Время до отключения <Минуты>"
+			"desc": "Время до отключения паяльника <Минуты>"
 		},
 		"MotionSensitivity": {
-			"text": "ЧувсДв",
+			"text": "ЧувсАксл",
 			"text2": [
-				"Чувст. сенсо-",
+				"Чувствительн.",
-				"ра движения"
+				"акселерометра"
 			],
-			"desc": "Акселерометр <0. Выкл. 1. мин. чувствительный 9. макс. чувствительный>"
+			"desc": "Чувствительность акселерометра <0=Выкл., 1=Мин., 9=Макс.>"
 		},
 		"TemperatureUnit": {
 			"text": "ЕдТемп",
 			"text2": [
-				"Формат темпе-",
+				"Единицы",
-				"ратуры(C°/F°)"
+				"температуры"
 			],
-			"desc": "В чем измерять температуру"
+			"desc": "Единицы изменения температуры <C=Цельция, F=Фаренгейта>"
 		},
 		"AdvancedIdle": {
 			"text": "ИнфОжд",
 			"text2": [
-				"Подробный ре-",
+				"Подробный",
-				"жим ожидания"
+				"реж. ожидания"
 			],
-			"desc": "Показывать детальную информацию маленьким шрифтом на домашнем экране"
+			"desc": "Отображать детальную информацию уменьшенным шрифтом на домашнем экране"
 		},
 		"DisplayRotation": {
 			"text": "ПовЭкр",
 			"text2": [
-				"Автоповорот",
+				"Ориентация",
 				"экрана"
 			],
-			"desc": "Ориентация дисплея <A. Автоматический, Л. Левая рука, П. Правая рука>"
+			"desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>"
 		},
 		"BoostEnabled": {
-			"text": "Турбо",
+			"text": "Турб",
 			"text2": [
-				"Режим",
+				"Турбо",
-				"Турбо"
+				"режим"
 			],
-			"desc": "Турбо-режим при удержании кнопки А при пайке "
+			"desc": "Включить активацию турбо-режма, при удержании ближней к жалу кнопки во время пайки"
 		},
 		"BoostTemperature": {
-			"text": "Ттур",
+			"text": "ТемпТурб",
 			"text2": [
-				"Темпер.",
+				"t° турбо",
-				"Турбо"
+				"режима"
 			],
-			"desc": "Температура в турбо-режиме"
+			"desc": "Температура жала в турбо режиме"
 		},
 		"AutoStart": {
-			"text": "Астарт",
+			"text": "АвтоРеж",
 			"text2": [
-				"Горячий",
+				"Авто",
 				"старт"
 			],
-			"desc": "Автоматический запуск паяльника при включении питания. T=Нагрев, S=Режим ожидания,F=Выкл."
+			"desc": "Режим с которым запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>"
 		},
 		"CooldownBlink": {
-			"text": "Охлажд",
+			"text": "МигТемп",
 			"text2": [
-				"Показ t° при",
+				"Мигание t°",
-				"остывании"
+				"при остывании"
 			],
-			"desc": "Показывать температуру на экране охлаждения, пока жало остается горячим."
+			"desc": "Мигать температурой на экране охлаждения, пока жало еще горячее"
 		},
 		"TemperatureCalibration": {
-			"text": "КалибрТ",
+			"text": "КалТемп?",
 			"text2": [
 				"Калибровка",
 				"температуры"
 			],
-			"desc": "Калибровка термодатчика."
+			"desc": "Калибровка термодатчика жала"
 		},
 		"SettingsReset": {
-			"text": "СБРОС?",
+			"text": "Сброс?",
 			"text2": [
-				"Сбросить все",
+				"Сброс",
-				"настройки?"
+				"Настроек"
 			],
-			"desc": "Сброс всех настроек."
+			"desc": "Сброс настроек к значеням по-умолчанию"
 		},
 		"VoltageCalibration": {
-			"text": "КалибрU?",
+			"text": "КалНапр",
 			"text2": [
 				"Калибровка",
 				"напряжения"
 			],
-			"desc": "Калибровка напряжения входа. Настройка кнопками, нажать и удержать чтобы завершить."
+			"desc": "Калибровка входного напряжения <длинное нажатие для выхода>"
 		},
 		"AdvancedSoldering": {
-			"text": "ИнфПай",
+			"text": "ИнфПайк",
 			"text2": [
-				"Подробный ре-",
+				"Подробный",
-				"жим пайки"
+				"экран пайки"
 			],
-			"desc": "Показывать детальную информацию при пайке."
+			"desc": "Показывать детальную информацию на экране пайки"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
+			"text": "СкорТекс",
 			"text2": [
 				"Скорость",
 				"текста"
 			],
-			"desc": "Скорость прокрутки текста"
+			"desc": "Скорость прокрутки текста <М=медленно, Б=быстро>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
+			"text": "МодЖала",
 			"text2": [
 				"Модель",
-				"жало"
+				"жала"
 			],
-			"desc": "Выбор модели жало"
+			"desc": "Выбор модели жала"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
+			"text": "УпрКал",
 			"text2": [
-				"Простая",
+				"Упрощенная",
 				"калибровка"
 			],
-			"desc": "Простая калибровка с использованием горячей воды"
+			"desc": "Упрощенная калибровка с использованием горячей воды"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
+			"text": "УлучшКал",
 			"text2": [
-				"Подробная",
+				"Улучшенная",
 				"калибровка"
 			],
-			"desc": "Калибровка с помощью термопары"
+			"desc": "Улучшенная калибровка с импользованием термопары жала"
 		},
 		"PowerInput": {
-			"text": "PWRW",
+			"text": "МощнИст",
+			"text2": [
+				"Мощность",
+				"питания"
+			],
+			"desc": "Мощность используемого источника питания"
+		},
+		"PowerLimitEnable": {
+			"text": "ВклЛимW",
+			"text2": [
+				"Ограничение",
+				"мощности"
+			],
+			"desc": "Включить лимит потреблямой мощности"
+		},
+		"PowerLimit": {
+			"text": "ЗначЛимW",
+			"text2": [
+				"Максимальная",
+				"мощность"
+			],
+			"desc": "Максимальная мощность которую может использовать паяльник <Ватт>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "ИнвКноп",
+			"text2": [
+				"Инвертировать",
+				"кнопки"
+			],
+			"desc": "Инвертировать кнопки изменения температуры"
+		},
+		"TempChangeShortStep": {
+			"text": "ШагКорт",
+			"text2": [
+				"Шаг темп.",
+				"кор. наж."
+			],
+			"desc": "Шаг изменения температуры при коротком нажатии кнопок"
+		},
+		"TempChangeLongStep": {
+			"text": "ШагДлин",
+			"text2": [
+				"Шаг темп.",
+				"длин. наж."
+			],
+			"desc": "Шаг изменения температуры при длинном нажатии кнопок"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
 			"text2": [
 				"Power",
-				"Wattage"
+				"Pulse W"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Keep awake pulse power intensity"			
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_sk.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": false,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_sl.json

@@ -0,0 +1,295 @@
+{
+	"languageCode": "SL",
+	"languageLocalName": "Slovensko",
+	"cyrillicGlyphs": false,
+	"messages": {
+		"SettingsCalibrationDone": "Kalibracija opravljena!",
+		"SettingsCalibrationWarning": "Preden nadaljujete, mora biti konica na sobni temperaturi!",
+		"SettingsResetWarning": "Ste prepričani, da želite ponastaviti nastavitve na privzete vrednosti?",
+		"UVLOWarningString": "NIZKA U",
+		"UndervoltageString": "Nizka napetost",
+		"InputVoltageString": "Vhodna U: ",
+		"WarningTipTempString": "Temp. kon.: ",
+		"BadTipString": "OKVARA K",
+		"SleepingSimpleString": "Zzzz",
+		"SleepingAdvancedString": "Spim...",
+		"WarningSimpleString": "HOT!",
+		"WarningAdvancedString": "!!!VROČA KON.!!!",
+		"SleepingTipAdvancedString": "Knica:",
+		"IdleTipString": "Kon:",
+		"IdleSetString": " nst.:",
+		"TipDisconnectedString": "KONICA ODSTRANJ.",
+		"SolderingAdvancedPowerPrompt": "Moč: ",
+		"OffString": "Izk",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Ojačan.:"
+	},
+	"characters": {
+		"SettingRightChar": "D",
+		"SettingLeftChar": "L",
+		"SettingAutoChar": "S",
+		"SettingFastChar": "H",
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
+	},
+	"menuDouble": true,
+	"menuGroups": {
+		"SolderingMenu": {
+			"text2": [
+				"Nastavitve",
+				"spajkanja"
+			],
+			"desc": "Nastavitve spajkanja"
+		},
+		"PowerSavingMenu": {
+			"text2": [
+				"Načini",
+				"spanja"
+			],
+			"desc": "Nastavitve varčevanja z energijo"
+		},
+		"UIMenu": {
+			"text2": [
+				"Uporabniški",
+				"vmesnik"
+			],
+			"desc": "Nastavitve uporabniškega vmesnika"
+		},
+		"AdvancedMenu": {
+			"text2": [
+				"Napredne",
+				"možnosti"
+			],
+			"desc": "Napredne možnosti"
+		}
+	},
+	"menuOptions": {
+		"PowerSource": {
+			"text": "PWRSC",
+			"text2": [
+				"Vir",
+				"napajanja"
+			],
+			"desc": "Vir napajanja. Nastavi napetost izklopa. <DC 10V> <S 3.3V na celico>"
+		},
+		"SleepTemperature": {
+			"text": "STMP",
+			"text2": [
+				"Temp. med",
+				"spanjem"
+			],
+			"desc": "Temperatura med spanjem <C>"
+		},
+		"SleepTimeout": {
+			"text": "STME",
+			"text2": [
+				"Čas do",
+				"spanja"
+			],
+			"desc": "Čas pred spanjem <minute/sekunde>"
+		},
+		"ShutdownTimeout": {
+			"text": "SHTME",
+			"text2": [
+				"Čas do",
+				"izklopa"
+			],
+			"desc": "Čas pred izklopom <minute>"
+		},
+		"MotionSensitivity": {
+			"text": "MSENSE",
+			"text2": [
+				"Občutljivost",
+				"premikanja"
+			],
+			"desc": "Občutljivost premikanja <0.izklopljeno 1.najmanj 9.najbolj občutljivo>"
+		},
+		"TemperatureUnit": {
+			"text": "TMPUNT",
+			"text2": [
+				"Enota za",
+				"temperaturo"
+			],
+			"desc": "Enota za temperaturo <C=celzija F=fahrenheita>"
+		},
+		"AdvancedIdle": {
+			"text": "ADVIDL",
+			"text2": [
+				"Več info na",
+				"zaslonu v mir"
+			],
+			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med mirovanjem."
+		},
+		"DisplayRotation": {
+			"text": "DSPROT",
+			"text2": [
+				"Orientacija",
+				"zaslona"
+			],
+			"desc": "Orientacija zaslona <S. samodejno L. levo D. desno>"
+		},
+		"BoostEnabled": {
+			"text": "BOOST",
+			"text2": [
+				"Omogoči",
+				"boost mode"
+			],
+			"desc": "Omogoči, da tipka za naprej zagreje konico na 450C."
+		},
+		"BoostTemperature": {
+			"text": "BTMP",
+			"text2": [
+				"Temperat.",
+				"v boost"
+			],
+			"desc": "Temperatura v \"boost\" načinu"
+		},
+		"AutoStart": {
+			"text": "ASTART",
+			"text2": [
+				"Samodejni",
+				"zagon"
+			],
+			"desc": "Samodejno segrej konico ob vklopu. T=segrej, S=spanje, F=izklop"
+		},
+		"CooldownBlink": {
+			"text": "CLBLNK",
+			"text2": [
+				"Utripanje med",
+				"hlajenjem"
+			],
+			"desc": "Utripaj temperaturo med hlajenjem, ko je konica še vroča."
+		},
+		"TemperatureCalibration": {
+			"text": "TMP CAL?",
+			"text2": [
+				"Kalibriram",
+				"temperaturo?"
+			],
+			"desc": "Kalibracija temperature na konici."
+		},
+		"SettingsReset": {
+			"text": "RESET?",
+			"text2": [
+				"Tovarniške",
+				"nastavitve?"
+			],
+			"desc": "Ponastavitev vseh nastavitev"
+		},
+		"VoltageCalibration": {
+			"text": "CAL VIN?",
+			"text2": [
+				"Kalibriram",
+				"vhodno napetost?"
+			],
+			"desc": "Kalibracija VIN. Nastavitve z gumbi, dolgi pritisk za izhod."
+		},
+		"AdvancedSoldering": {
+			"text": "ADVSLD",
+			"text2": [
+				"Več info na",
+				"zaslonu spaj."
+			],
+			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
+		},
+		"ScrollingSpeed": {
+			"text": "DESCSP",
+			"text2": [
+				"Hitrost",
+				"besedila"
+			],
+			"desc": "Hitrost, s katero se prikazuje besedilo"
+		},
+		"TipModel": {
+			"text": "TIPMO",
+			"text2": [
+				"Model",
+				"konice"
+			],
+			"desc": "Izbira tipa konice"
+		},
+		"SimpleCalibrationMode": {
+			"text": "SMPCAL",
+			"text2": [
+				"Preprosta",
+				"kalibracija"
+			],
+			"desc": "Preprosta kalibracija z vročo vodo."
+		},
+		"AdvancedCalibrationMode": {
+			"text": "ADVCAL",
+			"text2": [
+				"Napredna",
+				"kalibracija"
+			],
+			"desc": "Napredna kalibracija s termočlenom na konici"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Moč napajalnega",
+				"vira"
+			],
+			"desc": "Moč v W napajalnega vira"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		}
+	}
+}

Translation Editor/translation_sr_cyrl.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
 		"SolderingAdvancedPowerPrompt": "Снага: ",
-		"OffString": "Иск"
+		"OffString": "Иск",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "Д",
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "А",
 		"SettingFastChar": "Б",
-		"SettingSlowChar": "С"
+		"SettingSlowChar": "С",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"снага"
 			],
 			"desc": "Снага напајања у ватима."
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_sr_latn.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "VRH NIJE SPOJEN",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
-		"OffString": "Isk"
+		"OffString": "Isk",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "B",
-		"SettingSlowChar": "S"
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"snaga"
 			],
 			"desc": "Snaga napajanja u vatima."
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_sv.json

@@ -20,14 +20,19 @@
 		"IdleSetString": " Ange:",
 		"TipDisconnectedString": "SPETS URTAGEN",
 		"SolderingAdvancedPowerPrompt": "Ström: ",
-		"OffString": "Av"
+		"OffString": "Av",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "H",
 		"SettingLeftChar": "V",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "S",
-		"SettingSlowChar": "L"
+		"SettingSlowChar": "L",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
@@ -228,6 +233,62 @@
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
-}
+}

Translation Editor/translation_tr.json

@@ -1,63 +1,68 @@
 {
 	"languageCode": "TR",
-	"languageLocalName": "Türk",
+	"languageLocalName": "Türkçe",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Kalibrasyon tamamlandı!",
 		"SettingsCalibrationWarning": "Lütfen devam etmeden önce ucun oda sıcaklığında olduğunu garantiye alın!",
-		"SettingsResetWarning": "Are you sure to reset settings to default values?",
+		"SettingsResetWarning": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz?",
 		"UVLOWarningString": "DC LOW",
-		"UndervoltageString": "Undervoltage",
+		"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": {
@@ -200,34 +205,90 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
+				"Uç",
-				"Model"
+				"Modeli"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Uç Modeli seçimi"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
+				"Basit",
-				"Calibration"
+				"Kalibrasyon"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Sıcak su kullanarak basit kalibrasyon"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Gelişmiş",
-				"Calibration"
+				"Kalibrasyon"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Uçtaki ısı sensörünü kullanarak gelişmiş kalibrasyon"
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
+				"Güç",
-				"Wattage"
+				"Miktarı(W)"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Kullanılan adaptörün güç miktarı"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Enable power limit"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Power",
+				"Limit"
+			],
+			"desc": "Maximum power the iron can use <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Key +-",
+				"reverse?"
+			],
+			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Temp change",
+				"short?"
+			],
+			"desc": "Temperature change steps on short button press!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Temp change",
+				"long?"
+			],
+			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translation_uk.json

@@ -3,7 +3,7 @@
 	"languageLocalName": "Українська",
 	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Калібрування виконане!",
 		"SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!",
 		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням?",
 		"UVLOWarningString": "АККУМ--",
@@ -20,28 +20,33 @@
 		"IdleSetString": " ->",
 		"TipDisconnectedString": "Жало вимкнено!",
 		"SolderingAdvancedPowerPrompt": "Живлення: ",
-		"OffString": "Вим"
+		"OffString": "Вимк",
+		"ResetOKMessage": "Reset OK"
 	},
 	"characters": {
-		"SettingRightChar": "R",
+		"SettingRightChar": "П",
-		"SettingLeftChar": "L",
+		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "+",
-		"SettingSlowChar": "-"
+		"SettingSlowChar": "-",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F"
 	},
 	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Пайка",
+				"Параметри",
-				""
+				"пайки"
 			],
 			"desc": "Налаштування для режиму пайки. Діють при включеному жалі."
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Сон",
+				"Режим",
-				""
+				"сну"
 			],
 			"desc": "Налаштування при бездіяльності. Корисно що б не обпектися і з часом не спалити житло."
 		},
@@ -50,24 +55,24 @@
 				"Інтерфейс",
 				""
 			],
-			"desc": "Користувальницький інтерфейс."
+			"desc": "Параметри користувальницького інтерфейсу."
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Інші",
+				"Додаткові",
-				""
+				"параметри"
 			],
 			"desc": "Розширені налаштування. Додаткові зручності."
 		}
 	},
 	"menuOptions": {
 		"PowerSource": {
-			"text": "",
+			"text": "ДжЖив",
 			"text2": [
 				"Джерело",
 				"живлення"
 			],
-			"desc": "Установка напруги відключення. <DC - 10V, 3S - 9.9V, 4S - 13.2V, 5S - 16.5V, 6S - 19.8V>"
+			"desc": "Встановлення напруги відключення. <DC - 10V, 3S - 9.9V, 4S - 13.2V, 5S - 16.5V, 6S - 19.8V>"
 		},
 		"SleepTemperature": {
 			"text": "",
@@ -80,10 +85,10 @@
 		"SleepTimeout": {
 			"text": "",
 			"text2": [
-				"Таймаут",
+				"Тайм-аут",
 				"сну"
 			],
-			"desc": "Час до переходу в режим очікування <Доступно отключение>"
+			"desc": "Час до переходу в режим очікування <Хвилини>"
 		},
 		"ShutdownTimeout": {
 			"text": "",
@@ -91,7 +96,7 @@
 				"Часу до",
 				"вимкнення"
 			],
-			"desc": "Час до відключення <Доступно відключення>"
+			"desc": "Час до відключення <Хвилини>"
 		},
 		"MotionSensitivity": {
 			"text": "",
@@ -99,7 +104,7 @@
 				"Чутл. сенсо-",
 				"ру руху"
 			],
-			"desc": "Акселерометр <0 - Викл. 1 хв. чутливості 9 - макс. чутливості>"
+			"desc": "Акселерометр <0 - Вимк. 1 хв. чутливості 9 - макс. чутливості>"
 		},
 		"TemperatureUnit": {
 			"text": "",
@@ -115,7 +120,7 @@
 				"Детальний ре-",
 				"жим очікуван."
 			],
-			"desc": "Показувати детальну в режимі налаштувань <Замість картинки>"
+			"desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
 		},
 		"DisplayRotation": {
 			"text": "",
@@ -123,7 +128,7 @@
 				"Автоповорот",
 				"екрану"
 			],
-			"desc": "Орієнтація дисплея <A - Автоповорот, L - Лівша, R - Правша>"
+			"desc": "Орієнтація дисплея <A - Автоповорот, Л - Лівша, П - Правша>"
 		},
 		"BoostEnabled": {
 			"text": "",
@@ -147,7 +152,7 @@
 				"Гарячий",
 				"старт"
 			],
-			"desc": "Автоматичний перехід в режим пайки при включенні живлення."
+			"desc": "Автоматичний перехід в режим пайки при ввімкнені живлення."
 		},
 		"CooldownBlink": {
 			"text": "",
@@ -171,13 +176,13 @@
 				"Скинути всі",
 				"налаштування?"
 			],
-			"desc": "Скидання всіх параметрів до вихідних значень."
+			"desc": "Скидання всіх параметрів до стандартних значень."
 		},
 		"VoltageCalibration": {
 			"text": "",
 			"text2": [
-				"Калібровка",
+				"Калібрування",
-				"напруга"
+				"напруги"
 			],
 			"desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
 		},
@@ -200,34 +205,90 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
+				"Модель",
-				"Model"
+				"Жало"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Вибір моделі жала"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
+				"Просте",
-				"Calibration"
+				"Калібрування"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Просте калібрування з використанням гарячої води"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
+				"Детальне",
-				"Calibration"
+				"Калібрування"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Калібрування за допомогою термопари"
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
+				"Потужність",
-				"Wattage"
+				"дж. живл."
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Потужність джерела живлення в Ватах"
+		},
+		"PowerLimitEnable": {
+			"text": "PLIMEN",
+			"text2": [
+				"Ліміт",
+				"потужності"
+			],
+			"desc": "Вмикає обмеження потужності споживання"
+		},
+		"PowerLimit": {
+			"text": "PLIM",
+			"text2": [
+				"Максимальна",
+				"потужність"
+			],
+			"desc": "Макс. потужність, яку може використовувати паяльник <Ват>"
+		},
+		"ReverseButtonTempChange": {
+			"text": "RVTCHG",
+			"text2": [
+				"Інвертувати",
+				"кнопки +-?"
+			],
+			"desc": "Інвертувати кнопки зміни температури."
+		},
+		"TempChangeShortStep": {
+			"text": "TCHGST",
+			"text2": [
+				"Зміна темп.",
+				"коротко?"
+			],
+			"desc": "Змінювати температуру при короткому натисканні!"
+		},
+		"TempChangeLongStep": {
+			"text": "TCHGLT",
+			"text2": [
+				"Зміна темп.",
+				"довго?"
+			],
+			"desc": "Змінювати температуру при довгому натисканні!"
+		},
+		"PowerPulsePower":{
+			"text": "POWPLS",
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text": "TG",
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
 		}
 	}
 }

Translation Editor/translations_def.js

@@ -1,232 +1,297 @@
-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": "BoostEnabled",
-			"maxLen": 8,
+			"maxLen": 6,
-			"maxLen2": 16
+			"maxLen2": 13
-		},
+		},
-		{
+		{
-			"id": "AdvancedSoldering",
+			"id": "BoostTemperature",
-			"maxLen": 6,
+			"maxLen": 4,
-			"maxLen2": 13
+			"maxLen2": 9
-		},
+		},
-		{
+		{
-			"id": "ScrollingSpeed",
+			"id": "AutoStart",
-			"maxLen": 6,
+			"maxLen": 6,
-			"maxLen2": 11
+			"maxLen2": 13
-		},
+		},
-		{
+		{
-			"id": "TipModel",
+			"id": "CooldownBlink",
-			"maxLen": 8,
+			"maxLen": 6,
-			"maxLen2": 16
+			"maxLen2": 13
-		},
+		},
-		{
+		{
-			"id": "SimpleCalibrationMode",
+			"id": "TemperatureCalibration",
-			"maxLen": 8,
+			"maxLen": 8,
-			"maxLen2": 16
+			"maxLen2": 16
-		},
+		},
-		{
+		{
-			"id": "AdvancedCalibrationMode",
+			"id": "SettingsReset",
-			"maxLen": 8,
+			"maxLen": 8,
-			"maxLen2": 16
+			"maxLen2": 16
-		},
+		},
-		{
+		{
-			"id": "PowerInput",
+			"id": "VoltageCalibration",
-			"maxLen": 8,
+			"maxLen": 8,
-			"maxLen2": 16
+			"maxLen2": 16
-		}
+		},
-	]
+		{
-}
+			"id": "AdvancedSoldering",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "ScrollingSpeed",
+			"maxLen": 6,
+			"maxLen2": 11
+		},
+		{
+			"id": "TipModel",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "SimpleCalibrationMode",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "AdvancedCalibrationMode",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "PowerInput",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "PowerLimitEnable",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "PowerLimit",
+			"maxLen": 5,
+			"maxLen2": 11
+		},
+		{
+			"id": "ReverseButtonTempChange",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "TempChangeShortStep",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "TempChangeLongStep",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "PowerPulsePower",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "TipGain",
+			"maxLen": 6,
+			"maxLen2": 8
+		}
+	]
+}

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.

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

codeship-services.yml

@@ -0,0 +1,8 @@
+builder:
+  build:
+    context: .
+    dockerfile: Dockerfile
+  cached: true
+  encrypted_env_file: ci/secrets/encrypted/deployment.encrypted
+  volumes:
+    - ./ci:/ci

codeship-steps.yml

@@ -0,0 +1,6 @@
+- type: parallel
+  name: Build the firmware
+  steps:
+    - name: build
+      service: builder
+      command: /build/ci/buildAll.sh

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.

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

menu.md

@@ -0,0 +1,77 @@
+# Menu System
+
+
+## Soldering mode
+
+In this mode the iron works as you would expect, pressing either button will take you to a temperature change screen.
+Use each button to go up and down in temperature. Pressing both buttons will exit you from the temperature menu (or wait 3 seconds and it will time out).
+Pressing both buttons or holding the button near the USB will exit the soldering mode.
+Holding the button at the front of the iron will enter boost mode (if enabled).
+
+## Settings Menu
+
+This menu allows you to cycle through all the options and set their values.
+The button near the USB cycles through the options, and the one near the tip changes the selected option.
+Note that settings are not saved until you exit the menu.
+If you leave the unit alone (ie don't press any buttons) on a setting, after 3 seconds the screen will scroll a rough description of the setting.
+
+The menu is arranged so that the most often used settings are first.
+With submenu's being selected to enter using the front button (as if you were going to change the setting).
+Scrolling through the submenu will return you back to its entry location after you scroll through all of the options.
+
+### Calibrating input voltage
+
+Due to the tolerance on the resistors used for the input voltage divider, some irons can be up to 0.6V out on the voltage measurement.
+Please calibrate your iron if you have any issues with the cutoff voltage.
+Note that cutoff messages can also be triggered by using a power supply that is too weak and fails under the load of the iron.
+This is more critical than before with the new cell count based cutout voltage.
+
+To calibrate your iron:
+
+1. Measure the input voltage with a multimeter and note it down.
+2. Connect the input to your iron.
+3. Enter the settings menu
+4. Under the advanced submenu
+5. Select the calibrate voltage option
+6. Use the front and back buttons to adjust the displayed voltage to minimize the error to your original measurement
+7. Hold both buttons to save and exit to the menu
+
+### Tip Model Selection
+
+The menu now lets you select which tip you are using with your iron. This lets the unit know which gain value to use for your tip, this varies slightly between models and can help with temperature accuracy.
+There is also an option for a *custom* tip. This basically means that you will tune the tip parameters yourself.
+
+### Calibrating tip offset (Set tip model)
+
+Some tips will have an offset on their readings, to calibrate this out perform the following steps:
+
+1. Connect power to your iron
+2. Make sure the tip is at room temperature (ie. wait for a fair while after using the iron before calibration)
+3. Enter the settings menu
+4. Scroll down to the advanced menu, and then the temperature calibration
+5. Press the button to change the option (tip button)
+6. The display will start to scroll a warning message to check that the tip is at ambient temperature!
+7. Press the button near the tip of the iron to confirm
+8. The display will go to "...." for a short period of time as the unit measures the tip temperature and the handle temperature and compares them
+9. The display will then go back to *TMP CAL*
+10. Calibration is done, just exit the settings menu as normal
+11. You're done, enjoy your iron!
+
+### Calibration of custom tip
+
+There are two methods to calibrate the tip, the simple mode which requires boiling water, and an advanced mode that requires a method of measuring the actual tip of the tip.
+
+Advanced mode is preffered.
+
+In simple mode you first need to have the tip at room temperature to start, and then when prompted place the tip into a cup of boiling water, wait a few seconds and then press a button to confirm.
+
+In advanced mode, follow instructions on the screen, you will need to adjust the ranges to find two calibration points by measuring the tip temperature directly. This tends to be significantly more accurate.
+
+If you do calibrate your own values for a tip because it's missing from the menu or because you think the one in the menu is really wrong, raise an issue on github and I'll be happy to look at adding it or revising the existing settings.
+
+
+### Boost mode
+
+This allows you to change the front key (one near the tip) to become a boost button when you hold it for > 2 seconds. This allows you to set this button to change the soldering temperature for short periods. For example when soldering a big joint and you want to boost the temperature a bit.
+
+The boost temperature is set in the settings menu.

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

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

workspace/TS100/Core/BSP/BSP_Flash.h

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

workspace/TS100/Core/BSP/BSP_Power.h

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

workspace/TS100/Core/BSP/BSP_QC.h

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

workspace/TS100/Core/BSP/Defines.h

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,6 +5,7 @@
  *      Author: Ben V. Brown
  */
 #include "Setup.h"
+#include "Pins.h"
 ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
@@ -32,13 +33,9 @@ static void MX_ADC2_Init(void);
 
 void Setup_HAL() {
 	SystemClock_Config();
-	#ifndef LOCAL_BUILD
+	__HAL_AFIO_REMAP_SWJ_DISABLE()
-__HAL_AFIO_REMAP_SWJ_DISABLE();
+	;
-	#else 
+
-__HAL_AFIO_REMAP_SWJ_NOJTAG();
-	#endif
-	
-	
 	MX_GPIO_Init();
 	MX_DMA_Init();
 	MX_I2C1_Init();
@@ -49,8 +46,8 @@ __HAL_AFIO_REMAP_SWJ_NOJTAG();
 	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
@@ -136,7 +133,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
@@ -197,11 +194,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
@@ -262,9 +258,9 @@ static void MX_TIM3_Init(void) {
 	htim3.Instance = TIM3;
 	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_ENABLE;
+	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;
@@ -279,7 +275,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);
@@ -291,11 +287,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
@@ -314,14 +311,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_ENABLE;
+	htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+	htim2.Init.RepetitionCounter = 0;
 	HAL_TIM_Base_Init(&htim2);
 
 	sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
@@ -335,7 +333,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
@@ -344,11 +343,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);

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/UnitSettings.h

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

workspace/TS100/Core/BSP/Miniware/Vendor/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h

@@ -1,238 +1,238 @@
-/**
+/**
-  ******************************************************************************
+  ******************************************************************************
-  * @file    stm32f1xx.h
+  * @file    stm32f1xx.h
-  * @author  MCD Application Team
+  * @author  MCD Application Team
-  * @version V4.2.0
+  * @version V4.2.0
-  * @date    31-March-2017
+  * @date    31-March-2017
-  * @brief   CMSIS STM32F1xx Device Peripheral Access Layer Header File. 
+  * @brief   CMSIS STM32F1xx Device Peripheral Access Layer Header File. 
-  *
+  *
-  *          The file is the unique include file that the application programmer
+  *          The file is the unique include file that the application programmer
-  *          is using in the C source code, usually in main.c. This file contains:
+  *          is using in the C source code, usually in main.c. This file contains:
-  *            - Configuration section that allows to select:
+  *            - Configuration section that allows to select:
-  *              - The STM32F1xx device used in the target application
+  *              - The STM32F1xx device used in the target application
-  *              - To use or not the peripheral’s drivers in application code(i.e. 
+  *              - To use or not the peripheral’s drivers in application code(i.e. 
-  *                code will be based on direct access to peripheral’s registers 
+  *                code will be based on direct access to peripheral’s registers 
-  *                rather than drivers API), this option is controlled by 
+  *                rather than drivers API), this option is controlled by 
-  *                "#define USE_HAL_DRIVER"
+  *                "#define USE_HAL_DRIVER"
-  *  
+  *  
-  ******************************************************************************
+  ******************************************************************************
-  * @attention
+  * @attention
-  *
+  *
-  * <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
+  * <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
-  *
+  *
-  * Redistribution and use in source and binary forms, with or without modification,
+  * Redistribution and use in source and binary forms, with or without modification,
-  * are permitted provided that the following conditions are met:
+  * are permitted provided that the following conditions are met:
-  *   1. Redistributions of source code must retain the above copyright notice,
+  *   1. Redistributions of source code must retain the above copyright notice,
-  *      this list of conditions and the following disclaimer.
+  *      this list of conditions and the following disclaimer.
-  *   2. Redistributions in binary form must reproduce the above copyright notice,
+  *   2. Redistributions in binary form must reproduce the above copyright notice,
-  *      this list of conditions and the following disclaimer in the documentation
+  *      this list of conditions and the following disclaimer in the documentation
-  *      and/or other materials provided with the distribution.
+  *      and/or other materials provided with the distribution.
-  *   3. Neither the name of STMicroelectronics nor the names of its contributors
+  *   3. Neither the name of STMicroelectronics nor the names of its contributors
-  *      may be used to endorse or promote products derived from this software
+  *      may be used to endorse or promote products derived from this software
-  *      without specific prior written permission.
+  *      without specific prior written permission.
-  *
+  *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  *
+  *
-  ******************************************************************************
+  ******************************************************************************
-  */
+  */
-
+
-/** @addtogroup CMSIS
+/** @addtogroup CMSIS
-  * @{
+  * @{
-  */
+  */
-
+
-/** @addtogroup stm32f1xx
+/** @addtogroup stm32f1xx
-  * @{
+  * @{
-  */
+  */
-    
+    
-#ifndef __STM32F1XX_H
+#ifndef __STM32F1XX_H
-#define __STM32F1XX_H
+#define __STM32F1XX_H
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
- extern "C" {
+ extern "C" {
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-  
+  
-/** @addtogroup Library_configuration_section
+/** @addtogroup Library_configuration_section
-  * @{
+  * @{
-  */
+  */
-
+
-/**
+/**
-  * @brief STM32 Family
+  * @brief STM32 Family
-  */
+  */
-#if !defined (STM32F1)
+#if !defined (STM32F1)
-#define STM32F1
+#define STM32F1
-#endif /* STM32F1 */
+#endif /* STM32F1 */
-
+
-/* Uncomment the line below according to the target STM32L device used in your 
+/* Uncomment the line below according to the target STM32L device used in your 
-   application 
+   application 
-  */
+  */
-
+
-#if !defined (STM32F100xB) && !defined (STM32F100xE) && !defined (STM32F101x6) && \
+#if !defined (STM32F100xB) && !defined (STM32F100xE) && !defined (STM32F101x6) && \
-    !defined (STM32F101xB) && !defined (STM32F101xE) && !defined (STM32F101xG) && !defined (STM32F102x6) && !defined (STM32F102xB) && !defined (STM32F103x6) && \
+    !defined (STM32F101xB) && !defined (STM32F101xE) && !defined (STM32F101xG) && !defined (STM32F102x6) && !defined (STM32F102xB) && !defined (STM32F103x6) && \
-    !defined (STM32F103xB) && !defined (STM32F103xE) && !defined (STM32F103xG) && !defined (STM32F105xC) && !defined (STM32F107xC)
+    !defined (STM32F103xB) && !defined (STM32F103xE) && !defined (STM32F103xG) && !defined (STM32F105xC) && !defined (STM32F107xC)
-  /* #define STM32F100xB  */   /*!< STM32F100C4, STM32F100R4, STM32F100C6, STM32F100R6, STM32F100C8, STM32F100R8, STM32F100V8, STM32F100CB, STM32F100RB and STM32F100VB */
+  /* #define STM32F100xB  */   /*!< STM32F100C4, STM32F100R4, STM32F100C6, STM32F100R6, STM32F100C8, STM32F100R8, STM32F100V8, STM32F100CB, STM32F100RB and STM32F100VB */
-  /* #define STM32F100xE */    /*!< STM32F100RC, STM32F100VC, STM32F100ZC, STM32F100RD, STM32F100VD, STM32F100ZD, STM32F100RE, STM32F100VE and STM32F100ZE */
+  /* #define STM32F100xE */    /*!< STM32F100RC, STM32F100VC, STM32F100ZC, STM32F100RD, STM32F100VD, STM32F100ZD, STM32F100RE, STM32F100VE and STM32F100ZE */
-  /* #define STM32F101x6  */   /*!< STM32F101C4, STM32F101R4, STM32F101T4, STM32F101C6, STM32F101R6 and STM32F101T6 Devices */
+  /* #define STM32F101x6  */   /*!< STM32F101C4, STM32F101R4, STM32F101T4, STM32F101C6, STM32F101R6 and STM32F101T6 Devices */
-  /* #define STM32F101xB  */   /*!< STM32F101C8, STM32F101R8, STM32F101T8, STM32F101V8, STM32F101CB, STM32F101RB, STM32F101TB and STM32F101VB */
+  /* #define STM32F101xB  */   /*!< STM32F101C8, STM32F101R8, STM32F101T8, STM32F101V8, STM32F101CB, STM32F101RB, STM32F101TB and STM32F101VB */
-  /* #define STM32F101xE */    /*!< STM32F101RC, STM32F101VC, STM32F101ZC, STM32F101RD, STM32F101VD, STM32F101ZD, STM32F101RE, STM32F101VE and STM32F101ZE */ 
+  /* #define STM32F101xE */    /*!< STM32F101RC, STM32F101VC, STM32F101ZC, STM32F101RD, STM32F101VD, STM32F101ZD, STM32F101RE, STM32F101VE and STM32F101ZE */ 
-  /* #define STM32F101xG  */   /*!< STM32F101RF, STM32F101VF, STM32F101ZF, STM32F101RG, STM32F101VG and STM32F101ZG */
+  /* #define STM32F101xG  */   /*!< STM32F101RF, STM32F101VF, STM32F101ZF, STM32F101RG, STM32F101VG and STM32F101ZG */
-  /* #define STM32F102x6 */    /*!< STM32F102C4, STM32F102R4, STM32F102C6 and STM32F102R6 */
+  /* #define STM32F102x6 */    /*!< STM32F102C4, STM32F102R4, STM32F102C6 and STM32F102R6 */
-  /* #define STM32F102xB  */   /*!< STM32F102C8, STM32F102R8, STM32F102CB and STM32F102RB */
+  /* #define STM32F102xB  */   /*!< STM32F102C8, STM32F102R8, STM32F102CB and STM32F102RB */
-  /* #define STM32F103x6  */   /*!< STM32F103C4, STM32F103R4, STM32F103T4, STM32F103C6, STM32F103R6 and STM32F103T6 */
+  /* #define STM32F103x6  */   /*!< STM32F103C4, STM32F103R4, STM32F103T4, STM32F103C6, STM32F103R6 and STM32F103T6 */
-  /* #define STM32F103xB  */   /*!< STM32F103C8, STM32F103R8, STM32F103T8, STM32F103V8, STM32F103CB, STM32F103RB, STM32F103TB and STM32F103VB */
+  /* #define STM32F103xB  */   /*!< STM32F103C8, STM32F103R8, STM32F103T8, STM32F103V8, STM32F103CB, STM32F103RB, STM32F103TB and STM32F103VB */
-  /* #define STM32F103xE */    /*!< STM32F103RC, STM32F103VC, STM32F103ZC, STM32F103RD, STM32F103VD, STM32F103ZD, STM32F103RE, STM32F103VE and STM32F103ZE */
+  /* #define STM32F103xE */    /*!< STM32F103RC, STM32F103VC, STM32F103ZC, STM32F103RD, STM32F103VD, STM32F103ZD, STM32F103RE, STM32F103VE and STM32F103ZE */
-  /* #define STM32F103xG  */   /*!< STM32F103RF, STM32F103VF, STM32F103ZF, STM32F103RG, STM32F103VG and STM32F103ZG */
+  /* #define STM32F103xG  */   /*!< STM32F103RF, STM32F103VF, STM32F103ZF, STM32F103RG, STM32F103VG and STM32F103ZG */
-  /* #define STM32F105xC */    /*!< STM32F105R8, STM32F105V8, STM32F105RB, STM32F105VB, STM32F105RC and STM32F105VC */
+  /* #define STM32F105xC */    /*!< STM32F105R8, STM32F105V8, STM32F105RB, STM32F105VB, STM32F105RC and STM32F105VC */
-  /* #define STM32F107xC  */   /*!< STM32F107RB, STM32F107VB, STM32F107RC and STM32F107VC */  
+  /* #define STM32F107xC  */   /*!< STM32F107RB, STM32F107VB, STM32F107RC and STM32F107VC */  
-#endif
+#endif
-
+
-/*  Tip: To avoid modifying this file each time you need to switch between these
+/*  Tip: To avoid modifying this file each time you need to switch between these
-        devices, you can define the device in your toolchain compiler preprocessor.
+        devices, you can define the device in your toolchain compiler preprocessor.
-  */
+  */
-  
+  
-#if !defined  (USE_HAL_DRIVER)
+#if !defined  (USE_HAL_DRIVER)
-/**
+/**
- * @brief Comment the line below if you will not use the peripherals drivers.
+ * @brief Comment the line below if you will not use the peripherals drivers.
-   In this case, these drivers will not be included and the application code will 
+   In this case, these drivers will not be included and the application code will 
-   be based on direct access to peripherals registers 
+   be based on direct access to peripherals registers 
-   */
+   */
-  /*#define USE_HAL_DRIVER */
+  /*#define USE_HAL_DRIVER */
-#endif /* USE_HAL_DRIVER */
+#endif /* USE_HAL_DRIVER */
-
+
-/**
+/**
-  * @brief CMSIS Device version number V4.2.0
+  * @brief CMSIS Device version number V4.2.0
-  */
+  */
-#define __STM32F1_CMSIS_VERSION_MAIN   (0x04) /*!< [31:24] main version */
+#define __STM32F1_CMSIS_VERSION_MAIN   (0x04) /*!< [31:24] main version */
-#define __STM32F1_CMSIS_VERSION_SUB1   (0x02) /*!< [23:16] sub1 version */
+#define __STM32F1_CMSIS_VERSION_SUB1   (0x02) /*!< [23:16] sub1 version */
-#define __STM32F1_CMSIS_VERSION_SUB2   (0x00) /*!< [15:8]  sub2 version */
+#define __STM32F1_CMSIS_VERSION_SUB2   (0x00) /*!< [15:8]  sub2 version */
-#define __STM32F1_CMSIS_VERSION_RC     (0x00) /*!< [7:0]  release candidate */ 
+#define __STM32F1_CMSIS_VERSION_RC     (0x00) /*!< [7:0]  release candidate */ 
-#define __STM32F1_CMSIS_VERSION        ((__STM32F1_CMSIS_VERSION_MAIN << 24)\
+#define __STM32F1_CMSIS_VERSION        ((__STM32F1_CMSIS_VERSION_MAIN << 24)\
-                                       |(__STM32F1_CMSIS_VERSION_SUB1 << 16)\
+                                       |(__STM32F1_CMSIS_VERSION_SUB1 << 16)\
-                                       |(__STM32F1_CMSIS_VERSION_SUB2 << 8 )\
+                                       |(__STM32F1_CMSIS_VERSION_SUB2 << 8 )\
-                                       |(__STM32F1_CMSIS_VERSION_RC))
+                                       |(__STM32F1_CMSIS_VERSION_RC))
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-/** @addtogroup Device_Included
+/** @addtogroup Device_Included
-  * @{
+  * @{
-  */
+  */
-
+
-#if defined(STM32F100xB)
+#if defined(STM32F100xB)
-  #include "stm32f100xb.h"
+  #include "stm32f100xb.h"
-#elif defined(STM32F100xE)
+#elif defined(STM32F100xE)
-  #include "stm32f100xe.h"
+  #include "stm32f100xe.h"
-#elif defined(STM32F101x6)
+#elif defined(STM32F101x6)
-  #include "stm32f101x6.h"
+  #include "stm32f101x6.h"
-#elif defined(STM32F101xB)
+#elif defined(STM32F101xB)
-  #include "stm32f101xb.h"
+  #include "stm32f101xb.h"
-#elif defined(STM32F101xE)
+#elif defined(STM32F101xE)
-  #include "stm32f101xe.h"
+  #include "stm32f101xe.h"
-#elif defined(STM32F101xG)
+#elif defined(STM32F101xG)
-  #include "stm32f101xg.h"
+  #include "stm32f101xg.h"
-#elif defined(STM32F102x6)
+#elif defined(STM32F102x6)
-  #include "stm32f102x6.h"
+  #include "stm32f102x6.h"
-#elif defined(STM32F102xB)
+#elif defined(STM32F102xB)
-  #include "stm32f102xb.h"
+  #include "stm32f102xb.h"
-#elif defined(STM32F103x6)
+#elif defined(STM32F103x6)
-  #include "stm32f103x6.h"
+  #include "stm32f103x6.h"
-#elif defined(STM32F103xB)
+#elif defined(STM32F103xB)
-  #include "stm32f103xb.h"
+  #include "stm32f103xb.h"
-#elif defined(STM32F103xE)
+#elif defined(STM32F103xE)
-  #include "stm32f103xe.h"
+  #include "stm32f103xe.h"
-#elif defined(STM32F103xG)
+#elif defined(STM32F103xG)
-  #include "stm32f103xg.h"
+  #include "stm32f103xg.h"
-#elif defined(STM32F105xC)
+#elif defined(STM32F105xC)
-  #include "stm32f105xc.h"
+  #include "stm32f105xc.h"
-#elif defined(STM32F107xC)
+#elif defined(STM32F107xC)
-  #include "stm32f107xc.h"
+  #include "stm32f107xc.h"
-#else
+#else
- #error "Please select first the target STM32F1xx device used in your application (in stm32f1xx.h file)"
+ #error "Please select first the target STM32F1xx device used in your application (in stm32f1xx.h file)"
-#endif
+#endif
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-/** @addtogroup Exported_types
+/** @addtogroup Exported_types
-  * @{
+  * @{
-  */  
+  */  
-typedef enum 
+typedef enum 
-{
+{
-  RESET = 0, 
+  RESET = 0, 
-  SET = !RESET
+  SET = !RESET
-} FlagStatus, ITStatus;
+} FlagStatus, ITStatus;
-
+
-typedef enum 
+typedef enum 
-{
+{
-  DISABLE = 0, 
+  DISABLE = 0, 
-  ENABLE = !DISABLE
+  ENABLE = !DISABLE
-} FunctionalState;
+} FunctionalState;
-#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
+#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
-
+
-typedef enum 
+typedef enum 
-{
+{
-  ERROR = 0, 
+  ERROR = 0, 
-  SUCCESS = !ERROR
+  SUCCESS = !ERROR
-} ErrorStatus;
+} ErrorStatus;
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-
+
-/** @addtogroup Exported_macros
+/** @addtogroup Exported_macros
-  * @{
+  * @{
-  */
+  */
-#define SET_BIT(REG, BIT)     ((REG) |= (BIT))
+#define SET_BIT(REG, BIT)     ((REG) |= (BIT))
-
+
-#define CLEAR_BIT(REG, BIT)   ((REG) &= ~(BIT))
+#define CLEAR_BIT(REG, BIT)   ((REG) &= ~(BIT))
-
+
-#define READ_BIT(REG, BIT)    ((REG) & (BIT))
+#define READ_BIT(REG, BIT)    ((REG) & (BIT))
-
+
-#define CLEAR_REG(REG)        ((REG) = (0x0))
+#define CLEAR_REG(REG)        ((REG) = (0x0))
-
+
-#define WRITE_REG(REG, VAL)   ((REG) = (VAL))
+#define WRITE_REG(REG, VAL)   ((REG) = (VAL))
-
+
-#define READ_REG(REG)         ((REG))
+#define READ_REG(REG)         ((REG))
-
+
-#define MODIFY_REG(REG, CLEARMASK, SETMASK)  WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK)))
+#define MODIFY_REG(REG, CLEARMASK, SETMASK)  WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK)))
-
+
-#define POSITION_VAL(VAL)     (__CLZ(__RBIT(VAL))) 
+#define POSITION_VAL(VAL)     (__CLZ(__RBIT(VAL))) 
-
+
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-#if defined (USE_HAL_DRIVER)
+#if defined (USE_HAL_DRIVER)
- #include "stm32f1xx_hal.h"
+ #include "stm32f1xx_hal.h"
-#endif /* USE_HAL_DRIVER */
+#endif /* USE_HAL_DRIVER */
-
+
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
-}
+}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-
+
-#endif /* __STM32F1xx_H */
+#endif /* __STM32F1xx_H */
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-  
+  
-
+
-
+
-
+
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

workspace/TS100/Core/BSP/Miniware/Vendor/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h

@@ -1,116 +1,116 @@
-/**
+/**
-  ******************************************************************************
+  ******************************************************************************
-  * @file    system_stm32f10x.h
+  * @file    system_stm32f10x.h
-  * @author  MCD Application Team
+  * @author  MCD Application Team
-  * @version V4.2.0
+  * @version V4.2.0
-  * @date    31-March-2017
+  * @date    31-March-2017
-  * @brief   CMSIS Cortex-M3 Device Peripheral Access Layer System Header File.
+  * @brief   CMSIS Cortex-M3 Device Peripheral Access Layer System Header File.
-  ******************************************************************************
+  ******************************************************************************
-  * @attention
+  * @attention
-  *
+  *
-  * <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
+  * <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
-  *
+  *
-  * Redistribution and use in source and binary forms, with or without modification,
+  * Redistribution and use in source and binary forms, with or without modification,
-  * are permitted provided that the following conditions are met:
+  * are permitted provided that the following conditions are met:
-  *   1. Redistributions of source code must retain the above copyright notice,
+  *   1. Redistributions of source code must retain the above copyright notice,
-  *      this list of conditions and the following disclaimer.
+  *      this list of conditions and the following disclaimer.
-  *   2. Redistributions in binary form must reproduce the above copyright notice,
+  *   2. Redistributions in binary form must reproduce the above copyright notice,
-  *      this list of conditions and the following disclaimer in the documentation
+  *      this list of conditions and the following disclaimer in the documentation
-  *      and/or other materials provided with the distribution.
+  *      and/or other materials provided with the distribution.
-  *   3. Neither the name of STMicroelectronics nor the names of its contributors
+  *   3. Neither the name of STMicroelectronics nor the names of its contributors
-  *      may be used to endorse or promote products derived from this software
+  *      may be used to endorse or promote products derived from this software
-  *      without specific prior written permission.
+  *      without specific prior written permission.
-  *
+  *
-  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+  * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  *
+  *
-  ******************************************************************************
+  ******************************************************************************
-  */
+  */
-
+
-/** @addtogroup CMSIS
+/** @addtogroup CMSIS
-  * @{
+  * @{
-  */
+  */
-
+
-/** @addtogroup stm32f10x_system
+/** @addtogroup stm32f10x_system
-  * @{
+  * @{
-  */  
+  */  
-  
+  
-/**
+/**
-  * @brief Define to prevent recursive inclusion
+  * @brief Define to prevent recursive inclusion
-  */
+  */
-#ifndef __SYSTEM_STM32F10X_H
+#ifndef __SYSTEM_STM32F10X_H
-#define __SYSTEM_STM32F10X_H
+#define __SYSTEM_STM32F10X_H
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
- extern "C" {
+ extern "C" {
-#endif 
+#endif 
-
+
-/** @addtogroup STM32F10x_System_Includes
+/** @addtogroup STM32F10x_System_Includes
-  * @{
+  * @{
-  */
+  */
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-
+
-/** @addtogroup STM32F10x_System_Exported_types
+/** @addtogroup STM32F10x_System_Exported_types
-  * @{
+  * @{
-  */
+  */
-
+
-extern uint32_t SystemCoreClock;          /*!< System Clock Frequency (Core Clock) */
+extern uint32_t SystemCoreClock;          /*!< System Clock Frequency (Core Clock) */
-extern const uint8_t  AHBPrescTable[16U];  /*!< AHB prescalers table values */
+extern const uint8_t  AHBPrescTable[16U];  /*!< AHB prescalers table values */
-extern const uint8_t  APBPrescTable[8U];   /*!< APB prescalers table values */
+extern const uint8_t  APBPrescTable[8U];   /*!< APB prescalers table values */
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-/** @addtogroup STM32F10x_System_Exported_Constants
+/** @addtogroup STM32F10x_System_Exported_Constants
-  * @{
+  * @{
-  */
+  */
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-/** @addtogroup STM32F10x_System_Exported_Macros
+/** @addtogroup STM32F10x_System_Exported_Macros
-  * @{
+  * @{
-  */
+  */
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-/** @addtogroup STM32F10x_System_Exported_Functions
+/** @addtogroup STM32F10x_System_Exported_Functions
-  * @{
+  * @{
-  */
+  */
-  
+  
-extern void SystemInit(void);
+extern void SystemInit(void);
-extern void SystemCoreClockUpdate(void);
+extern void SystemCoreClockUpdate(void);
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-
+
-#ifdef __cplusplus
+#ifdef __cplusplus
-}
+}
-#endif
+#endif
-
+
-#endif /*__SYSTEM_STM32F10X_H */
+#endif /*__SYSTEM_STM32F10X_H */
-
+
-/**
+/**
-  * @}
+  * @}
-  */
+  */
-  
+  
-/**
+/**
-  * @}
+  * @}
-  */  
+  */  
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

workspace/TS100/Core/BSP/Miniware/Vendor/CMSIS/Include/arm_common_tables.h

@@ -1,136 +1,136 @@
-/* ----------------------------------------------------------------------
+/* ----------------------------------------------------------------------
-* Copyright (C) 2010-2014 ARM Limited. All rights reserved.
+* Copyright (C) 2010-2014 ARM Limited. All rights reserved.
-*
+*
-* $Date:        19. October 2015
+* $Date:        19. October 2015
-* $Revision: 	V.1.4.5 a
+* $Revision: 	V.1.4.5 a
-*
+*
-* Project: 	    CMSIS DSP Library
+* Project: 	    CMSIS DSP Library
-* Title:	    arm_common_tables.h
+* Title:	    arm_common_tables.h
-*
+*
-* Description:	This file has extern declaration for common tables like Bitreverse, reciprocal etc which are used across different functions
+* Description:	This file has extern declaration for common tables like Bitreverse, reciprocal etc which are used across different functions
-*
+*
-* Target Processor: Cortex-M4/Cortex-M3
+* Target Processor: Cortex-M4/Cortex-M3
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
+* modification, are permitted provided that the following conditions
-* are met:
+* are met:
-*   - Redistributions of source code must retain the above copyright
+*   - Redistributions of source code must retain the above copyright
-*     notice, this list of conditions and the following disclaimer.
+*     notice, this list of conditions and the following disclaimer.
-*   - Redistributions in binary form must reproduce the above copyright
+*   - Redistributions in binary form must reproduce the above copyright
-*     notice, this list of conditions and the following disclaimer in
+*     notice, this list of conditions and the following disclaimer in
-*     the documentation and/or other materials provided with the
+*     the documentation and/or other materials provided with the
-*     distribution.
+*     distribution.
-*   - Neither the name of ARM LIMITED nor the names of its contributors
+*   - Neither the name of ARM LIMITED nor the names of its contributors
-*     may be used to endorse or promote products derived from this
+*     may be used to endorse or promote products derived from this
-*     software without specific prior written permission.
+*     software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
+* POSSIBILITY OF SUCH DAMAGE.
-* -------------------------------------------------------------------- */
+* -------------------------------------------------------------------- */
-
+
-#ifndef _ARM_COMMON_TABLES_H
+#ifndef _ARM_COMMON_TABLES_H
-#define _ARM_COMMON_TABLES_H
+#define _ARM_COMMON_TABLES_H
-
+
-#include "arm_math.h"
+#include "arm_math.h"
-
+
-extern const uint16_t armBitRevTable[1024];
+extern const uint16_t armBitRevTable[1024];
-extern const q15_t armRecipTableQ15[64];
+extern const q15_t armRecipTableQ15[64];
-extern const q31_t armRecipTableQ31[64];
+extern const q31_t armRecipTableQ31[64];
-/* extern const q31_t realCoefAQ31[1024]; */
+/* extern const q31_t realCoefAQ31[1024]; */
-/* extern const q31_t realCoefBQ31[1024]; */
+/* extern const q31_t realCoefBQ31[1024]; */
-extern const float32_t twiddleCoef_16[32];
+extern const float32_t twiddleCoef_16[32];
-extern const float32_t twiddleCoef_32[64];
+extern const float32_t twiddleCoef_32[64];
-extern const float32_t twiddleCoef_64[128];
+extern const float32_t twiddleCoef_64[128];
-extern const float32_t twiddleCoef_128[256];
+extern const float32_t twiddleCoef_128[256];
-extern const float32_t twiddleCoef_256[512];
+extern const float32_t twiddleCoef_256[512];
-extern const float32_t twiddleCoef_512[1024];
+extern const float32_t twiddleCoef_512[1024];
-extern const float32_t twiddleCoef_1024[2048];
+extern const float32_t twiddleCoef_1024[2048];
-extern const float32_t twiddleCoef_2048[4096];
+extern const float32_t twiddleCoef_2048[4096];
-extern const float32_t twiddleCoef_4096[8192];
+extern const float32_t twiddleCoef_4096[8192];
-#define twiddleCoef twiddleCoef_4096
+#define twiddleCoef twiddleCoef_4096
-extern const q31_t twiddleCoef_16_q31[24];
+extern const q31_t twiddleCoef_16_q31[24];
-extern const q31_t twiddleCoef_32_q31[48];
+extern const q31_t twiddleCoef_32_q31[48];
-extern const q31_t twiddleCoef_64_q31[96];
+extern const q31_t twiddleCoef_64_q31[96];
-extern const q31_t twiddleCoef_128_q31[192];
+extern const q31_t twiddleCoef_128_q31[192];
-extern const q31_t twiddleCoef_256_q31[384];
+extern const q31_t twiddleCoef_256_q31[384];
-extern const q31_t twiddleCoef_512_q31[768];
+extern const q31_t twiddleCoef_512_q31[768];
-extern const q31_t twiddleCoef_1024_q31[1536];
+extern const q31_t twiddleCoef_1024_q31[1536];
-extern const q31_t twiddleCoef_2048_q31[3072];
+extern const q31_t twiddleCoef_2048_q31[3072];
-extern const q31_t twiddleCoef_4096_q31[6144];
+extern const q31_t twiddleCoef_4096_q31[6144];
-extern const q15_t twiddleCoef_16_q15[24];
+extern const q15_t twiddleCoef_16_q15[24];
-extern const q15_t twiddleCoef_32_q15[48];
+extern const q15_t twiddleCoef_32_q15[48];
-extern const q15_t twiddleCoef_64_q15[96];
+extern const q15_t twiddleCoef_64_q15[96];
-extern const q15_t twiddleCoef_128_q15[192];
+extern const q15_t twiddleCoef_128_q15[192];
-extern const q15_t twiddleCoef_256_q15[384];
+extern const q15_t twiddleCoef_256_q15[384];
-extern const q15_t twiddleCoef_512_q15[768];
+extern const q15_t twiddleCoef_512_q15[768];
-extern const q15_t twiddleCoef_1024_q15[1536];
+extern const q15_t twiddleCoef_1024_q15[1536];
-extern const q15_t twiddleCoef_2048_q15[3072];
+extern const q15_t twiddleCoef_2048_q15[3072];
-extern const q15_t twiddleCoef_4096_q15[6144];
+extern const q15_t twiddleCoef_4096_q15[6144];
-extern const float32_t twiddleCoef_rfft_32[32];
+extern const float32_t twiddleCoef_rfft_32[32];
-extern const float32_t twiddleCoef_rfft_64[64];
+extern const float32_t twiddleCoef_rfft_64[64];
-extern const float32_t twiddleCoef_rfft_128[128];
+extern const float32_t twiddleCoef_rfft_128[128];
-extern const float32_t twiddleCoef_rfft_256[256];
+extern const float32_t twiddleCoef_rfft_256[256];
-extern const float32_t twiddleCoef_rfft_512[512];
+extern const float32_t twiddleCoef_rfft_512[512];
-extern const float32_t twiddleCoef_rfft_1024[1024];
+extern const float32_t twiddleCoef_rfft_1024[1024];
-extern const float32_t twiddleCoef_rfft_2048[2048];
+extern const float32_t twiddleCoef_rfft_2048[2048];
-extern const float32_t twiddleCoef_rfft_4096[4096];
+extern const float32_t twiddleCoef_rfft_4096[4096];
-
+
-
+
-/* floating-point bit reversal tables */
+/* floating-point bit reversal tables */
-#define ARMBITREVINDEXTABLE__16_TABLE_LENGTH ((uint16_t)20  )
+#define ARMBITREVINDEXTABLE__16_TABLE_LENGTH ((uint16_t)20  )
-#define ARMBITREVINDEXTABLE__32_TABLE_LENGTH ((uint16_t)48  )
+#define ARMBITREVINDEXTABLE__32_TABLE_LENGTH ((uint16_t)48  )
-#define ARMBITREVINDEXTABLE__64_TABLE_LENGTH ((uint16_t)56  )
+#define ARMBITREVINDEXTABLE__64_TABLE_LENGTH ((uint16_t)56  )
-#define ARMBITREVINDEXTABLE_128_TABLE_LENGTH ((uint16_t)208 )
+#define ARMBITREVINDEXTABLE_128_TABLE_LENGTH ((uint16_t)208 )
-#define ARMBITREVINDEXTABLE_256_TABLE_LENGTH ((uint16_t)440 )
+#define ARMBITREVINDEXTABLE_256_TABLE_LENGTH ((uint16_t)440 )
-#define ARMBITREVINDEXTABLE_512_TABLE_LENGTH ((uint16_t)448 )
+#define ARMBITREVINDEXTABLE_512_TABLE_LENGTH ((uint16_t)448 )
-#define ARMBITREVINDEXTABLE1024_TABLE_LENGTH ((uint16_t)1800)
+#define ARMBITREVINDEXTABLE1024_TABLE_LENGTH ((uint16_t)1800)
-#define ARMBITREVINDEXTABLE2048_TABLE_LENGTH ((uint16_t)3808)
+#define ARMBITREVINDEXTABLE2048_TABLE_LENGTH ((uint16_t)3808)
-#define ARMBITREVINDEXTABLE4096_TABLE_LENGTH ((uint16_t)4032)
+#define ARMBITREVINDEXTABLE4096_TABLE_LENGTH ((uint16_t)4032)
-
+
-extern const uint16_t armBitRevIndexTable16[ARMBITREVINDEXTABLE__16_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable16[ARMBITREVINDEXTABLE__16_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable32[ARMBITREVINDEXTABLE__32_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable32[ARMBITREVINDEXTABLE__32_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable64[ARMBITREVINDEXTABLE__64_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable64[ARMBITREVINDEXTABLE__64_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable128[ARMBITREVINDEXTABLE_128_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable128[ARMBITREVINDEXTABLE_128_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable256[ARMBITREVINDEXTABLE_256_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable256[ARMBITREVINDEXTABLE_256_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable512[ARMBITREVINDEXTABLE_512_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable512[ARMBITREVINDEXTABLE_512_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable1024[ARMBITREVINDEXTABLE1024_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable1024[ARMBITREVINDEXTABLE1024_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable2048[ARMBITREVINDEXTABLE2048_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable2048[ARMBITREVINDEXTABLE2048_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable4096[ARMBITREVINDEXTABLE4096_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable4096[ARMBITREVINDEXTABLE4096_TABLE_LENGTH];
-
+
-/* fixed-point bit reversal tables */
+/* fixed-point bit reversal tables */
-#define ARMBITREVINDEXTABLE_FIXED___16_TABLE_LENGTH ((uint16_t)12  )
+#define ARMBITREVINDEXTABLE_FIXED___16_TABLE_LENGTH ((uint16_t)12  )
-#define ARMBITREVINDEXTABLE_FIXED___32_TABLE_LENGTH ((uint16_t)24  )
+#define ARMBITREVINDEXTABLE_FIXED___32_TABLE_LENGTH ((uint16_t)24  )
-#define ARMBITREVINDEXTABLE_FIXED___64_TABLE_LENGTH ((uint16_t)56  )
+#define ARMBITREVINDEXTABLE_FIXED___64_TABLE_LENGTH ((uint16_t)56  )
-#define ARMBITREVINDEXTABLE_FIXED__128_TABLE_LENGTH ((uint16_t)112 )
+#define ARMBITREVINDEXTABLE_FIXED__128_TABLE_LENGTH ((uint16_t)112 )
-#define ARMBITREVINDEXTABLE_FIXED__256_TABLE_LENGTH ((uint16_t)240 )
+#define ARMBITREVINDEXTABLE_FIXED__256_TABLE_LENGTH ((uint16_t)240 )
-#define ARMBITREVINDEXTABLE_FIXED__512_TABLE_LENGTH ((uint16_t)480 )
+#define ARMBITREVINDEXTABLE_FIXED__512_TABLE_LENGTH ((uint16_t)480 )
-#define ARMBITREVINDEXTABLE_FIXED_1024_TABLE_LENGTH ((uint16_t)992 )
+#define ARMBITREVINDEXTABLE_FIXED_1024_TABLE_LENGTH ((uint16_t)992 )
-#define ARMBITREVINDEXTABLE_FIXED_2048_TABLE_LENGTH ((uint16_t)1984)
+#define ARMBITREVINDEXTABLE_FIXED_2048_TABLE_LENGTH ((uint16_t)1984)
-#define ARMBITREVINDEXTABLE_FIXED_4096_TABLE_LENGTH ((uint16_t)4032)
+#define ARMBITREVINDEXTABLE_FIXED_4096_TABLE_LENGTH ((uint16_t)4032)
-
+
-extern const uint16_t armBitRevIndexTable_fixed_16[ARMBITREVINDEXTABLE_FIXED___16_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable_fixed_16[ARMBITREVINDEXTABLE_FIXED___16_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable_fixed_32[ARMBITREVINDEXTABLE_FIXED___32_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable_fixed_32[ARMBITREVINDEXTABLE_FIXED___32_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable_fixed_64[ARMBITREVINDEXTABLE_FIXED___64_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable_fixed_64[ARMBITREVINDEXTABLE_FIXED___64_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable_fixed_128[ARMBITREVINDEXTABLE_FIXED__128_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable_fixed_128[ARMBITREVINDEXTABLE_FIXED__128_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable_fixed_256[ARMBITREVINDEXTABLE_FIXED__256_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable_fixed_256[ARMBITREVINDEXTABLE_FIXED__256_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable_fixed_512[ARMBITREVINDEXTABLE_FIXED__512_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable_fixed_512[ARMBITREVINDEXTABLE_FIXED__512_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable_fixed_1024[ARMBITREVINDEXTABLE_FIXED_1024_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable_fixed_1024[ARMBITREVINDEXTABLE_FIXED_1024_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable_fixed_2048[ARMBITREVINDEXTABLE_FIXED_2048_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable_fixed_2048[ARMBITREVINDEXTABLE_FIXED_2048_TABLE_LENGTH];
-extern const uint16_t armBitRevIndexTable_fixed_4096[ARMBITREVINDEXTABLE_FIXED_4096_TABLE_LENGTH];
+extern const uint16_t armBitRevIndexTable_fixed_4096[ARMBITREVINDEXTABLE_FIXED_4096_TABLE_LENGTH];
-
+
-/* Tables for Fast Math Sine and Cosine */
+/* Tables for Fast Math Sine and Cosine */
-extern const float32_t sinTable_f32[FAST_MATH_TABLE_SIZE + 1];
+extern const float32_t sinTable_f32[FAST_MATH_TABLE_SIZE + 1];
-extern const q31_t sinTable_q31[FAST_MATH_TABLE_SIZE + 1];
+extern const q31_t sinTable_q31[FAST_MATH_TABLE_SIZE + 1];
-extern const q15_t sinTable_q15[FAST_MATH_TABLE_SIZE + 1];
+extern const q15_t sinTable_q15[FAST_MATH_TABLE_SIZE + 1];
-
+
-#endif /*  ARM_COMMON_TABLES_H */
+#endif /*  ARM_COMMON_TABLES_H */

workspace/TS100/Core/BSP/Miniware/Vendor/CMSIS/Include/arm_const_structs.h

@@ -1,79 +1,79 @@
-/* ----------------------------------------------------------------------
+/* ----------------------------------------------------------------------
-* Copyright (C) 2010-2014 ARM Limited. All rights reserved.
+* Copyright (C) 2010-2014 ARM Limited. All rights reserved.
-*
+*
-* $Date:        19. March 2015
+* $Date:        19. March 2015
-* $Revision: 	V.1.4.5
+* $Revision: 	V.1.4.5
-*
+*
-* Project: 	    CMSIS DSP Library
+* Project: 	    CMSIS DSP Library
-* Title:	    arm_const_structs.h
+* Title:	    arm_const_structs.h
-*
+*
-* Description:	This file has constant structs that are initialized for
+* Description:	This file has constant structs that are initialized for
-*              user convenience.  For example, some can be given as
+*              user convenience.  For example, some can be given as
-*              arguments to the arm_cfft_f32() function.
+*              arguments to the arm_cfft_f32() function.
-*
+*
-* Target Processor: Cortex-M4/Cortex-M3
+* Target Processor: Cortex-M4/Cortex-M3
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
+* modification, are permitted provided that the following conditions
-* are met:
+* are met:
-*   - Redistributions of source code must retain the above copyright
+*   - Redistributions of source code must retain the above copyright
-*     notice, this list of conditions and the following disclaimer.
+*     notice, this list of conditions and the following disclaimer.
-*   - Redistributions in binary form must reproduce the above copyright
+*   - Redistributions in binary form must reproduce the above copyright
-*     notice, this list of conditions and the following disclaimer in
+*     notice, this list of conditions and the following disclaimer in
-*     the documentation and/or other materials provided with the
+*     the documentation and/or other materials provided with the
-*     distribution.
+*     distribution.
-*   - Neither the name of ARM LIMITED nor the names of its contributors
+*   - Neither the name of ARM LIMITED nor the names of its contributors
-*     may be used to endorse or promote products derived from this
+*     may be used to endorse or promote products derived from this
-*     software without specific prior written permission.
+*     software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
+* POSSIBILITY OF SUCH DAMAGE.
-* -------------------------------------------------------------------- */
+* -------------------------------------------------------------------- */
-
+
-#ifndef _ARM_CONST_STRUCTS_H
+#ifndef _ARM_CONST_STRUCTS_H
-#define _ARM_CONST_STRUCTS_H
+#define _ARM_CONST_STRUCTS_H
-
+
-#include "arm_math.h"
+#include "arm_math.h"
-#include "arm_common_tables.h"
+#include "arm_common_tables.h"
-
+
-   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len16;
+   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len16;
-   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len32;
+   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len32;
-   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len64;
+   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len64;
-   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len128;
+   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len128;
-   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len256;
+   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len256;
-   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len512;
+   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len512;
-   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len1024;
+   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len1024;
-   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len2048;
+   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len2048;
-   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len4096;
+   extern const arm_cfft_instance_f32 arm_cfft_sR_f32_len4096;
-
+
-   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len16;
+   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len16;
-   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len32;
+   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len32;
-   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len64;
+   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len64;
-   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len128;
+   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len128;
-   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len256;
+   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len256;
-   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len512;
+   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len512;
-   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len1024;
+   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len1024;
-   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len2048;
+   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len2048;
-   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len4096;
+   extern const arm_cfft_instance_q31 arm_cfft_sR_q31_len4096;
-
+
-   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len16;
+   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len16;
-   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len32;
+   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len32;
-   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len64;
+   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len64;
-   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len128;
+   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len128;
-   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len256;
+   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len256;
-   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len512;
+   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len512;
-   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len1024;
+   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len1024;
-   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len2048;
+   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len2048;
-   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len4096;
+   extern const arm_cfft_instance_q15 arm_cfft_sR_q15_len4096;
-
+
-#endif
+#endif