Bump Settings version

As during development some fields were removed.

.github/workflows/ccpp.yml

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

.github/workflows/push.yml

@@ -0,0 +1,142 @@
+name: CI
+
+on: [push,pull_request]
+
+jobs:
+  build_TS80:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: chmod
+        run: chmod +x setup.sh && chmod +x workspace/TS100/build.sh && sudo mkdir -p /build/cache && sudo chmod -R 777 /build
+      
+      - name: Cached compiler source files
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-compilers
+        with:
+          # we deliberately persist a cache folder forwards
+          path: /build/cache
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+          restore-keys: |
+            ${{ runner.os }}-
+
+      - name: setup
+        run: ./setup.sh
+
+      - name: build TS80
+        run: cd workspace/TS100 && ./build.sh -m TS80
+
+      - name: Archive TS80 artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: TS80
+          path: |
+            workspace/TS100/Hexfile/TS80_*.hex
+            workspace/TS100/Hexfile/TS80_*.bin
+          if-no-files-found: error
+  build_TS80P:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: chmod
+        run: chmod +x setup.sh && chmod +x workspace/TS100/build.sh && sudo mkdir -p /build/cache && sudo chmod -R 777 /build
+
+      - name: Cached compiler source files
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-compilers
+        with:
+          # we deliberately persist a cache folder forwards
+          path: /build/cache
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+          restore-keys: |
+            ${{ runner.os }}-
+
+      - name: setup
+        run: ./setup.sh
+
+      - name: build TS80P
+        run: cd workspace/TS100 && ./build.sh -m TS80P
+
+      - name: Archive TS80P artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: TS80P
+          path: |
+            workspace/TS100/Hexfile/TS80P_*.hex
+            workspace/TS100/Hexfile/TS80P_*.bin
+          if-no-files-found: error
+  build_TS100:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: chmod
+        run: chmod +x setup.sh && chmod +x workspace/TS100/build.sh && sudo mkdir -p /build/cache && sudo chmod -R 777 /build
+        
+      - name: Cached compiler source files
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-compilers
+        with:
+          # we deliberately persist a cache folder forwards
+          path: /build/cache
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+          restore-keys: |
+            ${{ runner.os }}-
+
+      - name: setup
+        run: ./setup.sh
+
+      - name: build TS100
+        run: cd workspace/TS100 && ./build.sh -m TS100
+
+      - name: Archive TS100 artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: TS100
+          path: |
+            workspace/TS100/Hexfile/TS100_*.hex
+            workspace/TS100/Hexfile/TS100_*.bin
+          if-no-files-found: error
+
+  build_Pinecil:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: chmod
+        run: chmod +x setup.sh && chmod +x workspace/TS100/build.sh && sudo mkdir -p /build/cache && sudo chmod -R 777 /build
+        
+      - name: Cached compiler source files
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-compilers
+        with:
+          # we deliberately persist a cache folder forwards
+          path: /build/cache
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+          restore-keys: |
+            ${{ runner.os }}-
+
+      - name: setup
+        run: ./setup.sh
+
+      - name: build Pinecil
+        run: cd workspace/TS100 && ./build.sh -m Pinecil
+
+      - name: Archive Pinecil artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Pinecil
+          path: |
+            workspace/TS100/Hexfile/Pinecil_*.hex
+            workspace/TS100/Hexfile/Pinecil_*.bin
+          if-no-files-found: error

.gitignore

@@ -190,3 +190,5 @@ fabric.properties
 .idea/httpRequests
 
 CoreCompileInputs.cache
+.vscode/settings.json
+workspace/TS100/TS100/

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor.sln

@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.15
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TS100 Logo Editor", "TS100 Logo Editor\TS100 Logo Editor.csproj", "{206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor.userprefs

@@ -1,8 +0,0 @@
-<Properties StartupItem="TS100 Logo Editor/TS100 Logo Editor.csproj">
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench />
-  <MonoDevelop.Ide.DebuggingService.Breakpoints>
-    <BreakpointStore />
-  </MonoDevelop.Ide.DebuggingService.Breakpoints>
-  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
-</Properties>

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-    </startup>
-</configuration>

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.Designer.cs

@@ -1,209 +0,0 @@
-namespace TS100_Logo_Editor
-{
-    partial class Form1
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.btnLoadImage = new System.Windows.Forms.Button();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.cbInvertImage = new System.Windows.Forms.CheckBox();
-            this.gbScaling = new System.Windows.Forms.GroupBox();
-            this.rbScaleStretch = new System.Windows.Forms.RadioButton();
-            this.rbScaleFit = new System.Windows.Forms.RadioButton();
-            this.pbImage = new System.Windows.Forms.PictureBox();
-            this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.btnSaveHex = new System.Windows.Forms.Button();
-            this.groupBox1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.gbScaling.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pbImage)).BeginInit();
-            this.groupBox3.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // groupBox1
-            // 
-            this.groupBox1.Controls.Add(this.btnLoadImage);
-            this.groupBox1.Location = new System.Drawing.Point(20, 20);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.groupBox1.Size = new System.Drawing.Size(300, 217);
-            this.groupBox1.TabIndex = 0;
-            this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "1. Load source Image";
-            // 
-            // btnLoadImage
-            // 
-            this.btnLoadImage.Location = new System.Drawing.Point(10, 31);
-            this.btnLoadImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.btnLoadImage.Name = "btnLoadImage";
-            this.btnLoadImage.Size = new System.Drawing.Size(280, 35);
-            this.btnLoadImage.TabIndex = 0;
-            this.btnLoadImage.Text = "Load Image";
-            this.btnLoadImage.UseVisualStyleBackColor = true;
-            this.btnLoadImage.Click += new System.EventHandler(this.btnLoadImage_Click);
-            // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.cbInvertImage);
-            this.groupBox2.Controls.Add(this.gbScaling);
-            this.groupBox2.Controls.Add(this.pbImage);
-            this.groupBox2.Location = new System.Drawing.Point(330, 20);
-            this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.groupBox2.Size = new System.Drawing.Size(300, 217);
-            this.groupBox2.TabIndex = 1;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "2. Adjust image";
-            // 
-            // cbInvertImage
-            // 
-            this.cbInvertImage.AutoSize = true;
-            this.cbInvertImage.Location = new System.Drawing.Point(138, 122);
-            this.cbInvertImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.cbInvertImage.Name = "cbInvertImage";
-            this.cbInvertImage.Size = new System.Drawing.Size(75, 24);
-            this.cbInvertImage.TabIndex = 2;
-            this.cbInvertImage.Text = "Invert";
-            this.cbInvertImage.UseVisualStyleBackColor = true;
-            this.cbInvertImage.CheckedChanged += new System.EventHandler(this.cbInvertImage_CheckedChanged);
-            // 
-            // gbScaling
-            // 
-            this.gbScaling.Controls.Add(this.rbScaleStretch);
-            this.gbScaling.Controls.Add(this.rbScaleFit);
-            this.gbScaling.Location = new System.Drawing.Point(9, 91);
-            this.gbScaling.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.gbScaling.Name = "gbScaling";
-            this.gbScaling.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.gbScaling.Size = new System.Drawing.Size(120, 117);
-            this.gbScaling.TabIndex = 1;
-            this.gbScaling.TabStop = false;
-            this.gbScaling.Text = "Scaling";
-            // 
-            // rbScaleStretch
-            // 
-            this.rbScaleStretch.AutoSize = true;
-            this.rbScaleStretch.Location = new System.Drawing.Point(10, 68);
-            this.rbScaleStretch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.rbScaleStretch.Name = "rbScaleStretch";
-            this.rbScaleStretch.Size = new System.Drawing.Size(86, 24);
-            this.rbScaleStretch.TabIndex = 1;
-            this.rbScaleStretch.Text = "Stretch";
-            this.rbScaleStretch.UseVisualStyleBackColor = true;
-            this.rbScaleStretch.CheckedChanged += new System.EventHandler(this.rbScaleStretch_CheckedChanged);
-            // 
-            // rbScaleFit
-            // 
-            this.rbScaleFit.AutoSize = true;
-            this.rbScaleFit.Checked = true;
-            this.rbScaleFit.Location = new System.Drawing.Point(10, 31);
-            this.rbScaleFit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.rbScaleFit.Name = "rbScaleFit";
-            this.rbScaleFit.Size = new System.Drawing.Size(52, 24);
-            this.rbScaleFit.TabIndex = 0;
-            this.rbScaleFit.TabStop = true;
-            this.rbScaleFit.Text = "Fit";
-            this.rbScaleFit.UseVisualStyleBackColor = true;
-            this.rbScaleFit.CheckedChanged += new System.EventHandler(this.rbScaleFit_CheckedChanged);
-            // 
-            // pbImage
-            // 
-            this.pbImage.BackColor = System.Drawing.Color.Black;
-            this.pbImage.Location = new System.Drawing.Point(4, 31);
-            this.pbImage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.pbImage.Name = "pbImage";
-            this.pbImage.Size = new System.Drawing.Size(192, 32);
-            this.pbImage.TabIndex = 0;
-            this.pbImage.TabStop = false;
-            // 
-            // groupBox3
-            // 
-            this.groupBox3.Controls.Add(this.btnSaveHex);
-            this.groupBox3.Location = new System.Drawing.Point(640, 20);
-            this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.groupBox3.Size = new System.Drawing.Size(300, 217);
-            this.groupBox3.TabIndex = 2;
-            this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "3. Export";
-            // 
-            // btnSaveHex
-            // 
-            this.btnSaveHex.Location = new System.Drawing.Point(8, 91);
-            this.btnSaveHex.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.btnSaveHex.Name = "btnSaveHex";
-            this.btnSaveHex.Size = new System.Drawing.Size(280, 35);
-            this.btnSaveHex.TabIndex = 0;
-            this.btnSaveHex.Text = "Save DFU File";
-            this.btnSaveHex.UseVisualStyleBackColor = true;
-            this.btnSaveHex.Click += new System.EventHandler(this.btnSaveHex_Click);
-            // 
-            // Form1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(963, 265);
-            this.Controls.Add(this.groupBox3);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.groupBox1);
-            this.DoubleBuffered = true;
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
-            this.Name = "Form1";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "TS100 Custom Logo editor";
-            this.groupBox1.ResumeLayout(false);
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.gbScaling.ResumeLayout(false);
-            this.gbScaling.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pbImage)).EndInit();
-            this.groupBox3.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.Button btnLoadImage;
-        private System.Windows.Forms.GroupBox groupBox2;
-        private System.Windows.Forms.CheckBox cbInvertImage;
-        private System.Windows.Forms.GroupBox gbScaling;
-        private System.Windows.Forms.RadioButton rbScaleStretch;
-        private System.Windows.Forms.RadioButton rbScaleFit;
-        private System.Windows.Forms.PictureBox pbImage;
-        private System.Windows.Forms.GroupBox groupBox3;
-        private System.Windows.Forms.Button btnSaveHex;
-    }
-}
-

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.cs

@@ -1,169 +0,0 @@
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace TS100_Logo_Editor
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-        Image sourceImage;
-        const int LCDWidth = 96;
-        Bitmap PureBMP;
-        private void btnLoadImage_Click(object sender, EventArgs e)
-        {
-            //load in an image
-            OpenFileDialog dlg = new OpenFileDialog();
-            dlg.Title = "Select Image";
-            dlg.Filter = "Image files (*.jpg, *.jpeg, *.bmp, *.png) | *.jpg; *.jpeg; *.bmp; *.png";
-            if (dlg.ShowDialog() == DialogResult.OK)
-            {
-                //user has selected an image
-                string filename = dlg.FileName;
-                sourceImage = Image.FromFile(filename);
-                reDrawPreview();
-            }
-
-        }
-
-        private void reDrawPreview()
-        {
-            PureBMP = new Bitmap(LCDWidth, 16);
-            //scale mode
-            if (rbScaleFit.Checked)
-            {
-                //fit
-                float scalefactor = Math.Min((float)PureBMP.Width / (float)sourceImage.Width, (float)PureBMP.Height / (float)sourceImage.Height);
-                using (Graphics g = Graphics.FromImage(PureBMP))
-                {
-                    g.DrawImage(sourceImage, new RectangleF(0, 0, sourceImage.Width * scalefactor, sourceImage.Height * scalefactor));
-                }
-            }
-            else
-            {
-                //draw image stretched
-                using (Graphics g = Graphics.FromImage(PureBMP))
-                {
-                    g.DrawImage(sourceImage, new RectangleF(0, 0, LCDWidth, 16));
-                }
-            }
-            //We now have our downsampled colour image
-            //apply inversion
-            if (cbInvertImage.Checked)
-            {
-                for (int y = 0; (y <= (PureBMP.Height - 1)); y++)
-                {
-                    for (int x = 0; (x <= (PureBMP.Width - 1)); x++)
-                    {
-                        Color inv = PureBMP.GetPixel(x, y);
-                        inv = Color.FromArgb(255, (255 - inv.R), (255 - inv.G), (255 - inv.B));
-                        PureBMP.SetPixel(x, y, inv);
-                    }
-                }
-            }
-
-            //Threshold image
-            PureBMP = GrayScale(PureBMP);
-            //draw image at 2x scale
-            Bitmap bBig = new Bitmap(pbImage.Width, pbImage.Height);
-            using (Graphics g = Graphics.FromImage(bBig))
-            {
-                g.DrawImage(PureBMP, new RectangleF(0, 0, pbImage.Width, pbImage.Height));
-            }
-            pbImage.Image = bBig;
-        }
-        public Bitmap GrayScale(Bitmap Bmp)
-        {
-            int rgb;
-            Color c;
-
-            for (int y = 0; y < Bmp.Height; y++)
-                for (int x = 0; x < Bmp.Width; x++)
-                {
-                    c = Bmp.GetPixel(x, y);
-                    rgb = (int)((c.R + c.G + c.B) / 3);
-                    if (rgb > 128)
-                        rgb = 0xFF;
-                    else
-                        rgb = 0x00;
-                    Bmp.SetPixel(x, y, Color.FromArgb(rgb, rgb, rgb));
-                }
-            return Bmp;
-        }
-
-        private void rbScaleStretch_CheckedChanged(object sender, EventArgs e)
-        {
-            reDrawPreview();
-        }
-
-        private void rbScaleFit_CheckedChanged(object sender, EventArgs e)
-        {
-            reDrawPreview();
-        }
-
-        private void cbInvertImage_CheckedChanged(object sender, EventArgs e)
-        {
-            reDrawPreview();
-        }
-
-        private void btnSaveHex_Click(object sender, EventArgs e)
-        {
-            Bitmap bmp = PureBMP;
-            //convert image to byte array
-            byte[] data = new byte[1024];
-            data[0] = 0xAA;
-            data[1] = 0x55;
-            data[2] = 0xF0;
-            data[3] = 0x0D;
-
-            for (int i = 0; i < (LCDWidth * 16 / 8); i++)
-            {
-                //loop through all the bytes
-                byte b = 0;//local byte
-                //i sets the starting column
-                for (int y = 0; y < 8; y++)
-                {
-                    var px = bmp.GetPixel(i % LCDWidth, (i / LCDWidth) == 1 ? 8 + y : y);
-                    //we loop down the picture
-                    //LSB is the top, MSB is the bottom
-                    if (px.R >= 128)
-                    {
-                        //pixel is white
-                        b |= (byte)(1 << y);
-                    }
-                }
-                data[i + 4] = b;
-            }
-            //We should now have the byte array that represents the image in the LCD format.
-            //We now send this off to be encoded by the Intel Encoder
-            //Flip all uint16_t pairs
-            for (int i = 0; i < data.Length; i += 2)
-            {
-                //we need to swap each pair
-                byte temp = data[i];
-                data[i] = data[i + 1];
-                data[i + 1] = temp;
-            }
-            string outputHexFile = IntelHex.IntelHex.encode(data, 0x0800F800, 16, true, true);//16 bytes is the only format the DFU seems to support //0x0800F800
-            //^ This string now just needs to be written out to a text file :)
-            SaveFileDialog dlg = new SaveFileDialog();
-            dlg.Title = "Save DFU File";
-            dlg.AddExtension = true;
-            dlg.DefaultExt = ".hex";
-            dlg.Filter = "Hex Files(*.hex)|*.hex";
-            if (dlg.ShowDialog() == DialogResult.OK)
-            {
-                //The user has selected where they want to save the file
-                using (var fs = new System.IO.StreamWriter(dlg.FileName))
-                {
-                    fs.Write(outputHexFile);
-                }
-            }
-
-        }
-    }
-}

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Form1.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/IntelHex.cs

@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-
-namespace IntelHex
-{
-    public class IntelHex
-    {
-        public static string encode(byte[] data, UInt32 startingAddress, int bytesPerLine, bool header = true,bool Addbloat=false)
-        {
-            //We are taking the byte array and encoding it into the wanted hex file contents (aka string of data).
-            //First create the starting base address record
-            //:020000040800F2
-            string Output = "";
-            if (header)
-            {
-                //Set the upper 16 bits of the address space
-                Output += getHighAddressSetLine((UInt16)(startingAddress >> 16));
-            }
-
-            //Now loop through all the data that we were given
-            for (UInt32 index = 0; index < data.Length; index = (UInt32)(index + bytesPerLine))
-            {
-                //We want to read from data[index] to data[index+bytesPerLine-1]
-                UInt32 currentAddress = (UInt32)(startingAddress + index);
-                if ((currentAddress >> 16) != (startingAddress >> 16))
-                {
-                    Output += getHighAddressSetLine((UInt16)(currentAddress >> 16));
-                    //The address has rolled over the 64K boundry, so write a new high address change line
-                }
-                //We should now be good for the higher part of the address
-                Output += encodeDataLine((UInt16)(currentAddress & 0xFFFF), data, index, bytesPerLine);
-            }
-            if(Addbloat)
-            {
-                //Repeat the instructs a stack of times to get around filesize minimums
-                for(int x=0;x<3;x++)
-                {
-                    for (UInt32 index = 0; index < data.Length; index = (UInt32)(index + bytesPerLine))
-                    {
-                        //We want to read from data[index] to data[index+bytesPerLine-1]
-                        UInt32 currentAddress = (UInt32)(startingAddress + index);
-                        if ((currentAddress >> 16) != (startingAddress >> 16))
-                        {
-                            Output += getHighAddressSetLine((UInt16)(currentAddress >> 16));
-                            //The address has rolled over the 64K boundry, so write a new high address change line
-                        }
-                        //We should now be good for the higher part of the address
-                        Output += encodeDataLine((UInt16)(currentAddress & 0xFFFF), data, index, bytesPerLine);
-                    }
-                }
-            }
-            //We have now written out all the data lines
-            Output += ":00000001FF\r\n";//End of file marker
-
-            return Output;
-        }
-        private static string encodeDataLine(UInt16 address, byte[] data, UInt32 startindex, int bytes)
-        {
-            string line = ":";
-            line += bytes.ToString("X2");//add the marker of line length
-            line += address.ToString("X4");//write the address
-            line += "00";//Data line
-            //Next copy bytes bytes 
-            for (int i = 0; i < bytes; i++)
-            {
-                if ((startindex + i) < data.Length)
-                    line += data[startindex + i].ToString("X2");
-                else
-                    line += "FF";//pad images out with FF
-            }
-            line += checksumLine(line);//Adds checksum and EOL
-            return line;
-        }
-        private static string getHighAddressSetLine(UInt16 HighAddress)
-        {
-            string Output = "";
-            Output += ":02000004" + (HighAddress).ToString("X4");
-            Output += checksumLine(Output);
-            return Output;
-        }
-        private static string checksumLine(string line)
-        {
-            //We want to convert the string line to each byte and sum. 
-            byte sum = 0;
-            for (int i = 1; i < line.Length; i += 2)
-            {
-                byte b = byte.Parse((line.Substring(i, 2)), System.Globalization.NumberStyles.HexNumber);
-                sum += b;
-            }
-            byte checksum = (byte)(((byte)0) - sum);//invert
-            return checksum.ToString("X2") + "\r\n";
-        }
-    }
-}

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Program.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace TS100_Logo_Editor
-{
-    static class Program
-    {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
-        }
-    }
-}

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("TS100 Logo Editor")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TS100 Logo Editor")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("206c8aef-3be6-44e9-a1b0-25bf3805f1cb")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Resources.Designer.cs

@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace TS100_Logo_Editor.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TS100_Logo_Editor.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Settings.Designer.cs

@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace TS100_Logo_Editor.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/Properties/Settings.settings

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>

Bootup Logo/Logo GUI/TS100 Logo Editor/TS100 Logo Editor/TS100 Logo Editor.csproj

@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{206C8AEF-3BE6-44E9-A1B0-25BF3805F1CB}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>TS100_Logo_Editor</RootNamespace>
-    <AssemblyName>TS100 Logo Editor</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>TS100_Logo_Editor.Program</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="IntelHex.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Bootup Logo/Logos/001_PINECIL.hex

@@ -0,0 +1,258 @@
+:020000040800F2
+:10F8000055AA0DF080002A540215808180808080E6
+:10F810008080808080808080008000000000000068
+:10F82000408040C020C03030905010F010101010B8
+:10F830001010101010101010F010101010101010E8
+:10F8400010101010D09050D0505050505050505078
+:10F8500050505050D0D0D0D0D0D0109010101010A8
+:10F86000101000E002000502050508080808080855
+:10F87000080808080808080805080505050507051B
+:10F880001008101F201F62604850407F40404040D9
+:10F8900040404040404040407F4047404747424012
+:10F8A000424747405F4F505F50505050505050506B
+:10F8B000505050505F5F58585F58474F4740424044
+:10F8C0004040003F00000000000000000000000079
+:10F8D0000000000000000000000000000000000028
+:10F8E0000000000000000000000000000000000018
+:10F8F0000000000000000000000000000000000008
+:10F9000000000000000000000000000000000000F7
+:10F9100000000000000000000000000000000000E7
+:10F9200000000000000000000000000000000000D7
+:10F9300000000000000000000000000000000000C7
+:10F9400000000000000000000000000000000000B7
+:10F9500000000000000000000000000000000000A7
+:10F960000000000000000000000000000000000097
+:10F970000000000000000000000000000000000087
+:10F980000000000000000000000000000000000077
+:10F990000000000000000000000000000000000067
+:10F9A0000000000000000000000000000000000057
+:10F9B0000000000000000000000000000000000047
+:10F9C0000000000000000000000000000000000037
+:10F9D0000000000000000000000000000000000027
+:10F9E0000000000000000000000000000000000017
+:10F9F0000000000000000000000000000000000007
+:10FA000000000000000000000000000000000000F6
+:10FA100000000000000000000000000000000000E6
+:10FA200000000000000000000000000000000000D6
+:10FA300000000000000000000000000000000000C6
+:10FA400000000000000000000000000000000000B6
+:10FA500000000000000000000000000000000000A6
+:10FA60000000000000000000000000000000000096
+:10FA70000000000000000000000000000000000086
+:10FA80000000000000000000000000000000000076
+:10FA90000000000000000000000000000000000066
+:10FAA0000000000000000000000000000000000056
+:10FAB0000000000000000000000000000000000046
+:10FAC0000000000000000000000000000000000036
+:10FAD0000000000000000000000000000000000026
+:10FAE0000000000000000000000000000000000016
+:10FAF0000000000000000000000000000000000006
+:10FB000000000000000000000000000000000000F5
+:10FB100000000000000000000000000000000000E5
+:10FB200000000000000000000000000000000000D5
+:10FB300000000000000000000000000000000000C5
+:10FB400000000000000000000000000000000000B5
+:10FB500000000000000000000000000000000000A5
+:10FB60000000000000000000000000000000000095
+:10FB70000000000000000000000000000000000085
+:10FB80000000000000000000000000000000000075
+:10FB90000000000000000000000000000000000065
+:10FBA0000000000000000000000000000000000055
+:10FBB0000000000000000000000000000000000045
+:10FBC0000000000000000000000000000000000035
+:10FBD0000000000000000000000000000000000025
+:10FBE0000000000000000000000000000000000015
+:10FBF0000000000000000000000000000000000005
+:10F8000055AA0DF080002A540215808180808080E6
+:10F810008080808080808080008000000000000068
+:10F82000408040C020C03030905010F010101010B8
+:10F830001010101010101010F010101010101010E8
+:10F8400010101010D09050D0505050505050505078
+:10F8500050505050D0D0D0D0D0D0109010101010A8
+:10F86000101000E002000502050508080808080855
+:10F87000080808080808080805080505050507051B
+:10F880001008101F201F62604850407F40404040D9
+:10F8900040404040404040407F4047404747424012
+:10F8A000424747405F4F505F50505050505050506B
+:10F8B000505050505F5F58585F58474F4740424044
+:10F8C0004040003F00000000000000000000000079
+:10F8D0000000000000000000000000000000000028
+:10F8E0000000000000000000000000000000000018
+:10F8F0000000000000000000000000000000000008
+:10F9000000000000000000000000000000000000F7
+:10F9100000000000000000000000000000000000E7
+:10F9200000000000000000000000000000000000D7
+:10F9300000000000000000000000000000000000C7
+:10F9400000000000000000000000000000000000B7
+:10F9500000000000000000000000000000000000A7
+:10F960000000000000000000000000000000000097
+:10F970000000000000000000000000000000000087
+:10F980000000000000000000000000000000000077
+:10F990000000000000000000000000000000000067
+:10F9A0000000000000000000000000000000000057
+:10F9B0000000000000000000000000000000000047
+:10F9C0000000000000000000000000000000000037
+:10F9D0000000000000000000000000000000000027
+:10F9E0000000000000000000000000000000000017
+:10F9F0000000000000000000000000000000000007
+:10FA000000000000000000000000000000000000F6
+:10FA100000000000000000000000000000000000E6
+:10FA200000000000000000000000000000000000D6
+:10FA300000000000000000000000000000000000C6
+:10FA400000000000000000000000000000000000B6
+:10FA500000000000000000000000000000000000A6
+:10FA60000000000000000000000000000000000096
+:10FA70000000000000000000000000000000000086
+:10FA80000000000000000000000000000000000076
+:10FA90000000000000000000000000000000000066
+:10FAA0000000000000000000000000000000000056
+:10FAB0000000000000000000000000000000000046
+:10FAC0000000000000000000000000000000000036
+:10FAD0000000000000000000000000000000000026
+:10FAE0000000000000000000000000000000000016
+:10FAF0000000000000000000000000000000000006
+:10FB000000000000000000000000000000000000F5
+:10FB100000000000000000000000000000000000E5
+:10FB200000000000000000000000000000000000D5
+:10FB300000000000000000000000000000000000C5
+:10FB400000000000000000000000000000000000B5
+:10FB500000000000000000000000000000000000A5
+:10FB60000000000000000000000000000000000095
+:10FB70000000000000000000000000000000000085
+:10FB80000000000000000000000000000000000075
+:10FB90000000000000000000000000000000000065
+:10FBA0000000000000000000000000000000000055
+:10FBB0000000000000000000000000000000000045
+:10FBC0000000000000000000000000000000000035
+:10FBD0000000000000000000000000000000000025
+:10FBE0000000000000000000000000000000000015
+:10FBF0000000000000000000000000000000000005
+:10F8000055AA0DF080002A540215808180808080E6
+:10F810008080808080808080008000000000000068
+:10F82000408040C020C03030905010F010101010B8
+:10F830001010101010101010F010101010101010E8
+:10F8400010101010D09050D0505050505050505078
+:10F8500050505050D0D0D0D0D0D0109010101010A8
+:10F86000101000E002000502050508080808080855
+:10F87000080808080808080805080505050507051B
+:10F880001008101F201F62604850407F40404040D9
+:10F8900040404040404040407F4047404747424012
+:10F8A000424747405F4F505F50505050505050506B
+:10F8B000505050505F5F58585F58474F4740424044
+:10F8C0004040003F00000000000000000000000079
+:10F8D0000000000000000000000000000000000028
+:10F8E0000000000000000000000000000000000018
+:10F8F0000000000000000000000000000000000008
+:10F9000000000000000000000000000000000000F7
+:10F9100000000000000000000000000000000000E7
+:10F9200000000000000000000000000000000000D7
+:10F9300000000000000000000000000000000000C7
+:10F9400000000000000000000000000000000000B7
+:10F9500000000000000000000000000000000000A7
+:10F960000000000000000000000000000000000097
+:10F970000000000000000000000000000000000087
+:10F980000000000000000000000000000000000077
+:10F990000000000000000000000000000000000067
+:10F9A0000000000000000000000000000000000057
+:10F9B0000000000000000000000000000000000047
+:10F9C0000000000000000000000000000000000037
+:10F9D0000000000000000000000000000000000027
+:10F9E0000000000000000000000000000000000017
+:10F9F0000000000000000000000000000000000007
+:10FA000000000000000000000000000000000000F6
+:10FA100000000000000000000000000000000000E6
+:10FA200000000000000000000000000000000000D6
+:10FA300000000000000000000000000000000000C6
+:10FA400000000000000000000000000000000000B6
+:10FA500000000000000000000000000000000000A6
+:10FA60000000000000000000000000000000000096
+:10FA70000000000000000000000000000000000086
+:10FA80000000000000000000000000000000000076
+:10FA90000000000000000000000000000000000066
+:10FAA0000000000000000000000000000000000056
+:10FAB0000000000000000000000000000000000046
+:10FAC0000000000000000000000000000000000036
+:10FAD0000000000000000000000000000000000026
+:10FAE0000000000000000000000000000000000016
+:10FAF0000000000000000000000000000000000006
+:10FB000000000000000000000000000000000000F5
+:10FB100000000000000000000000000000000000E5
+:10FB200000000000000000000000000000000000D5
+:10FB300000000000000000000000000000000000C5
+:10FB400000000000000000000000000000000000B5
+:10FB500000000000000000000000000000000000A5
+:10FB60000000000000000000000000000000000095
+:10FB70000000000000000000000000000000000085
+:10FB80000000000000000000000000000000000075
+:10FB90000000000000000000000000000000000065
+:10FBA0000000000000000000000000000000000055
+:10FBB0000000000000000000000000000000000045
+:10FBC0000000000000000000000000000000000035
+:10FBD0000000000000000000000000000000000025
+:10FBE0000000000000000000000000000000000015
+:10FBF0000000000000000000000000000000000005
+:10F8000055AA0DF080002A540215808180808080E6
+:10F810008080808080808080008000000000000068
+:10F82000408040C020C03030905010F010101010B8
+:10F830001010101010101010F010101010101010E8
+:10F8400010101010D09050D0505050505050505078
+:10F8500050505050D0D0D0D0D0D0109010101010A8
+:10F86000101000E002000502050508080808080855
+:10F87000080808080808080805080505050507051B
+:10F880001008101F201F62604850407F40404040D9
+:10F8900040404040404040407F4047404747424012
+:10F8A000424747405F4F505F50505050505050506B
+:10F8B000505050505F5F58585F58474F4740424044
+:10F8C0004040003F00000000000000000000000079
+:10F8D0000000000000000000000000000000000028
+:10F8E0000000000000000000000000000000000018
+:10F8F0000000000000000000000000000000000008
+:10F9000000000000000000000000000000000000F7
+:10F9100000000000000000000000000000000000E7
+:10F9200000000000000000000000000000000000D7
+:10F9300000000000000000000000000000000000C7
+:10F9400000000000000000000000000000000000B7
+:10F9500000000000000000000000000000000000A7
+:10F960000000000000000000000000000000000097
+:10F970000000000000000000000000000000000087
+:10F980000000000000000000000000000000000077
+:10F990000000000000000000000000000000000067
+:10F9A0000000000000000000000000000000000057
+:10F9B0000000000000000000000000000000000047
+:10F9C0000000000000000000000000000000000037
+:10F9D0000000000000000000000000000000000027
+:10F9E0000000000000000000000000000000000017
+:10F9F0000000000000000000000000000000000007
+:10FA000000000000000000000000000000000000F6
+:10FA100000000000000000000000000000000000E6
+:10FA200000000000000000000000000000000000D6
+:10FA300000000000000000000000000000000000C6
+:10FA400000000000000000000000000000000000B6
+:10FA500000000000000000000000000000000000A6
+:10FA60000000000000000000000000000000000096
+:10FA70000000000000000000000000000000000086
+:10FA80000000000000000000000000000000000076
+:10FA90000000000000000000000000000000000066
+:10FAA0000000000000000000000000000000000056
+:10FAB0000000000000000000000000000000000046
+:10FAC0000000000000000000000000000000000036
+:10FAD0000000000000000000000000000000000026
+:10FAE0000000000000000000000000000000000016
+:10FAF0000000000000000000000000000000000006
+:10FB000000000000000000000000000000000000F5
+:10FB100000000000000000000000000000000000E5
+:10FB200000000000000000000000000000000000D5
+:10FB300000000000000000000000000000000000C5
+:10FB400000000000000000000000000000000000B5
+:10FB500000000000000000000000000000000000A5
+:10FB60000000000000000000000000000000000095
+:10FB70000000000000000000000000000000000085
+:10FB80000000000000000000000000000000000075
+:10FB90000000000000000000000000000000000065
+:10FBA0000000000000000000000000000000000055
+:10FBB0000000000000000000000000000000000045
+:10FBC0000000000000000000000000000000000035
+:10FBD0000000000000000000000000000000000025
+:10FBE0000000000000000000000000000000000015
+:10FBF0000000000000000000000000000000000005
+:00000001FF

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:rolling
+FROM ubuntu:20.04
 LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
 
 WORKDIR /build
