Merge pull request #535 from Ralim/feat/Settings-Reset-Should-Warn

Show warning message when settings are reset from a firmware update.
Update Translation.cpp
2025-02-26 07:53:55 +00:00 · 2019-12-28 12:36:42 +11:00 · 2019-12-28 12:00:44 +11:00 · 2019-12-28 12:00:34 +11:00 · 2019-12-28 12:00:26 +11:00 · 2019-12-28 12:00:18 +11:00
312 changed files with 109585 additions and 313663 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Ignore all differences in line endings
+*        -crlf
--- a/.gitignore
+++ b/.gitignore
@@ -1,51 +1,67 @@
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-*.d
-*.DS_Store
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-workspace/*.hex
-
-# Debug files
-*.dSYM/
-*.su
-workspace/ts100/Debug/*
-workspace/.metadata/*
-
-workspace/ts100/.settings/language.settings.xml
-workspace/ts100/.cproject
-TS100/KiCad/TS100.bak
-Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/
-Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
-workspace/ts100/ts100.xml
-workspace/ts100_old/*
-*.cache
-workspace/TS100/.settings/language.settings.xml
-workspace/TS100A/Release/TS100A.map
-workspace/TS100A/Release/TS100A.list
-workspace/TS100A/Release/TS100A.hex
-workspace/TS100A/.settings/language.settings.xml
-workspace/TS100A/.metadata/
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+*.d
+*.DS_Store
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+workspace/*.hex
+
+# Debug files
+*.dSYM/
+*.su
+workspace/ts100/Debug/*
+workspace/.metadata/*
+
+workspace/ts100/.settings/language.settings.xml
+workspace/ts100/.cproject
+TS100/KiCad/TS100.bak
+Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/
+Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
+workspace/ts100/ts100.xml
+workspace/ts100_old/*
+*.cache
+workspace/TS100/.settings/language.settings.xml
+workspace/TS100A/Release/TS100A.map
+workspace/TS100A/Release/TS100A.list
+workspace/TS100A/Release/TS100A.hex
+workspace/TS100A/.settings/language.settings.xml
+workspace/TS100A/.metadata/
+Translation Editor/.vscode/
+Translation Editor/__pycache__/
+*.pyc
+workspace/TS100/src/Translation.cpp
+*.lst
+*.mk
+*.list
+workspace/TS100/Release/
+workspace/TS100/Hexfile/
+workspace/RemoteSystemsTempFiles/
+workspace/TS100/.settings/
+workspace/TS100/TS80/
+ci/artefacts/
+ci/secrets/unencrypted/
+codeship.aes
+.vscode/settings.json
--- a/Logo/python_logo_converter/img2ts100.py
+++ b/Logo/python_logo_converter/img2ts100.py
@@ -8,7 +8,7 @@ import sys
 try:
    from PIL import Image, ImageOps
 except ImportError as error:
-    raise ImportError("{}: {} requres Python Imaging Library (PIL). " 
+    raise ImportError("{}: {} requres Python Imaging Library (PIL). "
                      "Install with `pip` or OS-specific package "
                      "management tool."
                      .format(error, sys.argv[0]))
@@ -32,29 +32,32 @@ def split16(word):
    return (word >> 8) & 0xff, word & 0xff


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

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

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


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

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

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

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


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

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

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

 V1.15

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

 V1.14

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

 V1.13

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

 V1.12

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

 V1.11

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

-V1.03 
+V1.03

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

 V1.02

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

 ***Steps to reproduce:***

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

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

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


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

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

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

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



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


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



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


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

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

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

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

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

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

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

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

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

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

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

 ## Setting a custom bootup image

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

-## New Menu System
+# Menu System

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

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

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

 ## Thanks

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

 ## Licence

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

 ## Commercial Use

-This software is provided as-is, so I cannot provide any commercial support for the firmware. However you are more than welcome to distribute links to the firmware, or provide irons with this software on them. 
-Please do not re-host the files, but rather link to this page, so that there are not old versions of the firmware scattered around. If this firmware does make you money, it would be nice to recieve a donation, however there is no enforcement.
+This software is provided as-is, so I cannot provide any commercial support for the firmware. However, you are more than welcome to distribute links to the firmware, or provide irons with this software on them.
+Please do not re-host the files, but rather link to this page, so that there are no old versions of the firmware scattered around. If this firmware does make you money, it would be nice to receive a donation, however, there is no enforcement.
--- a/Editor/fontTables.py
+++ b/Editor/fontTables.py
@@ -0,0 +1,844 @@
+#coding=utf-8
+def getFontMap():
+    font = {
+        " ":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,",
+        "!":"0x00,0x00,0x00,0x00,0x7C,0xFF,0xFF,0x7C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x33,0x00,0x00,0x00,0x00,0x00," ,
+        "\"":"0x00,0x00,0x00,0x3C,0x3C,0x00,0x00,0x3C,0x3C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,",
+        "#":"0x00,0x00,0x10,0x90,0xF0,0x7E,0x1E,0x90,0xF0,0x7E,0x1E,0x10,0x00,0x02,0x1E,0x1F,0x03,0x02,0x1E,0x1F,0x03,0x02,0x00,0x00," ,
+        "$":"0x00,0x00,0x78,0xFC,0xCC,0xFF,0xFF,0xCC,0xCC,0x88,0x00,0x00,0x00,0x00,0x04,0x0C,0x0C,0x3F,0x3F,0x0C,0x0F,0x07,0x00,0x00," ,
+        "%":"0x00,0x00,0x38,0x38,0x38,0x00,0x80,0xC0,0xE0,0x70,0x38,0x1C,0x00,0x30,0x38,0x1C,0x0E,0x07,0x03,0x01,0x38,0x38,0x38,0x00," ,
+        "&":"0x00,0x00,0x00,0xB8,0xFC,0xC6,0xE2,0x3E,0x1C,0x00,0x00,0x00,0x00,0x00,0x1F,0x3F,0x31,0x21,0x37,0x1E,0x1C,0x36,0x22,0x00," ,
+        "'":"0x00,0x00,0x00,0x00,0x27,0x3F,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "(":"0x00,0x00,0x00,0xF0,0xFC,0xFE,0x07,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x0F,0x1F,0x38,0x20,0x20,0x00,0x00,0x00," ,
+        "(":"0x00,0x00,0x00,0xF0,0xFC,0xFE,0x07,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x0F,0x1F,0x38,0x20,0x20,0x00,0x00,0x00," ,
+        ")":"0x00,0x00,0x00,0x01,0x01,0x07,0xFE,0xFC,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x38,0x1F,0x0F,0x03,0x00,0x00,0x00," ,
+        ")":"0x00,0x00,0x00,0x01,0x01,0x07,0xFE,0xFC,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x38,0x1F,0x0F,0x03,0x00,0x00,0x00," ,
+        "*":"0x00,0x00,0x98,0xB8,0xE0,0xF8,0xF8,0xE0,0xB8,0x98,0x00,0x00,0x00,0x00,0x0C,0x0E,0x03,0x0F,0x0F,0x03,0x0E,0x0C,0x00,0x00," ,
+        "+":"0x00,0x00,0x80,0x80,0x80,0xF0,0xF0,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x0F,0x0F,0x01,0x01,0x01,0x00,0x00," ,
+        ",":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xB8,0xF8,0x78,0x00,0x00,0x00,0x00,0x00," ,
+        "-":"0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00," ,
+        ".":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x38,0x38,0x38,0x00,0x00,0x00,0x00,0x00," ,
+        "/":"0x00,0x00,0x00,0x00,0x00,0x80,0xC0,0xE0,0x70,0x38,0x1C,0x0E,0x00,0x18,0x1C,0x0E,0x07,0x03,0x01,0x00,0x00,0x00,0x00,0x00," ,
+        "0":"0x00,0xF8,0xFE,0x06,0x03,0x83,0xC3,0x63,0x33,0x1E,0xFE,0xF8,0x00,0x07,0x1F,0x1E,0x33,0x31,0x30,0x30,0x30,0x18,0x1F,0x07," ,
+        "1":"0x00,0x00,0x00,0x0C,0x0C,0x0E,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x3F,0x3F,0x30,0x30,0x30,0x00," ,
+        "2":"0x00,0x1C,0x1E,0x07,0x03,0x03,0x83,0xC3,0xE3,0x77,0x3E,0x1C,0x00,0x30,0x38,0x3C,0x3E,0x37,0x33,0x31,0x30,0x30,0x30,0x30," ,
+        "3":"0x00,0x0C,0x0E,0x07,0xC3,0xC3,0xC3,0xC3,0xC3,0xE7,0x7E,0x3C,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0E," ,
+        "З":"0x00,0x0C,0x0E,0x07,0xC3,0xC3,0xC3,0xC3,0xC3,0xE7,0x7E,0x3C,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0E," ,
+        "4":"0x00,0xC0,0xE0,0x70,0x38,0x1C,0x0E,0x07,0xFF,0xFF,0x00,0x00,0x00,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x3F,0x3F,0x03,0x03," ,
+        "5":"0x00,0x3F,0x7F,0x63,0x63,0x63,0x63,0x63,0x63,0xE3,0xC3,0x83,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F," ,
+        "6":"0x00,0xC0,0xF0,0xF8,0xDC,0xCE,0xC7,0xC3,0xC3,0xC3,0x80,0x00,0x00,0x0F,0x1F,0x39,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F," ,
+        "7":"0x00,0x03,0x03,0x03,0x03,0x03,0x03,0xC3,0xF3,0x3F,0x0F,0x03,0x00,0x00,0x00,0x00,0x30,0x3C,0x0F,0x03,0x00,0x00,0x00,0x00," ,
+        "8":"0x00,0x00,0xBC,0xFE,0xE7,0xC3,0xC3,0xC3,0xE7,0xFE,0xBC,0x00,0x00,0x0F,0x1F,0x39,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F," ,
+        "9":"0x00,0x3C,0x7E,0xE7,0xC3,0xC3,0xC3,0xC3,0xC3,0xE7,0xFE,0xFC,0x00,0x00,0x00,0x30,0x30,0x30,0x38,0x1C,0x0E,0x07,0x03,0x00," ,
+        ":":"0x00,0x00,0x00,0x00,0x70,0x70,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x00,0x00,0x00,0x00,0x00," ,
+        ":":"0x00,0x00,0x00,0x00,0x70,0x70,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1C,0x1C,0x1C,0x00,0x00,0x00,0x00,0x00," ,
+        ";":"0x00,0x00,0x00,0x00,0x70,0x70,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x9C,0xFC,0x7C,0x00,0x00,0x00,0x00,0x00," ,
+        "<":"0x00,0x00,0xC0,0xE0,0xF0,0x38,0x1C,0x0E,0x07,0x03,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x30,0x00,0x00," ,
+        "=":"0x00,0x00,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x00,0x00,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x06,0x00," ,
+        ">":"0x00,0x00,0x03,0x07,0x0E,0x1C,0x38,0xF0,0xE0,0xC0,0x00,0x00,0x00,0x00,0x30,0x38,0x1C,0x0E,0x07,0x03,0x01,0x00,0x00,0x00," ,
+        "?":"0x00,0x1C,0x1E,0x07,0x03,0x83,0xC3,0xE3,0x77,0x3E,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x37,0x37,0x00,0x00,0x00,0x00,0x00," ,
+        "@":"0x00,0xF8,0xFE,0x07,0xF3,0xFB,0x1B,0xFB,0xFB,0x07,0xFE,0xF8,0x00,0x0F,0x1F,0x18,0x33,0x37,0x36,0x37,0x37,0x36,0x03,0x01," ,
+        "A":"0x00,0x00,0x00,0xE0,0xFC,0x1F,0x1F,0xFC,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x07,0x3F,0x38,0x00," ,
+        "А":"0x00,0x00,0x00,0xE0,0xFC,0x1F,0x1F,0xFC,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x07,0x3F,0x38,0x00," ,
+        "B":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xE7,0xFE,0xBC,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "C":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x03,0x07,0x0E,0x0C,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "D":"0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "E":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "E":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "F":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "G":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0xC3,0xC3,0xC3,0xC7,0xC6,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x30,0x3F,0x3F,0x00," ,
+        "H":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "I":"0x00,0x00,0x00,0x03,0x03,0xFF,0xFF,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "J":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x0E,0x1E,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "K":"0x00,0xFF,0xFF,0xC0,0xE0,0xF0,0x38,0x1C,0x0E,0x07,0x03,0x00,0x00,0x3F,0x3F,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x30,0x00," ,
+        "L":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "M":"0x00,0xFF,0xFF,0x1E,0x78,0xE0,0xE0,0x78,0x1E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x01,0x01,0x00,0x00,0x3F,0x3F,0x00," ,
+        "N":"0x00,0xFF,0xFF,0x0E,0x38,0xF0,0xC0,0x00,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x03,0x07,0x1C,0x3F,0x3F,0x00," ,
+        "O":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "P":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00," ,
+        "Р":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00," ,
+        "Q":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x36,0x3E,0x1C,0x3F,0x33,0x00," ,
+        "R":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0x03,0x07,0x0F,0x1D,0x38,0x30,0x00," ,
+        "S":"0x00,0x3C,0x7E,0xE7,0xC3,0xC3,0xC3,0xC3,0xC7,0x8E,0x0C,0x00,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "T":"0x00,0x00,0x03,0x03,0x03,0xFF,0xFF,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "U":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "V":"0x00,0x07,0x3F,0xF8,0xC0,0x00,0x00,0xC0,0xF8,0x3F,0x07,0x00,0x00,0x00,0x00,0x01,0x0F,0x3E,0x3E,0x0F,0x01,0x00,0x00,0x00," ,
+        "W":"0x00,0xFF,0xFF,0x00,0x00,0x80,0x80,0x00,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x1C,0x06,0x03,0x03,0x06,0x1C,0x3F,0x3F,0x00," ,
+        "X":"0x00,0x03,0x0F,0x1C,0x30,0xE0,0xE0,0x30,0x1C,0x0F,0x03,0x00,0x00,0x30,0x3C,0x0E,0x03,0x01,0x01,0x03,0x0E,0x3C,0x30,0x00," ,
+        "Y":"0x00,0x03,0x0F,0x3C,0xF0,0xC0,0xC0,0xF0,0x3C,0x0F,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "Z":"0x00,0x03,0x03,0x03,0x03,0xC3,0xE3,0x33,0x1F,0x0F,0x03,0x00,0x00,0x30,0x3C,0x3E,0x33,0x31,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "Z":"0x00,0x03,0x03,0x03,0x03,0xC3,0xE3,0x33,0x1F,0x0F,0x03,0x00,0x00,0x30,0x3C,0x3E,0x33,0x31,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "[":"0x00,0x00,0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x00,0x00,0x00," ,
+        "\\":"0x00,0x0E,0x1C,0x38,0x70,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0E,0x1C,0x18,",  
+        "\\":"0x00,0x0E,0x1C,0x38,0x70,0xE0,0xC0,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x07,0x0E,0x1C,0x18,",  
+        "]":"0x00,0x00,0x00,0x03,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x30,0x30,0x3F,0x3F,0x00,0x00,0x00," ,
+        "^":"0x00,0x60,0x70,0x38,0x1C,0x0E,0x07,0x0E,0x1C,0x38,0x70,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "_":"0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0," ,
+        "`":"0x00,0x00,0x00,0x00,0x00,0x3E,0x7E,0x4E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "a":"0x00,0x00,0x40,0x60,0x60,0x60,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "b":"0x00,0xFF,0xFF,0xC0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "c":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "d":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0xE0,0xC0,0xFF,0xFF,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x3F,0x3F,0x00," ,
+        "e":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "f":"0x00,0xC0,0xC0,0xFC,0xFE,0xC7,0xC3,0xC3,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "g":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "h":"0x00,0xFF,0xFF,0xC0,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00," ,
+        "i":"0x00,0x00,0x00,0x00,0x60,0xEC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "j":"0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xEC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xE0,0xC0,0xC0,0xFF,0x7F,0x00,0x00,0x00," ,
+        "k":"0x00,0x00,0xFF,0xFF,0x00,0x80,0xC0,0xE0,0x60,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x03,0x07,0x0F,0x1C,0x38,0x30,0x00,0x00," ,
+        "l":"0x00,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "m":"0x00,0xE0,0xC0,0xE0,0xE0,0xC0,0xC0,0xE0,0xE0,0xC0,0x80,0x00,0x00,0x3F,0x3F,0x00,0x00,0x3F,0x3F,0x00,0x00,0x3F,0x3F,0x00," ,
+        "n":"0x00,0x00,0xE0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "o":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "p":"0x00,0xE0,0xE0,0x60,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0xFF,0xFF,0x0C,0x18,0x18,0x18,0x18,0x1C,0x0F,0x07,0x00," ,
+        "q":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xE0,0xE0,0x00,0x00,0x07,0x0F,0x1C,0x18,0x18,0x18,0x18,0x0C,0xFF,0xFF,0x00," ,
+        "r":"0x00,0x00,0xE0,0xE0,0xC0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "s":"0x00,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "t":"0x00,0x60,0x60,0xFE,0xFE,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x3F,0x30,0x30,0x30,0x30,0x00,0x00,0x00," ,
+        "u":"0x00,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "v":"0x00,0x60,0xE0,0x80,0x00,0x00,0x00,0x00,0x80,0xE0,0x60,0x00,0x00,0x00,0x01,0x07,0x1E,0x38,0x38,0x1E,0x07,0x01,0x00,0x00," ,
+        "w":"0x00,0xE0,0xE0,0x00,0x00,0xE0,0xE0,0x00,0x00,0xE0,0xE0,0x00,0x00,0x07,0x1F,0x38,0x1C,0x0F,0x0F,0x1C,0x38,0x1F,0x07,0x00," ,
+        "x":"0x00,0x60,0xE0,0xC0,0x80,0x00,0x80,0xC0,0xE0,0x60,0x00,0x00,0x00,0x30,0x38,0x1D,0x0F,0x07,0x0F,0x1D,0x38,0x30,0x00,0x00," ,
+        "y":"0x00,0x00,0x60,0xE0,0x80,0x00,0x00,0x80,0xE0,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00," ,
+        "z":"0x00,0x60,0x60,0x60,0x60,0x60,0xE0,0xE0,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "z":"0x00,0x60,0x60,0x60,0x60,0x60,0xE0,0xE0,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "{":"0x00,0x00,0x80,0xC0,0xFC,0x7E,0x07,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x01,0x1F,0x3F,0x70,0x60,0x60,0x60,0x00,0x00," ,
+        "|":"0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "}":"0x00,0x00,0x03,0x03,0x03,0x07,0x7E,0xFC,0xC0,0x80,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x70,0x3F,0x1F,0x01,0x00,0x00,0x00," ,
+        "~":"0x00,0x10,0x18,0x0C,0x04,0x0C,0x18,0x10,0x18,0x0C,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "¡":"0x00,0x00,0x00,0x00,0x80,0xF3,0xF3,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0F,0x3F,0x3F,0x0F,0x00,0x00,0x00,0x00," ,
+        "¢":"0x00,0x00,0xE0,0xF0,0x38,0xFE,0xFE,0x18,0x38,0x30,0x00,0x00,0x00,0x00,0x03,0x07,0x0E,0x3F,0x3F,0x0C,0x0E,0x06,0x00,0x00," ,
+        "£":"0x00,0x00,0x00,0x80,0xF8,0xFC,0x8C,0x8C,0x1C,0x18,0x00,0x00,0x00,0x00,0x18,0x1C,0x1F,0x0B,0x18,0x18,0x18,0x18,0x08,0x00," ,
+        "¤":"0x00,0xF6,0xFE,0x18,0x0C,0x0C,0x0C,0x0C,0x18,0xFE,0xF6,0x00,0x00,0x1B,0x1F,0x06,0x0C,0x0C,0x0C,0x0C,0x06,0x1F,0x1B,0x00," ,
+        "¥":"0x00,0x03,0x0F,0x3C,0xF0,0xC0,0xC0,0xF0,0x3C,0x0F,0x03,0x00,0x00,0x00,0x0A,0x0A,0x0A,0x3F,0x3F,0x0A,0x0A,0x0A,0x00,0x00," ,
+        "¦":"0x00,0x00,0x00,0x00,0x00,0x1F,0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "§":"0x00,0x00,0xDC,0xFE,0x22,0x22,0x22,0x22,0xE6,0xC4,0x00,0x00,0x00,0x00,0x08,0x19,0x11,0x11,0x11,0x11,0x1F,0x0E,0x00,0x00," ,
+        "¨":"0x00,0x00,0x00,0x03,0x03,0x00,0x00,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "©":"0x00,0xF0,0xF8,0x1C,0xCC,0xEC,0x2C,0x6C,0x4C,0x1C,0xF8,0xF0,0x00,0x07,0x0F,0x1C,0x19,0x1B,0x1A,0x1B,0x19,0x1C,0x0F,0x07," ,
+        "«":"0x00,0x80,0xC0,0x60,0x20,0x00,0x80,0xC0,0x60,0x20,0x00,0x00,0x00,0x00,0x01,0x03,0x02,0x00,0x00,0x01,0x03,0x02,0x00,0x00," ,
+        "¬":"0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0xF8,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x00," ,
+        "®":"0x00,0xF0,0xF8,0x1C,0xEC,0xEC,0xAC,0xEC,0x4C,0x1C,0xF8,0xF0,0x00,0x07,0x0F,0x1C,0x1B,0x1B,0x18,0x1B,0x1B,0x1C,0x0F,0x07," ,
+        "¯":"0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x0C,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "°":"0x00,0x00,0x00,0x1E,0x3F,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "±":"0x00,0x00,0x00,0xC0,0xC0,0xF0,0xF0,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x1B,0x1B,0x18,0x18,0x00,0x00,0x00," ,
+        "²":"0x00,0x00,0x19,0x1D,0x15,0x17,0x12,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "³":"0x00,0x00,0x11,0x15,0x15,0x1F,0x0A,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "´":"0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "µ":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x00,0xFF,0xFF,0x0E,0x0C,0x0C,0x0C,0x06,0x0F,0x0F,0x00,0x00," ,
+        "¶":"0x00,0x38,0x7C,0xC6,0x82,0xFE,0xFE,0x02,0xFE,0xFE,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x3F,0x3F,0x00,0x00," ,
+        "¹":"0x00,0x00,0x12,0x1F,0x1F,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "»":"0x00,0x20,0x60,0xC0,0x80,0x00,0x20,0x60,0xC0,0x80,0x00,0x00,0x00,0x02,0x03,0x01,0x00,0x00,0x02,0x03,0x01,0x00,0x00,0x00," ,
+        "¼":"0x00,0x48,0x7C,0x7C,0x40,0x80,0xC0,0x60,0x30,0x10,0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x06,0x07,0x04,0x1F,0x1F,0x00," ,
+        "½":"0x00,0x48,0x7C,0x7C,0x40,0x80,0xC0,0x60,0x30,0x10,0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x00,0x19,0x1D,0x17,0x12,0x00," ,
+        "¾":"0x00,0x44,0x54,0x7C,0x28,0x80,0xC0,0x60,0x30,0x10,0x00,0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x06,0x07,0x04,0x1F,0x1F,0x00," ,
+        "¿":"0x00,0x00,0x00,0x80,0xC0,0xFB,0x7B,0x00,0x00,0x00,0x00,0x00,0x00,0x0E,0x1F,0x3B,0x31,0x30,0x30,0x30,0x38,0x1E,0x0E,0x00," ,
+        "À":"0x00,0x00,0x00,0x80,0xE1,0x7B,0x7E,0xE4,0x80,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Á":"0x00,0x00,0x00,0x80,0xE4,0x7E,0x7B,0xE1,0x80,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Â":"0x00,0x00,0x00,0x84,0xE6,0x7B,0x7B,0xE6,0x84,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Ã":"0x00,0x00,0x00,0x82,0xE3,0x79,0x7B,0xE2,0x83,0x01,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Ä":"0x00,0x00,0x00,0x83,0xE3,0x78,0x78,0xE3,0x83,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Å":"0x00,0x00,0x00,0x80,0xE2,0x75,0x75,0xE2,0x80,0x00,0x00,0x00,0x00,0x38,0x3E,0x0F,0x0D,0x0C,0x0C,0x0D,0x0F,0x3E,0x38,0x00," ,
+        "Æ":"0x00,0x00,0x80,0xF0,0x7C,0x1F,0xFF,0xFF,0xC3,0xC3,0x03,0x00,0x00,0x3C,0x3F,0x07,0x06,0x06,0x3F,0x3F,0x30,0x30,0x30,0x00," ,
+        "Ç":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x03,0x07,0x1E,0x1C,0x00,0x00,0x01,0x07,0xCE,0xDC,0xF8,0xF8,0x18,0x1C,0x0E,0x06,0x00," ,
+        "È":"0x00,0xF8,0xF8,0x99,0x9B,0x9E,0x9C,0x98,0x98,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "É":"0x00,0xF8,0xF8,0x98,0x98,0x9C,0x9E,0x9B,0x99,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "Ê":"0x00,0xF8,0xF8,0x9C,0x9E,0x9B,0x9B,0x9E,0x9C,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "Ë":"0x00,0xF8,0xF8,0x9B,0x9B,0x98,0x98,0x9B,0x9B,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "Ì":"0x00,0x00,0x00,0x19,0x1B,0xFE,0xFC,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Í":"0x00,0x00,0x00,0x18,0x18,0xFC,0xFE,0x1B,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Î":"0x00,0x00,0x00,0x1C,0x1E,0xFB,0xFB,0x1E,0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ï":"0x00,0x00,0x00,0x1B,0x1B,0xF8,0xF8,0x1B,0x1B,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ð":"0x00,0xC0,0xFF,0xFF,0xC3,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "Ñ":"0x00,0xF8,0xF8,0x72,0xE3,0xC1,0x83,0x02,0x03,0xF9,0xF8,0x00,0x00,0x3F,0x3F,0x00,0x00,0x01,0x03,0x07,0x0E,0x3F,0x3F,0x00," ,
+        "Ò":"0x00,0xE0,0xF0,0x39,0x1B,0x1E,0x1C,0x18,0x38,0xF0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ó":"0x00,0xE0,0xF0,0x38,0x18,0x1C,0x1E,0x1B,0x39,0xF0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ô":"0x00,0xE0,0xF0,0x3C,0x1E,0x1B,0x1B,0x1E,0x3C,0xF0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Õ":"0x00,0xE0,0xF0,0x3A,0x1B,0x19,0x1B,0x1A,0x3B,0xF1,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ö":"0x00,0xE0,0xF0,0x3B,0x1B,0x18,0x18,0x1B,0x3B,0xF0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "×":"0x00,0xF0,0xF8,0x1C,0x0C,0x8C,0xEC,0x7C,0x18,0xFC,0xF4,0x00,0x00,0x2F,0x3F,0x18,0x3E,0x37,0x31,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ù":"0x00,0xF8,0xF8,0x01,0x03,0x06,0x04,0x00,0x00,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "Ú":"0x00,0xF8,0xF8,0x00,0x00,0x04,0x06,0x03,0x01,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "Û":"0x00,0xF8,0xF8,0x04,0x06,0x03,0x03,0x06,0x04,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "Ü":"0x00,0xF8,0xF8,0x03,0x03,0x00,0x00,0x03,0x03,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "Ý":"0x00,0x08,0x18,0x30,0x60,0xC4,0xC6,0x63,0x31,0x18,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "ß":"0x00,0x00,0xC0,0xE0,0x30,0x10,0x10,0x30,0xE0,0xC0,0x00,0x00,0x00,0x00,0xFF,0xFF,0x21,0x21,0x21,0x33,0x3F,0x1E,0x00,0x00," ,
+        "à":"0x00,0x00,0x40,0x60,0x62,0x66,0x6C,0x68,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "á":"0x00,0x00,0x40,0x60,0x68,0x6C,0x66,0x62,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "â":"0x00,0x00,0x40,0x68,0x6C,0x66,0x66,0x6C,0x68,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ã":"0x00,0x00,0x40,0x68,0x6C,0x64,0x6C,0x68,0x6C,0xE4,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ä":"0x00,0x00,0x40,0x6C,0x6C,0x60,0x60,0x6C,0x6C,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "å":"0x00,0x00,0x40,0x60,0x64,0x6A,0x6A,0x64,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "æ":"0x00,0x80,0xC0,0x40,0x40,0xC0,0x80,0x40,0x40,0xC0,0x80,0x00,0x00,0x1C,0x3E,0x22,0x22,0x1F,0x3F,0x22,0x22,0x33,0x11,0x00," ,
+        "ç":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0xB8,0xB0,0xF0,0xF0,0x30,0x38,0x18,0x08,0x00," ,
+        "è":"0x00,0x80,0xC0,0xE0,0x62,0x66,0x6C,0x68,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x33,0x33,0x33,0x33,0x33,0x33,0x13,0x03,0x00," ,
+        "é":"0x00,0x80,0xC0,0xE0,0x60,0x68,0x6C,0x66,0x62,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x03,0x00," ,
+        "ê":"0x00,0x80,0xC0,0xE8,0x6C,0x66,0x66,0x6C,0x68,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x33,0x33,0x33,0x33,0x33,0x33,0x13,0x03,0x00," ,
+        "ë":"0x00,0x80,0xC0,0xEC,0x6C,0x60,0x60,0x6C,0x6C,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x33,0x33,0x33,0x33,0x33,0x33,0x13,0x03,0x00," ,
+        "ì":"0x00,0x00,0x00,0x00,0x62,0xE6,0xEC,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "í":"0x00,0x00,0x00,0x00,0x68,0xEC,0xE6,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "î":"0x00,0x00,0x00,0x08,0x6C,0xE6,0xE6,0x0C,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ï":"0x00,0x00,0x00,0x0C,0x6C,0xE0,0xEC,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ñ":"0x00,0x00,0xE0,0xE8,0x6C,0x64,0x6C,0x68,0xEC,0xC4,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "ò":"0x00,0x80,0xC0,0xE0,0x62,0x66,0x6C,0x68,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "ó":"0x00,0x80,0xC0,0xE0,0x68,0x6C,0x66,0x62,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "ô":"0x00,0x80,0xC0,0xE8,0x6C,0x66,0x66,0x6C,0xE8,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "õ":"0x00,0x80,0xC8,0xEC,0x64,0x6C,0x68,0x6C,0xE4,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "ö":"0x00,0x80,0xC0,0xEC,0x6C,0x60,0x60,0x6C,0xEC,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "÷":"0x00,0x00,0x80,0x80,0x80,0xB0,0xB0,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x0D,0x0D,0x01,0x01,0x01,0x00,0x00," ,
+        "ø":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0xE0,0xC0,0xE0,0xA0,0x00,0x00,0x2F,0x3F,0x18,0x3C,0x36,0x33,0x31,0x38,0x1F,0x0F,0x00," ,
+        "ù":"0x00,0xE0,0xE0,0x00,0x02,0x06,0x0C,0x08,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "ú":"0x00,0xE0,0xE0,0x00,0x08,0x0C,0x06,0x02,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "û":"0x00,0xE0,0xE0,0x08,0x0C,0x06,0x06,0x0C,0x08,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "ü":"0x00,0xE0,0xE0,0x0C,0x0C,0x00,0x00,0x0C,0x0C,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "ý":"0x00,0x00,0x60,0xE0,0x80,0x10,0x18,0x8C,0xE4,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00," ,
+        "þ":"0x00,0x00,0x03,0xFF,0xFF,0x1B,0x18,0x18,0xF8,0xF0,0x00,0x00,0x00,0x00,0x30,0x3F,0x3F,0x36,0x06,0x06,0x07,0x03,0x00,0x00," ,
+        "ÿ":"0x00,0x00,0x60,0xEC,0x8C,0x00,0x00,0x8C,0xEC,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00," ,
+        "Ѐ":"0x00,0xFC,0xFC,0x8D,0x8F,0x8E,0x8C,0x8C,0x8C,0x0C,0x0C,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "Ё":"0x00,0xFE,0xFE,0xC7,0xC7,0xC6,0xC6,0xC7,0xC7,0x06,0x06,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "Ђ":"0x00,0x03,0xFF,0xFF,0x83,0xC3,0xC3,0xC3,0xC0,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x01,0x00,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "Ѓ":"0x00,0xFC,0xFC,0x0C,0x0C,0x0C,0x0E,0x0F,0x0D,0x0C,0x0C,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Є":"0x00,0xF8,0xFC,0xCE,0xC7,0xC3,0xC3,0xC3,0x07,0x0E,0x0C,0x00,0x00,0x07,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "Ѕ":"0x00,0x3C,0x7E,0x67,0xE3,0xC3,0xC3,0xC3,0x87,0x8E,0x0C,0x00,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x31,0x39,0x1F,0x0F,0x00," ,
+        "І":"0x00,0x00,0x00,0x03,0x03,0xFF,0xFF,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ї":"0x00,0x00,0x00,0x0D,0x0D,0xFC,0xFC,0x0D,0x0D,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ј":"0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x0E,0x1E,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Љ":"0x00,0x00,0xFE,0xFF,0x03,0x03,0xFF,0xFF,0xC0,0xC0,0x80,0x00,0x00,0x30,0x3F,0x1F,0x00,0x00,0x3F,0x3F,0x30,0x39,0x1F,0x0F," ,
+        "Њ":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xFF,0xFF,0xC0,0xC0,0x80,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x3F,0x3F,0x30,0x39,0x1F,0x0F," ,
+        "Ћ":"0x00,0x03,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC0,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x01,0x00,0x00,0x00,0x01,0x3F,0x3F,0x00," ,
+        "Ќ":"0x00,0xFF,0xFF,0xC0,0xE2,0xF3,0x39,0x1C,0x0E,0x07,0x03,0x00,0x00,0x3F,0x3F,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x30,0x00," ,
+        "Ѝ":"0x00,0xFF,0xFF,0x00,0x01,0xC3,0xF2,0x38,0x0E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x1C,0x07,0x03,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Ў":"0x00,0x07,0x1F,0x7C,0xF1,0xC1,0xC1,0xF1,0x7C,0x1F,0x07,0x00,0x00,0x00,0x30,0x30,0x3C,0x0F,0x07,0x01,0x00,0x00,0x00,0x00," ,
+        "Џ":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x1F,0x1F,0x18,0x18,0x78,0x78,0x18,0x18,0x1F,0x1F,0x00," ,
+        #"A":"0x00,0x80,0xE0,0x78,0x1E,0x07,0x07,0x1E,0x78,0xE0,0x80,0x00,0x00,0x3F,0x3F,0x06,0x06,0x06,0x06,0x06,0x06,0x3F,0x3F,0x00," ,
+        "Б":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x83,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "В":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xE7,0xFE,0xBC,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "Г":"0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Г":"0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Д":"0x00,0x00,0xF8,0xFE,0x0F,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x00,0x70,0x7F,0x1F,0x18,0x18,0x18,0x18,0x1F,0x7F,0x70,0x00," ,
+        "Е":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "Ж":"0x00,0x03,0x0F,0xFC,0xE0,0xFF,0xFF,0xE0,0xFC,0x0F,0x03,0x00,0x00,0x38,0x3F,0x07,0x00,0x3F,0x3F,0x00,0x07,0x3F,0x38,0x00," ,
+        "Ж":"0x00,0x03,0x0F,0xFC,0xE0,0xFF,0xFF,0xE0,0xFC,0x0F,0x03,0x00,0x00,0x38,0x3F,0x07,0x00,0x3F,0x3F,0x00,0x07,0x3F,0x38,0x00," ,
+        "И":"0x00,0xFF,0xFF,0x00,0x00,0xC0,0xF0,0x38,0x0E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x1C,0x07,0x03,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Й":"0x00,0xFF,0xFF,0x00,0x02,0xC3,0xF1,0x38,0x0E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x1C,0x07,0x03,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "К":"0x00,0xFF,0xFF,0xC0,0xE0,0xF0,0x38,0x1C,0x0E,0x07,0x03,0x00,0x00,0x3F,0x3F,0x00,0x01,0x03,0x07,0x0E,0x1C,0x38,0x30,0x00," ,
+        "Л":"0x00,0x00,0xF0,0xFC,0x1E,0x07,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x30,0x3F,0x1F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "М":"0x00,0xFF,0xFF,0x1E,0x78,0xE0,0xE0,0x78,0x1E,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x01,0x01,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Н":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "О":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "П":"0x00,0xFF,0xFF,0x03,0x03,0x03,0x03,0x03,0x03,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Р":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00," ,
+        "С":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0x03,0x03,0x07,0x0E,0x0C,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "Т":"0x00,0x03,0x03,0x03,0x03,0xFF,0xFF,0x03,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "У":"0x00,0x07,0x1F,0x7C,0xF0,0xC0,0xC0,0xF0,0x7C,0x1F,0x07,0x00,0x00,0x00,0x30,0x30,0x3C,0x0F,0x07,0x01,0x00,0x00,0x00,0x00," ,
+        "Ф":"0x00,0xF8,0xFC,0x0E,0x06,0xFF,0xFF,0x06,0x0E,0xFC,0xF8,0x00,0x00,0x03,0x07,0x0E,0x0C,0x3F,0x3F,0x0C,0x0E,0x07,0x03,0x00," ,
+        "Х":"0x00,0x03,0x0F,0x3C,0xF0,0xC0,0xC0,0xF0,0x3C,0x0F,0x03,0x00,0x00,0x30,0x3C,0x0F,0x03,0x00,0x00,0x03,0x0F,0x3C,0x30,0x00," ,
+        "Ц":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x00,0x1F,0x1F,0x18,0x18,0x18,0x18,0x18,0x1F,0x7F,0x78,0x00," ,
+        "Ч":"0x00,0x7F,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Ш":"0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x00," ,
+        "Щ":"0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0x1F,0x1F,0x18,0x18,0x1F,0x1F,0x18,0x18,0x1F,0x7F,0x70," ,
+        "Ъ":"0x03,0x03,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "Ы":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0x80,0x00,0x00,0xFF,0xFF,0x00,0x3F,0x3F,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00,0x3F,0x3F," ,
+        "Ь":"0x00,0xFF,0xFF,0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x39,0x1F,0x0F,0x00," ,
+        "Э":"0x00,0x0C,0x0E,0x07,0xC3,0xC3,0xC3,0xC7,0xCE,0xFC,0xF8,0x00,0x00,0x0C,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0F,0x07,0x00," ,
+        "Ю":"0x00,0xFF,0xFF,0xC0,0xFC,0xFE,0x07,0x03,0x07,0xFE,0xFC,0x00,0x00,0x3F,0x3F,0x00,0x0F,0x1F,0x38,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Я":"0x00,0x7C,0xFE,0xC7,0x83,0x83,0x83,0x83,0x83,0xFF,0xFF,0x00,0x00,0x30,0x38,0x1D,0x0F,0x07,0x03,0x01,0x01,0x3F,0x3F,0x00," ,
+        "а":"0x00,0x00,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x1E,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "б":"0x00,0xE0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00," ,
+        "в":"0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x00,0x3F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00," ,
+        "г":"0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "д":"0x00,0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x00,0x60,0x7F,0x3F,0x30,0x30,0x30,0x30,0x3F,0x7F,0x60,0x00," ,
+        "е":"0x00,0xE0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x00," ,
+        "ж":"0x00,0x30,0xF0,0xC0,0x00,0xF0,0xF0,0x00,0xC0,0xF0,0x30,0x00,0x00,0x30,0x3C,0x0F,0x03,0x3F,0x3F,0x03,0x0F,0x3C,0x30,0x00," ,
+        "з":"0x00,0x60,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x18,0x38,0x30,0x33,0x33,0x33,0x33,0x33,0x3F,0x1D,0x00," ,
+        "З":"0x00,0x60,0x70,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x18,0x38,0x30,0x33,0x33,0x33,0x33,0x33,0x3F,0x1D,0x00," ,
+        "и":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x80,0xC0,0xE0,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x1C,0x0E,0x07,0x03,0x01,0x00,0x3F,0x3F,0x00," ,
+        "й":"0x00,0xF0,0xF0,0x00,0x04,0x08,0x88,0xC4,0xE0,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x1C,0x0E,0x07,0x03,0x01,0x00,0x3F,0x3F,0x00," ,
+        "к":"0x00,0xF0,0xF0,0x80,0x80,0xC0,0xE0,0x70,0x30,0x10,0x00,0x00,0x00,0x3F,0x3F,0x03,0x03,0x07,0x0E,0x1C,0x38,0x30,0x20,0x00," ,
+        "л":"0x00,0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x30,0x3F,0x1F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "м":"0x00,0xF0,0xF0,0xE0,0xC0,0x80,0x80,0xC0,0xE0,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x00,0x01,0x03,0x03,0x01,0x00,0x3F,0x3F,0x00," ,
+        "н":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x03,0x03,0x03,0x03,0x03,0x03,0x3F,0x3F,0x00," ,
+        "о":"0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x70,0xE0,0xC0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "п":"0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "р":"0x00,0xF0,0xF0,0x30,0x30,0x30,0x30,0x30,0x70,0xE0,0xC0,0x00,0x00,0xFF,0xFF,0x0C,0x0C,0x0C,0x0C,0x0C,0x0E,0x07,0x03,0x00," ,
+        "с":"0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x70,0x60,0x40,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x18,0x08,0x00," ,
+        "т":"0x00,0x30,0x30,0x30,0x30,0xF0,0xF0,0x30,0x30,0x30,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "у":"0x00,0x30,0xF0,0xC0,0x00,0x00,0x00,0x00,0xC0,0xF0,0x30,0x00,0x00,0x60,0xE0,0xC3,0xE7,0x7C,0x3C,0x0F,0x03,0x00,0x00,0x00," ,
+        "ф":"0x00,0x80,0xC0,0x60,0x60,0xF0,0xF0,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x30,0x30,0xFF,0xFF,0x30,0x30,0x1F,0x0F,0x00," ,
+        "х":"0x00,0x30,0x70,0xC0,0x80,0x00,0x00,0x80,0xC0,0x70,0x30,0x00,0x00,0x30,0x38,0x0C,0x07,0x03,0x03,0x07,0x0C,0x38,0x30,0x00," ,
+        "ц":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x3F,0xFF,0xF0,0x00," ,
+        "ч":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x01,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x3F,0x3F,0x00," ,
+        "ш":"0x00,0xF0,0xF0,0x00,0x00,0xE0,0xE0,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x00," ,
+        "щ":"0x00,0xF0,0xF0,0x00,0x00,0xF0,0xF0,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0x3F,0x3F,0x30,0x30,0x3F,0xFF,0xE0," ,
+        "ъ":"0x30,0x30,0xF0,0xF0,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "ы":"0x00,0xF0,0xF0,0x80,0x80,0x80,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x31,0x31,0x3B,0x1F,0x0E,0x00,0x3F,0x3F,0x00," ,
+        "ь":"0x00,0xF0,0xF0,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "э":"0x00,0x40,0x60,0x70,0x30,0x30,0x30,0x30,0x70,0xE0,0xC0,0x00,0x00,0x08,0x18,0x38,0x30,0x33,0x33,0x33,0x3B,0x1F,0x0F,0x00," ,
+        "ю":"0x00,0xF0,0xF0,0x00,0xE0,0xF0,0x30,0x30,0x30,0xF0,0xE0,0x00,0x00,0x3F,0x3F,0x03,0x1F,0x3F,0x30,0x30,0x30,0x3F,0x1F,0x00," ,
+        "я":"0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x30,0xF0,0xF0,0x00,0x00,0x21,0x33,0x3B,0x1E,0x0E,0x06,0x06,0x06,0x3F,0x3F,0x00," ,
+        "ѐ":"0x00,0xE0,0xF0,0x32,0x36,0x36,0x34,0x30,0x30,0xF0,0xE0,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x00," ,
+        "ё":"0x00,0xE0,0xF0,0x34,0x34,0x30,0x30,0x34,0x34,0xF0,0xE0,0x00,0x00,0x1F,0x3F,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x33,0x00," ,
+        "ђ":"0x00,0x30,0xFC,0xFC,0x30,0xB0,0xB0,0xB0,0x80,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x07,0x03,0x01,0x01,0xC1,0xFF,0x3F,0x00," ,
+        "ѓ":"0x00,0xF0,0xF0,0x30,0x30,0x34,0x36,0x32,0x30,0x30,0x30,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "є":"0x00,0xC0,0xE0,0x70,0x30,0x30,0x30,0x30,0x70,0x60,0x40,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x30,0x38,0x18,0x08,0x00," ,
+        "ѕ":"0x00,0xE0,0xF0,0xB0,0xB0,0x30,0x30,0x30,0x30,0x70,0x60,0x00,0x00,0x18,0x39,0x31,0x33,0x33,0x33,0x37,0x36,0x3E,0x1C,0x00," ,
+        "і":"0x00,0x00,0x00,0x00,0x30,0xF6,0xF6,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ї":"0x00,0x00,0x00,0x04,0x34,0xF0,0xF4,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ј":"0x00,0x00,0x00,0x00,0x00,0x30,0x30,0xF6,0xF6,0x00,0x00,0x00,0x00,0x00,0x00,0x60,0xE0,0xC0,0xC0,0xFF,0x7F,0x00,0x00,0x00," ,
+        "љ":"0x00,0x00,0xE0,0xF0,0x30,0x30,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x30,0x3F,0x1F,0x00,0x00,0x3F,0x3F,0x33,0x33,0x1E,0x0C," ,
+        "њ":"0x00,0xF0,0xF0,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x03,0x03,0x03,0x3F,0x3F,0x33,0x33,0x1E,0x0C," ,
+        "ћ":"0x00,0x30,0xFC,0xFC,0xB0,0xB0,0xB0,0xB0,0x80,0x80,0x00,0x00,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x3F,0x3F,0x00," ,
+        "ќ":"0x00,0xF0,0xF0,0x80,0x88,0xCC,0xE4,0x70,0x30,0x10,0x00,0x00,0x00,0x3F,0x3F,0x03,0x03,0x07,0x0E,0x1C,0x38,0x30,0x20,0x00," ,
+        "ѝ":"0x00,0xF0,0xF0,0x00,0x06,0x0C,0x88,0xC0,0xE0,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x1C,0x0E,0x07,0x03,0x01,0x00,0x3F,0x3F,0x00," ,
+        "ў":"0x00,0x30,0xF0,0xC0,0x04,0x08,0x08,0x04,0xC0,0xF0,0x30,0x00,0x00,0x60,0xE0,0xC3,0xE7,0x7C,0x3C,0x0F,0x03,0x00,0x00,0x00," ,
+        "џ":"0x00,0xF0,0xF0,0x00,0x00,0x00,0x00,0x00,0x00,0xF0,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0xF0,0xF0,0x30,0x30,0x3F,0x3F,0x00," ,
+        "Ā":"0x00,0x00,0x00,0xE0,0xF9,0x1D,0x1D,0xF9,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x07,0x3F,0x38,0x00," ,
+        "ā":"0x00,0x00,0x40,0x60,0x68,0x68,0x68,0x68,0x68,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "Ă":"0x00,0x00,0x00,0xE0,0xF9,0x1A,0x1A,0xF9,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x07,0x3F,0x38,0x00," ,
+        "ă":"0x00,0x00,0x40,0x60,0x64,0x68,0x68,0x68,0x64,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "Ą":"0x00,0x00,0x00,0xE0,0xFC,0x1F,0x1F,0xFC,0xE0,0x00,0x00,0x00,0x00,0x38,0x3F,0x07,0x06,0x06,0x06,0x06,0x67,0xBF,0xB8,0x00," ,
+        "ą":"0x00,0x00,0x40,0x60,0x60,0x60,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x1C,0x3E,0x33,0x33,0x33,0x33,0x33,0x73,0xBF,0xBF,0x00," ,
+        "Ć":"0x00,0x80,0xE0,0x70,0x38,0x18,0x1A,0x1B,0x39,0x70,0x60,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "ć":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x68,0x6C,0x64,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "Ĉ":"0x00,0x80,0xE0,0x70,0x3A,0x1B,0x19,0x1B,0x3A,0x70,0x60,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "ĉ":"0x00,0x80,0xC0,0xE0,0x68,0x6C,0x64,0x6C,0x68,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "Ċ":"0x00,0x80,0xE0,0x70,0x38,0x18,0x1A,0x18,0x38,0x70,0x60,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "ċ":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x68,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "Č":"0x00,0x80,0xE0,0x70,0x39,0x1B,0x1A,0x1B,0x39,0x70,0x60,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x30,0x38,0x1C,0x0C,0x00," ,
+        "č":"0x00,0x80,0xC0,0xE0,0x64,0x6C,0x68,0x6C,0x64,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x18,0x08,0x00," ,
+        "Ď":"0x00,0xF8,0xF8,0x19,0x1B,0x1A,0x1B,0x39,0x70,0xE0,0x80,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "ď":"0x00,0x80,0xC0,0xE0,0x60,0x60,0xE0,0xFF,0xFF,0x00,0x05,0x03,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x3F,0x3F,0x00,0x00,0x00," ,
+        "Đ":"0xC0,0xFF,0xFF,0xC3,0xC3,0x03,0x03,0x07,0x0E,0xFC,0xF0,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "đ":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0xE4,0xC4,0xFF,0xFF,0x04,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x30,0x3F,0x3F,0x00," ,
+        "Ē":"0x00,0xFC,0xFC,0x8C,0x8D,0x8D,0x8D,0x8D,0x8C,0x0C,0x0C,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "ē":"0x00,0x80,0xC0,0xE0,0x68,0x68,0x68,0x68,0x68,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "Ĕ":"0x00,0xF8,0xF8,0x98,0x99,0x9A,0x9A,0x99,0x98,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "ĕ":"0x00,0x80,0xC0,0xE0,0x64,0x68,0x68,0x68,0x64,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "Ė":"0x00,0xF8,0xF8,0x98,0x98,0x98,0x9A,0x98,0x98,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "ė":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x68,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "Ę":"0x00,0xFF,0xFF,0xC3,0xC3,0xC3,0xC3,0xC3,0xC3,0x03,0x03,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x70,0xB0,0xB0,0x00," ,
+        "ę":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x73,0xB3,0xB3,0x13,0x01,0x00," ,
+        "Ě":"0x00,0xF8,0xF8,0x98,0x99,0x9B,0x9A,0x9B,0x99,0x18,0x18,0x00,0x00,0x3F,0x3F,0x31,0x31,0x31,0x31,0x31,0x31,0x30,0x30,0x00," ,
+        "ě":"0x00,0x80,0xC0,0xE0,0x64,0x6C,0x68,0x6C,0x64,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x3B,0x33,0x33,0x33,0x33,0x33,0x13,0x01,0x00," ,
+        "Ĝ":"0x00,0x80,0xE0,0x70,0x1A,0x1B,0x19,0x1B,0x1A,0x38,0x30,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ĝ":"0x00,0x80,0xC0,0xE0,0x68,0x6C,0x64,0x6C,0x68,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "Ğ":"0x00,0x80,0xE0,0x70,0x1A,0x19,0x19,0x19,0x1A,0x38,0x30,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ğ":"0x00,0x80,0xC0,0xE0,0x68,0x64,0x64,0x64,0x68,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "Ġ":"0x00,0x80,0xE0,0x70,0x18,0x18,0x1A,0x18,0x18,0x38,0x30,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x33,0x33,0x33,0x3F,0x3F,0x00," ,
+        "ġ":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x68,0x60,0x60,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "Ģ":"0x00,0xF0,0xFC,0x0E,0x07,0x03,0xC3,0xC3,0xC3,0xC7,0xC6,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0xB0,0x70,0x30,0x3F,0x3F,0x00," ,
+        "ģ":"0x00,0x80,0xC0,0xE0,0x60,0x60,0x6C,0x6A,0x60,0xE0,0xE0,0x00,0x00,0x03,0xC7,0xCE,0xCC,0xCC,0xCC,0xCC,0xE6,0x7F,0x3F,0x00," ,
+        "Ĥ":"0x00,0xFC,0xFC,0x80,0x82,0x81,0x81,0x82,0x80,0xFC,0xFC,0x00,0x00,0x3F,0x3F,0x01,0x01,0x01,0x01,0x01,0x01,0x3F,0x3F,0x00," ,
+        "ĥ":"0x00,0xFE,0xFE,0xC0,0x62,0x63,0x61,0xE3,0xC2,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00," ,
+        "Ħ":"0x02,0xFF,0xFF,0xC2,0xC2,0xC2,0xC2,0xC2,0xC2,0xFF,0xFF,0x02,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "ħ":"0x04,0xFF,0xFF,0xC4,0x64,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00," ,
+        "Ĩ":"0x00,0x00,0x00,0x1A,0x19,0xFB,0xFB,0x1A,0x19,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ĩ":"0x00,0x00,0x00,0x08,0x64,0xEC,0xE8,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ī":"0x00,0x00,0x00,0x0C,0x0D,0xFD,0xFD,0x0D,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ī":"0x00,0x00,0x00,0x08,0x68,0xE8,0xE8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ĭ":"0x00,0x00,0x00,0x18,0x19,0xFA,0xFA,0x19,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ĭ":"0x00,0x00,0x00,0x00,0x64,0xE8,0xE8,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Į":"0x00,0x00,0x00,0x03,0x03,0xFF,0xFF,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x7F,0xBF,0xB0,0x30,0x00,0x00,0x00," ,
+        "į":"0x00,0x00,0x00,0x00,0x60,0xEC,0xEC,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x7F,0xBF,0xB0,0x30,0x00,0x00,0x00," ,
+        "İ":"0x00,0x00,0x00,0x18,0x18,0xF8,0xFA,0x18,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "ı":"0x00,0x00,0x00,0x00,0x60,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ĳ":"0x00,0x03,0xFF,0xFF,0x03,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x00,0x30,0x3F,0x3F,0x30,0x0C,0x1C,0x30,0x30,0x3F,0x1F,0x00," ,
+        "ĳ":"0x00,0x00,0x20,0xEC,0xEC,0x00,0x00,0x20,0xEC,0xEC,0x00,0x00,0x00,0x00,0x30,0x3F,0x3F,0x70,0xC0,0xC0,0xFF,0x7F,0x00,0x00," ,
+        "Ĵ":"0x00,0x00,0x00,0x00,0x02,0x03,0x01,0x03,0x02,0xF8,0xF8,0x00,0x00,0x0E,0x1E,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ĵ":"0x00,0x00,0x00,0x00,0x00,0x08,0x6C,0xE4,0xEC,0x08,0x00,0x00,0x00,0x00,0x00,0x60,0xE0,0xC0,0xC0,0xFF,0x7F,0x00,0x00,0x00," ,
+        "Ķ":"0x00,0xFF,0xFF,0xC0,0xE0,0xF0,0x38,0x1C,0x0E,0x07,0x03,0x00,0x00,0x3F,0x3F,0x00,0x01,0xA3,0x67,0x0E,0x1C,0x38,0x30,0x00," ,
+        "ķ":"0x00,0x00,0xFF,0xFF,0x00,0x80,0xC0,0xE0,0x60,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x03,0xA7,0x6F,0x1C,0x38,0x30,0x00,0x00," ,
+        "ĸ":"0x00,0x00,0xE0,0xE0,0x00,0x80,0xC0,0xE0,0x60,0x20,0x00,0x00,0x00,0x00,0x3F,0x3F,0x03,0x07,0x0F,0x1C,0x38,0x30,0x00,0x00," ,
+        "Ĺ":"0x00,0xF8,0xFA,0x03,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "ĺ":"0x00,0x00,0x00,0x00,0x18,0xFA,0xFB,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ļ":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0xB0,0x70,0x30,0x30,0x30,0x30,0x00," ,
+        "ļ":"0x00,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0xBF,0x7F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ľ":"0x00,0xFF,0xFF,0x00,0x00,0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "ľ":"0x00,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x05,0x03,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ŀ":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "ŀ":"0x00,0x00,0x00,0x00,0x03,0xFF,0xFF,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ł":"0x80,0xFF,0xFF,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x00," ,
+        "ł":"0x00,0x00,0x00,0x00,0x83,0xFF,0xFF,0x20,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x31,0x30,0x3F,0x3F,0x30,0x30,0x00,0x00,0x00," ,
+        "Ń":"0x00,0xFF,0xFF,0x0E,0x38,0xF2,0xC3,0x01,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x03,0x07,0x1C,0x3F,0x3F,0x00," ,
+        "ń":"0x00,0x00,0xE0,0xE0,0x60,0x68,0x6C,0x64,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Ņ":"0x00,0xFF,0xFF,0x0E,0x38,0xF0,0xC0,0x00,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0xA0,0x63,0x07,0x1C,0x3F,0x3F,0x00," ,
+        "ņ":"0x00,0x00,0xE0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0xA0,0x60,0x00,0x3F,0x3F,0x00," ,
+        "Ň":"0x00,0xFF,0xFF,0x0E,0x38,0xF1,0xC2,0x01,0x00,0xFF,0xFF,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x03,0x07,0x1C,0x3F,0x3F,0x00," ,
+        "ň":"0x00,0x00,0xE0,0xE0,0x64,0x6C,0x68,0x6C,0xE4,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "ŉ":"0x00,0x0A,0xE6,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00," ,
+        "Ŋ":"0x00,0x00,0xFF,0xFF,0x06,0x03,0x03,0x03,0x07,0xFE,0xFC,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x20,0x20,0x30,0x1F,0x0F,0x00," ,
+        "ŋ":"0x00,0x00,0xE0,0xE0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x80,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0xC0,0xC0,0xFF,0x7F,0x00," ,
+        "Ō":"0x00,0xC0,0xF0,0x38,0x1D,0x0D,0x0D,0x1D,0x38,0xF0,0xC0,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "ō":"0x00,0x80,0xC0,0xE0,0x68,0x68,0x68,0x68,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ŏ":"0x00,0x80,0xE0,0x70,0x39,0x1A,0x1A,0x39,0x70,0xE0,0x80,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "ŏ":"0x00,0x80,0xC0,0xE0,0x64,0x68,0x68,0x64,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Ő":"0x00,0x80,0xE0,0x70,0x3A,0x19,0x1A,0x39,0x70,0xE0,0x80,0x00,0x00,0x03,0x0F,0x1C,0x38,0x30,0x30,0x38,0x1C,0x0F,0x03,0x00," ,
+        "ő":"0x00,0x80,0xC0,0xE0,0x68,0x64,0x68,0x64,0xE0,0xC0,0x80,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x0F,0x00," ,
+        "Œ":"0xF0,0xFC,0x0E,0x03,0x03,0x07,0xFE,0xFF,0xC3,0xC3,0xC3,0x00,0x03,0x0F,0x1C,0x30,0x30,0x38,0x1F,0x3F,0x30,0x30,0x30,0x00," ,
+        "œ":"0x80,0xC0,0xE0,0x60,0x60,0xE0,0xC0,0x60,0x60,0x60,0x40,0x80,0x0F,0x1F,0x38,0x30,0x30,0x1F,0x1F,0x3B,0x33,0x33,0x1B,0x09," ,
+        "Ŕ":"0x00,0xF8,0xF8,0x98,0x98,0x9A,0x9B,0x99,0xF8,0xF0,0x60,0x00,0x00,0x3F,0x3F,0x01,0x01,0x03,0x07,0x0F,0x1D,0x38,0x30,0x00," ,
+        "ŕ":"0x00,0x00,0xE0,0xE0,0xC0,0x60,0x68,0x6C,0x64,0xE0,0xC0,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Ŗ":"0x00,0xFF,0xFF,0x83,0x83,0x83,0x83,0x83,0xC7,0xFE,0x7C,0x00,0x00,0x3F,0x3F,0x01,0x01,0xA3,0x67,0x0F,0x1D,0x38,0x30,0x00," ,
+        "ŗ":"0x00,0x00,0xE0,0xE0,0xC0,0x60,0x60,0x60,0x60,0xE0,0xC0,0x00,0x00,0x00,0x3F,0x3F,0x00,0xA0,0x60,0x00,0x00,0x00,0x00,0x00," ,
+        "Ř":"0x00,0xF8,0xF8,0x99,0x9B,0x9A,0x9B,0x99,0xF8,0xF0,0x60,0x00,0x00,0x3F,0x3F,0x01,0x01,0x03,0x07,0x0F,0x1D,0x38,0x30,0x00," ,
+        "ř":"0x00,0x00,0xE0,0xE0,0xC4,0x6C,0x68,0x6C,0x64,0xE0,0xC0,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00," ,
+        "Ś":"0x00,0x60,0xF0,0xF8,0x98,0x9A,0x9B,0x99,0x98,0x30,0x20,0x00,0x00,0x0C,0x1C,0x39,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "ś":"0x00,0xC0,0xE0,0x60,0x68,0x6C,0x64,0x60,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "Ŝ":"0x00,0x60,0xF0,0xF8,0x9A,0x9B,0x99,0x9B,0x9A,0x30,0x20,0x00,0x00,0x0C,0x1C,0x39,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "ŝ":"0x00,0xC0,0xE0,0x68,0x6C,0x64,0x6C,0x68,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "Ş":"0x00,0x3C,0x7E,0xE7,0xC3,0xC3,0xC3,0xC3,0xC7,0x8E,0x0C,0x00,0x00,0x0C,0x1C,0x38,0x30,0xB0,0xF0,0x30,0x39,0x1F,0x0F,0x00," ,
+        "ş":"0x00,0xC0,0xE0,0x60,0x60,0x60,0x60,0x60,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0xB3,0xF3,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "Š":"0x00,0x60,0xF0,0xF8,0x99,0x9B,0x9A,0x9B,0x99,0x30,0x20,0x00,0x00,0x0C,0x1C,0x39,0x31,0x31,0x31,0x31,0x3B,0x1F,0x0E,0x00," ,
+        "š":"0x00,0xC0,0xE0,0x64,0x6C,0x68,0x6C,0x64,0x40,0x00,0x00,0x00,0x00,0x11,0x33,0x33,0x33,0x33,0x33,0x3F,0x1E,0x00,0x00,0x00," ,
+        "Ţ":"0x00,0x00,0x03,0x03,0x03,0xFF,0xFF,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xBF,0xBF,0x60,0x00,0x00,0x00,0x00," ,
+        "ţ":"0x00,0x60,0x60,0xFE,0xFE,0x60,0x60,0x60,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x3F,0xB0,0xB0,0xF0,0x30,0x00,0x00,0x00," ,
+        "Ť":"0x00,0x00,0x18,0x19,0x1B,0xFA,0xFA,0x1B,0x19,0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "ť":"0x00,0x60,0x60,0xFE,0xFE,0x60,0x65,0x63,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1F,0x3F,0x30,0x30,0x30,0x30,0x00,0x00,0x00," ,
+        "Ŧ":"0x00,0x00,0x03,0xC3,0xC3,0xFF,0xFF,0xC3,0xC3,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "ŧ":"0x00,0x30,0x30,0xFE,0xFE,0x30,0x30,0x30,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x1F,0x3F,0x33,0x33,0x30,0x30,0x00,0x00,0x00," ,
+        "Ũ":"0x00,0xF8,0xF8,0x02,0x01,0x03,0x03,0x02,0x01,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ũ":"0x00,0xE0,0xE0,0x08,0x04,0x0C,0x0C,0x08,0x04,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ū":"0x00,0xFC,0xFC,0x00,0x01,0x01,0x01,0x01,0x00,0xFC,0xFC,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ū":"0x00,0xE0,0xE0,0x00,0x08,0x08,0x08,0x08,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ŭ":"0x00,0xFC,0xFC,0x00,0x01,0x02,0x02,0x01,0x00,0xFC,0xFC,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ŭ":"0x00,0xE0,0xE0,0x00,0x04,0x08,0x08,0x04,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ů":"0x00,0xF8,0xF8,0x00,0x06,0x09,0x09,0x06,0x00,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ů":"0x00,0xE0,0xE0,0x00,0x0C,0x12,0x12,0x0C,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ű":"0x00,0xF8,0xF8,0x00,0x02,0x01,0x02,0x01,0x00,0xF8,0xF8,0x00,0x00,0x07,0x1F,0x38,0x30,0x30,0x30,0x30,0x38,0x1F,0x07,0x00," ,
+        "ű":"0x00,0xE0,0xE0,0x00,0x08,0x04,0x08,0x04,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0x30,0x30,0x30,0x18,0x3F,0x3F,0x00," ,
+        "Ų":"0x00,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x00,0x00,0x07,0x1F,0x38,0x30,0xF0,0xB0,0xB0,0x38,0x1F,0x07,0x00," ,
+        "ų":"0x00,0xE0,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0xE0,0xE0,0x00,0x00,0x0F,0x1F,0x38,0x30,0xF0,0xB0,0xB0,0x18,0x3F,0x3F,0x00," ,
+        "Ŵ":"0x00,0xFC,0xFC,0x00,0x02,0x81,0x81,0x02,0x00,0xFC,0xFC,0x00,0x00,0x3F,0x3F,0x1C,0x06,0x03,0x03,0x06,0x1C,0x3F,0x3F,0x00," ,
+        "ŵ":"0x00,0xE0,0xE0,0x00,0x04,0xE8,0xE8,0x04,0x00,0xE0,0xE0,0x00,0x00,0x07,0x1F,0x38,0x1C,0x0F,0x0F,0x1C,0x38,0x1F,0x07,0x00," ,
+        "Ŷ":"0x00,0x02,0x0E,0x3C,0xF2,0xC1,0xC1,0xF2,0x3C,0x0E,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "ŷ":"0x00,0x00,0x60,0xE0,0x88,0x04,0x04,0x88,0xE0,0x60,0x00,0x00,0x00,0x00,0x00,0x81,0xE7,0x7E,0x1E,0x07,0x01,0x00,0x00,0x00," ,
+        "Ÿ":"0x00,0x02,0x0E,0x3C,0xF1,0xC0,0xC0,0xF1,0x3C,0x0E,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x3F,0x3F,0x00,0x00,0x00,0x00,0x00," ,
+        "Ź":"0x00,0x18,0x18,0x18,0x18,0x1A,0x9B,0xD9,0xF8,0x78,0x38,0x00,0x00,0x30,0x38,0x3C,0x3E,0x37,0x33,0x31,0x30,0x30,0x30,0x00," ,
+        "ź":"0x00,0x60,0x60,0x60,0x68,0x6C,0xE4,0xE0,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "Ż":"0x00,0x18,0x18,0x18,0x18,0x18,0x9A,0xD8,0xF8,0x78,0x38,0x00,0x00,0x30,0x38,0x3C,0x3E,0x37,0x33,0x31,0x30,0x30,0x30,0x00," ,
+        "ż":"0x00,0x60,0x60,0x60,0x60,0x68,0xE0,0xE0,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "Ž":"0x00,0x18,0x18,0x18,0x19,0x1B,0x9A,0xDB,0xF9,0x78,0x38,0x00,0x00,0x30,0x38,0x3C,0x3E,0x37,0x33,0x31,0x30,0x30,0x30,0x00," ,
+        "ž":"0x00,0x60,0x60,0x64,0x6C,0x68,0xEC,0xE4,0x60,0x20,0x00,0x00,0x00,0x30,0x38,0x3C,0x36,0x33,0x31,0x30,0x30,0x30,0x00,0x00," ,
+        "ſ":"0x00,0x00,0x00,0x00,0xFC,0xFE,0x06,0x06,0x0E,0x0C,0x00,0x00,0x00,0x00,0x30,0x30,0x3F,0x3F,0x30,0x00,0x00,0x00,0x00,0x00," ,
+    }
+    return font
+
+def getSmallFontMap():
+	font = {
+		" ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"!":"0x00, 0x00, 0x4f, 0x00, 0x00, 0x00,",
+		"\"":"0x00, 0x07, 0x00, 0x07, 0x00, 0x00,",
+		"#":"0x14, 0x7f, 0x14, 0x7f, 0x14, 0x00,",
+		"$":"0x24, 0x2a, 0x7f, 0x2a, 0x12, 0x00,",
+		"%":"0x23, 0x13, 0x08, 0x64, 0x62, 0x00,",
+		"&":"0x36, 0x49, 0x56, 0x20, 0x58, 0x00,",
+		"'":"0x00, 0x05, 0x03, 0x00, 0x00, 0x00,",
+		"(":"0x00, 0x1c, 0x22, 0x41, 0x00, 0x00,",
+		")":"0x00, 0x41, 0x22, 0x1c, 0x00, 0x00,",
+		"*":"0x14, 0x08, 0x3e, 0x08, 0x14, 0x00,",
+		"+":"0x08, 0x08, 0x3e, 0x08, 0x08, 0x00,",
+		",":"0x00, 0x50, 0x30, 0x00, 0x00, 0x00,",
+		"-":"0x08, 0x08, 0x08, 0x08, 0x08, 0x00,",
+		".":"0x00, 0x60, 0x60, 0x00, 0x00, 0x00,",
+		"/":"0x20, 0x10, 0x08, 0x04, 0x02, 0x00,",
+		"0":"0x3e, 0x51, 0x49, 0x45, 0x3e, 0x00,",
+		"1":"0x00, 0x42, 0x7f, 0x40, 0x00, 0x00,",
+		"2":"0x42, 0x61, 0x51, 0x49, 0x46, 0x00,",
+		"3":"0x21, 0x41, 0x45, 0x4b, 0x31, 0x00,",
+		"4":"0x18, 0x14, 0x12, 0x7f, 0x10, 0x00,",
+		"5":"0x27, 0x45, 0x45, 0x45, 0x39, 0x00,",
+		"6":"0x3c, 0x4a, 0x49, 0x49, 0x30, 0x00,",
+		"7":"0x01, 0x71, 0x09, 0x05, 0x03, 0x00,",
+		"8":"0x36, 0x49, 0x49, 0x49, 0x36, 0x00,",
+		"9":"0x06, 0x49, 0x49, 0x29, 0x1e, 0x00,",
+		":":"0x00, 0x36, 0x36, 0x00, 0x00, 0x00,",
+		";":"0x00, 0x56, 0x36, 0x00, 0x00, 0x00,",
+		"<":"0x08, 0x14, 0x22, 0x41, 0x00, 0x00,",
+		"=":"0x14, 0x14, 0x14, 0x14, 0x14, 0x00,",
+		">":"0x00, 0x41, 0x22, 0x14, 0x08, 0x00,",
+		"?":"0x02, 0x01, 0x51, 0x09, 0x06, 0x00,",
+		"@":"0x32, 0x49, 0x79, 0x41, 0x3e, 0x00,",
+		"A":"0x7e, 0x09, 0x09, 0x09, 0x7e, 0x00,",
+		"B":"0x7f, 0x49, 0x49, 0x49, 0x36, 0x00,",
+		"C":"0x3e, 0x41, 0x41, 0x41, 0x22, 0x00,",
+		"D":"0x7f, 0x41, 0x41, 0x22, 0x1c, 0x00,",
+		"E":"0x7f, 0x49, 0x49, 0x49, 0x41, 0x00,",
+		"F":"0x7f, 0x09, 0x09, 0x09, 0x01, 0x00,",
+		"G":"0x3e, 0x41, 0x41, 0x49, 0x7a, 0x00,",
+		"H":"0x7f, 0x08, 0x08, 0x08, 0x7f, 0x00,",
+		"I":"0x00, 0x41, 0x7f, 0x41, 0x00, 0x00,",
+		"J":"0x20, 0x40, 0x41, 0x3f, 0x01, 0x00,",
+		"K":"0x7f, 0x08, 0x14, 0x22, 0x41, 0x00,",
+		"L":"0x7f, 0x40, 0x40, 0x40, 0x40, 0x00,",
+		"M":"0x7f, 0x02, 0x0c, 0x02, 0x7f, 0x00,",
+		"N":"0x7f, 0x04, 0x08, 0x10, 0x7f, 0x00,",
+		"O":"0x3e, 0x41, 0x41, 0x41, 0x3e, 0x00,",
+		"P":"0x7f, 0x09, 0x09, 0x09, 0x06, 0x00,",
+		"Q":"0x3e, 0x41, 0x51, 0x21, 0x5e, 0x00,",
+		"R":"0x7f, 0x09, 0x19, 0x29, 0x46, 0x00,",
+		"S":"0x26, 0x49, 0x49, 0x49, 0x32, 0x00,",
+		"T":"0x01, 0x01, 0x7f, 0x01, 0x01, 0x00,",
+		"U":"0x3f, 0x40, 0x40, 0x40, 0x3f, 0x00,",
+		"V":"0x1f, 0x20, 0x40, 0x20, 0x1f, 0x00,",
+		"W":"0x3f, 0x40, 0x38, 0x40, 0x3f, 0x00,",
+		"X":"0x63, 0x14, 0x08, 0x14, 0x63, 0x00,",
+		"Y":"0x07, 0x08, 0x70, 0x08, 0x07, 0x00,",
+		"Z":"0x61, 0x51, 0x49, 0x45, 0x43, 0x00,",
+		"[":"0x00, 0x7f, 0x41, 0x41, 0x00, 0x00,",
+		"\\":"0x02, 0x04, 0x08, 0x10, 0x20, 0x00,",
+		"]":"0x00, 0x41, 0x41, 0x7f, 0x00, 0x00,",
+		"^":"0x04, 0x02, 0x01, 0x02, 0x04, 0x00,",
+		"_":"0x40, 0x40, 0x40, 0x40, 0x40, 0x00,",
+		"`":"0x00, 0x03, 0x05, 0x00, 0x00, 0x00,",
+		"a":"0x20, 0x54, 0x54, 0x54, 0x78, 0x00,",
+		"b":"0x7f, 0x48, 0x44, 0x44, 0x38, 0x00,",
+		"c":"0x38, 0x44, 0x44, 0x44, 0x20, 0x00,",
+		"d":"0x38, 0x44, 0x44, 0x48, 0x7f, 0x00,",
+		"e":"0x38, 0x54, 0x54, 0x54, 0x18, 0x00,",
+		"f":"0x00, 0x04, 0x7e, 0x05, 0x01, 0x00,",
+		"g":"0x08, 0x54, 0x54, 0x54, 0x3c, 0x00,",
+		"h":"0x7f, 0x08, 0x04, 0x04, 0x78, 0x00,",
+		"i":"0x00, 0x44, 0x7d, 0x40, 0x00, 0x00,",
+		"j":"0x20, 0x40, 0x44, 0x3d, 0x00, 0x00,",
+		"k":"0x00, 0x7f, 0x10, 0x28, 0x44, 0x00,",
+		"l":"0x00, 0x41, 0x7f, 0x40, 0x00, 0x00,",
+		"m":"0x7c, 0x04, 0x78, 0x04, 0x78, 0x00,",
+		"n":"0x7c, 0x08, 0x04, 0x04, 0x78, 0x00,",
+		"o":"0x38, 0x44, 0x44, 0x44, 0x38, 0x00,",
+		"p":"0x7c, 0x14, 0x14, 0x14, 0x08, 0x00,",
+		"q":"0x08, 0x14, 0x14, 0x14, 0x7c, 0x00,",
+		"r":"0x7c, 0x08, 0x04, 0x04, 0x08, 0x00,",
+		"s":"0x48, 0x54, 0x54, 0x54, 0x24, 0x00,",
+		"t":"0x04, 0x3e, 0x44, 0x40, 0x20, 0x00,",
+		"u":"0x3c, 0x40, 0x40, 0x20, 0x7c, 0x00,",
+		"v":"0x0c, 0x30, 0x40, 0x30, 0x0c, 0x00,",
+		"w":"0x3c, 0x40, 0x30, 0x40, 0x3c, 0x00,",
+		"x":"0x44, 0x24, 0x38, 0x48, 0x44, 0x00,",
+		"y":"0x44, 0x48, 0x30, 0x10, 0x0c, 0x00,",
+		"z":"0x44, 0x64, 0x54, 0x4c, 0x44, 0x00,",
+		"{":"0x08, 0x36, 0x41, 0x00, 0x00, 0x00,",
+		"|":"0x00, 0x00, 0x77, 0x00, 0x00, 0x00,",
+		"}":"0x00, 0x00, 0x41, 0x36, 0x08, 0x00,",
+		"~":"0x02, 0x01, 0x02, 0x04, 0x02, 0x00,",
+		"^":"0x04, 0x02, 0x01, 0x02, 0x04, 0x00,",
+		" ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"¡":"0x00, 0x00, 0x79, 0x00, 0x00, 0x00,",
+		"¢":"0x1c, 0x22, 0x7f, 0x22, 0x10, 0x00,",
+		"£":"0x50, 0x7e, 0x51, 0x41, 0x42, 0x00,",
+		"¤":"0x22, 0x1c, 0x14, 0x1c, 0x22, 0x00,",
+		"¥":"0x15, 0x16, 0x7c, 0x16, 0x15, 0x00,",
+		"¦":"0x00, 0x00, 0x77, 0x00, 0x00, 0x00,",
+		"§":"0x4a, 0x55, 0x55, 0x55, 0x29, 0x00,",
+		"¨":"0x00, 0x01, 0x00, 0x01, 0x00, 0x00,",
+		"©":"0x00, 0x18, 0x24, 0x24, 0x00, 0x00,",
+		"ª":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"«":"0x08, 0x14, 0x00, 0x08, 0x14, 0x00,",
+		"¬":"0x08, 0x08, 0x08, 0x08, 0x38, 0x00,",
+		"":"0x08, 0x08, 0x08, 0x08, 0x08, 0x00,",
+		"®":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"¯":"0x00, 0x01, 0x01, 0x01, 0x00, 0x00,",
+		"°":"0x00, 0x00, 0x07, 0x05, 0x07, 0x00,",
+		"±":"0x44, 0x44, 0x5f, 0x44, 0x44, 0x00,",
+		"²":"0x1d, 0x15, 0x17, 0x00, 0x00, 0x00,",
+		"³":"0x15, 0x15, 0x1f, 0x00, 0x00, 0x00,",
+		"´":"0x00, 0x04, 0x02, 0x01, 0x00, 0x00,",
+		"µ":"0x7c, 0x10, 0x10, 0x0c, 0x10, 0x00,",
+		"¶":"0x02, 0x07, 0x7f, 0x01, 0x7f, 0x00,",
+		"·":"0x00, 0x00, 0x08, 0x00, 0x00, 0x00,",
+		"¸":"0x00, 0x40, 0x60, 0x00, 0x00, 0x00,",
+		"¹":"0x12, 0x1f, 0x10, 0x00, 0x00, 0x00,",
+		"º":"0x07, 0x05, 0x07, 0x00, 0x00, 0x00,",
+		"»":"0x14, 0x08, 0x00, 0x14, 0x08, 0x00,",
+		"¼":"0x21, 0x17, 0x38, 0x24, 0x72, 0x00,",
+		"½":"0x21, 0x17, 0x78, 0x54, 0x5e, 0x00,",
+		"¾":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"¿":"0x30, 0x48, 0x45, 0x40, 0x20, 0x00,",
+		"À":"0x78, 0x15, 0x16, 0x14, 0x78, 0x00,",
+		"Á":"0x78, 0x14, 0x16, 0x15, 0x78, 0x00,",
+		"Â":"0x78, 0x16, 0x15, 0x16, 0x78, 0x00,",
+		"Ã":"0x7a, 0x29, 0x2a, 0x79, 0x00, 0x00,",
+		"Ä":"0x78, 0x15, 0x14, 0x15, 0x78, 0x00,",
+		"Å":"0x78, 0x14, 0x15, 0x14, 0x78, 0x00,",
+		"Æ":"0x7e, 0x09, 0x7f, 0x49, 0x49, 0x00,",
+		"Ç":"0x0e, 0x51, 0x71, 0x11, 0x08, 0x00,",
+		"È":"0x7c, 0x55, 0x56, 0x44, 0x44, 0x00,",
+		"É":"0x7c, 0x54, 0x56, 0x45, 0x44, 0x00,",
+		"Ê":"0x7c, 0x56, 0x55, 0x46, 0x44, 0x00,",
+		"Ë":"0x7c, 0x55, 0x54, 0x45, 0x44, 0x00,",
+		"Ì":"0x00, 0x49, 0x7a, 0x48, 0x00, 0x00,",
+		"Í":"0x00, 0x48, 0x7a, 0x49, 0x00, 0x00,",
+		"Î":"0x00, 0x4a, 0x79, 0x4a, 0x00, 0x00,",
+		"Ï":"0x44, 0x45, 0x7c, 0x45, 0x44, 0x00,",
+		"Ð":"0x08, 0x7f, 0x49, 0x22, 0x1c, 0x00,",
+		"Ñ":"0x7a, 0x11, 0x22, 0x79, 0x00, 0x00,",
+		"Ò":"0x38, 0x45, 0x46, 0x44, 0x38, 0x00,",
+		"Ó":"0x38, 0x44, 0x46, 0x45, 0x38, 0x00,",
+		"Ô":"0x38, 0x46, 0x45, 0x46, 0x38, 0x00,",
+		"Õ":"0x32, 0x49, 0x4a, 0x31, 0x00, 0x00,",
+		"Ö":"0x38, 0x45, 0x44, 0x45, 0x38, 0x00,",
+		"×":"0x22, 0x14, 0x08, 0x14, 0x22, 0x00,",
+		"Ø":"0x58, 0x24, 0x54, 0x48, 0x34, 0x00,",
+		"Ù":"0x38, 0x41, 0x42, 0x40, 0x38, 0x00,",
+		"Ú":"0x38, 0x40, 0x42, 0x41, 0x38, 0x00,",
+		"Û":"0x38, 0x42, 0x41, 0x42, 0x38, 0x00,",
+		"Ü":"0x3c, 0x41, 0x40, 0x41, 0x3c, 0x00,",
+		"Ý":"0x04, 0x08, 0x72, 0x09, 0x04, 0x00,",
+		"Þ":"0x7f, 0x22, 0x22, 0x22, 0x1c, 0x00,",
+		"ß":"0x7e, 0x11, 0x25, 0x25, 0x1a, 0x00,",
+		"à":"0x20, 0x55, 0x56, 0x54, 0x78, 0x00,",
+		"á":"0x20, 0x54, 0x56, 0x55, 0x78, 0x00,",
+		"â":"0x20, 0x56, 0x55, 0x56, 0x78, 0x00,",
+		"ã":"0x22, 0x55, 0x56, 0x55, 0x78, 0x00,",
+		"ä":"0x20, 0x55, 0x54, 0x55, 0x78, 0x00,",
+		"å":"0x20, 0x54, 0x55, 0x54, 0x78, 0x00,",
+		"æ":"0x24, 0x54, 0x7c, 0x54, 0x48, 0x00,",
+		"ç":"0x1c, 0x22, 0x62, 0x22, 0x10, 0x00,",
+		"è":"0x38, 0x55, 0x56, 0x54, 0x08, 0x00,",
+		"é":"0x38, 0x54, 0x56, 0x55, 0x08, 0x00,",
+		"ê":"0x38, 0x56, 0x55, 0x56, 0x08, 0x00,",
+		"ë":"0x38, 0x55, 0x54, 0x55, 0x08, 0x00,",
+		"ì":"0x00, 0x45, 0x7e, 0x40, 0x00, 0x00,",
+		"í":"0x00, 0x44, 0x7e, 0x41, 0x00, 0x00,",
+		"î":"0x00, 0x46, 0x7d, 0x42, 0x00, 0x00,",
+		"ï":"0x00, 0x45, 0x7c, 0x41, 0x00, 0x00,",
+		"ð":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ñ":"0x78, 0x12, 0x09, 0x0a, 0x71, 0x00,",
+		"ò":"0x38, 0x45, 0x46, 0x44, 0x38, 0x00,",
+		"ó":"0x38, 0x44, 0x46, 0x45, 0x38, 0x00,",
+		"ô":"0x38, 0x46, 0x45, 0x46, 0x38, 0x00,",
+		"õ":"0x32, 0x49, 0x4a, 0x31, 0x00, 0x00,",
+		"ö":"0x38, 0x45, 0x44, 0x45, 0x38, 0x00,",
+		"÷":"0x08, 0x08, 0x2a, 0x08, 0x08, 0x00,",
+		"ø":"0x58, 0x24, 0x54, 0x48, 0x34, 0x00,",
+		"ù":"0x3c, 0x41, 0x42, 0x20, 0x7c, 0x00,",
+		"ú":"0x3c, 0x40, 0x42, 0x21, 0x7c, 0x00,",
+		"û":"0x3c, 0x42, 0x41, 0x22, 0x7c, 0x00,",
+		"ü":"0x3c, 0x41, 0x40, 0x21, 0x5c, 0x00,",
+		"ý":"0x44, 0x48, 0x32, 0x11, 0x0c, 0x00,",
+		"þ":"0x7c, 0x28, 0x28, 0x10, 0x00, 0x00,",
+		"ÿ":"0x44, 0x49, 0x30, 0x11, 0x0c, 0x00,",
+		"Ѐ":"0x7c, 0x55, 0x56, 0x44, 0x44, 0x00,",
+		"Ё":"0x7c, 0x55, 0x54, 0x45, 0x44, 0x00,",
+		"Ђ":"0x01, 0x7f, 0x09, 0x49, 0x31, 0x00,",
+		"Ѓ":"0x7c, 0x04, 0x06, 0x05, 0x04, 0x00,",
+		"Є":"0x3e, 0x49, 0x49, 0x41, 0x00, 0x00,",
+		"Ѕ":"0x06, 0x49, 0x49, 0x49, 0x30, 0x00,",
+		"І":"0x41, 0x41, 0x7f, 0x41, 0x41, 0x00,",
+		"Ї":"0x44, 0x45, 0x7c, 0x45, 0x44, 0x00,",
+		"Ј":"0x20, 0x40, 0x41, 0x3f, 0x01, 0x00,",
+		"Љ":"0x7f, 0x01, 0x7f, 0x48, 0x30, 0x00,",
+		"Њ":"0x7f, 0x08, 0x7f, 0x48, 0x30, 0x00,",
+		"Ћ":"0x01, 0x01, 0x7f, 0x09, 0x71, 0x00,",
+		"Ќ":"0x7c, 0x12, 0x29, 0x44, 0x00, 0x00,",
+		"Ѝ":"0x7c, 0x21, 0x12, 0x08, 0x7c, 0x00,",
+		"Ў":"0x44, 0x49, 0x32, 0x09, 0x04, 0x00,",
+		"Џ":"0x3f, 0x20, 0x60, 0x20, 0x3f, 0x00,",
+		"А":"0x7e, 0x09, 0x09, 0x09, 0x7e, 0x00,",
+		"Б":"0x7f, 0x49, 0x49, 0x49, 0x31, 0x00,",
+		"В":"0x7f, 0x49, 0x49, 0x49, 0x36, 0x00,",
+		"Г":"0x7f, 0x01, 0x01, 0x01, 0x01, 0x00,",
+		"Д":"0x60, 0x3f, 0x21, 0x3f, 0x60, 0x00,",
+		"Е":"0x7f, 0x49, 0x49, 0x49, 0x41, 0x00,",
+		"Ж":"0x77, 0x08, 0x7f, 0x08, 0x77, 0x00,",
+		"З":"0x00, 0x41, 0x49, 0x49, 0x36, 0x00,",
+		"И":"0x7f, 0x10, 0x08, 0x04, 0x7f, 0x00,",
+		"Й":"0x7c, 0x21, 0x12, 0x09, 0x7c, 0x00,",
+		"К":"0x7f, 0x08, 0x14, 0x22, 0x41, 0x00,",
+		"Л":"0x40, 0x3f, 0x01, 0x01, 0x7f, 0x00,",
+		"М":"0x7f, 0x02, 0x04, 0x02, 0x7f, 0x00,",
+		"Н":"0x7f, 0x08, 0x08, 0x08, 0x7f, 0x00,",
+		"О":"0x3e, 0x41, 0x41, 0x41, 0x3e, 0x00,",
+		"П":"0x7f, 0x01, 0x01, 0x01, 0x7f, 0x00,",
+		"Р":"0x7f, 0x09, 0x09, 0x09, 0x06, 0x00,",
+		"С":"0x3e, 0x41, 0x41, 0x41, 0x22, 0x00,",
+		"Т":"0x01, 0x01, 0x7f, 0x01, 0x01, 0x00,",
+		"У":"0x47, 0x48, 0x30, 0x08, 0x07, 0x00,",
+		"Ф":"0x0c, 0x12, 0x7f, 0x12, 0x0c, 0x00,",
+		"Х":"0x63, 0x14, 0x08, 0x14, 0x63, 0x00,",
+		"Ц":"0x3f, 0x20, 0x20, 0x3f, 0x60, 0x00,",
+		"Ч":"0x07, 0x08, 0x08, 0x08, 0x7f, 0x00,",
+		"Ш":"0x3f, 0x20, 0x3f, 0x20, 0x3f, 0x00,",
+		"Щ":"0x3f, 0x20, 0x3f, 0x20, 0x3f, 0x60,",
+		"Ъ":"0x01, 0x7f, 0x48, 0x48, 0x30, 0x00,",
+		"Ы":"0x7f, 0x48, 0x30, 0x00, 0x7f, 0x00,",
+		"Ь":"0x00, 0x7f, 0x48, 0x48, 0x30, 0x00,",
+		"Э":"0x22, 0x49, 0x49, 0x2a, 0x1c, 0x00,",
+		"Ю":"0x7f, 0x08, 0x3e, 0x41, 0x3e, 0x00,",
+		"Я":"0x46, 0x29, 0x19, 0x09, 0x7f, 0x00,",
+		"а":"0x20, 0x54, 0x54, 0x54, 0x78, 0x00,",
+		"б":"0x3c, 0x4a, 0x4a, 0x4a, 0x30, 0x00,",
+		"в":"0x7c, 0x54, 0x54, 0x54, 0x28, 0x00,",
+		"г":"0x7c, 0x04, 0x04, 0x04, 0x04, 0x00,",
+		"д":"0x40, 0x3c, 0x24, 0x3c, 0x60, 0x00,",
+		"е":"0x38, 0x54, 0x54, 0x54, 0x18, 0x00,",
+		"ж":"0x6c, 0x10, 0x7c, 0x10, 0x6c, 0x00,",
+		"з":"0x28, 0x44, 0x54, 0x54, 0x28, 0x00,",
+		"и":"0x7c, 0x20, 0x10, 0x08, 0x7c, 0x00,",
+		"й":"0x7c, 0x21, 0x12, 0x09, 0x7c, 0x00,",
+		"к":"0x7c, 0x10, 0x28, 0x44, 0x00, 0x00,",
+		"л":"0x40, 0x3c, 0x04, 0x04, 0x7c, 0x00,",
+		"м":"0x7c, 0x08, 0x10, 0x08, 0x7c, 0x00,",
+		"н":"0x7c, 0x10, 0x10, 0x10, 0x7c, 0x00,",
+		"о":"0x38, 0x44, 0x44, 0x44, 0x38, 0x00,",
+		"п":"0x7c, 0x04, 0x04, 0x04, 0x7c, 0x00,",
+		"р":"0x7c, 0x14, 0x14, 0x14, 0x08, 0x00,",
+		"с":"0x38, 0x44, 0x44, 0x44, 0x20, 0x00,",
+		"т":"0x04, 0x04, 0x7c, 0x04, 0x04, 0x00,",
+		"у":"0x4c, 0x50, 0x20, 0x10, 0x0c, 0x00,",
+		"ф":"0x18, 0x24, 0x7e, 0x24, 0x18, 0x00,",
+		"х":"0x44, 0x28, 0x10, 0x28, 0x44, 0x00,",
+		"ц":"0x3c, 0x20, 0x20, 0x3c, 0x60, 0x00,",
+		"ч":"0x0c, 0x10, 0x10, 0x10, 0x7c, 0x00,",
+		"ш":"0x3c, 0x20, 0x3c, 0x20, 0x3c, 0x00,",
+		"щ":"0x3c, 0x20, 0x3c, 0x20, 0x7c, 0x00,",
+		"ъ":"0x04, 0x7c, 0x50, 0x20, 0x00, 0x00,",
+		"ы":"0x7c, 0x50, 0x20, 0x00, 0x7c, 0x00,",
+		"ь":"0x00, 0x7c, 0x50, 0x20, 0x00, 0x00,",
+		"э":"0x28, 0x44, 0x54, 0x54, 0x28, 0x00,",
+		"ю":"0x7c, 0x10, 0x38, 0x44, 0x38, 0x00,",
+		"я":"0x48, 0x34, 0x14, 0x14, 0x7c, 0x00,",
+		"ѐ":"0x38, 0x55, 0x56, 0x54, 0x08, 0x00,",
+		"ё":"0x38, 0x55, 0x54, 0x55, 0x08, 0x00,",
+		"ђ":"0x02, 0x3f, 0x12, 0x48, 0x30, 0x00,",
+		"ѓ":"0x7c, 0x04, 0x06, 0x05, 0x04, 0x00,",
+		"є":"0x38, 0x54, 0x54, 0x44, 0x28, 0x00,",
+		"ѕ":"0x08, 0x54, 0x54, 0x54, 0x20, 0x00,",
+		"і":"0x00, 0x44, 0x7d, 0x40, 0x00, 0x00,",
+		"ї":"0x00, 0x45, 0x7c, 0x41, 0x00, 0x00,",
+		"ј":"0x20, 0x40, 0x44, 0x3d, 0x00, 0x00,",
+		"љ":"0x7c, 0x04, 0x7c, 0x50, 0x20, 0x00,",
+		"њ":"0x7c, 0x10, 0x7c, 0x50, 0x20, 0x00,",
+		"ћ":"0x04, 0x7e, 0x14, 0x10, 0x60, 0x00,",
+		"ќ":"0x7c, 0x12, 0x29, 0x44, 0x00, 0x00,",
+		"ѝ":"0x7c, 0x21, 0x12, 0x08, 0x7c, 0x00,",
+		"ў":"0x4c, 0x51, 0x22, 0x11, 0x0c, 0x00,",
+		"џ":"0x3c, 0x20, 0x60, 0x20, 0x3c, 0x00,",
+		"Ā":"0x78, 0x15, 0x15, 0x15, 0x78, 0x00,",
+		"ā":"0x20, 0x55, 0x55, 0x55, 0x78, 0x00,",
+		"Ă":"0x78, 0x15, 0x16, 0x15, 0x78, 0x00,",
+		"ă":"0x20, 0x55, 0x56, 0x55, 0x78, 0x00,",
+		"Ą":"0x7e, 0x09, 0x09, 0x49, 0xbe, 0x00,",
+		"ą":"0x20, 0x54, 0x54, 0xd4, 0x78, 0x00,",
+		"Ć":"0x38, 0x44, 0x46, 0x45, 0x28, 0x00,",
+		"ć":"0x38, 0x44, 0x46, 0x45, 0x20, 0x00,",
+		"Ĉ":"0x38, 0x46, 0x45, 0x46, 0x28, 0x00,",
+		"ĉ":"0x38, 0x46, 0x45, 0x46, 0x20, 0x00,",
+		"Ċ":"0x38, 0x44, 0x45, 0x44, 0x28, 0x00,",
+		"ċ":"0x38, 0x44, 0x45, 0x44, 0x20, 0x00,",
+		"Č":"0x38, 0x45, 0x46, 0x45, 0x28, 0x00,",
+		"č":"0x38, 0x45, 0x46, 0x45, 0x20, 0x00,",
+		"Ď":"0x7c, 0x45, 0x46, 0x29, 0x10, 0x00,",
+		"ď":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Đ":"0x08, 0x7f, 0x49, 0x22, 0x1c, 0x00,",
+		"đ":"0x38, 0x44, 0x44, 0x4A, 0x7F, 0x00,",
+		"Ē":"0x7c, 0x55, 0x55, 0x55, 0x44, 0x00,",
+		"ē":"0x38, 0x55, 0x55, 0x55, 0x08, 0x00,",
+		"Ĕ":"0x7c, 0x55, 0x56, 0x55, 0x44, 0x00,",
+		"ĕ":"0x38, 0x55, 0x56, 0x55, 0x08, 0x00,",
+		"Ė":"0x7c, 0x54, 0x55, 0x54, 0x44, 0x00,",
+		"ė":"0x38, 0x54, 0x55, 0x54, 0x08, 0x00,",
+		"Ę":"0x7f, 0x49, 0x49, 0xc9, 0x41, 0x00,",
+		"ę":"0x38, 0x54, 0x54, 0xd4, 0x18, 0x00,",
+		"Ě":"0x7c, 0x55, 0x56, 0x55, 0x44, 0x00,",
+		"ě":"0x38, 0x55, 0x56, 0x55, 0x08, 0x00,",
+		"Ĝ":"0x38, 0x46, 0x55, 0x56, 0x70, 0x00,",
+		"ĝ":"0x08, 0x56, 0x55, 0x56, 0x3c, 0x00,",
+		"Ğ":"0x38, 0x45, 0x56, 0x55, 0x30, 0x00,",
+		"ğ":"0x08, 0x55, 0x56, 0x55, 0x3c, 0x00,",
+		"Ġ":"0x38, 0x44, 0x55, 0x54, 0x30, 0x00,",
+		"ġ":"0x08, 0x54, 0x55, 0x54, 0x3c, 0x00,",
+		"Ģ":"0x0e, 0x51, 0x35, 0x15, 0x1c, 0x00,",
+		"ģ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ĥ":"0x7c, 0x12, 0x11, 0x12, 0x7c, 0x00,",
+		"ĥ":"0x02, 0x79, 0x22, 0x10, 0x60, 0x00,",
+		"Ħ":"0x02, 0x7f, 0x0a, 0x7f, 0x02, 0x00,",
+		"ħ":"0x02, 0x7f, 0x12, 0x08, 0x70, 0x00,",
+		"Ĩ":"0x4a, 0x49, 0x7a, 0x49, 0x48, 0x00,",
+		"ĩ":"0x02, 0x49, 0x7a, 0x41, 0x00, 0x00,",
+		"Ī":"0x44, 0x45, 0x7d, 0x45, 0x44, 0x00,",
+		"ī":"0x00, 0x45, 0x7d, 0x41, 0x00, 0x00,",
+		"Ĭ":"0x44, 0x45, 0x7e, 0x45, 0x44, 0x00,",
+		"ĭ":"0x00, 0x45, 0x7e, 0x41, 0x00, 0x00,",
+		"Į":"0x00, 0x41, 0x7f, 0xc1, 0x00, 0x00,",
+		"į":"0x00, 0x44, 0x7d, 0xc0, 0x00, 0x00,",
+		"İ":"0x44, 0x44, 0x7d, 0x44, 0x44, 0x00,",
+		"ı":"0x00, 0x44, 0x7c, 0x40, 0x00, 0x00,",
+		"Ĳ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ĳ":"0x44, 0x7d, 0x40, 0x44, 0x3d, 0x00,",
+		"Ĵ":"0x20, 0x40, 0x46, 0x3d, 0x06, 0x00,",
+		"ĵ":"0x00, 0x20, 0x46, 0x3d, 0x02, 0x00,",
+		"Ķ":"0x1f, 0x44, 0x2a, 0x11, 0x00, 0x00,",
+		"ķ":"0x1f, 0x44, 0x2a, 0x11, 0x00, 0x00,",
+		"ĸ":"0x7c, 0x10, 0x28, 0x44, 0x00, 0x00,",
+		"Ĺ":"0x7c, 0x40, 0x42, 0x41, 0x40, 0x00,",
+		"ĺ":"0x00, 0x44, 0x7e, 0x41, 0x00, 0x00,",
+		"Ļ":"0x1f, 0x50, 0x30, 0x10, 0x10, 0x00,",
+		"ļ":"0x00, 0x51, 0x3f, 0x10, 0x00, 0x00,",
+		"Ľ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ľ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ŀ":"0x7f, 0x40, 0x40, 0x48, 0x40, 0x00,",
+		"ŀ":"0x00, 0x41, 0x7f, 0x40, 0x08, 0x00,",
+		"Ł":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ł":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ń":"0x7c, 0x08, 0x12, 0x21, 0x7c, 0x00,",
+		"ń":"0x7c, 0x08, 0x06, 0x05, 0x78, 0x00,",
+		"Ņ":"0x1f, 0x42, 0x24, 0x08, 0x1f, 0x00,",
+		"ņ":"0x1f, 0x42, 0x21, 0x01, 0x1e, 0x00,",
+		"Ň":"0x7c, 0x09, 0x12, 0x21, 0x7c, 0x00,",
+		"ň":"0x7c, 0x09, 0x06, 0x05, 0x78, 0x00,",
+		"ŉ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ŋ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ŋ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ō":"0x38, 0x45, 0x45, 0x45, 0x38, 0x00,",
+		"ō":"0x38, 0x45, 0x45, 0x45, 0x38, 0x00,",
+		"Ŏ":"0x38, 0x45, 0x46, 0x45, 0x38, 0x00,",
+		"ŏ":"0x38, 0x45, 0x46, 0x45, 0x38, 0x00,",
+		"Ő":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ő":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Œ":"0x3e, 0x41, 0x7f, 0x49, 0x49, 0x00,",
+		"œ":"0x38, 0x44, 0x7c, 0x54, 0x58, 0x00,",
+		"Ŕ":"0x7c, 0x14, 0x16, 0x15, 0x68, 0x00,",
+		"ŕ":"0x7c, 0x08, 0x06, 0x05, 0x08, 0x00,",
+		"Ŗ":"0x1f, 0x45, 0x25, 0x05, 0x1a, 0x00,",
+		"ŗ":"0x1f, 0x42, 0x21, 0x01, 0x02, 0x00,",
+		"Ř":"0x7c, 0x15, 0x16, 0x15, 0x68, 0x00,",
+		"ř":"0x7c, 0x09, 0x06, 0x05, 0x08, 0x00,",
+		"Ś":"0x08, 0x54, 0x56, 0x55, 0x20, 0x00,",
+		"ś":"0x48, 0x54, 0x56, 0x55, 0x24, 0x00,",
+		"Ŝ":"0x08, 0x56, 0x55, 0x56, 0x20, 0x00,",
+		"ŝ":"0x48, 0x56, 0x55, 0x56, 0x24, 0x00,",
+		"Ş":"0x02, 0x55, 0x35, 0x15, 0x08, 0x00,",
+		"ş":"0x12, 0x55, 0x35, 0x15, 0x09, 0x00,",
+		"Š":"0x08, 0x55, 0x56, 0x55, 0x20, 0x00,",
+		"š":"0x48, 0x55, 0x56, 0x55, 0x24, 0x00,",
+		"Ţ":"0x01, 0x41, 0x3f, 0x01, 0x01, 0x00,",
+		"ţ":"0x02, 0x4f, 0x32, 0x10, 0x08, 0x00,",
+		"Ť":"0x04, 0x05, 0x7e, 0x05, 0x04, 0x00,",
+		"ť":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ŧ":"0x01, 0x09, 0x7f, 0x09, 0x01, 0x00,",
+		"ŧ":"0x14, 0x3e, 0x54, 0x40, 0x20, 0x00,",
+		"Ũ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ũ":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ū":"0x3c, 0x41, 0x41, 0x41, 0x3c, 0x00,",
+		"ū":"0x3c, 0x41, 0x41, 0x21, 0x7c, 0x00,",
+		"Ŭ":"0x3c, 0x41, 0x42, 0x41, 0x3c, 0x00,",
+		"ŭ":"0x3c, 0x41, 0x41, 0x21, 0x7c, 0x00,",
+		"Ů":"0x3c, 0x40, 0x41, 0x40, 0x3c, 0x00,",
+		"ů":"0x3c, 0x41, 0x41, 0x21, 0x7c, 0x00,",
+		"Ű":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ű":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ų":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"ų":"0x00, 0x00, 0x00, 0x00, 0x00, 0x00,",
+		"Ŵ":"0x3c, 0x42, 0x39, 0x42, 0x3c, 0x00,",
+		"ŵ":"0x3c, 0x42, 0x31, 0x42, 0x3c, 0x00,",
+		"Ŷ":"0x04, 0x0a, 0x71, 0x0a, 0x04, 0x00,",
+		"ŷ":"0x04, 0x4a, 0x31, 0x12, 0x0c, 0x00,",
+		"Ÿ":"0x04, 0x09, 0x70, 0x09, 0x04, 0x00,",
+		"Ź":"0x44, 0x64, 0x56, 0x4d, 0x44, 0x00,",
+		"ź":"0x44, 0x64, 0x56, 0x4d, 0x44, 0x00,",
+		"Ż":"0x44, 0x64, 0x55, 0x4c, 0x44, 0x00,",
+		"ż":"0x44, 0x64, 0x55, 0x4c, 0x44, 0x00,",
+		"Ž":"0x44, 0x65, 0x56, 0x4d, 0x44, 0x00,",
+		"ž":"0x44, 0x65, 0x56, 0x4d, 0x44, 0x00,",
+		"ſ":"0x00, 0x04, 0x7e, 0x01, 0x01, 0x00,",
+	}
+	return font
--- a/Editor/make_translation.py
+++ b/Editor/make_translation.py
@@ -1,246 +1,514 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-import json
-import os
-import io
-import sys
-
-TRANSLATION_CPP = "Translation.cpp"
-
-try :
-    to_unicode = unicode
-except NameError:
-    to_unicode = str
-
-
-# Loading a single JSON file
-def loadJson(fileName, skipFirstLine):
-    with io.open(fileName, mode="r", encoding="utf-8") as f:
-        if skipFirstLine:
-            f.readline()
-
-        obj = json.loads(f.read())
-
-    return obj
-
-
-# Reading all language translations into a dictionary by langCode
-def readTranslations(jsonDir):
-    langDict = {}
-    
-    # Read all translation files from the input dir
-    for fileName in os.listdir(jsonDir):
-        
-        fileWithPath = os.path.join(jsonDir, fileName)
-        lf = fileName.lower()
-    
-        # Read only translation_XX.json
-        if lf.startswith("translation_") and lf.endswith(".json"):
-            try:
-                lang = loadJson(fileWithPath, False)
-            except json.decoder.JSONDecodeError as e:
-                print("Failed to decode " + lf)
-                print(str(e))
-                sys.exit(2)
-
-            # Extract lang code from file name
-            langCode = fileName[12:-5].upper()
-            # ...and the one specified in the JSON file...
-            try:
-                langCodeFromJson = lang['languageCode']
-            except KeyError:
-                langCodeFromJson = "(missing)"
-
-            # ...cause they should be the same!
-            if langCode != langCodeFromJson:
-                raise ValueError("Invalid languageCode " + langCodeFromJson + " in file " + fileName)
-            
-            langDict[langCode] = lang
-    
-    return langDict
-
-
-def writeStart(f):
-    f.write(to_unicode("""// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT.
-
-#include "Translation.h"
-#ifndef LANG
-#define LANG_EN
-#endif
-"""))
-
-
-def escapeC(s):
-    return s.replace("\"", "\\\"")
-
-
-def writeLanguage(languageCode, defs, f):
-    print("Generating block for " + languageCode)
-    lang = langDict[languageCode]
-    
-    f.write(to_unicode("\n#ifdef LANG_" + languageCode + "\n"))
-    try:
-        langName = lang['languageLocalName']
-    except KeyError:
-        langName = languageCode
-         
-    f.write(to_unicode("// ---- " + langName + " ----\n\n"))
-
-    try:
-        cyrillic = lang['cyrillicGlyphs']
-    except KeyError:
-        cyrillic = False
-
-    if cyrillic :
-        f.write(to_unicode("#define CYRILLIC_GLYPHS\n\n"))
-        
-    # ----- Writing SettingsDescriptions
-    obj = lang['menuOptions']
-    f.write(to_unicode("const char* SettingsDescriptions[] = {\n"))
-    
-    maxLen = 25
-    for mod in defs['menuOptions']:
-        eid = mod['id']
-        if 'feature' in mod:
-            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
-        f.write(to_unicode("\"" + escapeC(obj[eid]['desc']) + "\",\n"))
-        if 'feature' in mod:
-            f.write(to_unicode("#endif\n"))
-
-    f.write(to_unicode("};\n\n"))
-    
-    # ----- Writing Message strings
-    
-    obj = lang['messages']
-    
-    for mod in defs['messages']:
-        eid = mod['id']
-        f.write(to_unicode("const char* " + eid + " = \"" + escapeC(obj[eid]) + "\";\n"))
-
-    f.write(to_unicode("\n"))
-
-    # ----- Writing Characters
-    
-    obj = lang['characters']
-    
-    for mod in defs['characters']:
-        eid = mod['id']
-        f.write(to_unicode("const char " + eid + " = '" + obj[eid] + "';\n"))
-
-    f.write(to_unicode("\n"))
-    
-    # ----- Menu Options
-
-    # Menu type
-    f.write(to_unicode("const enum ShortNameType SettingsShortNameType = SHORT_NAME_" + ("DOUBLE" if lang['menuDouble'] else "SINGLE") + "_LINE;\n"))
-
-    # ----- Writing SettingsDescriptions
-    obj = lang['menuOptions']
-    f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
-    
-    maxLen = 25
-    for mod in defs['menuOptions']:
-        eid = mod['id']
-        if 'feature' in mod:
-            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
-        if lang['menuDouble']:
-            f.write(to_unicode("{ \"" + escapeC(obj[eid]['text2'][0]) + "\", \"" + escapeC(obj[eid]['text2'][1]) + "\" },\n"))
-        else:
-            f.write(to_unicode("{ \"" + escapeC(obj[eid]['text']) + "\" },\n"))
-        if 'feature' in mod:
-            f.write(to_unicode("#endif\n"))
-                
-    f.write(to_unicode("};\n\n"))
-
-    # ----- Writing Menu Groups
-    obj = lang['menuGroups']
-    f.write(to_unicode("const char* SettingsMenuEntries[" + str(len(obj)) + "] = {\n"))
-    
-    maxLen = 25
-    for mod in defs['menuGroups']:
-        eid = mod['id']
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
-        f.write(to_unicode("\"" + escapeC(obj[eid]['text2'][0] + "\\n" + obj[eid]['text2'][1]) + "\",\n"))
-                
-    f.write(to_unicode("};\n\n"))
-
-    # ----- Writing Menu Groups Descriptions
-    obj = lang['menuGroups']
-    f.write(to_unicode("const char* SettingsMenuEntriesDescriptions[" + str(len(obj)) + "] = {\n"))
-    
-    maxLen = 25
-    for mod in defs['menuGroups']:
-        eid = mod['id']
-        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
-        f.write(to_unicode("\"" + escapeC(obj[eid]['desc']) + "\",\n"))
-                
-    f.write(to_unicode("};\n\n"))
-
-    # ----- Block end    
-    f.write(to_unicode("#endif\n"))
-
-
-def read_opts():
-    """ Reading input parameters
-    First parameter = json directory
-    Second parameter = target directory
-    """
-    if len(sys.argv) > 1:
-        jsonDir = sys.argv[1]
-    else:
-        jsonDir = "."
-
-    if len(sys.argv) > 2:
-        outFile = sys.argv[2]
-    else:
-        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/src/")
-        outFile = os.path.join(outDir, TRANSLATION_CPP)
-
-    if len(sys.argv) > 3:
-        raise Exception("Too many parameters!")
-
-    return jsonDir, outFile
-
-
-def orderOutput(langDict):
-    # These languages go first
-    mandatoryOrder = ['EN']
-
-    # Then add all others in alphabetical order
-    sortedKeys = sorted(langDict.keys())
-
-    # Add the rest as they come
-    for key in sortedKeys:
-        if key not in mandatoryOrder:
-            mandatoryOrder.append(key)
-
-    return mandatoryOrder
-    
-
-def writeTarget(outFile, defs, langCodes):
-    # Start writing the file
-    with io.open(outFile, 'w', encoding='utf-8', newline="\n") as f:
-        writeStart(f)
-
-        for langCode in langCodes:
-            writeLanguage(langCode, defs, f)
-
-
-if __name__ == "__main__":
-    try:
-        jsonDir, outFile = read_opts()
-    except:
-        print("usage: make_translation.py {json dir} {cpp dir}")
-        sys.exit(1)
-
-    print("Making " + outFile + " from " + jsonDir)
-
-    langDict = readTranslations(jsonDir)
-    defs = loadJson(os.path.join(jsonDir, "translations_def.js"), True)
-    langCodes = orderOutput(langDict)
-    writeTarget(outFile, defs, langCodes)
-
-    print("Done")
+#!/usr/bin/env python3
+# coding=utf-8
+from __future__ import print_function
+import json
+import os
+import io
+from datetime import datetime
+import sys
+import fontTables
+TRANSLATION_CPP = "Translation.cpp"
+
+try:
+    to_unicode = unicode
+except NameError:
+    to_unicode = str
+
+
+# Loading a single JSON file
+def loadJson(fileName, skipFirstLine):
+    with io.open(fileName, mode="r", encoding="utf-8") as f:
+        if skipFirstLine:
+            f.readline()
+
+        obj = json.loads(f.read())
+
+    return obj
+
+
+# Reading all language translations into a dictionary by langCode
+def readTranslations(jsonDir):
+    langDict = {}
+
+    # Read all translation files from the input dir
+    for fileName in os.listdir(jsonDir):
+
+        fileWithPath = os.path.join(jsonDir, fileName)
+        lf = fileName.lower()
+
+        # Read only translation_XX.json
+        if lf.startswith("translation_") and lf.endswith(".json"):
+            try:
+                lang = loadJson(fileWithPath, False)
+            except json.decoder.JSONDecodeError as e:
+                print("Failed to decode " + lf)
+                print(str(e))
+                sys.exit(2)
+
+            # Extract lang code from file name
+            langCode = fileName[12:-5].upper()
+            # ...and the one specified in the JSON file...
+            try:
+                langCodeFromJson = lang['languageCode']
+            except KeyError:
+                langCodeFromJson = "(missing)"
+
+            # ...cause they should be the same!
+            if langCode != langCodeFromJson:
+                raise ValueError("Invalid languageCode " + langCodeFromJson +
+                                 " in file " + fileName)
+
+            langDict[langCode] = lang
+
+    return langDict
+
+
+def writeStart(f):
+    f.write(
+        to_unicode(
+            """// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT.
+
+#include "Translation.h"
+#ifndef LANG
+#define LANG_EN
+#endif
+"""))
+
+
+def escapeC(s):
+    return s.replace("\"", "\\\"")
+
+
+def getConstants():
+    # Extra constants that are used in the firmware that are shared across all languages
+    consants = []
+    consants.append(('SymbolPlus', '+'))
+    consants.append(('SymbolMinus', '-'))
+    consants.append(('SymbolSpace', ' '))
+    consants.append(('SymbolDot', '.'))
+    consants.append(('SymbolDegC', 'C'))
+    consants.append(('SymbolDegF', 'F'))
+    consants.append(('SymbolMinutes', 'M'))
+    consants.append(('SymbolSeconds', 'S'))
+    consants.append(('SymbolWatts', 'W'))
+    consants.append(('SymbolVolts', 'V'))
+    consants.append(('SymbolDC', 'DC'))
+    consants.append(('SymbolCellCount', 'S'))
+    consants.append(('SymbolVersionNumber', 'V2.06'))
+    return consants
+
+
+def getTipModelEnumTS80():
+    constants = []
+    constants.append("B02")
+    constants.append("D25")
+    constants.append("TS80")  # end of miniware
+    constants.append("User")  # User
+    return constants
+
+
+def getTipModelEnumTS100():
+    constants = []
+    constants.append("B02")
+    constants.append("D24")
+    constants.append("BC2")
+    constants.append(" C1")
+    constants.append("TS100")  # end of miniware
+    constants.append("BC2")
+    constants.append("Hakko")  # end of hakko
+    constants.append("User")
+    return constants
+
+
+def getDebugMenu():
+    constants = []
+    constants.append(datetime.today().strftime('%d-%m-%y'))
+    constants.append("HW G ")
+    constants.append("HW M ")
+    constants.append("HW P ")
+    constants.append("Time ")
+    constants.append("Move ")
+    constants.append("RTip ")
+    constants.append("CTip ")
+    constants.append("CHan ")
+    constants.append("Vin  ")
+    constants.append("PCB  ")  # PCB Version AKA IMU version
+    return constants
+
+
+def getLetterCounts(defs, lang):
+    textList = []
+    # iterate over all strings
+    obj = lang['menuOptions']
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        textList.append(obj[eid]['desc'])
+
+    obj = lang['messages']
+    for mod in defs['messages']:
+        eid = mod['id']
+        if eid not in obj:
+            textList.append(mod['default'])
+        else:
+            textList.append(obj[eid])
+
+    obj = lang['characters']
+
+    for mod in defs['characters']:
+        eid = mod['id']
+        textList.append(obj[eid])
+
+    obj = lang['menuOptions']
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if lang['menuDouble']:
+            textList.append(obj[eid]['text2'][0])
+            textList.append(obj[eid]['text2'][1])
+        else:
+            textList.append(obj[eid]['text'])
+
+    obj = lang['menuGroups']
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        textList.append(obj[eid]['text2'][0])
+        textList.append(obj[eid]['text2'][1])
+
+    obj = lang['menuGroups']
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        textList.append(obj[eid]['desc'])
+    constants = getConstants()
+    for x in constants:
+        textList.append(x[1])
+    textList.extend(getTipModelEnumTS100())
+    textList.extend(getTipModelEnumTS80())
+    textList.extend(getDebugMenu())
+
+    # collapse all strings down into the composite letters and store totals for these
+
+    symbolCounts = {}
+    for line in textList:
+        line = line.replace('\n', '').replace('\r', '')
+        line = line.replace('\\n', '').replace('\\r', '')
+        if len(line):
+            # print(line)
+            for letter in line:
+                symbolCounts[letter] = symbolCounts.get(letter, 0) + 1
+    symbolCounts = sorted(
+        symbolCounts.items(),
+        key=lambda kv: (kv[1], kv[0]))  # swap to Big -> little sort order
+    symbolCounts = list(map(lambda x: x[0], symbolCounts))
+    symbolCounts.reverse()
+    return symbolCounts
+
+
+def getFontMapAndTable(textList):
+    # the text list is sorted
+    # allocate out these in their order as number codes
+    symbolMap = {}
+    symbolMap['\n'] = '\\x01'  # Force insert the newline char
+    index = 2  # start at 2, as 0= null terminator,1 = new line
+    forcedFirstSymbols = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
+    # enforce numbers are first
+    for sym in forcedFirstSymbols:
+        symbolMap[sym] = "\\x%0.2X" % index
+        index = index + 1
+    if len(textList) > (253 - len(forcedFirstSymbols)):
+        print('Error, too many used symbols for this version')
+        exit(1)
+    print('Generating fonts for {} symbols'.format(len(textList)))
+
+    for sym in textList:
+        if sym not in symbolMap:
+            symbolMap[sym] = "\\x%0.2X" % index
+            index = index + 1
+    # Get the font table
+    fontTableStrings = []
+    fontSmallTableStrings = []
+    fontTable = fontTables.getFontMap()
+    fontSmallTable = fontTables.getSmallFontMap()
+    for sym in forcedFirstSymbols:
+        if sym not in fontTable:
+            print('Missing Large font element for {}'.format(sym))
+            exit(1)
+        fontLine = fontTable[sym]
+        fontTableStrings.append(
+            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+        if sym not in fontSmallTable:
+            print('Missing Small font element for {}'.format(sym))
+            exit(1)
+        fontLine = fontSmallTable[sym]
+        fontSmallTableStrings.append(
+            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+
+    for sym in textList:
+        if sym not in fontTable:
+            print('Missing Large font element for {}'.format(sym))
+            exit(1)
+        if sym not in forcedFirstSymbols:
+            fontLine = fontTable[sym]
+            fontTableStrings.append(
+                fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+            if sym not in fontSmallTable:
+                print('Missing Small font element for {}'.format(sym))
+                exit(1)
+            fontLine = fontSmallTable[sym]
+            fontSmallTableStrings.append(
+                fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+    outputTable = "const uint8_t USER_FONT_12[] = {" + to_unicode("\n")
+    for line in fontTableStrings:
+        # join font table int one large string
+        outputTable = outputTable + line + to_unicode("\n")
+    outputTable = outputTable + "};" + to_unicode("\n")
+    outputTable = outputTable + "const uint8_t USER_FONT_6x8[] = {" + to_unicode(
+        "\n")
+    for line in fontSmallTableStrings:
+        # join font table int one large string
+        outputTable = outputTable + line + to_unicode("\n")
+    outputTable = outputTable + "};" + to_unicode("\n")
+    return (outputTable, symbolMap)
+
+
+def convStr(symbolConversionTable, text):
+    # convert all of the symbols from the string into escapes for their content
+    outputString = ""
+    for c in text.replace('\\r', '').replace('\\n', '\n'):
+        if c not in symbolConversionTable:
+            print('Missing font definition for {}'.format(c))
+        else:
+            outputString = outputString + symbolConversionTable[c]
+    return outputString
+
+
+def writeLanguage(languageCode, defs, f):
+    print("Generating block for " + languageCode)
+    lang = langDict[languageCode]
+    # Iterate over all of the text to build up the symbols & counts
+    textList = getLetterCounts(defs, lang)
+    # From the letter counts, need to make a symbol translator & write out the font
+    (fontTableText, symbolConversionTable) = getFontMapAndTable(textList)
+
+    f.write(to_unicode("\n#ifdef LANG_" + languageCode + "\n"))
+    f.write(fontTableText)
+    try:
+        langName = lang['languageLocalName']
+    except KeyError:
+        langName = languageCode
+
+    f.write(to_unicode("// ---- " + langName + " ----\n\n"))
+
+    # ----- Writing SettingsDescriptions
+    obj = lang['menuOptions']
+    f.write(to_unicode("const char* SettingsDescriptions[] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if 'feature' in mod:
+            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode("\"" +
+                       convStr(symbolConversionTable, (obj[eid]['desc'])) +
+                       "\"," + "//{} \n".format(obj[eid]['desc'])))
+        if 'feature' in mod:
+            f.write(to_unicode("#endif\n"))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Writing Message strings
+
+    obj = lang['messages']
+
+    for mod in defs['messages']:
+        eid = mod['id']
+        sourceText = ""
+        if 'default' in mod:
+            sourceText = (mod['default'])
+        if eid in obj:
+            sourceText = (obj[eid])
+        translatedText = convStr(symbolConversionTable, sourceText)
+        f.write(
+            to_unicode("const char* " + eid + " = \"" +
+                       translatedText + "\";" + "//{} \n".format(sourceText.replace('\n', '_'))))
+
+    f.write(to_unicode("\n"))
+
+    # ----- Writing Characters
+
+    obj = lang['characters']
+
+    for mod in defs['characters']:
+        eid = mod['id']
+        f.write(
+            to_unicode("const char* " + eid + " = \"" +
+                       convStr(symbolConversionTable, obj[eid]) + "\";" + "//{} \n".format(obj[eid])))
+
+    f.write(to_unicode("\n"))
+
+    # Write out firmware constant options
+    constants = getConstants()
+    for x in constants:
+        f.write(
+            to_unicode("const char* " + x[0] + " = \"" +
+                       convStr(symbolConversionTable, x[1]) + "\";" + "//{} \n".format(x[1])))
+
+    f.write(to_unicode("\n"))
+    # Write out tip model strings
+
+    f.write(to_unicode("const char* TipModelStrings[] = {\n"))
+    f.write(to_unicode("#ifdef MODEL_TS100\n"))
+    for c in getTipModelEnumTS100():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
+                                             c) + "\"," + "//{} \n".format(c)))
+    f.write(to_unicode("#else\n"))
+    for c in getTipModelEnumTS80():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
+                                             c) + "\"," + "//{} \n".format(c)))
+    f.write(to_unicode("#endif\n"))
+
+    f.write(to_unicode("};\n\n"))
+
+    # Debug Menu
+    f.write(to_unicode("const char* DebugMenu[] = {\n"))
+
+    for c in getDebugMenu():
+        f.write(to_unicode("\t \"" + convStr(symbolConversionTable,
+                                             c) + "\"," + "//{} \n".format(c)))
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Menu Options
+
+    # Menu type
+    f.write(
+        to_unicode(
+            "const enum ShortNameType SettingsShortNameType = SHORT_NAME_" +
+            ("DOUBLE" if lang['menuDouble'] else "SINGLE") + "_LINE;\n"))
+
+    # ----- Writing SettingsDescriptions
+    obj = lang['menuOptions']
+    f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuOptions']:
+        eid = mod['id']
+        if 'feature' in mod:
+            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        if lang['menuDouble']:
+            f.write(
+                to_unicode(
+                    "{ \"" +
+                    convStr(symbolConversionTable, (obj[eid]['text2'][0])) +
+                    "\", \"" +
+                    convStr(symbolConversionTable, (obj[eid]['text2'][1])) +
+                    "\" }," + "//{} \n".format(obj[eid]['text2'])))
+        else:
+            f.write(
+                to_unicode("{ \"" +
+                           convStr(symbolConversionTable, (obj[eid]['text'])) +
+                           "\" }," + "//{} \n".format(obj[eid]['text'])))
+        if 'feature' in mod:
+            f.write(to_unicode("#endif\n"))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Writing Menu Groups
+    obj = lang['menuGroups']
+    f.write(
+        to_unicode("const char* SettingsMenuEntries[" + str(len(obj)) +
+                   "] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode("\"" +
+                       convStr(symbolConversionTable, (obj[eid]['text2'][0]) +
+                               "\\n" + obj[eid]['text2'][1]) + "\"," + "//{} \n".format(obj[eid]['text2'])))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Writing Menu Groups Descriptions
+    obj = lang['menuGroups']
+    f.write(
+        to_unicode("const char* SettingsMenuEntriesDescriptions[" +
+                   str(len(obj)) + "] = {\n"))
+
+    maxLen = 25
+    for mod in defs['menuGroups']:
+        eid = mod['id']
+        f.write(to_unicode("  /* " + eid.ljust(maxLen)[:maxLen] + " */ "))
+        f.write(
+            to_unicode("\"" +
+                       convStr(symbolConversionTable, (obj[eid]['desc'])) +
+                       "\"," + "//{} \n".format(obj[eid]['desc'])))
+
+    f.write(to_unicode("};\n\n"))
+
+    # ----- Block end
+    f.write(to_unicode("#endif\n"))
+
+
+def read_opts():
+    """ Reading input parameters
+    First parameter = json directory
+    Second parameter = target directory
+    """
+    if len(sys.argv) > 1:
+        jsonDir = sys.argv[1]
+    else:
+        jsonDir = "."
+
+    if len(sys.argv) > 2:
+        outFile = sys.argv[2]
+    else:
+        outDir = os.path.relpath(jsonDir + "/../workspace/TS100/Core/Src")
+        outFile = os.path.join(outDir, TRANSLATION_CPP)
+
+    if len(sys.argv) > 3:
+        raise Exception("Too many parameters!")
+
+    return jsonDir, outFile
+
+
+def orderOutput(langDict):
+    # These languages go first
+    mandatoryOrder = ['EN']
+
+    # Then add all others in alphabetical order
+    sortedKeys = sorted(langDict.keys())
+
+    # Add the rest as they come
+    for key in sortedKeys:
+        if key not in mandatoryOrder:
+            mandatoryOrder.append(key)
+
+    return mandatoryOrder
+
+
+def writeTarget(outFile, defs, langCodes):
+    # Start writing the file
+    with io.open(outFile, 'w', encoding='utf-8', newline="\n") as f:
+        writeStart(f)
+
+        for langCode in langCodes:
+            writeLanguage(langCode, defs, f)
+
+
+if __name__ == "__main__":
+    try:
+        jsonDir, outFile = read_opts()
+    except:
+        print("usage: make_translation.py {json dir} {cpp dir}")
+        sys.exit(1)
+
+    print("Making " + outFile + " from " + jsonDir)
+
+    langDict = readTranslations(jsonDir)
+    defs = loadJson(os.path.join(jsonDir, "translations_def.js"), True)
+    langCodes = orderOutput(langDict)
+    writeTarget(outFile, defs, langCodes)
+
+    print("Done")
--- a/Editor/translation_bg.json
+++ b/Editor/translation_bg.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "ВРЪХ ЛОША ВРЪЗКА",
 		"SolderingAdvancedPowerPrompt": "Захранване: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
--- a/Editor/translation_cs.json
+++ b/Editor/translation_cs.json
@@ -3,24 +3,26 @@
 	"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",
@@ -36,7 +38,7 @@
 				"Pájecí",
 				"nastavení"
 			],
-			"desc": "Nastavení pájení (boost, auto start...)"
+			"desc": "Nastavení pájení (boost, auto start...)."
 		},
 		"PowerSavingMenu": {
 			"text2": [
@@ -57,7 +59,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 +69,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 +85,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 +93,7 @@
 				"Čas do",
 				"vypnutí"
 			],
-			"desc": "Čas do automatického vypnutí <Minut>"
+			"desc": "Čas do automatického vypnutí <Minut>."
 		},
 		"MotionSensitivity": {
 			"text": "",
@@ -99,7 +101,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 +109,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 +125,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 +133,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 +146,7 @@
 		"AutoStart": {
 			"text": "",
 			"text2": [
-				"Auto",
+				"Automatický",
 				"start"
 			],
 			"desc": "Při startu ihned nahřát hrot?"
@@ -195,39 +197,39 @@
 				"Rychlost",
 				"popisků"
 			],
-			"desc": "Rychlost skrolování popisků podobných tomuto <P=Pomalu,R=Rychle>"
+			"desc": "Rychlost posuvu popisků podobných tomuto <P=Pomalu, R=Rychle>"
 		},
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
-				"Model"
+				"Model",
+				"hrotu"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Výběr modelu hrotu."
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Jednoduchá",
+				"kalibrace"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Jednoduchá kalibrace pomocí horké vody."
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Pokročilá",
+				"kalibrace"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Pokročilá kalibrace pomocí termočlánku na hrotu."
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Výkon",
+				"ve wattech"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Výkon použítého napájecího adaptéru ve wattech."
 		}
 	}
 }