@@ -6,16 +6,18 @@ WORKDIR /build
 
 # Install any needed packages specified in requirements.txt
 RUN apt-get update && \
-  apt-get upgrade -y && \
   apt-get install -y \
   make \
   bzip2 \
+  git \
   python3 \
   wget && \
-  apt-get clean && \
-  wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 | tar -xj
+  apt-get clean
+RUN wget -qO- https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 | tar -xj
+RUN wget -qO- https://github.com/Ralim/nuclei-compiler/releases/download/2020.08/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2 | tar -xj
 
 # Add compiler to the path
-ENV PATH "/build/gcc-arm-none-eabi-9-2019-q4-major/bin:$PATH"
+ENV PATH "/build/gcc-arm-none-eabi-9-2020-q2-update/bin:$PATH"
+ENV PATH "/build/gcc/bin/:$PATH"
 COPY . /build/source
 COPY ./ci /build/ci

Documentation/DebugMenu.md

@@ -0,0 +1,76 @@
+# Debugging Menu
+
+In this firmware there is extra debugging information hidden under and extra menu.
+This is accessed by holding the rear (B) button on the iron while its on the home screen.
+
+This menu is meant to be simple, so it has no fancy GUI animations.
+
+To move through the menu use the front (A) button.
+To exit, use the rear (B) button again.
+
+## Menu items
+
+Items are shown in the menu on a single line, so they use short codes
+
+### HW G
+
+This indicates the High Water mark for the stack for the GUI thread. The smaller this number is, the less headroom we have in the stack.
+As this is a Highwater mater, you should only trust this once you have walked through all GUI options to "hit" the worst one.
+
+### HW M
+
+This indicates the High Water mark for the stack for the movement detection thread. The smaller this number is, the less headroom we have in the stack.
+
+### HW P
+
+This indicates the High Water mark for the stack for the PID thread. The smaller this number is, the less headroom we have in the stack.
+
+### Time
+
+This just shows how many seconds the unit has been powered for.
+
+### Move
+
+This is the last timestamp of movement. When the iron is moved this should update to match the Time field (one before in the menu).
+This can be used for checking performance of the movement dection code.
+
+### RTip
+
+This is the raw tip reading in uV. This can be used when assessing the calibration routines for example.
+
+### CTip
+
+This is the tip temperature in deg C. This can be used with RTip for assessing temperature processing performance.
+
+### CHan
+
+This is the handle temperature in C. This is used for cold junction compensation of the tip temp.
+
+### Vin 
+
+The input voltage reading. 
+
+### PCB 
+
+This is slightly miss-named, but preserving the name for now.
+This indicates the PCB "version" number, which comes from the TS100 changing the model of accelerometer without warning.
+This indicates the accelerometer that is fitted inside the unit.
+
+- 0 = MMA8652
+- 1 = LIS2DH12
+- 2 = BMA223
+- 99 = None detected (running in fallback without movement detection)
+
+### PWR 
+
+This indicates the current power source for the iron.
+This may change during power up as the sources are negotiated in turn.
+
+- 0 = DC input (dumb)
+- 1 = QC input (We used QC2/3 negotiation for current supply)
+- 2 = PD input (We used the PD subsystem to negotiate for the current supply)
+
+### Max 
+
+This indicates the max temp in C that the system estimates it can measure the tip reliably to.
+This is dependant on a few factors including the handle temperature so it can move around during use.

Documentation/Development.md

@@ -18,3 +18,9 @@ To build a release instead, run the build.sh script. This will update translatio
 ## Updating languages
 
 To update the language translation files & associated font map, execute the `make_translation.py` code from the translations directory.