--- a/Editor/translation_da.json
+++ b/Editor/translation_da.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "H",
--- a/Editor/translation_de.json
+++ b/Editor/translation_de.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Soll:",
 		"TipDisconnectedString": "Spitze fehlt",
 		"SolderingAdvancedPowerPrompt": "Leistung: ",
-		"OffString": "Aus"
+		"OffString": "Aus",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
--- a/Editor/translation_en.json
+++ b/Editor/translation_en.json
@@ -1,233 +1,236 @@
-{
-	"languageCode": "EN",
-	"languageLocalName": "English",
-	"cyrillicGlyphs": false,
-	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
-		"SettingsResetWarning": "Are you sure you want to reset settings to default values?",
-		"UVLOWarningString": "DC LOW",
-		"UndervoltageString": "Undervoltage",
-		"InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip Temp: ",
-		"BadTipString": "BAD TIP",
-		"SleepingSimpleString": "Zzzz",
-		"SleepingAdvancedString": "Sleeping...",
-		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "!!! TIP HOT !!!",
-		"SleepingTipAdvancedString": "Tip:",
-		"IdleTipString": "Tip:",
-		"IdleSetString": " Set:",
-		"TipDisconnectedString": "TIP DISCONNECTED",
-		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
-	},
-	"characters": {
-		"SettingRightChar": "R",
-		"SettingLeftChar": "L",
-		"SettingAutoChar": "A",
-		"SettingFastChar": "F",
-		"SettingSlowChar": "S"
-	},
-	"menuDouble": true,
-	"menuGroups": {
-		"SolderingMenu": {
-			"text2": [
-				"Soldering",
-				"Settings"
-			],
-			"desc": "Soldering settings"
-		},
-		"PowerSavingMenu": {
-			"text2": [
-				"Sleep",
-				"Modes"
-			],
-			"desc": "Power saving settings"
-		},
-		"UIMenu": {
-			"text2": [
-				"User",
-				"Interface"
-			],
-			"desc": "User interface settings"
-		},
-		"AdvancedMenu": {
-			"text2": [
-				"Advanced",
-				"Options"
-			],
-			"desc": "Advanced options"
-		}
-	},
-	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
-			"text2": [
-				"Power",
-				"source"
-			],
-			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>"
-		},
-		"SleepTemperature": {
-			"text": "STMP",
-			"text2": [
-				"Sleep",
-				"temp"
-			],
-			"desc": "Sleep Temperature <C>"
-		},
-		"SleepTimeout": {
-			"text": "STME",
-			"text2": [
-				"Sleep",
-				"timeout"
-			],
-			"desc": "Sleep Timeout <Minutes/Seconds>"
-		},
-		"ShutdownTimeout": {
-			"text": "SHTME",
-			"text2": [
-				"Shutdown",
-				"timeout"
-			],
-			"desc": "Shutdown Timeout <Minutes>"
-		},
-		"MotionSensitivity": {
-			"text": "MSENSE",
-			"text2": [
-				"Motion",
-				"sensitivity"
-			],
-			"desc": "Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>"
-		},
-		"TemperatureUnit": {
-			"text": "TMPUNT",
-			"text2": [
-				"Temperature",
-				"units"
-			],
-			"desc": "Temperature Unit <C=Celsius F=Fahrenheit>"
-		},
-		"AdvancedIdle": {
-			"text": "ADVIDL",
-			"text2": [
-				"Detailed",
-				"idle screen"
-			],
-			"desc": "Display detailed information in a smaller font on the idle screen."
-		},
-		"DisplayRotation": {
-			"text": "DSPROT",
-			"text2": [
-				"Display",
-				"orientation"
-			],
-			"desc": "Display Orientation <A. Automatic L. Left Handed R. Right Handed>"
-		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"Boost mode",
-				"enabled"
-			],
-			"desc": "Enable front key enters boost mode 450C mode when soldering"
-		},
-		"BoostTemperature": {
-			"text": "BTMP",
-			"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Temperature when in \"boost\" mode"
-		},
-		"AutoStart": {
-			"text": "ASTART",
-			"text2": [
-				"Auto",
-				"start"
-			],
-			"desc": "Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off"
-		},
-		"CooldownBlink": {
-			"text": "CLBLNK",
-			"text2": [
-				"Cooldown",
-				"blink"
-			],
-			"desc": "Blink the temperature on the cooling screen while the tip is still hot."
-		},
-		"TemperatureCalibration": {
-			"text": "TMP CAL?",
-			"text2": [
-				"Calibrate",
-				"temperature?"
-			],
-			"desc": "Calibrate tip offset."
-		},
-		"SettingsReset": {
-			"text": "RESET?",
-			"text2": [
-				"Factory",
-				"Reset?"
-			],
-			"desc": "Reset all settings"
-		},
-		"VoltageCalibration": {
-			"text": "CAL VIN?",
-			"text2": [
-				"Calibrate",
-				"input voltage?"
-			],
-			"desc": "VIN Calibration. Buttons adjust, long press to exit"
-		},
-		"AdvancedSoldering": {
-			"text": "ADVSLD",
-			"text2": [
-				"Detailed",
-				"solder screen"
-			],
-			"desc": "Display detailed information while soldering"
-		},
-		"ScrollingSpeed": {
-			"text": "DESCSP",
-			"text2": [
-				"Scrolling",
-				"Speed"
-			],
-			"desc": "Speed this text scrolls past at"
-		},
-		"TipModel": {
-			"text": "TIPMO",
-			"text2": [
-				"Tip",
-				"Model"
-			],
-			"desc": "Tip Model selection"
-		},
-		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
-			"text2": [
-				"Simple",
-				"Calibration"
-			],
-			"desc": "Simple Calibration using Hot water"
-		},
-		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
-			"text2": [
-				"Advanced",
-				"Calibration"
-			],
-			"desc": "Advanced calibration using thermocouple on the tip"
-		},
-		"PowerInput": {
-			"text": "PWRW",
-			"text2": [
-				"Power",
-				"Wattage"
-			],
-			"desc": "Power Wattage of the power adapter used"
-		}
-	}
+{
+	"languageCode": "EN",
+	"languageLocalName": "English",
+	"cyrillicGlyphs": false,
+	"messages": {
+		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
+		"SettingsResetWarning": "Are you sure you want to reset settings to default values?",
+		"UVLOWarningString": "DC LOW",
+		"UndervoltageString": "Undervoltage",
+		"InputVoltageString": "Input V: ",
+		"WarningTipTempString": "Tip Temp: ",
+		"BadTipString": "BAD TIP",
+		"SleepingSimpleString": "Zzzz",
+		"SleepingAdvancedString": "Sleeping...",
+		"WarningSimpleString": "HOT!",
+		"WarningAdvancedString": "!!! TIP HOT !!!",
+		"SleepingTipAdvancedString": "Tip:",
+		"IdleTipString": "Tip:",
+		"IdleSetString": " Set:",
+		"TipDisconnectedString": "TIP DISCONNECTED",
+		"SolderingAdvancedPowerPrompt": "Power: ",
+		"OffString": "Off",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your Gain:",
+		"SettingsResetMessage": "Settings were\nreset!"
+	},
+	"characters": {
+		"SettingRightChar": "R",
+		"SettingLeftChar": "L",
+		"SettingAutoChar": "A",
+		"SettingFastChar": "F",
+		"SettingSlowChar": "S"
+	},
+	"menuDouble": true,
+	"menuGroups": {
+		"SolderingMenu": {
+			"text2": [
+				"Soldering",
+				"Settings"
+			],
+			"desc": "Soldering settings"
+		},
+		"PowerSavingMenu": {
+			"text2": [
+				"Sleep",
+				"Modes"
+			],
+			"desc": "Power saving settings"
+		},
+		"UIMenu": {
+			"text2": [
+				"User",
+				"Interface"
+			],
+			"desc": "User interface settings"
+		},
+		"AdvancedMenu": {
+			"text2": [
+				"Advanced",
+				"Options"
+			],
+			"desc": "Advanced options"
+		}
+	},
+	"menuOptions": {
+		"PowerSource": {
+			"text": "PWRSC",
+			"text2": [
+				"Power",
+				"source"
+			],
+			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell>"
+		},
+		"SleepTemperature": {
+			"text": "STMP",
+			"text2": [
+				"Sleep",
+				"temp"
+			],
+			"desc": "Sleep Temperature <C>"
+		},
+		"SleepTimeout": {
+			"text": "STME",
+			"text2": [
+				"Sleep",
+				"timeout"
+			],
+			"desc": "Sleep Timeout <Minutes/Seconds>"
+		},
+		"ShutdownTimeout": {
+			"text": "SHTME",
+			"text2": [
+				"Shutdown",
+				"timeout"
+			],
+			"desc": "Shutdown Timeout <Minutes>"
+		},
+		"MotionSensitivity": {
+			"text": "MSENSE",
+			"text2": [
+				"Motion",
+				"sensitivity"
+			],
+			"desc": "Motion Sensitivity <0.Off 1.least sensitive 9.most sensitive>"
+		},
+		"TemperatureUnit": {
+			"text": "TMPUNT",
+			"text2": [
+				"Temperature",
+				"units"
+			],
+			"desc": "Temperature Unit <C=Celsius F=Fahrenheit>"
+		},
+		"AdvancedIdle": {
+			"text": "ADVIDL",
+			"text2": [
+				"Detailed",
+				"idle screen"
+			],
+			"desc": "Display detailed information in a smaller font on the idle screen."
+		},
+		"DisplayRotation": {
+			"text": "DSPROT",
+			"text2": [
+				"Display",
+				"orientation"
+			],
+			"desc": "Display Orientation <A. Automatic L. Left Handed R. Right Handed>"
+		},
+		"BoostEnabled": {
+			"text": "BOOST",
+			"text2": [
+				"Boost mode",
+				"enabled"
+			],
+			"desc": "Enable front key enters boost mode 450C mode when soldering"
+		},
+		"BoostTemperature": {
+			"text": "BTMP",
+			"text2": [
+				"Boost",
+				"temp"
+			],
+			"desc": "Temperature when in \"boost\" mode"
+		},
+		"AutoStart": {
+			"text": "ASTART",
+			"text2": [
+				"Auto",
+				"start"
+			],
+			"desc": "Automatically starts the iron into soldering on power up. T=Soldering, S= Sleep mode,F=Off"
+		},
+		"CooldownBlink": {
+			"text": "CLBLNK",
+			"text2": [
+				"Cooldown",
+				"blink"
+			],
+			"desc": "Blink the temperature on the cooling screen while the tip is still hot."
+		},
+		"TemperatureCalibration": {
+			"text": "TMP CAL?",
+			"text2": [
+				"Calibrate",
+				"temperature?"
+			],
+			"desc": "Calibrate tip offset."
+		},
+		"SettingsReset": {
+			"text": "RESET?",
+			"text2": [
+				"Factory",
+				"Reset?"
+			],
+			"desc": "Reset all settings"
+		},
+		"VoltageCalibration": {
+			"text": "CAL VIN?",
+			"text2": [
+				"Calibrate",
+				"input voltage?"
+			],
+			"desc": "VIN Calibration. Buttons adjust, long press to exit"
+		},
+		"AdvancedSoldering": {
+			"text": "ADVSLD",
+			"text2": [
+				"Detailed",
+				"solder screen"
+			],
+			"desc": "Display detailed information while soldering"
+		},
+		"ScrollingSpeed": {
+			"text": "DESCSP",
+			"text2": [
+				"Scrolling",
+				"Speed"
+			],
+			"desc": "Speed this text scrolls past at"
+		},
+		"TipModel": {
+			"text": "TIPMO",
+			"text2": [
+				"Tip",
+				"Model"
+			],
+			"desc": "Tip Model selection"
+		},
+		"SimpleCalibrationMode": {
+			"text": "SMPCAL",
+			"text2": [
+				"Simple",
+				"Calibration"
+			],
+			"desc": "Simple Calibration using Hot water"
+		},
+		"AdvancedCalibrationMode": {
+			"text": "ADVCAL",
+			"text2": [
+				"Advanced",
+				"Calibration"
+			],
+			"desc": "Advanced calibration using thermocouple on the tip"
+		},
+		"PowerInput": {
+			"text": "PWRW",
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Power Wattage of the power adapter used"
+		}
+	}
 }
--- a/Editor/translation_es.json
+++ b/Editor/translation_es.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Aj:",
 		"TipDisconnectedString": "SIN PUNTA",
 		"SolderingAdvancedPowerPrompt": "POTENCIA: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
--- a/Editor/translation_fi.json
+++ b/Editor/translation_fi.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Asetus:",
 		"TipDisconnectedString": "KÄRKI ON IRTI",
 		"SolderingAdvancedPowerPrompt": "Teho: ",
-		"OffString": "OFF"
+		"OffString": "OFF",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "O",
--- a/Editor/translation_fr.json
+++ b/Editor/translation_fr.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "PANNE DÉBRANCHÉE",
 		"SolderingAdvancedPowerPrompt": "Puissance: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
--- a/Editor/translation_hr.json
+++ b/Editor/translation_hr.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "VRH NIJE SPOJEN!",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
--- a/Editor/translation_hu.json
+++ b/Editor/translation_hu.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Cél:",
 		"TipDisconnectedString": "HEGY LEVÉVE",
 		"SolderingAdvancedPowerPrompt": "Telj: ",
-		"OffString": "Ki"
+		"OffString": "Ki",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "J",
--- a/Editor/translation_it.json
+++ b/Editor/translation_it.json
@@ -16,11 +16,12 @@
 		"WarningSimpleString": "HOT!",
 		"WarningAdvancedString": "PUNTA CALDA!",
 		"SleepingTipAdvancedString": "Punta:",