+
+## Building Pinecil
+
+I highly reccomend using the command line tools and using docker to run the compiler.
+Its a bit more fussy on setup than the STM tooling and this is by far the easiest way.
+If you _need_ an IDE I have used [Nuclei's IDE](https://nucleisys.com/download.php)

Documentation/Flashing.md

@@ -0,0 +1,145 @@
+# Flashing / Upgrading your iron
+
+## Downloading source file
+
+### Main release
+
+Main releases are made to the [releases page](/releases).
+Download the zip file that matches your model of soldering iron, and extract it.
+You then need to use the appropriate file type for your unit, in general Miniware irons are `.hex` and Pinecil is `.bin.`
+Flash according to details below
+
+### Bleeding edge / latest
+
+For the _latest_ code, you will need to download the zip file from the artefacts page on the build for what you want.
+Head to the [Actions](/actions) page and then select the run for the appropriate branch you would like.
+In general you probably want `master`.
+
+Once you click on a run, scroll down to the "Artifacts" section and then click on your model to download a zip file.
+Then this works the same as a production release (use the correct file).
+
+## Miniware irons (TS100, TS80, TS80P)
+
+This is completely safe, but if it goes wrong just put the .hex file from the official website onto the unit and you're back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/ts100/releases) The file you want is called *(MODEL)_EN.hex* unless you want the translations, they are (MODEL)_*language short name*.hex. Where (MODEL) is either TS100 or TS80.
+
+Officially the bootloader on the iron only works under Windows (use the built-in File Explorer, as alternative file managers or copy handlers like Teracopy will fail). However, users have reported that it does work under Mac, and can be made to work under Linux *sometimes*. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading-Firmware). 
+
+
+
+1. Hold the button closest to the tip, and plug in the USB to the computer.
+2. The unit will appear as a USB drive.
+3. Drag the .hex file onto the USB drive.
+4. The unit will disconnect and reconnect.
+5. The filename will have changed to end in .RDY or .ERR
+6. If it ends with .RDY you're done! Otherwise, something went wrong.
+7. If it didn't work the first time, try copying the file again without disconnecting the iron, often it will work on the second shot.
+8. Disconnect the USB and power up the iron. You're good to go.
+
+
+
+For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer.
+
+On the bottom of the MCU riser PCB, there are 4 pads for programming. On v2.51A PCB revision `USB_D+` is shorted to `SWDIO` and `USB_D-` is shorted to `SWCLK` so debugging works without disassembly (attach while staying in the bootloader). Installing [dapboot from eDesignOSS](https://github.com/eDesignOSS/dapboot) (`make TARGET=TS100 -C src`) is recommended as it allows reliable flashing of binary files with [dfu-util](http://dfu-util.sourceforge.net/).
+
+There is a complete device flash backup included in this repository. (Note this includes the bootloader, so will need an SWD programmer to load onto the unit).
+
+For the TS80 the SWD pins are used for the QC negotiation, so you can actually connect to the SWD power via the USB connector.
+
+
+# Mac
+
+sgr1ff1n (Shane) commented in [issue 11](https://github.com/Ralim/ts100/issues/11) that upgrading worked on their Mac as per normal:
+
+> I just wanted to say that I was able to update the firmware on my ts100 from the stock version to 1.08 found in this repository using my Mac. I simply followed the same steps however through Finder. I have a MacBook Pro (13-inch, Mid 2012) running Sierra 10.12.4 (16E195).
+
+# Linux
+
+While in past there were reports of unreliable upgrades, the consensus in [issue 11](https://github.com/Ralim/ts100/issues/11) is that things work mostly as expected in Linux.
+
+@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/ts100/master/Flashing/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distro's.
+
+If you want to do it manually (or if the script does not work for some reason) the general procedure is the same as for Windows, the differences are in the way to mount the unit and copy the firmware.
+Remember that after flashing, the firmware filename will have changed to end in `.RDY` or `.ERR` or `.NOT` and only `.RDY` means the flashing was successful!
+
+* The unit has to be mounted as ```msdos``` type (thanks @balrog-kun for having spotted it). You may disable automount, but unmounting the automounted drive and remounting as `msdos` works fine.  You do not need to turn off automounting, but you do need to unmount the device with `umount`.
+* It is recommended to use an all-caps filename for the firmware, even if successful flashing were done with lower case names.
+* Avoid USB hubs, plug directly in your computer.
+* If it fails, try again several times without unplugging. Just let it remount.
+
+Example, to be run as root, once the unit has been plugged in DFU mode and auto-mounted:
+
+```bash
+FW=ts100.hex
+unset NAME
+eval $(lsblk -P -p -d --output NAME,MODEL|grep "DFU Disk")
+[ -z ${NAME+x} ] && exit 1  # Could not find DFU device
+umount "$NAME"
+mkdir /tmp/mntdfu
+mount -t msdos "$NAME" /tmp/mntdfu
+cp "$FW" "/tmp/mntdfu/$(basename $FW|tr a-z A-Z)"
+sync
+umount /tmp/mntdfu
+rmdir /tmp/mntdfu
+```
+
+Device will reboot and automount will rerun if not disabled.
+Check the extension of your firmware, it should be `.RDY` now.
+
+
+## Pinecil (Pine64)
+
+The MCU used in the Pinecil supports usb-dfu.
+To enter DFU mode, hold the button at the back of the iron while connecting to usb over usb-c.
+Generally all usb controllers work, but some hubs have issues so avoiding hubs may be best.
+Once the device is connected while holding the button, the screen will stay **off**.
+This is normal, and then you can use the appropriate tool to load the .hex or .bin file as per your OS. 
+
+You can also refer to the Pine64 [Wiki](https://wiki.pine64.org/wiki/Pinecil)
+
+### Linux and Mac
+Using `dfu-util` you can flash the firmware using a command line as such:
+
+```
+dfu-util -d 28e9:0189 -a 0 -D Pinecil_EN.bin -s 0x08000000:mass-erase:force
+```
+
+### Windows
+
+For windows the easiest tool to use is the vendors gui tool from [here](http://www.gd32mcu.com/download/down/document_id/176/path_type/1)
+Should the link break, its called "GD32 MCU Dfu Tool" and can be grabbed from http://www.gd32mcu.com/en/download/
+
+### FAQ
+
+#### [Miniware] The file is showing up with the extension `.ERR`
+
+This can occur duing the programming process if any of the checks in the bootloader fail. This is often triggered by anti-virus software or using a non-windows host OS.
+
+First, try just copying the file a second time.
+
+1. Attach the iron in DFU mode
+2. Copy the hex file to the device
+3. The device disconnects and connects with the `.ERR` file
+4. Copy the same hex file again  **DO NOT TRY AND DELETE THE OLD ONE**
+5. The device will disconnect and reconnect again
+6. The device _should_ now have the `.RDY` file
+7. Your done.
+
+If this fails, if you are on Mac or Linux reading the wiki page about programming can help. There is also a very long issue thread going through all of the different attempts around this too.
+
+If you are on windows, its often to try another computer (friends, work, partners etc).
+
+#### [Miniware] Device randomly disconnects or does not show up in DFU mode
+
+First, check the USB cable your using has the data pins; test it on another device. There are a surprisingly large number of usb-micro cables that are power _only_.
+
+Secondly, try other USB ports. Often different USB controllers will interact with the units differently due to design quirks in the miniware design.
+
+## [Miniware] Alternative bootloader
+
+If you are an advanced user, and you have used `usb-dfu` tools before, or you would like to learn; there is an alternative bootloader for these irons.
+This will **NOT** show up as a USB storage drive, but instead show up using a standard DFU protocol device. You can then use dfu tools or GUI's to upgrade the iron using the `.bin` files that are posted to the releases page.
+
+To change to dapboot based alternative bootloader, you need to flash the hex file from [here](https://github.com/eDesignOSS/ts100-bl-flasher/releases).
+`ts100-stockbl.hex` will reflash the stock bootloader, `ts100-dapboot.hex` will flash the new dapboot based usb bootloader.
+
+Note that this is only reccomended for users who know what they doing. If you dont not understand how this works; please dont flash this.

Documentation/History.md

@@ -0,0 +1,176 @@
+# Version Changes
+
+## V2.13
+
+* First _official_ Pinecil release
+* All of the wire for Pinecil releases added
+* Updated Translations
+* Delay accelerometer to help with entering sleep on startup
+* Dual speed PWM to help with power limit control
+* Improve heat up time
+* Adds locking mode
+* Improved docs all over the place
+* Repo rename occured TS100 -> IronOS
+* Hall effect sensor support added (not fitted in Pinecil but optional)
+* QC 20V support for Pinecil
+* CI upgrades for faster builds
+* Fixed bug with accelerometer model on Pinecil
+* Rework of all of the temperature curves for better accuracy
+
+
+
+## V2.12
+
+* Only released as pre-release
+* [TS80P] Improvements to the PD negotiation to handle a few more adapters cleanly
+* Pause on the last item in a list
+* Clean up the menu (removed both enables and settings, so that you can turn things off easier)
+* Removing the very old single line menu style.
+
+
+## V2.11
+
+* First TS80P support
+* Added in a USB-PD driver stack for the FUSB302
+* Fixed some graphical glitches
+
+## V2.10
+
+* GUI polish (animations and scroll bars)
+* Power pulse to keep power supplies alive
+* Adjustable tip response gain
+
+## V2.09
+
+* Adjustable steps in temperature adjustment
+* Git hash now in build string
+* Adjustable language to set if US units are available or not
+* Some minor QC3 improvements
+
+## V2.08
+
+* Fixes auto start in sleep mode
+* Power limiters
+
+## V2.07
+
+* QC fixes 
+* Cosmetic fixes for leading 0's
+
+## V2.06
+
+* Warning on settings reset
+* Temp temp re-write
+* Display calibration offset
+* Hide some leading 0's
+* Menu timeouts
+
+## V2.05
+
+* Language updates
+
+
+## V2.04
+
+* GUI updates
+
+## V2.03
+
+* Support for new accelerometers
+
+## V2.02
+
+* Adds small font
+
+## V2.01
+
+* Newer settings menu
+
+## V2.00
+
+* Complete re-write of the low layer system to use the STM32 HAL for easier development
+* This allowed easier setup for the new ADC auto measuring system
+* Better tip PWM control
+* Moved to FreeRTOS for scheduling
+* Complete re-write from blank
+* Added detailed screen views
+* Added smaller font for said screen views
+
+
+## V1.17
+
+* Added blinking cooldown display
+* Allowed smaller sleep timeout values
+* New font!
+* Automatic startup option
+
+## V1.16
+
+* Added automatic rotation support
+* Added power display graph
+
+## V1.15
+
+* 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
+
+## V1.13
+
+* Swapped buttons for menu to prevent accidentally changing first menu item
+* 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
+
+## V1.11
+
+* Boost mode
+* Change sensitivity options to be 1*8
+
+## V1.10
+
+* Adds help text to settings
+* Improves settings for the display update rate
+
+## V1.09
+
+* Adds display modes, for slowing down or simplifying the display
+
+## V1.08
+
+* Fix settings menu not showing flip display
+
+## V1.07
+
+* Adds shutdown time to automatically shutdown the iron after inactivity
+
+## V1.06
+
+* Changes H and C when the iron is heating to the minidso chevron like images
+
+## V1.05
+
+* Adds ability to calibrate the input voltage measurement
+
+## V1.04
+
+* Increased accuracy of the temperature control
+* Improved PID response slightly
+* Allows temperature offset calibration
+* Nicer idle screen
+
+## V1.03
+
+* Improved Button handling
+* Ability to set motion sensitivity
+* DC voltmeter page shows input voltage
+
+## 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)

Documentation/Logo.md

@@ -0,0 +1,40 @@
+# Startup Logos
+
+This firmware supports a user created bootup logo.
+By default there is _not_ one included in the firmware, as this means that once flashed they generally stay.
+
+## Generating the Logo files
+
+The [Python script](https://github.com/Ralim/ts100/blob/master/Bootup%20Logo/python_logo_converter/img2ts100.py) converts an image passed into it on the command line to a HEX file to be uploaded to the iron in DFU mode (similar to the process described above). The image can be in color and any size, but it will be resized and converted to 1-bit color. However, it looks best if you create a 96x16 image in an image editor and color the pixels black or white manually.
+
+The converter requires at least Python 3 and Pillow (if you don't have it, it will tell you to install PIL, which is an old version of the same thing). See [this page](https://stackoverflow.com/a/20061019/6705343) on StackOverflow about installing it.
+
+What works can vary, but this command may work:
+
+`python3 -m pip install Pillow`
+
+Then, to convert an image:
+
+`python3 img2ts100.py infile.png outfile.hex`
+
+Run `python3 img2ts100.py --help` to see available options.
+
+## Flashing the Logo
+
+### Miniware (TS100/TS80/TS80P)
+
+Upload the HEX file to the iron in DFU mode and, if the file's extension changes to .RDY, your custom splash screen should show up on startup.
+You perform this the same way as if you were flashing a new firmware, and all of the existing notes around this apply.
+
+### Pinecil
+
+For the Pinecil, we require to flash the logo using dfu-util instead, which will only take `.bin` files rather than `.hex`.
+To flash the logo, use the following steps:
+
+
+ - `python3 img2ts100.py input.png logo.hex`
+ - `riscv-nuclei-elf-objcopy -I ihex -O binary logo.hex logo.bin`
+ - `dfu-util -d 28e9:0189 -a 0 -D logo.bin -s 0x0800f800`
+
+ This will use the objcopy tool to convert the hex to a binary file, and then use dfu-util to flash it in the right location.
+ If you do not have `riscv-nuclei-elf-objcopy` installed, you can generally use any objcopy tool from any toolchain you do have.

Documentation/Menu.md

@@ -1,5 +1,6 @@
 # Menu System
 
+In this firmware for these soldering irons, all settings are adjustable on the device itself. This means you do **not** require a computer to change any settings.
 
 ## Soldering mode
 
@@ -24,7 +25,6 @@ Scrolling through the submenu will return you back to its entry location after y
 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:
 
@@ -36,11 +36,6 @@ To calibrate your iron:
 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:
@@ -53,23 +48,10 @@ Some tips will have an offset on their readings, to calibrate this out perform t
 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*
+9. The display will then go back to *TMP CAL* and it will display a number, this is your offset number. You generally dont need it unless debugging issues
 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.

Documentation/Power.md

@@ -1,6 +1,6 @@
 # Power & Performance
 
-Both the TS100 and TS80 are PWM controlled resistive heating elements.
+All of the irons 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.
 
@@ -10,7 +10,7 @@ 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.
+The resistance of the tip is fixed, ~7.5 ohms for the TS100/Pinecil and ~4.5 ohms for the TS80(P).
 
 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.

History.md

@@ -1,89 +0,0 @@
-# Version Changes
-V2.00
-
-* Complete re-write of the low layer system to use the STM32 HAL for easier development
-* This allowed easier setup for the new ADC auto measuring system
-* Better tip PWM control
-* Moved to FreeRTOS for scheduling
-* Complete re-write from blank
-* Added detailed screen views
-* Added smaller font for said screen views
-
-
-V1.17
-
-* Added blinking cooldown display
-* Allowed smaller sleep timeout values
-* New font!
-* Automatic startup option
-
-V1.16
-
-* Added automatic rotation support
-* Added power display graph
-
-V1.15
-
-* 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
-
-V1.13
-
-* Swapped buttons for menu to prevent accidentally changing first menu item
-* 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
-
-V1.11
-
-* Boost mode
-* Change sensitivity options to be 1*8
-
-V1.10
-
-* Adds help text to settings
-* Improves settings for the display update rate
-
-V1.09
-
-* Adds display modes, for slowing down or simplifying the display
-
-V1.08
-
-* Fix settings menu not showing flip display
-
-V1.07
-
-* Adds shutdown time to automatically shutdown the iron after inactivity
-
-V1.06
-
-* Changes H and C when the iron is heating to the minidso chevron like images
-
-V1.05
-
-* Adds ability to calibrate the input voltage measurement
-
-V1.04
-
-* Increased accuracy of the temperature control
-* Improved PID response slightly
-* Allows temperature offset calibration
-* Nicer idle screen
-
-V1.03
-
-* Improved Button handling
-* Ability to set motion sensitivity
-* DC voltmeter page shows input voltage
-
-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)

ISSUE_TEMPLATE.md

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

PULL_REQUEST_TEMPLATE.md

@@ -2,9 +2,8 @@
 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 makes sense
 - [] The changes have been tested locally
-- [] Are there any breaking changes
+- [] There are no breaking changes
 
 * **What kind of change does this PR introduce?**
 (Bug fix, feature, docs update, ...)
@@ -14,14 +13,6 @@ Please try and fill out this template where possible, not all fields are require
 * **What is the current behavior?**
 (You can also link to an open issue here)
 
-
-
 * **What is the new behavior (if this is a feature change)?**
 
-
-
-* **Does this PR introduce a breaking change?**
-(What changes might users need to make in their application due to this PR?)
-
-
 * **Other information**:

README.md

@@ -1,73 +1,50 @@
-[![Codeship Status for ts100](https://app.codeship.com/projects/c77dbfe0-0764-0138-9520-3eb35bdb2b2c/status?branch=master)](https://app.codeship.com/projects/379118)
+![CI](https://github.com/Ralim/ts100/workflows/CI%20Build%20all/badge.svg)
+![GitHub all](https://img.shields.io/github/downloads/ralim/IronOS/total)
+![Latest Release](https://img.shields.io/github/v/release/ralim/IronOS)
 
-# TS100 & TS80 Firmware
+# IronOS - Flexible Soldering iron control Firmware
 
+*This repository was formerly known as TS100, its the same great code. Just with more supported devices*
 
-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.
+Originally concieved as an alternative firmware for the TS100, this firmware has evolved into a complex soldering iron control firmware.
 
-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.
+The firmware implements all of the standard features of a "smart" soldering iron, with lots of little extras and tweaks.
+I highly reccomend reading the installation guide fully when installing on your iron. And after install just explore the settings menu.
 
-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.
+For soldering irons that are designed to be powered by "smart" power sources (QC and PD), the firmware supports settings around the negotiated power and voltage.
+For soldering irons that are designed to be powered by batteries (TS100), settings for a cutoff voltage for battery protection are supported.
+
+There are 25 languages currently supported as of present. When downloading the firmware for your soldering iron take note of the language code in the file name.
 
 This project is considered feature complete for use as a soldering iron, *so please suggest any feature improvements you would like!*
 
 *This firmware does **NOT** support the USB port while running for changing settings. This is done through the onscreen menu only. Logos are edited using the tool or python script and uploaded in DFU mode.*
 
-## Core Features
 
-* PID iron temperature control
+## Key Features
+
+* PID style iron temperature control
 * Automatic sleep with selectable sensitivity
 * Motion wake support
-* Settings menu on the unit
+* All settings exposed in intuitive menu
 * (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
+* (TS80) Set 18W or 24W settings for your power bank
+* (TS80P) Automatically negotiates appropriate PD and falls back to QC mode like TS80
+* (Pinecil) Supports all 3 power modes (PD,QC, DC In).
+* Improved readability Fonts, supporting multiple languages
 * Use hardware features to improve reliability
 * Can disable movement detection if desired
-* 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
+* Boost mode lets you temporarily change the temperature when soldering (i.e. raise the temperature for short periods of time)
+* (TS100/Pinecil) Battery charge level indicator if power source set to a lipo cell count
+* (TS80/TS80P/Pinecil) Power bank operating voltage is displayed
+* [Custom boot up logo support](Documentation/Logo.md)
 * Automatic LCD rotation based on the orientation
-* Supports both the version 1 and version 2 hardware (different accelerometers)
 
-# Upgrading your iron
+## Installation
 
-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.
+For installation for your device, please refer to the [Flashing Guide](Documentation/Flashing.md).
 
-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. Hold the button closest to the tip, and plug in the USB to the computer.
-2. The unit will appear as a USB drive.
-3. Drag the .hex file onto the USB drive.
-4. The unit will disconnect and reconnect.
-5. The filename will have changed to end in .RDY or .ERR
-6. If it ends with .RDY you're done! Otherwise, something went wrong.
-7. If it didn't work the first time, try copying the file again without disconnecting the iron, often it will work on the second shot.
-8. Disconnect the USB and power up the iron. You're good to go.
-```
-
-
-For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer.
-On the bottom of the MCU riser PCB, there are 4 pads for programming.
-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.
-
-# 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.
@@ -75,34 +52,40 @@ When on the main screen, the unit shows prompts for the two most common operatio
 * 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
+* Holding the button near the USB end will show the [debug menu](Documentation/DebugMenu.md)
 
-More details are over in the [Menu information.](menu.md)
+Detailed operation details are over in the [Menu information.](Documentation/Menu.md)
 
 ## Thanks
 
-
-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
+If you love this firmware and want to continue my caffeine addiction, you can do so [here](https://paypal.me/RalimTek) (or email me for other options).
 I also want to give a shout out to all of the [Fantastic Contributors](https://github.com/Ralim/ts100/graphs/contributors).
 
 Especially to the following users, who have helped in various ways that are massively appreciated:
 
-* [dhiltonp](https://github.com/dhiltonp)
+* [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)
+* [JonnieZG](https://github.com/jonnieZG)
+* [Federck](https://github.com/federck)
+* [Jvitkauskas](https://github.com/jvitkauskas)
+* [Doegox](https://github.com/doegox)
+* [Perillamint](https://github.com/perillamint)
+* [GeminiServer](https://github.com/GeminiServer)
+* [Patrick Horlebein](https://github.com/PixelPirate)
+* [Firebie](https://github.com/Firebie)
+* [Agatti](https://github.com/agatti)
+* [Discip](https://github.com/discip)
+* [Paul Fertser](https://github.com/paulfertser)
 
+Plus the huge number of people who have contributed translations, your effort is massively appreciated.
 
 ## Licence
 
-The code in this repository that is based on the STM tools is under a BSD-like licence.
 The code created by the community is GNU GPLv3. Unless noted elsewhere.
-The FreeRToS is under its own licence.
+Other components such as FreeRTOS/USB-PD have their 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 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.
+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.

Translation Editor/TranslationEditor.html

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

Translation Editor/TranslationsParser.html

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

Translation Editor/make_translation.py

@@ -54,19 +54,20 @@ def readTranslations(jsonDir):
             langCode = fileName[12:-5].upper()
             # ...and the one specified in the JSON file...
             try:
-                langCodeFromJson = lang['languageCode']
+                langCodeFromJson = lang["languageCode"]
             except KeyError:
                 langCodeFromJson = "(missing)"
 
             try:
-                TempUnitF_FromJson = lang['tempUnitFahrenheit']
+                TempUnitF_FromJson = lang["tempUnitFahrenheit"]
             except KeyError:
-                TempUnitF_FromJson = True # Default to true.
-            
+                TempUnitF_FromJson = True  # Default to true.
+
             # ...cause they should be the same!
             if langCode != langCodeFromJson:
-                raise ValueError("Invalid languageCode " + langCodeFromJson +
-                                 " in file " + fileName)
+                raise ValueError(
+                    "Invalid languageCode " + langCodeFromJson + " in file " + fileName
+                )
 
             langDict[langCode] = lang
             UnitDict[langCode] = TempUnitF_FromJson
@@ -82,7 +83,9 @@ def writeStart(f):
 #ifndef LANG
 #define LANG_EN
 #endif
-"""))
+"""
+        )
+    )
 
 
 def writeStartUnit(f):
@@ -100,130 +103,109 @@ def writeStartUnit(f):
 
 #ifndef _UNIT_H
 #define _UNIT_H\n
-"""))
+"""
+        )
+    )
+
 
 def escapeC(s):
-    return s.replace("\"", "\\\"")
+    return s.replace('"', '\\"')
 
 
 def getConstants():
     # Extra constants that are used in the firmware that are shared across all languages
     consants = []
-    consants.append(('SymbolPlus', '+'))
-    consants.append(('SymbolMinus', '-'))
-    consants.append(('SymbolSpace', ' '))
-    consants.append(('SymbolDot', '.'))
-    consants.append(('SymbolDegC', 'C'))
-    consants.append(('SymbolDegF', 'F'))
-    consants.append(('SymbolMinutes', 'M'))
-    consants.append(('SymbolSeconds', 'S'))
-    consants.append(('SymbolWatts', 'W'))
-    consants.append(('SymbolVolts', 'V'))
-    consants.append(('SymbolDC', 'DC'))
-    consants.append(('SymbolCellCount', 'S'))
-    consants.append(('SymbolVersionNumber', buildVersion))
+    consants.append(("SymbolPlus", "+"))
+    consants.append(("SymbolMinus", "-"))
+    consants.append(("SymbolSpace", " "))
+    consants.append(("SymbolDot", "."))
+    consants.append(("SymbolDegC", "C"))
+    consants.append(("SymbolDegF", "F"))
+    consants.append(("SymbolMinutes", "M"))
+    consants.append(("SymbolSeconds", "S"))
+    consants.append(("SymbolWatts", "W"))
+    consants.append(("SymbolVolts", "V"))
+    consants.append(("SymbolDC", "DC"))
+    consants.append(("SymbolCellCount", "S"))
+    consants.append(("SymbolVersionNumber", buildVersion))
     return consants
 
 
-def getTipModelEnumTS80():
-    constants = []
-    constants.append("B02")
-    constants.append("D25")
-    constants.append("TS80")  # end of miniware
-    constants.append("User")  # User
-    return constants
-
-
-def getTipModelEnumTS100():
-    constants = []
-    constants.append("B02")
-    constants.append("D24")
-    constants.append("BC2")
-    constants.append(" C1")
-    constants.append("TS100")  # end of miniware
-    constants.append("BC2")
-    constants.append("Hakko")  # end of hakko
-    constants.append("User")
-    return constants
-
-
 def getDebugMenu():
     constants = []
-    constants.append(datetime.today().strftime('%d-%m-%y'))
-    constants.append("HW G ")
-    constants.append("HW M ")
-    constants.append("HW P ")
-    constants.append("Time ")
-    constants.append("Move ")
-    constants.append("RTip ")
-    constants.append("CTip ")
-    constants.append("CHan ")
-    constants.append("Vin  ")
+    constants.append(datetime.today().strftime("%d-%m-%y"))
+    constants.append("HW G ")  # High Water marker for GUI task
+    constants.append("HW M ")  # High Water marker for MOV task
+    constants.append("HW P ")  # High Water marker for PID task
+    constants.append("Time ")  # Uptime (aka timestamp)
+    constants.append("Move ")  # Time of last significant movement
+    constants.append("RTip ")  # Tip reading in uV
+    constants.append("CTip ")  # Tip temp in C
+    constants.append("CHan ")  # Handle temp in C
+    constants.append("Vin  ")  # Input voltage
     constants.append("PCB  ")  # PCB Version AKA IMU version
+    constants.append("PWR  ")  # Power Negotiation State
+    constants.append("Max  ")  # Max deg C limit
+
     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["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']
+    obj = lang["messages"]
+    for mod in defs["messages"]:
+        eid = mod["id"]
         if eid not in obj:
-            textList.append(mod['default'])
+            textList.append(mod["default"])
         else:
             textList.append(obj[eid])
 
-    obj = lang['characters']
+    obj = lang["characters"]
 
-    for mod in defs['characters']:
-        eid = mod['id']
+    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["menuOptions"]
+    for mod in defs["menuOptions"]:
+        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]['text2'][0])
-        textList.append(obj[eid]['text2'][1])
+    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'])
+    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', '')
+        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.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
@@ -233,17 +215,17 @@ 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
+    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']
+    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')
+        print("Error, too many used symbols for this version")
         exit(1)
-    print('Generating fonts for {} symbols'.format(len(textList)))
+    print("Generating fonts for {} symbols".format(len(textList)))
 
     for sym in textList:
         if sym not in symbolMap:
@@ -256,39 +238,38 @@ def getFontMapAndTable(textList):
     fontSmallTable = fontTables.getSmallFontMap()
     for sym in forcedFirstSymbols:
         if sym not in fontTable:
-            print('Missing Large font element for {}'.format(sym))
+            print("Missing Large font element for {}".format(sym))
             exit(1)
         fontLine = fontTable[sym]
-        fontTableStrings.append(
-            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+        fontTableStrings.append(fontLine + "//{} -> {}".format(symbolMap[sym], sym))
         if sym not in fontSmallTable:
-            print('Missing Small font element for {}'.format(sym))
+            print("Missing Small font element for {}".format(sym))
             exit(1)
         fontLine = fontSmallTable[sym]
         fontSmallTableStrings.append(
-            fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+            fontLine + "//{} -> {}".format(symbolMap[sym], sym)
+        )
 
     for sym in textList:
         if sym not in fontTable:
-            print('Missing Large font element for {}'.format(sym))
+            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))
+            fontTableStrings.append(fontLine + "//{} -> {}".format(symbolMap[sym], sym))
             if sym not in fontSmallTable:
-                print('Missing Small font element for {}'.format(sym))
+                print("Missing Small font element for {}".format(sym))
                 exit(1)
             fontLine = fontSmallTable[sym]
             fontSmallTableStrings.append(
-                fontLine + "//{} -> {}".format(symbolMap[sym], sym))
+                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")
+    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")
@@ -299,9 +280,9 @@ def getFontMapAndTable(textList):
 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'):
+    for c in text.replace("\\r", "").replace("\\n", "\n"):
         if c not in symbolConversionTable:
-            print('Missing font definition for {}'.format(c))
+            print("Missing font definition for {}".format(c))
         else:
             outputString = outputString + symbolConversionTable[c]
     return outputString
@@ -318,58 +299,86 @@ def writeLanguage(languageCode, defs, f):
     f.write(to_unicode("\n#ifdef LANG_" + languageCode + "\n"))
     f.write(fontTableText)
     try:
-        langName = lang['languageLocalName']
+        langName = lang["languageLocalName"]
     except KeyError:
         langName = languageCode
 
     f.write(to_unicode("// ---- " + langName + " ----\n\n"))
 
     # ----- Writing SettingsDescriptions
-    obj = lang['menuOptions']
+    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] + " */ "))
+    index = 0
+    for mod in defs["menuOptions"]:
+        eid = mod["id"]
+        if "feature" in mod:
+            f.write(to_unicode("#ifdef " + mod["feature"] + "\n"))
         f.write(
-            to_unicode("\"" +
-                       convStr(symbolConversionTable, (obj[eid]['desc'])) +
-                       "\"," + "//{} \n".format(obj[eid]['desc'])))
-        if 'feature' in mod:
+            to_unicode(
+                "  /* ["
+                + "{:02d}".format(index)
+                + "] "
+                + eid.ljust(maxLen)[:maxLen]
+                + " */ "
+            )
+        )
+        f.write(
+            to_unicode(
+                '"'
+                + convStr(symbolConversionTable, (obj[eid]["desc"]))
+                + '",'
+                + "//{} \n".format(obj[eid]["desc"])
+            )
+        )
+        if "feature" in mod:
             f.write(to_unicode("#endif\n"))
+        index = index + 1
 
     f.write(to_unicode("};\n\n"))
 
     # ----- Writing Message strings
 
-    obj = lang['messages']
+    obj = lang["messages"]
 
-    for mod in defs['messages']:
-        eid = mod['id']
+    for mod in defs["messages"]:
+        eid = mod["id"]
         sourceText = ""
-        if 'default' in mod:
-            sourceText = (mod['default'])
+        if "default" in mod:
+            sourceText = mod["default"]
         if eid in obj:
-            sourceText = (obj[eid])
+            sourceText = obj[eid]
         translatedText = convStr(symbolConversionTable, sourceText)
         f.write(
-            to_unicode("const char* " + eid + " = \"" +
-                       translatedText + "\";" + "//{} \n".format(sourceText.replace('\n', '_'))))
+            to_unicode(
+                "const char* "
+                + eid
+                + ' = "'
+                + translatedText
+                + '";'
+                + "//{} \n".format(sourceText.replace("\n", "_"))
+            )
+        )
 
     f.write(to_unicode("\n"))
 
     # ----- Writing Characters
 
-    obj = lang['characters']
+    obj = lang["characters"]
 
-    for mod in defs['characters']:
-        eid = mod['id']
+    for mod in defs["characters"]:
+        eid = mod["id"]
         f.write(
-            to_unicode("const char* " + eid + " = \"" +
-                       convStr(symbolConversionTable, obj[eid]) + "\";" + "//{} \n".format(obj[eid])))
+            to_unicode(
+                "const char* "
+                + eid
+                + ' = "'
+                + convStr(symbolConversionTable, obj[eid])
+                + '";'
+                + "//{} \n".format(obj[eid])
+            )
+        )
 
     f.write(to_unicode("\n"))
 
@@ -377,100 +386,107 @@ def writeLanguage(languageCode, defs, f):
     constants = getConstants()
     for x in constants:
         f.write(
-            to_unicode("const char* " + x[0] + " = \"" +
-                       convStr(symbolConversionTable, x[1]) + "\";" + "//{} \n".format(x[1])))
+            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(
+                '\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']
+    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:
+    index = 0
+    for mod in defs["menuOptions"]:
+        eid = mod["id"]
+        if "feature" in mod:
+            f.write(to_unicode("#ifdef " + mod["feature"] + "\n"))
+        f.write(
+            to_unicode(
+                "  /* ["
+                + "{:02d}".format(index)
+                + "] "
+                + eid.ljust(maxLen)[:maxLen]
+                + " */ "
+            )
+        )
+        f.write(
+            to_unicode(
+                '{ "'
+                + convStr(symbolConversionTable, (obj[eid]["text2"][0]))
+                + '", "'
+                + convStr(symbolConversionTable, (obj[eid]["text2"][1]))
+                + '" },'
+                + "//{} \n".format(obj[eid]["text2"])
+            )
+        )
+
+        if "feature" in mod:
             f.write(to_unicode("#endif\n"))
+        index = index + 1
 
     f.write(to_unicode("};\n\n"))
 
     # ----- Writing Menu Groups
-    obj = lang['menuGroups']
-    f.write(
-        to_unicode("const char* SettingsMenuEntries[" + str(len(obj)) +
-                   "] = {\n"))
+    obj = lang["menuGroups"]
+    f.write(to_unicode("const char* SettingsMenuEntries[" + str(len(obj)) + "] = {\n"))
 
     maxLen = 25
-    for mod in defs['menuGroups']:
-        eid = mod['id']
+    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'])))
+            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']
+    obj = lang["menuGroups"]
     f.write(
-        to_unicode("const char* SettingsMenuEntriesDescriptions[" +
-                   str(len(obj)) + "] = {\n"))
+        to_unicode(
+            "const char* SettingsMenuEntriesDescriptions[" + str(len(obj)) + "] = {\n"
+        )
+    )
 
     maxLen = 25
-    for mod in defs['menuGroups']:
-        eid = mod['id']
+    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'])))
+            to_unicode(
+                '"'
+                + convStr(symbolConversionTable, (obj[eid]["desc"]))
+                + '",'
+                + "//{} \n".format(obj[eid]["desc"])
+            )
+        )
 
     f.write(to_unicode("};\n\n"))
 
@@ -483,36 +499,49 @@ def writeUnit(languageCode, defs, f, UnitCodes):
     lang = langDict[languageCode]
     unit = UnitDict[UnitCodes]
     try:
-        langName = lang['languageLocalName']
+        langName = lang["languageLocalName"]
     except KeyError:
         langName = languageCode
     f.write(to_unicode("  #ifdef LANG_" + languageCode + "\n"))
-    if unit: 
+    if unit:
         f.write(to_unicode("    #define  ENABLED_FAHRENHEIT_SUPPORT" + "\n"))
-    else: f.write(to_unicode("    //#define  ENABLED_FAHRENHEIT_SUPPORT" + "\n"))
+    else:
+        f.write(to_unicode("    //#define  ENABLED_FAHRENHEIT_SUPPORT" + "\n"))
     # ----- Block end
     f.write(to_unicode("  #endif /* ---- " + langName + " ---- */\n"))
 
+
 def readVersion():
-    with open(os.path.relpath(jsonDir + 
-    "/../workspace/TS100/version.h"),"r") as version_file:
-        try: 
+    with open(
+        os.path.relpath(jsonDir + "/../workspace/TS100/version.h"), "r"
+    ) as version_file:
+        try:
             for line in version_file:
-                if re.findall(r'^.*(?<=(#define)).*(?<=(BUILD_VERSION))', line):
-                    line = re.findall(r'\"(.+?)\"',line)
-                    if line: 
+                if re.findall(r"^.*(?<=(#define)).*(?<=(BUILD_VERSION))", line):
+                    line = re.findall(r"\"(.+?)\"", line)
+                    if line:
                         version = line[0]
-                        try: version += "."+ subprocess.check_output(
-                            ["git","rev-parse", "--short=7", "HEAD"]).strip().decode('ascii').upper()
-                            # --short=7: the shorted hash with 7 digits. Increase/decrease if needed!
-                        except OSError: version += " git"
-        finally: 
-            if version_file: 
-                version_file.close(); 
+                        try:
+                            version += (
+                                "."
+                                + subprocess.check_output(
+                                    ["git", "rev-parse", "--short=7", "HEAD"]
+                                )
+                                .strip()
+                                .decode("ascii")
+                                .upper()
+                            )
+                        # --short=7: the shorted hash with 7 digits. Increase/decrease if needed!
+                        except OSError:
+                            version += " git"
+        finally:
+            if version_file:
+                version_file.close()
                 return version
 
+
 def read_opts():
-    """ Reading input parameters
+    """Reading input parameters
     First parameter = json directory
     Second parameter = translation directory
     Third paramter = unit directory
@@ -527,12 +556,12 @@ def read_opts():
     else:
         outDir = os.path.relpath(jsonDir + "/../workspace/TS100/Core/Src")
         outFileTranslationCPP = os.path.join(outDir, TRANSLATION_CPP)
-    
+
     if len(sys.argv) > 3:
         outFileUnitH = sys.argv[3]
     else:
         outDir = os.path.relpath(jsonDir + "/../workspace/TS100/Core/Inc")
-        outFileUnitH = os.path.join(outDir,UNIT_H)
+        outFileUnitH = os.path.join(outDir, UNIT_H)
 
     if len(sys.argv) > 4:
         raise Exception("Too many parameters!")
@@ -542,7 +571,7 @@ def read_opts():
 
 def orderOutput(langDict):
     # These languages go first
-    mandatoryOrder = ['EN']
+    mandatoryOrder = ["EN"]
 
     # Then add all others in alphabetical order
     sortedKeys = sorted(langDict.keys())
@@ -557,17 +586,18 @@ def orderOutput(langDict):
 
 def writeTarget(outFileTranslationCPP, outFileUnitH, defs, langCodes, UnitCodes):
     # Start writing the file
-    with io.open(outFileTranslationCPP, 'w', encoding='utf-8', newline="\n") as f:
+    with io.open(outFileTranslationCPP, "w", encoding="utf-8", newline="\n") as f:
         writeStart(f)
         for langCode in langCodes:
             writeLanguage(langCode, defs, f)
 
-    with io.open(outFileUnitH, 'w', encoding='utf-8', newline="\n") as f:
+    with io.open(outFileUnitH, "w", encoding="utf-8", newline="\n") as f:
         writeStartUnit(f)
         for langCode, UnitCode in zip(langCodes, UnitCodes):
             writeUnit(langCode, defs, f, UnitCode)
         f.write(to_unicode("\n#endif /* _UNIT_H */\n"))
 
+
 if __name__ == "__main__":
     try:
         jsonDir, outFileTranslationCPP, outFileUnitH = read_opts()
@@ -575,8 +605,11 @@ if __name__ == "__main__":
         print("usage: make_translation.py {json dir} {cpp dir}")
         sys.exit(1)
 
-    try: buildVersion = readVersion()
-    except: print("error: could not get/extract build version"); sys.exit(1)
+    try:
+        buildVersion = readVersion()
+    except:
+        print("error: could not get/extract build version")
+        sys.exit(1)
 
     print("Build version: " + buildVersion)
     print("Making " + outFileTranslationCPP + " from " + jsonDir)

Translation Editor/translation_bg.json

@@ -3,10 +3,10 @@
 	"languageLocalName": "Български",
 	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "Уверете се, че човката на поялника е със стайна температура преди да продължите!",
+		"SettingsCalibrationDone": "Калибрацията завършена!",
+		"SettingsCalibrationWarning": "Уверете се, че върха на поялника е със стайна температура преди да продължите!",
 		"SettingsResetWarning": "Сигурни ли сте, че искате да върнете фабричните настройки?",
-		"UVLOWarningString": "Ниско V!",
+		"UVLOWarningString": "Ниско DC Напрежение",
 		"UndervoltageString": "Ниско Напрежение",
 		"InputVoltageString": "Входно V: ",
 		"WarningTipTempString": "Темп.: ",
@@ -17,11 +17,16 @@
 		"WarningAdvancedString": "ВНИМАНИЕ! ТОПЛО!",
 		"SleepingTipAdvancedString": "Връх:",
 		"IdleTipString": "Връх:",
-		"IdleSetString": " Set:",
-		"TipDisconnectedString": "ВРЪХ ЛОША ВРЪЗКА",
+		"IdleSetString": " Настройка:",
+		"TipDisconnectedString": "ПРЕКЪСНАТ ВРЪХ",
 		"SolderingAdvancedPowerPrompt": "Захранване: ",
-		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"OffString": "Изкл.",
+		"ResetOKMessage": "Нулиране завършено",
+		"YourGainMessage": "Усилване:",
+		"SettingsResetMessage": "Настройките бяха\nнулирани!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "",
+		"DCInCutoff": {
 			"text2": [
 				"Източник",
 				"захранване"
@@ -75,7 +85,6 @@
 			"desc": "Източник на захранване. Минимално напрежение. <DC 10V> <S 3.3V за клетка>"
 		},
 		"SleepTemperature": {
-			"text": "",
 			"text2": [
 				"Темп.",
 				"сън"
@@ -83,7 +92,6 @@
 			"desc": "Температура при режим \"сън\" <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
 			"text2": [
 				"Време",
 				"сън"
@@ -91,7 +99,6 @@
 			"desc": "Включване в режим \"сън\" след: <Минути/Секунди>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
 			"text2": [
 				"Време",
 				"изкл."
@@ -99,7 +106,6 @@
 			"desc": "Изключване след <Минути>"
 		},
 		"MotionSensitivity": {
-			"text": "",
 			"text2": [
 				"Усещане",
 				"за движение"
@@ -107,7 +113,6 @@
 			"desc": "Усещане за движение <0.Изключено 1.Слабо 9.Силно>"
 		},
 		"TemperatureUnit": {
-			"text": "",
 			"text2": [
 				"Единици за",
 				"температура"
@@ -115,7 +120,6 @@
 			"desc": "Единици за температура <C=Целзии F=Фаренхайт>"
 		},
 		"AdvancedIdle": {
-			"text": "",
 			"text2": [
 				"Детайлен",
 				"екран в покой"
@@ -123,23 +127,13 @@
 			"desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой."
 		},
 		"DisplayRotation": {
-			"text": "",
 			"text2": [
 				"Ориентация",
 				"на дисплея"
 			],
 			"desc": "Ориентация на дисплея <A. Автоматично L. Лява Ръка R. Дясна Ръка>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Турбо режим",
-				"пуснат"
-			],
-			"desc": "Ползвай предния бутон за \"турбо\" режим с температура до 450C при запояване"
-		},
 		"BoostTemperature": {
-			"text": "",
 			"text2": [
 				"Турбо",
 				"темп."
@@ -147,7 +141,6 @@
 			"desc": "Температура за \"турбо\" режим"
 		},
 		"AutoStart": {
-			"text": "",
 			"text2": [
 				"Автоматичен",
 				"работен режим"
@@ -155,7 +148,6 @@
 			"desc": "Режим на поялника при включване на захранването. T=Работен, S=Сън, F=Изключен"
 		},
 		"CooldownBlink": {
-			"text": "",
 			"text2": [
 				"Мигай при",
 				"топъл поялник"
@@ -163,7 +155,6 @@
 			"desc": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла"
 		},
 		"TemperatureCalibration": {
-			"text": "",
 			"text2": [
 				"Калибриране",
 				"температура?"
@@ -171,7 +162,6 @@
 			"desc": "Калибриране на температурата"
 		},
 		"SettingsReset": {
-			"text": "",
 			"text2": [
 				"Фабрични",
 				"настройки?"
@@ -179,15 +169,13 @@
 			"desc": "Връщане на фабрични настройки"
 		},
 		"VoltageCalibration": {
-			"text": "",
 			"text2": [
 				"Калибриране",
 				"напрежение?"
 			],
-			"desc": "Калибриране на входното напрежение (VIN). Задръжте бутонa за изход"
+			"desc": "Калибриране на входното напрежение. Задръжте бутонa за изход"
 		},
 		"AdvancedSoldering": {
-			"text": "",
 			"text2": [
 				"Детайлен",
 				"работен екран"
@@ -195,7 +183,6 @@
 			"desc": "Детайлна информация в работен режим при запояване"
 		},
 		"ScrollingSpeed": {
-			"text": "",
 			"text2": [
 				"Скорост",
 				"на текста"
@@ -203,76 +190,88 @@
 			"desc": "Скорост на движение на този текст"
 		},
 		"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",
+		"QCMaxVoltage": {
 			"text2": [
-				"Power",
-				"Wattage"
+				"Мощност на",
+				"захранване"
 			],
-			"desc": "Power Wattage of the power adapter used"
-		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
+			"desc": "Мощност на избраното захранване"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Лимит на",
+				"мощност"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Максимална мощност на поялника <W>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Размяна",
+				"бутони +-?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника"
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Промяна T",
+				"бързо?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Промяна на температура при бързо натискане на бутон!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Промяна Т",
+				"задържане?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Промяна на температура при задържане на бутон!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Захранващ",
+				"импулс"
+			],
+			"desc": "Поддържане на интензивност на захранващия импулс"
+		},
+		"TipGain": {
+			"text2": [
+				"Промяна",
+				"сила връх"
+			],
+			"desc": "Усилване на върха на поялника"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_cs.json

@@ -22,7 +22,11 @@
 		"SolderingAdvancedPowerPrompt": "Ohřev: ",
 		"OffString": "Vyp",
 		"ResetOKMessage": "Reset OK",
-		"YourGainMessage": "Zisk:"
+		"YourGainMessage": "Zisk:",
+		"SettingsResetMessage": "Tov. nas. obnov.",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "P",
@@ -33,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -67,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "",
+		"DCInCutoff": {
 			"text2": [
 				"Zdroj",
 				"napájení"
@@ -76,7 +85,6 @@
 			"desc": "Při nižším napětí ukončí pájení <DC=10V, ?S=?x3.3V pro LiPo, LiIon...>."
 		},
 		"SleepTemperature": {
-			"text": "",
 			"text2": [
 				"Teplota v",
 				"r. spánku"
@@ -84,7 +92,6 @@
 			"desc": "Teplota v režimu spánku."
 		},
 		"SleepTimeout": {
-			"text": "",
 			"text2": [
 				"Čas do",
 				"r. spánku"
@@ -92,7 +99,6 @@
 			"desc": "Čas do režimu spánku <Minut/Sekund>."
 		},
 		"ShutdownTimeout": {
-			"text": "",
 			"text2": [
 				"Čas do",
 				"vypnutí"
@@ -100,7 +106,6 @@
 			"desc": "Čas do automatického vypnutí <Minut>."
 		},
 		"MotionSensitivity": {
-			"text": "",
 			"text2": [
 				"Citlivost",
 				"det. pohybu"
@@ -108,7 +113,6 @@
 			"desc": "Citlivost detekce pohybu <0=Vyp, 1=Min, ... 9=Max>."
 		},
 		"TemperatureUnit": {
-			"text": "",
 			"text2": [
 				"Jednotky",
 				"teploty"
@@ -116,7 +120,6 @@
 			"desc": "Jednotky měření teploty <C=Celsius, F=Fahrenheit>."
 		},
 		"AdvancedIdle": {
-			"text": "",
 			"text2": [
 				"Podrobnosti",
 				"na vých. obr."
@@ -124,23 +127,13 @@
 			"desc": "Zobrazit podrobnosti na výchozí obrazovce?"
 		},
 		"DisplayRotation": {
-			"text": "",
 			"text2": [
 				"Orientace",
 				"obrazovky"
 			],
 			"desc": "Orientace obrazovky <A=Auto, L=Levák, P=Pravák>."
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Povolit",
-				"boost"
-			],
-			"desc": "Povolit boost podržením předního tlačítka při pájení?"
-		},
 		"BoostTemperature": {
-			"text": "",
 			"text2": [
 				"Teplota v",
 				"r. boost"
@@ -148,7 +141,6 @@
 			"desc": "Teplota v režimu boost."
 		},
 		"AutoStart": {
-			"text": "",
 			"text2": [
 				"Automatický",
 				"start"
@@ -156,7 +148,6 @@
 			"desc": "Při startu ihned nahřát hrot?"
 		},
 		"CooldownBlink": {
-			"text": "",
 			"text2": [
 				"Blikáni při",
 				"chladnutí"
@@ -164,7 +155,6 @@
 			"desc": "Blikání teploty při chladnutí, dokud je hrot horký?"
 		},
 		"TemperatureCalibration": {
-			"text": "",
 			"text2": [
 				"Kalibrovat",
 				"teplotu?"
@@ -172,7 +162,6 @@
 			"desc": "Kalibrace měření teploty."
 		},
 		"SettingsReset": {
-			"text": "",
 			"text2": [
 				"Tovární",
 				"nastavení?"
@@ -180,7 +169,6 @@
 			"desc": "Obnovení továrního nastavení."
 		},
 		"VoltageCalibration": {
-			"text": "",
 			"text2": [
 				"Kalibrovat",
 				"vstupní napětí?"
@@ -188,7 +176,6 @@
 			"desc": "Kalibrace vstupního napětí. Tlačítky uprav, podržením potvrď."
 		},
 		"AdvancedSoldering": {
-			"text": "",
 			"text2": [
 				"Podrobnosti",
 				"při pájení"
@@ -196,7 +183,6 @@
 			"desc": "Zobrazit podrobnosti při pájení?"
 		},
 		"ScrollingSpeed": {
-			"text": "",
 			"text2": [
 				"Rychlost",
 				"popisků"
@@ -204,7 +190,6 @@
 			"desc": "Rychlost posuvu popisků podobných tomuto <P=Pomalu, R=Rychle>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Model",
 				"hrotu"
@@ -212,7 +197,6 @@
 			"desc": "Výběr modelu hrotu."
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Jednoduchá",
 				"kalibrace"
@@ -220,60 +204,74 @@
 			"desc": "Jednoduchá kalibrace pomocí horké vody."
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Pokročilá",
 				"kalibrace"
 			],
 			"desc": "Pokročilá kalibrace pomocí termočlánku na hrotu."
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Výkon",
 				"ve wattech"
 			],
 			"desc": "Výkon použítého napájecího adaptéru ve wattech."
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Omezení",
+				"Výkonu"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Maximální příkon <Watty>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Prohodit",
+				"tl. +-?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Prohodí tlačítka plus a minus pro změnu teploty hrotu."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Krok teploty",
+				"krátký?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Velikost skoku při změně teploty krátkým stiskem tlačítka!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Krok teploty",
+				"dlouhý?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Velikost skoku při změně teploty dlouhým stiskem tlačítka!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Intenzita",
+				"Výkon. pulsu"
+			],
+			"desc": "Puls pro udržení zařízení v chodu (kvůli power bankám)."
+		},
+		"TipGain": {
+			"text2": [
+				"Změnit",
+				"zisk hr."
+			],
+			"desc": "Zisk hrotu (měření)"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_da.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "TIP DISCONNECTED",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "H",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "L",
 		"SettingStartSleepChar": "D",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "S"
+		"SettingStartNoneChar": "S",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": false,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,144 +77,119 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
+		"DCInCutoff": {
 			"text2": [
-				"",
-				""
+				"Power",
+				"source"
 			],
 			"desc": "Strømforsyning. Indstil Cutoff Spændingen. <DC 10V <S 3.3V per cell"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
-				"",
-				""
+				"Sleep",
+				"temp"
 			],
-			"desc": "Dvale Temperatur <C"
+			"desc": "Dvale Temperatur <C>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
-				"",
-				""
+				"Sleep",
+				"timeout"
 			],
 			"desc": "Dvale Timeout <Minutter/Sekunder"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
-				"",
-				""
+				"Shutdown",
+				"timeout"
 			],
 			"desc": "sluknings Timeout <Minutter"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
-				"",
-				""
+				"Motion",
+				"sensitivity"
 			],
 			"desc": "Bevægelsesfølsomhed <0.Slukket 1.Mindst følsom 9.Mest følsom"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
-				"",
-				""
+				"Temperature",
+				"unit"
 			],
 			"desc": "Temperatur Enhed <C=Celsius F=Fahrenheit"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
-				"",
-				""
+				"Detailed",
+				"idle screen"
 			],
 			"desc": "Vis detialieret information med en mindre skriftstørrelse på standby skærmen."
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
 			"text2": [
-				"",
-				""
+				"Display",
+				"orientation"
 			],
 			"desc": "Skærm Orientering <A. Automatisk V. Venstre Håndet H. Højre Håndet"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"",
-				""
-			],
-			"desc": "Ved tryk på front knap Aktiveres boost-funktionen, 450C tilstand når der loddes"
-		},
 		"BoostTemperature": {
-			"text": "BTMP",
 			"text2": [
-				"",
-				""
+				"Boost",
+				"temp"
 			],
 			"desc": "Temperatur i \"boost\" mode"
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
-				"",
-				""
+				"Auto",
+				"start"
 			],
 			"desc": "Start automatisk med lodning når strøm sættes til. L=Lodning, D= Dvale tilstand,S=Slukket"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
-				"",
-				""
+				"Cooldown",
+				"blink"
 			],
 			"desc": "Blink temperaturen på skærmen, mens spidsen stadig er varm."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
-				"",
-				""
+				"Calibrate",
+				"temperature?"
 			],
 			"desc": "kalibrere spids temperatur."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
-				"",
-				""
+				"Factory",
+				"Reset?"
 			],
 			"desc": "Gendan alle indstillinger"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
-				"",
-				""
+				"Calibrate",
+				"input voltage?"
 			],
 			"desc": "VIN kalibrering. Knapperne justere, Lang tryk for at gå ud"
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
-				"",
-				""
+				"Detailed",
+				"solder screen"
 			],
 			"desc": "Vis detialieret information mens der loddes"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
-				"",
-				""
+				"Scrolling",
+				"speed"
 			],
 			"desc": "Speed this text scrolls past at"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Tip",
 				"Model"
@@ -211,7 +197,6 @@
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Simple",
 				"Calibration"
@@ -219,31 +204,20 @@
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -251,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -259,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -267,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_de.json

@@ -24,7 +24,10 @@
 		"OffString": "Aus",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your Gain:",
-		"SettingsResetMessage": "Einstellungen\nzurück gesetzt!"
+		"SettingsResetMessage": "Einstellungen\nzurück gesetzt!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -35,9 +38,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -69,8 +78,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
+		"DCInCutoff": {
 			"text2": [
 				"Spannungs-",
 				"quelle"
@@ -78,7 +86,6 @@
 			"desc": "Spannungsquelle (Abschaltspannung) <DC=10V, nS=n*3.3V für n LiIon-Zellen>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
 				"Ruhetemp-",
 				"eratur"
@@ -86,7 +93,6 @@
 			"desc": "Ruhetemperatur"
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
 				"Ruhever-",
 				"zögerung"
@@ -94,7 +100,6 @@
 			"desc": "Ruhemodus nach <Sekunden/Minuten>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
 				"Abschalt-",
 				"zeit"
@@ -102,7 +107,6 @@
 			"desc": "Abschalten nach <Minuten>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
 				"Bewegungs-",
 				"empfindlichk."
@@ -110,7 +114,6 @@
 			"desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
 				"Temperatur-",
 				"einheit"
@@ -118,7 +121,6 @@
 			"desc": "Temperatureinheit <C=Celsius, F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
 				"Detaillierte",
 				"Ruheansicht"
@@ -126,23 +128,13 @@
 			"desc": "Detaillierte Anzeige im Ruhemodus"
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
 			"text2": [
 				"Anzeige-",
 				"ausrichtung"
 			],
 			"desc": "Ausrichtung der Anzeige <A=Automatisch, L=Linkshändig, R=Rechtshändig>"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"Boosttaste",
-				"aktiv?"
-			],
-			"desc": "Vordere Taste lange drücken für Temperatur-Boostmodus beim Löten"
-		},
 		"BoostTemperature": {
-			"text": "BTMP",
 			"text2": [
 				"Boosttemp-",
 				"eratur"
@@ -150,7 +142,6 @@
 			"desc": "Temperatur im Boostmodus  (In der eingestellten Einheit)"
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
 				"Start im",
 				"Lötmodus?"
@@ -158,7 +149,6 @@
 			"desc": "Automatischer Start-Modus beim Einschalten der Spannungsversorgung. <T=Lötmodus S=Ruhezustand F=Aus>"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
 				"Abkühl-",
 				"blinken?"
@@ -166,7 +156,6 @@
 			"desc": "Blinkende Temperaturanzeige beim Abkühlen, solange heiß ist."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
 				"Temperatur",
 				"kalibrieren?"
@@ -174,7 +163,6 @@
 			"desc": "Kalibrierung der Lötspitzentemperatur"
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
 				"Einstellungen",
 				"zurücksetzen?"
@@ -182,7 +170,6 @@
 			"desc": "Einstellungen auf werkseinstellungen zurück setzen"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
 				"Eingangsspannung",
 				"kalibrieren?"
@@ -190,7 +177,6 @@
 			"desc": "Kalibrierung der Eingangsspannung. Kurzer Tastendruck zum Einstellen, langer Tastendruck zum Verlassen."
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
 				"Detaillierte",
 				"Lötansicht"
@@ -198,7 +184,6 @@
 			"desc": "Detaillierte Anzeige im Lötmodus"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
 				"Scroll-",
 				"geschw."
@@ -206,7 +191,6 @@
 			"desc": "Scrollgeschwindigkeit der Texte <S=Langsam F=Schnell>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Löt-",
 				"spitze"
@@ -214,7 +198,6 @@
 			"desc": "Auswahl der Lötspitze"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Einfache",
 				"Kalibrierung"
@@ -222,31 +205,20 @@
 			"desc": "Einfache Kalibrierung mittels heißem Wasser"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Erweiterte",
 				"Kalibrierung"
 			],
 			"desc": "Erweiterte Kalibrierung mittels eines Thermoelements an der Lötspitze"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Leistungs-",
 				"Aufnahme"
 			],
 			"desc": "Leistungsaufnahme der verwendeten Spannungsversorgung"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Leistungs-",
-				"Limit An"
-			],
-			"desc": "Leistungslimit aktivieren"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Leistungs-",
 				"Limit"
@@ -254,7 +226,6 @@
 			"desc": "Maximale aufnahme der Lötspitze <Watt>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Taste +-",
 				"Umkehren?"
@@ -262,21 +233,46 @@
 			"desc": "Temperatur-Änderungs-Tasten-Belegung Plus-Minus umkehren?"
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"T. Schritt",
 				"Taste kurz?"
 			],
 			"desc": "Temperaturwechselschritte bei kurzem Tastendruck!"
-		}
-		,
+		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"T. Schritt",
 				"Taste Lang?"
 			],
 			"desc": "Temperaturwechselschritte bei langem Tastendruck!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_en.json

@@ -5,12 +5,12 @@
 	"tempUnitFahrenheit": true,
 	"messages": {
 		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
+		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature, before continuing!",
 		"SettingsResetWarning": "Are you sure you want to reset settings to default values?",
 		"UVLOWarningString": "DC LOW",
 		"UndervoltageString": "Undervoltage",
 		"InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip Temp: ",
+		"WarningTipTempString": "Tip temp: ",
 		"BadTipString": "BAD TIP",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Sleeping...",
@@ -23,8 +23,11 @@
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
 		"ResetOKMessage": "Reset OK",
-		"YourGainMessage": "Your Gain:",
-		"SettingsResetMessage": "Settings were\nreset!"
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -35,42 +38,47 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
 				"Soldering",
-				"Settings"
+				"settings"
 			],
 			"desc": "Soldering settings"
 		},
 		"PowerSavingMenu": {
 			"text2": [
 				"Sleep",
-				"Modes"
+				"modes"
 			],
 			"desc": "Power saving settings"
 		},
 		"UIMenu": {
 			"text2": [
 				"User",
-				"Interface"
+				"interface"
 			],
 			"desc": "User interface settings"
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Advanced",
-				"Options"
+				"options"
 			],
 			"desc": "Advanced options"
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
+		"DCInCutoff": {
 			"text2": [
 				"Power",
 				"source"
@@ -78,119 +86,97 @@
 			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell, disable power limit>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
 				"Sleep",
 				"temp"
 			],
-			"desc": "Sleep Temperature"
+			"desc": "Sleep temperature"
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
 				"Sleep",
 				"timeout"
 			],
-			"desc": "Sleep Timeout <Minutes/Seconds>"
+			"desc": "Sleep timeout <Minutes/Seconds>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
 				"Shutdown",
 				"timeout"
 			],
-			"desc": "Shutdown Timeout <Minutes>"
+			"desc": "Shutdown timeout <Minutes>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
 				"Motion",
 				"sensitivity"
 			],
-			"desc": "Motion Sensitivity <0=Off 1=Least Sensitive 9=Most Sensitive>"
+			"desc": "Motion sensitivity <0=Off 1=Least sensitive 9=Most sensitive>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
 				"Temperature",
-				"units"
+				"unit"
 			],
-			"desc": "Temperature Unit <C=Celsius F=Fahrenheit>"
+			"desc": "Temperature unit <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
 				"Detailed",
 				"idle screen"
 			],
-			"desc": "Display detailed information in a smaller font on the idle screen."
+			"desc": "Display detailed information in a smaller font on the idle screen"
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
 			"text2": [
 				"Display",
 				"orientation"
 			],
-			"desc": "Display Orientation <A=Automatic L=Left Handed R=Right Handed>"
-		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"Boost mode",
-				"enabled"
-			],
-			"desc": "Enable front key long press \"Boost\" mode when soldering"
+			"desc": "Display orientation <A=Automatic L=Left-handed R=Right-handed>"
 		},
 		"BoostTemperature": {
-			"text": "BTMP",
 			"text2": [
 				"Boost",
 				"temp"
 			],
-			"desc": "Temperature when in \"Boost\" mode"
+			"desc": "Temperature when in \"boost mode\""
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
 				"Auto",
 				"start"
 			],
-			"desc": "Automatically starts the iron into soldering on power up <T=Soldering S=Sleep F=Off>"
+			"desc": "Automatically starts the iron into soldering on power up <F=Off T=Soldering S=Sleep O=Sleep at room temperature>"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
 				"Cooldown",
 				"blink"
 			],
-			"desc": "Blink the temperature on the cooling screen while the tip is still hot."
+			"desc": "Blink the temperature on the cooling screen while the tip is still hot"
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
 				"Calibrate",
 				"temperature?"
 			],
-			"desc": "Calibrate tip offset."
+			"desc": "Calibrate tip offset?"
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
 				"Factory",
 				"Reset?"
 			],
-			"desc": "Reset all settings"
+			"desc": "Reset all settings!"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
 				"Calibrate",
 				"input voltage?"
 			],
-			"desc": "VIN Calibration. Buttons adjust, long press to exit"
+			"desc": "VIN Calibration <long press to exit>"
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
 				"Detailed",
 				"solder screen"
@@ -198,84 +184,95 @@
 			"desc": "Display detailed information while soldering"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
 				"Scrolling",
-				"Speed"
+				"speed"
 			],
 			"desc": "Speed this text scrolls past at <S=Slow F=Fast>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Tip",
-				"Model"
+				"model"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Tip model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Simple",
-				"Calibration"
+				"calibration"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Simple calibration using hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Advanced",
-				"Calibration"
+				"calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
-				"Power",
-				"Wattage"
+				"QC",
+				"Voltage"
 			],
-			"desc": "Power Wattage of the power adapter used"
-		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
+			"desc": "Desired max QC Voltage negotiated for"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
-				"Limit"
+				"limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Reverse",
+				"+ - keys"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Reverse assignment of temperature adjustment buttons"
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
-				"short?"
+				"short"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Temperature change steps on short button press"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
-				"long?"
+				"long"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Temperature change steps on long button press"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
-}
+}

Translation Editor/translation_es.json

@@ -23,7 +23,10 @@
 		"OffString": " No",
 		"ResetOKMessage": "Hecho.       ",
 		"YourGainMessage": "Gananc.:",
-		"SettingsResetMessage": "Restablecidos."
+		"SettingsResetMessage": "Ajustes borrados",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -34,9 +37,15 @@
 		"SettingStartSolderingChar": "S",
 		"SettingStartSleepChar": "R",
 		"SettingStartSleepOffChar": "F",
-		"SettingStartNoneChar": "N"
+		"SettingStartNoneChar": "N",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -68,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
+		"DCInCutoff": {
 			"text2": [
 				"Fuente",
 				"de energía"
@@ -77,7 +85,6 @@
 			"desc": "Elige el tipo de fuente para limitar el voltaje <DC 10V> <S 3,3V por pila, ilimitado>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
 				"Temperatura",
 				"en reposo"
@@ -85,7 +92,6 @@
 			"desc": "Temperatura de la punta en reposo."
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
 				"Entrar",
 				"en reposo"
@@ -93,7 +99,6 @@
 			"desc": "Tiempo de inactividad para entrar en reposo <min/seg>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
 				"Tiempo de",
 				"apagado"
@@ -101,7 +106,6 @@
 			"desc": "Tiempo de inactividad para apagarse <en minutos>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
 				"Detección de",
 				"movimiento"
@@ -109,7 +113,6 @@
 			"desc": "Tiempo de reacción al agarrar <0=no 1=menos sensible 9=más sensible>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
 				"Unidad de",
 				"temperatura"
@@ -117,7 +120,6 @@
 			"desc": "Unidad de temperatura <C=centígrados F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
 				"Info extra en",
 				"modo reposo"
@@ -125,23 +127,13 @@
 			"desc": "Muestra información detallada en letra pequeña al reposar."
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
 			"text2": [
 				"Orientación",
 				"de pantalla"
 			],
 			"desc": "Orientación de la pantalla <A=automático I=zurdo D=diestro>"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"Con botón de",
-				"temp. extra"
-			],
-			"desc": "Permite mantener pulsado el primer botón (A) al soldar y calentar momentáneamente un poco más."
-		},
 		"BoostTemperature": {
-			"text": "BTMP",
 			"text2": [
 				"Ajustar la",
 				"temp. extra"
@@ -149,7 +141,6 @@
 			"desc": "Temperatura momentánea que se alcanza al apretar el botón del modo extra."
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
 				"Calentar",
 				"al enchufar"
@@ -157,7 +148,6 @@
 			"desc": "Se calienta él solo al arrancar <S=entrar en modo soldar R=solo entrar en reposo F=en reposo pero mantiene la punta fría N=no>"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
 				"Parpadear",
 				"al enfriar"
@@ -165,7 +155,6 @@
 			"desc": "La temperatura en pantalla parpadea mientras la punta siga caliente."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
 				"Calibrar temp.",
 				"de la punta"
@@ -173,7 +162,6 @@
 			"desc": "Calibra la desviación térmica de la punta."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
 				"Volver a ajustes",
 				"de fábrica"
@@ -181,7 +169,6 @@
 			"desc": "Restablece todos los ajustes a los valores originales."
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
 				"Calibrar voltaje",
 				"de entrada"
@@ -189,7 +176,6 @@
 			"desc": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir."
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
 				"Info extra",
 				"al soldar"
@@ -197,7 +183,6 @@
 			"desc": "Muestra más datos por pantalla cuando se está soldando."
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
 				"Velocidad",
 				"del texto"
@@ -205,7 +190,6 @@
 			"desc": "Velocidad de desplazamiento del texto <R=rápida L=lenta>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Modelo de",
 				"punta"
@@ -213,7 +197,6 @@
 			"desc": "Elegir el modelo de punta actual."
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Calibración",
 				"simple"
@@ -221,31 +204,20 @@
 			"desc": "Calibración simple con agua caliente."
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Calibración",
 				"avanzada"
 			],
 			"desc": "Calibrar con un termopar en la punta; más difícil."
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Potencia de",
 				"entrada"
 			],
 			"desc": "Potencia en vatios del adaptador de corriente utilizado."
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Limitar la",
-				"potenc. máx."
-			],
-			"desc": "Activa el límite de potencia máxima."
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Ajustar la",
 				"potenc. máx."
@@ -253,28 +225,53 @@
 			"desc": "Elige el límite de potencia máxima del soldador <en vatios>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Invertir",
+				"botones +/-"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Intercambia las funciones de subir y bajar la temperatura de los botones +/- para que funcionen al revés."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Cambio temp.",
+				"puls. cortas"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-."
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Cambio temp.",
+				"puls. largas"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Pulsos bat.",
+				"constantes"
+			],
+			"desc": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios."
+		},
+		"TipGain": {
+			"text2": [
+				"Ajustar ganancia",
+				"de punta"
+			],
+			"desc": "Modificar el valor de ganancia de la punta."
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_fi.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "KÄRKI ON IRTI",
 		"SolderingAdvancedPowerPrompt": "Teho: ",
 		"OffString": "OFF",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "O",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "",
+		"DCInCutoff": {
 			"text2": [
 				"Virtalähde",
 				"DC"
@@ -75,7 +85,6 @@
 			"desc": "Käytettävä virtalähde. Asettaa katkaisujänniteen. <DC 10V, 3S=9.9V, 4S=13.2V, 5S=16.5V, 6S=19.8V>"
 		},
 		"SleepTemperature": {
-			"text": "",
 			"text2": [
 				"Lepotilan",
 				"lämpötila"
@@ -83,7 +92,6 @@
 			"desc": "Lepotilan lämpötila. <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
 			"text2": [
 				"Lepotilan",
 				"viive"
@@ -91,7 +99,6 @@
 			"desc": "Lepotilan viive. <minuuttia/sekuntia>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
 			"text2": [
 				"Sammutus",
 				"viive"
@@ -99,7 +106,6 @@
 			"desc": "Automaattisen sammutuksen aikaviive. <minuuttia>"
 		},
 		"MotionSensitivity": {
-			"text": "",
 			"text2": [
 				"Liikkeen",
 				"herkkyys"
@@ -107,7 +113,6 @@
 			"desc": "Liikkeentunnistuksen herkkyys. <0=pois, 1=epäherkin, 9=herkin>"
 		},
 		"TemperatureUnit": {
-			"text": "",
 			"text2": [
 				"Lämpötilan",
 				"yksikkö"
@@ -115,7 +120,6 @@
 			"desc": "Lämpötilan yksikkö. <C=celsius, F=fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
 			"text2": [
 				"Tiedot",
 				"lepotilassa"
@@ -123,23 +127,13 @@
 			"desc": "Näyttää yksityiskohtaisemmat tiedot lepotilassa."
 		},
 		"DisplayRotation": {
-			"text": "",
 			"text2": [
 				"Näytön",
 				"kierto"
 			],
 			"desc": "Näytön kierto. <A=automaattinen O=oikeakätinen V=vasenkätinen>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Tehostus",
-				"käytössä"
-			],
-			"desc": "Etupainikeella siirrytään juotettaessa tehostustilaan."
-		},
 		"BoostTemperature": {
-			"text": "",
 			"text2": [
 				"Tehostus-",
 				"lämpötila"
@@ -147,7 +141,6 @@
 			"desc": "Tehostustilan lämpötila"
 		},
 		"AutoStart": {
-			"text": "",
 			"text2": [
 				"Autom.",
 				"käynnistys"
@@ -155,7 +148,6 @@
 			"desc": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. T=juotostila, S=Lepotila, F=Ei käytössä"
 		},
 		"CooldownBlink": {
-			"text": "",
 			"text2": [
 				"Jäähdytyksen",
 				"vilkutus"
@@ -163,7 +155,6 @@
 			"desc": "Vilkuttaa jäähtyessä juotoskärjen lämpötilaa sen ollessa vielä vaarallisen kuuma."
 		},
 		"TemperatureCalibration": {
-			"text": "",
 			"text2": [
 				"Kalibroi",
 				"lämpötila?"
@@ -171,7 +162,6 @@
 			"desc": "Kalibroi kärjen lämpötilaeron."
 		},
 		"SettingsReset": {
-			"text": "",
 			"text2": [
 				"Palauta",
 				"tehdasasetukset?"
@@ -179,7 +169,6 @@
 			"desc": "Palauta kaikki asetukset oletusarvoihin."
 		},
 		"VoltageCalibration": {
-			"text": "",
 			"text2": [
 				"Kalibroi",
 				"tulojännite?"
@@ -187,7 +176,6 @@
 			"desc": "Tulojännitten kalibrointi (VIN). Painikkeilla säädetään ja pitkään painamalla poistutaan."
 		},
 		"AdvancedSoldering": {
-			"text": "",
 			"text2": [
 				"Tarkempi",
 				"juotosnäyttö"
@@ -195,7 +183,6 @@
 			"desc": "Näyttää yksityiskohtaisemmat tiedot juotostilassa."
 		},
 		"ScrollingSpeed": {
-			"text": "",
 			"text2": [
 				"Tietojen",
 				"näyttönopeus"
@@ -203,7 +190,6 @@
 			"desc": "Näiden selitetekstien vieritysnopeus."
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Tip",
 				"Model"
@@ -211,7 +197,6 @@
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Simple",
 				"Calibration"
@@ -219,31 +204,20 @@
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -251,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -259,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -267,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_fr.json

@@ -3,25 +3,30 @@
 	"languageLocalName": "Français",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration effectuée!",
-		"SettingsCalibrationWarning": "Assurez-vous que la panne soit à température ambiante avant de continuer!",
-		"SettingsResetWarning": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs d'usine?",
+		"SettingsCalibrationDone": "Calibration effectuée !",
+		"SettingsCalibrationWarning": "Assurez-vous que la panne soit à température ambiante avant de continuer !",
+		"SettingsResetWarning": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs d'usine ?",
 		"UVLOWarningString": "DC FAIBL",
 		"UndervoltageString": "Sous-tension",
-		"InputVoltageString": "V d'entrée:",
-		"WarningTipTempString": "Temp. Panne:",
+		"InputVoltageString": "V d'entrée :",
+		"WarningTipTempString": "Temp. Panne :",
 		"BadTipString": "PANNE HS",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "En veille...",
-		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "ATTENTION! CHAUD",
-		"SleepingTipAdvancedString": "Panne:",
-		"IdleTipString": "Tip:",
-		"IdleSetString": " Set:",
+		"WarningSimpleString": "CHAUD !",
+		"WarningAdvancedString": "ATTENTION ! CHAUD !",
+		"SleepingTipAdvancedString": "Panne :",
+		"IdleTipString": "Act :",
+		"IdleSetString": " Reg :",
 		"TipDisconnectedString": "PANNE DÉBRANCHÉE",
-		"SolderingAdvancedPowerPrompt": "Puissance: ",
+		"SolderingAdvancedPowerPrompt": "Puissance : ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Gain :",
+		"SettingsResetMessage": "Réglage réinit. !",
+		"LockingKeysString": "VERROUIL",
+		"UnlockingKeysString": "DEVERROU",
+		"WarningKeysLockedString": "! VERR. !"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "A",
 		"SettingStartSleepChar": "V",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "D"
+		"SettingStartNoneChar": "D",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "V"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "",
+		"DCInCutoff": {
 			"text2": [
 				"Source",
 				"d'alim"
@@ -75,7 +85,6 @@
 			"desc": "Source d'alimentation. Règle la tension de coupure <DC=10V S=3.3V par cellules>"
 		},
 		"SleepTemperature": {
-			"text": "",
 			"text2": [
 				"Temp.",
 				"veille"
@@ -83,7 +92,6 @@
 			"desc": "Température en veille <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
 			"text2": [
 				"Délai",
 				"veille"
@@ -91,7 +99,6 @@
 			"desc": "Délai avant mise en veille <Minutes>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
 			"text2": [
 				"Délai",
 				"extinction"
@@ -99,7 +106,6 @@
 			"desc": "Délai avant extinction <Minutes>"
 		},
 		"MotionSensitivity": {
-			"text": "",
 			"text2": [
 				"Sensibilité",
 				"au mouvement"
@@ -107,7 +113,6 @@
 			"desc": "Sensibilité du capteur de mouvement <0=Inactif 1=Peu sensible 9=Tres sensible>"
 		},
 		"TemperatureUnit": {
-			"text": "",
 			"text2": [
 				"Unité de",
 				"température"
@@ -115,7 +120,6 @@
 			"desc": "Unité de température <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
 			"text2": [
 				"Écran veille",
 				"détaillé"
@@ -123,23 +127,13 @@
 			"desc": "Afficher des informations détaillées lors de la veille."
 		},
 		"DisplayRotation": {
-			"text": "",
 			"text2": [
 				"Orientation",
 				"de l'écran"
 			],
 			"desc": "Orientation de l'affichage <A=Automatique G=Gaucher D=Droitier>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Activation du",
-				"mode Boost"
-			],
-			"desc": "Activer le mode \"Boost\" en maintenant le bouton de devant pendant la soudure"
-		},
 		"BoostTemperature": {
-			"text": "",
 			"text2": [
 				"Temp.",
 				"Boost"
@@ -147,7 +141,6 @@
 			"desc": "Température du mode \"Boost\""
 		},
 		"AutoStart": {
-			"text": "",
 			"text2": [
 				"Démarrage",
 				"automatique"
@@ -155,7 +148,6 @@
 			"desc": "Démarrer automatiquement la soudure a l'allumage <A=Activé, V=Mode Veille, D=Désactivé>"
 		},
 		"CooldownBlink": {
-			"text": "",
 			"text2": [
 				"Refroidir en",
 				"clignotant"
@@ -163,7 +155,6 @@
 			"desc": "Faire clignoter la température lors du refroidissement tant que la panne est chaude."
 		},
 		"TemperatureCalibration": {
-			"text": "",
 			"text2": [
 				"Étalonner",
 				"température"
@@ -171,7 +162,6 @@
 			"desc": "Étalonner température de la panne."
 		},
 		"SettingsReset": {
-			"text": "",
 			"text2": [
 				"Réinitialisation",
 				"d'usine"
@@ -179,7 +169,6 @@
 			"desc": "Réinitialiser tous les réglages"
 		},
 		"VoltageCalibration": {
-			"text": "",
 			"text2": [
 				"Étalonner",
 				"tension d'entrée"
@@ -187,7 +176,6 @@
 			"desc": "Étalonner tension d'entrée. Boutons pour ajuster, appui long pour quitter"
 		},
 		"AdvancedSoldering": {
-			"text": "",
 			"text2": [
 				"Écran soudure",
 				"détaillé"
@@ -195,7 +183,6 @@
 			"desc": "Afficher des informations détaillées pendant la soudure"
 		},
 		"ScrollingSpeed": {
-			"text": "",
 			"text2": [
 				"Vitesse de",
 				"défilement"
@@ -203,15 +190,13 @@
 			"desc": "Vitesse de défilement de ce texte en <R=Rapide L=Lent>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
-				"Panne",
-				"Modèle"
+				"Modèle de",
+				"la panne"
 			],
 			"desc": "Sélection du modèle de la panne"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Calibration",
 				"simple"
@@ -219,60 +204,74 @@
 			"desc": "Calibration simple à l'aide d'eau chaude"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Calibration",
 				"avancées"
 			],
 			"desc": "Calibration avancées à l'aide d'un thermocouple sur la panne"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Puissance de",
 				"l'alimentation"
 			],
 			"desc": "Puissance de l'alimentation utilisée"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Puissance",
+				"limite"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Puissance maximale utilisable <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Inverser les",
+				"touches + - ?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Incrément",
+				"appui court"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Incrément de changement de température sur appui court."
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Incrément",
+				"appui long"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Incrément de changement de température sur appui long."
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Puissance des",
+				"impulsion W"
+			],
+			"desc": "Puissance des impulsions pour éviter la mise en veille des batteries"
+		},
+		"TipGain": {
+			"text2": [
+				"Modifier",
+				"gain panne"
+			],
+			"desc": "Modifier le gain de la panne"
+		},
+		"LockingMode": {
+			"text2": [
+				"Autoriser le",
+				"verrouillage"
+			],
+			"desc": "Permet de verrouiller les touches pendant la soudure sur un appuis long des 2 bouttons <D=Désactiver, B=Boost seulement, V=Verr. total>"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Sensibilité",
+				"capteur effet hall"
+			],
+			"desc": "Sensibilité du capteur à effet Hall lors de la détection de mise en veille <O=Off,L=Low,M=Medium,H=High>"
 		}
 	}
-}
+}

Translation Editor/translation_hr.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "VRH NIJE SPOJEN!",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
+		"DCInCutoff": {
 			"text2": [
 				"Izvor",
 				"napajanja"
@@ -75,7 +85,6 @@
 			"desc": "Izvor napajanja. Postavlja napon isključivanja. <DC 10V> <S 3.3V po ćeliji>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
 				"Temp",
 				"spavanja"
@@ -83,7 +92,6 @@
 			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
 				"Vrijeme",
 				"spavanja"
@@ -91,7 +99,6 @@
 			"desc": "Vrijeme mirovanja nakon kojega lemilica spušta temperaturu. <Minute/Sekunde>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
 				"Vrijeme",
 				"gašenja"
@@ -99,7 +106,6 @@
 			"desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti. <Minute>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
 				"Osjetljivost",
 				"pokreta"
@@ -107,7 +113,6 @@
 			"desc": "Osjetljivost prepoznavanja pokreta. <0=Ugašeno, 1=Najmanje osjetljivo, 9=Najosjetljivije>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
 				"Jedinica",
 				"temperature"
@@ -115,7 +120,6 @@
 			"desc": "Jedinica temperature. <C=Celzij, F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
 				"Detalji",
 				"pri čekanju"
@@ -123,23 +127,13 @@
 			"desc": "Prikazivanje detaljnih informacija tijekom čekanja."
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
 			"text2": [
 				"Rotacija",
 				"ekrana"
 			],
 			"desc": "Orijentacija ekrana. <A=Automatski, L=Ljevoruki, D=Desnoruki>"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"Boost",
-				"način"
-			],
-			"desc": "Držanjem prednjeg gumba prilikom lemljenja aktivira se pojačani (Boost) način."
-		},
 		"BoostTemperature": {
-			"text": "BTMP",
 			"text2": [
 				"Boost",
 				"temp"
@@ -147,7 +141,6 @@
 			"desc": "Temperatura u pojačanom (Boost) načinu."
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
 				"Auto",
 				"start"
@@ -155,7 +148,6 @@
 			"desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati."
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
 				"Upozorenje",
 				"pri hlađenju"
@@ -163,7 +155,6 @@
 			"desc": "Bljeskanje temperature prilikom hlađenja, ako je lemilica vruća."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
 				"Kalibracija",
 				"temperature"
@@ -171,7 +162,6 @@
 			"desc": "Kalibriranje temperature mjeri razliku temperatura vrška i drške, dok je lemilica hladna."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
 				"Tvorničke",
 				"postavke"
@@ -179,7 +169,6 @@
 			"desc": "Vraćanje svih postavki na tvorničke vrijednosti."
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
 				"Kalibracija",
 				"napona napajanja"
@@ -187,7 +176,6 @@
 			"desc": "Kalibracija ulaznog napona. Podešavanje gumbima, dugački pritisak za kraj."
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
 				"Detalji",
 				"pri lemljenju"
@@ -195,7 +183,6 @@
 			"desc": "Prikazivanje detaljnih informacija tijekom lemljenja."
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
 				"Brzina",
 				"poruka"
@@ -203,7 +190,6 @@
 			"desc": "Brzina kretanja dugačkih poruka. <B=brzo, S=sporo>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Model",
 				"Vrha"
@@ -211,7 +197,6 @@
 			"desc": "Odabir modela lemnog vrha"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Jednostavna",
 				"kalibracija"
@@ -219,31 +204,20 @@
 			"desc": "Kalibracija kipućom vodom"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Napredna",
 				"kalibracija"
 			],
 			"desc": "Kalibracija korištenjem termo-elementa"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Snaga",
 				"napajanja"
 			],
 			"desc": "Snaga modula za napajanje"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -251,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -259,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -267,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_hu.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "HEGY LEVÉVE",
 		"SolderingAdvancedPowerPrompt": "Telj: ",
 		"OffString": "Ki",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "J",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": false,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "ÁRAMF",
+		"DCInCutoff": {
 			"text2": [
 				"Áram",
 				"forrás"
@@ -75,7 +85,6 @@
 			"desc": "Áramforrás. Beállítja a lekapcsolási feszültséget. <DC 10V> <S 3.3V cellánként>"
 		},
 		"SleepTemperature": {
-			"text": "AHŐM",
 			"text2": [
 				"Alvási",
 				"hőfok"
@@ -83,7 +92,6 @@
 			"desc": "Alvási hőmérséklet <C>"
 		},
 		"SleepTimeout": {
-			"text": "AIDŐ",
 			"text2": [
 				"Alvás",
 				"időzítő"
@@ -91,7 +99,6 @@
 			"desc": "Alvás időzítő <perc/másodperc>"
 		},
 		"ShutdownTimeout": {
-			"text": "KIIDŐ",
 			"text2": [
 				"Kikapcsolás",
 				"időzítő"
@@ -99,7 +106,6 @@
 			"desc": "Kikapcsolási időzítő <perc>"
 		},
 		"MotionSensitivity": {
-			"text": "MOZGÉR",
 			"text2": [
 				"Mozgás",
 				"érzékenység"
@@ -107,7 +113,6 @@
 			"desc": "Mozgás érzékenység beállítása. <0.kikapcsolva 1.legkevésbé érzékeny 9.legérzékenyebb>"
 		},
 		"TemperatureUnit": {
-			"text": "HŐEGYS",
 			"text2": [
 				"Hőmérséklet",
 				"mértékegysége"
@@ -115,7 +120,6 @@
 			"desc": "Hőmérséklet mértékegysége <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "RÉSZLI",
 			"text2": [
 				"Részletes",
 				"készenlét"
@@ -123,23 +127,13 @@
 			"desc": "Részletes információ megjelenítése kisebb betűméretben a készenléti képernyőn."
 		},
 		"DisplayRotation": {
-			"text": "KIJTÁJ",
 			"text2": [
 				"Kijelző",
 				"tájolása"
 			],
 			"desc": "Kijelző tájolása <A. automatikus B. balkezes J. jobbkezes>"
 		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"Boost",
-				"mód"
-			],
-			"desc": "Elülső gombbal boost módba (450C) lép forrasztás közben"
-		},
 		"BoostTemperature": {
-			"text": "BHŐ",
 			"text2": [
 				"Boost",
 				"hőfok"
@@ -147,7 +141,6 @@
 			"desc": "Hőmérséklet \"boost\" módban"
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
 				"Automatikus",
 				"indítás"
@@ -155,7 +148,6 @@
 			"desc": "Bekapcsolás után automatikusan lépjen forrasztás módba. T=forrasztás, S=alvó mód, F=ki"
 		},
 		"CooldownBlink": {
-			"text": "HŰLÉSV",
 			"text2": [
 				"Villogás",
 				"hűléskor"
@@ -163,7 +155,6 @@
 			"desc": "Villogjon a hőmérséklet hűlés közben, amíg a hegy forró."
 		},
 		"TemperatureCalibration": {
-			"text": "HŐM KAL?",
 			"text2": [
 				"Hőmérséklet",
 				"kalibrálása?"
@@ -171,7 +162,6 @@
 			"desc": "Hegy hőmérséklet-különbségének kalibrálása."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
 				"Gyári",
 				"beállítások?"
@@ -179,7 +169,6 @@
 			"desc": "Beállítások alaphelyzetbe állítása"
 		},
 		"VoltageCalibration": {
-			"text": "VIN KAL?",
 			"text2": [
 				"Bemeneti fesz",
 				"kalibrálása?"
@@ -187,7 +176,6 @@
 			"desc": "Bemeneti feszültség kalibrálása. Röviden megnyomva módosítás, hosszan megnyomva kilépés"
 		},
 		"AdvancedSoldering": {
-			"text": "HALKÉP",
 			"text2": [
 				"Részletes",
 				"forr. kép."
@@ -195,7 +183,6 @@
 			"desc": "Részletes információk megjelenítése forrasztás közben"
 		},
 		"ScrollingSpeed": {
-			"text": "GÖRGS",
 			"text2": [
 				"Görgetés",
 				"sebessége"
@@ -203,7 +190,6 @@
 			"desc": "Szöveggörgetés sebessége"
 		},
 		"TipModel": {
-			"text": "HEGYMOD",
 			"text2": [
 				"Forrasztóhegy",
 				"modell"
@@ -211,7 +197,6 @@
 			"desc": "Forrasztóhegy modell kiválasztása"
 		},
 		"SimpleCalibrationMode": {
-			"text": "EGYSZKAL",
 			"text2": [
 				"Egyszerű",
 				"kalibráció"
@@ -219,60 +204,74 @@
 			"desc": "Egyszerű kalibrálás forró víz segítségével"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "HALKAL",
 			"text2": [
 				"Haladó",
 				"Kalibráció"
 			],
 			"desc": "Haladó kalibrálás hegyre helyezett hőelem segítségével"
 		},
-		"PowerInput": {
-			"text": "TELJW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Bemeneti",
 				"teljesítmény"
 			],
 			"desc": "A tápegység által leadott teljesítmény"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Telj",
+				"maximum"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Maximális teljesitmény beállitása <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"GOMB +-",
+				"Felcseréled?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "A páka hömérséklet növelés csökkentési gombok felcserélése."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Hömérséklet",
+				"váltás rövid?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Hömérséklet váltás rövid gombnyomásrs bekapcsolva!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Hömérséklet",
+				"váltás hosszú?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Hömérséklet váltás hosszú gombnyomásrs bekapcsolva!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Telj power",
+				"bank üzem W"
+			],
+			"desc": "Powerbank üzemnél nem engedi a powerbankot kikapcsolni idönkénti áram felvételt generál. "
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_it.json

@@ -10,9 +10,9 @@
 		"UndervoltageString": "DC INSUFFICIENTE",
 		"InputVoltageString": "V ingresso:",
 		"WarningTipTempString": "Temp punta:",
-		"BadTipString": "PUNTA NO",
+		"BadTipString": "PUNTA KO",
 		"SleepingSimpleString": "Zzz ",
-		"SleepingAdvancedString": "Standby",
+		"SleepingAdvancedString": "Riposo",
 		"WarningSimpleString": "HOT!",
 		"WarningAdvancedString": "PUNTA CALDA!",
 		"SleepingTipAdvancedString": "Punta:",
@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "PUNTA ASSENTE",
 		"SolderingAdvancedPowerPrompt": "Potenz:",
 		"OffString": "OFF",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Guad.: ",
+		"SettingsResetMessage": "Reset effettuato",
+		"LockingKeysString": "Blocc.",
+		"UnlockingKeysString": "Sblocc.",
+		"WarningKeysLockedString": "BLOCCATO"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -29,12 +34,18 @@
 		"SettingAutoChar": "A",
 		"SettingFastChar": "V",
 		"SettingSlowChar": "L",
-		"SettingStartSolderingChar": "A",
-		"SettingStartSleepChar": "S",
-		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "D"
+		"SettingStartSolderingChar": "S",
+		"SettingStartSleepChar": "R",
+		"SettingStartSleepOffChar": "A",
+		"SettingStartNoneChar": "D",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "B",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "A",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "T",
+		"SettingLockFullChar": "C"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "",
+		"DCInCutoff": {
 			"text2": [
 				"Sorgente",
 				"alimentaz"
@@ -75,23 +85,20 @@
 			"desc": "Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia <DC: 10V; S: 3,3V per cella>"
 		},
 		"SleepTemperature": {
-			"text": "",
 			"text2": [
 				"Temp",
-				"standby"
+				"riposo"
 			],
-			"desc": "Imposta la temperatura da mantenere in modalità Standby <°C/°F>"
+			"desc": "Imposta la temperatura da mantenere in modalità Riposo <°C/°F>"
 		},
 		"SleepTimeout": {
-			"text": "",
 			"text2": [
 				"Timer",
-				"standby"
+				"riposo"
 			],
-			"desc": "Imposta il timer per entrare in modalità Standby <minuti/secondi>"
+			"desc": "Imposta il timer per entrare in modalità Riposo <minuti/secondi>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
 			"text2": [
 				"Timer",
 				"spegnimento"
@@ -99,15 +106,13 @@
 			"desc": "Imposta il timer per lo spegnimento <minuti>"
 		},
 		"MotionSensitivity": {
-			"text": "",
 			"text2": [
 				"Sensibilità",
 				"al movimento"
 			],
-			"desc": "Imposta la sensibilità al movimento per uscire dalla modalità Standby <0: nessuna; 1: minima; 9: massima>"
+			"desc": "Imposta la sensibilità al movimento per uscire dalla modalità Riposo <0: nessuna; 1: minima; 9: massima>"
 		},
 		"TemperatureUnit": {
-			"text": "",
 			"text2": [
 				"Unità di",
 				"temperatura"
@@ -115,7 +120,6 @@
 			"desc": "Scegli l'unità di misura per la temperatura <C: grado Celsius; F: grado Farenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
 			"text2": [
 				"Interfaccia",
 				"testuale"
@@ -123,47 +127,34 @@
 			"desc": "Mostra informazioni dettagliate all'interno della schermata principale"
 		},
 		"DisplayRotation": {
-			"text": "",
 			"text2": [
 				"Orientamento",
 				"display"
 			],
 			"desc": "Imposta l'orientamento del display <A: automatico; S: mano sinistra; D: mano destra>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Funzione",
-				"«Turbo»"
-			],
-			"desc": "Attiva la funzione «Turbo», durante la modalità Saldatura, tenendo premuto il tasto superiore"
-		},
 		"BoostTemperature": {
-			"text": "",
 			"text2": [
 				"Temp",
 				"«Turbo»"
 			],
-			"desc": "Imposta la temperatura della funzione «Turbo»"
+			"desc": "Imposta la temperatura della funzione «Turbo» <°C/°F>"
 		},
 		"AutoStart": {
-			"text": "",
 			"text2": [
 				"Avvio",
 				"automatico"
 			],
-			"desc": "Attiva automaticamente il saldatore quando viene alimentato <A: saldatura; S: standby; D: disattiva>"
+			"desc": "Attiva automaticamente il saldatore quando viene alimentato <D: disattiva; S: saldatura; R: riposo; A: temperatura ambiente>"
 		},
 		"CooldownBlink": {
-			"text": "",
 			"text2": [
 				"Avviso",
 				"punta calda"
 			],
-			"desc": "Mostra, lampeggiante, la temperatura durante il raffreddamento se la punta è ancora calda"
+			"desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda"
 		},
 		"TemperatureCalibration": {
-			"text": "",
 			"text2": [
 				"Calibrazione",
 				"temperatura"
@@ -171,7 +162,6 @@
 			"desc": "Calibra le rilevazioni di temperatura"
 		},
 		"SettingsReset": {
-			"text": "",
 			"text2": [
 				"Ripristino",
 				"impostazioni"
@@ -179,7 +169,6 @@
 			"desc": "Ripristina tutte le impostazioni"
 		},
 		"VoltageCalibration": {
-			"text": "",
 			"text2": [
 				"Calibrazione",
 				"tensione"
@@ -187,7 +176,6 @@
 			"desc": "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire"
 		},
 		"AdvancedSoldering": {
-			"text": "",
 			"text2": [
 				"Dettagli",
 				"saldatura"
@@ -195,7 +183,6 @@
 			"desc": "Mostra informazioni dettagliate durante la modalità Saldatura"
 		},
 		"ScrollingSpeed": {
-			"text": "",
 			"text2": [
 				"Velocità",
 				"testo"
@@ -203,7 +190,6 @@
 			"desc": "Imposta la velocità di scorrimento del testo <L: lento; V: veloce>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Modello",
 				"punta"
@@ -211,7 +197,6 @@
 			"desc": "Seleziona il modello della punta in uso"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Calibrazione",
 				"semplice"
@@ -219,60 +204,74 @@
 			"desc": "Calibra le rilevazioni di temperatura tramite l'utilizzo di acqua calda"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Calibrazione",
 				"avanzata"
 			],
 			"desc": "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
-				"Potenza",
-				"alimentaz"
+				"Voltaggio",
+				"Quick Charge"
 			],
-			"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
-		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
+			"desc": "Imposta il massimo voltaggio necessario alla negoziazione con un alimentatore Quick Charge"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Limite",
+				"potenza"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Imposta il valore di potenza massima erogabile al saldatore <watt>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Inversione",
+				"tasti"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Inverti i tasti per aumentare o diminuire la temperatura della punta"
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Temp passo",
+				"breve"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Imposta il «passo» dei valori di temperatura ad una breve pressione dei tasti"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Temp passo",
+				"lungo"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Imposta il «passo» dei valori di temperatura ad una lunga pressione dei tasti"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Potenza",
+				"impulso"
+			],
+			"desc": "Regola la potenza d'impulso per prevenire lo standby eventuale dell'alimentatore <watt>"
+		},
+		"TipGain": {
+			"text2": [
+				"Guadagno",
+				"punta"
+			],
+			"desc": "Varia il guadagno della punta"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Effetto",
+				"Hall"
+			],
+			"desc": "Regola la sensibilità alla rilevazione di supporti metallici per entrare in modalità Riposo <O: OFF; B: bassa; M: media; A: alta>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Blocco",
+				"tasti"
+			],
+			"desc": "Blocca i tasti durante la modalità Saldatura; tieni premuto entrambi per bloccare/sbloccare <D: disattiva; T: blocca «Turbo»; C: blocco completo>"
 		}
 	}
-}
+}

Translation Editor/translation_lt.json

@@ -3,38 +3,49 @@
 	"languageLocalName": "Lietuvių",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Kalibracija atlikta!",
+		"SettingsCalibrationDone": "Kalibravimas atliktas!",
 		"SettingsCalibrationWarning": "Prieš tęsdami įsitikinkite, kad antgalis yra kambario temperatūros!",
 		"SettingsResetWarning": "Ar norite atstatyti nustatymus į numatytas reikšmes?",
 		"UVLOWarningString": "MAŽ VOLT",
 		"UndervoltageString": "Žema įtampa",
 		"InputVoltageString": "Įvestis V: ",
-		"WarningTipTempString": "Antgl Temp: ",
+		"WarningTipTempString": "Angal Temp: ",
 		"BadTipString": "BLOG ANT",
 		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Miegu...",
 		"WarningSimpleString": "KRŠ!",
 		"WarningAdvancedString": "ANTGALIS KARŠTAS",
-		"SleepingTipAdvancedString": "Antgl:",
+		"SleepingTipAdvancedString": "Angal:",
 		"IdleTipString": "Ant:",
 		"IdleSetString": " Nust:",
-		"TipDisconnectedString": "ANTGAL ATJUNGTAS",
+		"TipDisconnectedString": "NĖRA ANTGALIO",
 		"SolderingAdvancedPowerPrompt": "Maitinimas: ",
 		"OffString": "Išj",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Gain:",
+		"SettingsResetMessage": "Nust. atstatyti!",
+		"LockingKeysString": " UŽRAKIN",
+		"UnlockingKeysString": "ATRAKIN",
+		"WarningKeysLockedString": "!UŽRAK!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "K",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "T",
-		"SettingSlowChar": "N",
+		"SettingFastChar": "G",
+		"SettingSlowChar": "L",
 		"SettingStartSolderingChar": "T",
-		"SettingStartSleepChar": "S",
-		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartSleepChar": "M",
+		"SettingStartSleepOffChar": "K",
+		"SettingStartNoneChar": "N",
+		"SettingSensitivityOff": "I",
+		"SettingSensitivityLow": "Ž",
+		"SettingSensitivityMedium": "V",
+		"SettingSensitivityHigh": "A",
+		"SettingLockDisableChar": "I",
+		"SettingLockBoostChar": "T",
+		"SettingLockFullChar": "V"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -48,7 +59,7 @@
 				"Miego",
 				"režimai"
 			],
-			"desc": "Energijos vartojimo nustatymai"
+			"desc": "Energijos tausojimo nustatymai"
 		},
 		"UIMenu": {
 			"text2": [
@@ -59,39 +70,35 @@
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Išplėstin.",
+				"Išplėsti.",
 				"nustatymai"
 			],
 			"desc": "Išplėstiniai nustatymai"
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "",
+		"DCInCutoff": {
 			"text2": [
 				"Maitinimo",
 				"šaltinis"
 			],
-			"desc": "Išjungimo įtampa. <DC 10V arba celių (S) kiekis (3.3V per celę)>"
+			"desc": "Išjungimo įtampa. <DC 10V> arba celių (S) kiekis (3.3V per celę)>"
 		},
 		"SleepTemperature": {
-			"text": "",
 			"text2": [
 				"Miego",
 				"temperat."
 			],
-			"desc": "Miego temperatūra <C>"
+			"desc": "Miego temperatūra"
 		},
 		"SleepTimeout": {
-			"text": "",
 			"text2": [
 				"Miego",
 				"laikas"
 			],
-			"desc": "Miego laikas <minutės/sekundės>"
+			"desc": "Užmigimo laikas <sekundės/minutės>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
 			"text2": [
 				"Išjungimo",
 				"laikas"
@@ -99,47 +106,34 @@
 			"desc": "Išjungimo laikas <minutės>"
 		},
 		"MotionSensitivity": {
-			"text": "",
 			"text2": [
-				"Jautrumas",
-				"judesiui"
+				"Judesio",
+				"jautrumas"
 			],
-			"desc": "Jautrumas judesiui <0 - išjungta, 1 - mažiausias, 9 - didžiausias>"
+			"desc": "Judesio jautrumas <0=Išjungta, 1=Mažiausias, 9=Didžiausias>"
 		},
 		"TemperatureUnit": {
-			"text": "",
 			"text2": [
 				"Temperatūros",
 				"vienetai"
 			],
-			"desc": "Temperatūros vienetai <C - Celsijus, F - Farenheitas>"
+			"desc": "Temperatūros vienetai <C=Celsijus, F=Farenheitas>"
 		},
 		"AdvancedIdle": {
-			"text": "",
 			"text2": [
-				"Detalus lauki",
-				"mo ekranas"
+				"Detalus lau-",
+				"kimo ekranas"
 			],
 			"desc": "Ar rodyti papildomą informaciją mažesniu šriftu laukimo ekrane"
 		},
 		"DisplayRotation": {
-			"text": "",
 			"text2": [
 				"Ekrano",
 				"orientacija"
 			],
-			"desc": "Ekrano orientacija <A - automatinė, K - kairiarankiams, D - dešiniarankiams>"
-		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Turbo režimas",
-				"įjungtas"
-			],
-			"desc": "Ar lituojant viršutinis mygtukas įjungia turbo režimą"
+			"desc": "Ekrano orientacija <A=Automatinė, K=Kairiarankiams, D=Dešiniarankiams>"
 		},
 		"BoostTemperature": {
-			"text": "",
 			"text2": [
 				"Turbo",
 				"temperat."
@@ -147,15 +141,13 @@
 			"desc": "Temperatūra turbo režimu"
 		},
 		"AutoStart": {
-			"text": "",
 			"text2": [
 				"Auto",
 				"paleidimas"
 			],
-			"desc": "Ar pradėti kaitininti iš karto įjungus lituoklį"
+			"desc": "Ar pradėti kaitininti iš karto įjungus lituoklį <N=Ne, T=Taip, M=Miegas, K=Miegoti kambario temperatūroje>"
 		},
 		"CooldownBlink": {
-			"text": "",
 			"text2": [
 				"Atvėsimo",
 				"mirksėjimas"
@@ -163,7 +155,6 @@
 			"desc": "Ar mirksėti temperatūrą ekrane kol vėstantis antgalis vis dar karštas"
 		},
 		"TemperatureCalibration": {
-			"text": "",
 			"text2": [
 				"Kalibruoti",
 				"temperatūrą?"
@@ -171,7 +162,6 @@
 			"desc": "Antgalio temperatūros kalibravimas"
 		},
 		"SettingsReset": {
-			"text": "",
 			"text2": [
 				"Atstatyti",
 				"nustatymus?"
@@ -179,7 +169,6 @@
 			"desc": "Nustatyti nustatymus iš naujo"
 		},
 		"VoltageCalibration": {
-			"text": "",
 			"text2": [
 				"Kalibruoti",
 				"įvesties įtampą?"
@@ -187,7 +176,6 @@
 			"desc": "Įvesties įtampos kalibravimas. Trumpai paspauskite, norėdami nustatyti, ilgai paspauskite, kad išeitumėte"
 		},
 		"AdvancedSoldering": {
-			"text": "",
 			"text2": [
 				"Detalus lita-",
 				"vimo ekranas"
@@ -195,15 +183,13 @@
 			"desc": "Ar rodyti išsamią informaciją lituojant"
 		},
 		"ScrollingSpeed": {
-			"text": "",
 			"text2": [
-				"Greitas apr",
-				"ašym. slink"
+				"Aprašymo",
+				"greitis"
 			],
 			"desc": "Greitis, kuriuo šis tekstas slenka"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Antgalio",
 				"modelis"
@@ -211,68 +197,81 @@
 			"desc": "Antgalio modelio pasirinkimas"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
-				"Paprasta",
-				"kalibracija"
+				"Paprastas",
+				"kalibravimas"
 			],
-			"desc": "Paprasta kalibracija naudojant karštą vandienį"
+			"desc": "Paprastas kalibravimas naudojant karštą vandienį"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
-				"Išplėstinė",
-				"kalibracija"
+				"Išplėstinis",
+				"kalibravimas"
 			],
-			"desc": "Išplėstinė kalibracija naudojant termoelementą"
+			"desc": "Išplėstinis kalibravimas naudojant termoelementą"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
-				"Galia",
-				"vatais"
+				"QC maitinimo",
+				"bloko įtampa"
 			],
-			"desc": "Maitinimo bloko galia vatais"
-		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
+			"desc": "Maksimali QC maitinimo bloko įtampa"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Galios",
+				"riba"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Didžiausia galia, kurią gali naudoti lituoklis <Vatai>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Sukeisti + -",
+				"mygtukus?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Sukeisti + - temperatūros keitimo mygtukus vietomis."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Temp. keitimas",
+				"trumpas spust."
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Temperatūros keitimo žingsnis trumpai spustėlėjus mygtuką!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Temp. keitimas",
+				"ilgas pasp."
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Temperatūros keitimo žingsnis ilgai paspaudus mygtuką!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Holo",
+				"jutiklis"
+			],
+			"desc": "Holo jutiklio jautrumas nustatant miegą <I=Išjungtas, Ž=Žemas, V=Vidutinis, A=Aukštas>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Mygtukų",
+				"užraktas"
+			],
+			"desc": "Lituodami, ilgai paspauskite abu mygtukus, kad juos užrakintumėte <I=Išjungta, T=Tik turbo režimas, V=Visiškas užrakinimas>"
 		}
 	}
-}
+}

Translation Editor/translation_nl.json

@@ -1,278 +1,277 @@
-{
-	"languageCode": "NL",
-	"languageLocalName": "Nederlands",
-	"cyrillicGlyphs": false,
-	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "Zorg ervoor dat de soldeerpunt op kamertemperatuur is voor je verdergaat!",
-		"SettingsResetWarning": "Ben je zeker dat je alle instellingen naar de standaardwaardes wilt terugzetten?",
-		"UVLOWarningString": "DC LAAG",
-		"UndervoltageString": "Onderspanning",
-		"InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip Temp: ",
-		"BadTipString": "DEFECT",
-		"SleepingSimpleString": "Zzz ",
-		"SleepingAdvancedString": "Slaapstand...",
-		"WarningSimpleString": "HEET",
-		"WarningAdvancedString": "!!! TIP HEET !!!",
-		"SleepingTipAdvancedString": "Tip:",
-		"IdleTipString": "Tip:",
-		"IdleSetString": " Set:",
-		"TipDisconnectedString": "TIP LOSGEKOPPELD",
-		"SolderingAdvancedPowerPrompt": "vermogen: ",
-		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
-	},
-	"characters": {
-		"SettingRightChar": "R",
-		"SettingLeftChar": "L",
-		"SettingAutoChar": "A",
-		"SettingFastChar": "F",
-		"SettingSlowChar": "S",
-		"SettingStartSolderingChar": "T",
-		"SettingStartSleepChar": "S",
-		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
-	},
-	"menuDouble": true,
-	"menuGroups": {
-		"SolderingMenu": {
-			"text2": [
-				"Soldeer",
-				"Instellingen"
-			],
-			"desc": "Soldeerinstellingen"
-		},
-		"PowerSavingMenu": {
-			"text2": [
-				"Slaap",
-				"Modes"
-			],
-			"desc": "Batterijbesparingsinstellingen"
-		},
-		"UIMenu": {
-			"text2": [
-				"Gebruikers-",
-				"Interface"
-			],
-			"desc": "Gebruikersinterface Instellingen"
-		},
-		"AdvancedMenu": {
-			"text2": [
-				"geavanceerde",
-				"Instellingen"
-			],
-			"desc": "geavanceerde Instellingen"
-		}
-	},
-	"menuOptions": {
-		"PowerSource": {
-			"text": "",
-			"text2": [
-				"Spannings-",
-				"bron"
-			],
-			"desc": "Spanningsbron. Stelt drempelspanning in. <DC 10V> <S 3.3V per cel>"
-		},
-		"SleepTemperature": {
-			"text": "",
-			"text2": [
-				"Slaap",
-				"temp"
-			],
-			"desc": "Temperatuur in slaapstand <C>"
-		},
-		"SleepTimeout": {
-			"text": "",
-			"text2": [
-				"Slaap",
-				"time-out"
-			],
-			"desc": "Slaapstand time-out <Minuten/Seconden>"
-		},
-		"ShutdownTimeout": {
-			"text": "",
-			"text2": [
-				"Uitschakel",
-				"time-out"
-			],
-			"desc": "Automatisch afsluiten time-out <Minuten>"
-		},
-		"MotionSensitivity": {
-			"text": "",
-			"text2": [
-				"Bewegings-",
-				"gevoeligheid"
-			],
-			"desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>"
-		},
-		"TemperatureUnit": {
-			"text": "",
-			"text2": [
-				"Temperatuur",
-				"eenheid"
-			],
-			"desc": "Temperatuureenheid <C=Celsius F=Fahrenheit>"
-		},
-		"AdvancedIdle": {
-			"text": "",
-			"text2": [
-				"Gedetailleerd",
-				"slaapscherm"
-			],
-			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het slaapscherm."
-		},
-		"DisplayRotation": {
-			"text": "",
-			"text2": [
-				"Scherm-",
-				"oriëntatie"
-			],
-			"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>"
-		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Boostmodes",
-				"ingeschakeld?"
-			],
-			"desc": "Soldeerbout gaat naar een hogere boost-temperatuur wanneer de voorste knop ingedrukt is."
-		},
-		"BoostTemperature": {
-			"text": "",
-			"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Temperatuur in boostmodes"
-		},
-		"AutoStart": {
-			"text": "",
-			"text2": [
-				"Auto",
-				"start"
-			],
-			"desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit"
-		},
-		"CooldownBlink": {
-			"text": "",
-			"text2": [
-				"Afkoel",
-				"flikker"
-			],
-			"desc": "Temperatuur laten flikkeren in het hoofdmenu als de soldeerpunt aan het afkoelen is."
-		},
-		"TemperatureCalibration": {
-			"text": "",
-			"text2": [
-				"Calibreer",
-				"temperatuur?"
-			],
-			"desc": "Temperatuursafwijking van de soldeerpunt calibreren."
-		},
-		"SettingsReset": {
-			"text": "",
-			"text2": [
-				"Instellingen",
-				"resetten?"
-			],
-			"desc": "Alle instellingen terugzetten."
-		},
-		"VoltageCalibration": {
-			"text": "",
-			"text2": [
-				"Calibreer",
-				"input-voltage?"
-			],
-			"desc": "VIN Calibreren. Knoppen lang ingedrukt houden om te bevestigen."
-		},
-		"AdvancedSoldering": {
-			"text": "",
-			"text2": [
-				"Gedetailleerd",
-				"soldeerscherm"
-			],
-			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm."
-		},
-		"ScrollingSpeed": {
-			"text": "",
-			"text2": [
-				"Scroll",
-				"snelheid"
-			],
-			"desc": "Snelheid waarmee de tekst scrolt."
-		},
-		"TipModel": {
-			"text": "TIPMO",
-			"text2": [
-				"Tip",
-				"Model"
-			],
-			"desc": "Tip Model selection"
-		},
-		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
-			"text2": [
-				"Simple",
-				"Calibration"
-			],
-			"desc": "Simple Calibration using Hot water"
-		},
-		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
-			"text2": [
-				"Advanced",
-				"Calibration"
-			],
-			"desc": "Advanced calibration using thermocouple on the tip"
-		},
-		"PowerInput": {
-			"text": "PWRW",
-			"text2": [
-				"Power",
-				"Wattage"
-			],
-			"desc": "Power Wattage of the power adapter used"
-		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
-		"PowerLimit": {
-			"text": "PLIM",
-			"text2": [
-				"Power",
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
-		},
-		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
-			"text2": [
-				"Key +-",
-				"reverse?"
-			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
-		},
-		"TempChangeShortStep": {
-			"text": "TCHGST",
-			"text2": [
-				"Temp change",
-				"short?"
-			],
-			"desc": "Temperature change steps on short button press!"
-		},
-		"TempChangeLongStep": {
-			"text": "TCHGLT",
-			"text2": [
-				"Temp change",
-				"long?"
-			],
-			"desc": "Temperature change steps on long button press!"
-		}
-	}
+{
+	"languageCode": "NL",
+	"languageLocalName": "Nederlands",
+	"cyrillicGlyphs": false,
+	"messages": {
+		"SettingsCalibrationDone": "Calibratie klaar!",
+		"SettingsCalibrationWarning": "Zorg ervoor dat te punt op kamertemperatuur is voor je verder gaat!",
+		"SettingsResetWarning": "Weet je zeker dat je de fabrieksinstellingen terug wil zetten?",
+		"UVLOWarningString": "DC Laag",
+		"UndervoltageString": "Onderspanning",
+		"InputVoltageString": "Input V: ",
+		"WarningTipTempString": "Punt temp: ",
+		"BadTipString": "DEFECTE PUNT",
+		"SleepingSimpleString": "Zzzz",
+		"SleepingAdvancedString": "Slaapstand...",
+		"WarningSimpleString": "HEET!",
+		"WarningAdvancedString": "!!! PUNT HOT !!!",
+		"SleepingTipAdvancedString": "Punt:",
+		"IdleTipString": "Punt:",
+		"IdleSetString": " Zet:",
+		"TipDisconnectedString": "PUNT LOSGEKOPPELT",
+		"SolderingAdvancedPowerPrompt": "Vermogen: ",
+		"OffString": "Uit",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Niveau:",
+		"SettingsResetMessage": "Instellingen zijn\ngereset!",
+		"LockingKeysString": " GEBLOKKEERD",
+		"UnlockingKeysString": "GEDEBLOKKEERD",
+		"WarningKeysLockedString": "!GEBLOKKEERD!"
+	},
+	"characters": {
+		"SettingRightChar": "R",
+		"SettingLeftChar": "L",
+		"SettingAutoChar": "A",
+		"SettingFastChar": "F",
+		"SettingSlowChar": "S",
+		"SettingStartSolderingChar": "T",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "O",
+		"SettingStartNoneChar": "F",
+		"SettingLockDisableChar": "U",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "V",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H"
+	},
+	"menuGroups": {
+		"SolderingMenu": {
+			"text2": [
+				"Soldeer",
+				"Instellingen"
+			],
+			"desc": "Soldeer instellingen"
+		},
+		"PowerSavingMenu": {
+			"text2": [
+				"Slaap",
+				"Modes"
+			],
+			"desc": "Stroom besparings instellingen"
+		},
+		"UIMenu": {
+			"text2": [
+				"Gebruikers-",
+				"interface"
+			],
+			"desc": "Gebruikers-interface instellingen"
+		},
+		"AdvancedMenu": {
+			"text2": [
+				"Geavanceerde",
+				"Instellingen"
+			],
+			"desc": "Geavanceerde Instellingen"
+		}
+	},
+	"menuOptions": {
+		"DCInCutoff": {
+			"text2": [
+				"Spannings-",
+				"bron"
+			],
+			"desc": "Spanningsbron. Stelt drempelspanning in. <DC 10V> <S 3.3V per cel>"
+		},
+		"SleepTemperature": {
+			"text2": [
+				"Slaap",
+				"temp"
+			],
+			"desc": "Temperatuur in slaapstand"
+		},
+		"SleepTimeout": {
+			"text2": [
+				"Slaap",
+				"time-out"
+			],
+			"desc": "Slaap time-out <Minuten/Seconden>"
+		},
+		"ShutdownTimeout": {
+			"text2": [
+				"Uitschakel",
+				"time-out"
+			],
+			"desc": "Automatisch afsluiten time-out <Minuten>"
+		},
+		"MotionSensitivity": {
+			"text2": [
+				"Bewegings-",
+				"gevoeligheid"
+			],
+			"desc": "Bewegingsgevoeligheid <0=uit 1=minst gevoelig 9=meest gevoelig>"
+		},
+		"TemperatureUnit": {
+			"text2": [
+				"Temperatuur",
+				"eenheid"
+			],
+			"desc": "Temperatuureenheid <C=Celsius F=Fahrenheit>"
+		},
+		"AdvancedIdle": {
+			"text2": [
+				"Gedetailleerd",
+				"startscherm"
+			],
+			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het startscherm."
+		},
+		"DisplayRotation": {
+			"text2": [
+				"Scherm-",
+				"oriëntatie"
+			],
+			"desc": "Schermoriëntatie <A=Automatisch L=Linkshandig R=Rechtshandig>"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"Boost",
+				"temp"
+			],
+			"desc": "Temperatuur in boostmode"
+		},
+		"AutoStart": {
+			"text2": [
+				"Auto",
+				"start"
+			],
+			"desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. <T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit>"
+		},
+		"CooldownBlink": {
+			"text2": [
+				"Afkoel",
+				"flikker"
+			],
+			"desc": "Temperatuur laten flikkeren in het hoofdmenu als de soldeerpunt aan het afkoelen is."
+		},
+		"TemperatureCalibration": {
+			"text2": [
+				"Calibreer",
+				"temperatuur?"
+			],
+			"desc": "Temperatuursafwijking van de soldeerpunt calibreren."
+		},
+		"SettingsReset": {
+			"text2": [
+				"Instellingen",
+				"resetten?"
+			],
+			"desc": "Alle instellingen terugzetten."
+		},
+		"VoltageCalibration": {
+			"text2": [
+				"Calibreer",
+				"input-voltage?"
+			],
+			"desc": "VIN Calibreren. <druk lang om te sluiten>."
+		},
+		"AdvancedSoldering": {
+			"text2": [
+				"Gedetailleerd",
+				"soldeerscherm"
+			],
+			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm."
+		},
+		"ScrollingSpeed": {
+			"text2": [
+				"Scroll",
+				"snelheid"
+			],
+			"desc": "Snelheid waarmee de tekst scrolt."
+		},
+		"TipModel": {
+			"text2": [
+				"Punt",
+				"Model"
+			],
+			"desc": "Punt Model selecteren"
+		},
+		"SimpleCalibrationMode": {
+			"text2": [
+				"Simpele",
+				"Calibratie"
+			],
+			"desc": "Simpele Calibratie met warm water"
+		},
+		"AdvancedCalibrationMode": {
+			"text2": [
+				"Geavanceerde",
+				"Calibratie"
+			],
+			"desc": "Geavanceerde calibratie met een thermokoppel op de punt"
+		},
+		"QCMaxVoltage": {
+			"text2": [
+				"Power",
+				"Wattage"
+			],
+			"desc": "Wattage van de gebruikte voeding"
+		},
+		"PowerLimit": {
+			"text2": [
+				"Vermogen",
+				"limiet"
+			],
+			"desc": "Maximaal vermogen <Watts>"
+		},
+		"ReverseButtonTempChange": {
+			"text2": [
+				"Draai",
+				"+ - knoppen om"
+			],
+			"desc": "Keer de +- knoppen om de termperatuur van de punt te regelen om."
+		},
+		"TempChangeShortStep": {
+			"text2": [
+				"Temp veranderen",
+				"kort"
+			],
+			"desc": "Temperatuur verandering bij kort drukken"
+		},
+		"TempChangeLongStep": {
+			"text2": [
+				"Temp veranderen",
+				"lang"
+			],
+			"desc": "Temperatuur verandering bij lang drukken"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Vermogen",
+				"Puls W"
+			],
+			"desc": "Vermogen van puls om soldeerbout aan te houden"
+		},
+		"TipGain": {
+			"text2": [
+				"Verander",
+				"punt gain"
+			],
+			"desc": "Punt gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Blokkeer",
+				"knoppen"
+			],
+			"desc": "Tijdens solderen lang op beide knoppen drukken, blokkeert ze. <U=Uit, B=Alleen boost, V=Volledig blokkeren>"
+		}
+	}
 }

Translation Editor/translation_nl_be.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "Punt ONTKOPPELD",
 		"SolderingAdvancedPowerPrompt": "Vermogen: ",
 		"OffString": "Uit",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "",
+		"DCInCutoff": {
 			"text2": [
 				"Spannings-",
 				"bron"
@@ -75,7 +85,6 @@
 			"desc": "Spanningsbron. Stelt minimumspanning in. <DC 10V> <S 3.3V per cel>"
 		},
 		"SleepTemperature": {
-			"text": "",
 			"text2": [
 				"Slaap",
 				"temp"
@@ -83,7 +92,6 @@
 			"desc": "Temperatuur in slaapstand <°C>"
 		},
 		"SleepTimeout": {
-			"text": "",
 			"text2": [
 				"Slaap",
 				"time-out"
@@ -91,7 +99,6 @@
 			"desc": "Slaapstand time-out <Minuten/Seconden>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
 			"text2": [
 				"Uitschakel",
 				"time-out"
@@ -99,7 +106,6 @@
 			"desc": "Automatisch afsluiten time-out <Minuten>"
 		},
 		"MotionSensitivity": {
-			"text": "",
 			"text2": [
 				"Bewegings-",
 				"gevoeligheid"
@@ -107,7 +113,6 @@
 			"desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>"
 		},
 		"TemperatureUnit": {
-			"text": "",
 			"text2": [
 				"Temperatuur",
 				"schaal"
@@ -115,7 +120,6 @@
 			"desc": "Temperatuurschaal <°C=Celsius °F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
 			"text2": [
 				"Gedetailleerd",
 				"slaapscherm"
@@ -123,23 +127,13 @@
 			"desc": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm."
 		},
 		"DisplayRotation": {
-			"text": "",
 			"text2": [
 				"Scherm-",
 				"oriëntatie"
 			],
 			"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Temperatuurverhoging",
-				"ingeschakeld?"
-			],
-			"desc": "Temperatuur verhoogt als voorste knop is ingedrukt"
-		},
 		"BoostTemperature": {
-			"text": "",
 			"text2": [
 				"Verhogings",
 				"temp"
@@ -147,7 +141,6 @@
 			"desc": "Verhogingstemperatuur"
 		},
 		"AutoStart": {
-			"text": "",
 			"text2": [
 				"Auto",
 				"start"
@@ -155,7 +148,6 @@
 			"desc": "Breng de soldeerbout op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit"
 		},
 		"CooldownBlink": {
-			"text": "",
 			"text2": [
 				"Afkoel",
 				"knipper"
@@ -163,7 +155,6 @@
 			"desc": "Temperatuur knippert in hoofdmenu tijdens afkoeling."
 		},
 		"TemperatureCalibration": {
-			"text": "",
 			"text2": [
 				"Calibreer",
 				"temperatuur?"
@@ -171,7 +162,6 @@
 			"desc": "Temperatuur van de punt calibreren."
 		},
 		"SettingsReset": {
-			"text": "",
 			"text2": [
 				"Instellingen",
 				"resetten?"
@@ -179,7 +169,6 @@
 			"desc": "Alle instellingen resetten."
 		},
 		"VoltageCalibration": {
-			"text": "",
 			"text2": [
 				"Calibreer",
 				"voedingsspanning?"
@@ -187,7 +176,6 @@
 			"desc": "VIN Calibreren. Bevestigen door knoppen lang in te drukken."
 		},
 		"AdvancedSoldering": {
-			"text": "",
 			"text2": [
 				"Gedetailleerd",
 				"soldeerscherm"
@@ -195,7 +183,6 @@
 			"desc": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
 		},
 		"ScrollingSpeed": {
-			"text": "",
 			"text2": [
 				"Scrol",
 				"snelheid"
@@ -203,7 +190,6 @@
 			"desc": "Scrolsnelheid van de tekst."
 		},
 		"TipModel": {
-			"text": "PUNTMO",
 			"text2": [
 				"Punt",
 				"Model"
@@ -211,7 +197,6 @@
 			"desc": "Gekozen punt"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Eenvoudige",
 				"Calibrering"
@@ -219,31 +204,20 @@
 			"desc": "Calibrering met heet water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Gevorderde",
 				"Calibrering"
 			],
 			"desc": "Calibrering met thermokoppel"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Vermogen",
 				"Watt"
 			],
 			"desc": "Vermogen van de adapter"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -251,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -259,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -267,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_no.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "SPISS FRAKOBLET",
 		"SolderingAdvancedPowerPrompt": "Effekt: ",
 		"OffString": "Av",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "H",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "L",
 		"SettingStartSleepChar": "D",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "I"
+		"SettingStartNoneChar": "I",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": false,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,24 +77,21 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "Kilde",
+		"DCInCutoff": {
 			"text2": [
-				"",
+				"Kilde",
 				""
 			],
 			"desc": "Strømforsyning. Sett nedre spenning for automatisk nedstenging. <DC 10V <S 3.3V per celle"
 		},
 		"SleepTemperature": {
-			"text": "DTmp",
 			"text2": [
-				"",
+				"DTmp",
 				""
 			],
-			"desc": "Dvaletemperatur <C"
+			"desc": "Dvaletemperatur <C>"
 		},
 		"SleepTimeout": {
-			"text": "DTid",
 			"text2": [
 				"",
 				""
@@ -91,119 +99,97 @@
 			"desc": "Tid før dvale <Minutter/Sekunder"
 		},
 		"ShutdownTimeout": {
-			"text": "AvTid",
 			"text2": [
-				"",
+				"AvTid",
 				""
 			],
 			"desc": "Tid før automatisk nedstenging <Minutter"
 		},
 		"MotionSensitivity": {
-			"text": "BSensr",
 			"text2": [
-				"",
+				"BSensr",
 				""
 			],
 			"desc": "Bevegelsesfølsomhet <0.Inaktiv 1.Minst følsom 9.Mest følsom"
 		},
 		"TemperatureUnit": {
-			"text": "TmpEnh",
 			"text2": [
-				"",
+				"TmpEnh",
 				""
 			],
 			"desc": "Temperaturskala <C=Celsius F=Fahrenheit"
 		},
 		"AdvancedIdle": {
-			"text": "AvDvSk",
 			"text2": [
-				"",
+				"AvDvSk",
 				""
 			],
 			"desc": "Vis detaljert informasjon med liten skrift på dvaleskjermen."
 		},
 		"DisplayRotation": {
-			"text": "SkRetn",
 			"text2": [
-				"",
+				"SkRetn",
 				""
 			],
 			"desc": "Skjermretning <A. Automatisk V. Venstrehendt H. Høyrehendt"
 		},
-		"BoostEnabled": {
-			"text": "Kraft",
-			"text2": [
-				"",
-				""
-			],
-			"desc": "Frontknappen aktiverer kraftfunksjonen, 450C ved lodding"
-		},
 		"BoostTemperature": {
-			"text": "KTmp",
 			"text2": [
-				"",
+				"KTmp",
 				""
 			],
 			"desc": "Temperatur i \"kraft\"-modus"
 		},
 		"AutoStart": {
-			"text": "AStart",
 			"text2": [
-				"",
+				"AStart",
 				""
 			],
 			"desc": "Start automatisk med lodding når strøm kobles til. L=Lodding, D=Dvale, I=Inaktiv"
 		},
 		"CooldownBlink": {
-			"text": "KjBlnk",
 			"text2": [
-				"",
+				"KjBlnk",
 				""
 			],
 			"desc": "Blink temperaturen på skjermen mens spissen fortsatt er varm."
 		},
 		"TemperatureCalibration": {
-			"text": "TempKal?",
 			"text2": [
-				"",
+				"TempKal?",
 				""
 			],
 			"desc": "Kalibrer spiss-temperatur."
 		},
 		"SettingsReset": {
-			"text": "TilbStl?",
 			"text2": [
-				"",
+				"TilbStl?",
 				""
 			],
 			"desc": "Tilbakestill alle innstillinger"
 		},
 		"VoltageCalibration": {
-			"text": "KalSpIn?",
 			"text2": [
-				"",
+				"KalSpIn?",
 				""
 			],
 			"desc": "Kalibrer spenning. Knappene justerer. Langt trykk for å gå ut"
 		},
 		"AdvancedSoldering": {
-			"text": "AvLdSk",
 			"text2": [
-				"",
+				"AvLdSk",
 				""
 			],
 			"desc": "Vis detaljert informasjon ved lodding"
 		},
 		"ScrollingSpeed": {
-			"text": "RullHa",
 			"text2": [
-				"",
+				"RullHa",
 				""
 			],
 			"desc": "Hastigheten på rulletekst"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Tip",
 				"Model"
@@ -211,7 +197,6 @@
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Simple",
 				"Calibration"
@@ -219,31 +204,20 @@
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -251,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -259,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -267,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_pl.json

@@ -2,184 +2,174 @@
 	"languageCode": "PL",
 	"languageLocalName": "Polski",
 	"cyrillicGlyphs": false,
+	"tempUnitFahrenheit": false,
 	"messages": {
 		"SettingsCalibrationDone": "Kalibracja udana!",
-		"SettingsCalibrationWarning": "Przed kontynuowaniem upewnij się, że końcówka osiągnela temperature pokojowa!",
+		"SettingsCalibrationWarning": "Przed kontynuowaniem upewnij się, że końcówka osiągnęła temperaturę pokojową!",
 		"SettingsResetWarning": "Czy na pewno chcesz przywrócić ustawienia fabryczne?",
-		"UVLOWarningString": "NISKIE DC",
-		"UndervoltageString": "Pod napięciem",
-		"InputVoltageString": "Wejściowe V: ",
-		"WarningTipTempString": "Temperatura grota: ",
+		"UVLOWarningString": "NIS. NAP",
+		"UndervoltageString": "Zbyt niskie nap.",
+		"InputVoltageString": "Nap. wej.:",
+		"WarningTipTempString": "Temp. grotu:",
 		"BadTipString": "ZŁY GROT",
 		"SleepingSimpleString": "Zzz!",
-		"SleepingAdvancedString": "Uspienie...",
+		"SleepingAdvancedString": "Tr. uśpienia",
 		"WarningSimpleString": "HOT!",
 		"WarningAdvancedString": "GORĄCA KOŃCÓWKA!",
 		"SleepingTipAdvancedString": "Grot:",
 		"IdleTipString": "Grot:",
-		"IdleSetString": " Ustaw:",
+		"IdleSetString": " Ust:",
 		"TipDisconnectedString": "GROT ODŁĄCZONY",
-		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Wyłącz",
-		"ResetOKMessage": "Reset OK"
+		"SolderingAdvancedPowerPrompt": "Moc: ",
+		"OffString": "Wył",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Us.zysk:",
+		"SettingsResetMessage": "Ust. zresetowane",
+		"LockingKeysString": " ZABLOK.",
+		"UnlockingKeysString": "ODBLOK.",
+		"WarningKeysLockedString": "!ZABLOK!"
 	},
 	"characters": {
 		"SettingRightChar": "P",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "F",
-		"SettingSlowChar": "S",
+		"SettingFastChar": "S",
+		"SettingSlowChar": "W",
 		"SettingStartSolderingChar": "T",
-		"SettingStartSleepChar": "S",
+		"SettingStartSleepChar": "Z",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "N"
+		"SettingStartNoneChar": "B",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "N",
+		"SettingSensitivityMedium": "Ś",
+		"SettingSensitivityHigh": "W",
+		"SettingLockDisableChar": "W",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "P"
 	},
-	"menuDouble": false,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
 				"Lutowanie",
-				"Ustawienia"
+				""
 			],
-			"desc": "Ustawienia lutownicy"
+			"desc": "Ustawienia trybu lutowania"
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Uśpienie",
-				"Tryby"
+				"Oszcz.",
+				"energii"
 			],
 			"desc": "Ustawienia oszczędzania energii"
 		},
 		"UIMenu": {
 			"text2": [
-				"Użytkownik",
-				"Interfejs"
+				"Interfejs",
+				"użytkownika"
 			],
 			"desc": "Ustawienia interfejsu użytkownika"
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Zaawansowane",
-				"Opcje"
+				"Ustawienia",
+				"zaawans."
 			],
-			"desc": "Opcje zaawansowane"
+			"desc": "Ustawienia zaawansowane"
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
+		"DCInCutoff": {
 			"text2": [
 				"Źródło",
 				"zasilania"
 			],
-			"desc": "Źródło zasilania. Ustaw napięcie odcięcia. <DC 10V> <S 3.3V dla ogniw Li>"
+			"desc": "Źródło zasilania. Ustaw napięcie odcięcia. <DC 10V> <S 3.3V dla ogniw Li, wyłącz limit mocy>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
-				"Temperatura",
+				"Temp.",
 				"uśpienia"
 			],
-			"desc": "Temperatura uśpienia <°C>"
+			"desc": "Temperatura w trybie uśpienia <°C>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
-				"Czas",
+				"Czas do",
 				"uśpienia"
 			],
-			"desc": "Czas uśpienia <Minuty/Sekundy>"
+			"desc": "Czas do przejścia w tryb uśpienia <minuty/sekundy>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
-				"Czas",
+				"Czas do",
 				"wyłączenia"
 			],
-			"desc": "Czas wyłączenia <Minuty>"
+			"desc": "Czas do wyłączenia <minuty>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
 				"Czułość",
-				"ruchu"
+				"wykr. ruchu"
 			],
-			"desc": "Czułość ruchu <0.Wyłączona 1.minimalna 9.maksymalna>"
+			"desc": "Czułość wykrywania ruchu <0-Wyłączona, 1-Minimalna, 9-Maksymalna>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
 				"Jednostka",
 				"temperatury"
 			],
-			"desc": "Jednostka temperatury <C=Celsius F=Fahrenheit>"
+			"desc": "Jednostka temperatury <C-Celciusz, F-Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
-				"Mniejsza",
-				"czcionka"
+				"Szeczegółowy",
+				"ekran bezczy."
 			],
-			"desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynnośći <T = wł., N = wył.>"
+			"desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynności"
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
 			"text2": [
-				"Orientacja",
-				"wyświetlacza"
+				"Obrót",
+				"ekranu"
 			],
-			"desc": "Orientacja wyświetlacza <A. Automatyczna L. Leworęczna P. Praworęczna>"
-		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"",
-				""
-			],
-			"desc": "Użyj przycisku przedniego w celu zwiększenia temperatury <T = wł., N = wył.>"
+			"desc": "Obrót ekranu <A-automatycznie, L-dla leworęcznych, P-dla praworęcznych>"
 		},
 		"BoostTemperature": {
-			"text": "BTMP",
 			"text2": [
-				"Temperatura",
-				"w trybie boost"
+				"Temp.",
+				"boost"
 			],
 			"desc": "Temperatura w trybie \"boost\" "
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
-				"Automatyczne",
-				"uruchamianie"
+				"Aut. uruch.",
+				"tr. lutowania"
 			],
-			"desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania. T=Lutowanie, S= Tryb Uspienia ,N=Wyłącz"
+			"desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania.<B - wyłączone, T - lutowanie, Z - uśpienie, O - uśpienie w temp. pokojowej"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
-				"Migająca",
-				"temperatura"
+				"Mig. podczas",
+				"wychładzania"
 			],
-			"desc": "Temperatura na ekranie miga, gdy grot jest jeszcze gorący. <T = wł., N = wył.>"
+			"desc": "Temperatura miga podczas wychładzania, gdy grot jest wciąż gorący"
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
 				"Kalibracja",
-				"temp. grota"
+				"temp. grotu"
 			],
-			"desc": "Kalibracja temperatury grota lutownicy"
+			"desc": "Kalibracja temperatury grotu lutownicy"
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
-				"",
-				""
+				"Ustawienia",
+				"fabryczne"
 			],
-			"desc": "Zresetuj wszystkie ustawienia"
+			"desc": "Resetuje wszystkie ustawienia"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
 				"Kalibracja",
 				"napięcia"
@@ -187,92 +177,102 @@
 			"desc": "Kalibracja napięcia wejściowego. Krótkie naciśnięcie, aby ustawić, długie naciśnięcie, aby wyjść."
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
-				"Szczegółowe",
-				"informacje"
+				"Sz. inf. w",
+				"tr. lutowania"
 			],
-			"desc": "Wyświetl szczegółowe informacje podczas lutowania <T = wł., N = wył.>"
+			"desc": "Wyświetl szczegółowe informacje w trybie lutowania"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
-				"Szybkość",
+				"Sz. przew.",
 				"tekstu"
 			],
 			"desc": "Szybkość przewijania tekstu"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Model",
-				"grota"
+				"grotu"
 			],
-			"desc": "Wybór grotu"
+			"desc": "Wybór modelu grotu"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Prosta",
-				"Kalibracja"
+				"kalibracja"
 			],
-			"desc": "Prosta kalibracja używając gorącej wody"
+			"desc": "Prosta kalibracja, używając gorącej wody"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Zaawansowana",
-				"Kalibracja"
+				"kalibracja"
 			],
-			"desc": "Zaawansowana kalibracja za pomocy termopoary na grocie"
+			"desc": "Zaawansowana kalibracja za pomocą termopary na grocie"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Moc",
-				"Wattach"
+				"w W"
 			],
-			"desc": "Moc używanego zasilacza w Watach"
-		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
+			"desc": "Moc używanego zasilacza w <W>"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Ogr.",
+				"mocy"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Maksymalna moc <W>, jakiej może użyć lutownica"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Zamień przyc.",
+				"+ -"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Zamienia działanie przycisków zmiany temperatury grotu"
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Zm. temp.",
+				"kr. przyc."
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Wartość zmiany temperatury, po krótkim przyciśnięciu <°C>"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Zm. temp.",
+				"dł. przyc."
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Wartość zmiany temperatury, po długim przyciśnięciu <°C>"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Moc",
+				"impulsu"
+			],
+			"desc": "Utrzymuj moc impulsu na wybranym poziomie <W>"
+		},
+		"TipGain": {
+			"text2": [
+				"Zm. zysk",
+				"grotu"
+			],
+			"desc": "Własne ustawienia zysku grotu, celem lepszej kalibracji wysokich temperatur <uV/°C>"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Czułość",
+				"cz.Halla"
+			],
+			"desc": "Czułość czujnika Halla, używanego do przechodznia w tryb uśpienia <O-Wył,N-Niska,Ś=Średnia,W=Wysoka>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Blokada",
+				"przycisków"
+			],
+			"desc": "W trybie lutowania, wciśnij oba przyciski aby je zablokować <O-Wyłączona, B-tylko Boost, P-pełna blokada>"
 		}
 	}
-}
+}

Translation Editor/translation_pt.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "SEM PONTA",
 		"SolderingAdvancedPowerPrompt": "Power: ",
 		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "FONTE",
+		"DCInCutoff": {
 			"text2": [
 				"Fonte",
 				"alimentação"
@@ -75,7 +85,6 @@
 			"desc": "Fonte de alimentação. Define a tensão de corte. <DC=10V> <S=3.3V/célula>"
 		},
 		"SleepTemperature": {
-			"text": "TMPE",
 			"text2": [
 				"Temperat.",
 				"repouso"
@@ -83,7 +92,6 @@
 			"desc": "Temperatura de repouso <C>"
 		},
 		"SleepTimeout": {
-			"text": "TMPO",
 			"text2": [
 				"Tempo",
 				"repouso"
@@ -91,7 +99,6 @@
 			"desc": "Tempo para repouso <Minutos/Segundos>"
 		},
 		"ShutdownTimeout": {
-			"text": "DESLI",
 			"text2": [
 				"Tempo",
 				"desligam."
@@ -99,7 +106,6 @@
 			"desc": "Tempo para desligamento <Minutos>"
 		},
 		"MotionSensitivity": {
-			"text": "MOVIME",
 			"text2": [
 				"Sensibilidade",
 				"movimento"
@@ -107,7 +113,6 @@
 			"desc": "Sensibilidade ao movimento <0=Desligado 1=Menor 9=Maior>"
 		},
 		"TemperatureUnit": {
-			"text": "UNIDAD",
 			"text2": [
 				"Unidade",
 				"temperatura"
@@ -115,7 +120,6 @@
 			"desc": "Unidade de temperatura <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "EM ESPERA",
 			"text2": [
 				"Tela repouso",
 				"avançada"
@@ -123,23 +127,13 @@
 			"desc": "Exibe informações avançadas quando em espera"
 		},
 		"DisplayRotation": {
-			"text": "ORIENT",
 			"text2": [
 				"Orientação",
 				"tela"
 			],
 			"desc": "Orientação da tela <A.utomática C.anhoto D.estro>"
 		},
-		"BoostEnabled": {
-			"text": "TURBO",
-			"text2": [
-				"Modo turbo",
-				"activado"
-			],
-			"desc": "Tecla frontal activa modo \"turbo\""
-		},
 		"BoostTemperature": {
-			"text": "TTMP",
 			"text2": [
 				"Modo turbo",
 				"temperat."
@@ -147,7 +141,6 @@
 			"desc": "Ajuste de temperatura do modo \"turbo\""
 		},
 		"AutoStart": {
-			"text": "MODOAT",
 			"text2": [
 				"Partida",
 				"automática"
@@ -155,7 +148,6 @@
 			"desc": "Aquece a ponta automaticamente ao ligar"
 		},
 		"CooldownBlink": {
-			"text": "RESFRI",
 			"text2": [
 				"Piscar ao",
 				"arrefecer"
@@ -163,7 +155,6 @@
 			"desc": "Faz o valor da temperatura piscar durante o arrefecimento"
 		},
 		"TemperatureCalibration": {
-			"text": "CAL.TEMP",
 			"text2": [
 				"Calibrar",
 				"temperatura"
@@ -171,7 +162,6 @@
 			"desc": "Calibra a temperatura"
 		},
 		"SettingsReset": {
-			"text": "RESET",
 			"text2": [
 				"Reset de",
 				"fábrica?"
@@ -179,7 +169,6 @@
 			"desc": "Reverte todos ajustes"
 		},
 		"VoltageCalibration": {
-			"text": "CAL.VOLT",
 			"text2": [
 				"Calibrar",
 				"tensão"
@@ -187,7 +176,6 @@
 			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair"
 		},
 		"AdvancedSoldering": {
-			"text": "AVNCAD",
 			"text2": [
 				"Tela trabalho",
 				"avançada"
@@ -195,7 +183,6 @@
 			"desc": "Exibe informações avançadas durante o uso"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
 				"Velocidade",
 				"texto ajuda"
@@ -203,7 +190,6 @@
 			"desc": "Velocidade a que o texto é exibido"
 		},
 		"TipModel": {
-			"text": "MODPNT",
 			"text2": [
 				"Ponta",
 				"Modelo"
@@ -211,7 +197,6 @@
 			"desc": "Selecção de modelo de ponta"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Calibração",
 				"Simples"
@@ -219,31 +204,20 @@
 			"desc": "Calibração simples com água quente"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Calibração",
 				"Avançada"
 			],
 			"desc": "Calibração avançada com um termopar na ponta"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Potência",
 				"Fonte"
 			],
 			"desc": "Potência da fonte usada (Watt)"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -251,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -259,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -267,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_ru.json

@@ -3,17 +3,17 @@
 	"languageLocalName": "Русский",
 	"cyrillicGlyphs": true,
 	"messages": {
-		"SettingsCalibrationDone": "Калибровка выполнена!",
-		"SettingsCalibrationWarning": "Убедитесь, что жало остыло до комнатной температуры, прежде чем продолжать!",
-		"SettingsResetWarning": "Вы действительно хотите сбросить настройки до значений по умолчанию?",
+		"SettingsCalibrationDone": "Калибровка завершена!",
+		"SettingsCalibrationWarning": "Прежде чем продолжить, пожалуйста, убедитесь, что жало имеет комнатную температуру!",
+		"SettingsResetWarning": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?",
 		"UVLOWarningString": "НАПРЯЖ--",
-		"UndervoltageString": "Под питанием",
-		"InputVoltageString": "Питание B: ",
-		"WarningTipTempString": "Жало t°: ",
-		"BadTipString": "Жало--",
-		"SleepingSimpleString": "Сон ",
+		"UndervoltageString": "Низк. напряжение",
+		"InputVoltageString": "Питание В: ",
+		"WarningTipTempString": "Темп. жала: ",
+		"BadTipString": "ЖАЛО--",
+		"SleepingSimpleString": "Zzzz",
 		"SleepingAdvancedString": "Ожидание...",
-		"WarningSimpleString": " ГОРЯЧО!",
+		"WarningSimpleString": "ГОРЯЧО!",
 		"WarningAdvancedString": "!!! ГОРЯЧЕЕ ЖАЛО !!!",
 		"SleepingTipAdvancedString": "Жало:",
 		"IdleTipString": "Жало:",
@@ -23,20 +23,29 @@
 		"OffString": "Выкл.",
 		"ResetOKMessage": "Сброс OK",
 		"YourGainMessage": "Прирост:",
-		"SettingsResetMessage": "Настройки \nсброшены!"
+		"SettingsResetMessage": "Настройки сброшены!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
 		"SettingLeftChar": "Л",
-		"SettingAutoChar": "A",
-		"SettingFastChar": "+",
-		"SettingSlowChar": "-",
-		"SettingStartSolderingChar": "T",
-		"SettingStartSleepChar": "S",
-		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingAutoChar": "А",
+		"SettingFastChar": "Б",
+		"SettingSlowChar": "М",
+		"SettingStartSolderingChar": "П",
+		"SettingStartSleepChar": "О",
+		"SettingStartSleepOffChar": "К",
+		"SettingStartNoneChar": "В",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -47,234 +56,222 @@
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Режим",
+				"Режимы",
 				"сна"
 			],
-			"desc": "Параметры экономии энергии"
+			"desc": "Настройки режима ожидания"
 		},
 		"UIMenu": {
 			"text2": [
-				"Пользовател",
-				"интерфейс"
+				"Параметры",
+				"интерфейса"
 			],
-			"desc": "Параметры пользовательского интерфейса"
+			"desc": "Настройки пользовательского интерфейса"
 		},
 		"AdvancedMenu": {
 			"text2": [
 				"Дополнител.",
-				"параметры"
+				"настройки"
 			],
-			"desc": "Дополнительные параметры"
+			"desc": "Дополнительные настройки"
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "ИстП",
+		"DCInCutoff": {
 			"text2": [
 				"Источник",
 				"питания"
 			],
-			"desc": "Источник питания. Установка напряжения отключения. <DC = 10 В, S = 3.3 В на батарею, ограничение мощности выкл.>"
+			"desc": "Источник питания. Устанавливает напряжение отсечки. <DC 10В> <S 3.3В на ячейку, без лимита мощности>"
 		},
 		"SleepTemperature": {
-			"text": "Тожд",
 			"text2": [
-				"Темпер.",
-				"сна"
+				"Темп.",
+				"ожидания"
 			],
-			"desc": "Температура режима ожидания <С>"
+			"desc": "Температура режима ожидания"
 		},
 		"SleepTimeout": {
-			"text": "Вожд",
 			"text2": [
 				"Таймаут",
-				"сна"
+				"ожидания"
 			],
 			"desc": "Время до перехода в режим ожидания <Минуты/Секунды>"
 		},
 		"ShutdownTimeout": {
-			"text": "Тоткл",
 			"text2": [
-				"Время до",
-				"отключения"
+				"Таймаут",
+				"выключения"
 			],
-			"desc": "Время до отключения <Минуты>"
+			"desc": "Время до отключения паяльника <Минуты>"
 		},
 		"MotionSensitivity": {
-			"text": "ЧувсДв",
 			"text2": [
-				"Чувст. сенсо-",
-				"ра движения"
+				"Чувствительн.",
+				"акселерометра"
 			],
-			"desc": "Акселерометр <0 = Выкл, 1 = Мин. чувствительный, 9 = Макс. чувствительный>"
+			"desc": "Чувствительность акселерометра <0=Выкл., 1=Мин., 9=Макс.>"
 		},
 		"TemperatureUnit": {
-			"text": "ЕдТемп",
 			"text2": [
-				"Формат темпе-",
-				"ратуры(C°/F°)"
+				"Единицы",
+				"температуры"
 			],
-			"desc": "Единица измерения температуры <C = Цельсия, F = Фаренгейт>"
+			"desc": "Единицы измерения температуры <C=Цельcия, F=Фаренгейта>"
 		},
 		"AdvancedIdle": {
-			"text": "ИнфОжд",
 			"text2": [
-				"Подробный ре-",
-				"жим ожидания"
+				"Подробный",
+				"реж. ожидания"
 			],
-			"desc": "Показывать детальную информацию маленьким шрифтом на домашнем экране"
+			"desc": "Отображать детальную информацию уменьшенным шрифтом на экране ожидания"
 		},
 		"DisplayRotation": {
-			"text": "ПовЭкр",
 			"text2": [
-				"Автоповорот",
+				"Ориентация",
 				"экрана"
 			],
-			"desc": "Ориентация дисплея <A = Авто, Л = Левая рука, П = Правая рука>"
-		},
-		"BoostEnabled": {
-			"text": "Турбо",
-			"text2": [
-				"Режим",
-				"Турбо"
-			],
-			"desc": "Активирует \"Турбо-режим\" при удержании кнопки А во время пайки"
+			"desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>"
 		},
 		"BoostTemperature": {
-			"text": "Ттур",
 			"text2": [
-				"Темпер.",
-				"Турбо"
+				"t° турбо",
+				"режима"
 			],
-			"desc": "Температура в \"Турбо-режиме\""
+			"desc": "Температура жала в турбо-режиме"
 		},
 		"AutoStart": {
-			"text": "Астарт",
 			"text2": [
-				"Горячий",
+				"Авто",
 				"старт"
 			],
-			"desc": "Автоматический запуск паяльника при включении питания <T = Нагрев, S = Режим ожидания, F = Выкл.>"
+			"desc": "Режим, в котором запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>"
 		},
 		"CooldownBlink": {
-			"text": "Охлажд",
 			"text2": [
-				"Показ t° при",
-				"остывании"
+				"Мигание t°",
+				"при остывании"
 			],
-			"desc": "Показывать температуру на экране охлаждения, пока жало остается горячим"
+			"desc": "Мигать температурой на экране охлаждения, пока жало еще горячее"
 		},
 		"TemperatureCalibration": {
-			"text": "КалибрТ",
 			"text2": [
 				"Калибровка",
 				"температуры"
 			],
-			"desc": "Калибровка термодатчика"
+			"desc": "Калибровка термодатчика жала"
 		},
 		"SettingsReset": {
-			"text": "СБРОС?",
 			"text2": [
-				"Сбросить все",
-				"настройки?"
+				"Сброс",
+				"Настроек"
 			],
-			"desc": "Сброс всех настроек"
+			"desc": "Сброс настроек к значеням по умолчанию"
 		},
 		"VoltageCalibration": {
-			"text": "КалибрU?",
 			"text2": [
 				"Калибровка",
 				"напряжения"
 			],
-			"desc": "Калибровка входного напряжения. Настройка кнопками, нажать и удержать чтобы завершить"
+			"desc": "Калибровка входного напряжения <длинное нажатие для выхода>"
 		},
 		"AdvancedSoldering": {
-			"text": "ИнфПай",
 			"text2": [
-				"Подробный ре-",
-				"жим пайки"
+				"Подробный",
+				"экран пайки"
 			],
-			"desc": "Показывать детальную информацию при пайке"
+			"desc": "Показывать детальную информацию на экране пайки"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
 				"Скорость",
 				"текста"
 			],
-			"desc": "Скорость прокрутки текста"
+			"desc": "Скорость прокрутки текста <М=медленно, Б=быстро>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Модель",
-				"жало"
+				"жала"
 			],
-			"desc": "Выбор модели жало"
+			"desc": "Выбор модели жала"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
-				"Простая",
+				"Упрощенная",
 				"калибровка"
 			],
-			"desc": "Простая калибровка с использованием горячей воды"
+			"desc": "Упрощенная калибровка с использованием горячей воды"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
-				"Подробная",
+				"Улучшенная",
 				"калибровка"
 			],
-			"desc": "Калибровка с помощью термопары"
+			"desc": "Улучшенная калибровка с импользованием термопары жала"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Мощность",
-				"адаптера"
+				"питания"
 			],
-			"desc": "Мощность используемого адаптера питания"
-		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Ограничение",
-				"мощности"
-			],
-			"desc": "Включает ограничение мощности потребления"
+			"desc": "Мощность используемого источника питания"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Максимальная",
 				"мощность"
 			],
-			"desc": "Макс. мощность, которую может использовать паяльник <Ватт>"
+			"desc": "Максимальная мощность, которую может использовать паяльник <Ватт>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Инвертировать",
+				"кнопки"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Инвертировать кнопки изменения температуры"
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Шаг темп.",
+				"кор. наж."
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Шаг изменения температуры при коротком нажатии кнопок"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Шаг темп.",
+				"длин. наж."
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Шаг изменения температуры при длинном нажатии кнопок"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Мощность импульса",
+				"питания Вт"
+			],
+			"desc": "Мощность импульса удерживающего от сна источник питания"
+		},
+		"TipGain": {
+			"text2": [
+				"Изменить",
+				"усиление жала"
+			],
+			"desc": "Усиление жала"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Эффект Холла",
+				"чувствительность"
+			],
+			"desc": "Уровень чувствительности датчика холла в режиме сна <O=Выкл,L=Низкий,M=Средний,H=Высокий>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Разрешить блокировку",
+				"кнопок"
+			],
+			"desc": "При работе длинное нажатие обеих кнопок блокирует их <D=Отключено, B=Только турбо, F=Полная блокировка>"
 		}
 	}
-}
+}

Translation Editor/translation_sk.json

@@ -1,278 +1,277 @@
 {
 	"languageCode": "SK",
-	"languageLocalName": "Slovenský",
+	"languageLocalName": "Slovenčina",
 	"cyrillicGlyphs": false,
 	"messages": {
-		"SettingsCalibrationDone": "Calibration done!",
-		"SettingsCalibrationWarning": "Najprv sa prosim uistite, ze hrot ma izbovu teplotu!",
-		"SettingsResetWarning": "Are you sure to reset settings to default values?",
-		"UVLOWarningString": "DC LOW",
-		"UndervoltageString": "Undervoltage",
-		"InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip Temp: ",
-		"BadTipString": "BAD TIP",
+		"SettingsCalibrationDone": "Kalibrácia hotová!",
+		"SettingsCalibrationWarning": "Najprv sa prosím uistite, že hrot má izbovú teplotu!",
+		"SettingsResetWarning": "Naozaj chcete obnovit nastavenia?",
+		"UVLOWarningString": "Nízke U!",
+		"UndervoltageString": "Nízke napätie",
+		"InputVoltageString": "Vstupné U: ",
+		"WarningTipTempString": "Tep. hrotu: ",
+		"BadTipString": "ZLÝ HROT",
 		"SleepingSimpleString": "Chrr",
-		"SleepingAdvancedString": "Kludovy rezim...",
+		"SleepingAdvancedString": "Kľudový režim...",
 		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "HROT JE HORUCI !",
-		"SleepingTipAdvancedString": "Tip:",
-		"IdleTipString": "Tip:",
+		"WarningAdvancedString": "HROT JE HORÚCI !",
+		"SleepingTipAdvancedString": "Hrot:",
+		"IdleTipString": "Hrot:",
 		"IdleSetString": " Set:",
-		"TipDisconnectedString": "TIP DISCONNECTED",
-		"SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off",
-		"ResetOKMessage": "Reset OK"
+		"TipDisconnectedString": "HROT ODPOJENÝ",
+		"SolderingAdvancedPowerPrompt": "Výkon: ",
+		"OffString": "Vyp",
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Zisk:",
+		"SettingsResetMessage": "Nast. Obnovené!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
-		"SettingRightChar": "R",
+		"SettingRightChar": "P",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "F",
-		"SettingSlowChar": "S",
-		"SettingStartSolderingChar": "T",
-		"SettingStartSleepChar": "S",
+		"SettingFastChar": "R",
+		"SettingSlowChar": "P",
+		"SettingStartSolderingChar": "S",
+		"SettingStartSleepChar": "K",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "N",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": false,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
-				"Soldering",
-				"Settings"
+				"Nastavenie",
+				"spájkovania"
 			],
-			"desc": "Soldering settings"
+			"desc": "Nastavenie spájkovania"
 		},
 		"PowerSavingMenu": {
 			"text2": [
-				"Sleep",
-				"Modes"
+				"Úsporný",
+				"režim"
 			],
-			"desc": "Power Saving Settings"
+			"desc": "Nastavenia režimov úspory energie"
 		},
 		"UIMenu": {
 			"text2": [
-				"User",
-				"Interface"
+				"Nastavenie",
+				"zobrazenia"
 			],
-			"desc": "User Interface settings"
+			"desc": "Nastavenie zobrazenia"
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Advanced",
-				"Options"
+				"Pokročilé",
+				"nastavenia"
 			],
-			"desc": "Advanced options"
+			"desc": "Pokročilé nastavenia"
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
+		"DCInCutoff": {
 			"text2": [
-				"",
-				""
+				"Zdroj",
+				"napätia"
 			],
-			"desc": "Zdroj napatia. Nastavit napatie pre vypnutie (cutoff)  <DC=10V, nS=n*3.3V pre LiIon clanky>"
+			"desc": "Zdroj napätia. Nastavenie napätia pre vypnutie (cutoff)  <DC=10V, nS=n*3.3V pre LiIon články>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
-				"",
-				""
+				"Kľudová",
+				"teplota"
 			],
-			"desc": "Kludova teplota (v nastavenych jednotkach)"
+			"desc": "Kľudová teplota (v nastavených jednotkách)"
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
-				"",
-				""
+				"Kľudový",
+				"režim po"
 			],
 			"desc": "Kludovy rezim po <sekundach/minutach>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
-				"",
-				""
+				"Vypnutie",
+				"po"
 			],
-			"desc": "Cas na vypnutie <minuty>"
+			"desc": "Čas na vypnutie <minuty>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
-				"",
-				""
+				"Citlivosť",
+				"pohybu"
 			],
-			"desc": "Citlivost detekcie pohybu <0=Vyp, 1=Min ... 9=Max>"
+			"desc": "Citlivosť detekcie pohybu <0=Vyp, 1=Min ... 9=Max>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
-				"",
-				""
+				"Jednotka",
+				"teploty"
 			],
 			"desc": "Jednotky merania teploty <C=stupne Celzia, F=stupne Fahrenheita>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
-				"",
-				""
+				"Detaily v",
+				"kľud. režime"
 			],
-			"desc": "Zobrazit detailne informacie v kludovom rezime <T=Zap, F=Vyp>"
+			"desc": "Zobraziť detailné informácie v kľudovom režime <T=Zap, F=Vyp>"
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
 			"text2": [
-				"",
-				""
+				"Orientácia",
+				"displeja"
 			],
-			"desc": "Orientacia displeja <A=Auto, L=Lavak, R=Pravak>"
-		},
-		"BoostEnabled": {
-			"text": "BOOST",
-			"text2": [
-				"",
-				""
-			],
-			"desc": "Povolit tlacidlo pre prudky nahrev <T=Zap, F=Vyp>"
+			"desc": "Orientácia displeja <A=Auto, L=Ľavák, P=Pravák>"
 		},
 		"BoostTemperature": {
-			"text": "BTMP",
 			"text2": [
-				"",
-				""
+				"Boost",
+				"teplota"
 			],
-			"desc": "Cielova teplota pre prudky nahrev (v nastavenych jednotkach)"
+			"desc": "Cieľová teplota pre prudký náhrev (v nastavených jednotkách)"
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
-				"",
-				""
+				"Automatické",
+				"spustenie"
 			],
-			"desc": "Pri starte spustit rezim spajkovania <T=Zap, F=Vyp, S=Spanok>"
+			"desc": "Pri štarte spustiť režim spájkovania <S=Zap, N=Vyp, K=Spanok>"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
-				"",
-				""
+				"Blikanie pri",
+				"chladnutí"
 			],
-			"desc": "Blikanie ukazovatela teploty pocas chladnutia hrotu <T=Zap, F=Vyp>"
+			"desc": "Blikanie ukazovateľa teploty počas chladnutia hrotu"
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
-				"",
-				""
+				"Kalibrácia",
+				"teploty"
 			],
-			"desc": "Kalibracia posunu hrotu"
+			"desc": "Kalibrácia posunu teploty hrotu"
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
-				"",
-				""
+				"Obnovenie",
+				"nastavení"
 			],
-			"desc": "Tovarenske nastavenia"
+			"desc": "Obnovenie nastavení na pôvodné hodnoty"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
-				"",
-				""
+				"Kalibrácia",
+				"vst. napätia"
 			],
-			"desc": "Kalibracia VIN. Kratke stlacenie meni nastavenie, dlhe stlacenie pre navrat"
+			"desc": "Kalibrácia napätia. Krátke stlačenie mení nastavenie, dlhé stlačenie pre návrat"
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
-				"",
-				""
+				"Detaily počas",
+				"spájkovania"
 			],
-			"desc": "Zobrazenie detailov pocas spajkovania <T=Zap, F=Vyp>"
+			"desc": "Zobrazenie detailov počas spájkovania"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
-				"",
-				""
+				"Rýchlost",
+				"skrolovania"
 			],
-			"desc": "Speed this text scrolls past at"
+			"desc": "Rychlost pohybu tohoto textu"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
-				"Tip",
-				"Model"
+				"Typ",
+				"hrotu"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Zvolenie hrotu"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
-				"Simple",
-				"Calibration"
+				"Zjednodušená",
+				"kalibrácia"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Zjednodušená kalibrácia pomocou horúcej vody"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
-				"Advanced",
-				"Calibration"
+				"Pokročilá",
+				"kalibrácia"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Pokročilá kalibrácia meraním teploty hrotu"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
-				"Power",
-				"Wattage"
+				"Obmedzenie",
+				"výkonu"
 			],
-			"desc": "Power Wattage of the power adapter used"
-		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
+			"desc": "Obmedzenie výkonu podľa použitého zdroja"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
-				"Power",
-				"Limit"
+				"Obmedzenie",
+				"výkonu"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Obmedzenie výkonu podľa použitého zdroja <watt>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Otočenie",
+				"tlačidiel +/-"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Prehodenie tlačidiel na nastavovanie teploty"
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Malý krok",
+				"teploty"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Zmena teploty pri krátkom stlačení tlačidla"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Veľký krok",
+				"teploty"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Zmena teploty pri držaní tlačidla"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Impulz",
+				"W"
+			],
+			"desc": "Impulz udržujúci napájací zdroj zapnutý <watt>"
+		},
+		"TipGain": {
+			"text2": [
+				"Zisk",
+				"hrotu"
+			],
+			"desc": "Úprava zisku hrotu"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_sl.json

@@ -22,7 +22,11 @@
 		"SolderingAdvancedPowerPrompt": "Moč: ",
 		"OffString": "Izk",
 		"ResetOKMessage": "Reset OK",
-		"YourGainMessage": "Ojačan.:"
+		"YourGainMessage": "Ojačan.:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -33,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -67,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
+		"DCInCutoff": {
 			"text2": [
 				"Vir",
 				"napajanja"
@@ -76,7 +85,6 @@
 			"desc": "Vir napajanja. Nastavi napetost izklopa. <DC 10V> <S 3.3V na celico>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
 				"Temp. med",
 				"spanjem"
@@ -84,7 +92,6 @@
 			"desc": "Temperatura med spanjem <C>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
 				"Čas do",
 				"spanja"
@@ -92,7 +99,6 @@
 			"desc": "Čas pred spanjem <minute/sekunde>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
 				"Čas do",
 				"izklopa"
@@ -100,7 +106,6 @@
 			"desc": "Čas pred izklopom <minute>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
 				"Občutljivost",
 				"premikanja"
@@ -108,7 +113,6 @@
 			"desc": "Občutljivost premikanja <0.izklopljeno 1.najmanj 9.najbolj občutljivo>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
 				"Enota za",
 				"temperaturo"
@@ -116,7 +120,6 @@
 			"desc": "Enota za temperaturo <C=celzija F=fahrenheita>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
 				"Več info na",
 				"zaslonu v mir"
@@ -124,23 +127,13 @@
 			"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"
@@ -148,7 +141,6 @@
 			"desc": "Temperatura v \"boost\" načinu"
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
 				"Samodejni",
 				"zagon"
@@ -156,7 +148,6 @@
 			"desc": "Samodejno segrej konico ob vklopu. T=segrej, S=spanje, F=izklop"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
 				"Utripanje med",
 				"hlajenjem"
@@ -164,7 +155,6 @@
 			"desc": "Utripaj temperaturo med hlajenjem, ko je konica še vroča."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
 				"Kalibriram",
 				"temperaturo?"
@@ -172,7 +162,6 @@
 			"desc": "Kalibracija temperature na konici."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
 				"Tovarniške",
 				"nastavitve?"
@@ -180,7 +169,6 @@
 			"desc": "Ponastavitev vseh nastavitev"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
 				"Kalibriram",
 				"vhodno napetost?"
@@ -188,7 +176,6 @@
 			"desc": "Kalibracija VIN. Nastavitve z gumbi, dolgi pritisk za izhod."
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
 				"Več info na",
 				"zaslonu spaj."
@@ -196,7 +183,6 @@
 			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
 				"Hitrost",
 				"besedila"
@@ -204,7 +190,6 @@
 			"desc": "Hitrost, s katero se prikazuje besedilo"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Model",
 				"konice"
@@ -212,7 +197,6 @@
 			"desc": "Izbira tipa konice"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Preprosta",
 				"kalibracija"
@@ -220,31 +204,20 @@
 			"desc": "Preprosta kalibracija z vročo vodo."
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Napredna",
 				"kalibracija"
 			],
 			"desc": "Napredna kalibracija s termočlenom na konici"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Moč napajalnega",
 				"vira"
 			],
 			"desc": "Moč v W napajalnega vira"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -252,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -260,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -268,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_sr_cyrl.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "ВРХ НИЈЕ СПОЈЕН",
 		"SolderingAdvancedPowerPrompt": "Снага: ",
 		"OffString": "Иск",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "Д",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "Нпјње",
+		"DCInCutoff": {
 			"text2": [
 				"Врста",
 				"напајања"
@@ -75,7 +85,6 @@
 			"desc": "Тип напајања; одређује најнижи радни напон. <DC=адаптер (10V), S=батерија (3,3V по ћелији)>"
 		},
 		"SleepTemperature": {
-			"text": "ТСпв",
 			"text2": [
 				"Темп.",
 				"спавања"
@@ -83,7 +92,6 @@
 			"desc": "Температура на коју се спушта лемилица након одређеног времена мировања. <C/F>"
 		},
 		"SleepTimeout": {
-			"text": "ВСпв",
 			"text2": [
 				"Време до",
 				"спавања"
@@ -91,7 +99,6 @@
 			"desc": "Време мировања након кога лемилица спушта температуру. <M=минути, S=секунде>"
 		},
 		"ShutdownTimeout": {
-			"text": "ВГшњ",
 			"text2": [
 				"Време до",
 				"гашења"
@@ -99,7 +106,6 @@
 			"desc": "Време мировања након кога се лемилица гаси. <M=минути>"
 		},
 		"MotionSensitivity": {
-			"text": "ОстПкр",
 			"text2": [
 				"Осетљивост",
 				"на покрет"
@@ -107,7 +113,6 @@
 			"desc": "Осетљивост сензора покрета. <0=искључено, 1=најмање осетљиво, 9=најосетљивије>"
 		},
 		"TemperatureUnit": {
-			"text": "ЈедТмп",
 			"text2": [
 				"Јединица",
 				"температуре"
@@ -115,7 +120,6 @@
 			"desc": "Јединице у којима се приказује температура. <C=целзијус, F=фаренхајт>"
 		},
 		"AdvancedIdle": {
-			"text": "ДтљМир",
 			"text2": [
 				"Детаљи током",
 				"мировања"
@@ -123,23 +127,13 @@
 			"desc": "Приказивање детаљних информација на екрану током мировања."
 		},
 		"DisplayRotation": {
-			"text": "ОрјЕкр",
 			"text2": [
 				"Оријентација",
 				"екрана"
 			],
 			"desc": "Како је окренут екран. <А=аутоматски, Л=за леворуке, Д=за десноруке>"
 		},
-		"BoostEnabled": {
-			"text": "Пјчње",
-			"text2": [
-				"Појачање",
-				"омогућено"
-			],
-			"desc": "Држање предњег тастера током лемљења додатно појачава температуру врха."
-		},
 		"BoostTemperature": {
-			"text": "ТПјч",
 			"text2": [
 				"Темп.",
 				"појачања"
@@ -147,7 +141,6 @@
 			"desc": "Температура врха лемилице у току појачања."
 		},
 		"AutoStart": {
-			"text": "ВрћСта",
 			"text2": [
 				"Врући",
 				"старт"
@@ -155,7 +148,6 @@
 			"desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се."
 		},
 		"CooldownBlink": {
-			"text": "УпзХла",
 			"text2": [
 				"Упозорење",
 				"при хлађењу"
@@ -163,7 +155,6 @@
 			"desc": "Приказ температуре трепће приликом хлађења докле год је врх и даље врућ."
 		},
 		"TemperatureCalibration": {
-			"text": "КалбрТмп",
 			"text2": [
 				"Калибрација",
 				"температуре"
@@ -171,7 +162,6 @@
 			"desc": "Калибрисање одступања температуре врха у односу на дршку."
 		},
 		"SettingsReset": {
-			"text": "ФабрПост",
 			"text2": [
 				"Фабричке",
 				"поставке"
@@ -179,7 +169,6 @@
 			"desc": "Враћање свих поставки на фабричке вредности."
 		},
 		"VoltageCalibration": {
-			"text": "КалбрНап",
 			"text2": [
 				"Калибрација",
 				"улазног напона"
@@ -187,7 +176,6 @@
 			"desc": "Калибрисање улазног напона. Подешава се на тастере; дуги притисак за крај."
 		},
 		"AdvancedSoldering": {
-			"text": "ДтљЛем",
 			"text2": [
 				"Детаљи током",
 				"лемљења"
@@ -195,7 +183,6 @@
 			"desc": "Приказивање детаљних информација на екрану током лемљења."
 		},
 		"ScrollingSpeed": {
-			"text": "БрзПор",
 			"text2": [
 				"Брзина",
 				"порука"
@@ -203,7 +190,6 @@
 			"desc": "Брзина кретања описних порука попут ове. <С=споро, Б=брзо>"
 		},
 		"TipModel": {
-			"text": "МоделВрх",
 			"text2": [
 				"Модел",
 				"врха"
@@ -211,7 +197,6 @@
 			"desc": "Одабир модела лемног врха."
 		},
 		"SimpleCalibrationMode": {
-			"text": "ЈедКалбр",
 			"text2": [
 				"Једноставна",
 				"калибрација"
@@ -219,31 +204,20 @@
 			"desc": "Једноставна калибрација кипућом водом."
 		},
 		"AdvancedCalibrationMode": {
-			"text": "НапКалбр",
 			"text2": [
 				"Напредна",
 				"калибрација"
 			],
 			"desc": "Напредна калибрација помоћу термопара."
 		},
-		"PowerInput": {
-			"text": "УлазСнаг",
+		"QCMaxVoltage": {
 			"text2": [
 				"Улазна",
 				"снага"
 			],
 			"desc": "Снага напајања у ватима."
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -251,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -259,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -267,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_sr_latn.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "VRH NIJE SPOJEN",
 		"SolderingAdvancedPowerPrompt": "Snaga: ",
 		"OffString": "Isk",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "Npjnj",
+		"DCInCutoff": {
 			"text2": [
 				"Vrsta",
 				"napajanja"
@@ -75,7 +85,6 @@
 			"desc": "Tip napajanja; određuje najniži radni napon. <DC=adapter (10V), S=baterija (3,3V po ćeliji)>"
 		},
 		"SleepTemperature": {
-			"text": "TSpv",
 			"text2": [
 				"Temp.",
 				"spavanja"
@@ -83,7 +92,6 @@
 			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
 		},
 		"SleepTimeout": {
-			"text": "VSpv",
 			"text2": [
 				"Vreme do",
 				"spavanja"
@@ -91,7 +99,6 @@
 			"desc": "Vreme mirovanja nakon koga lemilica spušta temperaturu. <M=minuti, S=sekunde>"
 		},
 		"ShutdownTimeout": {
-			"text": "VGšnj",
 			"text2": [
 				"Vreme do",
 				"gašenja"
@@ -99,7 +106,6 @@
 			"desc": "Vreme mirovanja nakon koga se lemilica gasi. <M=minuti>"
 		},
 		"MotionSensitivity": {
-			"text": "OstPkr",
 			"text2": [
 				"Osetljivost",
 				"na pokret"
@@ -107,7 +113,6 @@
 			"desc": "Osetljivost senzora pokreta. <0=isključeno, 1=najmanje osetljivo, 9=najosetljivije>"
 		},
 		"TemperatureUnit": {
-			"text": "JedTmp",
 			"text2": [
 				"Jedinica",
 				"temperature"
@@ -115,7 +120,6 @@
 			"desc": "Jedinice u kojima se prikazuje temperatura. <C=celzijus, F=farenhajt>"
 		},
 		"AdvancedIdle": {
-			"text": "DtlMir",
 			"text2": [
 				"Detalji tokom",
 				"mirovanja"
@@ -123,23 +127,13 @@
 			"desc": "Prikazivanje detaljnih informacija na ekranu tokom mirovanja."
 		},
 		"DisplayRotation": {
-			"text": "OrjEkr",
 			"text2": [
 				"Orijentacija",
 				"ekrana"
 			],
 			"desc": "Kako je okrenut ekran. <A=automatski, L=za levoruke, D=za desnoruke>"
 		},
-		"BoostEnabled": {
-			"text": "Pjčnj",
-			"text2": [
-				"Pojačanje",
-				"omogućeno"
-			],
-			"desc": "Držanje prednjeg tastera tokom lemljenja dodatno pojačava temperaturu vrha."
-		},
 		"BoostTemperature": {
-			"text": "TPjč",
 			"text2": [
 				"Temp.",
 				"pojačanja"
@@ -147,7 +141,6 @@
 			"desc": "Temperatura vrha lemilice u toku pojačanja."
 		},
 		"AutoStart": {
-			"text": "VrćSta",
 			"text2": [
 				"Vrući",
 				"start"
@@ -155,7 +148,6 @@
 			"desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se."
 		},
 		"CooldownBlink": {
-			"text": "UpzHla",
 			"text2": [
 				"Upozorenje",
 				"pri hlađenju"
@@ -163,7 +155,6 @@
 			"desc": "Prikaz temperature trepće prilikom hlađenja dokle god je vrh i dalje vruć."
 		},
 		"TemperatureCalibration": {
-			"text": "KalbrTmp",
 			"text2": [
 				"Kalibracija",
 				"temperature"
@@ -171,7 +162,6 @@
 			"desc": "Kalibrisanje odstupanja temperature vrha u odnosu na dršku."
 		},
 		"SettingsReset": {
-			"text": "FabrPost",
 			"text2": [
 				"Fabričke",
 				"postavke"
@@ -179,7 +169,6 @@
 			"desc": "Vraćanje svih postavki na fabričke vrednosti."
 		},
 		"VoltageCalibration": {
-			"text": "KalbrNap",
 			"text2": [
 				"Kalibracija",
 				"ulaznog napona"
@@ -187,7 +176,6 @@
 			"desc": "Kalibrisanje ulaznog napona. Podešava se na tastere; dugi pritisak za kraj."
 		},
 		"AdvancedSoldering": {
-			"text": "DtlLem",
 			"text2": [
 				"Detalji tokom",
 				"lemljenja"
@@ -195,7 +183,6 @@
 			"desc": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja."
 		},
 		"ScrollingSpeed": {
-			"text": "BrzPor",
 			"text2": [
 				"Brzina",
 				"poruka"
@@ -203,7 +190,6 @@
 			"desc": "Brzina kretanja opisnih poruka poput ove. <S=sporo, B=brzo>"
 		},
 		"TipModel": {
-			"text": "ModelVrh",
 			"text2": [
 				"Model",
 				"vrha"
@@ -211,7 +197,6 @@
 			"desc": "Odabir modela lemnog vrha."
 		},
 		"SimpleCalibrationMode": {
-			"text": "JedKalbr",
 			"text2": [
 				"Jednostavna",
 				"kalibracija"
@@ -219,31 +204,20 @@
 			"desc": "Jednostavna kalibracija kipućom vodom."
 		},
 		"AdvancedCalibrationMode": {
-			"text": "NapKalbr",
 			"text2": [
 				"Napredna",
 				"kalibracija"
 			],
 			"desc": "Napredna kalibracija pomoću termopara."
 		},
-		"PowerInput": {
-			"text": "UlazSnag",
+		"QCMaxVoltage": {
 			"text2": [
 				"Ulazna",
 				"snaga"
 			],
 			"desc": "Snaga napajanja u vatima."
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -251,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -259,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -267,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_sv.json

@@ -21,7 +21,12 @@
 		"TipDisconnectedString": "SPETS URTAGEN",
 		"SolderingAdvancedPowerPrompt": "Ström: ",
 		"OffString": "Av",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Reset OK",
+		"YourGainMessage": "Your gain:",
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "H",
@@ -32,9 +37,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "",
+		"DCInCutoff": {
 			"text2": [
 				"Ström-",
 				"källa"
@@ -75,7 +85,6 @@
 			"desc": "Strömkälla. Anger lägsta spänning. <DC 10V> <S 3.3V per cell>"
 		},
 		"SleepTemperature": {
-			"text": "",
 			"text2": [
 				"Vilo-",
 				"temp"
@@ -83,7 +92,6 @@
 			"desc": "Vilotemperatur <C>"
 		},
 		"SleepTimeout": {
-			"text": "",
 			"text2": [
 				"Vilo-",
 				"timeout"
@@ -91,7 +99,6 @@
 			"desc": "Vilo-timeout <Minuter/Seconder>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
 			"text2": [
 				"Avstängn.",
 				"timeout"
@@ -99,7 +106,6 @@
 			"desc": "Avstängnings-timeout <Minuter>"
 		},
 		"MotionSensitivity": {
-			"text": "",
 			"text2": [
 				"Rörelse-",
 				"känslighet"
@@ -107,7 +113,6 @@
 			"desc": "Rörelsekänslighet <0.Av 1.minst känslig 9.mest känslig>"
 		},
 		"TemperatureUnit": {
-			"text": "",
 			"text2": [
 				"Temperatur-",
 				"enheter"
@@ -115,7 +120,6 @@
 			"desc": "Temperaturenhet <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "",
 			"text2": [
 				"Detaljerad",
 				"vid inaktiv"
@@ -123,23 +127,13 @@
 			"desc": "Visa detaljerad information i mindre typsnitt när inaktiv."
 		},
 		"DisplayRotation": {
-			"text": "",
 			"text2": [
 				"Visnings",
 				"läge"
 			],
 			"desc": "Visningsläge <A. Automatisk V. Vänsterhänt H. Högerhänt>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Turboläge",
-				"aktiverat"
-			],
-			"desc": "Aktivera främre knappen för turboläge (temperaturhöjning) vid lödning"
-		},
 		"BoostTemperature": {
-			"text": "",
 			"text2": [
 				"Turbo-",
 				"temp"
@@ -147,7 +141,6 @@
 			"desc": "Temperatur i \"turbo\"-läge"
 		},
 		"AutoStart": {
-			"text": "",
 			"text2": [
 				"Auto",
 				"start"
@@ -155,7 +148,6 @@
 			"desc": "Startar automatiskt lödpennan vid uppstart. T=Lödning, S=Viloläge, F=Av"
 		},
 		"CooldownBlink": {
-			"text": "",
 			"text2": [
 				"Nedkylnings-",
 				"blink"
@@ -163,7 +155,6 @@
 			"desc": "Blinka temperaturen medan spetsen kyls av och fortfarande är varm."
 		},
 		"TemperatureCalibration": {
-			"text": "",
 			"text2": [
 				"Kalibrera",
 				"temperatur?"
@@ -171,7 +162,6 @@
 			"desc": "Kalibrera spets-kompensation."
 		},
 		"SettingsReset": {
-			"text": "",
 			"text2": [
 				"Fabriks-",
 				"inställ?"
@@ -179,7 +169,6 @@
 			"desc": "Återställ alla inställningar"
 		},
 		"VoltageCalibration": {
-			"text": "",
 			"text2": [
 				"Kalibrera",
 				"inspänning?"
@@ -187,7 +176,6 @@
 			"desc": "Inspänningskalibrering. Knapparna justerar, håll inne för avslut"
 		},
 		"AdvancedSoldering": {
-			"text": "",
 			"text2": [
 				"Detaljerad",
 				"lödng.skärm"
@@ -195,7 +183,6 @@
 			"desc": "Visa detaljerad information vid lödning"
 		},
 		"ScrollingSpeed": {
-			"text": "",
 			"text2": [
 				"Beskrivning",
 				"rullhast."
@@ -203,7 +190,6 @@
 			"desc": "Hastighet som den här texten rullar i"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Tip",
 				"Model"
@@ -211,7 +197,6 @@
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Simple",
 				"Calibration"
@@ -219,31 +204,20 @@
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"P Limit",
-				"Enable"
-			],
-			"desc": "Enable power limit"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
@@ -251,7 +225,6 @@
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
@@ -259,7 +232,6 @@
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
@@ -267,12 +239,39 @@
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Keep awake pulse power intensity"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_tr.json

@@ -6,13 +6,13 @@
 		"SettingsCalibrationDone": "Kalibrasyon tamamlandı!",
 		"SettingsCalibrationWarning": "Lütfen devam etmeden önce ucun oda sıcaklığında olduğunu garantiye alın!",
 		"SettingsResetWarning": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz?",
-		"UVLOWarningString": "DC LOW",
-		"UndervoltageString": "Düşüş Voltaj",
+		"UVLOWarningString": "Güç Az",
+		"UndervoltageString": "Düşük Voltaj",
 		"InputVoltageString": "Giriş V: ",
 		"WarningTipTempString": "Uç Sıcaklığı: ",
 		"BadTipString": "KÖTÜ UÇ",
 		"SleepingSimpleString": "Zzzz",
-		"SleepingAdvancedString": "Uyuyor...",
+		"SleepingAdvancedString": "Bekleme Modu ...",
 		"WarningSimpleString": "SICAK!",
 		"WarningAdvancedString": "UYARI! UÇ SICAK!",
 		"SleepingTipAdvancedString": "Uç:",
@@ -21,7 +21,9 @@
 		"TipDisconnectedString": "UÇ ÇIKARILDI",
 		"SolderingAdvancedPowerPrompt": "Güç: ",
 		"OffString": "Kapalı",
-		"ResetOKMessage": "Reset Tamam"
+		"ResetOKMessage": "Sıfırlama Tamam",
+		"YourGainMessage": "Kazancınız:",
+		"SettingsResetMessage": "Ayarlar Sıfırlandı"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -32,9 +34,15 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": false,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,144 +74,126 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "PWRSC",
+		"DCInCutoff": {
 			"text2": [
-				"",
+				"GÇKYN",
 				""
 			],
-			"desc": "Güç Kaynağı. kesim geriliminı ayarlar. <DC 10V> <S 3.3V hücre başına>"
+			"desc": "\"Güç Kaynağı\". En düşük çalışma voltajını ayarlar. <DC 10V> <S 3.3V hücre başına>"
 		},
 		"SleepTemperature": {
-			"text": "STMP",
 			"text2": [
-				"",
+				"BKSC",
 				""
 			],
-			"desc": "Uyku Sıcaklığı <C>"
+			"desc": "Bekleme Modu Sıcaklığı <C>"
 		},
 		"SleepTimeout": {
-			"text": "STME",
 			"text2": [
-				"",
+				"BMZA",
 				""
 			],
-			"desc": "Uyku Zaman Aşımı <Dakika/Saniye>"
+			"desc": "Bekleme Modu Zaman Aşımı <Dakika/Saniye>"
 		},
 		"ShutdownTimeout": {
-			"text": "SHTME",
 			"text2": [
-				"",
+				"KPTZA",
 				""
 			],
 			"desc": "Kapatma Zaman Aşımı <Dakika>"
 		},
 		"MotionSensitivity": {
-			"text": "MSENSE",
 			"text2": [
-				"",
+				"HARHAS",
 				""
 			],
 			"desc": "Hareket Hassasiyeti <0.Kapalı 1.En az duyarlı 9.En duyarlı>"
 		},
 		"TemperatureUnit": {
-			"text": "TMPUNT",
 			"text2": [
-				"",
+				"SCKBRM",
 				""
 			],
-			"desc": "Sıcaklık Ünitesi <C=Celsius F=Fahrenheit>"
+			"desc": "Sıcaklık Birimi <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-			"text": "ADVIDL",
 			"text2": [
-				"",
+				"AYRBİL",
 				""
 			],
 			"desc": "Boş ekranda ayrıntılı bilgileri daha küçük bir yazı tipi ile göster."
 		},
 		"DisplayRotation": {
-			"text": "DSPROT",
 			"text2": [
-				"",
+				"GRNYÖN",
 				""
 			],
 			"desc": "Görüntü Yönlendirme <A. Otomatik L. Solak R. Sağlak>"
 		},
 		"BoostEnabled": {
-			"text": "BOOST",
 			"text2": [
-				"",
+				"YÜKPER",
 				""
 			],
-			"desc": "Lehimleme yaparken ön tuşa basmak Boost moduna sokar(450C)"
+			"desc": "Lehimleme yaparken ön tuşa basmak anlık sıcaklık yükselişi sağlar. (450C)"
 		},
 		"BoostTemperature": {
-			"text": "BTMP",
 			"text2": [
-				"",
+				"YKSC",
 				""
 			],
-			"desc": "\"boost\" Modu Derecesi"
+			"desc": "Yüksek Performans Modu Sıcaklığı"
 		},
 		"AutoStart": {
-			"text": "ASTART",
 			"text2": [
-				"",
+				"OTOBAŞ",
 				""
 			],
 			"desc": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. T=Lehimleme Modu, S= Uyku Modu,F=Kapalı"
 		},
 		"CooldownBlink": {
-			"text": "CLBLNK",
 			"text2": [
-				"",
+				"SĞGÖST",
 				""
 			],
-			"desc": "Soğutma ekranında uç hala sıcakken derece yanıp sönsün."
+			"desc": "Soğutma ekranında uç hala sıcakken derece gösterilsin."
 		},
 		"TemperatureCalibration": {
-			"text": "TMP CAL?",
 			"text2": [
-				"",
+				"SCK KAL?",
 				""
 			],
 			"desc": "Ucu kalibre et."
 		},
 		"SettingsReset": {
-			"text": "RESET?",
 			"text2": [
-				"",
+				"SIFIRLA?",
 				""
 			],
-			"desc": "Bütün ayarları sıfırla"
+			"desc": "Bütün ayarları sıfırlar"
 		},
 		"VoltageCalibration": {
-			"text": "CAL VIN?",
 			"text2": [
-				"",
+				"VOL KAL?",
 				""
 			],
-			"desc": "VIN Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas."
+			"desc": "Voltaj Girişi Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas."
 		},
 		"AdvancedSoldering": {
-			"text": "ADVSLD",
 			"text2": [
-				"",
+				"GELLHM",
 				""
 			],
-			"desc": "Lehimleme yaparken detaylı bilgi göster"
+			"desc": "\"Gelişmiş Lehimleme\" Lehimleme yaparken detaylı bilgi göster"
 		},
 		"ScrollingSpeed": {
-			"text": "DESCSP",
 			"text2": [
-				"",
+				"YZKYHZ",
 				""
 			],
-			"desc": "Speed this text scrolls past at"
+			"desc": "Bu yazının kayma hızı S= Yavaş, F= Hızlı"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Uç",
 				"Modeli"
@@ -211,7 +201,6 @@
 			"desc": "Uç Modeli seçimi"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Basit",
 				"Kalibrasyon"
@@ -219,60 +208,88 @@
 			"desc": "Sıcak su kullanarak basit kalibrasyon"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Gelişmiş",
 				"Kalibrasyon"
 			],
 			"desc": "Uçtaki ısı sensörünü kullanarak gelişmiş kalibrasyon"
 		},
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"Voltage"
+			],
+			"desc": "Desired max QC Voltage negotiated for"
+		},
 		"PowerInput": {
-			"text": "PWRW",
 			"text2": [
 				"Güç",
 				"Miktarı(W)"
 			],
-			"desc": "Kullanılan adaptörün güç miktarı"
+			"desc": "Kullanılan adaptörün watt biriminden güç miktarı"
 		},
 		"PowerLimitEnable": {
-			"text": "PLIMEN",
 			"text2": [
 				"P Limit",
 				"Enable"
 			],
-			"desc": "Enable power limit"
+			"desc": "Güç sınırlamayı aç"
 		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
 				"Power",
 				"Limit"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Havyanın kullanacağı en yüksek güç <Watts>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
 				"Key +-",
 				"reverse?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "\"Düğme Yerleri Rotasyonu\" Sıcaklık ayar düğmelerinin yerini değiştirin"
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
 				"Temp change",
 				"short?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Kısa basışlardaki sıcaklık derecesi atlama oranı"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
 				"Temp change",
 				"long?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Uzun başışlardaki sıcaklık derecesi atlama oranı"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Power",
+				"Pulse W"
+			],
+			"desc": "Güç girişi voltajı ölçüm yoğunluğunu sık tut."
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Kazancınız"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
 }

Translation Editor/translation_uk.json

@@ -5,36 +5,47 @@
 	"messages": {
 		"SettingsCalibrationDone": "Калібрування виконане!",
 		"SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!",
-		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням?",
+		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? <A - Так, В - Ні>",
 		"UVLOWarningString": "АККУМ--",
-		"UndervoltageString": "Під живленням",
+		"UndervoltageString": "Низ. напруга",
 		"InputVoltageString": "Жив.(B): ",
 		"WarningTipTempString": "Жало t°: ",
-		"BadTipString": "Жало--",
-		"SleepingSimpleString": "Сон ",
+		"BadTipString": "ЖАЛО--",
+		"SleepingSimpleString": "ZzZzz",
 		"SleepingAdvancedString": "Очікування...",
-		"WarningSimpleString": "АЙ!",
-		"WarningAdvancedString": "УВАГА ГАРЯЧЕ!",
+		"WarningSimpleString": "ГАРЯЧЕ!",
+		"WarningAdvancedString": "!!! ГАРЯЧЕ ЖАЛО !!!",
 		"SleepingTipAdvancedString": "Жало:",
 		"IdleTipString": "Жало:",
 		"IdleSetString": " ->",
 		"TipDisconnectedString": "Жало вимкнено!",
 		"SolderingAdvancedPowerPrompt": "Живлення: ",
 		"OffString": "Вимк",
-		"ResetOKMessage": "Reset OK"
+		"ResetOKMessage": "Скидання OK",
+		"YourGainMessage": "Приріст:",
+		"SettingsResetMessage": "Налаштування скинуті!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
 		"SettingLeftChar": "Л",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "+",
-		"SettingSlowChar": "-",
-		"SettingStartSolderingChar": "T",
-		"SettingStartSleepChar": "S",
-		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingFastChar": "Ш",
+		"SettingSlowChar": "П",
+		"SettingStartSolderingChar": "П",
+		"SettingStartSleepChar": "О",
+		"SettingStartSleepOffChar": "К",
+		"SettingStartNoneChar": "В",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
-	"menuDouble": true,
 	"menuGroups": {
 		"SolderingMenu": {
 			"text2": [
@@ -66,8 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-			"text": "ДжЖив",
+		"DCInCutoff": {
 			"text2": [
 				"Джерело",
 				"живлення"
@@ -75,7 +85,6 @@
 			"desc": "Встановлення напруги відключення. <DC - 10V, 3S - 9.9V, 4S - 13.2V, 5S - 16.5V, 6S - 19.8V>"
 		},
 		"SleepTemperature": {
-			"text": "",
 			"text2": [
 				"Темпер.",
 				"сну"
@@ -83,15 +92,13 @@
 			"desc": "Температура режиму очікування <C°/F°>"
 		},
 		"SleepTimeout": {
-			"text": "",
 			"text2": [
 				"Тайм-аут",
 				"сну"
 			],
-			"desc": "Час до переходу в режим очікування <Хвилини>"
+			"desc": "Час до переходу в режим очікування <Хвилини/Секунди>"
 		},
 		"ShutdownTimeout": {
-			"text": "",
 			"text2": [
 				"Часу до",
 				"вимкнення"
@@ -99,15 +106,13 @@
 			"desc": "Час до відключення <Хвилини>"
 		},
 		"MotionSensitivity": {
-			"text": "",
 			"text2": [
 				"Чутл. сенсо-",
 				"ру руху"
 			],
-			"desc": "Акселерометр <0 - Вимк. 1 хв. чутливості 9 - макс. чутливості>"
+			"desc": "Акселерометр <0 - Вимк. 1 - мін. чутливості 9 - макс. чутливості>"
 		},
 		"TemperatureUnit": {
-			"text": "",
 			"text2": [
 				"Формат темпе-",
 				"ратури(C°/F°)"
@@ -115,7 +120,6 @@
 			"desc": "Одиниця виміру температури <C - Цельсій, F - Фаренгейт>"
 		},
 		"AdvancedIdle": {
-			"text": "",
 			"text2": [
 				"Детальний ре-",
 				"жим очікуван."
@@ -123,23 +127,13 @@
 			"desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
 		},
 		"DisplayRotation": {
-			"text": "",
 			"text2": [
 				"Автоповорот",
 				"екрану"
 			],
 			"desc": "Орієнтація дисплея <A - Автоповорот, Л - Лівша, П - Правша>"
 		},
-		"BoostEnabled": {
-			"text": "",
-			"text2": [
-				"Режим",
-				"Турбо"
-			],
-			"desc": "Турбо-режим при утриманні кнопки А при пайці"
-		},
 		"BoostTemperature": {
-			"text": "",
 			"text2": [
 				"Темпер.",
 				"Турбо"
@@ -147,15 +141,13 @@
 			"desc": "Температура в Турбо-режимі"
 		},
 		"AutoStart": {
-			"text": "",
 			"text2": [
 				"Гарячий",
 				"старт"
 			],
-			"desc": "Автоматичний перехід в режим пайки при ввімкнені живлення."
+			"desc": "Режим з яким запускається паяльник при подачі живлення <П=Пайка, О=Очікування, К=Очікування при кімн. темп., В=Вимк.>"
 		},
 		"CooldownBlink": {
-			"text": "",
 			"text2": [
 				"Показ t° при",
 				"охолодж."
@@ -163,7 +155,6 @@
 			"desc": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран моргає"
 		},
 		"TemperatureCalibration": {
-			"text": "",
 			"text2": [
 				"Калібровка",
 				"температури"
@@ -171,7 +162,6 @@
 			"desc": "Калібрування температурного датчика."
 		},
 		"SettingsReset": {
-			"text": "",
 			"text2": [
 				"Скинути всі",
 				"налаштування?"
@@ -179,7 +169,6 @@
 			"desc": "Скидання всіх параметрів до стандартних значень."
 		},
 		"VoltageCalibration": {
-			"text": "",
 			"text2": [
 				"Калібрування",
 				"напруги"
@@ -187,7 +176,6 @@
 			"desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
 		},
 		"AdvancedSoldering": {
-			"text": "",
 			"text2": [
 				"Детальний ре-",
 				"жим пайки"
@@ -195,15 +183,13 @@
 			"desc": "Показувати детальну інформацію при пайці."
 		},
 		"ScrollingSpeed": {
-			"text": "",
 			"text2": [
 				"Швидкість",
 				"тексту"
 			],
-			"desc": "Швидкість прокрутки тексту"
+			"desc": "Швидкість прокрутки тексту <П=повільно, Ш=швидко>"
 		},
 		"TipModel": {
-			"text": "TIPMO",
 			"text2": [
 				"Модель",
 				"Жало"
@@ -211,7 +197,6 @@
 			"desc": "Вибір моделі жала"
 		},
 		"SimpleCalibrationMode": {
-			"text": "SMPCAL",
 			"text2": [
 				"Просте",
 				"Калібрування"
@@ -219,60 +204,74 @@
 			"desc": "Просте калібрування з використанням гарячої води"
 		},
 		"AdvancedCalibrationMode": {
-			"text": "ADVCAL",
 			"text2": [
 				"Детальне",
 				"Калібрування"
 			],
 			"desc": "Калібрування за допомогою термопари"
 		},
-		"PowerInput": {
-			"text": "PWRW",
+		"QCMaxVoltage": {
 			"text2": [
 				"Потужність",
 				"дж. живл."
 			],
 			"desc": "Потужність джерела живлення в Ватах"
 		},
-		"PowerLimitEnable": {
-			"text": "PLIMEN",
-			"text2": [
-				"Ліміт",
-				"потужності"
-			],
-			"desc": "Вмикає обмеження потужності споживання"
-		},
 		"PowerLimit": {
-			"text": "PLIM",
 			"text2": [
-				"Максимальна",
-				"потужність"
+				"Макс.",
+				"потуж."
 			],
 			"desc": "Макс. потужність, яку може використовувати паяльник <Ват>"
 		},
 		"ReverseButtonTempChange": {
-			"text": "RVTCHG",
 			"text2": [
-				"Key +-",
-				"reverse?"
+				"Інвертувати",
+				"кнопки +-?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Інвертувати кнопки зміни температури."
 		},
 		"TempChangeShortStep": {
-			"text": "TCHGST",
 			"text2": [
-				"Temp change",
-				"short?"
+				"Зм. темп.",
+				"коротко?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Змінювати температуру при короткому натисканні!"
 		},
 		"TempChangeLongStep": {
-			"text": "TCHGLT",
 			"text2": [
-				"Temp change",
-				"long?"
+				"Зм. темп.",
+				"довго?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Змінювати температуру при довгому натисканні!"
+		},
+		"PowerPulsePower": {
+			"text2": [
+				"Пульс.",
+				"Навантаж."
+			],
+			"desc": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії (це потрібно щоб паяльник не вимкнувся з часом)"
+		},
+		"TipGain": {
+			"text2": [
+				"Modify",
+				"tip gain"
+			],
+			"desc": "Tip gain"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Hall Eff",
+				"Sensitivity"
+			],
+			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Allow buttons",
+				"locking"
+			],
+			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
 		}
 	}
-}
+}

Translation Editor/translations_def.js

@@ -94,6 +94,21 @@ var def =
 			"id": "SettingsResetMessage",
 			"maxLen": 16,
 			"default": "Settings were\nreset!"
+		},
+		{
+			"id": "LockingKeysString",
+			"maxLen": 8,
+			"default": "LOCKING"
+		},
+		{
+			"id": "UnlockingKeysString",
+			"maxLen": 8,
+			"default": "UNLOCK"
+		},
+		{
+			"id": "WarningKeysLockedString",
+			"maxLen": 8,
+			"default": "LOCKED!"
 		}
 	],
 	"characters": [
@@ -132,6 +147,36 @@ var def =
 		{
 			"id": "SettingStartNoneChar",
 			"len": 1
+		},
+		{
+			"id": "SettingSensitivityOff",
+			"len": 1
+		},
+		{
+			"id": "SettingSensitivityLow",
+			"len": 1
+		},
+		{
+			"id": "SettingSensitivityMedium",
+			"len": 1
+		},
+		{
+			"id": "SettingSensitivityHigh",
+			"len": 1
+		}, {
+			"id": "SettingLockDisableChar",
+			"len": 1,
+			"default": "D"
+		},
+		{
+			"id": "SettingLockBoostChar",
+			"len": 1,
+			"default": "B"
+		},
+		{
+			"id": "SettingLockFullChar",
+			"len": 1,
+			"default": "F"
 		}
 	],
 	"menuGroups": [
@@ -154,7 +199,7 @@ var def =
 	],
 	"menuOptions": [
 		{
-			"id": "PowerSource",
+			"id": "DCInCutoff",
 			"maxLen": 5,
 			"maxLen2": 11
 		},
@@ -193,11 +238,6 @@ var def =
 			"maxLen": 6,
 			"maxLen2": 13
 		},
-		{
-			"id": "BoostEnabled",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
 		{
 			"id": "BoostTemperature",
 			"maxLen": 4,
@@ -254,15 +294,10 @@ var def =
 			"maxLen2": 16
 		},
 		{
-			"id": "PowerInput",
+			"id": "QCMaxVoltage",
 			"maxLen": 8,
 			"maxLen2": 16
 		},
-		{
-			"id": "PowerLimitEnable",
-			"maxLen": 6,
-			"maxLen2": 13
-		},
 		{
 			"id": "PowerLimit",
 			"maxLen": 5,
@@ -282,6 +317,25 @@ var def =
 			"id": "TempChangeLongStep",
 			"maxLen": 6,
 			"maxLen2": 16
+		},
+		{
+			"id": "PowerPulsePower",
+			"maxLen": 6,
+			"maxLen2": 16
+		},
+		{
+			"id": "TipGain",
+			"maxLen": 6,
+			"maxLen2": 8
+		},
+		{
+			"id": "HallEffSensitivity",
+			"maxLen": 6,
+			"maxLen2": 8
+		}, {
+			"id": "LockingMode",
+			"maxLen": 6,
+			"maxLen2": 13
 		}
 	]
 }

ci/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2.md5

@@ -0,0 +1 @@
+2b9eeccc33470f9d3cda26983b9d2dc6  gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2

ci/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2.md5

@@ -0,0 +1 @@
+add5b6a9b12987d0e72f55a4d2cd0f3b  nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2

ci/secrets/decrypt.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SECRETS="$DIR/encrypted/*.encrypted"
-KEY="$DIR/../../codeship.aes"
-
-mkdir -p $DIR/unencrypted
-
-for f in $SECRETS
-do
-    out="${f/.encrypted/.secret}"
-    out="${out/encrypted/unencrypted}"
-    echo $out
-    jet decrypt $f $out --key-path $KEY
-done
-
-echo "Done"

ci/secrets/encrypted/deployment.encrypted

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

codeship-services.yml

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

codeship-steps.yml

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

docker-compose.yml

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

setup.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+set -e
+# Setup shell file to setup the environment on an ubuntu machine
+sudo apt-get update && sudo apt-get install -y make bzip2 git python3 wget 
+sudo mkdir -p /build
+cd /build
+
+#Download source files to cache folder
+# Remember if these are updated, you need to update the md5 file respectively
+# Github checks out under $GITHUB_WORKSPACE
+MDPATH=${GITHUB_WORKSPACE:-/build/source/}
+sudo mkdir -p /build/cache
+cd /build/cache/
+if md5sum -c $MDPATH/ci/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2.md5; then
+    echo "Good MD5 ARM"
+else
+    echo "ARM MD5 Mismatch, downloading fresh"
+    sudo wget -q https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 -O gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
+fi
+
+if md5sum -c $MDPATH/ci/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2.md5; then
+    echo "Good MD5 RISCV"
+else
+    echo "RISCV MD5 Mismatch, downloading fresh"
+    sudo wget -q https://github.com/Ralim/nuclei-compiler/releases/download/2020.08/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2 -O nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2
+fi
+
+echo "Extracting compilers"
+sudo tar -xj -f gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 -C /build/
+sudo tar -xj -f nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2 -C /build/
+
+echo "Link into PATH"
+
+sudo ln -s /build/gcc-arm-none-eabi-9-2020-q2-update/bin/* /usr/local/bin
+sudo ln -s /build/gcc/bin/* /usr/local/bin

workspace/TS100/Core/BSP/BSP.h

@@ -0,0 +1,77 @@
+#include <stdint.h>
+#include <stdbool.h>
+#include "BSP_Flash.h"
+#include "BSP_Power.h"
+#include "BSP_QC.h"
+#include "Defines.h"
+#include "Model_Config.h"
+/*
+ * BSP.h -- Board Support
+ *
+ * This exposes functions that are expected to be implemented to add support for different hardware
+ */
+
+#ifndef BSP_BSP_H_
+#define BSP_BSP_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// maximum htim2 PWM value
+extern const uint16_t powerPWM;
+// htim2.Init.Period, the full PWM cycle
+extern uint16_t totalPWM;
+
+// Called first thing in main() to init the hardware
+void preRToSInit();
+// Called once the RToS has started for any extra work
+void postRToSInit();
+
+// Called once from preRToSInit()
+void BSPInit(void);
+
+// Called to reset the hardware watchdog unit
+void resetWatchdog();
+// Accepts a output level of 0.. to use to control the tip output PWM
+void setTipPWM(uint8_t pulse);
+// Returns the Handle temp in C, X10
+uint16_t getHandleTemperature();
+// Returns the Tip temperature ADC reading in raw units
+uint16_t getTipRawTemp(uint8_t refresh);
+// Returns the main DC input voltage, using the adjustable divisor + sample flag
+uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample);
+// Switch to the most suitable PWM freq given the desired period;
+// returns true if the switch was performed and totalPWM changed
+bool tryBetterPWM(uint8_t pwm);
+
+// Readers for the two buttons
+// !! Returns 1 if held down, 0 if released
+uint8_t getButtonA();
+uint8_t getButtonB();
+
+// This is a work around that will be called if I2C starts to bug out
+// This should toggle the SCL line until SDA goes high to end the current transaction
+void unstick_I2C();
+
+// Reboot the IC when things go seriously wrong
+void reboot();
+
+// If the user has programmed in a bootup logo, draw it to the screen from flash
+// Returns 1 if the logo was printed so that the unit waits for the timeout or button
+uint8_t showBootLogoIfavailable();
+//delay wrapper for delay using the hardware timer (used before RTOS)
+void delay_ms(uint16_t count) ;
+//Used to allow knowledge of if usb_pd is being used
+uint8_t usb_pd_detect();
+bool getHallSensorFitted();
+// If the iron has a hall effect sensor in the handle, return an signed count of the reading
+// If the sensor is single polarity (or polarity insensitive) just return 0..32768
+int16_t getRawHallEffect();
+
+//Returns true if power is from dumb "DC" input rather than "smart" QC or PD
+bool getIsPoweredByDCIN();
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_BSP_H_ */

workspace/TS100/Core/BSP/BSP_Common.c

@@ -0,0 +1 @@
+#include "BSP.h"

workspace/TS100/Core/BSP/BSP_Flash.h

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

workspace/TS100/Core/BSP/BSP_PD.h

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

workspace/TS100/Core/BSP/BSP_Power.h

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

workspace/TS100/Core/BSP/BSP_QC.h

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

workspace/TS100/Core/BSP/Defines.h

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

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

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

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

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

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

@@ -0,0 +1,171 @@
+/*
+ FreeRTOS V9.0.0 - Copyright (C) 2016 Real Time Engineers Ltd.
+ All rights reserved
+
+ VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
+
+ This file is part of the FreeRTOS distribution.
+
+ FreeRTOS is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License (version 2) as published by the
+ Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
+
+ ***************************************************************************
+ >>!   NOTE: The modification to the GPL is included to allow you to     !<<
+ >>!   distribute a combined work that includes FreeRTOS without being   !<<
+ >>!   obliged to provide the source code for proprietary components     !<<
+ >>!   outside of the FreeRTOS kernel.                                   !<<
+ ***************************************************************************
+
+ FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE.  Full license text is available on the following
+ link: http://www.freertos.org/a00114.html
+
+ ***************************************************************************
+ *                                                                       *
+ *    FreeRTOS provides completely free yet professionally developed,    *
+ *    robust, strictly quality controlled, supported, and cross          *
+ *    platform software that is more than just the market leader, it     *
+ *    is the industry's de facto standard.                               *
+ *                                                                       *
+ *    Help yourself get started quickly while simultaneously helping     *
+ *    to support the FreeRTOS project by purchasing a FreeRTOS           *
+ *    tutorial book, reference manual, or both:                          *
+ *    http://www.FreeRTOS.org/Documentation                              *
+ *                                                                       *
+ ***************************************************************************
+
+ http://www.FreeRTOS.org/FAQHelp.html - Having a problem?  Start by reading
+ the FAQ page "My application does not run, what could be wrong?".  Have you
+ defined configASSERT()?
+
+ http://www.FreeRTOS.org/support - In return for receiving this top quality
+ embedded software for free we request you assist our global community by
+ participating in the support forum.
+
+ http://www.FreeRTOS.org/training - Investing in training allows your team to
+ be as productive as possible as early as possible.  Now you can receive
+ FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers
+ Ltd, and the world's leading authority on the world's leading RTOS.
+
+ http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
+ including FreeRTOS+Trace - an indispensable productivity tool, a DOS
+ compatible FAT file system, and our tiny thread aware UDP/IP stack.
+
+ http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.
+ Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.
+
+ http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High
+ Integrity Systems ltd. to sell under the OpenRTOS brand.  Low cost OpenRTOS
+ licenses offer ticketed support, indemnification and commercial middleware.
+
+ http://www.SafeRTOS.com - High Integrity Systems also provide a safety
+ engineered and independently SIL3 certified version for use in safety and
+ mission critical applications that require provable dependability.
+
+ 1 tab == 4 spaces!
+ */
+
+#ifndef FREERTOS_CONFIG_H
+#define FREERTOS_CONFIG_H
+
+/*-----------------------------------------------------------
+ * Application specific definitions.
+ *
+ * These definitions should be adjusted for your particular hardware and
+ * application requirements.
+ *
+ * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
+ *
+ * See http://www.freertos.org/a00110.html.
+ *----------------------------------------------------------*/
+
+/* USER CODE BEGIN Includes */
+/* Section where include file can be added */
+/* USER CODE END Includes */
+
+/* Ensure stdint is only used by the compiler, and not the assembler. */
+#if defined(__ICCARM__) || defined(__CC_ARM) || defined(__GNUC__)
+#include <stdint.h>
+extern uint32_t SystemCoreClock;
+#endif
+
+#define configUSE_PREEMPTION                     1
+#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)1000)
+#define configMAX_PRIORITIES                     ( 6 )
+#define configMINIMAL_STACK_SIZE                 ((uint16_t)256)
+#define configTOTAL_HEAP_SIZE                    ((size_t)1024*14) /*Currently use about 9000*/
+#define configMAX_TASK_NAME_LEN                  ( 32 )
+#define configUSE_16_BIT_TICKS                   0
+#define configUSE_MUTEXES                        1
+#define configQUEUE_REGISTRY_SIZE                8
+#define configUSE_TIMERS                         0
+#define configUSE_PORT_OPTIMISED_TASK_SELECTION  1
+#define configCHECK_FOR_STACK_OVERFLOW			 2 /*Bump this to 2 during development and bug hunting*/
+
+/* Co-routine definitions. */
+#define configUSE_CO_ROUTINES                    0
+#define configMAX_CO_ROUTINE_PRIORITIES          ( 2 )
+
+/* Set the following definitions to 1 to include the API function, or zero
+ to exclude the API function. */
+#define INCLUDE_vTaskPrioritySet            1
+#define INCLUDE_uxTaskPriorityGet           0
+#define INCLUDE_vTaskDelete                 0
+#define INCLUDE_vTaskCleanUpResources       0
+#define INCLUDE_vTaskSuspend                0
+#define INCLUDE_vTaskDelayUntil             0
+#define INCLUDE_vTaskDelay                  1
+#define INCLUDE_xTaskGetSchedulerState      1
+#define INCLUDE_uxTaskGetStackHighWaterMark 1
+
+/* Cortex-M specific definitions. */
+#ifdef __NVIC_PRIO_BITS
+ /* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
+ #define configPRIO_BITS         __NVIC_PRIO_BITS
+#else
+#define configPRIO_BITS         4
+#endif
+
+/* The lowest interrupt priority that can be used in a call to a "set priority"
+ function. */
+#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY   15
+
+/* The highest interrupt priority that can be used by any interrupt service
+ routine that makes calls to interrupt safe FreeRTOS API functions.  DO NOT CALL
+ INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
+ PRIORITY THAN THIS! (higher priorities are lower numeric values. */
+#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 5
+
+/* Interrupt priorities used by the kernel port layer itself.  These are generic
+ to all Cortex-M ports, and do not rely on any particular library functions. */
+#define configKERNEL_INTERRUPT_PRIORITY 		( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
+ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
+#define configMAX_SYSCALL_INTERRUPT_PRIORITY 	( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+
+/* Normal assert() semantics without relying on the provision of an assert.h
+ header file. */
+/* USER CODE BEGIN 1 */
+#define configASSERT( x ) if ((x) == 0) {taskDISABLE_INTERRUPTS(); for( ;; );} 
+/* USER CODE END 1 */
+
+/* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
+ standard names. */
+#define vPortSVCHandler    SVC_Handler
+#define xPortPendSVHandler PendSV_Handler
+
+#if configUSE_TIMERS
+#define configTIMER_TASK_PRIORITY 2
+#define configTIMER_QUEUE_LENGTH 8
+#define configTIMER_TASK_STACK_DEPTH (512/4)
+#endif
+
+#endif /* FREERTOS_CONFIG_H */

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,126 @@
+/*
+ * Pins.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_MINIWARE_PINS_H_
+#define BSP_MINIWARE_PINS_H_
+#include "Model_Config.h"
+
+#ifdef MODEL_TS100
+
+#define KEY_B_Pin GPIO_PIN_6
+#define KEY_B_GPIO_Port GPIOA
+#define TMP36_INPUT_Pin GPIO_PIN_7
+#define TMP36_INPUT_GPIO_Port GPIOA
+#define TMP36_ADC1_CHANNEL ADC_CHANNEL_7
+#define TMP36_ADC2_CHANNEL ADC_CHANNEL_7
+#define TIP_TEMP_Pin GPIO_PIN_0
+#define TIP_TEMP_GPIO_Port GPIOB
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_8
+#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_8
+#define VIN_Pin GPIO_PIN_1
+#define VIN_GPIO_Port GPIOB
+#define VIN_ADC1_CHANNEL ADC_CHANNEL_9
+#define VIN_ADC2_CHANNEL ADC_CHANNEL_9
+#define OLED_RESET_Pin GPIO_PIN_8
+#define OLED_RESET_GPIO_Port GPIOA
+#define KEY_A_Pin GPIO_PIN_9
+#define KEY_A_GPIO_Port GPIOA
+#define INT_Orientation_Pin GPIO_PIN_3
+#define INT_Orientation_GPIO_Port GPIOB
+#define PWM_Out_Pin GPIO_PIN_4
+#define PWM_Out_GPIO_Port GPIOB
+#define PWM_Out_CHANNEL TIM_CHANNEL_1
+#define PWM_Out_CCR
+#define INT_Movement_Pin GPIO_PIN_5
+#define INT_Movement_GPIO_Port GPIOB
+#define SCL_Pin GPIO_PIN_6
+#define SCL_GPIO_Port GPIOB
+#define SDA_Pin GPIO_PIN_7
+#define SDA_GPIO_Port GPIOB
+#endif
+#ifdef MODEL_TS80
+// TS80 pin map
+#define KEY_B_Pin GPIO_PIN_0
+#define KEY_B_GPIO_Port GPIOB
+#define TMP36_INPUT_Pin GPIO_PIN_4
+#define TMP36_INPUT_GPIO_Port GPIOA
+#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
+#define TMP36_ADC2_CHANNEL ADC_CHANNEL_4
+#define TIP_TEMP_Pin GPIO_PIN_3
+#define TIP_TEMP_GPIO_Port GPIOA
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3
+#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3
+
+#define VIN_Pin GPIO_PIN_2
+#define VIN_GPIO_Port GPIOA
+#define VIN_ADC1_CHANNEL ADC_CHANNEL_2
+#define VIN_ADC2_CHANNEL ADC_CHANNEL_2
+#define OLED_RESET_Pin GPIO_PIN_15
+#define OLED_RESET_GPIO_Port GPIOA
+#define KEY_A_Pin GPIO_PIN_1
+#define KEY_A_GPIO_Port GPIOB
+#define INT_Orientation_Pin GPIO_PIN_4
+#define INT_Orientation_GPIO_Port GPIOB
+#define PWM_Out_Pin GPIO_PIN_6
+#define PWM_Out_GPIO_Port GPIOA
+#define PWM_Out_CHANNEL TIM_CHANNEL_1
+#define INT_Movement_Pin GPIO_PIN_5
+#define INT_Movement_GPIO_Port GPIOB
+#define SCL_Pin GPIO_PIN_6
+#define SCL_GPIO_Port GPIOB
+#define SDA_Pin GPIO_PIN_7
+#define SDA_GPIO_Port GPIOB
+#define SCL2_Pin GPIO_PIN_5
+#define SCL2_GPIO_Port GPIOA
+#define SDA2_Pin GPIO_PIN_1
+#define SDA2_GPIO_Port GPIOA
+#define INT_PD_Pin GPIO_PIN_9
+#define INT_PD_GPIO_Port GPIOA
+
+#endif
+#ifdef MODEL_TS80P
+// TS80P pin map
+#define KEY_B_Pin GPIO_PIN_0
+#define KEY_B_GPIO_Port GPIOB
+#define TMP36_INPUT_Pin GPIO_PIN_4
+#define TMP36_INPUT_GPIO_Port GPIOA
+#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
+#define TMP36_ADC2_CHANNEL ADC_CHANNEL_4
+#define TIP_TEMP_Pin GPIO_PIN_3
+#define TIP_TEMP_GPIO_Port GPIOA
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3
+#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3
+
+#define VIN_Pin GPIO_PIN_2
+#define VIN_GPIO_Port GPIOA
+#define VIN_ADC1_CHANNEL ADC_CHANNEL_2
+#define VIN_ADC2_CHANNEL ADC_CHANNEL_2
+#define OLED_RESET_Pin GPIO_PIN_15
+#define OLED_RESET_GPIO_Port GPIOA
+#define KEY_A_Pin GPIO_PIN_1
+#define KEY_A_GPIO_Port GPIOB
+#define INT_Orientation_Pin GPIO_PIN_4
+#define INT_Orientation_GPIO_Port GPIOB
+#define PWM_Out_Pin GPIO_PIN_6
+#define PWM_Out_GPIO_Port GPIOA
+#define PWM_Out_CHANNEL TIM_CHANNEL_1
+#define INT_Movement_Pin GPIO_PIN_5
+#define INT_Movement_GPIO_Port GPIOB
+#define SCL_Pin GPIO_PIN_6
+#define SCL_GPIO_Port GPIOB
+#define SDA_Pin GPIO_PIN_7
+#define SDA_GPIO_Port GPIOB
+#define SCL2_Pin GPIO_PIN_5
+#define SCL2_GPIO_Port GPIOA
+#define SDA2_Pin GPIO_PIN_1
+#define SDA2_GPIO_Port GPIOA
+#define INT_PD_Pin GPIO_PIN_9
+#define INT_PD_GPIO_Port GPIOA
+
+#endif
+
+#endif /* BSP_MINIWARE_PINS_H_ */

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

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

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

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

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

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

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

@@ -5,6 +5,7 @@
  *      Author: Ben V. Brown
  */
 #include "Setup.h"
+#include "Pins.h"
 ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
@@ -16,8 +17,9 @@ DMA_HandleTypeDef hdma_i2c1_tx;
 IWDG_HandleTypeDef hiwdg;
 TIM_HandleTypeDef htim2;
 TIM_HandleTypeDef htim3;
-
-uint16_t ADCReadings[64];  // room for 32 lots of the pair of readings
+#define ADC_CHANNELS 2
+#define ADC_SAMPLES 16
+uint32_t ADCReadings[ADC_SAMPLES * ADC_CHANNELS];  // room for 32 lots of the pair of readings
 
 // Functions
 static void SystemClock_Config(void);
@@ -29,12 +31,11 @@ static void MX_TIM2_Init(void);
 static void MX_DMA_Init(void);
 static void MX_GPIO_Init(void);
 static void MX_ADC2_Init(void);
-
 void Setup_HAL() {
 	SystemClock_Config();
-#ifndef LOCAL_BUILD
-	__HAL_AFIO_REMAP_SWJ_DISABLE()
-	;
+
+#ifndef SWD_ENABLE
+	__HAL_AFIO_REMAP_SWJ_DISABLE();
 #else
 	__HAL_AFIO_REMAP_SWJ_NOJTAG();
 #endif
@@ -48,16 +49,20 @@ void Setup_HAL() {
 	MX_TIM2_Init();
 	MX_IWDG_Init();
 	HAL_ADC_Start(&hadc2);
-	HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t*) ADCReadings, 64); // start DMA of normal readings
-	HAL_ADCEx_InjectedStart(&hadc1);   // enable injected  readings
-	HAL_ADCEx_InjectedStart(&hadc2);   // enable injected  readings
+	HAL_ADCEx_MultiModeStart_DMA(&hadc1, ADCReadings, (ADC_SAMPLES * ADC_CHANNELS)); // start DMA of normal readings
+	HAL_ADCEx_InjectedStart(&hadc1);   // enable injected readings
+	HAL_ADCEx_InjectedStart(&hadc2);   // enable injected readings
 }
 
 // channel 0 -> temperature sensor, 1-> VIN
 uint16_t getADC(uint8_t channel) {
 	uint32_t sum = 0;
-	for (uint8_t i = 0; i < 32; i++)
-		sum += ADCReadings[channel + (i * 2)];
+	for (uint8_t i = 0; i < ADC_SAMPLES; i++) {
+		uint16_t adc1Sample = ADCReadings[channel + (i * ADC_CHANNELS)];
+		uint16_t adc2Sample = ADCReadings[channel + (i * ADC_CHANNELS)] >> 16;
+
+		sum += (adc1Sample + adc2Sample);
+	}
 	return sum >> 2;
 }
 
@@ -124,7 +129,7 @@ static void MX_ADC1_Init(void) {
 	hadc1.Init.DiscontinuousConvMode = DISABLE;
 	hadc1.Init.ExternalTrigConv = ADC_SOFTWARE_START;
 	hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
-	hadc1.Init.NbrOfConversion = 2;
+	hadc1.Init.NbrOfConversion = ADC_CHANNELS;
 	HAL_ADC_Init(&hadc1);
 
 	/**Configure the ADC multi-mode
@@ -135,14 +140,14 @@ static void MX_ADC1_Init(void) {
 	/**Configure Regular Channel
 	 */
 	sConfig.Channel = TMP36_ADC1_CHANNEL;
-	sConfig.Rank = 1;
+	sConfig.Rank = ADC_REGULAR_RANK_1;
 	sConfig.SamplingTime = ADC_SAMPLETIME_71CYCLES_5;
 	HAL_ADC_ConfigChannel(&hadc1, &sConfig);
 
 	/**Configure Regular Channel
 	 */
 	sConfig.Channel = VIN_ADC1_CHANNEL;
-	sConfig.Rank = 2;
+	sConfig.Rank = ADC_REGULAR_RANK_2;
 	HAL_ADC_ConfigChannel(&hadc1, &sConfig);
 
 	/**Configure Injected Channel
@@ -156,15 +161,15 @@ static void MX_ADC1_Init(void) {
 	sConfigInjected.InjectedChannel = TIP_TEMP_ADC1_CHANNEL;
 	sConfigInjected.InjectedRank = 1;
 	sConfigInjected.InjectedNbrOfConversion = 4;
-	sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_7CYCLES_5;
+	sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5;
 	sConfigInjected.ExternalTrigInjecConv = ADC_EXTERNALTRIGINJECCONV_T2_CC1;
 	sConfigInjected.AutoInjectedConv = DISABLE;
 	sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
 	sConfigInjected.InjectedOffset = 0;
 
 	HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
-
 	sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5;
+
 	sConfigInjected.InjectedRank = 2;
 	HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
 	sConfigInjected.InjectedRank = 3;
@@ -190,15 +195,16 @@ static void MX_ADC2_Init(void) {
 	hadc2.Init.DiscontinuousConvMode = DISABLE;
 	hadc2.Init.ExternalTrigConv = ADC_SOFTWARE_START;
 	hadc2.Init.DataAlign = ADC_DATAALIGN_RIGHT;
-	hadc2.Init.NbrOfConversion = 2;
+	hadc2.Init.NbrOfConversion = ADC_CHANNELS;
 	HAL_ADC_Init(&hadc2);
 
 	/**Configure Regular Channel
 	 */
-	sConfig.Channel = TIP_TEMP_ADC2_CHANNEL;
+	sConfig.Channel = TMP36_ADC2_CHANNEL;
 	sConfig.Rank = ADC_REGULAR_RANK_1;
 	sConfig.SamplingTime = ADC_SAMPLETIME_71CYCLES_5;
 	HAL_ADC_ConfigChannel(&hadc2, &sConfig);
+
 	sConfig.Channel = VIN_ADC2_CHANNEL;
 	sConfig.Rank = ADC_REGULAR_RANK_2;
 	HAL_ADC_ConfigChannel(&hadc2, &sConfig);
@@ -208,7 +214,7 @@ static void MX_ADC2_Init(void) {
 	sConfigInjected.InjectedChannel = TIP_TEMP_ADC2_CHANNEL;
 	sConfigInjected.InjectedRank = ADC_INJECTED_RANK_1;
 	sConfigInjected.InjectedNbrOfConversion = 4;
-	sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_7CYCLES_5;
+	sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5;
 	sConfigInjected.ExternalTrigInjecConv = ADC_EXTERNALTRIGINJECCONV_T2_CC1;
 	sConfigInjected.AutoInjectedConv = DISABLE;
 	sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
@@ -247,7 +253,7 @@ static void MX_IWDG_Init(void) {
 	hiwdg.Instance = IWDG;
 	hiwdg.Init.Prescaler = IWDG_PRESCALER_256;
 	hiwdg.Init.Reload = 100;
-#ifndef LOCAL_BUILD
+#ifndef SWD_ENABLE
 	HAL_IWDG_Init(&hiwdg);
 #endif
 }
@@ -278,7 +284,7 @@ static void MX_TIM3_Init(void) {
 	HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig);
 
 	sConfigOC.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 80;  //80% duty cycle, that is AC coupled through the cap
+	sConfigOC.Pulse = 50;  //50% 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);
@@ -314,13 +320,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 = 4000; //1mhz tick rate/800 = 1.25 KHz tick rate
+	// dummy value, will be reconfigured by BSPInit()
+	htim2.Init.Prescaler = 2000; // 2 MHz timer clock/2000 = 1 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
+	// These values give a rate of around 3.5 Hz for "fast" mode and 1.84 Hz for "slow"
 	htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
-	htim2.Init.Period = 255 + 17;
-	htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4;  // 4mhz before divide
+	// dummy value, will be reconfigured by BSPInit()
+	htim2.Init.Period = 255 + 17 * 2;
+	htim2.Init.ClockDivision = TIM_CLOCKDIVISION_DIV4; // 8 MHz (x2 APB1) before divide
 	htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
 	htim2.Init.RepetitionCounter = 0;
 	HAL_TIM_Base_Init(&htim2);
@@ -336,7 +344,8 @@ static void MX_TIM2_Init(void) {
 	HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
 
 	sConfigOC.OCMode = TIM_OCMODE_PWM1;
-	sConfigOC.Pulse = 255 + 13;//13 -> Delay of 5ms
+	// dummy value, will be reconfigured by BSPInit() in the BSP.cpp
+	sConfigOC.Pulse = 255 + 13 * 2;  // 13 -> Delay of 7 ms
 	//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.
@@ -428,8 +437,10 @@ static void MX_GPIO_Init(void) {
 	HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
 #ifdef MODEL_TS100
-	/* Pull USB lines low to disable, pull down debug too*/
-	GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13;
+#ifndef SWD_ENABLE
+	/* Pull USB and SWD lines low to prevent enumeration attempts and EMI affecting
+	 * the debug core */
+	GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_13 | GPIO_PIN_14;
 	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
 	GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
 	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@@ -437,6 +448,12 @@ static void MX_GPIO_Init(void) {
 	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_12, GPIO_PIN_RESET);
 	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_13, GPIO_PIN_RESET);
 	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_14, GPIO_PIN_RESET);
+#else
+	/* Make all lines affecting SWD floating to allow debugging */
+	GPIO_InitStruct.Pin = GPIO_PIN_11 | GPIO_PIN_12 | GPIO_PIN_14 | GPIO_PIN_13;
+	GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+#endif
 #else
 	/* TS80 */
 	/* Leave USB lines open circuit*/
@@ -461,3 +478,8 @@ static void MX_GPIO_Init(void) {
 	HAL_Delay(30);
 	HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_SET);
 }
+#ifdef  USE_FULL_ASSERT
+void assert_failed(uint8_t* file, uint32_t line){
+	asm("bkpt");
+}
+#endif

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

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

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

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