-		"IdleTipString": "Punta:",
+		"IdleTipString": "T punta:",
 		"IdleSetString": "/",
 		"TipDisconnectedString": "PUNTA ASSENTE",
-		"SolderingAdvancedPowerPrompt": "Potenza:",
-		"OffString": "OFF"
+		"SolderingAdvancedPowerPrompt": "Potenz:",
+		"OffString": "OFF",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -112,10 +113,10 @@
 		"AdvancedIdle": {
 			"text": "",
 			"text2": [
-				"Mostra",
-				"dettagli"
+				"Interfaccia",
+				"testuale"
 			],
-			"desc": "Mostra informazioni dettagliate con un carattere più piccolo all'interno della schermata principale"
+			"desc": "Mostra informazioni dettagliate all'interno della schermata principale"
 		},
 		"DisplayRotation": {
 			"text": "",
@@ -131,7 +132,7 @@
 				"Funzione",
 				"«Turbo»"
 			],
-			"desc": "Il tasto superiore attiva la funzione «Turbo» durante la modalità Saldatura"
+			"desc": "Attiva la funzione «Turbo», durante la modalità Saldatura, tenendo premuto il tasto superiore"
 		},
 		"BoostTemperature": {
 			"text": "",
@@ -201,7 +202,7 @@
 			"text": "TIPMO",
 			"text2": [
 				"Modello",
-				"della punta"
+				"punta"
 			],
 			"desc": "Seleziona il modello della punta in uso"
 		},
@@ -227,7 +228,7 @@
 				"Potenza",
 				"alimentaz"
 			],
-			"desc": "Imposta la potenza dell'alimentatore in uso"
+			"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
 		}
 	}
 }
--- a/Editor/translation_lt.json
+++ b/Editor/translation_lt.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Nust:",
 		"TipDisconnectedString": "ANTGAL ATJUNGTAS",
 		"SolderingAdvancedPowerPrompt": "Maitinimas: ",
-		"OffString": "Išj"
+		"OffString": "Išj",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
--- a/Editor/translation_nl.json
+++ b/Editor/translation_nl.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "TIP LOSGEKOPPELD",
 		"SolderingAdvancedPowerPrompt": "vermogen: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
--- a/Editor/translation_nl_be.json
+++ b/Editor/translation_nl_be.json
@@ -20,7 +20,8 @@
 		"IdleSetString": "Stel in:",
 		"TipDisconnectedString": "Punt ONTKOPPELD",
 		"SolderingAdvancedPowerPrompt": "Vermogen: ",
-		"OffString": "Uit"
+		"OffString": "Uit",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
--- a/Editor/translation_no.json
+++ b/Editor/translation_no.json
@@ -20,7 +20,8 @@
 		"IdleSetString": "Set:",
 		"TipDisconnectedString": "SPISS FRAKOBLET",
 		"SolderingAdvancedPowerPrompt": "Effekt: ",
-		"OffString": "Av"
+		"OffString": "Av",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "H",
--- a/Editor/translation_pl.json
+++ b/Editor/translation_pl.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Ustaw:",
 		"TipDisconnectedString": "GROT ODŁĄCZONY",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Wyłącz"
+		"OffString": "Wyłącz",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "P",
--- a/Editor/translation_pt.json
+++ b/Editor/translation_pt.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Aj:",
 		"TipDisconnectedString": "SEM PONTA",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
--- a/Editor/translation_ru.json
+++ b/Editor/translation_ru.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " ->",
 		"TipDisconnectedString": "Жало отключено",
 		"SolderingAdvancedPowerPrompt": "Питание: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "П",
--- a/Editor/translation_sk.json
+++ b/Editor/translation_sk.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Set:",
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"OffString": "Off",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "R",
--- a/Editor/translation_sl.json
+++ b/Editor/translation_sl.json
@@ -0,0 +1,235 @@
+{
+	"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"
+	},
+	"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"
+		}
+	}
+}
--- a/Editor/translation_sr_cyrl.json
+++ b/Editor/translation_sr_cyrl.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
 		"SolderingAdvancedPowerPrompt": "Снага: ",
-		"OffString": "Иск"
+		"OffString": "Иск",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "Д",
--- a/Editor/translation_sr_latn.json
+++ b/Editor/translation_sr_latn.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " / ",
 		"TipDisconnectedString": "VRH NIJE SPOJEN",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
-		"OffString": "Isk"
+		"OffString": "Isk",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "D",
--- a/Editor/translation_sv.json
+++ b/Editor/translation_sv.json
@@ -20,7 +20,8 @@
 		"IdleSetString": " Ange:",
 		"TipDisconnectedString": "SPETS URTAGEN",
 		"SolderingAdvancedPowerPrompt": "Ström: ",
-		"OffString": "Av"
+		"OffString": "Av",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
 		"SettingRightChar": "H",
--- a/Editor/translation_tr.json
+++ b/Editor/translation_tr.json
@@ -1,26 +1,27 @@
 {
 	"languageCode": "TR",
-	"languageLocalName": "Türk",
+	"languageLocalName": "Türkçe",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Kalibrasyon tamamlandı!",
 		"SettingsCalibrationWarning": "Lütfen devam etmeden önce ucun oda sıcaklığında olduğunu garantiye alın!",
-		"SettingsResetWarning": "Are you sure to reset settings to default values?",
+		"SettingsResetWarning": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz?",
 		"UVLOWarningString": "DC LOW",
-		"UndervoltageString": "Undervoltage",
-		"InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip Temp: ",
-		"BadTipString": "BAD TIP",
+		"UndervoltageString": "Düşüş Voltaj",
+		"InputVoltageString": "Giriş V: ",
+		"WarningTipTempString": "Uç Sıcaklığı: ",
+		"BadTipString": "KÖTÜ UÇ",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Uyuyor...",
-		"WarningSimpleString": "HOT!",
+		"WarningSimpleString": "SICAK!",
 		"WarningAdvancedString": "UYARI! UÇ SICAK!",
-		"SleepingTipAdvancedString": "Tip:",
-		"IdleTipString": "Tip:",
-		"IdleSetString": " Set:",
-		"TipDisconnectedString": "TIP DISCONNECTED",
-		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off"
+		"SleepingTipAdvancedString": "Uç:",
+		"IdleTipString": "Uç:",
+		"IdleSetString": " Ayarla:",
+		"TipDisconnectedString": "UÇ ÇIKARILDI",
+		"SolderingAdvancedPowerPrompt": "Güç: ",
+		"OffString": "Kapalı",
+		"ResetOKMessage":"Reset Tamam"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -33,31 +34,31 @@
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Soldering",
-				"Settings"
+				"Lehimleme",
+				"Ayarları"
 			],
-			"desc": "Soldering settings"
+			"desc": "Lehimleme Ayarları"
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Sleep",
-				"Modes"
+				"Uyku",
+				"Modları"
 			],
-			"desc": "Power Saving Settings"
+			"desc": "Güç Tasarrufu Ayarları"
 		},
 		"UIMenu": {
 			"text2": [
-				"User",
-				"Interface"
+				"Kullanıcı",
+				"Arayüzü"
 			],
-			"desc": "User Interface settings"
+			"desc": "Kullanıcı Arayüzü Ayarları"
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Advanced",
-				"Options"
+				"Gelişmiş",
+				"Ayarlar"
 			],
-			"desc": "Advanced options"
+			"desc": "Gelişmiş Ayarlar"
 		}
 	},
 	"menuOptions": {
@@ -200,34 +201,34 @@
 		"TipModel": {
 			"text": "TIPMO",
 			"text2": [
-				"Tip",
-				"Model"
+				"Uç",
+				"Modeli"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Uç Modeli seçimi"
 		},
 		"SimpleCalibrationMode": {
 			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Basit",
+				"Kalibrasyon"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Sıcak su kullanarak basit kalibrasyon"
 		},
 		"AdvancedCalibrationMode": {
 			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Gelişmiş",
+				"Kalibrasyon"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Uçtaki ısı sensörünü kullanarak gelişmiş kalibrasyon"
 		},
 		"PowerInput": {
 			"text": "PWRW",
 			"text2": [
-				"Power",
-				"Wattage"
+				"Güç",
+				"Miktarı(W)"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Kullanılan adaptörün güç miktarı"
 		}
 	}
 }
--- a/Editor/translation_uk.json
+++ b/Editor/translation_uk.json
@@ -3,7 +3,7 @@
 	"languageLocalName": "Українська",
 	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+		"SettingsCalibrationDone": "Калібрування виконане!",
 		"SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!",
 		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням?",
 		"UVLOWarningString": "АККУМ--",
@@ -20,11 +20,12 @@
 		"IdleSetString": " ->",
 		"TipDisconnectedString": "Жало вимкнено!",
 		"SolderingAdvancedPowerPrompt": "Живлення: ",
-		"OffString": "Вим"
+		"OffString": "Вимк",
+		"ResetOKMessage":"Reset OK"
 	},
 	"characters": {
-		"SettingRightChar": "R",
-		"SettingLeftChar": "L",
+		"SettingRightChar": "П",
+		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
 		"SettingFastChar": "+",
 		"SettingSlowChar": "-"
@@ -33,15 +34,15 @@
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Пайка",
-				""
+				"Параметри",
+				"пайки"
 			],
 			"desc": "Налаштування для режиму пайки. Діють при включеному жалі."
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Сон",
-				""
+				"Режим",
+				"сну"
 			],
 			"desc": "Налаштування при бездіяльності. Корисно що б не обпектися і з часом не спалити житло."
 		},
@@ -50,24 +51,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 +81,10 @@
 		"SleepTimeout": {
 			"text": "",
 			"text2": [
-				"Таймаут",
+				"Тайм-аут",
 				"сну"
 			],
-			"desc": "Час до переходу в режим очікування <Доступно отключение>"
+			"desc": "Час до переходу в режим очікування <Хвилини>"
 		},
 		"ShutdownTimeout": {
 			"text": "",
@@ -91,7 +92,7 @@
 				"Часу до",
 				"вимкнення"
 			],
-			"desc": "Час до відключення <Доступно відключення>"
+			"desc": "Час до відключення <Хвилини>"
 		},
 		"MotionSensitivity": {
 			"text": "",
@@ -99,7 +100,7 @@
 				"Чутл. сенсо-",
 				"ру руху"
 			],
-			"desc": "Акселерометр <0 - Викл. 1 хв. чутливості 9 - макс. чутливості>"
+			"desc": "Акселерометр <0 - Вимк. 1 хв. чутливості 9 - макс. чутливості>"
 		},
 		"TemperatureUnit": {
 			"text": "",
@@ -115,7 +116,7 @@
 				"Детальний ре-",
 				"жим очікуван."
 			],
-			"desc": "Показувати детальну в режимі налаштувань <Замість картинки>"
+			"desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
 		},
 		"DisplayRotation": {
 			"text": "",
@@ -123,7 +124,7 @@
 				"Автоповорот",
 				"екрану"
 			],
-			"desc": "Орієнтація дисплея <A - Автоповорот, L - Лівша, R - Правша>"
+			"desc": "Орієнтація дисплея <A - Автоповорот, Л - Лівша, П - Правша>"
 		},
 		"BoostEnabled": {
 			"text": "",
@@ -147,7 +148,7 @@
 				"Гарячий",
 				"старт"
 			],
-			"desc": "Автоматичний перехід в режим пайки при включенні живлення."
+			"desc": "Автоматичний перехід в режим пайки при ввімкнені живлення."
 		},
 		"CooldownBlink": {
 			"text": "",
@@ -171,13 +172,13 @@
 				"Скинути всі",
 				"налаштування?"
 			],
-			"desc": "Скидання всіх параметрів до вихідних значень."
+			"desc": "Скидання всіх параметрів до стандартних значень."
 		},
 		"VoltageCalibration": {
 			"text": "",
 			"text2": [
 				"Калібровка",
-				"напруга"
+				"напруги"
 			],
 			"desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
 		},
@@ -200,34 +201,34 @@
 		"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": "Потужність джерела живлення в Ватах"
 		}
 	}
 }
--- a/Editor/translations_def.js
+++ b/Editor/translations_def.js
@@ -1,232 +1,246 @@
-var def =
-{
-	"messages": [
-		{
-			"id": "SettingsCalibrationDone"
-		},
-		{
-			"id": "SettingsCalibrationWarning"
-		},
-		{
-			"id": "SettingsResetWarning"
-		},
-		{
-			"id": "UVLOWarningString",
-			"maxLen": 8
-		},
-		{
-			"id": "UndervoltageString",
-			"maxLen": 16
-		},
-		{
-			"id": "InputVoltageString",
-			"maxLen": 11,
-			"note": "Preferably end with a space"
-		},
-		{
-			"id": "WarningTipTempString",
-			"maxLen": 12,
-			"note": "Preferably end with a space"
-		},
-		{
-			"id": "BadTipString",
-			"maxLen": 8
-		},
-		{
-			"id": "SleepingSimpleString",
-			"maxLen": 4
-		},
-		{
-			"id": "SleepingAdvancedString",
-			"maxLen": 16
-		},
-		{
-			"id": "WarningSimpleString",
-			"maxLen": 4
-		},
-		{
-			"id": "WarningAdvancedString",
-			"maxLen": 16
-		},
-		{
-			"id": "SleepingTipAdvancedString",
-			"maxLen": 6
-		},
-		{
-			"id": "IdleTipString",
-			"lenSum":
-			{
-				"fields": ["IdleTipString", "IdleSetString"],
-				"maxLen": 10
-			}
-		},
-		{
-			"id": "IdleSetString",
-			"lenSum":
-			{
-				"fields": ["IdleTipString", "IdleSetString"],
-				"maxLen": 10
-			},
-			"note": "Preferably start with a space"
-		},
-		{
-			"id": "TipDisconnectedString",
-			"maxLen": 16
-		},
-		{
-			"id": "SolderingAdvancedPowerPrompt",
-			"maxLen": null
-		},
-		{
-			"id": "OffString",
-			"maxLen": 3
-		}
-	],
-	"characters": [
-		{
-			"id": "SettingRightChar",
-			"len": 1
-		},
-		{
-			"id": "SettingLeftChar",
-			"len": 1
-		},
-		{
-			"id": "SettingAutoChar",
-			"len": 1
-		},
-		{
-			"id": "SettingFastChar",
-			"len": 1
-		},
-		{
-			"id": "SettingSlowChar",
-			"len": 1
-		}
-	],
-	"menuGroups": [
-		{
-			"id": "SolderingMenu",
-			"maxLen": 11
-		},
-		{
-			"id": "PowerSavingMenu",
-			"maxLen": 11
-		},
-		{
-			"id": "UIMenu",
-			"maxLen": 11
-		},
-		{
-			"id": "AdvancedMenu",
-			"maxLen": 11
-		}
-	],
-	"menuOptions": [
-		{
-			"id": "PowerSource",
-			"maxLen": 5,
-			"maxLen2": 11
-		},
-		{
-			"id": "SleepTemperature",
-			"maxLen": 4,
-			"maxLen2": 9
-		},
-		{
-			"id": "SleepTimeout",
-			"maxLen": 4,
-			"maxLen2": 9
-		},
-		{
-			"id": "ShutdownTimeout",
-			"maxLen": 5,
-			"maxLen2": 11
-		},
-		{
-			"id": "MotionSensitivity",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "TemperatureUnit",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "AdvancedIdle",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "DisplayRotation",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "BoostEnabled",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "BoostTemperature",
-			"maxLen": 4,
-			"maxLen2": 9
-		},
-		{
-			"id": "AutoStart",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "CooldownBlink",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "TemperatureCalibration",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "SettingsReset",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "VoltageCalibration",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "AdvancedSoldering",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
-		{
-			"id": "ScrollingSpeed",
-			"maxLen": 6,
-			"maxLen2": 11
-		},
-		{
-			"id": "TipModel",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "SimpleCalibrationMode",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "AdvancedCalibrationMode",
-			"maxLen": 8,
-			"maxLen2": 16
-		},
-		{
-			"id": "PowerInput",
-			"maxLen": 8,
-			"maxLen2": 16
-		}
-	]
-}
+var def =
+{
+	"messages": [
+		{
+			"id": "SettingsCalibrationDone"
+		},
+		{
+			"id": "SettingsCalibrationWarning"
+		},
+		{
+			"id": "SettingsResetWarning"
+		},
+		{
+			"id": "UVLOWarningString",
+			"maxLen": 8
+		},
+		{
+			"id": "UndervoltageString",
+			"maxLen": 16
+		},
+		{
+			"id": "InputVoltageString",
+			"maxLen": 11,
+			"note": "Preferably end with a space"
+		},
+		{
+			"id": "WarningTipTempString",
+			"maxLen": 12,
+			"note": "Preferably end with a space"
+		},
+		{
+			"id": "BadTipString",
+			"maxLen": 8
+		},
+		{
+			"id": "SleepingSimpleString",
+			"maxLen": 4
+		},
+		{
+			"id": "SleepingAdvancedString",
+			"maxLen": 16
+		},
+		{
+			"id": "WarningSimpleString",
+			"maxLen": 4
+		},
+		{
+			"id": "WarningAdvancedString",
+			"maxLen": 16
+		},
+		{
+			"id": "SleepingTipAdvancedString",
+			"maxLen": 6
+		},
+		{
+			"id": "IdleTipString",
+			"lenSum":
+			{
+				"fields": ["IdleTipString", "IdleSetString"],
+				"maxLen": 10
+			}
+		},
+		{
+			"id": "IdleSetString",
+			"lenSum":
+			{
+				"fields": ["IdleTipString", "IdleSetString"],
+				"maxLen": 10
+			},
+			"note": "Preferably start with a space"
+		},
+		{
+			"id": "TipDisconnectedString",
+			"maxLen": 16
+		},
+		{
+			"id": "SolderingAdvancedPowerPrompt",
+			"maxLen": null
+		},
+		{
+			"id": "OffString",
+			"maxLen": 3
+		},
+		{
+			"id": "ResetOKMessage",
+			"maxLen": 8
+		},
+		{
+			"id": "YourGainMessage",
+			"maxLen": 8,
+			"default": "Your Gain"
+		},
+		{
+			"id": "SettingsResetMessage",
+			"maxLen": 16,
+			"default": "Settings were\nreset!"
+		}
+	],
+	"characters": [
+		{
+			"id": "SettingRightChar",
+			"len": 1
+		},
+		{
+			"id": "SettingLeftChar",
+			"len": 1
+		},
+		{
+			"id": "SettingAutoChar",
+			"len": 1
+		},
+		{
+			"id": "SettingFastChar",
+			"len": 1
+		},
+		{
+			"id": "SettingSlowChar",
+			"len": 1
+		}
+	],
+	"menuGroups": [
+		{
+			"id": "SolderingMenu",
+			"maxLen": 11
+		},
+		{
+			"id": "PowerSavingMenu",
+			"maxLen": 11
+		},
+		{
+			"id": "UIMenu",
+			"maxLen": 11
+		},
+		{
+			"id": "AdvancedMenu",
+			"maxLen": 11
+		}
+	],
+	"menuOptions": [
+		{
+			"id": "PowerSource",
+			"maxLen": 5,
+			"maxLen2": 11
+		},
+		{
+			"id": "SleepTemperature",
+			"maxLen": 4,
+			"maxLen2": 9
+		},
+		{
+			"id": "SleepTimeout",
+			"maxLen": 4,
+			"maxLen2": 9
+		},
+		{
+			"id": "ShutdownTimeout",
+			"maxLen": 5,
+			"maxLen2": 11
+		},
+		{
+			"id": "MotionSensitivity",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "TemperatureUnit",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "AdvancedIdle",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "DisplayRotation",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "BoostEnabled",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "BoostTemperature",
+			"maxLen": 4,
+			"maxLen2": 9
+		},
+		{
+			"id": "AutoStart",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "CooldownBlink",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "TemperatureCalibration",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "SettingsReset",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "VoltageCalibration",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "AdvancedSoldering",
+			"maxLen": 6,
+			"maxLen2": 13
+		},
+		{
+			"id": "ScrollingSpeed",
+			"maxLen": 6,
+			"maxLen2": 11
+		},
+		{
+			"id": "TipModel",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "SimpleCalibrationMode",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "AdvancedCalibrationMode",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+		{
+			"id": "PowerInput",
+			"maxLen": 8,
+			"maxLen2": 16
+		}
+	]
+}
--- a/Translation.md
+++ b/Translation.md
@@ -3,4 +3,4 @@ If you would like to contribute a translation, use the [Translation Editor](http

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

-You can create an issue with your updated json translation, or make your own pull request. If you make a pull request, also run `python3 make_translation.py` to regenerate the source file.
+You can create a pull request with the new / updated json configuration file, and this will include this language into the new builds for the firmware.
--- a/build.sh
+++ b/build.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker-compose run --rm builder /bin/bash /build/ci/buildAll.sh
--- a/ci/buildAll.sh
+++ b/ci/buildAll.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+set -u
+
+mkdir -p /build/ci/artefacts
+
+# Build STM code
+cd /build/source/workspace/TS100/
+bash ./build.sh || exit 1
+echo "All Firmware built"
+# Copy out all the final resulting files we would like to store for the next op
+cp -r /build/source/workspace/TS100/Hexfile/*.hex  /build/ci/artefacts/
+cp -r /build/source/workspace/TS100/Hexfile/*.bin  /build/ci/artefacts/
--- a/ci/secrets/decrypt.sh
+++ b/ci/secrets/decrypt.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+SECRETS="$DIR/encrypted/*.encrypted"
+KEY="$DIR/../../codeship.aes"
+
+mkdir -p $DIR/unencrypted
+
+for f in $SECRETS
+do
+    out="${f/.encrypted/.secret}"
+    out="${out/encrypted/unencrypted}"
+    echo $out
+    jet decrypt $f $out --key-path $KEY
+done
+
+echo "Done"
--- a/ci/secrets/encrypted/deployment.encrypted
+++ b/ci/secrets/encrypted/deployment.encrypted
@@ -0,0 +1,2 @@
+codeship:v2
+DUgOERb8iPVn95/DKIw9M7sgNjJlIlsaeE4PFV58tmmBu2sD1ooR7Y0L23bimC9a
--- a/codeship-services.yml
+++ b/codeship-services.yml
@@ -0,0 +1,8 @@
+builder:
+  build:
+    context: .
+    dockerfile: Dockerfile
+  cached: true
+  encrypted_env_file: ci/secrets/encrypted/deployment.encrypted
+  volumes:
+    - ./ci:/ci
--- a/codeship-steps.yml
+++ b/codeship-steps.yml
@@ -0,0 +1,6 @@
+- type: parallel
+  name: Build the firmware
+  steps:
+    - name: build
+      service: builder
+      command: /build/ci/buildAll.sh
--- a/development.md
+++ b/development.md
@@ -0,0 +1,20 @@
+# Development
+
+Building this software can be performed two ways, using the STMCubeIDE or using command line tools.
+
+## STM Cube IDE
+
+The repository is setup to try and make this painless, when starting the IDE you can import the project by pointing the internal search to the workspace folder of this repository. If you start with a fresh installation, close the welcome screen tab, and then in the left sidebar, there is an option to "import". Select General -> Import existing projects -> Set the top location option to this repositories workspace -> Should find the TS100 project.
+
+## Developing with command line tools & building a release
+
+In the `workspace/TS100` folder there is a makefile that can be used to build the repository using command line tools.
+when running the `make` command, specify which model of the device & the language you would like to use.
+
+`make -j8 lang=EN model=TS80`
+
+To build a release instead, run the build.sh script. This will update translations and also build every language for both TS100 and TS80 models.
+
+## Updating languages
+
+To update the language translation files & associated font map, execute the `make_translation.py` code from the translations directory.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+services:
+  builder:
+    stdin_open: true
+    tty: true
+    build:
+      context: .
+    command: /bin/bash
+    volumes:
+      - ./ci:/build/ci
+      - ./:/build/source
--- a/menu.md
+++ b/menu.md
@@ -0,0 +1,77 @@
+# Menu System
+
+
+## Soldering mode
+
+In this mode the iron works as you would expect, pressing either button will take you to a temperature change screen.
+Use each button to go up and down in temperature. Pressing both buttons will exit you from the temperature menu (or wait 3 seconds and it will time out).
+Pressing both buttons or holding the button near the USB will exit the soldering mode.
+Holding the button at the front of the iron will enter boost mode (if enabled).
+
+## Settings Menu
+
+This menu allows you to cycle through all the options and set their values.
+The button near the USB cycles through the options, and the one near the tip changes the selected option.
+Note that settings are not saved until you exit the menu.
+If you leave the unit alone (ie don't press any buttons) on a setting, after 3 seconds the screen will scroll a rough description of the setting.
+
+The menu is arranged so that the most often used settings are first.
+With submenu's being selected to enter using the front button (as if you were going to change the setting).
+Scrolling through the submenu will return you back to its entry location after you scroll through all of the options.
+
+### Calibrating input voltage
+
+Due to the tolerance on the resistors used for the input voltage divider, some irons can be up to 0.6V out on the voltage measurement.
+Please calibrate your iron if you have any issues with the cutoff voltage.
+Note that cutoff messages can also be triggered by using a power supply that is too weak and fails under the load of the iron.
+This is more critical than before with the new cell count based cutout voltage.
+
+To calibrate your iron:
+
+1. Measure the input voltage with a multimeter and note it down.
+2. Connect the input to your iron.
+3. Enter the settings menu
+4. Under the advanced submenu
+5. Select the calibrate voltage option
+6. Use the front and back buttons to adjust the displayed voltage to minimize the error to your original measurement
+7. Hold both buttons to save and exit to the menu
+
+### Tip Model Selection
+
+The menu now lets you select which tip you are using with your iron. This lets the unit know which gain value to use for your tip, this varies slightly between models and can help with temperature accuracy.
+There is also an option for a *custom* tip. This basically means that you will tune the tip parameters yourself.
+
+### Calibrating tip offset (Set tip model)
+
+Some tips will have an offset on their readings, to calibrate this out perform the following steps:
+
+1. Connect power to your iron
+2. Make sure the tip is at room temperature (ie. wait for a fair while after using the iron before calibration)
+3. Enter the settings menu
+4. Scroll down to the advanced menu, and then the temperature calibration
+5. Press the button to change the option (tip button)
+6. The display will start to scroll a warning message to check that the tip is at ambient temperature!
+7. Press the button near the tip of the iron to confirm
+8. The display will go to "...." for a short period of time as the unit measures the tip temperature and the handle temperature and compares them
+9. The display will then go back to *TMP CAL*
+10. Calibration is done, just exit the settings menu as normal
+11. You're done, enjoy your iron!
+
+### Calibration of custom tip
+
+There are two methods to calibrate the tip, the simple mode which requires boiling water, and an advanced mode that requires a method of measuring the actual tip of the tip.
+
+Advanced mode is preffered.
+
+In simple mode you first need to have the tip at room temperature to start, and then when prompted place the tip into a cup of boiling water, wait a few seconds and then press a button to confirm.
+
+In advanced mode, follow instructions on the screen, you will need to adjust the ranges to find two calibration points by measuring the tip temperature directly. This tends to be significantly more accurate.
+
+If you do calibrate your own values for a tip because it's missing from the menu or because you think the one in the menu is really wrong, raise an issue on github and I'll be happy to look at adding it or revising the existing settings.
+
+
+### Boost mode
+
+This allows you to change the front key (one near the tip) to become a boost button when you hold it for > 2 seconds. This allows you to set this button to change the soldering temperature for short periods. For example when soldering a big joint and you want to boost the temperature a bit.
+
+The boost temperature is set in the settings menu.
--- a/power.md
+++ b/power.md
@@ -0,0 +1,24 @@
+# Power & Performance
+
+Both the TS100 and TS80 are PWM controlled resistive heating elements.
+This means that the electronics in the handle can only turn the heating element on and off.
+This *means* that the power proivded in the tip is 100% controlled by the supply voltage used.
+
+Both irons at their simplest are just a resistor connected to your power source via a switch.
+
+When the switch is on, the power in the resistor is `Current (I) times Volts (V)`.
+Current through the resistor is `Volts (V) divided by Resistance (R)`.
+Combining these two gives the common equation, power is `Volts (V) squared / Resistance (R)`.
+
+The resistance of the tip is fixed, 8.5 ohms for the TS100 and 4.5 ohms for the TS80.
+
+This means that for both irons, the power delivered to the soldering tip is proportional to the voltage used, squared.
+This is why the TS100 performs poorly when run off 12V power supplies.
+
+## Output Control & Regulation
+
+Both soldering irons use a FET to switch the power to the soldering iron tip. This is a P-MOSFET and its controlled via a small transistor circuit, which in turn is controlled via the STM32. The STM32 controls this PWM output proportional to the output from the PID control loop running in the software.
+
+To measure the tip temperature in the iron, the iron has a small op-amp connected across the terminals, this is setup to measure the voltage across the same terminals that are used the power the tip. In order to be able to read the small voltage generated by the thermocouple junction, the irons output must be turned off.
+Once the output is turned off (via the FET), the system has a recovery time as the tip capacitance discharges and the op-amp exits saturation. After this delay period, the STM32 ADC samples the output of the op-amp 8 times quickly and then sets a flag to turn the PWM output back on.
+This enforces a small dead time in the output signal while this occurs, so there is a balance between sampling the temperature often to maintain stable tip temperature control and sampling less often to increase the maximum power deliverable to the tip
--- a/start_dev.sh
+++ b/start_dev.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker-compose run --rm builder
--- a/workspace/RemoteSystemsTempFiles/.project
+++ b/workspace/RemoteSystemsTempFiles/.project
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>RemoteSystemsTempFiles</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.rse.ui.remoteSystemsTempNature</nature>
-	</natures>
-</projectDescription>
--- a/workspace/TS100/..cproject.swp
+++ b/workspace/TS100/..cproject.swp
--- a/workspace/TS100/.cproject
+++ b/workspace/TS100/.cproject
@@ -1,146 +1,280 @@
-<?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>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604" moduleId="org.eclipse.cdt.core.settings" name="Release">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604" name="Release" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.371966959" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.268924932" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.1807761944" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.16668176" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32F103T8Ux" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1774243727" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.1519200339" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.2085586885" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.1101562931" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.0 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32F103T8Ux || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3 || ../ ||  || USE_HAL_DRIVER | STM32F103xB ||  || Startup || Drivers | Middlewares | Core ||  || ${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld} || true" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1139950997" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1111393917" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/TS100}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.382006335" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.2103323603" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.1096256111" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths.1236938233" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1567896324" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1462975681" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.30611156" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1339073625" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.635455407" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.803860120" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.830444742" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra.831438684" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.209834308" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-write-strings"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1520167136" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1389226967" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.320699143" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1467281053" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.786921488" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="MODEL_TS100"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.1822309991" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra.2125869818" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags.1596069067" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-fno-rtti"/>
+									<listOptionValue builtIn="false" value="-Wno-write-strings"/>
+									<listOptionValue builtIn="false" value="-fno-exceptions"/>
+									<listOptionValue builtIn="false" value="-fno-non-call-exceptions"/>
+									<listOptionValue builtIn="false" value="-fno-use-cxa-atexit"/>
+									<listOptionValue builtIn="false" value="-fno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1159197200" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1444632567" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.270389521" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.1357582083" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1902507185" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.752998" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" useByScannerDiscovery="false" value="C:\Users\Ralim.DESKTOP-R877O7F\Documents\GitHub\ts100\workspace\TS100\LinkerScript.ld" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags.329644110" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-flto"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref.145186443" name="Add symbol cross reference table to map file (-Wl,--cref)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input.1684195922" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1875744128" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.684181602" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.719558919" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.202432297" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.796590488" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.566015042" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1489612670" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1442634952" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Startup"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+		<cconfiguration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551" moduleId="org.eclipse.cdt.core.settings" name="TS80">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551" name="TS80" parent="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release">
+					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.1040839551." name="/" resourcePath="">
+						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release.119279677" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.release">
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.type.849152425" name="Internal Toolchain Type" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.type" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.option.internal.toolchain.version.159605979" name="Internal Toolchain Version" superClass="com.st.stm32cube.ide.mcu.option.internal.toolchain.version" useByScannerDiscovery="false" value="7-2018-q2-update" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1536164180" name="Mcu" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu" useByScannerDiscovery="false" value="STM32F103T8Ux" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.1370739571" name="CpuId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.295605019" name="CpuCoreId" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid" useByScannerDiscovery="false" value="0" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.973266354" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board" useByScannerDiscovery="false" value="genericBoard" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.464348240" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults" useByScannerDiscovery="false" value="com.st.stm32cube.ide.common.services.build.inputs.revA.1.0.0 || Release || false || Executable || com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.base.gnu-tools-for-stm32 || STM32F103T8Ux || 0 || arm-none-eabi- || ${gnu_tools_for_stm32_compiler_path} || ../Middlewares/Third_Party/FreeRTOS/Source/include | ../Drivers/CMSIS/Device/ST/STM32F1xx/Include | ../Drivers/CMSIS/Include | ../Core/Inc | ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy | ../Drivers/STM32F1xx_HAL_Driver/Inc | ../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS | ../Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3 || ../ ||  || USE_HAL_DRIVER | STM32F103xB ||  || Startup || Drivers | Middlewares | Core ||  || ${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld} || true" valueType="string"/>
+							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1607101911" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform.1970014216" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<builder buildPath="${workspace_loc:/TS100}/Release" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder.1807978370" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.builder"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.832589290" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.2021461351" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths.1740040757" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="../"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols.1866744147" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="MODEL_TS80"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1978031483" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1462185687" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.1548601111" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.457682077" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.1260353799" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="MODEL_TS80"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.540768214" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra.1574359913" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags.1077707594" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-Wno-write-strings"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1813870546" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1660249714" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.16251983" name="Debug level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.debuglevel.value.g3" valueType="enumerated"/>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.1224833714" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.optimization.level.value.os" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.1599760897" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
+									<listOptionValue builtIn="false" value="MODEL_TS80"/>
+									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
+									<listOptionValue builtIn="false" value="STM32F103xB"/>
+								</option>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.925084011" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Device/ST/STM32F1xx/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/CMSIS/Include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc/Legacy}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Drivers/STM32F1xx_HAL_Driver/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3}&quot;"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra.110760609" name="Enable extra warning flags (-Wextra)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.extra" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags.834159935" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-fno-rtti"/>
+									<listOptionValue builtIn="false" value="-Wno-write-strings"/>
+									<listOptionValue builtIn="false" value="-fno-exceptions"/>
+									<listOptionValue builtIn="false" value="-fno-non-call-exceptions"/>
+									<listOptionValue builtIn="false" value="-fno-use-cxa-atexit"/>
+									<listOptionValue builtIn="false" value="-fno-strict-aliasing"/>
+								</option>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1576964672" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1130643119" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script.215123120" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.option.script" value="${workspace_loc:/${ProjName}/STM32F103T8UX_FLASH.ld}" valueType="string"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input.300729142" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.227435340" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker">
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script.830347551" name="Linker Script (-T)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.script" useByScannerDiscovery="false" value="C:\Users\Ralim.DESKTOP-R877O7F\Documents\GitHub\ts100\workspace\TS100\LinkerScript.ld" valueType="string"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags.2106114007" name="Other flags" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.otherflags" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="-flto"/>
+								</option>
+								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref.1223102617" name="Add symbol cross reference table to map file (-Wl,--cref)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.option.cref" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input.1693496005" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1793875206" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.2031511845" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1883149988" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1503571164" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1574630014" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.948380741" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.260468267" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.984915652" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Startup"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="TS100.null.5136256" name="TS100"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.606095682;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.606095682.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1328412936;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.405681469">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604;com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.980996604.;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.30611156;com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1520167136">
+			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/TS100"/>
+		</configuration>
+	</storageModule>
+</cproject>
--- a/workspace/TS100/.gitignore
+++ b/workspace/TS100/.gitignore
@@ -1,5 +0,0 @@
-/Debug/
-/Release/
-/Hexfile/
-/Objects/
-
--- a/workspace/TS100/.mxproject
+++ b/workspace/TS100/.mxproject
--- a/workspace/TS100/.project
+++ b/workspace/TS100/.project
@@ -19,10 +19,13 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.st.stm32cube.ide.mcu.MCUProjectNature</nature>
 		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeIdeServicesRevAProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUCubeProjectNature</nature>
+		<nature>com.st.stm32cube.ide.mcu.MCUSingleCpuProjectNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-		<nature>fr.ac6.mcu.ide.core.MCUProjectNature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
 	</natures>
 </projectDescription>
--- a/workspace/TS100/.settings/language.settings.xml
+++ b/workspace/TS100/.settings/language.settings.xml
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<configuration id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1352500998" name="Debug">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-283880394950776525" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-		</extension>
-	</configuration>
-</project>
--- a/workspace/TS100/.settings/org.eclipse.cdt.codan.core.prefs
+++ b/workspace/TS100/.settings/org.eclipse.cdt.codan.core.prefs
@@ -1,73 +0,0 @@
-eclipse.preferences.version=1
-fr.ac6.mcu.ide.source.checker.libnano.problem=Error
-fr.ac6.mcu.ide.source.checker.libnano.problem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Float formatting support\\")"}
-org.eclipse.cdt.codan.checkers.errnoreturn=Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return\\")",implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused return value\\")"}
-org.eclipse.cdt.codan.checkers.nocommentinside=-Error
-org.eclipse.cdt.codan.checkers.nocommentinside.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Nesting comments\\")"}
-org.eclipse.cdt.codan.checkers.nolinecomment=-Error
-org.eclipse.cdt.codan.checkers.nolinecomment.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Line comments\\")"}
-org.eclipse.cdt.codan.checkers.noreturn=Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return value\\")",implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Abstract class cannot be instantiated\\")"}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Ambiguous problem\\")"}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment in condition\\")"}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment to itself\\")"}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No break at end of case\\")",no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Catching by reference is recommended\\")",unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Circular inheritance\\")"}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class members should be properly initialized\\")",skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Field cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Function cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid arguments\\")"}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid template argument\\")"}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Label statement not found\\")"}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Member declaration not found\\")"}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Method cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Name convention for function\\")",pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class has a virtual method and non-virtual destructor\\")"}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid overload\\")"}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redeclaration\\")"}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redefinition\\")"}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Return with parenthesis\\")"}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Format String Vulnerability\\")"}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Statement has no effect\\")",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suggested parenthesis around expression\\")",paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suspicious semicolon\\")",else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Type cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused function declaration\\")",macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused static function\\")",macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused variable declaration in file scope\\")",macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Symbol is not resolved\\")"}
--- a/workspace/TS100/.settings/org.eclipse.core.resources.prefs
+++ b/workspace/TS100/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
--- a/workspace/TS100/.vscode/c_cpp_properties.json
+++ b/workspace/TS100/.vscode/c_cpp_properties.json
@@ -1,66 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Mac",
-            "includePath": [
-                "/usr/include",
-                "/usr/local/include",
-                "${workspaceFolder}"
-            ],
-            "defines": ["STM32F103T8Ux","STM32F1","STM32","USE_HAL_DRIVER","STM32F103xB","USE_RTOS_SYSTICK"],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/usr/include",
-                    "/usr/local/include",
-                    "${workspaceFolder}"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "macFrameworkPath": [
-                "/System/Library/Frameworks",
-                "/Library/Frameworks"
-            ]
-        },
-        {
-            "name": "STM32",
-            "includePath": [
-                "${workspaceFolder}",
-                "/usr/include/c++/5",
-                "/usr/include/x86_64-linux-gnu/c++/5",
-                "/usr/include/c++/5/backward",
-                "/usr/lib/llvm-5.0/lib/clang/5.0.0/include",
-                "/usr/local/include",
-                "/usr/include/x86_64-linux-gnu",
-                "/usr/include",
-                "${workspaceFolder}/inc",
-                "${workspaceFolder}/HAL_Driver/Inc",
-                "${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS",
-                "${workspaceFolder}/CMSIS/device",
-                "${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/include",
-                "${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM3"
-            ],
-            "defines": [],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "${workspaceFolder}",
-                    "/usr/include/c++/5",
-                    "/usr/include/x86_64-linux-gnu/c++/5",
-                    "/usr/include/c++/5/backward",
-                    "/usr/lib/llvm-5.0/lib/clang/5.0.0/include",
-                    "/usr/local/include",
-                    "/usr/include/x86_64-linux-gnu",
-                    "/usr/include"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "compilerPath": "/usr/bin/clang++-5.0",
-            "cStandard": "c11",
-            "cppStandard": "c++17"
-        }
-    ],
-    "version": 3
-}
--- a/workspace/TS100/CMSIS/device/stm32f100xb.h
+++ b/workspace/TS100/CMSIS/device/stm32f100xb.h
--- a/workspace/TS100/CMSIS/device/stm32f100xe.h
+++ b/workspace/TS100/CMSIS/device/stm32f100xe.h
--- a/workspace/TS100/CMSIS/device/stm32f101x6.h
+++ b/workspace/TS100/CMSIS/device/stm32f101x6.h
--- a/workspace/TS100/CMSIS/device/stm32f101xb.h
+++ b/workspace/TS100/CMSIS/device/stm32f101xb.h
--- a/workspace/TS100/CMSIS/device/stm32f101xe.h
+++ b/workspace/TS100/CMSIS/device/stm32f101xe.h
--- a/workspace/TS100/CMSIS/device/stm32f101xg.h
+++ b/workspace/TS100/CMSIS/device/stm32f101xg.h
--- a/workspace/TS100/CMSIS/device/stm32f102x6.h
+++ b/workspace/TS100/CMSIS/device/stm32f102x6.h
--- a/workspace/TS100/CMSIS/device/stm32f102xb.h
+++ b/workspace/TS100/CMSIS/device/stm32f102xb.h
--- a/workspace/TS100/CMSIS/device/stm32f103x6.h
+++ b/workspace/TS100/CMSIS/device/stm32f103x6.h
--- a/workspace/TS100/CMSIS/device/stm32f103xe.h
+++ b/workspace/TS100/CMSIS/device/stm32f103xe.h
--- a/workspace/TS100/CMSIS/device/stm32f103xg.h
+++ b/workspace/TS100/CMSIS/device/stm32f103xg.h
--- a/workspace/TS100/CMSIS/device/stm32f105xc.h
+++ b/workspace/TS100/CMSIS/device/stm32f105xc.h
--- a/workspace/TS100/CMSIS/device/stm32f107xc.h
+++ b/workspace/TS100/CMSIS/device/stm32f107xc.h
--- a/workspace/TS100/Core/Inc/FRToSI2C.hpp
+++ b/workspace/TS100/Core/Inc/FRToSI2C.hpp
@@ -13,18 +13,20 @@
 class FRToSI2C {
 public:

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

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

 	static void CpltCallback(); //Normal Tx Callback

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

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

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

 #define configUSE_PREEMPTION                     1
-#define configSUPPORT_STATIC_ALLOCATION          0
-#define configSUPPORT_DYNAMIC_ALLOCATION         1
-#define configUSE_IDLE_HOOK                      0
+#define configSUPPORT_STATIC_ALLOCATION          1
+#define configSUPPORT_DYNAMIC_ALLOCATION         0
+#define configUSE_IDLE_HOOK                      1
 #define configUSE_TICK_HOOK                      0
 #define configCPU_CLOCK_HZ                       ( SystemCoreClock )
 #define configTICK_RATE_HZ                       ((TickType_t)100)
--- a/workspace/TS100/Core/Inc/LIS2DH12.hpp
+++ b/workspace/TS100/Core/Inc/LIS2DH12.hpp
@@ -34,7 +34,7 @@ public:
 		return static_cast<Orientation>((FRToSI2C::I2C_RegisterRead(LIS2DH_I2C_ADDRESS,LIS_INT2_SRC) >> 2) - 1);
 #endif
 	}
-	static void getAxisReadings(int16_t *x, int16_t *y, int16_t *z);
+	static void getAxisReadings(int16_t& x, int16_t& y, int16_t& z);

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

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

 private:
 };
--- a/workspace/TS100/Core/Inc/MMA8652FC_defines.h
+++ b/workspace/TS100/Core/Inc/MMA8652FC_defines.h
--- a/workspace/TS100/Core/Inc/OLED.hpp
+++ b/workspace/TS100/Core/Inc/OLED.hpp
@@ -26,8 +26,14 @@ extern "C" {
 #define OLED_WIDTH        96
 #define FRAMEBUFFER_START 17

-class OLED {
+class OLED {	
 public:
+
+	enum DisplayState : bool {
+		OFF = false,
+		ON  = true
+	};
+
 	static void initialize(); // Startup the I2C coms (brings screen out of reset etc)

 	// Draw the buffer out to the LCD using the DMA Channel
@@ -38,12 +44,11 @@ public:
 		//or we need to goto double buffering
 	}

-	static void drawChar(char c, char preCursorCommand = '\0'); // Draw a character to a specific location
-	// Turn the screen on or not
-	static void displayOnOff(bool on) {
-		displayOnOffState = on;
-		screenBuffer[1] = on ? 0xAF : 0xAE;
+	static void setDisplayState(DisplayState state) {
+		displayState = state;
+		screenBuffer[1] = (state == ON) ? 0xAF : 0xAE;
 	}
+	
 	static void setRotation(bool leftHanded); // Set the rotation for the screen
 	// Get the current rotation of the LCD
 	static bool getRotation()  {
@@ -92,14 +97,12 @@ public:
 			bool clear);
 	static void drawHeatSymbol(uint8_t state);
 private:
-
-	//Draw a buffer to the screen buffer
-
+	static void drawChar(char c); // Draw a character to a specific location
 	static const uint8_t* currentFont;// Pointer to the current font used for rendering to the buffer
 	static uint8_t* firstStripPtr; // Pointers to the strips to allow for buffer having extra content
 	static uint8_t* secondStripPtr;	//Pointers to the strips
 	static bool inLeftHandedMode; // Whether the screen is in left or not (used for offsets in GRAM)
-	static bool displayOnOffState;				// If the display is on or not
+	static DisplayState displayState;
 	static uint8_t fontWidth, fontHeight;
 	static int16_t cursor_x, cursor_y;
 	static uint8_t displayOffset;
--- a/workspace/TS100/Core/Inc/Settings.h
+++ b/workspace/TS100/Core/Inc/Settings.h
@@ -11,7 +11,7 @@
 #define SETTINGS_H_
 #include <stdint.h>
 #include "stm32f1xx_hal.h"
-#define SETTINGSVERSION   ( 0x19 )
+#define SETTINGSVERSION   ( 0x1B )
 /*Change this if you change the struct below to prevent people getting \
          out of sync*/

@@ -39,15 +39,13 @@ typedef struct {
 	uint8_t descriptionScrollSpeed :1;  // Description scroll speed
 	uint16_t voltageDiv;                 // Voltage divisor factor
 	uint16_t BoostTemp;                  // Boost mode set point for the iron
-	int16_t CalibrationOffset; // This stores the temperature offset for this tip
-							   // in the iron.
-	uint8_t PID_P;    // PID P Term
-	uint8_t PID_I;    // PID I Term
-	uint8_t PID_D;    // PID D Term
-	uint8_t version;  // Used to track if a reset is needed on firmware upgrade
+	uint16_t CalibrationOffset; // This stores the temperature offset for this tip
+								// in the iron.
+
 	uint8_t customTipGain;  // Tip gain value if custom tuned, or 0 if using a
 							// tipType param
-	uint8_t tipType;
+	uint8_t pidPowerLimit;
+	uint8_t version;  // Used to track if a reset is needed on firmware upgrade
 	uint32_t padding;  // This is here for in case we are not an even divisor so
 					   // that nothing gets cut off
 } systemSettingsType;
@@ -55,7 +53,7 @@ typedef struct {
 extern volatile systemSettingsType systemSettings;

 void saveSettings();
-void restoreSettings();
+bool restoreSettings();
 uint8_t lookupVoltageLevel(uint8_t level);
 void resetSettings();
 bool showBootLogoIfavailable();
--- a/workspace/TS100/Core/Inc/Setup.h
+++ b/workspace/TS100/Core/Inc/Setup.h
--- a/workspace/TS100/Core/Inc/Translation.h
+++ b/workspace/TS100/Core/Inc/Translation.h
@@ -1,54 +1,73 @@
-/*
- * Translation.h
- *
- *  Created on: 31Aug.,2017
- *      Author: Ben V. Brown
- */
-
-#ifndef TRANSLATION_H_
-#define TRANSLATION_H_
-
-enum ShortNameType {
-  SHORT_NAME_SINGLE_LINE = 1,
-  SHORT_NAME_DOUBLE_LINE = 2,
-};
-
-/*
- * When SettingsShortNameType is SHORT_NAME_SINGLE_LINE
- * use SettingsShortNames as SettingsShortNames[16][1].. second column undefined
- */
-extern const enum ShortNameType SettingsShortNameType;
-extern const char* SettingsShortNames[21][2];
-extern const char* SettingsDescriptions[21];
-extern const char* SettingsMenuEntries[4];
-
-extern const char* SettingsCalibrationDone;
-extern const char* SettingsCalibrationWarning;
-extern const char* SettingsResetWarning;
-extern const char* UVLOWarningString;
-extern const char* UndervoltageString;
-extern const char* InputVoltageString;
-extern const char* WarningTipTempString;
-extern const char* BadTipString;
-
-extern const char* SleepingSimpleString;
-extern const char* SleepingAdvancedString;
-extern const char* WarningSimpleString;
-extern const char* WarningAdvancedString;
-extern const char* SleepingTipAdvancedString;
-extern const char* IdleTipString;
-extern const char* IdleSetString;
-extern const char* TipDisconnectedString;
-extern const char* SolderingAdvancedPowerPrompt;
-extern const char* OffString;
-
-extern const char SettingTrueChar;
-extern const char SettingFalseChar;
-extern const char SettingRightChar;
-extern const char SettingLeftChar;
-extern const char SettingAutoChar;
-
-extern const char SettingFastChar;
-extern const char SettingSlowChar;
-
-#endif /* TRANSLATION_H_ */
+/*
+ * Translation.h
+ *
+ *  Created on: 31Aug.,2017
+ *      Author: Ben V. Brown
+ */
+
+#ifndef TRANSLATION_H_
+#define TRANSLATION_H_
+#include "stm32f1xx_hal.h"
+enum ShortNameType {
+	SHORT_NAME_SINGLE_LINE = 1, SHORT_NAME_DOUBLE_LINE = 2,
+};
+extern const uint8_t USER_FONT_12[];
+extern const uint8_t USER_FONT_6x8[];
+/*
+ * When SettingsShortNameType is SHORT_NAME_SINGLE_LINE
+ * use SettingsShortNames as SettingsShortNames[16][1].. second column undefined
+ */
+extern const enum ShortNameType SettingsShortNameType;
+extern const char* SettingsShortNames[21][2];
+extern const char* SettingsDescriptions[21];
+extern const char* SettingsMenuEntries[4];
+
+extern const char* SettingsCalibrationDone;
+extern const char* SettingsCalibrationWarning;
+extern const char* SettingsResetWarning;
+extern const char* UVLOWarningString;
+extern const char* UndervoltageString;
+extern const char* InputVoltageString;
+extern const char* WarningTipTempString;
+extern const char* BadTipString;
+
+extern const char* SleepingSimpleString;
+extern const char* SleepingAdvancedString;
+extern const char* WarningSimpleString;
+extern const char* WarningAdvancedString;
+extern const char* SleepingTipAdvancedString;
+extern const char* IdleTipString;
+extern const char* IdleSetString;
+extern const char* TipDisconnectedString;
+extern const char* SolderingAdvancedPowerPrompt;
+extern const char* OffString;
+extern const char* ResetOKMessage;
+extern const char* YourGainMessage;
+extern const char* SettingsResetMessage;
+
+extern const char* SettingTrueChar;
+extern const char* SettingFalseChar;
+extern const char* SettingRightChar;
+extern const char* SettingLeftChar;
+extern const char* SettingAutoChar;
+
+extern const char* SettingFastChar;
+extern const char* SettingSlowChar;
+extern const char*  TipModelStrings[];
+extern const char* DebugMenu[];
+extern const char* SymbolPlus;
+extern const char* SymbolMinus;
+extern const char* SymbolSpace;
+extern const char* SymbolDot;
+extern const char* SymbolDegC;
+extern const char* SymbolDegF;
+extern const char* SymbolMinutes;
+extern const char* SymbolSeconds;
+extern const char* SymbolWatts;
+extern const char* SymbolVolts;
+extern const char* SymbolDC;
+extern const char* SymbolCellCount;
+extern const char* SymbolVersionNumber;
+
+extern const char* DebugMenu[];
+#endif /* TRANSLATION_H_ */
--- a/workspace/TS100/Core/Inc/expMovingAverage.h
+++ b/workspace/TS100/Core/Inc/expMovingAverage.h
@@ -0,0 +1,24 @@
+/*
+ * expMovingAverage.h
+ *
+ *  Created on: 8 Oct 2019
+ *      Author: ralim
+ */
+
+#ifndef INC_EXPMOVINGAVERAGE_H_
+#define INC_EXPMOVINGAVERAGE_H_
+
+// max size = 127
+template<class T, uint8_t weighting>
+struct expMovingAverage {
+	int32_t sum;
+	void update(T const val) {
+		sum = ((val * weighting) + (sum * (256 - weighting))) / 256;
+	}
+
+	T average() const {
+		return sum;
+	}
+};
+
+#endif /* INC_EXPMOVINGAVERAGE_H_ */
--- a/workspace/TS100/Core/Inc/gui.hpp
+++ b/workspace/TS100/Core/Inc/gui.hpp
--- a/workspace/TS100/Core/Inc/hardware.h
+++ b/workspace/TS100/Core/Inc/hardware.h
@@ -9,6 +9,10 @@
 #define HARDWARE_H_
 #include "Setup.h"
 #include "stm32f1xx_hal.h"
+#include "FreeRTOS.h"
+#include "stm32f1xx_hal.h"
+#include "cmsis_os.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -16,7 +20,7 @@ extern "C" {
 enum Orientation {
 	ORIENTATION_LEFT_HAND = 0, ORIENTATION_RIGHT_HAND = 1, ORIENTATION_FLAT = 3
 };
-
+#define PID_TIM_HZ (8)
 #if defined(MODEL_TS100) + defined(MODEL_TS80) > 1
 #error "Multiple models defined!"
 #elif defined(MODEL_TS100) + defined(MODEL_TS80) == 0
@@ -106,7 +110,7 @@ enum TipType {
 #endif
 #ifdef MODEL_TS80
 enum TipType {
-	TS_B02 = 0, TS_D25 = 1, Tip_MiniWare = 2, Tip_Custom = 2,
+	TS_B02 = 0, TS_D25 = 1, Tip_MiniWare = 2, Tip_Custom = 3,
 };
 #endif
 extern uint16_t tipGainCalValue ;
@@ -131,7 +135,9 @@ void startQC(uint16_t divisor); // Tries to negotiate QC for highest voltage, mu
 // This will try for 12V, failing that 9V, failing that 5V
 // If input is over 12V returns -1
 // If the input is [5-12] Will return the value.
-
+void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer,
+		StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize) ;
+void vApplicationIdleHook(void);
 #ifdef __cplusplus
 }
 #endif
--- a/workspace/TS100/Core/Inc/history.hpp
+++ b/workspace/TS100/Core/Inc/history.hpp
@@ -11,25 +11,25 @@
 #include <stdint.h>

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

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

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

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

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

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

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

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

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

 				I2C1_ClearBusyFlagErratum();
 				xSemaphoreGive(I2CSemaphore);
--- a/workspace/TS100/Core/Src/GUIThread.cpp
+++ b/workspace/TS100/Core/Src/GUIThread.cpp
@@ -1,4 +1,9 @@
-// By Ben V. Brown - V2.0 of the TS100 firmware
+/*
+ * GUIThread.cpp
+ *
+ *  Created on: 19 Aug 2019
+ *      Author: ralim
+ */
 #include <MMA8652FC.hpp>
 #include <gui.hpp>
 #include <main.hpp>
@@ -11,93 +16,33 @@
 #include "stdlib.h"
 #include "stm32f1xx_hal.h"
 #include "string.h"
-
-#define ACCELDEBUG 0
-uint8_t PCBVersion = 0;
+#include "TipThermoModel.h"
+extern uint8_t PCBVersion;
 // File local variables
-uint32_t currentlyActiveTemperatureTarget = 0;
-uint32_t lastMovementTime = 0;
+extern uint32_t currentTempTargetDegC;
+extern uint32_t lastMovementTime;
+extern int16_t idealQCVoltage;
 uint32_t lastButtonTime = 0;
-int16_t idealQCVoltage = 0;
-// FreeRTOS variables
-osThreadId GUITaskHandle;
-osThreadId PIDTaskHandle;
-osThreadId MOVTaskHandle;
+extern osThreadId GUITaskHandle;
+extern osThreadId MOVTaskHandle;
+extern osThreadId PIDTaskHandle;

-static TaskHandle_t pidTaskNotification = NULL;
+// TODO: express time constants in terms of dividends of portTICK_RATE_MS

-void startGUITask(void const *argument);
-void startPIDTask(void const *argument);
-void startMOVTask(void const *argument);
-// End FreeRTOS
+#define MOVEMENT_INACTIVITY_TIME 6000
+#define BUTTON_INACTIVITY_TIME   6000

-// Main sets up the hardware then hands over to the FreeRTOS kernel
-int main(void) {
-	/* Reset of all peripherals, Initializes the Flash interface and the Systick.
-	 */
-	HAL_Init();
-	Setup_HAL();  // Setup all the HAL objects
-	HAL_IWDG_Refresh(&hiwdg);
-	setTipMilliWatts(0);  // force tip off
-	FRToSI2C::init(&hi2c1);
-	OLED::initialize();  // start up the LCD
-	OLED::setFont(0);    // default to bigger font
-	// Testing for which accelerometer is mounted
-	uint8_t buffer[1];
-	HAL_IWDG_Refresh(&hiwdg);
-	if (HAL_I2C_Mem_Read(&hi2c1, 29 << 1, 0x0F, I2C_MEMADD_SIZE_8BIT, buffer, 1,
-			1000) == HAL_OK) {
-		PCBVersion = 1;
-		MMA8652FC::initalize();  // this sets up the I2C registers
-	} else if (HAL_I2C_Mem_Read(&hi2c1, 25 << 1, 0x0F, I2C_MEMADD_SIZE_8BIT,
-			buffer, 1, 1000) == HAL_OK) {
-		PCBVersion = 2;
-		// Setup the ST Accelerometer
-		LIS2DH12::initalize();  // startup the accelerometer
-	} else {
-		PCBVersion = 3;
-		systemSettings.SleepTime = 0;
-		systemSettings.ShutdownTime = 0;  // No accel -> disable sleep
-		systemSettings.sensitivity = 0;
-	}
-	HAL_IWDG_Refresh(&hiwdg);
-	restoreSettings();  // load the settings from flash
-	setCalibrationOffset(systemSettings.CalibrationOffset);
-	setTipType((enum TipType) systemSettings.tipType,
-			systemSettings.customTipGain);  // apply tip type selection
-	HAL_IWDG_Refresh(&hiwdg);
-
-	/* Create the thread(s) */
-	/* definition and creation of GUITask */
-	osThreadDef(GUITask, startGUITask, osPriorityBelowNormal, 0, 5 * 1024 / 4);
-	GUITaskHandle = osThreadCreate(osThread(GUITask), NULL);
-
-	/* definition and creation of PIDTask */
-	osThreadDef(PIDTask, startPIDTask, osPriorityRealtime, 0, 3 * 1024 / 4);
-	PIDTaskHandle = osThreadCreate(osThread(PIDTask), NULL);
-	if (PCBVersion < 3) {
-		/* definition and creation of MOVTask */
-		osThreadDef(MOVTask, startMOVTask, osPriorityNormal, 0, 4 * 1024 / 4);
-		MOVTaskHandle = osThreadCreate(osThread(MOVTask), NULL);
-#ifdef LOCAL_BUILD
-		//Test that there was enough ram in the FreeRToS pool to allocate all the tasks
-		if (MOVTaskHandle == 0)
-			asm("bkpt");
-#endif
-	}
-
-	/* Start scheduler */
-	osKernelStart();
-
-	/* We should never get here as control is now taken by the scheduler */
-	while (1) {
-	}
+static uint16_t min(uint16_t a, uint16_t b) {
+	if (a > b)
+		return b;
+	else
+		return a;
 }

 void printVoltage() {
 	uint32_t volt = getInputVoltageX10(systemSettings.voltageDiv, 0);
 	OLED::printNumber(volt / 10, 2);
-	OLED::drawChar('.');
+	OLED::print(SymbolDot);
 	OLED::printNumber(volt % 10, 1);
 }
 void GUIDelay() {
@@ -109,19 +54,19 @@ void GUIDelay() {
 }
 void gui_drawTipTemp(bool symbol) {
 	// Draw tip temp handling unit conversion & tolerance near setpoint
-	uint16_t Temp = getTipRawTemp(0);
+	uint16_t Temp = 0;

 	if (systemSettings.temperatureInF)
-		Temp = tipMeasurementToF(Temp);
+		Temp = TipThermoModel::getTipInF();
 	else
-		Temp = tipMeasurementToC(Temp);
+		Temp = TipThermoModel::getTipInC();

 	OLED::printNumber(Temp, 3);  // Draw the tip temp out finally
 	if (symbol) {
 		if (systemSettings.temperatureInF)
-			OLED::print("F");
+			OLED::print(SymbolDegF);
 		else
-			OLED::print("C");
+			OLED::print(SymbolDegC);
 	}
 }
 ButtonState getButtonState() {
@@ -256,7 +201,7 @@ static bool checkVoltageForExit() {
 			}

 			OLED::refresh();
-			currentlyActiveTemperatureTarget = 0;
+			currentTempTargetDegC = 0;
 			waitForButtonPress();
 			return true;
 		}
@@ -283,29 +228,29 @@ static void gui_drawBatteryIcon() {
 	} else
 		OLED::drawSymbol(15);  // Draw the DC Logo
 #else
-				// On TS80 we replace this symbol with the voltage we are operating on
-				// If <9V then show single digit, if not show duals
-				uint8_t V = getInputVoltageX10(systemSettings.voltageDiv, 0);
-				if (V % 10 >= 5)
-				V = V / 10 + 1;// round up
-				else
-				V = V / 10;
-				if (V >= 10) {
-					int16_t xPos = OLED::getCursorX();
-					OLED::setFont(1);
-					OLED::printNumber(1, 1);
-					OLED::setCursor(xPos, 8);
-					OLED::printNumber(V % 10, 1);
-					OLED::setFont(0);
-					OLED::setCursor(xPos + 12, 0); // need to reset this as if we drew a wide char
-				} else {
-					OLED::printNumber(V, 1);
-				}
+	// On TS80 we replace this symbol with the voltage we are operating on
+	// If <9V then show single digit, if not show duals
+	uint8_t V = getInputVoltageX10(systemSettings.voltageDiv, 0);
+	if (V % 10 >= 5)
+		V = V / 10 + 1;				// round up
+	else
+		V = V / 10;
+	if (V >= 10) {
+		int16_t xPos = OLED::getCursorX();
+		OLED::setFont(1);
+		OLED::printNumber(1, 1);
+		OLED::setCursor(xPos, 8);
+		OLED::printNumber(V % 10, 1);
+		OLED::setFont(0);
+		OLED::setCursor(xPos + 12, 0); // need to reset this as if we drew a wide char
+	} else {
+		OLED::printNumber(V, 1);
+	}
 #endif
 }
 static void gui_solderingTempAdjust() {
 	uint32_t lastChange = xTaskGetTickCount();
-	currentlyActiveTemperatureTarget = 0;
+	currentTempTargetDegC = 0;
 	uint32_t autoRepeatTimer = 0;
 	uint8_t autoRepeatAcceleration = 0;
 	for (;;) {
@@ -324,16 +269,16 @@ static void gui_solderingTempAdjust() {
 			return;
 			break;
 		case BUTTON_B_LONG:
-			if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration >
-			PRESS_ACCEL_INTERVAL_MAX) {
+			if (xTaskGetTickCount() - autoRepeatTimer
+					+ autoRepeatAcceleration> PRESS_ACCEL_INTERVAL_MAX) {
 				systemSettings.SolderingTemp -= 10;  // sub 10
 				autoRepeatTimer = xTaskGetTickCount();
 				autoRepeatAcceleration += PRESS_ACCEL_STEP;
 			}
 			break;
 		case BUTTON_F_LONG:
-			if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration >
-			PRESS_ACCEL_INTERVAL_MAX) {
+			if (xTaskGetTickCount() - autoRepeatTimer
+					+ autoRepeatAcceleration> PRESS_ACCEL_INTERVAL_MAX) {
 				systemSettings.SolderingTemp += 10;
 				autoRepeatTimer = xTaskGetTickCount();
 				autoRepeatAcceleration += PRESS_ACCEL_STEP;
@@ -348,10 +293,10 @@ static void gui_solderingTempAdjust() {
 		default:
 			break;
 		}
-		if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration) <
-		PRESS_ACCEL_INTERVAL_MIN) {
-			autoRepeatAcceleration =
-			PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
+		if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration)
+				< PRESS_ACCEL_INTERVAL_MIN) {
+			autoRepeatAcceleration = PRESS_ACCEL_INTERVAL_MAX
+					- PRESS_ACCEL_INTERVAL_MIN;
 		}
 		// constrain between 50-450 C
 		if (systemSettings.temperatureInF) {
@@ -374,36 +319,30 @@ static void gui_solderingTempAdjust() {
 #else
 		if (OLED::getRotation())
 #endif
-			OLED::drawChar('-');
+			OLED::print(SymbolMinus);
 		else
-			OLED::drawChar('+');
+			OLED::print(SymbolPlus);

-		OLED::drawChar(' ');
+		OLED::print(SymbolSpace);
 		OLED::printNumber(systemSettings.SolderingTemp, 3);
 		if (systemSettings.temperatureInF)
 			OLED::drawSymbol(0);
 		else
 			OLED::drawSymbol(1);
-		OLED::drawChar(' ');
+		OLED::print(SymbolSpace);
 #ifdef MODEL_TS80
 		if (!OLED::getRotation())
 #else
 		if (OLED::getRotation())
 #endif
-			OLED::drawChar('+');
+			OLED::print(SymbolPlus);
 		else
-			OLED::drawChar('-');
+			OLED::print(SymbolMinus);
 		OLED::refresh();
 		GUIDelay();
 	}
 }

-static uint16_t min(uint16_t a, uint16_t b) {
-	if (a > b)
-		return b;
-	else
-		return a;
-}
 static int gui_SolderingSleepingMode() {
 	// Drop to sleep temperature and display until movement or button press

@@ -419,20 +358,19 @@ static int gui_SolderingSleepingMode() {
 			return 1; // return non-zero on error
 #endif
 		if (systemSettings.temperatureInF) {
-			currentlyActiveTemperatureTarget = ftoTipMeasurement(
+			currentTempTargetDegC = TipThermoModel::convertFtoC(
 					min(systemSettings.SleepTemp,
 							systemSettings.SolderingTemp));
 		} else {
-			currentlyActiveTemperatureTarget = ctoTipMeasurement(
-					min(systemSettings.SleepTemp,
-							systemSettings.SolderingTemp));
+			currentTempTargetDegC = (min(systemSettings.SleepTemp,
+					systemSettings.SolderingTemp));
 		}
 		// draw the lcd
 		uint16_t tipTemp;
 		if (systemSettings.temperatureInF)
-			tipTemp = tipMeasurementToF(getTipRawTemp(0));
+			tipTemp = TipThermoModel::getTipInF();
 		else
-			tipTemp = tipMeasurementToC(getTipRawTemp(0));
+			tipTemp = TipThermoModel::getTipInC();

 		OLED::clearScreen();
 		OLED::setCursor(0, 0);
@@ -443,13 +381,13 @@ static int gui_SolderingSleepingMode() {
 			OLED::print(SleepingTipAdvancedString);
 			OLED::printNumber(tipTemp, 3);
 			if (systemSettings.temperatureInF)
-				OLED::print("F");
+				OLED::print(SymbolDegF);
 			else
-				OLED::print("C");
+				OLED::print(SymbolDegC);

-			OLED::print(" ");
+			OLED::print(SymbolSpace);
 			printVoltage();
-			OLED::drawChar('V');
+			OLED::print(SymbolVolts);
 		} else {
 			OLED::setFont(0);
 			OLED::print(SleepingSimpleString);
@@ -464,7 +402,7 @@ static int gui_SolderingSleepingMode() {
 				if (((uint32_t) (xTaskGetTickCount() - lastMovementTime))
 						> (uint32_t) (systemSettings.ShutdownTime * 60 * 100)) {
 					// shutdown
-					currentlyActiveTemperatureTarget = 0;
+					currentTempTargetDegC = 0;
 					return 1;  // we want to exit soldering mode
 				}
 		OLED::refresh();
@@ -484,10 +422,10 @@ static void display_countdown(int sleepThres) {
 	int downCount = sleepThres - xTaskGetTickCount() + lastEventTime;
 	if (downCount > 9900) {
 		OLED::printNumber(downCount / 6000 + 1, 2);
-		OLED::print("M");
+		OLED::print(SymbolMinutes);
 	} else {
 		OLED::printNumber(downCount / 100 + 1, 2);
-		OLED::print("S");
+		OLED::print(SymbolSeconds);
 	}
 }

@@ -556,7 +494,7 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 		OLED::setFont(0);
 		uint16_t tipTemp = getTipRawTemp(0);
 		if (tipTemp > 32700) {
-			badTipCounter++;// Use a counter so that error has to persist for > 1 second continious so that peak errors dont trip it
+			badTipCounter++; // Use a counter so that error has to persist for > 1 second continuous so that peak errors dont trip it
 		} else {
 			badTipCounter = 0;
 		}
@@ -564,29 +502,32 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 		if (systemSettings.detailedSoldering) {
 			OLED::setFont(1);
 			OLED::print(SolderingAdvancedPowerPrompt);  // Power:
-			OLED::printNumber(milliWattHistory[0] / 1000, 2);
-			OLED::drawChar('.');
-			OLED::printNumber(milliWattHistory[0] / 100 % 10, 1);
-			OLED::drawChar('W');
+			OLED::printNumber(x10WattHistory.average() / 10, 2);
+			OLED::print(SymbolDot);
+			OLED::printNumber(x10WattHistory.average() % 10, 1);
+			OLED::print(SymbolWatts);

 			if (systemSettings.sensitivity && systemSettings.SleepTime) {
-				OLED::print(" ");
+				OLED::print(SymbolSpace);
 				display_countdown(sleepThres);
 			}

 			OLED::setCursor(0, 8);
 			OLED::print(SleepingTipAdvancedString);
+			//OLED::printNumber(
+			//		TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0)), 5); // Draw the tip temp out finally
+
 			gui_drawTipTemp(true);
-			OLED::print(" ");
+			OLED::print(SymbolSpace);
 			printVoltage();
-			OLED::drawChar('V');
+			OLED::print(SymbolVolts);
 		} else {
 			// We switch the layout direction depending on the orientation of the
 			// OLED::
 			if (OLED::getRotation()) {
 				// battery
 				gui_drawBatteryIcon();
-				OLED::drawChar(' '); // Space out gap between battery <-> temp
+				OLED::print(SymbolSpace); // Space out gap between battery <-> temp
 				gui_drawTipTemp(true);  // Draw current tip temp

 				// We draw boost arrow if boosting, or else gap temp <-> heat
@@ -594,26 +535,22 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 				if (boostModeOn)
 					OLED::drawSymbol(2);
 				else
-					OLED::drawChar(' ');
+					OLED::print(SymbolSpace);

 				// Draw heating/cooling symbols
-				OLED::drawHeatSymbol(
-						milliWattsToPWM(milliWattHistory[0],
-								systemSettings.voltageDiv));
+				OLED::drawHeatSymbol(X10WattsToPWM(x10WattHistory.average()));
 			} else {
 				// Draw heating/cooling symbols
-				OLED::drawHeatSymbol(
-						milliWattsToPWM(milliWattHistory[0],
-								systemSettings.voltageDiv));
+				OLED::drawHeatSymbol(X10WattsToPWM(x10WattHistory.average()));
 				// We draw boost arrow if boosting, or else gap temp <-> heat
 				// indicator
 				if (boostModeOn)
 					OLED::drawSymbol(2);
 				else
-					OLED::drawChar(' ');
+					OLED::print(SymbolSpace);
 				gui_drawTipTemp(true);  // Draw current tip temp

-				OLED::drawChar(' '); // Space out gap between battery <-> temp
+				OLED::print(SymbolSpace); // Space out gap between battery <-> temp

 				gui_drawBatteryIcon();
 			}
@@ -622,9 +559,9 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 		if (badTipCounter > 128) {
 			OLED::print(BadTipString);
 			OLED::refresh();
-			currentlyActiveTemperatureTarget = 0;
+			currentTempTargetDegC = 0;
 			waitForButtonPress();
-			currentlyActiveTemperatureTarget = 0;
+			currentTempTargetDegC = 0;
 			return;
 		}
 		OLED::refresh();
@@ -632,19 +569,17 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 		// Update the setpoints for the temperature
 		if (boostModeOn) {
 			if (systemSettings.temperatureInF)
-				currentlyActiveTemperatureTarget = ftoTipMeasurement(
+				currentTempTargetDegC = TipThermoModel::convertFtoC(
 						systemSettings.BoostTemp);
 			else
-				currentlyActiveTemperatureTarget = ctoTipMeasurement(
-						systemSettings.BoostTemp);
+				currentTempTargetDegC = (systemSettings.BoostTemp);

 		} else {
 			if (systemSettings.temperatureInF)
-				currentlyActiveTemperatureTarget = ftoTipMeasurement(
+				currentTempTargetDegC = TipThermoModel::convertFtoC(
 						systemSettings.SolderingTemp);
 			else
-				currentlyActiveTemperatureTarget = ctoTipMeasurement(
-						systemSettings.SolderingTemp);
+				currentTempTargetDegC = (systemSettings.SolderingTemp);
 		}

 #ifdef MODEL_TS100
@@ -674,78 +609,64 @@ static void gui_solderingMode(uint8_t jumpToSleep) {
 	}
 }

-static const char *HEADERS[] = {
-__DATE__, "Heap: ", "HWMG: ", "HWMP: ", "HWMM: ", "Time: ", "Move: ", "RTip: ",
-		"CTip: ", "Vin :", "THan: ", "Model: ",
-#ifdef MODEL_TS80
-		"QCV: ", "Tr ",
-#else
-		"Tm ", "Ralim-",
-
-#endif
-		};
-
-void showVersion(void) {
+void showDebugMenu(void) {
 	uint8_t screen = 0;
 	ButtonState b;
 	for (;;) {
 		OLED::clearScreen();    // Ensure the buffer starts clean
 		OLED::setCursor(0, 0);  // Position the cursor at the 0,0 (top left)
 		OLED::setFont(1);       // small font
-#ifdef MODEL_TS100
-		OLED::print((char *) "V2.06 TS100");  // Print version number
-#else
-				OLED::print((char *) "V2.06 TS80");  // Print version number
-#endif
+		OLED::print(SymbolVersionNumber);  // Print version number
 		OLED::setCursor(0, 8);  // second line
-		OLED::print(HEADERS[screen]);
+		OLED::print(DebugMenu[screen]);
 		switch (screen) {
-		case 1:
-			OLED::printNumber(xPortGetFreeHeapSize(), 5);
+		case 0:  //Just prints date
 			break;
-		case 2:
+		case 1:
+			//High water mark for GUI
 			OLED::printNumber(uxTaskGetStackHighWaterMark(GUITaskHandle), 5);
 			break;
+		case 2:
+			//High water mark for the Movement task
+			OLED::printNumber(uxTaskGetStackHighWaterMark(MOVTaskHandle), 5);
+			break;
 		case 3:
+			//High water mark for the PID task
 			OLED::printNumber(uxTaskGetStackHighWaterMark(PIDTaskHandle), 5);
 			break;
 		case 4:
-			OLED::printNumber(uxTaskGetStackHighWaterMark(MOVTaskHandle), 5);
-			break;
-		case 5:
+			//system up time stamp
 			OLED::printNumber(xTaskGetTickCount() / 100, 5);
 			break;
-		case 6:
+		case 5:
+			//Movement time stamp
 			OLED::printNumber(lastMovementTime / 100, 5);
 			break;
+		case 6:
+			//Raw Tip
+		{
+			uint32_t temp = systemSettings.CalibrationOffset;
+			systemSettings.CalibrationOffset = 0;
+			OLED::printNumber(
+					TipThermoModel::convertTipRawADCTouV(getTipRawTemp(1)), 6);
+			systemSettings.CalibrationOffset = temp;
+		}
+			break;
 		case 7:
-			OLED::printNumber(getTipRawTemp(0), 6);
+			//Temp in C
+			OLED::printNumber(TipThermoModel::getTipInC(1), 5);
 			break;
 		case 8:
-			OLED::printNumber(tipMeasurementToC(getTipRawTemp(0)), 5);
+			//Handle Temp
+			OLED::printNumber(getHandleTemperature(), 3);
 			break;
 		case 9:
+			//Voltage input
 			printVoltage();
 			break;
 		case 10:
-			OLED::printNumber(getHandleTemperature(), 3);
-			break;
-		case 11:
-			OLED::printNumber(PCBVersion, 1);  // Print PCB ID number
-			break;
-		case 12:
-#ifdef MODEL_TS80
-			OLED::printNumber(idealQCVoltage, 3);
-#else
-			OLED::printNumber(systemSettings.tipType, 3);
-#endif
-			break;
-		case 13:
-#ifdef MODEL_TS80
-			OLED::printNumber(calculateTipR(), 5);
-#else
-			OLED::print("Tek.com");
-#endif
+			// Print PCB ID number
+			OLED::printNumber(PCBVersion, 1);
 			break;
 		default:
 			break;
@@ -757,7 +678,7 @@ void showVersion(void) {
 			return;
 		else if (b == BUTTON_F_SHORT) {
 			screen++;
-			screen = screen % 14;
+			screen = screen % 11;
 		}
 		GUIDelay();
 	}
@@ -781,6 +702,17 @@ void startGUITask(void const *argument __unused) {
 			ticks = xTaskGetTickCount();  // make timeout now so we will exit
 		GUIDelay();
 	}
+
+	if (settingsWereReset) {
+		//Display alert settings were reset
+		OLED::setFont(1);
+		OLED::setCursor(0, 0);
+		OLED::print(SettingsResetMessage);
+		OLED::refresh();
+		waitForButtonPressOrTimeout(1000);
+
+	}
+
 	if (systemSettings.autoStartMode) {
 		// jump directly to the autostart mode
 		if (systemSettings.autoStartMode == 1)
@@ -789,7 +721,7 @@ void startGUITask(void const *argument __unused) {
 			gui_solderingMode(1);
 	}

-#if ACCELDEBUG
+#ifdef ACCELDEBUG

 	for (;;) {
 		HAL_IWDG_Refresh(&hiwdg);
@@ -801,7 +733,7 @@ void startGUITask(void const *argument __unused) {
 	for (;;) {
 		ButtonState buttons = getButtonState();
 		if (buttons != BUTTON_NONE) {
-			OLED::displayOnOff(true);  // turn lcd on
+			OLED::setDisplayState(OLED::DisplayState::ON);
 			OLED::setFont(0);
 		}
 		if (tempWarningState == 2)
@@ -823,7 +755,7 @@ void startGUITask(void const *argument __unused) {

 		case BUTTON_B_LONG:
 			// Show the version information
-			showVersion();
+			showDebugMenu();
 			break;
 		case BUTTON_F_LONG:
 			gui_solderingTempAdjust();
@@ -835,29 +767,29 @@ void startGUITask(void const *argument __unused) {
 			break;
 		case BUTTON_B_SHORT:
 			enterSettingsMenu();       // enter the settings menu
-			saveSettings();
 			buttonLockout = true;
-			setCalibrationOffset(systemSettings.CalibrationOffset); // ensure cal offset is applied
 			break;
 		default:
 			break;
 		}

-		currentlyActiveTemperatureTarget = 0;  // ensure tip is off
+		currentTempTargetDegC = 0;  // ensure tip is off
 		getInputVoltageX10(systemSettings.voltageDiv, 0);
-		uint16_t tipTemp = tipMeasurementToC(getTipRawTemp(0));
+		uint16_t tipTemp = TipThermoModel::getTipInC();

-		if (tipTemp < 50) {
-			if (systemSettings.sensitivity) {
-				if ((xTaskGetTickCount() - lastMovementTime) > 6000
-						&& (xTaskGetTickCount() - lastButtonTime) > 6000) {
-					OLED::displayOnOff(false);  // turn lcd off when no movement
-				} else
-					OLED::displayOnOff(true);  // turn lcd on
-			} else
-				OLED::displayOnOff(true); // turn lcd on - disabled motion sleep
-		} else
-			OLED::displayOnOff(true);  // turn lcd on when temp > 50C
+		// Preemptively turn the display on.  Turn it off if and only if
+		// the tip temperature is below 50 degrees C *and* motion sleep
+		// detection is enabled *and* there has been no activity (movement or
+		// button presses) in a while.
+		OLED::setDisplayState(OLED::DisplayState::ON);
+
+		if ((tipTemp < 50) && systemSettings.sensitivity
+				&& (((xTaskGetTickCount() - lastMovementTime)
+						> MOVEMENT_INACTIVITY_TIME)
+						&& ((xTaskGetTickCount() - lastButtonTime)
+								> BUTTON_INACTIVITY_TIME))) {
+			OLED::setDisplayState(OLED::DisplayState::OFF);
+		}

 		// Clear the lcd buffer
 		OLED::clearScreen();
@@ -923,298 +855,3 @@ void startGUITask(void const *argument __unused) {
 		GUIDelay();
 	}
 }
-
-/* StartPIDTask function */
-void startPIDTask(void const *argument __unused) {
-	/*
-	 * We take the current tip temperature & evaluate the next step for the tip
-	 * control PWM.
-	 */
-	setTipMilliWatts(0); // disable the output driver if the output is set to be off
-#ifdef MODEL_TS80
-			idealQCVoltage = calculateMaxVoltage(systemSettings.cutoutSetting);
-#endif
-	uint8_t rawC = ctoTipMeasurement(101) - ctoTipMeasurement(100); // 1*C change in raw.
-
-#ifdef MODEL_TS80
-			//Set power management code to the tip resistance in ohms * 10
-			setupPower(calculateTipR() / 100);
-			//size_t lastPowerPulse = 0;
-#else
-	setupPower(85);
-
-#endif
-	history<int32_t> tempError = { { 0 }, 0, 0 };
-	currentlyActiveTemperatureTarget = 0; // Force start with no output (off). If in sleep / soldering this will
-										  // be over-ridden rapidly
-	pidTaskNotification = xTaskGetCurrentTaskHandle();
-	for (;;) {
-
-		if (ulTaskNotifyTake(pdTRUE, 2000)) {
-			// This is a call to block this thread until the ADC does its samples
-			uint16_t rawTemp = getTipRawTemp(1);  // get instantaneous reading
-			if (currentlyActiveTemperatureTarget) {
-				// Cap the max set point to 450C
-				if (currentlyActiveTemperatureTarget > ctoTipMeasurement(450)) {
-					//Maximum allowed output
-					currentlyActiveTemperatureTarget = ctoTipMeasurement(450);
-				} else if (currentlyActiveTemperatureTarget > 32400) {
-					//Cap to max adc reading
-					currentlyActiveTemperatureTarget = 32400;
-				}
-
-				// As we get close to our target, temp noise causes the system
-				//  to be unstable. Use a rolling average to dampen it.
-				// We overshoot by roughly 1/2 of 1 degree Fahrenheit.
-				//  This helps stabilize the display.
-				int32_t tError = currentlyActiveTemperatureTarget - rawTemp
-						+ (rawC / 4);
-				tError = tError > INT16_MAX ? INT16_MAX : tError;
-				tError = tError < INT16_MIN ? INT16_MIN : tError;
-				tempError.update(tError);
-
-				// Now for the PID!
-				int32_t milliWattsOut = 0;
-
-				// P term - total power needed to hit target temp next cycle.
-				// thermal mass = 1690 milliJ/*C for my tip.
-				//  = Watts*Seconds to raise Temp from room temp to +100*C, divided by 100*C.
-				// we divide milliWattsNeeded by 20 to let the I term dominate near the set point.
-				//  This is necessary because of the temp noise and thermal lag in the system.
-				// Once we have feed-forward temp estimation we should be able to better tune this.
-
-#ifdef MODEL_TS100
-				const uint16_t mass = 2020 / 20; // divide here so division is compile-time.
-#endif
-#ifdef MODEL_TS80
-				const uint16_t mass = 2020 / 50;
-#endif
-
-				int32_t milliWattsNeeded = tempToMilliWatts(tempError.average(),
-						mass, rawC);
-				// note that milliWattsNeeded is sometimes negative, this counters overshoot
-				//  from I term's inertia.
-				milliWattsOut += milliWattsNeeded;
-
-				// I term - energy needed to compensate for heat loss.
-				// We track energy put into the system over some window.
-				// Assuming the temp is stable, energy in = energy transfered.
-				//  (If it isn't, P will dominate).
-				milliWattsOut += milliWattHistory.average();
-
-				// D term - use sudden temp change to counter fast cooling/heating.
-				//  In practice, this provides an early boost if temp is dropping
-				//  and counters extra power if the iron is no longer losing temp.
-				// basically: temp - lastTemp
-				//  Unfortunately, our temp signal is too noisy to really help.
-
-				setTipMilliWatts(milliWattsOut);
-			} else {
-
-#ifdef MODEL_TS80
-				//If its a TS80, we want to have the option of using an occasional pulse to keep the power bank on
-				//~200ms @ a low wattage
-				//Doesnt keep all power banks awake but helps with some
-				/*if (xTaskGetTickCount() - lastPowerPulse < 20) {
-				 // for the first 200mS turn on for a bit
-				 setTipMilliWatts(4000);	// typically its around 5W to hold the current temp, so this wont raise temp much
-				 } else
-				 setTipMilliWatts(0);
-				 //Then wait until the next second
-				 if (xTaskGetTickCount() - lastPowerPulse > 100) {
-				 lastPowerPulse = xTaskGetTickCount();
-				 }*/
-				setTipMilliWatts(0);
-#else
-				setTipMilliWatts(0);
-#endif
-			}
-
-			HAL_IWDG_Refresh(&hiwdg);
-		} else {
-			asm("bkpt");
-
-//ADC interrupt timeout
-			setTipMilliWatts(0);
-			setTipPWM(0);
-		}
-	}
-}
-
-#define MOVFilter 8
-void startMOVTask(void const *argument __unused) {
-	OLED::setRotation(true);
-
-#ifdef MODEL_TS80
-	startQC(systemSettings.voltageDiv);
-	while (pidTaskNotification == 0)
-	osDelay(20);  // To ensure we return after idealQCVoltage/tip resistance
-
-	seekQC(idealQCVoltage, systemSettings.voltageDiv);// this will move the QC output to the preferred voltage to start with
-
-#else
-	osDelay(250);  // wait for accelerometer to stabilize
-#endif
-
-	OLED::setRotation(systemSettings.OrientationMode & 1);
-	lastMovementTime = 0;
-	int16_t datax[MOVFilter] = { 0 };
-	int16_t datay[MOVFilter] = { 0 };
-	int16_t dataz[MOVFilter] = { 0 };
-	uint8_t currentPointer = 0;
-	int16_t tx = 0, ty = 0, tz = 0;
-	int32_t avgx = 0, avgy = 0, avgz = 0;
-	if (systemSettings.sensitivity > 9)
-		systemSettings.sensitivity = 9;
-#if ACCELDEBUG
-	uint32_t max = 0;
-#endif
-	Orientation rotation = ORIENTATION_FLAT;
-	for (;;) {
-		int32_t threshold = 1500 + (9 * 200);
-		threshold -= systemSettings.sensitivity * 200;  // 200 is the step size
-
-		if (PCBVersion == 2) {
-			LIS2DH12::getAxisReadings(&tx, &ty, &tz);
-			rotation = LIS2DH12::getOrientation();
-		} else if (PCBVersion == 1) {
-			MMA8652FC::getAxisReadings(&tx, &ty, &tz);
-			rotation = MMA8652FC::getOrientation();
-		}
-		if (systemSettings.OrientationMode == 2) {
-			if (rotation != ORIENTATION_FLAT) {
-				OLED::setRotation(rotation == ORIENTATION_LEFT_HAND); // link the data through
-			}
-		}
-		datax[currentPointer] = (int32_t) tx;
-		datay[currentPointer] = (int32_t) ty;
-		dataz[currentPointer] = (int32_t) tz;
-		currentPointer = (currentPointer + 1) % MOVFilter;
-		avgx = avgy = avgz = 0;
-		// calculate averages
-		for (uint8_t i = 0; i < MOVFilter; i++) {
-			avgx += datax[i];
-			avgy += datay[i];
-			avgz += dataz[i];
-		}
-		avgx /= MOVFilter;
-		avgy /= MOVFilter;
-		avgz /= MOVFilter;
-
-		// Sum the deltas
-		int32_t error = (abs(avgx - tx) + abs(avgy - ty) + abs(avgz - tz));
-
-#if ACCELDEBUG
-		// Debug for Accel
-
-		OLED::setFont(1);
-		OLED::setCursor(0, 0);
-		OLED::printNumber(abs(avgx - (int32_t)tx), 5);
-		OLED::print(" ");
-		OLED::printNumber(abs(avgy - (int32_t)ty), 5);
-		if (error > max) {
-			max = (abs(avgx - tx) + abs(avgy - ty) + abs(avgz - tz));
-		}
-		OLED::setCursor(0, 8);
-		OLED::printNumber(max, 5);
-		OLED::print(" ");
-
-		OLED::printNumber((abs(avgx - tx) + abs(avgy - ty) + abs(avgz - tz)), 5);
-		OLED::refresh();
-		if (HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET) {
-			max = 0;
-		}
-#endif
-
-		// So now we have averages, we want to look if these are different by more
-		// than the threshold
-
-		// If error has occurred then we update the tick timer
-		if (error > threshold) {
-			lastMovementTime = xTaskGetTickCount();
-		}
-
-		osDelay(100);  // Slow down update rate
-#ifdef MODEL_TS80
-				if (currentlyActiveTemperatureTarget) {
-					seekQC(idealQCVoltage, systemSettings.voltageDiv); // Run the QC seek again to try and compensate for cable V drop
-				}
-#endif
-	}
-}
-
-#define FLASH_LOGOADDR \
-  (0x8000000 | 0xF800) /*second last page of flash set aside for logo image*/
-
-bool showBootLogoIfavailable() {
-	// check if the header is there (0xAA,0x55,0xF0,0x0D)
-	// If so display logo
-	// TODO REDUCE STACK ON THIS ONE, USE DRAWING IN THE READ LOOP
-	uint16_t temp[98];
-
-	for (uint8_t i = 0; i < (98); i++) {
-		temp[i] = *(uint16_t *) (FLASH_LOGOADDR + (i * 2));
-	}
-	uint8_t temp8[98 * 2];
-	for (uint8_t i = 0; i < 98; i++) {
-		temp8[i * 2] = temp[i] >> 8;
-		temp8[i * 2 + 1] = temp[i] & 0xFF;
-	}
-
-	if (temp8[0] != 0xAA)
-		return false;
-	if (temp8[1] != 0x55)
-		return false;
-	if (temp8[2] != 0xF0)
-		return false;
-	if (temp8[3] != 0x0D)
-		return false;
-
-	OLED::drawArea(0, 0, 96, 16, (uint8_t *) (temp8 + 4));
-	OLED::refresh();
-	return true;
-}
-
-/*
- * 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) {
-	asm("bkpt");
-
-	FRToSI2C::CpltCallback();
-}
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
-	//asm("bkpt");
-
-	FRToSI2C::CpltCallback();
-}
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
-	FRToSI2C::CpltCallback();
-}
-void vApplicationStackOverflowHook(xTaskHandle *pxTask __unused,
-		signed portCHAR *pcTaskName __unused) {
-	asm("bkpt");
-	// We dont have a good way to handle a stack overflow at this point in time
-	NVIC_SystemReset();
-}
--- a/workspace/TS100/Core/Src/LIS2DH12.cpp
+++ b/workspace/TS100/Core/Src/LIS2DH12.cpp
@@ -5,9 +5,10 @@
 *      Author: Ralim
 */

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

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

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

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

-	(*x) = ((uint16_t) (tempArr[1] << 8 | tempArr[0]));
-	(*y) = ((uint16_t) (tempArr[3] << 8 | tempArr[2]));
-	(*z) = ((uint16_t) (tempArr[5] << 8 | tempArr[4]));
+    FRToSI2C::Mem_Read(LIS2DH_I2C_ADDRESS, 0xA8, I2C_MEMADD_SIZE_8BIT,
+        reinterpret_cast<uint8_t*>(sensorData.begin()),
+        sensorData.size() * sizeof(int16_t));
+
+    x = sensorData[0];
+    y = sensorData[1];
+    z = sensorData[2];
 }
-
-
--- a/workspace/TS100/Core/Src/MMA8652FC.cpp
+++ b/workspace/TS100/Core/Src/MMA8652FC.cpp
@@ -5,7 +5,9 @@
 *      Author: Ben V. Brown
 */

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

 typedef struct {
@@ -62,12 +64,15 @@ Orientation MMA8652FC::getOrientation() {

 	return ORIENTATION_FLAT;
 }
-void MMA8652FC::getAxisReadings(int16_t *x, int16_t *y, int16_t *z) {
-	uint8_t tempArr[6];
-	FRToSI2C::Mem_Read( MMA8652FC_I2C_ADDRESS, OUT_X_MSB_REG, I2C_MEMADD_SIZE_8BIT,
-			(uint8_t*) tempArr, 6);

-	(*x) = tempArr[0] << 8 | tempArr[1];
-	(*y) = tempArr[2] << 8 | tempArr[3];
-	(*z) = tempArr[4] << 8 | tempArr[5];
+void MMA8652FC::getAxisReadings(int16_t& x, int16_t& y, int16_t& z) {
+	std::array<int16_t, 3> sensorData;
+
+	FRToSI2C::Mem_Read(MMA8652FC_I2C_ADDRESS, OUT_X_MSB_REG, I2C_MEMADD_SIZE_8BIT,
+		reinterpret_cast<uint8_t*>(sensorData.begin()),
+		sensorData.size() * sizeof(int16_t));
+
+	x = static_cast<int16_t>(__builtin_bswap16(*reinterpret_cast<uint16_t*>(&sensorData[0])));
+	y = static_cast<int16_t>(__builtin_bswap16(*reinterpret_cast<uint16_t*>(&sensorData[1])));
+	z = static_cast<int16_t>(__builtin_bswap16(*reinterpret_cast<uint16_t*>(&sensorData[2])));
 }
--- a/workspace/TS100/Core/Src/OLED.cpp
+++ b/workspace/TS100/Core/Src/OLED.cpp
@@ -0,0 +1,334 @@
+/*
+ * OLED.cpp
+ *
+ *  Created on: 29Aug.,2017
+ *      Author: Ben V. Brown
+ */
+
+#include <string.h>
+#include <OLED.hpp>
+#include <stdlib.h>
+#include "Translation.h"
+#include "cmsis_os.h"
+
+const uint8_t *OLED::currentFont;  // Pointer to the current font used for
+// rendering to the buffer
+uint8_t *OLED::firstStripPtr;      // Pointers to the strips to allow for buffer
+// having extra content
+uint8_t *OLED::secondStripPtr;     // Pointers to the strips
+bool OLED::inLeftHandedMode;   // Whether the screen is in left or not (used for
+// offsets in GRAM)
+OLED::DisplayState OLED::displayState;
+uint8_t OLED::fontWidth, OLED::fontHeight;
+int16_t OLED::cursor_x, OLED::cursor_y;
+uint8_t OLED::displayOffset;
+uint8_t OLED::screenBuffer[16 + (OLED_WIDTH * 2) + 10];  // The data buffer
+
+/*Setup params for the OLED screen*/
+/*http://www.displayfuture.com/Display/datasheet/controller/SSD1307.pdf*/
+/*All commands are prefixed with 0x80*/
+/*Data packets are prefixed with 0x40*/
+uint8_t OLED_Setup_Array[] = {
+/**/
+0x80, 0xAE, /*Display off*/
+0x80, 0xD5, /*Set display clock divide ratio / osc freq*/
+0x80, 0x52, /*Divide ratios*/
+0x80, 0xA8, /*Set Multiplex Ratio*/
+0x80, 0x0F, /*16 == max brightness,39==dimmest*/
+0x80, 0xC0, /*Set COM Scan direction*/
+0x80, 0xD3, /*Set vertical Display offset*/
+0x80, 0x00, /*0 Offset*/
+0x80, 0x40, /*Set Display start line to 0*/
+0x80, 0xA0, /*Set Segment remap to normal*/
+0x80, 0x8D, /*Charge Pump*/
+0x80, 0x14, /*Charge Pump settings*/
+0x80, 0xDA, /*Set VCOM Pins hardware config*/
+0x80, 0x02, /*Combination 2*/
+0x80, 0x81, /*Contrast*/
+0x80, 0x33, /*^51*/
+0x80, 0xD9, /*Set pre-charge period*/
+0x80, 0xF1, /*Pre charge period*/
+0x80, 0xDB, /*Adjust VCOMH regulator ouput*/
+0x80, 0x30, /*VCOM level*/
+0x80, 0xA4, /*Enable the display GDDR*/
+0x80, 0XA6, /*Normal display*/
+0x80, 0x20, /*Memory Mode*/
+0x80, 0x00, /*Wrap memory*/
+0x80, 0xAF /*Display on*/
+};
+// Setup based on the SSD1307 and modified for the SSD1306
+
+const uint8_t REFRESH_COMMANDS[17] = { 0x80, 0xAF, 0x80, 0x21, 0x80, 0x20, 0x80,
+		0x7F, 0x80, 0xC0, 0x80, 0x22, 0x80, 0x00, 0x80, 0x01, 0x40 };
+
+void OLED::initialize() {
+	cursor_x = cursor_y = 0;
+	currentFont = USER_FONT_12;
+	fontWidth = 12;
+	inLeftHandedMode = false;
+	firstStripPtr = &screenBuffer[FRAMEBUFFER_START];
+	secondStripPtr = &screenBuffer[FRAMEBUFFER_START + OLED_WIDTH];
+	fontHeight = 16;
+	displayOffset = 0;
+	memcpy(&screenBuffer[0], &REFRESH_COMMANDS[0], sizeof(REFRESH_COMMANDS));
+
+	HAL_Delay(50);
+	HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_SET);
+	HAL_Delay(50);
+
+	// Set the display to be ON once the settings block is sent and send the
+	// initialisation data to the OLED.
+
+	setDisplayState(DisplayState::ON);
+	FRToSI2C::Transmit(DEVICEADDR_OLED, &OLED_Setup_Array[0],
+			sizeof(OLED_Setup_Array));
+}
+
+/*
+ * Prints a char to the screen.
+ * UTF font handling is done using the two input chars.
+ * Precursor is the command char that is used to select the table.
+ */
+void OLED::drawChar(char c) {
+	if (c == '\x01' && cursor_y == 0) { // 0x01 is used as new line char
+		cursor_x = 0;
+		cursor_y = 8;
+		return;
+	} else if (c == 0) {
+		return;
+	}
+	uint16_t index = c - 2; //First index is \x02
+	uint8_t *charPointer;
+	charPointer = ((uint8_t*) currentFont)
+			+ ((fontWidth * (fontHeight / 8)) * index);
+	drawArea(cursor_x, cursor_y, fontWidth, fontHeight, charPointer);
+	cursor_x += fontWidth;
+}
+
+void OLED::setRotation(bool leftHanded) {
+#ifdef MODEL_TS80
+	leftHanded = !leftHanded;
+#endif
+	if (inLeftHandedMode == leftHanded) {
+		return;
+	}
+
+	// send command struct again with changes
+	if (leftHanded) {
+		OLED_Setup_Array[11] = 0xC8;  // c1?
+		OLED_Setup_Array[19] = 0xA1;
+	} else {
+		OLED_Setup_Array[11] = 0xC0;
+		OLED_Setup_Array[19] = 0xA0;
+	}
+	FRToSI2C::Transmit(DEVICEADDR_OLED, (uint8_t*) OLED_Setup_Array,
+			sizeof(OLED_Setup_Array));
+	inLeftHandedMode = leftHanded;
+
+	screenBuffer[5] = inLeftHandedMode ? 0 : 32; // display is shifted by 32 in left handed
+												 // mode as driver ram is 128 wide
+	screenBuffer[7] = inLeftHandedMode ? 95 : 0x7F; // End address of the ram segment we are writing to (96 wide)
+	screenBuffer[9] = inLeftHandedMode ? 0xC8 : 0xC0;
+}
+
+// print a string to the current cursor location
+void OLED::print(const char *str) {
+	while (str[0]) {
+		drawChar(str[0]);
+		str++;
+	}
+}
+
+void OLED::setFont(uint8_t fontNumber) {
+	if (fontNumber == 1) {
+		// small font
+		currentFont = USER_FONT_6x8;
+		fontHeight = 8;
+		fontWidth = 6;
+	} else if (fontNumber == 2) {
+		currentFont = ExtraFontChars;
+		fontHeight = 16;
+		fontWidth = 12;
+	} else {
+		currentFont = USER_FONT_12;
+		fontHeight = 16;
+		fontWidth = 12;
+	}
+}
+inline void stripLeaderZeros(char *buffer) {
+	//Removing the leading zero's by swapping them to SymbolSpace
+	// Stop 1 short so that we dont blank entire number if its zero
+	for (int i = 0; i < 6; i++) {
+		if (buffer[i] == 2) {
+			buffer[i] = SymbolSpace[0];
+		} else {
+			return;
+		}
+	}
+}
+// maximum places is 5
+void OLED::printNumber(uint16_t number, uint8_t places) {
+	char buffer[7] = { 0 };
+
+	if (places >= 5) {
+		buffer[5] = 2 + number % 10;
+		number /= 10;
+	}
+	if (places > 4) {
+		buffer[4] = 2 + number % 10;
+		number /= 10;
+	}
+
+	if (places > 3) {
+		buffer[3] = 2 + number % 10;
+		number /= 10;
+	}
+
+	if (places > 2) {
+		buffer[2] = 2 + number % 10;
+		number /= 10;
+	}
+
+	if (places > 1) {
+		buffer[1] = 2 + number % 10;
+		number /= 10;
+	}
+
+	buffer[0] = 2 + number % 10;
+	stripLeaderZeros(buffer);
+	print(buffer);
+}
+
+void OLED::debugNumber(int32_t val) {
+	if (abs(val) > 99999) {
+		OLED::print(SymbolSpace); // out of bounds
+		return;
+	}
+	if (val >= 0) {
+		OLED::print(SymbolSpace);
+		OLED::printNumber(val, 5);
+	} else {
+		OLED::print(SymbolMinus);
+		OLED::printNumber(-val, 5);
+	}
+}
+
+void OLED::drawSymbol(uint8_t symbolID) {
+	// draw a symbol to the current cursor location
+	setFont(2);
+	drawChar(symbolID + 2);
+	setFont(0);
+}
+
+// Draw an area, but y must be aligned on 0/8 offset
+void OLED::drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
+		const uint8_t *ptr) {
+	// Splat this from x->x+wide in two strides
+	if (x <= -wide)
+		return;  // cutoffleft
+	if (x > 96)
+		return;      // cutoff right
+
+	uint8_t visibleStart = 0;
+	uint8_t visibleEnd = wide;
+
+	// trimming to draw partials
+	if (x < 0) {
+		visibleStart -= x;  // subtract negative value == add absolute value
+	}
+	if (x + wide > 96) {
+		visibleEnd = 96 - x;
+	}
+
+	if (y == 0) {
+		// Splat first line of data
+		for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) {
+			firstStripPtr[xx + x] = ptr[xx];
+		}
+	}
+	if (y == 8 || height == 16) {
+		// Splat the second line
+		for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) {
+			secondStripPtr[x + xx] = ptr[xx + (height == 16 ? wide : 0)];
+		}
+	}
+}
+void OLED::fillArea(int16_t x, int8_t y, uint8_t wide, uint8_t height,
+		const uint8_t value) {
+	// Splat this from x->x+wide in two strides
+	if (x <= -wide)
+		return;  // cutoffleft
+	if (x > 96)
+		return;      // cutoff right
+
+	uint8_t visibleStart = 0;
+	uint8_t visibleEnd = wide;
+
+	// trimming to draw partials
+	if (x < 0) {
+		visibleStart -= x;  // subtract negative value == add absolute value
+	}
+	if (x + wide > 96) {
+		visibleEnd = 96 - x;
+	}
+
+	if (y == 0) {
+		// Splat first line of data
+		for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) {
+			firstStripPtr[xx + x] = value;
+		}
+	}
+	if (y == 8 || height == 16) {
+		// Splat the second line
+		for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) {
+			secondStripPtr[x + xx] = value;
+		}
+	}
+}
+
+void OLED::drawFilledRect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1,
+		bool clear) {
+	// Draw this in 3 sections
+	// This is basically a N wide version of vertical line
+
+	// Step 1 : Draw in the top few pixels that are not /8 aligned
+	// LSB is at the top of the screen
+	uint8_t mask = 0xFF;
+	if (y0) {
+		mask = mask << (y0 % 8);
+		for (uint8_t col = x0; col < x1; col++)
+			if (clear)
+				firstStripPtr[(y0 / 8) * 96 + col] &= ~mask;
+			else
+				firstStripPtr[(y0 / 8) * 96 + col] |= mask;
+	}
+	// Next loop down the line the total number of solids
+	if (y0 / 8 != y1 / 8)
+		for (uint8_t col = x0; col < x1; col++)
+			for (uint8_t r = (y0 / 8); r < (y1 / 8); r++) {
+				// This gives us the row index r
+				if (clear)
+					firstStripPtr[(r * 96) + col] = 0;
+				else
+					firstStripPtr[(r * 96) + col] = 0xFF;
+			}
+
+	// Finally draw the tail
+	mask = ~(mask << (y1 % 8));
+	for (uint8_t col = x0; col < x1; col++)
+		if (clear)
+			firstStripPtr[(y1 / 8) * 96 + col] &= ~mask;
+		else
+			firstStripPtr[(y1 / 8) * 96 + col] |= mask;
+}
+
+void OLED::drawHeatSymbol(uint8_t state) {
+	// Draw symbol 14
+	// Then draw over it, the bottom 5 pixels always stay. 8 pixels above that are
+	// the levels masks the symbol nicely
+	state /= 31;  // 0-> 8 range
+	// Then we want to draw down (16-(5+state)
+	uint8_t cursor_x_temp = cursor_x;
+	drawSymbol(14);
+	drawFilledRect(cursor_x_temp, 0, cursor_x_temp + 12, 2 + (8 - state), true);
+}
--- a/workspace/TS100/Core/Src/Settings.cpp
+++ b/workspace/TS100/Core/Src/Settings.cpp
@@ -0,0 +1,116 @@
+/*
+ * Settings.c
+ *
+ *  Created on: 29 Sep 2016
+ *      Author: Ralim
+ *
+ *      This file holds the users settings and saves / restores them to the
+ * devices flash
+ */
+
+#include "Settings.h"
+#include "Setup.h"
+#define FLASH_ADDR \
+  (0x8000000 |     \
+   0xFC00) /*Flash start OR'ed with the maximum amount of flash - 1024 bytes*/
+#include "string.h"
+volatile systemSettingsType systemSettings;
+
+void saveSettings() {
+	// First we erase the flash
+	FLASH_EraseInitTypeDef pEraseInit;
+	pEraseInit.TypeErase = FLASH_TYPEERASE_PAGES;
+	pEraseInit.Banks = FLASH_BANK_1;
+	pEraseInit.NbPages = 1;
+	pEraseInit.PageAddress = FLASH_ADDR;
+	uint32_t failingAddress = 0;
+	HAL_IWDG_Refresh(&hiwdg);
+	__HAL_FLASH_CLEAR_FLAG(
+			FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR | FLASH_FLAG_BSY);
+	HAL_FLASH_Unlock();
+	HAL_Delay(10);
+	HAL_IWDG_Refresh(&hiwdg);
+	HAL_FLASHEx_Erase(&pEraseInit, &failingAddress);
+	//^ Erase the page of flash (1024 bytes on this stm32)
+	// erased the chunk
+	// now we program it
+	uint16_t *data = (uint16_t*) &systemSettings;
+	HAL_FLASH_Unlock();
+
+	for (uint8_t i = 0; i < (sizeof(systemSettingsType) / 2); i++) {
+		HAL_IWDG_Refresh(&hiwdg);
+		HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, FLASH_ADDR + (i * 2),
+				data[i]);
+	}
+	HAL_FLASH_Lock();
+}
+
+bool restoreSettings() {
+	// We read the flash
+	uint16_t *data = (uint16_t*) &systemSettings;
+	for (uint8_t i = 0; i < (sizeof(systemSettingsType) / 2); i++) {
+		data[i] = *((uint16_t*) (FLASH_ADDR + (i * 2)));
+	}
+
+	// if the version is correct were done
+	// if not we reset and save
+	if (systemSettings.version != SETTINGSVERSION) {
+		// probably not setup
+		resetSettings();
+		return true;
+	}
+	return false;
+}
+// Lookup function for cutoff setting -> X10 voltage
+/*
+ * 0=DC
+ * 1=3S
+ * 2=4S
+ * 3=5S
+ * 4=6S
+ */
+uint8_t lookupVoltageLevel(uint8_t level) {
+	if (level == 0)
+		return 90;  // 9V since iron does not function effectively below this
+	else
+		return (level * 33) + (33 * 2);
+}
+void resetSettings() {
+	memset((void*) &systemSettings, 0, sizeof(systemSettingsType));
+	systemSettings.SleepTemp = 150; // Temperature the iron sleeps at - default 150.0 C
+	systemSettings.SleepTime = 6; // How many seconds/minutes we wait until going
+								  // to sleep - default 1 min
+	systemSettings.SolderingTemp = 320;  // Default soldering temp is 320.0 C
+	systemSettings.cutoutSetting = 0; // default to no cut-off voltage (or 18W for TS80)
+	systemSettings.version =
+	SETTINGSVERSION;  // Store the version number to allow for easier upgrades
+	systemSettings.detailedSoldering = 0;  // Detailed soldering screen
+	systemSettings.detailedIDLE = 0; // Detailed idle screen (off for first time users)
+	systemSettings.OrientationMode = 2;  // Default to automatic
+	systemSettings.sensitivity = 7;      // Default high sensitivity
+#ifdef MODEL_TS80
+	systemSettings.voltageDiv = 780;  // Default divider from schematic
+
+#else
+  systemSettings.voltageDiv = 467;  // Default divider from schematic
+#endif
+	systemSettings.ShutdownTime = 10; // How many minutes until the unit turns itself off
+	systemSettings.boostModeEnabled = 1; // Default to having boost mode on as most people prefer it
+	systemSettings.BoostTemp = 420;    // default to 400C
+	systemSettings.autoStartMode = 0;  // Auto start off for safety
+	systemSettings.coolingTempBlink = 0; // Blink the temperature on the cooling screen when its > 50C
+	systemSettings.temperatureInF = 0;          // default to 0
+	systemSettings.descriptionScrollSpeed = 0;  // default to slow
+
+#ifdef MODEL_TS100
+  systemSettings.CalibrationOffset = 900;  // the adc offset in uV
+  systemSettings.pidPowerLimit=70;  // Sets the max pwm power limit
+
+#endif
+#ifdef MODEL_TS80
+	systemSettings.pidPowerLimit = 24;  // Sets the max pwm power limit
+
+	systemSettings.CalibrationOffset = 900;  // the adc offset in uV
+#endif
+	saveSettings();  // Save defaults
+}
--- a/workspace/TS100/Core/Src/Setup.c
+++ b/workspace/TS100/Core/Src/Setup.c
@@ -32,13 +32,13 @@ static void MX_ADC2_Init(void);

 void Setup_HAL() {
 	SystemClock_Config();
-	#ifndef LOCAL_BUILD
-__HAL_AFIO_REMAP_SWJ_DISABLE();
-	#else 
-__HAL_AFIO_REMAP_SWJ_NOJTAG();
-	#endif
-	
-	
+#ifndef LOCAL_BUILD
+	__HAL_AFIO_REMAP_SWJ_DISABLE()
+	;
+#else
+	__HAL_AFIO_REMAP_SWJ_NOJTAG();
+#endif
+
 	MX_GPIO_Init();
 	MX_DMA_Init();
 	MX_I2C1_Init();
@@ -136,7 +136,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 +197,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 +261,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 +278,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 +290,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
-	__HAL_AFIO_REMAP_TIM3_PARTIAL();
+	// Remap TIM3_CH1 to be on PB4
+	__HAL_AFIO_REMAP_TIM3_PARTIAL()
+	;
 #else
 	// No re-map required
 #endif
@@ -314,14 +314,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
-	// 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,
-	//But it increases the time delay between the heat cycle and the measurement and calculate cycle
+	htim2.Init.Prescaler = 4000; //1mhz tick rate/800 = 1.25 KHz tick rate
+
+	// pwm out is 10k from tim3, we want to run our PWM at around 10hz or slower on the output stage
+	// 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 +336,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 +346,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.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 0;
-	sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
-	sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
+	sConfigOC.Pulse = 0;  //default to entirely off
 	HAL_TIM_OC_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_4);

 	HAL_TIM_Base_Start_IT(&htim2);
--- a/workspace/TS100/Core/Src/TipThermoModel.cpp
+++ b/workspace/TS100/Core/Src/TipThermoModel.cpp
@@ -0,0 +1,121 @@
+/*
+ * TipThermoModel.cpp
+ *
+ *  Created on: 7 Oct 2019
+ *      Author: ralim
+ */
+
+#include "TipThermoModel.h"
+#include "Settings.h"
+#include "hardware.h"
+
+/*
+ * The hardware is laid out  as a non-inverting op-amp
+ * There is a pullup of 39k(TS100) from the +ve input to 3.9V (1M pulup on TS100)
+ *
+ * The simplest case to model this, is to ignore the pullup resistors influence, and assume that its influence is mostly constant
+ * -> Tip resistance *does* change with temp, but this should be much less than the rest of the system.
+ *
+ * When a thermocouple is equal temperature at both sides (hot and cold junction), then the output should be 0uV
+ * Therefore, by measuring the uV when both are equal, the measured reading is the offset value.
+ * This is a mix of the pull-up resistor, combined with tip manufacturing differences.
+ *
+ * All of the thermocouple readings are based on this expired patent
+ * - > https://patents.google.com/patent/US6087631A/en
+ *
+ * This was bought to my attention by <Kuba Sztandera>
+ */
+
+// TIP_GAIN =  TIP_GAIN/1000 == uV per deg C constant of the tip
+#ifdef MODEL_TS100
+#define OP_AMP_Rf 		750*1000 		/*750  Kilo-ohms -> From schematic, R1*/
+#define OP_AMP_Rin 		2370			/*2.37 Kilo-ohms -> From schematic, R2*/
+#define TIP_GAIN 405
+#else
+#define OP_AMP_Rf 		180*1000 		/*180  Kilo-ohms -> From schematic, R6*/
+#define OP_AMP_Rin 		2000			/*2.0  Kilo-ohms -> From schematic, R3*/
+#define TIP_GAIN 115
+
+#endif
+
+#define  op_amp_gain_stage  (1+(OP_AMP_Rf/OP_AMP_Rin))
+uint32_t TipThermoModel::convertTipRawADCTouV(uint16_t rawADC) {
+	// This takes the raw ADC samples, converts these to uV
+	// Then divides this down by the gain to convert to the uV on the input to the op-amp (A+B terminals)
+	// Then remove the calibration value that is stored as a tip offset
+	uint32_t vddRailmVX10 = 33000;	//TODO use ADC Vref to calculate this
+	// 4096 * 8 readings for full scale
+	// Convert the input ADC reading back into mV times 10 format.
+	uint32_t rawInputmVX10 = (rawADC * vddRailmVX10) / (4096 * 8);
+
+	uint32_t valueuV = rawInputmVX10 * 100;	// shift into uV
+	//Now to divide this down by the gain
+	valueuV = (valueuV) / op_amp_gain_stage;
+	//Remove uV tipOffset
+	if (valueuV >= systemSettings.CalibrationOffset)
+		valueuV -= systemSettings.CalibrationOffset;
+	else
+		valueuV = 0;
+
+	return valueuV;
+}
+
+uint32_t TipThermoModel::convertTipRawADCToDegC(uint16_t rawADC) {
+	return convertuVToDegC(convertTipRawADCTouV(rawADC));
+}
+uint32_t TipThermoModel::convertTipRawADCToDegF(uint16_t rawADC) {
+	return convertuVToDegF(convertTipRawADCTouV(rawADC));
+}
+
+//Table that is designed to be walked to find the best sample for the lookup
+
+//Extrapolate between two points
+// [x1, y1] = point 1
+// [x2, y2] = point 2
+//  x = input value
+// output is x's extrapolated y value
+int32_t LinearInterpolate(int32_t x1, int32_t y1, int32_t x2, int32_t y2,
+		int32_t x) {
+	return y1 + (((((x - x1) * 1000) / (x2 - x1)) * (y2 - y1))) / 1000;
+}
+
+uint32_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) {
+	//based on new measurements, tip is quite linear at 24.9uV per deg C = 2.49 per 0.1C
+	//
+	tipuVDelta *= TIP_GAIN;
+	tipuVDelta /= 10000;
+	return tipuVDelta;
+}
+
+uint32_t TipThermoModel::convertuVToDegF(uint32_t tipuVDelta) {
+	tipuVDelta *= TIP_GAIN;
+	tipuVDelta /= 1000;
+	return ((tipuVDelta * 9) / 50) + 32;
+	//(Y °C × 9/5) + 32 =Y°F
+}
+
+uint32_t TipThermoModel::convertCtoF(uint32_t degC) {
+	//(Y °C × 9/5) + 32 =Y°F
+	return 32 + ((degC * 9) / 5);
+}
+
+uint32_t TipThermoModel::convertFtoC(uint32_t degF) {
+	//(Y°F − 32) × 5/9 = Y°C
+	if (degF < 32)
+		return 0;
+	return ((degF - 32) * 5) / 9;
+}
+
+uint32_t TipThermoModel::getTipInC(bool sampleNow) {
+	uint32_t currentTipTempInC = TipThermoModel::convertTipRawADCToDegC(
+			getTipRawTemp(sampleNow));
+	currentTipTempInC += getHandleTemperature() / 10; //Add handle offset
+	return currentTipTempInC;
+}
+
+uint32_t TipThermoModel::getTipInF(bool sampleNow) {
+	uint32_t currentTipTempInF = TipThermoModel::convertTipRawADCToDegF(
+			getTipRawTemp(sampleNow));
+	currentTipTempInF += convertCtoF(getHandleTemperature() / 10); //Add handle offset
+	return currentTipTempInF;
+}
--- a/workspace/TS100/Core/Src/TipThermoModel.h
+++ b/workspace/TS100/Core/Src/TipThermoModel.h
@@ -0,0 +1,31 @@
+/*
+ * TipThermoModel.h
+ *
+ *  Created on: 7 Oct 2019
+ *      Author: ralim
+ */
+
+#ifndef SRC_TIPTHERMOMODEL_H_
+#define SRC_TIPTHERMOMODEL_H_
+#include "stdint.h"
+#include "hardware.h"
+class TipThermoModel {
+public:
+	//These are the main two functions
+	static uint32_t getTipInC(bool sampleNow=false);
+	static uint32_t getTipInF(bool sampleNow=false);
+
+
+	static uint32_t convertTipRawADCToDegC(uint16_t rawADC);
+	static uint32_t convertTipRawADCToDegF(uint16_t rawADC);
+	//Returns the uV of the tip reading before the op-amp compensating for pullups
+	static uint32_t convertTipRawADCTouV(uint16_t rawADC);
+	static uint32_t convertCtoF(uint32_t degC);
+	static uint32_t convertFtoC(uint32_t degF);
+
+private:
+	static uint32_t convertuVToDegC(uint32_t tipuVDelta);
+	static uint32_t convertuVToDegF(uint32_t tipuVDelta);
+};
+
+#endif /* SRC_TIPTHERMOMODEL_H_ */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben V. Brown	4626f32ede	Merge pull request #535 from Ralim/feat/Settings-Reset-Should-Warn Show warning message when settings are reset from a firmware update.	2019-12-28 12:36:42 +11:00
Ben V. Brown	ce81a3ee18	Update Translation.cpp	2019-12-28 12:00:44 +11:00
Ben V. Brown	255f7009f2	Display the warning	2019-12-28 12:00:34 +11:00
Ben V. Brown	da882fe27a	Export new settings message	2019-12-28 12:00:26 +11:00
Ben V. Brown	2032e8a2f3	Return if settings were reset	2019-12-28 12:00:18 +11:00
Ben V. Brown	e6a562f8f4	Track if settings were reset	2019-12-28 11:59:56 +11:00
Ben V. Brown	97f0dcae36	Cleanup generator code to handle \n in messages	2019-12-28 11:59:43 +11:00
Ben V. Brown	2d5482ecd2	Add new `SettingsResetMessage` Message	2019-12-28 11:59:33 +11:00
Ben V. Brown	ff69301207	Merge pull request #534 from Ralim/fix-drop-leader-zeros Fix drop leader zeros	2019-12-28 11:31:25 +11:00
Ben V. Brown	5974ece927	Dont blank entire string if all zero	2019-12-28 11:21:40 +11:00
Ben V. Brown	3ca3b7fcca	Delete language.settings.xml	2019-12-28 11:21:21 +11:00
Ben V. Brown	48b32dcf45	Merge pull request #532 from Ralim/menu-should-timeout Menu should timeout	2019-12-28 11:10:06 +11:00
Ben V. Brown	c1cc64c485	Fix typo	2019-12-28 10:57:40 +11:00
Ben V. Brown	5c2c37604e	Merge pull request #533 from Ralim/codeship-update Codeship update Re-work the build script to keep temp files that can be kept	2019-12-26 11:31:54 +11:00
Ben V. Brown	b46ae3a7a5	Fix cleaning temp files properly to allow re-use of STM libs	2019-12-26 11:23:36 +11:00
Ben V. Brown	e394ad0a93	Fix line ending mistake	2019-12-26 11:13:42 +11:00
Ben V. Brown	636edcbd50	Drop github-releases, decided against auto releases	2019-12-26 11:04:33 +11:00
Ben V. Brown	7e2ba77d79	Merge pull request #531 from Ralim/nix-leader-zero Walk over number prints to drop leader zeros	2019-12-24 12:26:36 +11:00
Ben V. Brown	f2337ffc37	Add timeout to the menu display logic	2019-12-24 12:17:02 +11:00
Ben V. Brown	0f707bf323	Dont double save	2019-12-24 12:13:40 +11:00
Ben V. Brown	8e50f16f6c	Walk over number prints to drop leader zeros	2019-12-24 12:08:22 +11:00
Ben V. Brown	7e7d31d563	Merge pull request #524 from awigen/update-linux-flash-script Update Linux flash script	2019-12-24 11:57:27 +11:00
Ben V. Brown	dc3d64444f	Merge branch 'master' of https://github.com/Ralim/ts100	2019-12-23 23:05:46 +11:00
Ben V. Brown	3a45014b75	Add build status	2019-12-23 23:04:00 +11:00
Ben V. Brown	ae388031b4	Merge pull request #530 from Ralim/add-build-command Create build.sh	2019-12-23 22:50:00 +11:00
Ben V. Brown	f33ea7e4d7	Create build.sh	2019-12-23 22:46:58 +11:00
Ben V. Brown	2c121df181	Update codeship-steps.yml	2019-12-23 22:15:53 +11:00
Ben V. Brown	4ccf735351	Merge pull request #529 from Ralim/fix-perm Fix execute bits	2019-12-23 19:37:59 +11:00
Ben V. Brown	937728b734	Fix execute bits	2019-12-23 08:36:54 +00:00
Ben V. Brown	3554913153	Merge pull request #528 from Ralim/ci-codeship Setting up CI builds	2019-12-23 19:26:29 +11:00
Ben V. Brown	7b563bf2ba	Merge pull request #527 from Ralim/testing-temp-rework Temperature control system re-write	2019-12-23 19:24:55 +11:00
Ben V. Brown	448b5824ff	Prevent reuse causing lang issues due to optimisations	2019-12-23 19:22:16 +11:00
Ben V. Brown	47fb6d2cc1	Update translations, more repeatable sorting	2019-12-23 19:21:53 +11:00
Ben V. Brown	aee37d4c5d	Merge branch 'testing-temp-rework' into ci-codeship	2019-12-23 18:46:00 +11:00
Ben V. Brown	cc79fcb4cf	Rough pass at builder	2019-12-23 18:36:10 +11:00
Ben V. Brown	51420829f0	update build script	2019-12-23 18:33:24 +11:00
Ben V. Brown	668e2c0ec0	Squash compiler warnings and keep translation file up to date	2019-12-23 15:10:47 +11:00
Ben V. Brown	720f81a0f5	Remove unused thermal model	2019-12-23 15:06:55 +11:00
Ben V. Brown	9e7355adab	Update .gitignore	2019-12-23 14:48:34 +11:00
Ben V. Brown	d8f7d660b8	Rough ts80 tuning	2019-12-23 13:33:17 +11:00
Ben V. Brown	c408fc0a7e	tune ts100	2019-12-23 13:25:11 +11:00
Ben V. Brown	329f6fdbe7	Fix battery voltage not updating when not soldering	2019-12-23 13:19:48 +11:00
Ben V. Brown	e3434fba9e	Update GUIThread.cpp	2019-12-23 13:14:28 +11:00
Alex Wigen	a596ffd5e4	Update Linux flash script Miwer commented in issue #11 that on Mint 17.3 lsblk does not escape potentially unsafe characters like it does on Fedora (lsblk v2.32.1). So broaden the grep match expression to catch both posibilities.	2019-11-30 23:21:04 +10:00
Ben V. Brown	a3faa9fa4a	Merge pull request #520 from onovy/master Update Czech translation	2019-11-09 16:11:14 +11:00
Ondřej Nový	b3f8193fdf	Update Czech translation	2019-11-08 20:08:52 +01:00
Ben V. Brown	cad422fba4	Merge pull request #519 from C0rn3j/master Grammar and other small fixes	2019-11-03 15:14:00 +11:00
C0rn3j	e5171d0ead	Grammar and other small fixes	2019-11-02 15:38:34 +01:00
Ben V. Brown	5cfab0ad65	Merge pull request #511 from OliverParoczai/patch-1 Grammar fixes	2019-10-15 18:45:58 +11:00
Paróczai Olivér	d3fbfb9d46	Grammar fixes	2019-10-14 22:38:14 +02:00
Ben V. Brown	3fea95c6b1	Fix calibration, move to exp moving average	2019-10-08 21:50:50 +11:00
Ben V. Brown	6a39e4bcc8	Work in progress Working, but has temp offset issue slightly. Could have slightly wrong gain values	2019-10-07 21:11:31 +11:00
Ben V. Brown	3e1abc451c	Remove old PID struct	2019-10-07 19:31:02 +11:00
Ben V. Brown	eda0681eb8	Update & Fix translations	2019-10-07 19:09:28 +11:00
Ben V. Brown	64f8ca5c53	Functioning MVP tester	2019-10-07 19:09:21 +11:00
Ben V. Brown	1cf88b2cd6	Rough refactor main control loop to C	2019-10-07 18:58:51 +11:00
Ben V. Brown	c5f6f6d044	Roughing out concept of patent based temp curve	2019-10-07 18:20:09 +11:00
Ben V. Brown	c1db22cb4a	Merge pull request #508 from Ralim/TweakTS80 This re-works the movement filter and some IRQ cleanup misc work.	2019-10-07 16:51:46 +11:00
Ben V. Brown	4fe8c1654e	Fix build after merge	2019-10-07 16:51:10 +11:00
Ben V. Brown	bc38132f31	Merge branch 'master' into TweakTS80	2019-10-07 16:40:42 +11:00
Ben V. Brown	144600d531	Merge pull request #499 from agatti/guicleanup Refactor OLED on/off mechanism.	2019-10-07 16:34:20 +11:00
Ben V. Brown	e162d20723	Merge pull request #507 from playday3008/patch-1 Fixed translations Ukranian	2019-10-07 16:33:04 +11:00
Вадим	9040d6fe9c	Fixed translations	2019-10-06 05:27:52 +02:00
Ben V. Brown	84de602245	Merge pull request #500 from agatti/accelerometer-speedup Speed up accelerometer driver data processing.	2019-08-29 17:39:09 +10:00
Alessandro Gatti	5eb3df47df	Speed up accelerometer data intake. The LIS2DH12 driver performed an unnecessary endianness conversion, as data from the sensor was already coming in little-endian format. The MMA8652FC driver is now using the rev16 opcode to perform the swap rather than doing all the bitshuffling operations in multiple steps.	2019-08-29 04:11:38 +02:00
Alessandro Gatti	b8819b8e73	Refactor OLED on/off mechanism. Made the display on/off mechanism a bit more self-descriptive by replacing bare true/false values with an enum with more appropriate value names. OLED automatic turn-off logic has been cleaned up, along with minor updates to the OLED initialisation sequence.	2019-08-28 21:13:39 +02:00
Ben V. Brown	c96f1b528a	Merge pull request #496 from aWZHY0yQH81uOYvH/master changed Python logo converter to use correct line endings on all OSes	2019-08-28 18:50:48 +10:00
aWZHY0yQH81uOYvH	ef88d5ec31	changed Intel HEX gen to use correct line endings on all OSes	2019-08-27 22:58:39 -07:00
Ben V. Brown	481be32c2f	Merge pull request #493 from agatti/remove-urender Remove unused uRender code.	2019-08-27 12:40:54 +10:00
Alessandro Gatti	c26eeb0c2c	Remove unused uRender code.	2019-08-23 00:05:31 +02:00
Ben V. Brown	08f7dedd52	Merge pull request #492 from Ralim/STMCubeIDE Move to STM32CubeIDE	2019-08-19 21:30:37 +10:00
Ben V. Brown	9bdb601742	Fix Debug menu translation	2019-08-19 21:26:24 +10:00
Ben V. Brown	eb3837e529	Re-size stacks	2019-08-19 20:41:27 +10:00
Ben V. Brown	aed7d7b126	Split GUI out for easier management	2019-08-19 20:36:57 +10:00
Ben V. Brown	a49c4e9740	WiP some general cleanup with help of new IDE Static'ing more of the code where possible	2019-08-19 18:53:29 +10:00
Ben V. Brown	bafe43fc63	Updating documentation	2019-08-19 07:54:16 +10:00
Ben V. Brown	1d4f4822ed	Cleanup	2019-08-18 22:32:36 +10:00
Ben V. Brown	7ca613e22b	Migrate :O	2019-08-18 22:24:01 +10:00
Ben V. Brown	09ce60f658	Merge pull request #486 from agatti/macos_build_fix Fix build on macOS	2019-08-16 08:13:54 +10:00
Ben V. Brown	bcae079cd7	Merge pull request #488 from mesutkilic/patch-1 added some turkish translations	2019-08-16 08:13:19 +10:00
Ben V. Brown	a18cca6639	Merge pull request #491 from timecop97/master changed intel Hex gen to use unix line endings to fix #460	2019-08-16 08:12:34 +10:00
timecop97	379df5b7c1	changed intel Hex gen to use unix line ends	2019-08-15 14:12:02 +01:00
Mesut KILIÇ	27d40d0b36	added some turkish translations	2019-07-23 14:51:05 +03:00
Ben V. Brown	a9dec94476	Merge pull request #487 from pikipirs/master Slovenian Translation	2019-07-23 19:18:58 +10:00
pikipirs	25c96dab2c	Add files via upload	2019-07-23 11:07:10 +02:00
Alessandro Gatti	495073425e	Make build.sh Bash 3.x compatible. The highest version of bash shipped by vanilla macOS is 3.2, and it will stay like that for the foreseeable future (bash being removed as default in 10.15 is a strong indicator for that). The build.sh script used Bash 4.x syntax for enumerating available translations - this patch dials back the clock to Bash 3.x making things work again on macOS and (hopefully) still maintaining functionality on other platforms that use a newer version of bash.	2019-07-20 00:06:17 +02:00
Ben V. Brown	4347ed2d68	Try and re-tune TS100 and TS80	2019-07-14 11:46:34 +10:00
Ben V. Brown	c5409f4f1b	Ts80 Tuned a bit better, Ts100 WiP	2019-07-13 22:54:07 +10:00
Ben V. Brown	74b225ceaa	Cleanup IRQ's	2019-07-03 15:33:00 +10:00
Ben V. Brown	f6affb67ca	Move Movement filter to history template	2019-07-03 15:32:49 +10:00
Ben V. Brown	3f69dbd5a3	Rework debug menu	2019-07-03 15:32:02 +10:00
Ben V. Brown	d7e8bd77e4	Merge pull request #478 from Ralim/feat/AutoFont Feature that adds auto font creation	2019-06-25 19:56:36 +10:00
Ben V. Brown	b570ebae54	WiP Power limit	2019-06-18 19:32:45 +10:00
Ben V. Brown	884f22c8af	All models building	2019-06-18 18:18:17 +10:00
Ben V. Brown	acd4d69f7d	All strings now get comments of the source material pre-encoding	2019-06-18 18:09:08 +10:00
Ben V. Brown	d5eee5f69b	Adding helper text & re-enable ts80 pulse	2019-06-18 18:03:26 +10:00
Ben V. Brown	9a2dc5c524	All Strings converted!	2019-06-18 17:52:50 +10:00
Ben V. Brown	d05561bc84	Fix tip selection menu	2019-06-18 08:44:23 +10:00
Ben V. Brown	6b558479e4	Convert over C constants to python aware strings for translation	2019-06-18 08:40:48 +10:00
Ben V. Brown	07f4164a32	Mostly working, still have debugging to go	2019-06-17 21:28:33 +10:00
Ben V. Brown	e81c86157b	Working small font table	2019-06-17 21:02:21 +10:00
Ben V. Brown	85cba9b9e4	Adding second font	2019-06-17 20:53:17 +10:00
Ben V. Brown	04f3e1aa02	Update font.py	2019-06-17 19:10:55 +10:00
Ben V. Brown	cffb49ab34	Add wrapper to other strings Adds the conversion wrapper to all of the other strings	2019-06-17 18:46:37 +10:00
Ben V. Brown	35ac6d2455	Roughing out first pass on making auto font tables	2019-06-17 18:41:27 +10:00
Ben V. Brown	c70a63b44b	Merge pull request #468 from Kubuxu/feat/fat-lto Enable flt-lto-objects for listing generation	2019-05-08 20:05:08 +10:00
Jakub Sztandera	c3226110f6	Enable flt-lto-objects for listing generation I suspect that since -flto was added listing generation wasn't working. -ffat-lto-objects allows tools like objdump to still work by including both the internal compiler representation (for LTO) and generated code in the .o files. It increases the compile time from 12s to 17s on my machine but I think it is small enough cost for the benefit. Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch> License: MIT	2019-05-07 04:05:23 +02:00
Ben V. Brown	88bf41da7c	Merge pull request #466 from Kubuxu/feat/spec/nano Use --specs=nano.specs to enable newlib-nano	2019-05-01 13:49:13 +10:00
Jakub Sztandera	e8ee66d1c8	Use --specs=nano.specs to enable newlib-nano Saves 1.6KiB flash. Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch> License: MIT	2019-04-30 20:10:11 +02:00
Ben V. Brown	8c8ec9328e	Merge pull request #461 from Ralim/UpdatingDocs Its about time this gets a damn update...	2019-04-06 21:47:21 +11:00
Ben V. Brown	c1e465ef8a	Merge branch 'master' into UpdatingDocs	2019-04-06 21:47:09 +11:00
Ben V. Brown	7ba80dff4e	Merge pull request #452 from pjz/pygen Make intel_hex_line a generator instead of passing in filehandle	2019-02-27 06:56:49 +11:00
Paul Jimenez	576f7a91f2	Make intel_hex_line a generator instead of passing in filehandle	2019-02-23 01:55:02 -05:00
Ben V. Brown	609354b857	Merge pull request #448 from rorosaurus/patch-1 Update README.md	2019-02-05 08:14:46 +10:00
Rory Hayes	c1ed852986	Update README.md	2019-02-04 00:37:06 -08:00
Ben V. Brown	e4857dfe6b	Merge pull request #445 from federck/patch-20 [FIX] italian.json	2019-02-02 18:34:43 +10:00
federck	793e7356d7	italian.json	2019-01-30 23:24:47 +01:00
Ben V. Brown	449e21ae65	Fix build using already variable, updated translations file	2019-01-31 07:25:42 +11:00
Ben V. Brown	008e03edb4	Its about time this gets a damn update... Splits out the menu Fixes some typos Better wording in some places Adds TS80 Adds some thanks :)	2018-10-18 15:11:42 +11:00