Bump Settings version

As during development some fields were removed.

.github/workflows/ccpp.yml

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

.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,4 +190,5 @@ fabric.properties
 .idea/httpRequests
 
 CoreCompileInputs.cache
-.vscode/settings.json
+.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

@@ -14,8 +14,10 @@ RUN apt-get update && \
   wget && \
   apt-get clean
 RUN wget -qO- https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 | tar -xj
+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-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

@@ -1,5 +1,33 @@
 # 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

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

@@ -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.

Documentation/Upgrading.md

@@ -1,72 +0,0 @@
-# Upgrading your iron
-
-## Miniware irons (TS100, TS80, TS80P)
-
-This is completely safe, but if it goes wrong just put the .hex file from the official website onto the unit and you're back to the old firmware. Downloads for the hex files to flash are available on the [releases page.](https://github.com/Ralim/ts100/releases) The file you want is called *(MODEL)_EN.hex* unless you want the translations, they are (MODEL)_*language short name*.hex. Where (MODEL) is either TS100 or TS80.
-
-Officially the bootloader on the iron only works under Windows (use the built-in File Explorer, as alternative file managers or copy handlers like Teracopy will fail). However, users have reported that it does work under Mac, and can be made to work under Linux *sometimes*. Details over on the [wiki page](https://github.com/Ralim/ts100/wiki/Upgrading-Firmware). 
-
-
-
-1. Hold the button closest to the tip, and plug in the USB to the computer.
-2. The unit will appear as a USB drive.
-3. Drag the .hex file onto the USB drive.
-4. The unit will disconnect and reconnect.
-5. The filename will have changed to end in .RDY or .ERR
-6. If it ends with .RDY you're done! Otherwise, something went wrong.
-7. If it didn't work the first time, try copying the file again without disconnecting the iron, often it will work on the second shot.
-8. Disconnect the USB and power up the iron. You're good to go.
-
-
-
-For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer.
-
-On the bottom of the MCU riser PCB, there are 4 pads for programming. On v2.51A PCB revision `USB_D+` is shorted to `SWDIO` and `USB_D-` is shorted to `SWCLK` so debugging works without disassembly (attach while staying in the bootloader). Installing [dapboot from eDesignOSS](https://github.com/eDesignOSS/dapboot) (`make TARGET=TS100 -C src`) is recommended as it allows reliable flashing of binary files with [dfu-util](http://dfu-util.sourceforge.net/).
-
-There is a complete device flash backup included in this repository. (Note this includes the bootloader, so will need an SWD programmer to load onto the unit).
-
-For the TS80 the SWD pins are used for the QC negotiation, so you can actually connect to the SWD power via the USB connector.
-
-
-### FAQ
-
-#### The file is showing up with the extension `.ERR`
-
-This can occur duing the programming process if any of the checks in the bootloader fail. This is often triggered by anti-virus software or using a non-windows host OS.
-
-First, try just copying the file a second time.
-
-1. Attach the iron in DFU mode
-2. Copy the hex file to the device
-3. The device disconnects and connects with the `.ERR` file
-4. Copy the same hex file again  **DO NOT TRY AND DELETE THE OLD ONE**
-5. The device will disconnect and reconnect again
-6. The device _should_ now have the `.RDY` file
-7. Your done.
-
-If this fails, if you are on Mac or Linux reading the wiki page about programming can help. There is also a very long issue thread going through all of the different attempts around this too.
-
-If you are on windows, its often to try another computer (friends, work, partners etc).
-
-#### Device randomly disconnects or does not show up in DFU mode
-
-First, check the USB cable your using has the data pins; test it on another device. There are a surprisingly large number of usb-micro cables that are power _only_.
-
-Secondly, try other USB ports. Often different USB controllers will interact with the units differently due to design quirks in the miniware design.
-
-## Setting a custom bootup image
-
-This firmware uses a different method of updating the bootup image.
-This removes the need for emulating a USB drive on the iron just to allow for a bootup image to be setup.
-There are further instructions on the [wiki](https://github.com/Ralim/ts100/wiki/Logo-Editor).
-Instructions are kept on the wiki so that users can update the information if they find extra helpful information.
-
-## Alternative bootloader
-
-If you are an advanced user, and you have used `usb-dfu` tools before, or you would like to learn; there is an alternative bootloader for these irons.
-This will **NOT** show up as a USB storage drive, but instead show up using a standard DFU protocol device. You can then use dfu tools or GUI's to upgrade the iron using the `.bin` files that are posted to the releases page.
-
-To change to dapboot based alternative bootloader, you need to flash the hex file from [here](https://github.com/eDesignOSS/ts100-bl-flasher/releases).
-`ts100-stockbl.hex` will reflash the stock bootloader, `ts100-dapboot.hex` will flash the new dapboot based usb bootloader.
-
-Note that this is only reccomended for users who know what they doing. If you dont not understand how this works; please dont flash this.

README.md

@@ -1,23 +1,26 @@
-![C/C++ CI](https://github.com/Ralim/ts100/workflows/C/C++%20CI/badge.svg)
+![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)
 
-# Flexible Soldering iron control Firmware
+# IronOS - Flexible Soldering iron control Firmware
 
-*Please Note, this repo will likely be renaming soon to unire - See issue #639. Old links willcontinue to work, and should redirect. So dont panic :) This is just to better account for the newer soldeing irons being added.*
+*This repository was formerly known as TS100, its the same great code. Just with more supported devices*
 
 Originally concieved as an alternative firmware for the TS100, this firmware has evolved into a complex soldering iron control firmware.
 
 The firmware implements all of the standard features of a "smart" soldering iron, with lots of little extras and tweaks.
-I highly reccomend reading the installation guide fully when installing on your iron.
+I highly reccomend reading the installation guide fully when installing on your iron. And after install just explore the settings menu.
 
 For soldering irons that are designed to be powered by "smart" power sources (QC and PD), the firmware supports settings around the negotiated power and voltage.
 For soldering irons that are designed to be powered by batteries (TS100), settings for a cutoff voltage for battery protection are supported.
 
-There are 25 languages currently supported as of present. When downloading the firmware for your soldering iron take node of the language code in the file name.
+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.*
 
+
 ## Key Features
 
 * PID style iron temperature control
@@ -26,17 +29,22 @@ This project is considered feature complete for use as a soldering iron, *so ple
 * 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
-* Improved readability Fonts
+* (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
 * Boost mode lets you temporarily change the temperature when soldering (i.e. 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](Documentation/upgrading.md)
+* (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)
 
-# Menu System
+## Installation
+
+For installation for your device, please refer to the [Flashing Guide](Documentation/Flashing.md).
+
+## 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.
@@ -44,9 +52,9 @@ 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)
 
-Detailed operation details are over in the [Menu information.](Documentation/menu.md)
+Detailed operation details are over in the [Menu information.](Documentation/Menu.md)
 
 ## Thanks
 
@@ -68,12 +76,16 @@ Especially to the following users, who have helped in various ways that are mass
 * [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 created by the community is GNU GPLv3. Unless noted elsewhere.
-Other components such as FreeRTOS have their 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.
+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/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,86 +103,91 @@ 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 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']
-        textList.append(obj[eid]['text2'][0])
-        textList.append(obj[eid]['text2'][1])
+    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])
@@ -189,15 +197,15 @@ def getLetterCounts(defs, lang):
 
     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
@@ -207,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:
@@ -230,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")
@@ -273,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
@@ -292,60 +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
-    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] + " */ "))
+    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
+        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"))
 
@@ -353,8 +386,15 @@ 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"))
 
@@ -362,66 +402,91 @@ def writeLanguage(languageCode, defs, f):
     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"))
 
     # ----- Writing SettingsDescriptions
-    obj = lang['menuOptions']
+    obj = lang["menuOptions"]
     f.write(to_unicode("const char* SettingsShortNames[][2] = {\n"))
 
     maxLen = 25
     index = 0
-    for mod in defs['menuOptions']:
-        eid = mod['id']
-        if 'feature' in mod:
-            f.write(to_unicode("#ifdef " + mod['feature'] + "\n"))
-        f.write(to_unicode("  /* ["+"{:02d}".format(index)+"] "   + eid.ljust(maxLen)[:maxLen] + " */ "))
+    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]['text2'][0])) +
-                "\", \"" +
-                convStr(symbolConversionTable, (obj[eid]['text2'][1])) +
-                "\" }," + "//{} \n".format(obj[eid]['text2'])))
-        
-        if 'feature' in mod:
+                "  /* ["
+                + "{: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 
+        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"))
 
@@ -434,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
@@ -478,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!")
@@ -493,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())
@@ -508,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()
@@ -526,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

@@ -23,7 +23,10 @@
 		"OffString": "Изкл.",
 		"ResetOKMessage": "Нулиране завършено",
 		"YourGainMessage": "Усилване:",
-		"SettingsResetMessage": "Настройките бяха\nнулирани!"
+		"SettingsResetMessage": "Настройките бяха\nнулирани!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -34,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -67,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Източник",
 				"захранване"
 			],
 			"desc": "Източник на захранване. Минимално напрежение. <DC 10V> <S 3.3V за клетка>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Темп.",
 				"сън"
 			],
 			"desc": "Температура при режим \"сън\" <C>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Време",
 				"сън"
 			],
 			"desc": "Включване в режим \"сън\" след: <Минути/Секунди>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Време",
 				"изкл."
 			],
 			"desc": "Изключване след <Минути>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Усещане",
 				"за движение"
 			],
 			"desc": "Усещане за движение <0.Изключено 1.Слабо 9.Силно>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Единици за",
 				"температура"
 			],
 			"desc": "Единици за температура <C=Целзии F=Фаренхайт>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Детайлен",
 				"екран в покой"
 			],
 			"desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Ориентация",
 				"на дисплея"
 			],
 			"desc": "Ориентация на дисплея <A. Автоматично L. Лява Ръка R. Дясна Ръка>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Турбо",
 				"темп."
 			],
 			"desc": "Температура за \"турбо\" режим"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Автоматичен",
 				"работен режим"
 			],
 			"desc": "Режим на поялника при включване на захранването. T=Работен, S=Сън, F=Изключен"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Мигай при",
 				"топъл поялник"
 			],
 			"desc": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла"
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Калибриране",
 				"температура?"
 			],
 			"desc": "Калибриране на температурата"
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Фабрични",
 				"настройки?"
 			],
 			"desc": "Връщане на фабрични настройки"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Калибриране",
 				"напрежение?"
 			],
 			"desc": "Калибриране на входното напрежение. Задръжте бутонa за изход"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Детайлен",
 				"работен екран"
 			],
 			"desc": "Детайлна информация в работен режим при запояване"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Скорост",
 				"на текста"
 			],
 			"desc": "Скорост на движение на този текст"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Модел",
 				"на връх"
 			],
 			"desc": "Избор на модел на връх"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Бърза",
 				"калибрация"
 			],
 			"desc": "Бърза калибрация с използване на гореща вода"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Прецизна",
 				"калибрация"
 			],
 			"desc": "Прецизна калибрация с използване на термо-двойка на върха на поялника"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Мощност на",
 				"захранване"
 			],
 			"desc": "Мощност на избраното захранване"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Лимит на",
 				"мощност"
 			],
 			"desc": "Максимална мощност на поялника <W>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Размяна",
 				"бутони +-?"
 			],
 			"desc": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника"
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Промяна T",
 				"бързо?"
 			],
 			"desc": "Промяна на температура при бързо натискане на бутон!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Промяна Т",
 				"задържане?"
 			],
 			"desc": "Промяна на температура при задържане на бутон!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Захранващ",
 				"импулс"
 			],
 			"desc": "Поддържане на интензивност на захранващия импулс"
 		},
 		"TipGain": {
-						"text2": [
+			"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

@@ -23,7 +23,10 @@
 		"OffString": "Vyp",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Zisk:",
-		"SettingsResetMessage": "Tov. nas. obnov."
+		"SettingsResetMessage": "Tov. nas. obnov.",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "P",
@@ -34,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -67,113 +77,113 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Zdroj",
 				"napájení"
 			],
 			"desc": "Při nižším napětí ukončí pájení <DC=10V, ?S=?x3.3V pro LiPo, LiIon...>."
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Teplota v",
 				"r. spánku"
 			],
 			"desc": "Teplota v režimu spánku."
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Čas do",
 				"r. spánku"
 			],
 			"desc": "Čas do režimu spánku <Minut/Sekund>."
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Čas do",
 				"vypnutí"
 			],
 			"desc": "Čas do automatického vypnutí <Minut>."
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Citlivost",
 				"det. pohybu"
 			],
 			"desc": "Citlivost detekce pohybu <0=Vyp, 1=Min, ... 9=Max>."
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Jednotky",
 				"teploty"
 			],
 			"desc": "Jednotky měření teploty <C=Celsius, F=Fahrenheit>."
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Podrobnosti",
 				"na vých. obr."
 			],
 			"desc": "Zobrazit podrobnosti na výchozí obrazovce?"
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Orientace",
 				"obrazovky"
 			],
 			"desc": "Orientace obrazovky <A=Auto, L=Levák, P=Pravák>."
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Teplota v",
 				"r. boost"
 			],
 			"desc": "Teplota v režimu boost."
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Automatický",
 				"start"
 			],
 			"desc": "Při startu ihned nahřát hrot?"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Blikáni při",
 				"chladnutí"
 			],
 			"desc": "Blikání teploty při chladnutí, dokud je hrot horký?"
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibrovat",
 				"teplotu?"
 			],
 			"desc": "Kalibrace měření teploty."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Tovární",
 				"nastavení?"
 			],
 			"desc": "Obnovení továrního nastavení."
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibrovat",
 				"vstupní napětí?"
 			],
 			"desc": "Kalibrace vstupního napětí. Tlačítky uprav, podržením potvrď."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Podrobnosti",
 				"při pájení"
 			],
 			"desc": "Zobrazit podrobnosti při pájení?"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Rychlost",
 				"popisků"
 			],
@@ -200,7 +210,7 @@
 			],
 			"desc": "Pokročilá kalibrace pomocí termočlánku na hrotu."
 		},
-		"PowerInput": {
+		"QCMaxVoltage": {
 			"text2": [
 				"Výkon",
 				"ve wattech"
@@ -248,6 +258,20 @@
 				"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,7 +37,14 @@
 		"SettingStartSolderingChar": "L",
 		"SettingStartSleepChar": "D",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "S"
+		"SettingStartNoneChar": "S",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,7 +77,7 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
+		"DCInCutoff": {
 			"text2": [
 				"Power",
 				"source"
@@ -198,7 +210,7 @@
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
+		"QCMaxVoltage": {
 			"text2": [
 				"Power",
 				"Wattage"
@@ -233,7 +245,7 @@
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
+		"PowerPulsePower": {
 			"text2": [
 				"Power",
 				"Pulse W"
@@ -246,6 +258,20 @@
 				"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,7 +38,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -68,188 +78,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Spannungs-",
 				"quelle"
 			],
 			"desc": "Spannungsquelle (Abschaltspannung) <DC=10V, nS=n*3.3V für n LiIon-Zellen>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Ruhetemp-",
 				"eratur"
 			],
 			"desc": "Ruhetemperatur"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Ruhever-",
 				"zögerung"
 			],
 			"desc": "Ruhemodus nach <Sekunden/Minuten>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Abschalt-",
 				"zeit"
 			],
 			"desc": "Abschalten nach <Minuten>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Bewegungs-",
 				"empfindlichk."
 			],
 			"desc": "Bewegungsempfindlichkeit <0=Aus, 1=Minimal ... 9=Maximal>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Temperatur-",
 				"einheit"
 			],
 			"desc": "Temperatureinheit <C=Celsius, F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Detaillierte",
 				"Ruheansicht"
 			],
 			"desc": "Detaillierte Anzeige im Ruhemodus"
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Anzeige-",
 				"ausrichtung"
 			],
 			"desc": "Ausrichtung der Anzeige <A=Automatisch, L=Linkshändig, R=Rechtshändig>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Boosttemp-",
 				"eratur"
 			],
 			"desc": "Temperatur im Boostmodus  (In der eingestellten Einheit)"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Start im",
 				"Lötmodus?"
 			],
 			"desc": "Automatischer Start-Modus beim Einschalten der Spannungsversorgung. <T=Lötmodus S=Ruhezustand F=Aus>"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Abkühl-",
 				"blinken?"
 			],
 			"desc": "Blinkende Temperaturanzeige beim Abkühlen, solange heiß ist."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Temperatur",
 				"kalibrieren?"
 			],
 			"desc": "Kalibrierung der Lötspitzentemperatur"
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Einstellungen",
 				"zurücksetzen?"
 			],
 			"desc": "Einstellungen auf werkseinstellungen zurück setzen"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Eingangsspannung",
 				"kalibrieren?"
 			],
 			"desc": "Kalibrierung der Eingangsspannung. Kurzer Tastendruck zum Einstellen, langer Tastendruck zum Verlassen."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Detaillierte",
 				"Lötansicht"
 			],
 			"desc": "Detaillierte Anzeige im Lötmodus"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Scroll-",
 				"geschw."
 			],
 			"desc": "Scrollgeschwindigkeit der Texte <S=Langsam F=Schnell>"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Löt-",
 				"spitze"
 			],
 			"desc": "Auswahl der Lötspitze"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Einfache",
 				"Kalibrierung"
 			],
 			"desc": "Einfache Kalibrierung mittels heißem Wasser"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Erweiterte",
 				"Kalibrierung"
 			],
 			"desc": "Erweiterte Kalibrierung mittels eines Thermoelements an der Lötspitze"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Leistungs-",
 				"Aufnahme"
 			],
 			"desc": "Leistungsaufnahme der verwendeten Spannungsversorgung"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Leistungs-",
 				"Limit"
 			],
 			"desc": "Maximale aufnahme der Lötspitze <Watt>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Taste +-",
 				"Umkehren?"
 			],
 			"desc": "Temperatur-Änderungs-Tasten-Belegung Plus-Minus umkehren?"
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"T. Schritt",
 				"Taste kurz?"
 			],
 			"desc": "Temperaturwechselschritte bei kurzem Tastendruck!"
-		}
-		,
+		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"T. Schritt",
 				"Taste Lang?"
 			],
 			"desc": "Temperaturwechselschritte bei langem Tastendruck!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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

@@ -24,7 +24,10 @@
 		"OffString": "Off",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Your gain:",
-		"SettingsResetMessage": "Settings were\nreset!"
+		"SettingsResetMessage": "Settings were\nreset!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "R",
@@ -35,7 +38,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -68,187 +78,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Power",
 				"source"
 			],
 			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell, disable power limit>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Sleep",
 				"temp"
 			],
 			"desc": "Sleep temperature"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Sleep",
 				"timeout"
 			],
 			"desc": "Sleep timeout <Minutes/Seconds>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Shutdown",
 				"timeout"
 			],
 			"desc": "Shutdown timeout <Minutes>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Motion",
 				"sensitivity"
 			],
 			"desc": "Motion sensitivity <0=Off 1=Least sensitive 9=Most sensitive>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Temperature",
 				"unit"
 			],
 			"desc": "Temperature unit <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Detailed",
 				"idle screen"
 			],
 			"desc": "Display detailed information in a smaller font on the idle screen"
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Display",
 				"orientation"
 			],
 			"desc": "Display orientation <A=Automatic L=Left-handed R=Right-handed>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Boost",
 				"temp"
 			],
 			"desc": "Temperature when in \"boost mode\""
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Auto",
 				"start"
 			],
 			"desc": "Automatically starts the iron into soldering on power up <F=Off T=Soldering S=Sleep O=Sleep at room temperature>"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Cooldown",
 				"blink"
 			],
 			"desc": "Blink the temperature on the cooling screen while the tip is still hot"
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Calibrate",
 				"temperature?"
 			],
 			"desc": "Calibrate tip offset?"
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Factory",
 				"Reset?"
 			],
 			"desc": "Reset all settings!"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Calibrate",
 				"input voltage?"
 			],
 			"desc": "VIN Calibration <long press to exit>"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Detailed",
 				"solder screen"
 			],
 			"desc": "Display detailed information while soldering"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Scrolling",
 				"speed"
 			],
 			"desc": "Speed this text scrolls past at <S=Slow F=Fast>"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Tip",
 				"model"
 			],
 			"desc": "Tip model selection"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Simple",
 				"calibration"
 			],
 			"desc": "Simple calibration using hot water"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Advanced",
 				"calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
-						"text2": [
-				"Power",
-				"wattage"
+		"QCMaxVoltage": {
+			"text2": [
+				"QC",
+				"Voltage"
 			],
-			"desc": "Power wattage of the power adapter used"
+			"desc": "Desired max QC Voltage negotiated for"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Reverse",
 				"+ - keys"
 			],
 			"desc": "Reverse assignment of temperature adjustment buttons"
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short"
 			],
 			"desc": "Temperature change steps on short button press"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long"
 			],
 			"desc": "Temperature change steps on long button press"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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": "Ajustes borrados"
+		"SettingsResetMessage": "Ajustes borrados",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -34,7 +37,14 @@
 		"SettingStartSolderingChar": "S",
 		"SettingStartSleepChar": "R",
 		"SettingStartSleepOffChar": "F",
-		"SettingStartNoneChar": "N"
+		"SettingStartNoneChar": "N",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -67,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Fuente",
 				"de energía"
 			],
 			"desc": "Elige el tipo de fuente para limitar el voltaje <DC 10V> <S 3,3V por pila, ilimitado>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Temperatura",
 				"en reposo"
 			],
 			"desc": "Temperatura de la punta en reposo."
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Entrar",
 				"en reposo"
 			],
 			"desc": "Tiempo de inactividad para entrar en reposo <min/seg>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Tiempo de",
 				"apagado"
 			],
 			"desc": "Tiempo de inactividad para apagarse <en minutos>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Detección de",
 				"movimiento"
 			],
 			"desc": "Tiempo de reacción al agarrar <0=no 1=menos sensible 9=más sensible>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Unidad de",
 				"temperatura"
 			],
 			"desc": "Unidad de temperatura <C=centígrados F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Info extra en",
 				"modo reposo"
 			],
 			"desc": "Muestra información detallada en letra pequeña al reposar."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Orientación",
 				"de pantalla"
 			],
 			"desc": "Orientación de la pantalla <A=automático I=zurdo D=diestro>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Ajustar la",
 				"temp. extra"
 			],
 			"desc": "Temperatura momentánea que se alcanza al apretar el botón del modo extra."
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Calentar",
 				"al enchufar"
 			],
 			"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": {
-						"text2": [
+			"text2": [
 				"Parpadear",
 				"al enfriar"
 			],
 			"desc": "La temperatura en pantalla parpadea mientras la punta siga caliente."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Calibrar temp.",
 				"de la punta"
 			],
 			"desc": "Calibra la desviación térmica de la punta."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Volver a ajustes",
 				"de fábrica"
 			],
 			"desc": "Restablece todos los ajustes a los valores originales."
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Calibrar voltaje",
 				"de entrada"
 			],
 			"desc": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Info extra",
 				"al soldar"
 			],
 			"desc": "Muestra más datos por pantalla cuando se está soldando."
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Velocidad",
 				"del texto"
 			],
 			"desc": "Velocidad de desplazamiento del texto <R=rápida L=lenta>"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Modelo de",
 				"punta"
 			],
 			"desc": "Elegir el modelo de punta actual."
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Calibración",
 				"simple"
 			],
 			"desc": "Calibración simple con agua caliente."
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Calibración",
 				"avanzada"
 			],
 			"desc": "Calibrar con un termopar en la punta; más difícil."
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Potencia de",
 				"entrada"
 			],
 			"desc": "Potencia en vatios del adaptador de corriente utilizado."
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Ajustar la",
 				"potenc. máx."
 			],
 			"desc": "Elige el límite de potencia máxima del soldador <en vatios>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Invertir",
 				"botones +/-"
 			],
 			"desc": "Intercambia las funciones de subir y bajar la temperatura de los botones +/- para que funcionen al revés."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Cambio temp.",
 				"puls. cortas"
 			],
 			"desc": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-."
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Cambio temp.",
 				"puls. largas"
 			],
 			"desc": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-."
 		},
 		"PowerPulsePower": {
-						"text2": [
+			"text2": [
 				"Pulsos bat.",
 				"constantes"
 			],
 			"desc": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios."
 		},
 		"TipGain": {
-						"text2": [
+			"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,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Virtalähde",
 				"DC"
 			],
 			"desc": "Käytettävä virtalähde. Asettaa katkaisujänniteen. <DC 10V, 3S=9.9V, 4S=13.2V, 5S=16.5V, 6S=19.8V>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Lepotilan",
 				"lämpötila"
 			],
 			"desc": "Lepotilan lämpötila. <C>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Lepotilan",
 				"viive"
 			],
 			"desc": "Lepotilan viive. <minuuttia/sekuntia>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Sammutus",
 				"viive"
 			],
 			"desc": "Automaattisen sammutuksen aikaviive. <minuuttia>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Liikkeen",
 				"herkkyys"
 			],
 			"desc": "Liikkeentunnistuksen herkkyys. <0=pois, 1=epäherkin, 9=herkin>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Lämpötilan",
 				"yksikkö"
 			],
 			"desc": "Lämpötilan yksikkö. <C=celsius, F=fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Tiedot",
 				"lepotilassa"
 			],
 			"desc": "Näyttää yksityiskohtaisemmat tiedot lepotilassa."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Näytön",
 				"kierto"
 			],
 			"desc": "Näytön kierto. <A=automaattinen O=oikeakätinen V=vasenkätinen>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Tehostus-",
 				"lämpötila"
 			],
 			"desc": "Tehostustilan lämpötila"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Autom.",
 				"käynnistys"
 			],
 			"desc": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. T=juotostila, S=Lepotila, F=Ei käytössä"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Jäähdytyksen",
 				"vilkutus"
 			],
 			"desc": "Vilkuttaa jäähtyessä juotoskärjen lämpötilaa sen ollessa vielä vaarallisen kuuma."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibroi",
 				"lämpötila?"
 			],
 			"desc": "Kalibroi kärjen lämpötilaeron."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Palauta",
 				"tehdasasetukset?"
 			],
 			"desc": "Palauta kaikki asetukset oletusarvoihin."
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibroi",
 				"tulojännite?"
 			],
 			"desc": "Tulojännitten kalibrointi (VIN). Painikkeilla säädetään ja pitkään painamalla poistutaan."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Tarkempi",
 				"juotosnäyttö"
 			],
 			"desc": "Näyttää yksityiskohtaisemmat tiedot juotostilassa."
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Tietojen",
 				"näyttönopeus"
 			],
 			"desc": "Näiden selitetekstien vieritysnopeus."
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Tip",
 				"Model"
 			],
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Simple",
 				"Calibration"
 			],
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Key +-",
 				"reverse?"
 			],
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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": "CHAUD!",
-		"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,7 +37,14 @@
 		"SettingStartSolderingChar": "A",
 		"SettingStartSleepChar": "V",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "D"
+		"SettingStartNoneChar": "D",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "V"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Source",
 				"d'alim"
 			],
 			"desc": "Source d'alimentation. Règle la tension de coupure <DC=10V S=3.3V par cellules>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Temp.",
 				"veille"
 			],
 			"desc": "Température en veille <C>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Délai",
 				"veille"
 			],
 			"desc": "Délai avant mise en veille <Minutes>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Délai",
 				"extinction"
 			],
 			"desc": "Délai avant extinction <Minutes>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Sensibilité",
 				"au mouvement"
 			],
 			"desc": "Sensibilité du capteur de mouvement <0=Inactif 1=Peu sensible 9=Tres sensible>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Unité de",
 				"température"
 			],
 			"desc": "Unité de température <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Écran veille",
 				"détaillé"
 			],
 			"desc": "Afficher des informations détaillées lors de la veille."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Orientation",
 				"de l'écran"
 			],
 			"desc": "Orientation de l'affichage <A=Automatique G=Gaucher D=Droitier>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Temp.",
 				"Boost"
 			],
 			"desc": "Température du mode \"Boost\""
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Démarrage",
 				"automatique"
 			],
 			"desc": "Démarrer automatiquement la soudure a l'allumage <A=Activé, V=Mode Veille, D=Désactivé>"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Refroidir en",
 				"clignotant"
 			],
 			"desc": "Faire clignoter la température lors du refroidissement tant que la panne est chaude."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Étalonner",
 				"température"
 			],
 			"desc": "Étalonner température de la panne."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Réinitialisation",
 				"d'usine"
 			],
 			"desc": "Réinitialiser tous les réglages"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Étalonner",
 				"tension d'entrée"
 			],
 			"desc": "Étalonner tension d'entrée. Boutons pour ajuster, appui long pour quitter"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Écran soudure",
 				"détaillé"
 			],
 			"desc": "Afficher des informations détaillées pendant la soudure"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Vitesse de",
 				"défilement"
 			],
 			"desc": "Vitesse de défilement de ce texte en <R=Rapide L=Lent>"
 		},
 		"TipModel": {
-						"text2": [
-				"Panne",
-				"Modèle"
+			"text2": [
+				"Modèle de",
+				"la panne"
 			],
 			"desc": "Sélection du modèle de la panne"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Calibration",
 				"simple"
 			],
 			"desc": "Calibration simple à l'aide d'eau chaude"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Calibration",
 				"avancées"
 			],
 			"desc": "Calibration avancées à l'aide d'un thermocouple sur la panne"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Puissance de",
 				"l'alimentation"
 			],
 			"desc": "Puissance de l'alimentation utilisée"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Puissance",
-				"Limite"
+				"limite"
 			],
 			"desc": "Puissance maximale utilisable <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
-				"Key +-",
-				"Inverser?"
+			"text2": [
+				"Inverser les",
+				"touches + - ?"
 			],
 			"desc": "Inversez l'assignation +/- du bouton de changement de température de la pointe."
 		},
 		"TempChangeShortStep": {
-						"text2": [
-				"Temp change",
-				"Court?"
+			"text2": [
+				"Incrément",
+				"appui court"
 			],
 			"desc": "Incrément de changement de température sur appui court."
 		},
 		"TempChangeLongStep": {
-						"text2": [
-				"Temp change",
-				"Long?"
+			"text2": [
+				"Incrément",
+				"appui long"
 			],
 			"desc": "Incrément de changement de température sur appui long."
 		},
-		"PowerPulsePower":{
-						"text2": [
-				"Power",
-				"Pulse W"
+		"PowerPulsePower": {
+			"text2": [
+				"Puissance des",
+				"impulsion W"
 			],
-			"desc": "Keep awake pulse power intensity"
+			"desc": "Puissance des impulsions pour éviter la mise en veille des batteries"
 		},
 		"TipGain": {
-						"text2": [
-				"Modify",
-				"tip gain"
+			"text2": [
+				"Modifier",
+				"gain panne"
 			],
-			"desc": "Tip gain"
+			"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,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Izvor",
 				"napajanja"
 			],
 			"desc": "Izvor napajanja. Postavlja napon isključivanja. <DC 10V> <S 3.3V po ćeliji>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Temp",
 				"spavanja"
 			],
 			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Vrijeme",
 				"spavanja"
 			],
 			"desc": "Vrijeme mirovanja nakon kojega lemilica spušta temperaturu. <Minute/Sekunde>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Vrijeme",
 				"gašenja"
 			],
 			"desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti. <Minute>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Osjetljivost",
 				"pokreta"
 			],
 			"desc": "Osjetljivost prepoznavanja pokreta. <0=Ugašeno, 1=Najmanje osjetljivo, 9=Najosjetljivije>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Jedinica",
 				"temperature"
 			],
 			"desc": "Jedinica temperature. <C=Celzij, F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Detalji",
 				"pri čekanju"
 			],
 			"desc": "Prikazivanje detaljnih informacija tijekom čekanja."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Rotacija",
 				"ekrana"
 			],
 			"desc": "Orijentacija ekrana. <A=Automatski, L=Ljevoruki, D=Desnoruki>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Boost",
 				"temp"
 			],
 			"desc": "Temperatura u pojačanom (Boost) načinu."
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Auto",
 				"start"
 			],
 			"desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati."
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Upozorenje",
 				"pri hlađenju"
 			],
 			"desc": "Bljeskanje temperature prilikom hlađenja, ako je lemilica vruća."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibracija",
 				"temperature"
 			],
 			"desc": "Kalibriranje temperature mjeri razliku temperatura vrška i drške, dok je lemilica hladna."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Tvorničke",
 				"postavke"
 			],
 			"desc": "Vraćanje svih postavki na tvorničke vrijednosti."
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibracija",
 				"napona napajanja"
 			],
 			"desc": "Kalibracija ulaznog napona. Podešavanje gumbima, dugački pritisak za kraj."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Detalji",
 				"pri lemljenju"
 			],
 			"desc": "Prikazivanje detaljnih informacija tijekom lemljenja."
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Brzina",
 				"poruka"
 			],
 			"desc": "Brzina kretanja dugačkih poruka. <B=brzo, S=sporo>"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Model",
 				"Vrha"
 			],
 			"desc": "Odabir modela lemnog vrha"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Jednostavna",
 				"kalibracija"
 			],
 			"desc": "Kalibracija kipućom vodom"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Napredna",
 				"kalibracija"
 			],
 			"desc": "Kalibracija korištenjem termo-elementa"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Snaga",
 				"napajanja"
 			],
 			"desc": "Snaga modula za napajanje"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Key +-",
 				"reverse?"
 			],
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Áram",
 				"forrás"
 			],
 			"desc": "Áramforrás. Beállítja a lekapcsolási feszültséget. <DC 10V> <S 3.3V cellánként>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Alvási",
 				"hőfok"
 			],
 			"desc": "Alvási hőmérséklet <C>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Alvás",
 				"időzítő"
 			],
 			"desc": "Alvás időzítő <perc/másodperc>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Kikapcsolás",
 				"időzítő"
 			],
 			"desc": "Kikapcsolási időzítő <perc>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Mozgás",
 				"érzékenység"
 			],
 			"desc": "Mozgás érzékenység beállítása. <0.kikapcsolva 1.legkevésbé érzékeny 9.legérzékenyebb>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Hőmérséklet",
 				"mértékegysége"
 			],
 			"desc": "Hőmérséklet mértékegysége <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Részletes",
 				"készenlét"
 			],
 			"desc": "Részletes információ megjelenítése kisebb betűméretben a készenléti képernyőn."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Kijelző",
 				"tájolása"
 			],
 			"desc": "Kijelző tájolása <A. automatikus B. balkezes J. jobbkezes>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Boost",
 				"hőfok"
 			],
 			"desc": "Hőmérséklet \"boost\" módban"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Automatikus",
 				"indítás"
 			],
 			"desc": "Bekapcsolás után automatikusan lépjen forrasztás módba. T=forrasztás, S=alvó mód, F=ki"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Villogás",
 				"hűléskor"
 			],
 			"desc": "Villogjon a hőmérséklet hűlés közben, amíg a hegy forró."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Hőmérséklet",
 				"kalibrálása?"
 			],
 			"desc": "Hegy hőmérséklet-különbségének kalibrálása."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Gyári",
 				"beállítások?"
 			],
 			"desc": "Beállítások alaphelyzetbe állítása"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Bemeneti fesz",
 				"kalibrálása?"
 			],
 			"desc": "Bemeneti feszültség kalibrálása. Röviden megnyomva módosítás, hosszan megnyomva kilépés"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Részletes",
 				"forr. kép."
 			],
 			"desc": "Részletes információk megjelenítése forrasztás közben"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Görgetés",
 				"sebessége"
 			],
 			"desc": "Szöveggörgetés sebessége"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Forrasztóhegy",
 				"modell"
 			],
 			"desc": "Forrasztóhegy modell kiválasztása"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Egyszerű",
 				"kalibráció"
 			],
 			"desc": "Egyszerű kalibrálás forró víz segítségével"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Haladó",
 				"Kalibráció"
 			],
 			"desc": "Haladó kalibrálás hegyre helyezett hőelem segítségével"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Bemeneti",
 				"teljesítmény"
 			],
 			"desc": "A tápegység által leadott teljesítmény"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Telj",
 				"maximum"
 			],
 			"desc": "Maximális teljesitmény beállitása <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"GOMB +-",
 				"Felcseréled?"
 			],
 			"desc": "A páka hömérséklet növelés csökkentési gombok felcserélése."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Hömérséklet",
 				"váltás rövid?"
 			],
 			"desc": "Hömérséklet váltás rövid gombnyomásrs bekapcsolva!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Hömérséklet",
 				"váltás hosszú?"
 			],
 			"desc": "Hömérséklet váltás hosszú gombnyomásrs bekapcsolva!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"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": [
+			"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:",
@@ -23,7 +23,10 @@
 		"OffString": "OFF",
 		"ResetOKMessage": "Reset OK",
 		"YourGainMessage": "Guad.: ",
-		"SettingsResetMessage": "Reset effettuato"
+		"SettingsResetMessage": "Reset effettuato",
+		"LockingKeysString": "Blocc.",
+		"UnlockingKeysString": "Sblocc.",
+		"WarningKeysLockedString": "BLOCCATO"
 	},
 	"characters": {
 		"SettingRightChar": "D",
@@ -31,10 +34,17 @@
 		"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"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -67,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Sorgente",
 				"alimentaz"
 			],
 			"desc": "Scegli la sorgente di alimentazione; se a batteria, limita lo scaricamento al valore di soglia <DC: 10V; S: 3,3V per cella>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"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": {
-						"text2": [
+			"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": {
-						"text2": [
+			"text2": [
 				"Timer",
 				"spegnimento"
 			],
 			"desc": "Imposta il timer per lo spegnimento <minuti>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"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": {
-						"text2": [
+			"text2": [
 				"Unità di",
 				"temperatura"
 			],
 			"desc": "Scegli l'unità di misura per la temperatura <C: grado Celsius; F: grado Farenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Interfaccia",
 				"testuale"
 			],
 			"desc": "Mostra informazioni dettagliate all'interno della schermata principale"
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Orientamento",
 				"display"
 			],
 			"desc": "Imposta l'orientamento del display <A: automatico; S: mano sinistra; D: mano destra>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Temp",
 				"«Turbo»"
 			],
-			"desc": "Imposta la temperatura della funzione «Turbo»"
+			"desc": "Imposta la temperatura della funzione «Turbo» <°C/°F>"
 		},
 		"AutoStart": {
-						"text2": [
+			"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": {
-						"text2": [
+			"text2": [
 				"Avviso",
 				"punta calda"
 			],
 			"desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda"
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Calibrazione",
 				"temperatura"
 			],
 			"desc": "Calibra le rilevazioni di temperatura"
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Ripristino",
 				"impostazioni"
 			],
 			"desc": "Ripristina tutte le impostazioni"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Calibrazione",
 				"tensione"
 			],
 			"desc": "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Dettagli",
 				"saldatura"
 			],
 			"desc": "Mostra informazioni dettagliate durante la modalità Saldatura"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Velocità",
 				"testo"
 			],
 			"desc": "Imposta la velocità di scorrimento del testo <L: lento; V: veloce>"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Modello",
 				"punta"
 			],
 			"desc": "Seleziona il modello della punta in uso"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Calibrazione",
 				"semplice"
 			],
 			"desc": "Calibra le rilevazioni di temperatura tramite l'utilizzo di acqua calda"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Calibrazione",
 				"avanzata"
 			],
 			"desc": "Calibra le rilevazioni di temperatura attraverso la termocoppia presente nella punta"
 		},
-		"PowerInput": {
-						"text2": [
-				"Potenza",
-				"alimentaz"
+		"QCMaxVoltage": {
+			"text2": [
+				"Voltaggio",
+				"Quick Charge"
 			],
-			"desc": "Imposta la potenza massima erogabile dall'alimentatore in uso"
+			"desc": "Imposta il massimo voltaggio necessario alla negoziazione con un alimentatore Quick Charge"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Limite",
-				"di potenza"
+				"potenza"
 			],
 			"desc": "Imposta il valore di potenza massima erogabile al saldatore <watt>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Inversione",
 				"tasti"
 			],
-			"desc": "Inverti i tasti per impostare la temperatura della punta "
+			"desc": "Inverti i tasti per aumentare o diminuire la temperatura della punta"
 		},
 		"TempChangeShortStep": {
-						"text2": [
-				"Cambio temp",
-				"pressione breve"
+			"text2": [
+				"Temp passo",
+				"breve"
 			],
-			"desc": "Varia la temperatura della punta attraverso una breve pressione dei tasti"
+			"desc": "Imposta il «passo» dei valori di temperatura ad una breve pressione dei tasti"
 		},
 		"TempChangeLongStep": {
-						"text2": [
-				"Cambio temp",
-				"pressione lunga"
+			"text2": [
+				"Temp passo",
+				"lungo"
 			],
-			"desc": "Varia la temperatura della punta attraverso una lunga pressione dei tasti"
+			"desc": "Imposta il «passo» dei valori di temperatura ad una lunga pressione dei tasti"
 		},
 		"PowerPulsePower": {
-						"text2": [
-				"Potenza impulso",
-				"«Keep-Alive»"
+			"text2": [
+				"Potenza",
+				"impulso"
 			],
-			"desc": "Regola la potenza d'impulso in ingresso al saldatore per prevenire lo standby eventuale dell'alimentatore <watt>"
+			"desc": "Regola la potenza d'impulso per prevenire lo standby eventuale dell'alimentatore <watt>"
 		},
 		"TipGain": {
-						"text2": [
+			"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,36 +3,48 @@
 	"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"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -47,7 +59,7 @@
 				"Miego",
 				"režimai"
 			],
-			"desc": "Energijos vartojimo nustatymai"
+			"desc": "Energijos tausojimo nustatymai"
 		},
 		"UIMenu": {
 			"text2": [
@@ -58,194 +70,208 @@
 		},
 		"AdvancedMenu": {
 			"text2": [
-				"Išplėstin.",
+				"Išplėsti.",
 				"nustatymai"
 			],
 			"desc": "Išplėstiniai nustatymai"
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"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": {
-						"text2": [
+			"text2": [
 				"Miego",
 				"temperat."
 			],
-			"desc": "Miego temperatūra <C>"
+			"desc": "Miego temperatūra"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Miego",
 				"laikas"
 			],
-			"desc": "Miego laikas <minutės/sekundės>"
+			"desc": "Užmigimo laikas <sekundės/minutės>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Išjungimo",
 				"laikas"
 			],
 			"desc": "Išjungimo laikas <minutės>"
 		},
 		"MotionSensitivity": {
-						"text2": [
-				"Jautrumas",
-				"judesiui"
+			"text2": [
+				"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": {
-						"text2": [
+			"text2": [
 				"Temperatūros",
 				"vienetai"
 			],
-			"desc": "Temperatūros vienetai <C - Celsijus, F - Farenheitas>"
+			"desc": "Temperatūros vienetai <C=Celsijus, F=Farenheitas>"
 		},
 		"AdvancedIdle": {
-						"text2": [
-				"Detalus lauki",
-				"mo ekranas"
+			"text2": [
+				"Detalus lau-",
+				"kimo ekranas"
 			],
 			"desc": "Ar rodyti papildomą informaciją mažesniu šriftu laukimo ekrane"
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Ekrano",
 				"orientacija"
 			],
-			"desc": "Ekrano orientacija <A - automatinė, K - kairiarankiams, D - dešiniarankiams>"
+			"desc": "Ekrano orientacija <A=Automatinė, K=Kairiarankiams, D=Dešiniarankiams>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Turbo",
 				"temperat."
 			],
 			"desc": "Temperatūra turbo režimu"
 		},
 		"AutoStart": {
-						"text2": [
+			"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": {
-						"text2": [
+			"text2": [
 				"Atvėsimo",
 				"mirksėjimas"
 			],
 			"desc": "Ar mirksėti temperatūrą ekrane kol vėstantis antgalis vis dar karštas"
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibruoti",
 				"temperatūrą?"
 			],
 			"desc": "Antgalio temperatūros kalibravimas"
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Atstatyti",
 				"nustatymus?"
 			],
 			"desc": "Nustatyti nustatymus iš naujo"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibruoti",
 				"įvesties įtampą?"
 			],
 			"desc": "Įvesties įtampos kalibravimas. Trumpai paspauskite, norėdami nustatyti, ilgai paspauskite, kad išeitumėte"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Detalus lita-",
 				"vimo ekranas"
 			],
 			"desc": "Ar rodyti išsamią informaciją lituojant"
 		},
 		"ScrollingSpeed": {
-						"text2": [
-				"Greitas apr",
-				"ašym. slink"
+			"text2": [
+				"Aprašymo",
+				"greitis"
 			],
 			"desc": "Greitis, kuriuo šis tekstas slenka"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Antgalio",
 				"modelis"
 			],
 			"desc": "Antgalio modelio pasirinkimas"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
-				"Paprasta",
-				"kalibracija"
+			"text2": [
+				"Paprastas",
+				"kalibravimas"
 			],
-			"desc": "Paprasta kalibracija naudojant karštą vandienį"
+			"desc": "Paprastas kalibravimas naudojant karštą vandienį"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
-				"Išplėstinė",
-				"kalibracija"
+			"text2": [
+				"Išplėstinis",
+				"kalibravimas"
 			],
-			"desc": "Išplėstinė kalibracija naudojant termoelementą"
+			"desc": "Išplėstinis kalibravimas naudojant termoelementą"
 		},
-		"PowerInput": {
-						"text2": [
-				"Galia",
-				"vatais"
+		"QCMaxVoltage": {
+			"text2": [
+				"QC maitinimo",
+				"bloko įtampa"
 			],
-			"desc": "Maitinimo bloko galia vatais"
+			"desc": "Maksimali QC maitinimo bloko įtampa"
 		},
 		"PowerLimit": {
-						"text2": [
-				"Power",
-				"Limit"
+			"text2": [
+				"Galios",
+				"riba"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Didžiausia galia, kurią gali naudoti lituoklis <Vatai>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
-				"Key +-",
-				"reverse?"
+			"text2": [
+				"Sukeisti + -",
+				"mygtukus?"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Sukeisti + - temperatūros keitimo mygtukus vietomis."
 		},
 		"TempChangeShortStep": {
-						"text2": [
-				"Temp change",
-				"short?"
+			"text2": [
+				"Temp. keitimas",
+				"trumpas spust."
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Temperatūros keitimo žingsnis trumpai spustėlėjus mygtuką!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
-				"Temp change",
-				"long?"
+			"text2": [
+				"Temp. keitimas",
+				"ilgas pasp."
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Temperatūros keitimo žingsnis ilgai paspaudus mygtuką!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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,251 +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"
-	},
-	"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": {
-						"text2": [
-				"Spannings-",
-				"bron"
-			],
-			"desc": "Spanningsbron. Stelt drempelspanning in. <DC 10V> <S 3.3V per cel>"
-		},
-		"SleepTemperature": {
-						"text2": [
-				"Slaap",
-				"temp"
-			],
-			"desc": "Temperatuur in slaapstand <C>"
-		},
-		"SleepTimeout": {
-						"text2": [
-				"Slaap",
-				"time-out"
-			],
-			"desc": "Slaapstand 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",
-				"slaapscherm"
-			],
-			"desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het slaapscherm."
-		},
-		"DisplayRotation": {
-						"text2": [
-				"Scherm-",
-				"oriëntatie"
-			],
-			"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>"
-		},
-		"BoostTemperature": {
-						"text2": [
-				"Boost",
-				"temp"
-			],
-			"desc": "Temperatuur in boostmodes"
-		},
-		"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. Knoppen lang ingedrukt houden om te bevestigen."
-		},
-		"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": [
-				"Tip",
-				"Model"
-			],
-			"desc": "Tip Model selection"
-		},
-		"SimpleCalibrationMode": {
-						"text2": [
-				"Simple",
-				"Calibration"
-			],
-			"desc": "Simple Calibration using Hot water"
-		},
-		"AdvancedCalibrationMode": {
-						"text2": [
-				"Advanced",
-				"Calibration"
-			],
-			"desc": "Advanced calibration using thermocouple on the tip"
-		},
-		"PowerInput": {
-						"text2": [
-				"Power",
-				"Wattage"
-			],
-			"desc": "Power Wattage of the power adapter used"
-		},
-		"PowerLimit": {
-						"text2": [
-				"Power",
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
-		},
-		"ReverseButtonTempChange": {
-						"text2": [
-				"Key +-",
-				"reverse?"
-			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
-		},
-		"TempChangeShortStep": {
-						"text2": [
-				"Temp change",
-				"short?"
-			],
-			"desc": "Temperature change steps on short button press!"
-		},
-		"TempChangeLongStep": {
-						"text2": [
-				"Temp change",
-				"long?"
-			],
-			"desc": "Temperature change steps on long button press!"
-		},
-		"PowerPulsePower":{
-						"text2": [
-				"Power",
-				"Pulse W"
-			],
-			"desc": "Keep awake pulse power intensity"
-		},
-		"TipGain": {
-						"text2": [
-				"Modify",
-				"tip gain"
-			],
-			"desc": "Tip gain"
-		}
-	}
-}
+{
+	"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,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Spannings-",
 				"bron"
 			],
 			"desc": "Spanningsbron. Stelt minimumspanning in. <DC 10V> <S 3.3V per cel>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Slaap",
 				"temp"
 			],
 			"desc": "Temperatuur in slaapstand <°C>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Slaap",
 				"time-out"
 			],
 			"desc": "Slaapstand time-out <Minuten/Seconden>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Uitschakel",
 				"time-out"
 			],
 			"desc": "Automatisch afsluiten time-out <Minuten>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Bewegings-",
 				"gevoeligheid"
 			],
 			"desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Temperatuur",
 				"schaal"
 			],
 			"desc": "Temperatuurschaal <°C=Celsius °F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Gedetailleerd",
 				"slaapscherm"
 			],
 			"desc": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Scherm-",
 				"oriëntatie"
 			],
 			"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Verhogings",
 				"temp"
 			],
 			"desc": "Verhogingstemperatuur"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Auto",
 				"start"
 			],
 			"desc": "Breng de soldeerbout op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Afkoel",
 				"knipper"
 			],
 			"desc": "Temperatuur knippert in hoofdmenu tijdens afkoeling."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Calibreer",
 				"temperatuur?"
 			],
 			"desc": "Temperatuur van de punt calibreren."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Instellingen",
 				"resetten?"
 			],
 			"desc": "Alle instellingen resetten."
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Calibreer",
 				"voedingsspanning?"
 			],
 			"desc": "VIN Calibreren. Bevestigen door knoppen lang in te drukken."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Gedetailleerd",
 				"soldeerscherm"
 			],
 			"desc": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Scrol",
 				"snelheid"
 			],
 			"desc": "Scrolsnelheid van de tekst."
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Punt",
 				"Model"
 			],
 			"desc": "Gekozen punt"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Eenvoudige",
 				"Calibrering"
 			],
 			"desc": "Calibrering met heet water"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Gevorderde",
 				"Calibrering"
 			],
 			"desc": "Calibrering met thermokoppel"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Vermogen",
 				"Watt"
 			],
 			"desc": "Vermogen van de adapter"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Key +-",
 				"reverse?"
 			],
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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,7 +37,14 @@
 		"SettingStartSolderingChar": "L",
 		"SettingStartSleepChar": "D",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "I"
+		"SettingStartNoneChar": "I",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Kilde",
 				""
 			],
 			"desc": "Strømforsyning. Sett nedre spenning for automatisk nedstenging. <DC 10V <S 3.3V per celle"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"DTmp",
 				""
 			],
 			"desc": "Dvaletemperatur <C>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"",
 				""
 			],
 			"desc": "Tid før dvale <Minutter/Sekunder"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"AvTid",
 				""
 			],
 			"desc": "Tid før automatisk nedstenging <Minutter"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"BSensr",
 				""
 			],
 			"desc": "Bevegelsesfølsomhet <0.Inaktiv 1.Minst følsom 9.Mest følsom"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"TmpEnh",
 				""
 			],
 			"desc": "Temperaturskala <C=Celsius F=Fahrenheit"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"AvDvSk",
 				""
 			],
 			"desc": "Vis detaljert informasjon med liten skrift på dvaleskjermen."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"SkRetn",
 				""
 			],
 			"desc": "Skjermretning <A. Automatisk V. Venstrehendt H. Høyrehendt"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"KTmp",
 				""
 			],
 			"desc": "Temperatur i \"kraft\"-modus"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"AStart",
 				""
 			],
 			"desc": "Start automatisk med lodding når strøm kobles til. L=Lodding, D=Dvale, I=Inaktiv"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"KjBlnk",
 				""
 			],
 			"desc": "Blink temperaturen på skjermen mens spissen fortsatt er varm."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"TempKal?",
 				""
 			],
 			"desc": "Kalibrer spiss-temperatur."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"TilbStl?",
 				""
 			],
 			"desc": "Tilbakestill alle innstillinger"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"KalSpIn?",
 				""
 			],
 			"desc": "Kalibrer spenning. Knappene justerer. Langt trykk for å gå ut"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"AvLdSk",
 				""
 			],
 			"desc": "Vis detaljert informasjon ved lodding"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"RullHa",
 				""
 			],
 			"desc": "Hastigheten på rulletekst"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Tip",
 				"Model"
 			],
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Simple",
 				"Calibration"
 			],
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Key +-",
 				"reverse?"
 			],
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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

@@ -7,24 +7,27 @@
 		"SettingsCalibrationDone": "Kalibracja udana!",
 		"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": "Uśpienie...",
+		"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",
+		"SolderingAdvancedPowerPrompt": "Moc: ",
+		"OffString": "Wył",
 		"ResetOKMessage": "Reset OK",
-		"YourGainMessage": "Twój zysk:",
-		"SettingsResetMessage": "Ustawienia zostały\nzresetowane!"
+		"YourGainMessage": "Us.zysk:",
+		"SettingsResetMessage": "Ust. zresetowane",
+		"LockingKeysString": " ZABLOK.",
+		"UnlockingKeysString": "ODBLOK.",
+		"WarningKeysLockedString": "!ZABLOK!"
 	},
 	"characters": {
 		"SettingRightChar": "P",
@@ -35,220 +38,241 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "Z",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "B"
+		"SettingStartNoneChar": "B",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "N",
+		"SettingSensitivityMedium": "Ś",
+		"SettingSensitivityHigh": "W",
+		"SettingLockDisableChar": "W",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "P"
 	},
 	"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": {
-						"text2": [
+		"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": {
-						"text2": [
-				"Temperatura",
+			"text2": [
+				"Temp.",
 				"uśpienia"
 			],
-			"desc": "Temperatura uśpienia <°C>"
+			"desc": "Temperatura w trybie uśpienia <°C>"
 		},
 		"SleepTimeout": {
-						"text2": [
-				"Czas",
+			"text2": [
+				"Czas do",
 				"uśpienia"
 			],
-			"desc": "Czas uśpienia <minuty/sekundy>"
+			"desc": "Czas do przejścia w tryb uśpienia <minuty/sekundy>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
-				"Czas",
+			"text2": [
+				"Czas do",
 				"wyłączenia"
 			],
-			"desc": "Czas wyłączenia <minuty>"
+			"desc": "Czas do wyłączenia <minuty>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"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": {
-						"text2": [
+			"text2": [
 				"Jednostka",
 				"temperatury"
 			],
-			"desc": "Jednostka temperatury <C=Celsius F=Fahrenheit>"
+			"desc": "Jednostka temperatury <C-Celciusz, F-Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
-				"Mniejsza",
-				"czcionka"
+			"text2": [
+				"Szeczegółowy",
+				"ekran bezczy."
 			],
 			"desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynności"
 		},
 		"DisplayRotation": {
-						"text2": [
-				"Orientacja",
-				"wyświetlacza"
+			"text2": [
+				"Obrót",
+				"ekranu"
 			],
-			"desc": "Orientacja wyświetlacza <A - automatyczna, L - leworęczna, P - praworęczna>"
+			"desc": "Obrót ekranu <A-automatycznie, L-dla leworęcznych, P-dla praworęcznych>"
 		},
 		"BoostTemperature": {
-						"text2": [
-				"Temperatura",
-				"w trybie boost"
+			"text2": [
+				"Temp.",
+				"boost"
 			],
 			"desc": "Temperatura w trybie \"boost\" "
 		},
 		"AutoStart": {
-						"text2": [
-				"Automatyczne",
-				"uruchamianie"
+			"text2": [
+				"Aut. uruch.",
+				"tr. lutowania"
 			],
 			"desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania.<B - wyłączone, T - lutowanie, Z - uśpienie, O - uśpienie w temp. pokojowej"
 		},
 		"CooldownBlink": {
-						"text2": [
-				"Migająca",
-				"temperatura"
+			"text2": [
+				"Mig. podczas",
+				"wychładzania"
 			],
-			"desc": "Temperatura na ekranie miga, gdy grot jest jeszcze gorący."
+			"desc": "Temperatura miga podczas wychładzania, gdy grot jest wciąż gorący"
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibracja",
-				"temp. grota"
+				"temp. grotu"
 			],
-			"desc": "Kalibracja temperatury grota lutownicy"
+			"desc": "Kalibracja temperatury grotu lutownicy"
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Ustawienia",
 				"fabryczne"
 			],
-			"desc": "Zresetuje wszystkie ustawienia!"
+			"desc": "Resetuje wszystkie ustawienia"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibracja",
 				"napięcia"
 			],
 			"desc": "Kalibracja napięcia wejściowego. Krótkie naciśnięcie, aby ustawić, długie naciśnięcie, aby wyjść."
 		},
 		"AdvancedSoldering": {
-						"text2": [
-				"Szczegółowe",
-				"informacje"
+			"text2": [
+				"Sz. inf. w",
+				"tr. lutowania"
 			],
-			"desc": "Wyświetl szczegółowe informacje podczas lutowania"
+			"desc": "Wyświetl szczegółowe informacje w trybie lutowania"
 		},
 		"ScrollingSpeed": {
-						"text2": [
-				"Szybkość",
+			"text2": [
+				"Sz. przew.",
 				"tekstu"
 			],
 			"desc": "Szybkość przewijania tekstu"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Model",
-				"grota"
+				"grotu"
 			],
-			"desc": "Wybór grotu"
+			"desc": "Wybór modelu grotu"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Prosta",
 				"kalibracja"
 			],
 			"desc": "Prosta kalibracja, używając gorącej wody"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Zaawansowana",
 				"kalibracja"
 			],
-			"desc": "Zaawansowana kalibracja za pomocą termoelementu na grocie"
+			"desc": "Zaawansowana kalibracja za pomocą termopary na grocie"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Moc",
 				"w W"
 			],
-			"desc": "Moc używanego zasilacza w Wattach"
+			"desc": "Moc używanego zasilacza w <W>"
 		},
 		"PowerLimit": {
-						"text2": [
-				"Limit",
+			"text2": [
+				"Ogr.",
 				"mocy"
 			],
-			"desc": "Maksymalna moc w W, jakiej może użyć lutownica"
+			"desc": "Maksymalna moc <W>, jakiej może użyć lutownica"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
-				"Zamień przyciski",
+			"text2": [
+				"Zamień przyc.",
 				"+ -"
 			],
 			"desc": "Zamienia działanie przycisków zmiany temperatury grotu"
 		},
 		"TempChangeShortStep": {
-						"text2": [
-				"Szybka zmiana",
-				"temperatury"
+			"text2": [
+				"Zm. temp.",
+				"kr. przyc."
 			],
-			"desc": "Zmiany temperatury krok po korku, po krótkim naciśnięciu przycisku"
+			"desc": "Wartość zmiany temperatury, po krótkim przyciśnięciu <°C>"
 		},
 		"TempChangeLongStep": {
-						"text2": [
-				"Wolna zmiana",
-				"temperatury"
+			"text2": [
+				"Zm. temp.",
+				"dł. przyc."
 			],
-			"desc": "Zmiany temperatury krok po korku, po długim naciśnięciu przycisku"
+			"desc": "Wartość zmiany temperatury, po długim przyciśnięciu <°C>"
 		},
-		"PowerPulsePower":{
-						"text2": [
-				"Moc pulsu",
-				"w W"
+		"PowerPulsePower": {
+			"text2": [
+				"Moc",
+				"impulsu"
 			],
-			"desc": "Utrzymuj intensywność mocy pulsu"
+			"desc": "Utrzymuj moc impulsu na wybranym poziomie <W>"
 		},
 		"TipGain": {
-						"text2": [
-				"Zmodyfikowany",
-				"zysk grotu"
+			"text2": [
+				"Zm. zysk",
+				"grotu"
 			],
-			"desc": "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,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Fonte",
 				"alimentação"
 			],
 			"desc": "Fonte de alimentação. Define a tensão de corte. <DC=10V> <S=3.3V/célula>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Temperat.",
 				"repouso"
 			],
 			"desc": "Temperatura de repouso <C>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Tempo",
 				"repouso"
 			],
 			"desc": "Tempo para repouso <Minutos/Segundos>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Tempo",
 				"desligam."
 			],
 			"desc": "Tempo para desligamento <Minutos>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Sensibilidade",
 				"movimento"
 			],
 			"desc": "Sensibilidade ao movimento <0=Desligado 1=Menor 9=Maior>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Unidade",
 				"temperatura"
 			],
 			"desc": "Unidade de temperatura <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Tela repouso",
 				"avançada"
 			],
 			"desc": "Exibe informações avançadas quando em espera"
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Orientação",
 				"tela"
 			],
 			"desc": "Orientação da tela <A.utomática C.anhoto D.estro>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Modo turbo",
 				"temperat."
 			],
 			"desc": "Ajuste de temperatura do modo \"turbo\""
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Partida",
 				"automática"
 			],
 			"desc": "Aquece a ponta automaticamente ao ligar"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Piscar ao",
 				"arrefecer"
 			],
 			"desc": "Faz o valor da temperatura piscar durante o arrefecimento"
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Calibrar",
 				"temperatura"
 			],
 			"desc": "Calibra a temperatura"
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Reset de",
 				"fábrica?"
 			],
 			"desc": "Reverte todos ajustes"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Calibrar",
 				"tensão"
 			],
 			"desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Tela trabalho",
 				"avançada"
 			],
 			"desc": "Exibe informações avançadas durante o uso"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Velocidade",
 				"texto ajuda"
 			],
 			"desc": "Velocidade a que o texto é exibido"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Ponta",
 				"Modelo"
 			],
 			"desc": "Selecção de modelo de ponta"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Calibração",
 				"Simples"
 			],
 			"desc": "Calibração simples com água quente"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Calibração",
 				"Avançada"
 			],
 			"desc": "Calibração avançada com um termopar na ponta"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Potência",
 				"Fonte"
 			],
 			"desc": "Potência da fonte usada (Watt)"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Key +-",
 				"reverse?"
 			],
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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

@@ -23,7 +23,10 @@
 		"OffString": "Выкл.",
 		"ResetOKMessage": "Сброс OK",
 		"YourGainMessage": "Прирост:",
-		"SettingsResetMessage": "Настройки сброшены!"
+		"SettingsResetMessage": "Настройки сброшены!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
@@ -34,7 +37,14 @@
 		"SettingStartSolderingChar": "П",
 		"SettingStartSleepChar": "О",
 		"SettingStartSleepOffChar": "К",
-		"SettingStartNoneChar": "В"
+		"SettingStartNoneChar": "В",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -67,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Источник",
 				"питания"
 			],
 			"desc": "Источник питания. Устанавливает напряжение отсечки. <DC 10В> <S 3.3В на ячейку, без лимита мощности>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Темп.",
 				"ожидания"
 			],
 			"desc": "Температура режима ожидания"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Таймаут",
 				"ожидания"
 			],
 			"desc": "Время до перехода в режим ожидания <Минуты/Секунды>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Таймаут",
 				"выключения"
 			],
 			"desc": "Время до отключения паяльника <Минуты>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Чувствительн.",
 				"акселерометра"
 			],
 			"desc": "Чувствительность акселерометра <0=Выкл., 1=Мин., 9=Макс.>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Единицы",
 				"температуры"
 			],
 			"desc": "Единицы измерения температуры <C=Цельcия, F=Фаренгейта>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Подробный",
 				"реж. ожидания"
 			],
 			"desc": "Отображать детальную информацию уменьшенным шрифтом на экране ожидания"
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Ориентация",
 				"экрана"
 			],
 			"desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"t° турбо",
 				"режима"
 			],
 			"desc": "Температура жала в турбо-режиме"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Авто",
 				"старт"
 			],
 			"desc": "Режим, в котором запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Мигание t°",
 				"при остывании"
 			],
 			"desc": "Мигать температурой на экране охлаждения, пока жало еще горячее"
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Калибровка",
 				"температуры"
 			],
 			"desc": "Калибровка термодатчика жала"
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Сброс",
 				"Настроек"
 			],
 			"desc": "Сброс настроек к значеням по умолчанию"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Калибровка",
 				"напряжения"
 			],
 			"desc": "Калибровка входного напряжения <длинное нажатие для выхода>"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Подробный",
 				"экран пайки"
 			],
 			"desc": "Показывать детальную информацию на экране пайки"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Скорость",
 				"текста"
 			],
 			"desc": "Скорость прокрутки текста <М=медленно, Б=быстро>"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Модель",
 				"жала"
 			],
 			"desc": "Выбор модели жала"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Упрощенная",
 				"калибровка"
 			],
 			"desc": "Упрощенная калибровка с использованием горячей воды"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Улучшенная",
 				"калибровка"
 			],
 			"desc": "Улучшенная калибровка с импользованием термопары жала"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Мощность",
 				"питания"
 			],
 			"desc": "Мощность используемого источника питания"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Максимальная",
 				"мощность"
 			],
 			"desc": "Максимальная мощность, которую может использовать паяльник <Ватт>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Инвертировать",
 				"кнопки"
 			],
 			"desc": "Инвертировать кнопки изменения температуры"
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Шаг темп.",
 				"кор. наж."
 			],
 			"desc": "Шаг изменения температуры при коротком нажатии кнопок"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Шаг темп.",
 				"длин. наж."
 			],
 			"desc": "Шаг изменения температуры при длинном нажатии кнопок"
 		},
-		"PowerPulsePower":{
-						"text2": [
-				"Power",
-				"Pulse W"
+		"PowerPulsePower": {
+			"text2": [
+				"Мощность импульса",
+				"питания Вт"
 			],
-			"desc": "Keep awake pulse power intensity"			
+			"desc": "Мощность импульса удерживающего от сна источник питания"
 		},
 		"TipGain": {
-						"text2": [
-				"Modify",
-				"tip gain"
+			"text2": [
+				"Изменить",
+				"усиление жала"
 			],
-			"desc": "Tip gain"
+			"desc": "Усиление жала"
+		},
+		"HallEffSensitivity": {
+			"text2": [
+				"Эффект Холла",
+				"чувствительность"
+			],
+			"desc": "Уровень чувствительности датчика холла в режиме сна <O=Выкл,L=Низкий,M=Средний,H=Высокий>"
+		},
+		"LockingMode": {
+			"text2": [
+				"Разрешить блокировку",
+				"кнопок"
+			],
+			"desc": "При работе длинное нажатие обеих кнопок блокирует их <D=Отключено, B=Только турбо, F=Полная блокировка>"
 		}
 	}
 }

Translation Editor/translation_sk.json

@@ -1,251 +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"
 	},
 	"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": {
-						"text2": [
-				"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": {
-						"text2": [
-				"STMP",
-				""
+			"text2": [
+				"Kľudová",
+				"teplota"
 			],
-			"desc": "Kludova teplota (v nastavenych jednotkach)"
+			"desc": "Kľudová teplota (v nastavených jednotkách)"
 		},
 		"SleepTimeout": {
-						"text2": [
-				"STME",
-				""
+			"text2": [
+				"Kľudový",
+				"režim po"
 			],
 			"desc": "Kludovy rezim po <sekundach/minutach>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
-				"SHTME",
-				""
+			"text2": [
+				"Vypnutie",
+				"po"
 			],
-			"desc": "Cas na vypnutie <minuty>"
+			"desc": "Čas na vypnutie <minuty>"
 		},
 		"MotionSensitivity": {
-						"text2": [
-				"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": {
-						"text2": [
-				"TMPUNT",
-				""
+			"text2": [
+				"Jednotka",
+				"teploty"
 			],
 			"desc": "Jednotky merania teploty <C=stupne Celzia, F=stupne Fahrenheita>"
 		},
 		"AdvancedIdle": {
-						"text2": [
-				"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": {
-						"text2": [
-				"DSPROT",
-				""
+			"text2": [
+				"Orientácia",
+				"displeja"
 			],
-			"desc": "Orientacia displeja <A=Auto, L=Lavak, R=Pravak>"
+			"desc": "Orientácia displeja <A=Auto, L=Ľavák, P=Pravák>"
 		},
 		"BoostTemperature": {
-						"text2": [
-				"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": {
-						"text2": [
-				"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": {
-						"text2": [
-				"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": {
-						"text2": [
-				"TMP CAL?",
-				""
+			"text2": [
+				"Kalibrácia",
+				"teploty"
 			],
-			"desc": "Kalibracia posunu hrotu"
+			"desc": "Kalibrácia posunu teploty hrotu"
 		},
 		"SettingsReset": {
-						"text2": [
-				"RESET?",
-				""
+			"text2": [
+				"Obnovenie",
+				"nastavení"
 			],
-			"desc": "Tovarenske nastavenia"
+			"desc": "Obnovenie nastavení na pôvodné hodnoty"
 		},
 		"VoltageCalibration": {
-						"text2": [
-				"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": {
-						"text2": [
-				"ADVSLD",
-				""
+			"text2": [
+				"Detaily počas",
+				"spájkovania"
 			],
-			"desc": "Zobrazenie detailov pocas spajkovania <T=Zap, F=Vyp>"
+			"desc": "Zobrazenie detailov počas spájkovania"
 		},
 		"ScrollingSpeed": {
-						"text2": [
-				"DESCSP",
-				""
+			"text2": [
+				"Rýchlost",
+				"skrolovania"
 			],
-			"desc": "Speed this text scrolls past at"
+			"desc": "Rychlost pohybu tohoto textu"
 		},
 		"TipModel": {
-						"text2": [
-				"Tip",
-				"Model"
+			"text2": [
+				"Typ",
+				"hrotu"
 			],
-			"desc": "Tip Model selection"
+			"desc": "Zvolenie hrotu"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
-				"Simple",
-				"Calibration"
+			"text2": [
+				"Zjednodušená",
+				"kalibrácia"
 			],
-			"desc": "Simple Calibration using Hot water"
+			"desc": "Zjednodušená kalibrácia pomocou horúcej vody"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
-				"Advanced",
-				"Calibration"
+			"text2": [
+				"Pokročilá",
+				"kalibrácia"
 			],
-			"desc": "Advanced calibration using thermocouple on the tip"
+			"desc": "Pokročilá kalibrácia meraním teploty hrotu"
 		},
-		"PowerInput": {
-						"text2": [
-				"Power",
-				"Wattage"
+		"QCMaxVoltage": {
+			"text2": [
+				"Obmedzenie",
+				"výkonu"
 			],
-			"desc": "Power Wattage of the power adapter used"
+			"desc": "Obmedzenie výkonu podľa použitého zdroja"
 		},
 		"PowerLimit": {
-						"text2": [
-				"Power",
-				"Limit"
+			"text2": [
+				"Obmedzenie",
+				"výkonu"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Obmedzenie výkonu podľa použitého zdroja <watt>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
-				"Key +-",
-				"reverse?"
+			"text2": [
+				"Otočenie",
+				"tlačidiel +/-"
 			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
+			"desc": "Prehodenie tlačidiel na nastavovanie teploty"
 		},
 		"TempChangeShortStep": {
-						"text2": [
-				"Temp change",
-				"short?"
+			"text2": [
+				"Malý krok",
+				"teploty"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Zmena teploty pri krátkom stlačení tlačidla"
 		},
 		"TempChangeLongStep": {
-						"text2": [
-				"Temp change",
-				"long?"
+			"text2": [
+				"Veľký krok",
+				"teploty"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Zmena teploty pri držaní tlačidla"
 		},
-		"PowerPulsePower":{
-						"text2": [
-				"Power",
-				"Pulse W"
+		"PowerPulsePower": {
+			"text2": [
+				"Impulz",
+				"W"
 			],
-			"desc": "Keep awake pulse power intensity"
+			"desc": "Impulz udržujúci napájací zdroj zapnutý <watt>"
 		},
 		"TipGain": {
-						"text2": [
-				"Modify",
-				"tip gain"
+			"text2": [
+				"Zisk",
+				"hrotu"
 			],
-			"desc": "Tip gain"
+			"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,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -66,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Vir",
 				"napajanja"
 			],
 			"desc": "Vir napajanja. Nastavi napetost izklopa. <DC 10V> <S 3.3V na celico>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Temp. med",
 				"spanjem"
 			],
 			"desc": "Temperatura med spanjem <C>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Čas do",
 				"spanja"
 			],
 			"desc": "Čas pred spanjem <minute/sekunde>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Čas do",
 				"izklopa"
 			],
 			"desc": "Čas pred izklopom <minute>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Občutljivost",
 				"premikanja"
 			],
 			"desc": "Občutljivost premikanja <0.izklopljeno 1.najmanj 9.najbolj občutljivo>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Enota za",
 				"temperaturo"
 			],
 			"desc": "Enota za temperaturo <C=celzija F=fahrenheita>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Več info na",
 				"zaslonu v mir"
 			],
 			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med mirovanjem."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Orientacija",
 				"zaslona"
 			],
 			"desc": "Orientacija zaslona <S. samodejno L. levo D. desno>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Temperat.",
 				"v boost"
 			],
 			"desc": "Temperatura v \"boost\" načinu"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Samodejni",
 				"zagon"
 			],
 			"desc": "Samodejno segrej konico ob vklopu. T=segrej, S=spanje, F=izklop"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Utripanje med",
 				"hlajenjem"
 			],
 			"desc": "Utripaj temperaturo med hlajenjem, ko je konica še vroča."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibriram",
 				"temperaturo?"
 			],
 			"desc": "Kalibracija temperature na konici."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Tovarniške",
 				"nastavitve?"
 			],
 			"desc": "Ponastavitev vseh nastavitev"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibriram",
 				"vhodno napetost?"
 			],
 			"desc": "Kalibracija VIN. Nastavitve z gumbi, dolgi pritisk za izhod."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Več info na",
 				"zaslonu spaj."
 			],
 			"desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Hitrost",
 				"besedila"
 			],
 			"desc": "Hitrost, s katero se prikazuje besedilo"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Model",
 				"konice"
 			],
 			"desc": "Izbira tipa konice"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Preprosta",
 				"kalibracija"
 			],
 			"desc": "Preprosta kalibracija z vročo vodo."
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Napredna",
 				"kalibracija"
 			],
 			"desc": "Napredna kalibracija s termočlenom na konici"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Moč napajalnega",
 				"vira"
 			],
 			"desc": "Moč v W napajalnega vira"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Key +-",
 				"reverse?"
 			],
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Врста",
 				"напајања"
 			],
 			"desc": "Тип напајања; одређује најнижи радни напон. <DC=адаптер (10V), S=батерија (3,3V по ћелији)>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Темп.",
 				"спавања"
 			],
 			"desc": "Температура на коју се спушта лемилица након одређеног времена мировања. <C/F>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Време до",
 				"спавања"
 			],
 			"desc": "Време мировања након кога лемилица спушта температуру. <M=минути, S=секунде>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Време до",
 				"гашења"
 			],
 			"desc": "Време мировања након кога се лемилица гаси. <M=минути>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Осетљивост",
 				"на покрет"
 			],
 			"desc": "Осетљивост сензора покрета. <0=искључено, 1=најмање осетљиво, 9=најосетљивије>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Јединица",
 				"температуре"
 			],
 			"desc": "Јединице у којима се приказује температура. <C=целзијус, F=фаренхајт>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Детаљи током",
 				"мировања"
 			],
 			"desc": "Приказивање детаљних информација на екрану током мировања."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Оријентација",
 				"екрана"
 			],
 			"desc": "Како је окренут екран. <А=аутоматски, Л=за леворуке, Д=за десноруке>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Темп.",
 				"појачања"
 			],
 			"desc": "Температура врха лемилице у току појачања."
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Врући",
 				"старт"
 			],
 			"desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се."
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Упозорење",
 				"при хлађењу"
 			],
 			"desc": "Приказ температуре трепће приликом хлађења докле год је врх и даље врућ."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Калибрација",
 				"температуре"
 			],
 			"desc": "Калибрисање одступања температуре врха у односу на дршку."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Фабричке",
 				"поставке"
 			],
 			"desc": "Враћање свих поставки на фабричке вредности."
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Калибрација",
 				"улазног напона"
 			],
 			"desc": "Калибрисање улазног напона. Подешава се на тастере; дуги притисак за крај."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Детаљи током",
 				"лемљења"
 			],
 			"desc": "Приказивање детаљних информација на екрану током лемљења."
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Брзина",
 				"порука"
 			],
 			"desc": "Брзина кретања описних порука попут ове. <С=споро, Б=брзо>"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Модел",
 				"врха"
 			],
 			"desc": "Одабир модела лемног врха."
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Једноставна",
 				"калибрација"
 			],
 			"desc": "Једноставна калибрација кипућом водом."
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Напредна",
 				"калибрација"
 			],
 			"desc": "Напредна калибрација помоћу термопара."
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Улазна",
 				"снага"
 			],
 			"desc": "Снага напајања у ватима."
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Key +-",
 				"reverse?"
 			],
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Vrsta",
 				"napajanja"
 			],
 			"desc": "Tip napajanja; određuje najniži radni napon. <DC=adapter (10V), S=baterija (3,3V po ćeliji)>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Temp.",
 				"spavanja"
 			],
 			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Vreme do",
 				"spavanja"
 			],
 			"desc": "Vreme mirovanja nakon koga lemilica spušta temperaturu. <M=minuti, S=sekunde>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Vreme do",
 				"gašenja"
 			],
 			"desc": "Vreme mirovanja nakon koga se lemilica gasi. <M=minuti>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Osetljivost",
 				"na pokret"
 			],
 			"desc": "Osetljivost senzora pokreta. <0=isključeno, 1=najmanje osetljivo, 9=najosetljivije>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Jedinica",
 				"temperature"
 			],
 			"desc": "Jedinice u kojima se prikazuje temperatura. <C=celzijus, F=farenhajt>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Detalji tokom",
 				"mirovanja"
 			],
 			"desc": "Prikazivanje detaljnih informacija na ekranu tokom mirovanja."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Orijentacija",
 				"ekrana"
 			],
 			"desc": "Kako je okrenut ekran. <A=automatski, L=za levoruke, D=za desnoruke>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Temp.",
 				"pojačanja"
 			],
 			"desc": "Temperatura vrha lemilice u toku pojačanja."
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Vrući",
 				"start"
 			],
 			"desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se."
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Upozorenje",
 				"pri hlađenju"
 			],
 			"desc": "Prikaz temperature trepće prilikom hlađenja dokle god je vrh i dalje vruć."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibracija",
 				"temperature"
 			],
 			"desc": "Kalibrisanje odstupanja temperature vrha u odnosu na dršku."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Fabričke",
 				"postavke"
 			],
 			"desc": "Vraćanje svih postavki na fabričke vrednosti."
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibracija",
 				"ulaznog napona"
 			],
 			"desc": "Kalibrisanje ulaznog napona. Podešava se na tastere; dugi pritisak za kraj."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Detalji tokom",
 				"lemljenja"
 			],
 			"desc": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja."
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Brzina",
 				"poruka"
 			],
 			"desc": "Brzina kretanja opisnih poruka poput ove. <S=sporo, B=brzo>"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Model",
 				"vrha"
 			],
 			"desc": "Odabir modela lemnog vrha."
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Jednostavna",
 				"kalibracija"
 			],
 			"desc": "Jednostavna kalibracija kipućom vodom."
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Napredna",
 				"kalibracija"
 			],
 			"desc": "Napredna kalibracija pomoću termopara."
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Ulazna",
 				"snaga"
 			],
 			"desc": "Snaga napajanja u vatima."
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Key +-",
 				"reverse?"
 			],
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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,7 +37,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Ström-",
 				"källa"
 			],
 			"desc": "Strömkälla. Anger lägsta spänning. <DC 10V> <S 3.3V per cell>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Vilo-",
 				"temp"
 			],
 			"desc": "Vilotemperatur <C>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Vilo-",
 				"timeout"
 			],
 			"desc": "Vilo-timeout <Minuter/Seconder>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Avstängn.",
 				"timeout"
 			],
 			"desc": "Avstängnings-timeout <Minuter>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Rörelse-",
 				"känslighet"
 			],
 			"desc": "Rörelsekänslighet <0.Av 1.minst känslig 9.mest känslig>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Temperatur-",
 				"enheter"
 			],
 			"desc": "Temperaturenhet <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Detaljerad",
 				"vid inaktiv"
 			],
 			"desc": "Visa detaljerad information i mindre typsnitt när inaktiv."
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Visnings",
 				"läge"
 			],
 			"desc": "Visningsläge <A. Automatisk V. Vänsterhänt H. Högerhänt>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Turbo-",
 				"temp"
 			],
 			"desc": "Temperatur i \"turbo\"-läge"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Auto",
 				"start"
 			],
 			"desc": "Startar automatiskt lödpennan vid uppstart. T=Lödning, S=Viloläge, F=Av"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Nedkylnings-",
 				"blink"
 			],
 			"desc": "Blinka temperaturen medan spetsen kyls av och fortfarande är varm."
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibrera",
 				"temperatur?"
 			],
 			"desc": "Kalibrera spets-kompensation."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Fabriks-",
 				"inställ?"
 			],
 			"desc": "Återställ alla inställningar"
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Kalibrera",
 				"inspänning?"
 			],
 			"desc": "Inspänningskalibrering. Knapparna justerar, håll inne för avslut"
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Detaljerad",
 				"lödng.skärm"
 			],
 			"desc": "Visa detaljerad information vid lödning"
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Beskrivning",
 				"rullhast."
 			],
 			"desc": "Hastighet som den här texten rullar i"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Tip",
 				"Model"
 			],
 			"desc": "Tip Model selection"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Simple",
 				"Calibration"
 			],
 			"desc": "Simple Calibration using Hot water"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Advanced",
 				"Calibration"
 			],
 			"desc": "Advanced calibration using thermocouple on the tip"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Power",
 				"Wattage"
 			],
 			"desc": "Power Wattage of the power adapter used"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
 			"desc": "Maximum power the iron can use <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Key +-",
 				"reverse?"
 			],
 			"desc": "Reverse the tip temperature change buttons plus minus assignment."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
 			"desc": "Temperature change steps on short button press!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
 			"desc": "Temperature change steps on long button press!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
 			"desc": "Keep awake pulse power intensity"
 		},
 		"TipGain": {
-						"text2": [
+			"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,7 +34,14 @@
 		"SettingStartSolderingChar": "T",
 		"SettingStartSleepChar": "S",
 		"SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F"
+		"SettingStartNoneChar": "F",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -65,187 +74,222 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
-				"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": {
-						"text2": [
-				"STMP",
+			"text2": [
+				"BKSC",
 				""
 			],
-			"desc": "Uyku Sıcaklığı <C>"
+			"desc": "Bekleme Modu Sıcaklığı <C>"
 		},
 		"SleepTimeout": {
-						"text2": [
-				"STME",
+			"text2": [
+				"BMZA",
 				""
 			],
-			"desc": "Uyku Zaman Aşımı <Dakika/Saniye>"
+			"desc": "Bekleme Modu Zaman Aşımı <Dakika/Saniye>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
-				"SHTME",
+			"text2": [
+				"KPTZA",
 				""
 			],
 			"desc": "Kapatma Zaman Aşımı <Dakika>"
 		},
 		"MotionSensitivity": {
-						"text2": [
-				"MSENSE",
+			"text2": [
+				"HARHAS",
 				""
 			],
 			"desc": "Hareket Hassasiyeti <0.Kapalı 1.En az duyarlı 9.En duyarlı>"
 		},
 		"TemperatureUnit": {
-						"text2": [
-				"TMPUNT",
+			"text2": [
+				"SCKBRM",
 				""
 			],
-			"desc": "Sıcaklık Ünitesi <C=Celsius F=Fahrenheit>"
+			"desc": "Sıcaklık Birimi <C=Celsius F=Fahrenheit>"
 		},
 		"AdvancedIdle": {
-						"text2": [
-				"ADVIDL",
+			"text2": [
+				"AYRBİL",
 				""
 			],
 			"desc": "Boş ekranda ayrıntılı bilgileri daha küçük bir yazı tipi ile göster."
 		},
 		"DisplayRotation": {
-						"text2": [
-				"DSPROT",
+			"text2": [
+				"GRNYÖN",
 				""
 			],
 			"desc": "Görüntü Yönlendirme <A. Otomatik L. Solak R. Sağlak>"
 		},
-		"BoostTemperature": {
-						"text2": [
-				"BTMP",
+		"BoostEnabled": {
+			"text2": [
+				"YÜKPER",
 				""
 			],
-			"desc": "\"boost\" Modu Derecesi"
+			"desc": "Lehimleme yaparken ön tuşa basmak anlık sıcaklık yükselişi sağlar. (450C)"
+		},
+		"BoostTemperature": {
+			"text2": [
+				"YKSC",
+				""
+			],
+			"desc": "Yüksek Performans Modu Sıcaklığı"
 		},
 		"AutoStart": {
-						"text2": [
-				"ASTART",
+			"text2": [
+				"OTOBAŞ",
 				""
 			],
 			"desc": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. T=Lehimleme Modu, S= Uyku Modu,F=Kapalı"
 		},
 		"CooldownBlink": {
-						"text2": [
-				"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": {
-						"text2": [
-				"TMP CAL?",
+			"text2": [
+				"SCK KAL?",
 				""
 			],
 			"desc": "Ucu kalibre et."
 		},
 		"SettingsReset": {
-						"text2": [
-				"RESET?",
+			"text2": [
+				"SIFIRLA?",
 				""
 			],
-			"desc": "Bütün ayarları sıfırla"
+			"desc": "Bütün ayarları sıfırlar"
 		},
 		"VoltageCalibration": {
-						"text2": [
-				"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": {
-						"text2": [
-				"ADVSLD",
+			"text2": [
+				"GELLHM",
 				""
 			],
-			"desc": "Lehimleme yaparken detaylı bilgi göster"
+			"desc": "\"Gelişmiş Lehimleme\" Lehimleme yaparken detaylı bilgi göster"
 		},
 		"ScrollingSpeed": {
-						"text2": [
-				"DESCSP",
+			"text2": [
+				"YZKYHZ",
 				""
 			],
-			"desc": "Speed this text scrolls past at"
+			"desc": "Bu yazının kayma hızı S= Yavaş, F= Hızlı"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Uç",
 				"Modeli"
 			],
 			"desc": "Uç Modeli seçimi"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Basit",
 				"Kalibrasyon"
 			],
 			"desc": "Sıcak su kullanarak basit kalibrasyon"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"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": {
-						"text2": [
+			"text2": [
 				"Güç",
 				"Miktarı(W)"
 			],
-			"desc": "Kullanılan adaptörün güç miktarı"
+			"desc": "Kullanılan adaptörün watt biriminden güç miktarı"
+		},
+		"PowerLimitEnable": {
+			"text2": [
+				"P Limit",
+				"Enable"
+			],
+			"desc": "Güç sınırlamayı aç"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Power",
 				"Limit"
 			],
-			"desc": "Maximum power the iron can use <Watts>"
+			"desc": "Havyanın kullanacağı en yüksek güç <Watts>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"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": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"short?"
 			],
-			"desc": "Temperature change steps on short button press!"
+			"desc": "Kısa basışlardaki sıcaklık derecesi atlama oranı"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Temp change",
 				"long?"
 			],
-			"desc": "Temperature change steps on long button press!"
+			"desc": "Uzun başışlardaki sıcaklık derecesi atlama oranı"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Power",
 				"Pulse W"
 			],
-			"desc": "Keep awake pulse power intensity"
+			"desc": "Güç girişi voltajı ölçüm yoğunluğunu sık tut."
 		},
 		"TipGain": {
-						"text2": [
+			"text2": [
 				"Modify",
 				"tip gain"
 			],
-			"desc": "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

@@ -23,7 +23,10 @@
 		"OffString": "Вимк",
 		"ResetOKMessage": "Скидання OK",
 		"YourGainMessage": "Приріст:",
-		"SettingsResetMessage": "Налаштування скинуті!"
+		"SettingsResetMessage": "Налаштування скинуті!",
+		"LockingKeysString": " LOCKED",
+		"UnlockingKeysString": "UNLOCKED",
+		"WarningKeysLockedString": "!LOCKED!"
 	},
 	"characters": {
 		"SettingRightChar": "П",
@@ -34,7 +37,14 @@
 		"SettingStartSolderingChar": "П",
 		"SettingStartSleepChar": "О",
 		"SettingStartSleepOffChar": "К",
-		"SettingStartNoneChar": "В"
+		"SettingStartNoneChar": "В",
+		"SettingSensitivityOff": "O",
+		"SettingSensitivityLow": "L",
+		"SettingSensitivityMedium": "M",
+		"SettingSensitivityHigh": "H",
+		"SettingLockDisableChar": "D",
+		"SettingLockBoostChar": "B",
+		"SettingLockFullChar": "F"
 	},
 	"menuGroups": {
 		"SolderingMenu": {
@@ -67,187 +77,201 @@
 		}
 	},
 	"menuOptions": {
-		"PowerSource": {
-						"text2": [
+		"DCInCutoff": {
+			"text2": [
 				"Джерело",
 				"живлення"
 			],
 			"desc": "Встановлення напруги відключення. <DC - 10V, 3S - 9.9V, 4S - 13.2V, 5S - 16.5V, 6S - 19.8V>"
 		},
 		"SleepTemperature": {
-						"text2": [
+			"text2": [
 				"Темпер.",
 				"сну"
 			],
 			"desc": "Температура режиму очікування <C°/F°>"
 		},
 		"SleepTimeout": {
-						"text2": [
+			"text2": [
 				"Тайм-аут",
 				"сну"
 			],
 			"desc": "Час до переходу в режим очікування <Хвилини/Секунди>"
 		},
 		"ShutdownTimeout": {
-						"text2": [
+			"text2": [
 				"Часу до",
 				"вимкнення"
 			],
 			"desc": "Час до відключення <Хвилини>"
 		},
 		"MotionSensitivity": {
-						"text2": [
+			"text2": [
 				"Чутл. сенсо-",
 				"ру руху"
 			],
 			"desc": "Акселерометр <0 - Вимк. 1 - мін. чутливості 9 - макс. чутливості>"
 		},
 		"TemperatureUnit": {
-						"text2": [
+			"text2": [
 				"Формат темпе-",
 				"ратури(C°/F°)"
 			],
 			"desc": "Одиниця виміру температури <C - Цельсій, F - Фаренгейт>"
 		},
 		"AdvancedIdle": {
-						"text2": [
+			"text2": [
 				"Детальний ре-",
 				"жим очікуван."
 			],
 			"desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
 		},
 		"DisplayRotation": {
-						"text2": [
+			"text2": [
 				"Автоповорот",
 				"екрану"
 			],
 			"desc": "Орієнтація дисплея <A - Автоповорот, Л - Лівша, П - Правша>"
 		},
 		"BoostTemperature": {
-						"text2": [
+			"text2": [
 				"Темпер.",
 				"Турбо"
 			],
 			"desc": "Температура в Турбо-режимі"
 		},
 		"AutoStart": {
-						"text2": [
+			"text2": [
 				"Гарячий",
 				"старт"
 			],
 			"desc": "Режим з яким запускається паяльник при подачі живлення <П=Пайка, О=Очікування, К=Очікування при кімн. темп., В=Вимк.>"
 		},
 		"CooldownBlink": {
-						"text2": [
+			"text2": [
 				"Показ t° при",
 				"охолодж."
 			],
 			"desc": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран моргає"
 		},
 		"TemperatureCalibration": {
-						"text2": [
+			"text2": [
 				"Калібровка",
 				"температури"
 			],
 			"desc": "Калібрування температурного датчика."
 		},
 		"SettingsReset": {
-						"text2": [
+			"text2": [
 				"Скинути всі",
 				"налаштування?"
 			],
 			"desc": "Скидання всіх параметрів до стандартних значень."
 		},
 		"VoltageCalibration": {
-						"text2": [
+			"text2": [
 				"Калібрування",
 				"напруги"
 			],
 			"desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
 		},
 		"AdvancedSoldering": {
-						"text2": [
+			"text2": [
 				"Детальний ре-",
 				"жим пайки"
 			],
 			"desc": "Показувати детальну інформацію при пайці."
 		},
 		"ScrollingSpeed": {
-						"text2": [
+			"text2": [
 				"Швидкість",
 				"тексту"
 			],
 			"desc": "Швидкість прокрутки тексту <П=повільно, Ш=швидко>"
 		},
 		"TipModel": {
-						"text2": [
+			"text2": [
 				"Модель",
 				"Жало"
 			],
 			"desc": "Вибір моделі жала"
 		},
 		"SimpleCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Просте",
 				"Калібрування"
 			],
 			"desc": "Просте калібрування з використанням гарячої води"
 		},
 		"AdvancedCalibrationMode": {
-						"text2": [
+			"text2": [
 				"Детальне",
 				"Калібрування"
 			],
 			"desc": "Калібрування за допомогою термопари"
 		},
-		"PowerInput": {
-						"text2": [
+		"QCMaxVoltage": {
+			"text2": [
 				"Потужність",
 				"дж. живл."
 			],
 			"desc": "Потужність джерела живлення в Ватах"
 		},
 		"PowerLimit": {
-						"text2": [
+			"text2": [
 				"Макс.",
 				"потуж."
 			],
 			"desc": "Макс. потужність, яку може використовувати паяльник <Ват>"
 		},
 		"ReverseButtonTempChange": {
-						"text2": [
+			"text2": [
 				"Інвертувати",
 				"кнопки +-?"
 			],
 			"desc": "Інвертувати кнопки зміни температури."
 		},
 		"TempChangeShortStep": {
-						"text2": [
+			"text2": [
 				"Зм. темп.",
 				"коротко?"
 			],
 			"desc": "Змінювати температуру при короткому натисканні!"
 		},
 		"TempChangeLongStep": {
-						"text2": [
+			"text2": [
 				"Зм. темп.",
 				"довго?"
 			],
 			"desc": "Змінювати температуру при довгому натисканні!"
 		},
-		"PowerPulsePower":{
-						"text2": [
+		"PowerPulsePower": {
+			"text2": [
 				"Пульс.",
 				"Навантаж."
 			],
 			"desc": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії (це потрібно щоб паяльник не вимкнувся з часом)"
 		},
 		"TipGain": {
-						"text2": [
+			"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
 		},
@@ -249,7 +294,7 @@ var def =
 			"maxLen2": 16
 		},
 		{
-			"id": "PowerInput",
+			"id": "QCMaxVoltage",
 			"maxLen": 8,
 			"maxLen2": 16
 		},
@@ -282,6 +327,15 @@ var def =
 			"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

setup.sh

@@ -1,13 +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 /build
+sudo apt-get update && sudo apt-get install -y make bzip2 git python3 wget 
+sudo mkdir -p /build
 cd /build
 
-sudo wget -qO- https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 | sudo tar -xj
+#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
 
-# Add compiler to the path
+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

@@ -1,9 +1,10 @@
+#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"
-#include "stdint.h"
 /*
  * BSP.h -- Board Support
  *
@@ -16,11 +17,19 @@
 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
@@ -31,6 +40,9 @@ uint16_t getHandleTemperature();
 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
@@ -51,6 +63,13 @@ uint8_t showBootLogoIfavailable();
 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
 }

workspace/TS100/Core/BSP/BSP_Common.c

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

workspace/TS100/Core/BSP/Defines.h

@@ -15,5 +15,7 @@ enum Orientation {
 
 //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

@@ -12,6 +12,14 @@
 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() {
@@ -22,16 +30,16 @@ void resetWatchdog() {
 //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, //
+		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, //
@@ -52,52 +60,52 @@ static const uint16_t NTCHandleLookup[] = {
 		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, //
+		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++) {
+	for (uint32_t i = 0; i < (sizeof(NTCHandleLookup) / (2 * sizeof(uint16_t))); i++) {
 		if (result > NTCHandleLookup[(i * 2) + 0]) {
 			return NTCHandleLookup[(i * 2) + 1] * 10;
 		}
 	}
-	return 0;
+	return 45 * 10;
 #endif
 #ifdef TEMP_TMP36
 	// We return the current handle temperature in X10 C
@@ -108,21 +116,21 @@ uint16_t getHandleTemperature() {
 	// (4964.8 counts)
 	//
 	int32_t result = getADC(0);
-	result -= 4965;  // remove 0.5V offset
+	result -= 4965; // remove 0.5V offset
 	// 10mV per C
-	// 99.29 counts per Deg C above 0C
+	// 99.29 counts per Deg C above 0C. Tends to read a tad over across all of my sample units
 	result *= 100;
-	result /= 993;
+	result /= 994;
 	return result;
 #endif
 }
 
 uint16_t getTipInstantTemperature() {
-	uint16_t sum = 0;	// 12 bit readings * 8 -> 15 bits
+	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
+	//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;
@@ -135,7 +143,7 @@ uint16_t getTipInstantTemperature() {
 	for (int i = 0; i < 8; i++) {
 		sum += readings[i];
 	}
-	return sum;  // 8x over sample
+	return sum; // 8x over sample
 }
 
 uint16_t getTipRawTemp(uint8_t refresh) {
@@ -190,11 +198,46 @@ void setTipPWM(uint8_t pulse) {
 	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
+	// Period has elapsed
 	if (htim->Instance == TIM2) {
 		// we want to turn on the output again
 		PWMSafetyTimer--;
@@ -216,7 +259,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
 }
 
 void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) {
-// This was a when the PWM for the output has timed out
+	// 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);
 	}
@@ -226,13 +269,13 @@ void unstick_I2C() {
 	int timeout = 100;
 	int timeout_cnt = 0;
 
-// 1. Clear PE bit.
+	// 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).
+	//  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;
@@ -259,7 +302,7 @@ void unstick_I2C() {
 			return;
 	}
 
-// 12. Configure the SCL and SDA I/Os as Alternate function Open-Drain.
+	// 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;
@@ -273,34 +316,35 @@ void unstick_I2C() {
 	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.
+	// 13. Set SWRST bit in I2Cx_CR1 register.
 	hi2c1.Instance->CR1 |= 0x8000;
 
 	asm("nop");
 
-// 14. Clear SWRST bit in I2Cx_CR1 register.
+	// 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
+	// 15. Enable the I2C peripheral by setting the PE bit in I2Cx_CR1 register
 	hi2c1.Instance->CR1 |= 0x0001;
 
-// Call initialization function.
+	// 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;
+	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;
+	return HAL_GPIO_ReadPin(KEY_B_GPIO_Port, KEY_B_Pin) == GPIO_PIN_RESET ? 1 : 0;
+}
+
+void BSPInit(void) {
+	switchToFastPWM();
 }
 
 void reboot() {
-
 	NVIC_SystemReset();
 }
 

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

@@ -4,14 +4,14 @@
  *  Created on: 14Apr.,2018
  *      Author: Ralim
  */
-#include <I2C_Wrapper.hpp>
 #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)
+	hi2c1.State = HAL_I2C_STATE_READY; // Force state reset (even if tx error)
 	if (I2CSemaphore) {
 		xSemaphoreGiveFromISR(I2CSemaphore, NULL);
 	}
@@ -22,8 +22,8 @@ bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress,
 
 	if (!lock())
 		return false;
-	if (HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress,
-	I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
+	if (HAL_I2C_Mem_Read(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT,
+			pData, Size, 500) != HAL_OK) {
 
 		I2C_Unstick();
 		unlock();
@@ -32,7 +32,6 @@ bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t MemAddress,
 
 	unlock();
 	return true;
-
 }
 bool FRToSI2C::I2C_RegisterWrite(uint8_t address, uint8_t reg, uint8_t data) {
 	return Mem_Write(address, reg, &data, 1);
@@ -48,8 +47,8 @@ bool FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
 
 	if (!lock())
 		return false;
-	if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress,
-	I2C_MEMADD_SIZE_8BIT, pData, Size, 500) != HAL_OK) {
+	if (HAL_I2C_Mem_Write(&hi2c1, DevAddress, MemAddress, I2C_MEMADD_SIZE_8BIT,
+			pData, Size, 500) != HAL_OK) {
 
 		I2C_Unstick();
 		unlock();
@@ -87,11 +86,22 @@ void FRToSI2C::I2C_Unstick() {
 }
 
 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

@@ -44,6 +44,6 @@ void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) {
 }
 
 void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
-	(void)GPIO_Pin;
+	(void) GPIO_Pin;
 	InterruptHandler::irqCallback();
 }

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

@@ -18,17 +18,20 @@
 #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 LIS_ORI_FLIP
+#define ACCEL_ORI_FLIP
 #define OLED_FLIP
+#define BATTFILTERDEPTH 8
 #endif
 
 #ifdef MODEL_TS80P
@@ -37,8 +40,9 @@
 #define POW_QC
 #define TEMP_NTC
 #define I2C_SOFT
-#define LIS_ORI_FLIP
+#define ACCEL_ORI_FLIP
 #define OLED_FLIP
+#define BATTFILTERDEPTH 8
 #endif
 
 #endif /* BSP_MINIWARE_MODEL_CONFIG_H_ */

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

@@ -16,6 +16,7 @@
 #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
@@ -48,6 +49,7 @@
 #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
@@ -87,6 +89,7 @@
 #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

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

@@ -34,3 +34,17 @@ uint8_t usb_pd_detect() {
 	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

@@ -12,65 +12,67 @@
 #include "Model_Config.h"
 #ifdef POW_QC
 void QC_DPlusZero_Six() {
-    HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET);  // pull down D+
+	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);
+	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+
+	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);
+	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);
+	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);
+	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);
+	// 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);
+	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; }
+uint8_t QC_DM_PulledDown() {
+	return HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO_PIN_RESET ? 1 : 0;
+}
 #endif
 void QC_resync() {
 #ifdef POW_QC
-    seekQC((systemSettings.cutoutSetting) ? 120 : 90,
-           systemSettings.voltageDiv);  // Run the QC seek again if we have drifted too much
+	seekQC((systemSettings.QCIdealVoltage) ? 120 : 90,
+			systemSettings.voltageDiv); // Run the QC seek again if we have drifted too much
 #endif
 }

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

@@ -17,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);
@@ -30,7 +31,6 @@ static void MX_TIM2_Init(void);
 static void MX_DMA_Init(void);
 static void MX_GPIO_Init(void);
 static void MX_ADC2_Init(void);
-#define SWD_ENABLE
 void Setup_HAL() {
 	SystemClock_Config();
 
@@ -49,7 +49,7 @@ 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_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
 }
@@ -57,8 +57,12 @@ void Setup_HAL() {
 // 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;
 }
 
@@ -125,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
@@ -136,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
@@ -157,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;
@@ -191,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);
@@ -209,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;
@@ -279,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);
@@ -315,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);
@@ -337,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.

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

@@ -22,6 +22,4 @@
 
 #endif
 
-
-
 #endif /* BSP_MINIWARE_SOFTWARE_I2C_H_ */

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

@@ -17,7 +17,7 @@ uint8_t flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
 	pEraseInit.TypeErase = FLASH_TYPEERASE_PAGES;
 	pEraseInit.Banks = FLASH_BANK_1;
 	pEraseInit.NbPages = 1;
-	pEraseInit.PageAddress = (uint32_t)settings_page;
+	pEraseInit.PageAddress = (uint32_t) settings_page;
 	uint32_t failingAddress = 0;
 	resetWatchdog();
 	__HAL_FLASH_CLEAR_FLAG(
@@ -33,8 +33,8 @@ uint8_t flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
 	HAL_FLASH_Unlock();
 	for (uint8_t i = 0; i < (length / 2); i++) {
 		resetWatchdog();
-		HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, (uint32_t)&settings_page[i],
-				data[i]);
+		HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,
+				(uint32_t) &settings_page[i], data[i]);
 	}
 	HAL_FLASH_Lock();
 	return 1;

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

@@ -142,16 +142,16 @@ void fusb_send_hardrst() {
 	I2CBB::unlock2();
 }
 
-void fusb_setup() {
+bool fusb_setup() {
 
 	if (!I2CBB::lock2()) {
-		return;
+		return false;
 	}
 	/* Fully reset the FUSB302B */
 //	fusb_write_byte( FUSB_RESET, FUSB_RESET_SW_RES);
 //	osDelay(2);
 	if (!fusb_read_id()) {
-		return;
+		return false;
 	}
 
 	/* Turn on all power */
@@ -200,6 +200,7 @@ void fusb_setup() {
 	HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 	HAL_NVIC_SetPriority(EXTI9_5_IRQn, 10, 0);
 	HAL_NVIC_EnableIRQ(EXTI9_5_IRQn);
+	return true;
 }
 
 void fusb_get_status(union fusb_status *status) {

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

@@ -15,8 +15,7 @@ static uint8_t logo_page[1024] __attribute__ ((section (".logo_page")));
 
 uint8_t showBootLogoIfavailable() {
 // Do not show logo data if signature is not found.
-	if (LOGO_HEADER_VALUE
-			!= *(reinterpret_cast<const uint32_t*>(logo_page))) {
+	if (LOGO_HEADER_VALUE != *(reinterpret_cast<const uint32_t*>(logo_page))) {
 		return 0;
 	}
 

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

@@ -34,16 +34,16 @@
 #include "task.h"
 
 /* For backward compatibility, ensure configKERNEL_INTERRUPT_PRIORITY is
-defined.  The value should also ensure backward compatibility.
-FreeRTOS.org versions prior to V4.4.0 did not include this definition. */
+ defined.  The value should also ensure backward compatibility.
+ FreeRTOS.org versions prior to V4.4.0 did not include this definition. */
 #ifndef configKERNEL_INTERRUPT_PRIORITY
-	#define configKERNEL_INTERRUPT_PRIORITY 255
+#define configKERNEL_INTERRUPT_PRIORITY 255
 #endif
 
 #ifndef configSYSTICK_CLOCK_HZ
-	#define configSYSTICK_CLOCK_HZ configCPU_CLOCK_HZ
-	/* Ensure the SysTick is clocked at the same frequency as the core. */
-	#define portNVIC_SYSTICK_CLK_BIT	( 1UL << 2UL )
+#define configSYSTICK_CLOCK_HZ configCPU_CLOCK_HZ
+/* Ensure the SysTick is clocked at the same frequency as the core. */
+#define portNVIC_SYSTICK_CLK_BIT	( 1UL << 2UL )
 #else
 	/* The way the SysTick is clocked is not modified in case it is not the same
 	as the core. */
@@ -85,21 +85,21 @@ FreeRTOS.org versions prior to V4.4.0 did not include this definition. */
 #define portMAX_24_BIT_NUMBER				( 0xffffffUL )
 
 /* A fiddle factor to estimate the number of SysTick counts that would have
-occurred while the SysTick counter is stopped during tickless idle
-calculations. */
+ occurred while the SysTick counter is stopped during tickless idle
+ calculations. */
 #define portMISSED_COUNTS_FACTOR			( 45UL )
 
 /* For strict compliance with the Cortex-M spec the task start address should
-have bit-0 clear, as it is loaded into the PC on exit from an ISR. */
+ have bit-0 clear, as it is loaded into the PC on exit from an ISR. */
 #define portSTART_ADDRESS_MASK				( ( StackType_t ) 0xfffffffeUL )
 
 /* Let the user override the pre-loading of the initial LR with the address of
-prvTaskExitError() in case it messes up unwinding of the stack in the
-debugger. */
+ prvTaskExitError() in case it messes up unwinding of the stack in the
+ debugger. */
 #ifdef configTASK_RETURN_ADDRESS
 	#define portTASK_RETURN_ADDRESS	configTASK_RETURN_ADDRESS
 #else
-	#define portTASK_RETURN_ADDRESS	prvTaskExitError
+#define portTASK_RETURN_ADDRESS	prvTaskExitError
 #endif
 
 /*
@@ -107,29 +107,29 @@ debugger. */
  * file is weak to allow application writers to change the timer used to
  * generate the tick interrupt.
  */
-void vPortSetupTimerInterrupt( void );
+void vPortSetupTimerInterrupt(void);
 
 /*
  * Exception handlers.
  */
-void xPortPendSVHandler( void ) __attribute__ (( naked ));
-void xPortSysTickHandler( void );
-void vPortSVCHandler( void ) __attribute__ (( naked ));
+void xPortPendSVHandler(void) __attribute__ (( naked ));
+void xPortSysTickHandler(void);
+void vPortSVCHandler(void) __attribute__ (( naked ));
 
 /*
  * Start first task is a separate function so it can be tested in isolation.
  */
-static void prvPortStartFirstTask( void ) __attribute__ (( naked ));
+static void prvPortStartFirstTask(void) __attribute__ (( naked ));
 
 /*
  * Used to catch tasks that attempt to return from their implementing function.
  */
-static void prvTaskExitError( void );
+static void prvTaskExitError(void);
 
 /*-----------------------------------------------------------*/
 
 /* Each task maintains its own interrupt status in the critical nesting
-variable. */
+ variable. */
 static UBaseType_t uxCriticalNesting = 0xaaaaaaaa;
 
 /*
@@ -161,9 +161,10 @@ static UBaseType_t uxCriticalNesting = 0xaaaaaaaa;
  * a priority above configMAX_SYSCALL_INTERRUPT_PRIORITY.
  */
 #if( configASSERT_DEFINED == 1 )
-	 static uint8_t ucMaxSysCallPriority = 0;
-	 static uint32_t ulMaxPRIGROUPValue = 0;
-	 static const volatile uint8_t * const pcInterruptPriorityRegisters = ( const volatile uint8_t * const ) portNVIC_IP_REGISTERS_OFFSET_16;
+static uint8_t ucMaxSysCallPriority = 0;
+static uint32_t ulMaxPRIGROUPValue = 0;
+static const volatile uint8_t *const pcInterruptPriorityRegisters =
+		(const volatile uint8_t* const ) portNVIC_IP_REGISTERS_OFFSET_16;
 #endif /* configASSERT_DEFINED */
 
 /*-----------------------------------------------------------*/
@@ -171,129 +172,126 @@ static UBaseType_t uxCriticalNesting = 0xaaaaaaaa;
 /*
  * See header file for description.
  */
-StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, TaskFunction_t pxCode, void *pvParameters )
-{
+StackType_t* pxPortInitialiseStack(StackType_t *pxTopOfStack,
+		TaskFunction_t pxCode, void *pvParameters) {
 	/* Simulate the stack frame as it would be created by a context switch
-	interrupt. */
+	 interrupt. */
 	pxTopOfStack--; /* Offset added to account for the way the MCU uses the stack on entry/exit of interrupts. */
-	*pxTopOfStack = portINITIAL_XPSR;	/* xPSR */
+	*pxTopOfStack = portINITIAL_XPSR; /* xPSR */
 	pxTopOfStack--;
-	*pxTopOfStack = ( ( StackType_t ) pxCode ) & portSTART_ADDRESS_MASK;	/* PC */
+	*pxTopOfStack = ((StackType_t) pxCode) & portSTART_ADDRESS_MASK; /* PC */
 	pxTopOfStack--;
-	*pxTopOfStack = ( StackType_t ) portTASK_RETURN_ADDRESS;	/* LR */
-	pxTopOfStack -= 5;	/* R12, R3, R2 and R1. */
-	*pxTopOfStack = ( StackType_t ) pvParameters;	/* R0 */
-	pxTopOfStack -= 8;	/* R11, R10, R9, R8, R7, R6, R5 and R4. */
+	*pxTopOfStack = (StackType_t) portTASK_RETURN_ADDRESS; /* LR */
+	pxTopOfStack -= 5; /* R12, R3, R2 and R1. */
+	*pxTopOfStack = (StackType_t) pvParameters; /* R0 */
+	pxTopOfStack -= 8; /* R11, R10, R9, R8, R7, R6, R5 and R4. */
 
 	return pxTopOfStack;
 }
 /*-----------------------------------------------------------*/
 
-static void prvTaskExitError( void )
-{
-volatile uint32_t ulDummy = 0UL;
+static void prvTaskExitError(void) {
+	volatile uint32_t ulDummy = 0UL;
 
 	/* A function that implements a task must not exit or attempt to return to
-	its caller as there is nothing to return to.  If a task wants to exit it
-	should instead call vTaskDelete( NULL ).
+	 its caller as there is nothing to return to.  If a task wants to exit it
+	 should instead call vTaskDelete( NULL ).
 
-	Artificially force an assert() to be triggered if configASSERT() is
-	defined, then stop here so application writers can catch the error. */
-	configASSERT( uxCriticalNesting == ~0UL );
+	 Artificially force an assert() to be triggered if configASSERT() is
+	 defined, then stop here so application writers can catch the error. */
+	configASSERT(uxCriticalNesting == ~0UL);
 	portDISABLE_INTERRUPTS();
-	while( ulDummy == 0 )
-	{
+	while (ulDummy == 0) {
 		/* This file calls prvTaskExitError() after the scheduler has been
-		started to remove a compiler warning about the function being defined
-		but never called.  ulDummy is used purely to quieten other warnings
-		about code appearing after this function is called - making ulDummy
-		volatile makes the compiler think the function could return and
-		therefore not output an 'unreachable code' warning for code that appears
-		after it. */
+		 started to remove a compiler warning about the function being defined
+		 but never called.  ulDummy is used purely to quieten other warnings
+		 about code appearing after this function is called - making ulDummy
+		 volatile makes the compiler think the function could return and
+		 therefore not output an 'unreachable code' warning for code that appears
+		 after it. */
 	}
 }
 /*-----------------------------------------------------------*/
 
-void vPortSVCHandler( void )
-{
+void vPortSVCHandler(void) {
 	__asm volatile (
-					"	ldr	r3, pxCurrentTCBConst2		\n" /* Restore the context. */
-					"	ldr r1, [r3]					\n" /* Use pxCurrentTCBConst to get the pxCurrentTCB address. */
-					"	ldr r0, [r1]					\n" /* The first item in pxCurrentTCB is the task top of stack. */
-					"	ldmia r0!, {r4-r11}				\n" /* Pop the registers that are not automatically saved on exception entry and the critical nesting count. */
-					"	msr psp, r0						\n" /* Restore the task stack pointer. */
-					"	isb								\n"
-					"	mov r0, #0 						\n"
-					"	msr	basepri, r0					\n"
-					"	orr r14, #0xd					\n"
-					"	bx r14							\n"
-					"									\n"
-					"	.align 4						\n"
-					"pxCurrentTCBConst2: .word pxCurrentTCB				\n"
-				);
+			"	ldr	r3, pxCurrentTCBConst2		\n" /* Restore the context. */
+			"	ldr r1, [r3]					\n" /* Use pxCurrentTCBConst to get the pxCurrentTCB address. */
+			"	ldr r0, [r1]					\n" /* The first item in pxCurrentTCB is the task top of stack. */
+			"	ldmia r0!, {r4-r11}				\n" /* Pop the registers that are not automatically saved on exception entry and the critical nesting count. */
+			"	msr psp, r0						\n" /* Restore the task stack pointer. */
+			"	isb								\n"
+			"	mov r0, #0 						\n"
+			"	msr	basepri, r0					\n"
+			"	orr r14, #0xd					\n"
+			"	bx r14							\n"
+			"									\n"
+			"	.align 4						\n"
+			"pxCurrentTCBConst2: .word pxCurrentTCB				\n"
+	);
 }
 /*-----------------------------------------------------------*/
 
-static void prvPortStartFirstTask( void )
-{
+static void prvPortStartFirstTask(void) {
 	__asm volatile(
-					" ldr r0, =0xE000ED08 	\n" /* Use the NVIC offset register to locate the stack. */
-					" ldr r0, [r0] 			\n"
-					" ldr r0, [r0] 			\n"
-					" msr msp, r0			\n" /* Set the msp back to the start of the stack. */
-					" cpsie i				\n" /* Globally enable interrupts. */
-					" cpsie f				\n"
-					" dsb					\n"
-					" isb					\n"
-					" svc 0					\n" /* System call to start first task. */
-					" nop					\n"
-				);
+			" ldr r0, =0xE000ED08 	\n" /* Use the NVIC offset register to locate the stack. */
+			" ldr r0, [r0] 			\n"
+			" ldr r0, [r0] 			\n"
+			" msr msp, r0			\n" /* Set the msp back to the start of the stack. */
+			" cpsie i				\n" /* Globally enable interrupts. */
+			" cpsie f				\n"
+			" dsb					\n"
+			" isb					\n"
+			" svc 0					\n" /* System call to start first task. */
+			" nop					\n"
+	);
 }
 /*-----------------------------------------------------------*/
 
 /*
  * See header file for description.
  */
-BaseType_t xPortStartScheduler( void )
-{
+BaseType_t xPortStartScheduler(void) {
 	/* configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to 0.
-	See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
-	configASSERT( configMAX_SYSCALL_INTERRUPT_PRIORITY );
+	 See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html */
+	configASSERT(configMAX_SYSCALL_INTERRUPT_PRIORITY);
 
-	#if( configASSERT_DEFINED == 1 )
+#if( configASSERT_DEFINED == 1 )
 	{
 		volatile uint32_t ulOriginalPriority;
-		volatile uint8_t * const pucFirstUserPriorityRegister = ( volatile uint8_t * const ) ( portNVIC_IP_REGISTERS_OFFSET_16 + portFIRST_USER_INTERRUPT_NUMBER );
+		volatile uint8_t *const pucFirstUserPriorityRegister =
+				(volatile uint8_t* const ) ( portNVIC_IP_REGISTERS_OFFSET_16
+						+ portFIRST_USER_INTERRUPT_NUMBER);
 		volatile uint8_t ucMaxPriorityValue;
 
 		/* Determine the maximum priority from which ISR safe FreeRTOS API
-		functions can be called.  ISR safe functions are those that end in
-		"FromISR".  FreeRTOS maintains separate thread and ISR API functions to
-		ensure interrupt entry is as fast and simple as possible.
+		 functions can be called.  ISR safe functions are those that end in
+		 "FromISR".  FreeRTOS maintains separate thread and ISR API functions to
+		 ensure interrupt entry is as fast and simple as possible.
 
-		Save the interrupt priority value that is about to be clobbered. */
+		 Save the interrupt priority value that is about to be clobbered. */
 		ulOriginalPriority = *pucFirstUserPriorityRegister;
 
 		/* Determine the number of priority bits available.  First write to all
-		possible bits. */
+		 possible bits. */
 		*pucFirstUserPriorityRegister = portMAX_8_BIT_VALUE;
 
 		/* Read the value back to see how many bits stuck. */
 		ucMaxPriorityValue = *pucFirstUserPriorityRegister;
 
 		/* Use the same mask on the maximum system call priority. */
-		ucMaxSysCallPriority = configMAX_SYSCALL_INTERRUPT_PRIORITY & ucMaxPriorityValue;
+		ucMaxSysCallPriority = configMAX_SYSCALL_INTERRUPT_PRIORITY
+				& ucMaxPriorityValue;
 
 		/* Calculate the maximum acceptable priority group value for the number
-		of bits read back. */
+		 of bits read back. */
 		ulMaxPRIGROUPValue = portMAX_PRIGROUP_BITS;
-		while( ( ucMaxPriorityValue & portTOP_BIT_OF_BYTE ) == portTOP_BIT_OF_BYTE )
-		{
+		while ((ucMaxPriorityValue & portTOP_BIT_OF_BYTE) == portTOP_BIT_OF_BYTE) {
 			ulMaxPRIGROUPValue--;
-			ucMaxPriorityValue <<= ( uint8_t ) 0x01;
+			ucMaxPriorityValue <<= (uint8_t) 0x01;
 		}
 
-		#ifdef __NVIC_PRIO_BITS
+#ifdef __NVIC_PRIO_BITS
 		{
 			/* Check the CMSIS configuration that defines the number of
 			priority bits matches the number of priority bits actually queried
@@ -302,7 +300,7 @@ BaseType_t xPortStartScheduler( void )
 		}
 		#endif
 
-		#ifdef configPRIO_BITS
+#ifdef configPRIO_BITS
 		{
 			/* Check the FreeRTOS configuration that defines the number of
 			priority bits matches the number of priority bits actually queried
@@ -312,22 +310,22 @@ BaseType_t xPortStartScheduler( void )
 		#endif
 
 		/* Shift the priority group value back to its position within the AIRCR
-		register. */
+		 register. */
 		ulMaxPRIGROUPValue <<= portPRIGROUP_SHIFT;
 		ulMaxPRIGROUPValue &= portPRIORITY_GROUP_MASK;
 
 		/* Restore the clobbered interrupt priority register to its original
-		value. */
+		 value. */
 		*pucFirstUserPriorityRegister = ulOriginalPriority;
 	}
-	#endif /* conifgASSERT_DEFINED */
+#endif /* conifgASSERT_DEFINED */
 
 	/* Make PendSV and SysTick the lowest priority interrupts. */
 	portNVIC_SYSPRI2_REG |= portNVIC_PENDSV_PRI;
 	portNVIC_SYSPRI2_REG |= portNVIC_SYSTICK_PRI;
 
 	/* Start the timer that generates the tick ISR.  Interrupts are disabled
-	here already. */
+	 here already. */
 	vPortSetupTimerInterrupt();
 
 	/* Initialise the critical nesting count ready for the first task. */
@@ -337,11 +335,11 @@ BaseType_t xPortStartScheduler( void )
 	prvPortStartFirstTask();
 
 	/* Should never get here as the tasks will now be executing!  Call the task
-	exit error function to prevent compiler warnings about a static function
-	not being called in the case that the application writer overrides this
-	functionality by defining configTASK_RETURN_ADDRESS.  Call
-	vTaskSwitchContext() so link time optimisation does not remove the
-	symbol. */
+	 exit error function to prevent compiler warnings about a static function
+	 not being called in the case that the application writer overrides this
+	 functionality by defining configTASK_RETURN_ADDRESS.  Call
+	 vTaskSwitchContext() so link time optimisation does not remove the
+	 symbol. */
 	vTaskSwitchContext();
 	prvTaskExitError();
 
@@ -350,92 +348,84 @@ BaseType_t xPortStartScheduler( void )
 }
 /*-----------------------------------------------------------*/
 
-void vPortEndScheduler( void )
-{
+void vPortEndScheduler(void) {
 	/* Not implemented in ports where there is nothing to return to.
-	Artificially force an assert. */
-	configASSERT( uxCriticalNesting == 1000UL );
+	 Artificially force an assert. */
+	configASSERT(uxCriticalNesting == 1000UL);
 }
 /*-----------------------------------------------------------*/
 
-void vPortEnterCritical( void )
-{
+void vPortEnterCritical(void) {
 	portDISABLE_INTERRUPTS();
 	uxCriticalNesting++;
 
 	/* This is not the interrupt safe version of the enter critical function so
-	assert() if it is being called from an interrupt context.  Only API
-	functions that end in "FromISR" can be used in an interrupt.  Only assert if
-	the critical nesting count is 1 to protect against recursive calls if the
-	assert function also uses a critical section. */
-	if( uxCriticalNesting == 1 )
-	{
-		configASSERT( ( portNVIC_INT_CTRL_REG & portVECTACTIVE_MASK ) == 0 );
+	 assert() if it is being called from an interrupt context.  Only API
+	 functions that end in "FromISR" can be used in an interrupt.  Only assert if
+	 the critical nesting count is 1 to protect against recursive calls if the
+	 assert function also uses a critical section. */
+	if (uxCriticalNesting == 1) {
+		configASSERT(( portNVIC_INT_CTRL_REG & portVECTACTIVE_MASK) == 0);
 	}
 }
 /*-----------------------------------------------------------*/
 
-void vPortExitCritical( void )
-{
-	configASSERT( uxCriticalNesting );
+void vPortExitCritical(void) {
+	configASSERT(uxCriticalNesting);
 	uxCriticalNesting--;
-	if( uxCriticalNesting == 0 )
-	{
+	if (uxCriticalNesting == 0) {
 		portENABLE_INTERRUPTS();
 	}
 }
 /*-----------------------------------------------------------*/
 
-void xPortPendSVHandler( void )
-{
+void xPortPendSVHandler(void) {
 	/* This is a naked function. */
 
 	__asm volatile
 	(
-	"	mrs r0, psp							\n"
-	"	isb									\n"
-	"										\n"
-	"	ldr	r3, pxCurrentTCBConst			\n" /* Get the location of the current TCB. */
-	"	ldr	r2, [r3]						\n"
-	"										\n"
-	"	stmdb r0!, {r4-r11}					\n" /* Save the remaining registers. */
-	"	str r0, [r2]						\n" /* Save the new top of stack into the first member of the TCB. */
-	"										\n"
-	"	stmdb sp!, {r3, r14}				\n"
-	"	mov r0, %0							\n"
-	"	msr basepri, r0						\n"
-	"	bl vTaskSwitchContext				\n"
-	"	mov r0, #0							\n"
-	"	msr basepri, r0						\n"
-	"	ldmia sp!, {r3, r14}				\n"
-	"										\n" /* Restore the context, including the critical nesting count. */
-	"	ldr r1, [r3]						\n"
-	"	ldr r0, [r1]						\n" /* The first item in pxCurrentTCB is the task top of stack. */
-	"	ldmia r0!, {r4-r11}					\n" /* Pop the registers. */
-	"	msr psp, r0							\n"
-	"	isb									\n"
-	"	bx r14								\n"
-	"										\n"
-	"	.align 4							\n"
-	"pxCurrentTCBConst: .word pxCurrentTCB	\n"
-	::"i"(configMAX_SYSCALL_INTERRUPT_PRIORITY)
+			"	mrs r0, psp							\n"
+			"	isb									\n"
+			"										\n"
+			"	ldr	r3, pxCurrentTCBConst			\n" /* Get the location of the current TCB. */
+			"	ldr	r2, [r3]						\n"
+			"										\n"
+			"	stmdb r0!, {r4-r11}					\n" /* Save the remaining registers. */
+			"	str r0, [r2]						\n" /* Save the new top of stack into the first member of the TCB. */
+			"										\n"
+			"	stmdb sp!, {r3, r14}				\n"
+			"	mov r0, %0							\n"
+			"	msr basepri, r0						\n"
+			"	bl vTaskSwitchContext				\n"
+			"	mov r0, #0							\n"
+			"	msr basepri, r0						\n"
+			"	ldmia sp!, {r3, r14}				\n"
+			"										\n" /* Restore the context, including the critical nesting count. */
+			"	ldr r1, [r3]						\n"
+			"	ldr r0, [r1]						\n" /* The first item in pxCurrentTCB is the task top of stack. */
+			"	ldmia r0!, {r4-r11}					\n" /* Pop the registers. */
+			"	msr psp, r0							\n"
+			"	isb									\n"
+			"	bx r14								\n"
+			"										\n"
+			"	.align 4							\n"
+			"pxCurrentTCBConst: .word pxCurrentTCB	\n"
+			::"i"(configMAX_SYSCALL_INTERRUPT_PRIORITY)
 	);
 }
 /*-----------------------------------------------------------*/
 
-void xPortSysTickHandler( void )
-{
+void xPortSysTickHandler(void) {
 	/* The SysTick runs at the lowest interrupt priority, so when this interrupt
-	executes all interrupts must be unmasked.  There is therefore no need to
-	save and then restore the interrupt mask value as its value is already
-	known. */
+	 executes all interrupts must be unmasked.  There is therefore no need to
+	 save and then restore the interrupt mask value as its value is already
+	 known. */
 	portDISABLE_INTERRUPTS();
 	{
 		/* Increment the RTOS tick. */
-		if( xTaskIncrementTick() != pdFALSE )
-		{
+		if (xTaskIncrementTick() != pdFALSE) {
 			/* A context switch is required.  Context switching is performed in
-			the PendSV interrupt.  Pend the PendSV interrupt. */
+			 the PendSV interrupt.  Pend the PendSV interrupt. */
 			portNVIC_INT_CTRL_REG = portNVIC_PENDSVSET_BIT;
 		}
 	}
@@ -614,10 +604,9 @@ void xPortSysTickHandler( void )
  * Setup the systick timer to generate the tick interrupts at the required
  * frequency.
  */
-__attribute__(( weak )) void vPortSetupTimerInterrupt( void )
-{
+__attribute__(( weak )) void vPortSetupTimerInterrupt(void) {
 	/* Calculate the constants required to configure the tick interrupt. */
-	#if( configUSE_TICKLESS_IDLE == 1 )
+#if( configUSE_TICKLESS_IDLE == 1 )
 	{
 		ulTimerCountsForOneTick = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ );
 		xMaximumPossibleSuppressedTicks = portMAX_24_BIT_NUMBER / ulTimerCountsForOneTick;
@@ -630,88 +619,69 @@ __attribute__(( weak )) void vPortSetupTimerInterrupt( void )
 	portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;
 
 	/* Configure SysTick to interrupt at the requested rate. */
-	portNVIC_SYSTICK_LOAD_REG = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;
-	portNVIC_SYSTICK_CTRL_REG = ( portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT );
+	portNVIC_SYSTICK_LOAD_REG = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ)
+			- 1UL;
+	portNVIC_SYSTICK_CTRL_REG = ( portNVIC_SYSTICK_CLK_BIT
+			| portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT);
 }
 /*-----------------------------------------------------------*/
 
 #if( configASSERT_DEFINED == 1 )
 
-	void vPortValidateInterruptPriority( void )
-	{
+void vPortValidateInterruptPriority(void) {
 	uint32_t ulCurrentInterrupt;
 	uint8_t ucCurrentPriority;
 
-		/* Obtain the number of the currently executing interrupt. */
-		__asm volatile( "mrs %0, ipsr" : "=r"( ulCurrentInterrupt ) :: "memory" );
+	/* Obtain the number of the currently executing interrupt. */
+	__asm volatile( "mrs %0, ipsr" : "=r"( ulCurrentInterrupt ) :: "memory" );
 
-		/* Is the interrupt number a user defined interrupt? */
-		if( ulCurrentInterrupt >= portFIRST_USER_INTERRUPT_NUMBER )
-		{
-			/* Look up the interrupt's priority. */
-			ucCurrentPriority = pcInterruptPriorityRegisters[ ulCurrentInterrupt ];
+	/* Is the interrupt number a user defined interrupt? */
+	if (ulCurrentInterrupt >= portFIRST_USER_INTERRUPT_NUMBER) {
+		/* Look up the interrupt's priority. */
+		ucCurrentPriority = pcInterruptPriorityRegisters[ulCurrentInterrupt];
 
-			/* The following assertion will fail if a service routine (ISR) for
-			an interrupt that has been assigned a priority above
-			configMAX_SYSCALL_INTERRUPT_PRIORITY calls an ISR safe FreeRTOS API
-			function.  ISR safe FreeRTOS API functions must *only* be called
-			from interrupts that have been assigned a priority at or below
-			configMAX_SYSCALL_INTERRUPT_PRIORITY.
+		/* The following assertion will fail if a service routine (ISR) for
+		 an interrupt that has been assigned a priority above
+		 configMAX_SYSCALL_INTERRUPT_PRIORITY calls an ISR safe FreeRTOS API
+		 function.  ISR safe FreeRTOS API functions must *only* be called
+		 from interrupts that have been assigned a priority at or below
+		 configMAX_SYSCALL_INTERRUPT_PRIORITY.
 
-			Numerically low interrupt priority numbers represent logically high
-			interrupt priorities, therefore the priority of the interrupt must
-			be set to a value equal to or numerically *higher* than
-			configMAX_SYSCALL_INTERRUPT_PRIORITY.
+		 Numerically low interrupt priority numbers represent logically high
+		 interrupt priorities, therefore the priority of the interrupt must
+		 be set to a value equal to or numerically *higher* than
+		 configMAX_SYSCALL_INTERRUPT_PRIORITY.
 
-			Interrupts that	use the FreeRTOS API must not be left at their
-			default priority of	zero as that is the highest possible priority,
-			which is guaranteed to be above configMAX_SYSCALL_INTERRUPT_PRIORITY,
-			and	therefore also guaranteed to be invalid.
+		 Interrupts that	use the FreeRTOS API must not be left at their
+		 default priority of	zero as that is the highest possible priority,
+		 which is guaranteed to be above configMAX_SYSCALL_INTERRUPT_PRIORITY,
+		 and	therefore also guaranteed to be invalid.
 
-			FreeRTOS maintains separate thread and ISR API functions to ensure
-			interrupt entry is as fast and simple as possible.
+		 FreeRTOS maintains separate thread and ISR API functions to ensure
+		 interrupt entry is as fast and simple as possible.
 
-			The following links provide detailed information:
-			http://www.freertos.org/RTOS-Cortex-M3-M4.html
-			http://www.freertos.org/FAQHelp.html */
-			configASSERT( ucCurrentPriority >= ucMaxSysCallPriority );
-		}
-
-		/* Priority grouping:  The interrupt controller (NVIC) allows the bits
-		that define each interrupt's priority to be split between bits that
-		define the interrupt's pre-emption priority bits and bits that define
-		the interrupt's sub-priority.  For simplicity all bits must be defined
-		to be pre-emption priority bits.  The following assertion will fail if
-		this is not the case (if some bits represent a sub-priority).
-
-		If the application only uses CMSIS libraries for interrupt
-		configuration then the correct setting can be achieved on all Cortex-M
-		devices by calling NVIC_SetPriorityGrouping( 0 ); before starting the
-		scheduler.  Note however that some vendor specific peripheral libraries
-		assume a non-zero priority group setting, in which cases using a value
-		of zero will result in unpredictable behaviour. */
-		configASSERT( ( portAIRCR_REG & portPRIORITY_GROUP_MASK ) <= ulMaxPRIGROUPValue );
+		 The following links provide detailed information:
+		 http://www.freertos.org/RTOS-Cortex-M3-M4.html
+		 http://www.freertos.org/FAQHelp.html */
+		configASSERT(ucCurrentPriority >= ucMaxSysCallPriority);
 	}
 
+	/* Priority grouping:  The interrupt controller (NVIC) allows the bits
+	 that define each interrupt's priority to be split between bits that
+	 define the interrupt's pre-emption priority bits and bits that define
+	 the interrupt's sub-priority.  For simplicity all bits must be defined
+	 to be pre-emption priority bits.  The following assertion will fail if
+	 this is not the case (if some bits represent a sub-priority).
+
+	 If the application only uses CMSIS libraries for interrupt
+	 configuration then the correct setting can be achieved on all Cortex-M
+	 devices by calling NVIC_SetPriorityGrouping( 0 ); before starting the
+	 scheduler.  Note however that some vendor specific peripheral libraries
+	 assume a non-zero priority group setting, in which cases using a value
+	 of zero will result in unpredictable behaviour. */
+	configASSERT(
+			( portAIRCR_REG & portPRIORITY_GROUP_MASK) <= ulMaxPRIGROUPValue);
+}
+
 #endif /* configASSERT_DEFINED */
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

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

@@ -25,7 +25,6 @@
  * 1 tab == 4 spaces!
  */
 
-
 #ifndef PORTMACRO_H
 #define PORTMACRO_H
 
@@ -60,12 +59,12 @@ typedef unsigned long UBaseType_t;
 	typedef uint16_t TickType_t;
 	#define portMAX_DELAY ( TickType_t ) 0xffff
 #else
-	typedef uint32_t TickType_t;
-	#define portMAX_DELAY ( TickType_t ) 0xffffffffUL
+typedef uint32_t TickType_t;
+#define portMAX_DELAY ( TickType_t ) 0xffffffffUL
 
-	/* 32-bit tick type on a 32-bit architecture, so reads of the tick count do
-	not need to be guarded with a critical section. */
-	#define portTICK_TYPE_IS_ATOMIC 1
+/* 32-bit tick type on a 32-bit architecture, so reads of the tick count do
+ not need to be guarded with a critical section. */
+#define portTICK_TYPE_IS_ATOMIC 1
 #endif
 /*-----------------------------------------------------------*/
 
@@ -94,8 +93,8 @@ typedef unsigned long UBaseType_t;
 /*-----------------------------------------------------------*/
 
 /* Critical section management. */
-extern void vPortEnterCritical( void );
-extern void vPortExitCritical( void );
+extern void vPortEnterCritical(void);
+extern void vPortExitCritical(void);
 #define portSET_INTERRUPT_MASK_FROM_ISR()		ulPortRaiseBASEPRI()
 #define portCLEAR_INTERRUPT_MASK_FROM_ISR(x)	vPortSetBASEPRI(x)
 #define portDISABLE_INTERRUPTS()				vPortRaiseBASEPRI()
@@ -106,55 +105,55 @@ extern void vPortExitCritical( void );
 /*-----------------------------------------------------------*/
 
 /* Task function macros as described on the FreeRTOS.org WEB site.  These are
-not necessary for to use this port.  They are defined so the common demo files
-(which build with all the ports) will build. */
+ not necessary for to use this port.  They are defined so the common demo files
+ (which build with all the ports) will build. */
 #define portTASK_FUNCTION_PROTO( vFunction, pvParameters ) void vFunction( void *pvParameters )
 #define portTASK_FUNCTION( vFunction, pvParameters ) void vFunction( void *pvParameters )
 /*-----------------------------------------------------------*/
 
 /* Tickless idle/low power functionality. */
 #ifndef portSUPPRESS_TICKS_AND_SLEEP
-	extern void vPortSuppressTicksAndSleep( TickType_t xExpectedIdleTime );
-	#define portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime ) vPortSuppressTicksAndSleep( xExpectedIdleTime )
+extern void vPortSuppressTicksAndSleep(TickType_t xExpectedIdleTime);
+#define portSUPPRESS_TICKS_AND_SLEEP( xExpectedIdleTime ) vPortSuppressTicksAndSleep( xExpectedIdleTime )
 #endif
 /*-----------------------------------------------------------*/
 
 /* Architecture specific optimisations. */
 #ifndef configUSE_PORT_OPTIMISED_TASK_SELECTION
-	#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
+#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
 #endif
 
 #if configUSE_PORT_OPTIMISED_TASK_SELECTION == 1
 
-	/* Generic helper function. */
-	__attribute__( ( always_inline ) ) static inline uint8_t ucPortCountLeadingZeros( uint32_t ulBitmap )
-	{
+/* Generic helper function. */
+__attribute__( ( always_inline ) ) static inline uint8_t ucPortCountLeadingZeros(
+		uint32_t ulBitmap) {
 	uint8_t ucReturn;
 
-		__asm volatile ( "clz %0, %1" : "=r" ( ucReturn ) : "r" ( ulBitmap ) : "memory" );
-		return ucReturn;
-	}
+	__asm volatile ( "clz %0, %1" : "=r" ( ucReturn ) : "r" ( ulBitmap ) : "memory" );
+	return ucReturn;
+}
 
-	/* Check the configuration. */
-	#if( configMAX_PRIORITIES > 32 )
-		#error configUSE_PORT_OPTIMISED_TASK_SELECTION can only be set to 1 when configMAX_PRIORITIES is less than or equal to 32.  It is very rare that a system requires more than 10 to 15 difference priorities as tasks that share a priority will time slice.
-	#endif
+/* Check the configuration. */
+#if( configMAX_PRIORITIES > 32 )
+#error configUSE_PORT_OPTIMISED_TASK_SELECTION can only be set to 1 when configMAX_PRIORITIES is less than or equal to 32.  It is very rare that a system requires more than 10 to 15 difference priorities as tasks that share a priority will time slice.
+#endif
 
-	/* Store/clear the ready priorities in a bit map. */
-	#define portRECORD_READY_PRIORITY( uxPriority, uxReadyPriorities ) ( uxReadyPriorities ) |= ( 1UL << ( uxPriority ) )
-	#define portRESET_READY_PRIORITY( uxPriority, uxReadyPriorities ) ( uxReadyPriorities ) &= ~( 1UL << ( uxPriority ) )
+/* Store/clear the ready priorities in a bit map. */
+#define portRECORD_READY_PRIORITY( uxPriority, uxReadyPriorities ) ( uxReadyPriorities ) |= ( 1UL << ( uxPriority ) )
+#define portRESET_READY_PRIORITY( uxPriority, uxReadyPriorities ) ( uxReadyPriorities ) &= ~( 1UL << ( uxPriority ) )
 
-	/*-----------------------------------------------------------*/
+/*-----------------------------------------------------------*/
 
-	#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31UL - ( uint32_t ) ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
+#define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities ) uxTopPriority = ( 31UL - ( uint32_t ) ucPortCountLeadingZeros( ( uxReadyPriorities ) ) )
 
 #endif /* configUSE_PORT_OPTIMISED_TASK_SELECTION */
 
 /*-----------------------------------------------------------*/
 
 #ifdef configASSERT
-	void vPortValidateInterruptPriority( void );
-	#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() 	vPortValidateInterruptPriority()
+void vPortValidateInterruptPriority( void );
+#define portASSERT_IF_INTERRUPT_PRIORITY_INVALID() 	vPortValidateInterruptPriority()
 #endif
 
 /* portNOP() is not required by this port. */
@@ -163,25 +162,21 @@ not necessary for to use this port.  They are defined so the common demo files
 #define portINLINE	__inline
 
 #ifndef portFORCE_INLINE
-	#define portFORCE_INLINE inline __attribute__(( always_inline))
+#define portFORCE_INLINE inline __attribute__(( always_inline))
 #endif
 
 /*-----------------------------------------------------------*/
 
-portFORCE_INLINE static BaseType_t xPortIsInsideInterrupt( void )
-{
-uint32_t ulCurrentInterrupt;
-BaseType_t xReturn;
+portFORCE_INLINE static BaseType_t xPortIsInsideInterrupt(void) {
+	uint32_t ulCurrentInterrupt;
+	BaseType_t xReturn;
 
 	/* Obtain the number of the currently executing interrupt. */
 	__asm volatile( "mrs %0, ipsr" : "=r"( ulCurrentInterrupt ) :: "memory" );
 
-	if( ulCurrentInterrupt == 0 )
-	{
+	if (ulCurrentInterrupt == 0) {
 		xReturn = pdFALSE;
-	}
-	else
-	{
+	} else {
 		xReturn = pdTRUE;
 	}
 
@@ -190,47 +185,44 @@ BaseType_t xReturn;
 
 /*-----------------------------------------------------------*/
 
-portFORCE_INLINE static void vPortRaiseBASEPRI( void )
-{
-uint32_t ulNewBASEPRI;
+portFORCE_INLINE static void vPortRaiseBASEPRI(void) {
+	uint32_t ulNewBASEPRI;
 
 	__asm volatile
 	(
-		"	mov %0, %1												\n" \
-		"	msr basepri, %0											\n" \
-		"	isb														\n" \
-		"	dsb														\n" \
-		:"=r" (ulNewBASEPRI) : "i" ( configMAX_SYSCALL_INTERRUPT_PRIORITY ) : "memory"
+			"	mov %0, %1												\n"
+			"	msr basepri, %0											\n"
+			"	isb														\n"
+			"	dsb														\n"
+			:"=r" (ulNewBASEPRI) : "i" ( configMAX_SYSCALL_INTERRUPT_PRIORITY ) : "memory"
 	);
 }
 
 /*-----------------------------------------------------------*/
 
-portFORCE_INLINE static uint32_t ulPortRaiseBASEPRI( void )
-{
-uint32_t ulOriginalBASEPRI, ulNewBASEPRI;
+portFORCE_INLINE static uint32_t ulPortRaiseBASEPRI(void) {
+	uint32_t ulOriginalBASEPRI, ulNewBASEPRI;
 
 	__asm volatile
 	(
-		"	mrs %0, basepri											\n" \
-		"	mov %1, %2												\n" \
-		"	msr basepri, %1											\n" \
-		"	isb														\n" \
-		"	dsb														\n" \
-		:"=r" (ulOriginalBASEPRI), "=r" (ulNewBASEPRI) : "i" ( configMAX_SYSCALL_INTERRUPT_PRIORITY ) : "memory"
+			"	mrs %0, basepri											\n"
+			"	mov %1, %2												\n"
+			"	msr basepri, %1											\n"
+			"	isb														\n"
+			"	dsb														\n"
+			:"=r" (ulOriginalBASEPRI), "=r" (ulNewBASEPRI) : "i" ( configMAX_SYSCALL_INTERRUPT_PRIORITY ) : "memory"
 	);
 
 	/* This return will not be reached but is necessary to prevent compiler
-	warnings. */
+	 warnings. */
 	return ulOriginalBASEPRI;
 }
 /*-----------------------------------------------------------*/
 
-portFORCE_INLINE static void vPortSetBASEPRI( uint32_t ulNewMaskValue )
-{
+portFORCE_INLINE static void vPortSetBASEPRI(uint32_t ulNewMaskValue) {
 	__asm volatile
 	(
-		"	msr basepri, %0	" :: "r" ( ulNewMaskValue ) : "memory"
+			"	msr basepri, %0	" :: "r" ( ulNewMaskValue ) : "memory"
 	);
 }
 /*-----------------------------------------------------------*/

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

@@ -17,6 +17,7 @@ void preRToSInit() {
 	 */
 	HAL_Init();
 	Setup_HAL();  // Setup all the HAL objects
+	BSPInit();
 #ifdef I2C_SOFT
 	I2CBB::init();
 #endif

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

@@ -26,10 +26,9 @@ void HAL_MspInit(void) {
 	/* SysTick_IRQn interrupt configuration */
 	HAL_NVIC_SetPriority(SysTick_IRQn, 15, 0);
 
-
 }
 
-void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) {
+void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc) {
 
 	GPIO_InitTypeDef GPIO_InitStruct;
 	if (hadc->Instance == ADC1) {
@@ -42,10 +41,10 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) {
 		hdma_adc1.Init.Direction = DMA_PERIPH_TO_MEMORY;
 		hdma_adc1.Init.PeriphInc = DMA_PINC_DISABLE;
 		hdma_adc1.Init.MemInc = DMA_MINC_ENABLE;
-		hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
-		hdma_adc1.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
+		hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+		hdma_adc1.Init.MemDataAlignment = DMA_MDATAALIGN_WORD;
 		hdma_adc1.Init.Mode = DMA_CIRCULAR;
-		hdma_adc1.Init.Priority = DMA_PRIORITY_VERY_HIGH;
+		hdma_adc1.Init.Priority = DMA_PRIORITY_MEDIUM;
 		HAL_DMA_Init(&hdma_adc1);
 
 		__HAL_LINKDMA(hadc, DMA_Handle, hdma_adc1);
@@ -63,7 +62,13 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) {
 		 */
 		GPIO_InitStruct.Pin = TIP_TEMP_Pin;
 		GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-		HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+		HAL_GPIO_Init(TIP_TEMP_GPIO_Port, &GPIO_InitStruct);
+		GPIO_InitStruct.Pin = TMP36_INPUT_Pin;
+		GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+		HAL_GPIO_Init(TMP36_INPUT_GPIO_Port, &GPIO_InitStruct);
+		GPIO_InitStruct.Pin = VIN_Pin;
+		GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+		HAL_GPIO_Init(VIN_GPIO_Port, &GPIO_InitStruct);
 
 		/* ADC2 interrupt Init */
 		HAL_NVIC_SetPriority(ADC1_2_IRQn, 15, 0);
@@ -72,7 +77,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc) {
 
 }
 
-void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) {
+void HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c) {
 
 	GPIO_InitTypeDef GPIO_InitStruct;
 	/**I2C1 GPIO Configuration
@@ -123,7 +128,7 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) {
 
 }
 
-void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base) {
+void HAL_TIM_Base_MspInit(TIM_HandleTypeDef *htim_base) {
 	if (htim_base->Instance == TIM3) {
 		/* Peripheral clock enable */
 		__HAL_RCC_TIM3_CLK_ENABLE()

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

@@ -1,158 +1,154 @@
 /**
-  ******************************************************************************
-  * @file    stm32f1xx_hal_timebase_TIM.c 
-  * @brief   HAL time base based on the hardware TIM.
-  ******************************************************************************
-  * This notice applies to any and all portions of this file
-  * that are not between comment pairs USER CODE BEGIN and
-  * USER CODE END. Other portions of this file, whether 
-  * inserted by the user or by software development tools
-  * are owned by their respective copyright owners.
-  *
-  * Copyright (c) 2017 STMicroelectronics International N.V. 
-  * All rights reserved.
-  *
-  * Redistribution and use in source and binary forms, with or without 
-  * modification, are permitted, provided that the following conditions are met:
-  *
-  * 1. Redistribution of source code must retain the above copyright notice, 
-  *    this list of conditions and the following disclaimer.
-  * 2. Redistributions in binary form must reproduce the above copyright notice,
-  *    this list of conditions and the following disclaimer in the documentation
-  *    and/or other materials provided with the distribution.
-  * 3. Neither the name of STMicroelectronics nor the names of other 
-  *    contributors to this software may be used to endorse or promote products 
-  *    derived from this software without specific written permission.
-  * 4. This software, including modifications and/or derivative works of this 
-  *    software, must execute solely and exclusively on microcontroller or
-  *    microprocessor devices manufactured by or for STMicroelectronics.
-  * 5. Redistribution and use of this software other than as permitted under 
-  *    this license is void and will automatically terminate your rights under 
-  *    this license. 
-  *
-  * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" 
-  * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT 
-  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-  * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
-  * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT 
-  * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
-  * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  *
-  ******************************************************************************
-  */
+ ******************************************************************************
+ * @file    stm32f1xx_hal_timebase_TIM.c
+ * @brief   HAL time base based on the hardware TIM.
+ ******************************************************************************
+ * This notice applies to any and all portions of this file
+ * that are not between comment pairs USER CODE BEGIN and
+ * USER CODE END. Other portions of this file, whether
+ * inserted by the user or by software development tools
+ * are owned by their respective copyright owners.
+ *
+ * Copyright (c) 2017 STMicroelectronics International N.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted, provided that the following conditions are met:
+ *
+ * 1. Redistribution of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of other
+ *    contributors to this software may be used to endorse or promote products
+ *    derived from this software without specific written permission.
+ * 4. This software, including modifications and/or derivative works of this
+ *    software, must execute solely and exclusively on microcontroller or
+ *    microprocessor devices manufactured by or for STMicroelectronics.
+ * 5. Redistribution and use of this software other than as permitted under
+ *    this license is void and will automatically terminate your rights under
+ *    this license.
+ *
+ * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
+ * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT
+ * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************
+ */
 
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f1xx_hal.h"
 #include "stm32f1xx_hal_tim.h"
 /** @addtogroup STM32F7xx_HAL_Examples
-  * @{
-  */
+ * @{
+ */
 
 /** @addtogroup HAL_TimeBase
-  * @{
-  */ 
+ * @{
+ */
 
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
-TIM_HandleTypeDef        htim1; 
-uint32_t                 uwIncrementState = 0;
+TIM_HandleTypeDef htim1;
+uint32_t uwIncrementState = 0;
 /* Private function prototypes -----------------------------------------------*/
 /* Private functions ---------------------------------------------------------*/
 
 /**
-  * @brief  This function configures the TIM1 as a time base source. 
-  *         The time source is configured  to have 1ms time base with a dedicated 
-  *         Tick interrupt priority. 
-  * @note   This function is called  automatically at the beginning of program after
-  *         reset by HAL_Init() or at any time when clock is configured, by HAL_RCC_ClockConfig(). 
-  * @param  TickPriority: Tick interrupt priorty.
-  * @retval HAL status
-  */
-HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
-{
-  RCC_ClkInitTypeDef    clkconfig;
-  uint32_t              uwTimclock = 0;
-  uint32_t              uwPrescalerValue = 0;
-  uint32_t              pFLatency;
-  
-  /*Configure the TIM1 IRQ priority */
-  HAL_NVIC_SetPriority(TIM1_UP_IRQn, TickPriority ,0); 
-  
-  /* Enable the TIM1 global Interrupt */
-  HAL_NVIC_EnableIRQ(TIM1_UP_IRQn); 
-  
-  /* Enable TIM1 clock */
-  __HAL_RCC_TIM1_CLK_ENABLE();
-  
-  /* Get clock configuration */
-  HAL_RCC_GetClockConfig(&clkconfig, &pFLatency);
-  
-  /* Compute TIM1 clock */
-  uwTimclock = HAL_RCC_GetPCLK2Freq();
-   
-  /* Compute the prescaler value to have TIM1 counter clock equal to 1MHz */
-  uwPrescalerValue = (uint32_t) ((uwTimclock / 1000000) - 1);
-  
-  /* Initialize TIM1 */
-  htim1.Instance = TIM1;
-  
-  /* Initialize TIMx peripheral as follow:
-  + Period = [(TIM1CLK/1000) - 1]. to have a (1/1000) s time base.
-  + Prescaler = (uwTimclock/1000000 - 1) to have a 1MHz counter clock.
-  + ClockDivision = 0
-  + Counter direction = Up
-  */
-  htim1.Init.Period = (1000000 / 1000) - 1;
-  htim1.Init.Prescaler = uwPrescalerValue;
-  htim1.Init.ClockDivision = 0;
-  htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
-  if(HAL_TIM_Base_Init(&htim1) == HAL_OK)
-  {
-    /* Start the TIM time Base generation in interrupt mode */
-    return HAL_TIM_Base_Start_IT(&htim1);
-  }
-  
-  /* Return function status */
-  return HAL_ERROR;
+ * @brief  This function configures the TIM1 as a time base source.
+ *         The time source is configured  to have 1ms time base with a dedicated
+ *         Tick interrupt priority.
+ * @note   This function is called  automatically at the beginning of program after
+ *         reset by HAL_Init() or at any time when clock is configured, by HAL_RCC_ClockConfig().
+ * @param  TickPriority: Tick interrupt priorty.
+ * @retval HAL status
+ */
+HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
+	RCC_ClkInitTypeDef clkconfig;
+	uint32_t uwTimclock = 0;
+	uint32_t uwPrescalerValue = 0;
+	uint32_t pFLatency;
+
+	/*Configure the TIM1 IRQ priority */
+	HAL_NVIC_SetPriority(TIM1_UP_IRQn, TickPriority, 0);
+
+	/* Enable the TIM1 global Interrupt */
+	HAL_NVIC_EnableIRQ(TIM1_UP_IRQn);
+
+	/* Enable TIM1 clock */
+	__HAL_RCC_TIM1_CLK_ENABLE();
+
+	/* Get clock configuration */
+	HAL_RCC_GetClockConfig(&clkconfig, &pFLatency);
+
+	/* Compute TIM1 clock */
+	uwTimclock = HAL_RCC_GetPCLK2Freq();
+
+	/* Compute the prescaler value to have TIM1 counter clock equal to 1MHz */
+	uwPrescalerValue = (uint32_t) ((uwTimclock / 1000000) - 1);
+
+	/* Initialize TIM1 */
+	htim1.Instance = TIM1;
+
+	/* Initialize TIMx peripheral as follow:
+	 + Period = [(TIM1CLK/1000) - 1]. to have a (1/1000) s time base.
+	 + Prescaler = (uwTimclock/1000000 - 1) to have a 1MHz counter clock.
+	 + ClockDivision = 0
+	 + Counter direction = Up
+	 */
+	htim1.Init.Period = (1000000 / 1000) - 1;
+	htim1.Init.Prescaler = uwPrescalerValue;
+	htim1.Init.ClockDivision = 0;
+	htim1.Init.CounterMode = TIM_COUNTERMODE_UP;
+	if (HAL_TIM_Base_Init(&htim1) == HAL_OK) {
+		/* Start the TIM time Base generation in interrupt mode */
+		return HAL_TIM_Base_Start_IT(&htim1);
+	}
+
+	/* Return function status */
+	return HAL_ERROR;
 }
 
 /**
-  * @brief  Suspend Tick increment.
-  * @note   Disable the tick increment by disabling TIM1 update interrupt.
-  * @param  None
-  * @retval None
-  */
-void HAL_SuspendTick(void)
-{
-  /* Disable TIM1 update Interrupt */
-  __HAL_TIM_DISABLE_IT(&htim1, TIM_IT_UPDATE);                                                  
+ * @brief  Suspend Tick increment.
+ * @note   Disable the tick increment by disabling TIM1 update interrupt.
+ * @param  None
+ * @retval None
+ */
+void HAL_SuspendTick(void) {
+	/* Disable TIM1 update Interrupt */
+	__HAL_TIM_DISABLE_IT(&htim1, TIM_IT_UPDATE);
 }
 
 /**
-  * @brief  Resume Tick increment.
-  * @note   Enable the tick increment by Enabling TIM1 update interrupt.
-  * @param  None
-  * @retval None
-  */
-void HAL_ResumeTick(void)
-{
-  /* Enable TIM1 Update interrupt */
-  __HAL_TIM_ENABLE_IT(&htim1, TIM_IT_UPDATE);
+ * @brief  Resume Tick increment.
+ * @note   Enable the tick increment by Enabling TIM1 update interrupt.
+ * @param  None
+ * @retval None
+ */
+void HAL_ResumeTick(void) {
+	/* Enable TIM1 Update interrupt */
+	__HAL_TIM_ENABLE_IT(&htim1, TIM_IT_UPDATE);
 }
 
 /**
-  * @}
-  */ 
+ * @}
+ */
 
 /**
-  * @}
-  */ 
+ * @}
+ */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

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

@@ -82,6 +82,6 @@ void DMA1_Channel6_IRQHandler(void) {
 void DMA1_Channel7_IRQHandler(void) {
 	HAL_DMA_IRQHandler(&hdma_i2c1_rx);
 }
-void EXTI9_5_IRQHandler(void){
+void EXTI9_5_IRQHandler(void) {
 	HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_9);
 }

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

@@ -7,7 +7,7 @@
                                                 This value can be provided and adapted by the user application. */
 #endif /* HSI_VALUE */
 
-/*!< Uncomment the following line if you need to use external SRAM  */ 
+/*!< Uncomment the following line if you need to use external SRAM  */
 #if defined(STM32F100xE) || defined(STM32F101xE) || defined(STM32F101xG) || defined(STM32F103xE) || defined(STM32F103xG)
 /* #define DATA_IN_ExtSRAM */
 #endif /* STM32F100xE || STM32F101xE || STM32F101xG || STM32F103xE || STM32F103xG */
@@ -19,68 +19,67 @@
 #endif
 
 /*******************************************************************************
-*  Clock Definitions
-*******************************************************************************/
+ *  Clock Definitions
+ *******************************************************************************/
 #if defined(STM32F100xB) ||defined(STM32F100xE)
   uint32_t SystemCoreClock         = 24000000U;        /*!< System Clock Frequency (Core Clock) */
 #else /*!< HSI Selected as System Clock source */
-  uint32_t SystemCoreClock         = 64000000U;        /*!< System Clock Frequency (Core Clock) */
+uint32_t SystemCoreClock = 64000000U; /*!< System Clock Frequency (Core Clock) */
 #endif
 
-const uint8_t AHBPrescTable[16U] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9};
-const uint8_t APBPrescTable[8U] =  {0, 0, 0, 0, 1, 2, 3, 4};
-
+const uint8_t AHBPrescTable[16U] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7,
+		8, 9 };
+const uint8_t APBPrescTable[8U] = { 0, 0, 0, 0, 1, 2, 3, 4 };
 
 /**
-  * @brief  Setup the microcontroller system
-  *         Initialize the Embedded Flash Interface, the PLL and update the 
-  *         SystemCoreClock variable.
-  * @note   This function should be used only after reset.
-  * @param  None
-  * @retval None
-  */
-void SystemInit (void)
-{
-  /* Reset the RCC clock configuration to the default reset state(for debug purpose) */
-  /* Set HSION bit */
-  RCC->CR |= 0x00000001U;
+ * @brief  Setup the microcontroller system
+ *         Initialize the Embedded Flash Interface, the PLL and update the
+ *         SystemCoreClock variable.
+ * @note   This function should be used only after reset.
+ * @param  None
+ * @retval None
+ */
+void SystemInit(void) {
+	/* Reset the RCC clock configuration to the default reset state(for debug purpose) */
+	/* Set HSION bit */
+	RCC->CR |= 0x00000001U;
 
-  /* Reset SW, HPRE, PPRE1, PPRE2, ADCPRE and MCO bits */
+	/* Reset SW, HPRE, PPRE1, PPRE2, ADCPRE and MCO bits */
 #if !defined(STM32F105xC) && !defined(STM32F107xC)
-  RCC->CFGR &= 0xF8FF0000U;
+	RCC->CFGR &= 0xF8FF0000U;
 #else
-  RCC->CFGR &= 0xF0FF0000U;
+	RCC->CFGR &= 0xF0FF0000U;
 #endif /* STM32F105xC */   
-  
-  /* Reset HSEON, CSSON and PLLON bits */
-  RCC->CR &= 0xFEF6FFFFU;
 
-  /* Reset HSEBYP bit */
-  RCC->CR &= 0xFFFBFFFFU;
+	/* Reset HSEON, CSSON and PLLON bits */
+	RCC->CR &= 0xFEF6FFFFU;
 
-  /* Reset PLLSRC, PLLXTPRE, PLLMUL and USBPRE/OTGFSPRE bits */
-  RCC->CFGR &= 0xFF80FFFFU;
+	/* Reset HSEBYP bit */
+	RCC->CR &= 0xFFFBFFFFU;
+
+	/* Reset PLLSRC, PLLXTPRE, PLLMUL and USBPRE/OTGFSPRE bits */
+	RCC->CFGR &= 0xFF80FFFFU;
 
 #if defined(STM32F105xC) || defined(STM32F107xC)
-  /* Reset PLL2ON and PLL3ON bits */
-  RCC->CR &= 0xEBFFFFFFU;
+	/* Reset PLL2ON and PLL3ON bits */
+	RCC->CR &= 0xEBFFFFFFU;
 
-  /* Disable all interrupts and clear pending bits  */
-  RCC->CIR = 0x00FF0000U;
+	/* Disable all interrupts and clear pending bits  */
+	RCC->CIR = 0x00FF0000U;
 
-  /* Reset CFGR2 register */
-  RCC->CFGR2 = 0x00000000U;
+	/* Reset CFGR2 register */
+	RCC->CFGR2 = 0x00000000U;
 #elif defined(STM32F100xB) || defined(STM32F100xE)
-  /* Disable all interrupts and clear pending bits  */
-  RCC->CIR = 0x009F0000U;
+	/* Disable all interrupts and clear pending bits  */
+	RCC->CIR = 0x009F0000U;
 
-  /* Reset CFGR2 register */
-  RCC->CFGR2 = 0x00000000U;      
+	/* Reset CFGR2 register */
+	RCC->CFGR2 = 0x00000000U;
 #else
-  /* Disable all interrupts and clear pending bits  */
-  RCC->CIR = 0x009F0000U;
+	/* Disable all interrupts and clear pending bits  */
+	RCC->CIR = 0x009F0000U;
 #endif /* STM32F105xC */
-    
+
 #if defined(STM32F100xE) || defined(STM32F101xE) || defined(STM32F101xG) || defined(STM32F103xE) || defined(STM32F103xG)
   #ifdef DATA_IN_ExtSRAM
     SystemInit_ExtMemCtl(); 
@@ -90,48 +89,47 @@ void SystemInit (void)
 #ifdef VECT_TAB_SRAM
   SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM. */
 #else
-  SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */
+	SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH. */
 #endif 
 }
 
 /**
-  * @brief  Update SystemCoreClock variable according to Clock Register Values.
-  *         The SystemCoreClock variable contains the core clock (HCLK), it can
-  *         be used by the user application to setup the SysTick timer or configure
-  *         other parameters.
-  *           
-  * @note   Each time the core clock (HCLK) changes, this function must be called
-  *         to update SystemCoreClock variable value. Otherwise, any configuration
-  *         based on this variable will be incorrect.         
-  *     
-  * @note   - The system frequency computed by this function is not the real 
-  *           frequency in the chip. It is calculated based on the predefined 
-  *           constant and the selected clock source:
-  *             
-  *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(*)
-  *                                              
-  *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(**)
-  *                          
-  *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(**) 
-  *             or HSI_VALUE(*) multiplied by the PLL factors.
-  *         
-  *         (*) HSI_VALUE is a constant defined in stm32f1xx.h file (default value
-  *             8 MHz) but the real value may vary depending on the variations
-  *             in voltage and temperature.   
-  *    
-  *         (**) HSE_VALUE is a constant defined in stm32f1xx.h file (default value
-  *              8 MHz or 25 MHz, depending on the product used), user has to ensure
-  *              that HSE_VALUE is same as the real frequency of the crystal used.
-  *              Otherwise, this function may have wrong result.
-  *                
-  *         - The result of this function could be not correct when using fractional
-  *           value for HSE crystal.
-  * @param  None
-  * @retval None
-  */
-void SystemCoreClockUpdate (void)
-{
-  uint32_t tmp = 0U, pllmull = 0U, pllsource = 0U;
+ * @brief  Update SystemCoreClock variable according to Clock Register Values.
+ *         The SystemCoreClock variable contains the core clock (HCLK), it can
+ *         be used by the user application to setup the SysTick timer or configure
+ *         other parameters.
+ *
+ * @note   Each time the core clock (HCLK) changes, this function must be called
+ *         to update SystemCoreClock variable value. Otherwise, any configuration
+ *         based on this variable will be incorrect.
+ *
+ * @note   - The system frequency computed by this function is not the real
+ *           frequency in the chip. It is calculated based on the predefined
+ *           constant and the selected clock source:
+ *
+ *           - If SYSCLK source is HSI, SystemCoreClock will contain the HSI_VALUE(*)
+ *
+ *           - If SYSCLK source is HSE, SystemCoreClock will contain the HSE_VALUE(**)
+ *
+ *           - If SYSCLK source is PLL, SystemCoreClock will contain the HSE_VALUE(**)
+ *             or HSI_VALUE(*) multiplied by the PLL factors.
+ *
+ *         (*) HSI_VALUE is a constant defined in stm32f1xx.h file (default value
+ *             8 MHz) but the real value may vary depending on the variations
+ *             in voltage and temperature.
+ *
+ *         (**) HSE_VALUE is a constant defined in stm32f1xx.h file (default value
+ *              8 MHz or 25 MHz, depending on the product used), user has to ensure
+ *              that HSE_VALUE is same as the real frequency of the crystal used.
+ *              Otherwise, this function may have wrong result.
+ *
+ *         - The result of this function could be not correct when using fractional
+ *           value for HSE crystal.
+ * @param  None
+ * @retval None
+ */
+void SystemCoreClockUpdate(void) {
+	uint32_t tmp = 0U, pllmull = 0U, pllsource = 0U;
 
 #if defined(STM32F105xC) || defined(STM32F107xC)
   uint32_t prediv1source = 0U, prediv1factor = 0U, prediv2factor = 0U, pll2mull = 0U;
@@ -140,50 +138,43 @@ void SystemCoreClockUpdate (void)
 #if defined(STM32F100xB) || defined(STM32F100xE)
   uint32_t prediv1factor = 0U;
 #endif /* STM32F100xB or STM32F100xE */
-    
-  /* Get SYSCLK source -------------------------------------------------------*/
-  tmp = RCC->CFGR & RCC_CFGR_SWS;
-  
-  switch (tmp)
-  {
-    case 0x00U:  /* HSI used as system clock */
-      SystemCoreClock = HSI_VALUE;
-      break;
-    case 0x04U:  /* HSE used as system clock */
-      SystemCoreClock = HSE_VALUE;
-      break;
-    case 0x08U:  /* PLL used as system clock */
 
-      /* Get PLL clock source and multiplication factor ----------------------*/
-      pllmull = RCC->CFGR & RCC_CFGR_PLLMULL;
-      pllsource = RCC->CFGR & RCC_CFGR_PLLSRC;
-      
+	/* Get SYSCLK source -------------------------------------------------------*/
+	tmp = RCC->CFGR & RCC_CFGR_SWS;
+
+	switch (tmp) {
+	case 0x00U: /* HSI used as system clock */
+		SystemCoreClock = HSI_VALUE;
+		break;
+	case 0x04U: /* HSE used as system clock */
+		SystemCoreClock = HSE_VALUE;
+		break;
+	case 0x08U: /* PLL used as system clock */
+
+		/* Get PLL clock source and multiplication factor ----------------------*/
+		pllmull = RCC->CFGR & RCC_CFGR_PLLMULL;
+		pllsource = RCC->CFGR & RCC_CFGR_PLLSRC;
+
 #if !defined(STM32F105xC) && !defined(STM32F107xC)      
-      pllmull = ( pllmull >> 18U) + 2U;
-      
-      if (pllsource == 0x00U)
-      {
-        /* HSI oscillator clock divided by 2 selected as PLL clock entry */
-        SystemCoreClock = (HSI_VALUE >> 1U) * pllmull;
-      }
-      else
-      {
- #if defined(STM32F100xB) || defined(STM32F100xE)
+		pllmull = (pllmull >> 18U) + 2U;
+
+		if (pllsource == 0x00U) {
+			/* HSI oscillator clock divided by 2 selected as PLL clock entry */
+			SystemCoreClock = (HSI_VALUE >> 1U) * pllmull;
+		} else {
+#if defined(STM32F100xB) || defined(STM32F100xE)
        prediv1factor = (RCC->CFGR2 & RCC_CFGR2_PREDIV1) + 1U;
        /* HSE oscillator clock selected as PREDIV1 clock entry */
        SystemCoreClock = (HSE_VALUE / prediv1factor) * pllmull; 
  #else
-        /* HSE selected as PLL clock entry */
-        if ((RCC->CFGR & RCC_CFGR_PLLXTPRE) != (uint32_t)RESET)
-        {/* HSE oscillator clock divided by 2 */
-          SystemCoreClock = (HSE_VALUE >> 1U) * pllmull;
-        }
-        else
-        {
-          SystemCoreClock = HSE_VALUE * pllmull;
-        }
- #endif
-      }
+			/* HSE selected as PLL clock entry */
+			if ((RCC->CFGR & RCC_CFGR_PLLXTPRE) != (uint32_t) RESET) {/* HSE oscillator clock divided by 2 */
+				SystemCoreClock = (HSE_VALUE >> 1U) * pllmull;
+			} else {
+				SystemCoreClock = HSE_VALUE * pllmull;
+			}
+#endif
+		}
 #else
       pllmull = pllmull >> 18U;
       
@@ -223,18 +214,18 @@ void SystemCoreClockUpdate (void)
         }
       }
 #endif /* STM32F105xC */ 
-      break;
+		break;
 
-    default:
-      SystemCoreClock = HSI_VALUE;
-      break;
-  }
-  
-  /* Compute HCLK clock frequency ----------------*/
-  /* Get HCLK prescaler */
-  tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> 4U)];
-  /* HCLK clock frequency */
-  SystemCoreClock >>= tmp;  
+	default:
+		SystemCoreClock = HSI_VALUE;
+		break;
+	}
+
+	/* Compute HCLK clock frequency ----------------*/
+	/* Get HCLK prescaler */
+	tmp = AHBPrescTable[((RCC->CFGR & RCC_CFGR_HPRE) >> 4U)];
+	/* HCLK clock frequency */
+	SystemCoreClock >>= tmp;
 }
 
 #if defined(STM32F100xE) || defined(STM32F101xE) || defined(STM32F101xG) || defined(STM32F103xE) || defined(STM32F103xG)
@@ -302,14 +293,14 @@ void SystemInit_ExtMemCtl(void)
 #endif /* STM32F100xE || STM32F101xE || STM32F101xG || STM32F103xE || STM32F103xG */
 
 /**
-  * @}
-  */
+ * @}
+ */
 
 /**
-  * @}
-  */
-  
+ * @}
+ */
+
 /**
-  * @}
-  */    
+ * @}
+ */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

workspace/TS100/Core/BSP/Pine64/BSP.cpp

@@ -0,0 +1,131 @@
+// BSP mapping functions
+
+#include "BSP.h"
+#include "I2C_Wrapper.hpp"
+#include "Pins.h"
+#include "Setup.h"
+#include "gd32vf103_timer.h"
+#include "history.hpp"
+#include "main.hpp"
+#include <IRQ.h>
+
+const uint16_t powerPWM = 255;
+const uint8_t holdoffTicks = 25; // delay of 7 ms
+const uint8_t tempMeasureTicks = 25;
+
+uint16_t totalPWM; // htim2.Init.Period, the full PWM cycle
+
+// 2 second filter (ADC is PID_TIM_HZ Hz)
+history<uint16_t, PID_TIM_HZ> rawTempFilter = { { 0 }, 0, 0 };
+void resetWatchdog() {
+	fwdgt_counter_reload();
+}
+
+uint16_t getTipInstantTemperature() {
+	volatile uint16_t sum = 0; // 12 bit readings * 8*2 -> 16 bits
+
+	for (int i = 0; i < 4; i++) {
+		sum += adc_inserted_data_read(ADC0, i);
+		sum += adc_inserted_data_read(ADC1, 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 getHandleTemperature() {
+#ifdef TEMP_TMP36
+	// We return the current handle temperature in X10 C
+	// TMP36 in handle, 0.5V offset and then 10mV per deg C (0.75V @ 25C for
+	// example) STM32 = 4096 count @ 3.3V input -> But We oversample by 32/(2^2) =
+	// 8 times oversampling Therefore 32768 is the 3.3V input, so 0.1007080078125
+	// mV per count So we need to subtract an offset of 0.5V to center on 0C
+	// (4964.8 counts)
+	//
+	int32_t result = getADC(0);
+	result -= 4965; // remove 0.5V offset
+	// 10mV per C
+	// 99.29 counts per Deg C above 0C
+	result *= 100;
+	result /= 993;
+	return result;
+#else
+#error
+#endif
+}
+uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
+
+	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 unstick_I2C() {
+	/* configure SDA/SCL for GPIO */
+	GPIO_BC(GPIOB) |= SDA_Pin | SCL_Pin;
+	gpio_init(SDA_GPIO_Port, GPIO_MODE_OUT_PP, GPIO_OSPEED_50MHZ,
+	SDA_Pin | SCL_Pin);
+	asm("nop");
+	asm("nop");
+	asm("nop");
+	asm("nop");
+	asm("nop");
+	GPIO_BOP(GPIOB) |= SCL_Pin;
+	asm("nop");
+	asm("nop");
+	asm("nop");
+	asm("nop");
+	asm("nop");
+	GPIO_BOP(GPIOB) |= SDA_Pin;
+	/* connect PB6 to I2C0_SCL */
+	/* connect PB7 to I2C0_SDA */
+	gpio_init(SDA_GPIO_Port, GPIO_MODE_AF_OD, GPIO_OSPEED_50MHZ,
+	SDA_Pin | SCL_Pin);
+}
+
+uint8_t getButtonA() {
+	return (gpio_input_bit_get(KEY_A_GPIO_Port, KEY_A_Pin) == SET) ? 1 : 0;
+}
+uint8_t getButtonB() {
+	return (gpio_input_bit_get(KEY_B_GPIO_Port, KEY_B_Pin) == SET) ? 1 : 0;
+}
+
+void reboot() {
+	//Spin for watchdog
+	for (;;) {
+	}
+}
+
+void delay_ms(uint16_t count) {
+	delay_1ms(count);
+}
+uint32_t __get_IPSR(void) {
+	return 0;	// To shut-up CMSIS
+}

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

@@ -0,0 +1,25 @@
+/*
+ * 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
+		//Tip is ~ 7.5 ohms
+		20000, 2666, // 20V, 2.6A
+		15000, 2000, // 15V 2A
+		12000, 1600, //12V @ 1.6A
+		9000, 1200, //9V @ 1.2A
+		5000, 100, //5V @ whatever
+
+		};
+const uint8_t USB_PD_Desired_Levels_Len = 5;
+#endif

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

@@ -0,0 +1,96 @@
+#ifndef FREERTOS_CONFIG_H
+#define FREERTOS_CONFIG_H
+#include <stdint.h>
+#include "nuclei_sdk_soc.h"
+//RISC-V configuration
+#define USER_MODE_TASKS 0
+
+#define configUSE_PREEMPTION 1
+#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0
+#define configUSE_TICKLESS_IDLE 0
+#define configCPU_CLOCK_HZ ((uint32_t)SystemCoreClock)
+#define configRTC_CLOCK_HZ ((uint32_t)32768)
+#define configTICK_RATE_HZ ((TickType_t)1000)
+#define configMAX_PRIORITIES (4)
+#define configMINIMAL_STACK_SIZE ((unsigned short)128)
+#define configMAX_TASK_NAME_LEN 24
+#define configUSE_16_BIT_TICKS 0
+#define configIDLE_SHOULD_YIELD 0
+#define configUSE_TASK_NOTIFICATIONS 1
+#define configUSE_MUTEXES 1
+#define configUSE_RECURSIVE_MUTEXES 0
+#define configUSE_COUNTING_SEMAPHORES 0
+#define configQUEUE_REGISTRY_SIZE 10
+#define configUSE_QUEUE_SETS 0
+#define configUSE_TIME_SLICING 1
+#define configUSE_NEWLIB_REENTRANT 0
+#define configENABLE_BACKWARD_COMPATIBILITY 0
+#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 5
+
+#define INCLUDE_uxTaskGetStackHighWaterMark 1
+#define INCLUDE_xTaskGetSchedulerState 1
+#define INCLUDE_vTaskDelay 1
+/* Memory allocation related definitions. */
+#define configSUPPORT_STATIC_ALLOCATION 1
+#define configSUPPORT_DYNAMIC_ALLOCATION 0
+#define configTOTAL_HEAP_SIZE 1024
+#define configAPPLICATION_ALLOCATED_HEAP 0
+
+/* Hook function related definitions. */
+#define configUSE_IDLE_HOOK 1
+#define configUSE_TICK_HOOK 0
+#define configCHECK_FOR_STACK_OVERFLOW 2
+#define configUSE_MALLOC_FAILED_HOOK 0
+#define configUSE_DAEMON_TASK_STARTUP_HOOK 0
+
+/* Run time and task stats gathering related definitions. */
+#define configGENERATE_RUN_TIME_STATS 0
+#define configUSE_TRACE_FACILITY 1
+#define configUSE_STATS_FORMATTING_FUNCTIONS 1
+
+/* Co-routine related definitions. */
+#define configUSE_CO_ROUTINES 0
+#define configMAX_CO_ROUTINE_PRIORITIES 1
+
+/* Software timer related definitions. */
+#define configUSE_TIMERS 0
+#define configTIMER_TASK_PRIORITY 3
+#define configTIMER_QUEUE_LENGTH 5
+#define configTIMER_TASK_STACK_DEPTH configMINIMAL_STACK_SIZE
+
+/* Interrupt nesting behaviour configuration. */
+#define configPRIO_BITS (4UL)
+#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 0x1
+#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 0xe
+#define configKERNEL_INTERRUPT_PRIORITY (configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS))
+#define configMAX_SYSCALL_INTERRUPT_PRIORITY (configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS))
+
+/* Define to trap errors during development. */
+#define configASSERT(x)           \
+    if ((x) == 0)                 \
+    {                             \
+        taskDISABLE_INTERRUPTS(); \
+        for (;;)                  \
+            ;                     \
+    }
+
+#define INCLUDE_vTaskPrioritySet 1
+#define INCLUDE_uxTaskPriorityGet 1
+#define INCLUDE_vTaskDelete 1
+#define INCLUDE_vTaskSuspend 1
+#define INCLUDE_xResumeFromISR 1
+#define INCLUDE_vTaskDelayUntil 1
+#define INCLUDE_vTaskDelay 1
+#define INCLUDE_xTaskGetSchedulerState 1
+#define INCLUDE_xTaskGetCurrentTaskHandle 1
+#define INCLUDE_uxTaskGetStackHighWaterMark 1
+#define INCLUDE_xTaskGetIdleTaskHandle 1
+#define INCLUDE_eTaskGetState 0
+#define INCLUDE_xEventGroupSetBitFromISR 1
+#define INCLUDE_xTimerPendFunctionCall 0
+#define INCLUDE_xTaskAbortDelay 0
+#define INCLUDE_xTaskGetHandle 1
+#define INCLUDE_xTaskResumeFromISR 1
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#endif /* FREERTOS_CONFIG_H */

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

@@ -0,0 +1,541 @@
+/*
+ * FRToSI2C.cpp
+ *
+ *  Created on: 14Apr.,2018
+ *      Author: Ralim
+ */
+#include "BSP.h"
+#include "IRQ.h"
+#include "Setup.h"
+#include <I2C_Wrapper.hpp>
+SemaphoreHandle_t FRToSI2C::I2CSemaphore = nullptr;
+StaticSemaphore_t FRToSI2C::xSemaphoreBuffer;
+#define I2C_TIME_OUT (uint16_t)(12000)
+void FRToSI2C::CpltCallback() {
+	// TODO
+}
+
+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 temp = 0;
+	Mem_Read(add, reg, &temp, 1);
+	return temp;
+}
+
+bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t read_address,
+		uint8_t *p_buffer, uint16_t number_of_byte) {
+	if (!lock())
+		return false;
+	i2c_interrupt_disable(I2C0, I2C_INT_ERR);
+	i2c_interrupt_disable(I2C0, I2C_INT_BUF);
+	i2c_interrupt_disable(I2C0, I2C_INT_EV);
+	dma_parameter_struct dma_init_struct;
+
+	uint8_t state = I2C_START;
+	uint8_t in_rx_cycle = 0;
+	uint16_t timeout = 0;
+	uint8_t tries = 0;
+	uint8_t i2c_timeout_flag = 0;
+	while (!(i2c_timeout_flag)) {
+		switch (state) {
+		case I2C_START:
+			tries++;
+			if (tries > 64) {
+				i2c_stop_on_bus(I2C0);
+				/* i2c master sends STOP signal successfully */
+				while ((I2C_CTL0(I2C0) & 0x0200) && (timeout < I2C_TIME_OUT )) {
+					timeout++;
+				}
+				unlock();
+				return false;
+			}
+			if (0 == in_rx_cycle) {
+				/* disable I2C0 */
+				i2c_disable(I2C0);
+				/* enable I2C0 */
+				i2c_enable(I2C0);
+
+				/* enable acknowledge */
+				i2c_ack_config(I2C0, I2C_ACK_ENABLE);
+				/* i2c master sends start signal only when the bus is idle */
+				while (i2c_flag_get(I2C0, I2C_FLAG_I2CBSY)
+						&& (timeout < I2C_TIME_OUT )) {
+					timeout++;
+				}
+				if (timeout < I2C_TIME_OUT) {
+					/* send the start signal */
+					i2c_start_on_bus(I2C0);
+					timeout = 0;
+					state = I2C_SEND_ADDRESS;
+				} else {
+					I2C_Unstick();
+					timeout = 0;
+					state = I2C_START;
+				}
+			} else {
+				i2c_start_on_bus(I2C0);
+				timeout = 0;
+				state = I2C_SEND_ADDRESS;
+			}
+			break;
+		case I2C_SEND_ADDRESS:
+			/* i2c master sends START signal successfully */
+			while ((!i2c_flag_get(I2C0, I2C_FLAG_SBSEND))
+					&& (timeout < I2C_TIME_OUT )) {
+				timeout++;
+			}
+			if (timeout < I2C_TIME_OUT) {
+				if (RESET == in_rx_cycle) {
+					i2c_master_addressing(I2C0, DevAddress, I2C_TRANSMITTER);
+					state = I2C_CLEAR_ADDRESS_FLAG;
+				} else {
+					i2c_master_addressing(I2C0, DevAddress, I2C_RECEIVER);
+					state = I2C_CLEAR_ADDRESS_FLAG;
+				}
+				timeout = 0;
+			} else {
+				timeout = 0;
+				state = I2C_START;
+				in_rx_cycle = 0;
+			}
+			break;
+		case I2C_CLEAR_ADDRESS_FLAG:
+			/* address flag set means i2c slave sends ACK */
+			while ((!i2c_flag_get(I2C0, I2C_FLAG_ADDSEND))
+					&& (timeout < I2C_TIME_OUT )) {
+				timeout++;
+				if (i2c_flag_get(I2C0, I2C_FLAG_AERR)) {
+					i2c_flag_clear(I2C0, I2C_FLAG_AERR);
+					i2c_stop_on_bus(I2C0);
+					/* i2c master sends STOP signal successfully */
+					while ((I2C_CTL0(I2C0) & 0x0200)
+							&& (timeout < I2C_TIME_OUT )) {
+						timeout++;
+					}
+					// Address NACK'd
+					unlock();
+					return false;
+				}
+			}
+			if (timeout < I2C_TIME_OUT) {
+				i2c_flag_clear(I2C0, I2C_FLAG_ADDSEND);
+				timeout = 0;
+				state = I2C_TRANSMIT_DATA;
+			} else {
+				i2c_stop_on_bus(I2C0);
+				/* i2c master sends STOP signal successfully */
+				while ((I2C_CTL0(I2C0) & 0x0200) && (timeout < I2C_TIME_OUT )) {
+					timeout++;
+				}
+				// Address NACK'd
+				unlock();
+				return false;
+			}
+			break;
+		case I2C_TRANSMIT_DATA:
+			if (0 == in_rx_cycle) {
+				/* wait until the transmit data buffer is empty */
+				while ((!i2c_flag_get(I2C0, I2C_FLAG_TBE))
+						&& (timeout < I2C_TIME_OUT )) {
+					timeout++;
+				}
+				if (timeout < I2C_TIME_OUT) {
+					// Write out the 8 byte address
+					i2c_data_transmit(I2C0, read_address);
+					timeout = 0;
+				} else {
+					timeout = 0;
+					state = I2C_START;
+					in_rx_cycle = 0;
+				}
+				/* wait until BTC bit is set */
+				while ((!i2c_flag_get(I2C0, I2C_FLAG_BTC))
+						&& (timeout < I2C_TIME_OUT )) {
+					timeout++;
+				}
+				if (timeout < I2C_TIME_OUT) {
+					timeout = 0;
+					state = I2C_START;
+					in_rx_cycle = 1;
+				} else {
+					timeout = 0;
+					state = I2C_START;
+					in_rx_cycle = 0;
+				}
+			} else {
+				/* one byte master reception procedure (polling) */
+				if (number_of_byte < 2) {
+					/* disable acknowledge */
+					i2c_ack_config(I2C0, I2C_ACK_DISABLE);
+					/* clear ADDSEND register by reading I2C_STAT0 then I2C_STAT1 register
+					 * (I2C_STAT0 has already been read) */
+					i2c_flag_get(I2C0, I2C_FLAG_ADDSEND);
+					/* send a stop condition to I2C bus*/
+					i2c_stop_on_bus(I2C0);
+					/* wait for the byte to be received */
+					while (!i2c_flag_get(I2C0, I2C_FLAG_RBNE))
+						;
+					/* read the byte received from the EEPROM */
+					*p_buffer = i2c_data_receive(I2C0);
+					/* decrement the read bytes counter */
+					number_of_byte--;
+					timeout = 0;
+				} else { /* more than one byte master reception procedure (DMA) */
+					dma_deinit(DMA0, DMA_CH6);
+					dma_init_struct.direction = DMA_PERIPHERAL_TO_MEMORY;
+					dma_init_struct.memory_addr = (uint32_t) p_buffer;
+					dma_init_struct.memory_inc = DMA_MEMORY_INCREASE_ENABLE;
+					dma_init_struct.memory_width = DMA_MEMORY_WIDTH_8BIT;
+					dma_init_struct.number = number_of_byte;
+					dma_init_struct.periph_addr = (uint32_t) &I2C_DATA(I2C0);
+					dma_init_struct.periph_inc = DMA_PERIPH_INCREASE_DISABLE;
+					dma_init_struct.periph_width = DMA_PERIPHERAL_WIDTH_8BIT;
+					dma_init_struct.priority = DMA_PRIORITY_ULTRA_HIGH;
+					dma_init(DMA0, DMA_CH6, &dma_init_struct);
+
+					i2c_dma_last_transfer_config(I2C0, I2C_DMALST_ON);
+					/* enable I2C0 DMA */
+					i2c_dma_enable(I2C0, I2C_DMA_ON);
+					/* enable DMA0 channel5 */
+					dma_channel_enable(DMA0, DMA_CH6);
+					/* wait until BTC bit is set */
+					while (!dma_flag_get(DMA0, DMA_CH6, DMA_FLAG_FTF)) {
+
+					}
+					/* send a stop condition to I2C bus*/
+					i2c_stop_on_bus(I2C0);
+				}
+				timeout = 0;
+				state = I2C_STOP;
+			}
+			break;
+		case I2C_STOP:
+			/* i2c master sends STOP signal successfully */
+			while ((I2C_CTL0(I2C0) & 0x0200) && (timeout < I2C_TIME_OUT )) {
+				timeout++;
+			}
+			if (timeout < I2C_TIME_OUT) {
+				timeout = 0;
+				state = I2C_END;
+				i2c_timeout_flag = I2C_OK;
+			} else {
+				timeout = 0;
+				state = I2C_START;
+				in_rx_cycle = 0;
+			}
+			break;
+		default:
+			state = I2C_START;
+			in_rx_cycle = 0;
+			i2c_timeout_flag = I2C_OK;
+			timeout = 0;
+			break;
+		}
+	}
+	unlock();
+	return true;
+}
+
+bool FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress,
+		uint8_t *p_buffer, uint16_t number_of_byte) {
+	if (!lock())
+		return false;
+
+	i2c_interrupt_disable(I2C0, I2C_INT_ERR);
+	i2c_interrupt_disable(I2C0, I2C_INT_EV);
+	i2c_interrupt_disable(I2C0, I2C_INT_BUF);
+	dma_parameter_struct dma_init_struct;
+
+	uint8_t state = I2C_START;
+	uint16_t timeout = 0;
+	bool done = false;
+	bool timedout = false;
+	while (!(done || timedout)) {
+		switch (state) {
+		case I2C_START:
+			/* i2c master sends start signal only when the bus is idle */
+			while (i2c_flag_get(I2C0, I2C_FLAG_I2CBSY)
+					&& (timeout < I2C_TIME_OUT )) {
+				timeout++;
+			}
+			if (timeout < I2C_TIME_OUT) {
+				i2c_start_on_bus(I2C0);
+				timeout = 0;
+				state = I2C_SEND_ADDRESS;
+			} else {
+				I2C_Unstick();
+				timeout = 0;
+				state = I2C_START;
+			}
+			break;
+		case I2C_SEND_ADDRESS:
+			/* i2c master sends START signal successfully */
+			while ((!i2c_flag_get(I2C0, I2C_FLAG_SBSEND))
+					&& (timeout < I2C_TIME_OUT )) {
+				timeout++;
+			}
+			if (timeout < I2C_TIME_OUT) {
+				i2c_master_addressing(I2C0, DevAddress, I2C_TRANSMITTER);
+				timeout = 0;
+				state = I2C_CLEAR_ADDRESS_FLAG;
+			} else {
+				timedout = true;
+				done = true;
+				timeout = 0;
+				state = I2C_START;
+			}
+			break;
+		case I2C_CLEAR_ADDRESS_FLAG:
+			/* address flag set means i2c slave sends ACK */
+			while ((!i2c_flag_get(I2C0, I2C_FLAG_ADDSEND))
+					&& (timeout < I2C_TIME_OUT )) {
+				timeout++;
+				if (i2c_flag_get(I2C0, I2C_FLAG_AERR)) {
+					i2c_flag_clear(I2C0, I2C_FLAG_AERR);
+					i2c_stop_on_bus(I2C0);
+					/* i2c master sends STOP signal successfully */
+					while ((I2C_CTL0(I2C0) & 0x0200)
+							&& (timeout < I2C_TIME_OUT )) {
+						timeout++;
+					}
+					// Address NACK'd
+					unlock();
+					return false;
+				}
+			}
+			timeout = 0;
+			if (timeout < I2C_TIME_OUT) {
+				i2c_flag_clear(I2C0, I2C_FLAG_ADDSEND);
+				state = I2C_TRANSMIT_DATA;
+			} else {
+				// Dont retry as this means a NAK
+				i2c_stop_on_bus(I2C0);
+				/* i2c master sends STOP signal successfully */
+				while ((I2C_CTL0(I2C0) & 0x0200) && (timeout < I2C_TIME_OUT )) {
+					timeout++;
+				}
+				unlock();
+				return false;
+			}
+			break;
+		case I2C_TRANSMIT_DATA:
+			/* wait until the transmit data buffer is empty */
+			while ((!i2c_flag_get(I2C0, I2C_FLAG_TBE))
+					&& (timeout < I2C_TIME_OUT )) {
+				timeout++;
+			}
+			if (timeout < I2C_TIME_OUT) {
+				/* send the EEPROM's internal address to write to : only one byte
+				 * address */
+				i2c_data_transmit(I2C0, MemAddress);
+				timeout = 0;
+			} else {
+				timedout = true;
+				timeout = 0;
+				state = I2C_START;
+			}
+			/* wait until BTC bit is set */
+			while (!i2c_flag_get(I2C0, I2C_FLAG_BTC))
+				;
+			dma_deinit(DMA0, DMA_CH5);
+			dma_init_struct.direction = DMA_MEMORY_TO_PERIPHERAL;
+			dma_init_struct.memory_addr = (uint32_t) p_buffer;
+			dma_init_struct.memory_inc = DMA_MEMORY_INCREASE_ENABLE;
+			dma_init_struct.memory_width = DMA_MEMORY_WIDTH_8BIT;
+			dma_init_struct.number = number_of_byte;
+			dma_init_struct.periph_addr = (uint32_t) &I2C_DATA(I2C0);
+			dma_init_struct.periph_inc = DMA_PERIPH_INCREASE_DISABLE;
+			dma_init_struct.periph_width = DMA_PERIPHERAL_WIDTH_8BIT;
+			dma_init_struct.priority = DMA_PRIORITY_ULTRA_HIGH;
+			dma_init(DMA0, DMA_CH5, &dma_init_struct);
+			/* enable I2C0 DMA */
+			i2c_dma_enable(I2C0, I2C_DMA_ON);
+			/* enable DMA0 channel5 */
+			dma_channel_enable(DMA0, DMA_CH5);
+			/* wait until BTC bit is set */
+			while (!dma_flag_get(DMA0, DMA_CH5, DMA_FLAG_FTF)) {
+
+			}
+			/* wait until BTC bit is set */
+			while (!i2c_flag_get(I2C0, I2C_FLAG_BTC)) {
+			}
+			state = I2C_STOP;
+			break;
+		case I2C_STOP:
+			/* send a stop condition to I2C bus */
+			i2c_stop_on_bus(I2C0);
+			/* i2c master sends STOP signal successfully */
+			while ((I2C_CTL0(I2C0) & 0x0200) && (timeout < I2C_TIME_OUT )) {
+				timeout++;
+			}
+			if (timeout < I2C_TIME_OUT) {
+				timeout = 0;
+				state = I2C_END;
+				done = true;
+			} else {
+				timedout = true;
+				done = true;
+				timeout = 0;
+				state = I2C_START;
+			}
+			break;
+		default:
+			state = I2C_START;
+			timeout = 0;
+			break;
+		}
+	}
+	unlock();
+	return timedout == false;
+}
+
+bool FRToSI2C::Transmit(uint16_t DevAddress, uint8_t *pData, uint16_t Size) {
+	return Mem_Write(DevAddress, pData[0], pData + 1, Size - 1);
+}
+
+bool FRToSI2C::probe(uint16_t DevAddress) {
+	uint8_t temp[1];
+	return Mem_Read(DevAddress, 0x00, temp, sizeof(temp));
+}
+
+void FRToSI2C::I2C_Unstick() {
+	unstick_I2C();
+}
+
+bool FRToSI2C::lock() {
+	if (I2CSemaphore == nullptr) {
+		return false;
+	}
+	return xSemaphoreTake(I2CSemaphore, TICKS_SECOND) == pdTRUE;
+}
+
+void FRToSI2C::unlock() {
+	xSemaphoreGive(I2CSemaphore);
+}
+
+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;
+}
+
+bool FRToSI2C::wakePart(uint16_t DevAddress) {
+	// wakepart is a special case  where only the device address is sent
+	if (!lock())
+		return false;
+
+	i2c_interrupt_disable(I2C0, I2C_INT_ERR);
+	i2c_interrupt_disable(I2C0, I2C_INT_EV);
+	i2c_interrupt_disable(I2C0, I2C_INT_BUF);
+
+	uint8_t state = I2C_START;
+	uint16_t timeout = 0;
+	bool done = false;
+	bool timedout = false;
+	while (!(done || timedout)) {
+		switch (state) {
+		case I2C_START:
+			/* i2c master sends start signal only when the bus is idle */
+			while (i2c_flag_get(I2C0, I2C_FLAG_I2CBSY)
+					&& (timeout < I2C_TIME_OUT )) {
+				timeout++;
+			}
+			if (timeout < I2C_TIME_OUT) {
+				i2c_start_on_bus(I2C0);
+				timeout = 0;
+				state = I2C_SEND_ADDRESS;
+			} else {
+				I2C_Unstick();
+				timeout = 0;
+				state = I2C_START;
+			}
+			break;
+		case I2C_SEND_ADDRESS:
+			/* i2c master sends START signal successfully */
+			while ((!i2c_flag_get(I2C0, I2C_FLAG_SBSEND))
+					&& (timeout < I2C_TIME_OUT )) {
+				timeout++;
+			}
+			if (timeout < I2C_TIME_OUT) {
+				i2c_master_addressing(I2C0, DevAddress, I2C_TRANSMITTER);
+				timeout = 0;
+				state = I2C_CLEAR_ADDRESS_FLAG;
+			} else {
+				timedout = true;
+				done = true;
+				timeout = 0;
+				state = I2C_START;
+			}
+			break;
+		case I2C_CLEAR_ADDRESS_FLAG:
+			/* address flag set means i2c slave sends ACK */
+			while ((!i2c_flag_get(I2C0, I2C_FLAG_ADDSEND))
+					&& (timeout < I2C_TIME_OUT )) {
+				timeout++;
+				if (i2c_flag_get(I2C0, I2C_FLAG_AERR)) {
+					i2c_flag_clear(I2C0, I2C_FLAG_AERR);
+					i2c_stop_on_bus(I2C0);
+					/* i2c master sends STOP signal successfully */
+					while ((I2C_CTL0(I2C0) & 0x0200)
+							&& (timeout < I2C_TIME_OUT )) {
+						timeout++;
+					}
+					// Address NACK'd
+					unlock();
+					return false;
+				}
+			}
+			if (timeout < I2C_TIME_OUT) {
+				i2c_flag_clear(I2C0, I2C_FLAG_ADDSEND);
+				timeout = 0;
+				state = I2C_STOP;
+			} else {
+				// Dont retry as this means a NAK
+				i2c_stop_on_bus(I2C0);
+				/* i2c master sends STOP signal successfully */
+				while ((I2C_CTL0(I2C0) & 0x0200) && (timeout < I2C_TIME_OUT )) {
+					timeout++;
+				}
+				unlock();
+				return false;
+			}
+			break;
+
+		case I2C_STOP:
+			/* send a stop condition to I2C bus */
+			i2c_stop_on_bus(I2C0);
+			/* i2c master sends STOP signal successfully */
+			while ((I2C_CTL0(I2C0) & 0x0200) && (timeout < I2C_TIME_OUT )) {
+				timeout++;
+			}
+			if (timeout < I2C_TIME_OUT) {
+				timeout = 0;
+				state = I2C_END;
+				done = true;
+			} else {
+				timedout = true;
+				done = true;
+				timeout = 0;
+				state = I2C_START;
+			}
+			break;
+		default:
+			state = I2C_START;
+			timeout = 0;
+			break;
+		}
+	}
+	unlock();
+	return timedout == false;
+}

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

@@ -0,0 +1,126 @@
+/*
+ * IRQ.c
+ *
+ *  Created on: 30 May 2020
+ *      Author: Ralim
+ */
+
+#include "IRQ.h"
+#include "Pins.h"
+#include "int_n.h"
+volatile uint8_t i2c_read_process = 0;
+volatile uint8_t i2c_write_process = 0;
+volatile uint8_t i2c_slave_address = 0;
+volatile uint8_t i2c_error_code = 0;
+volatile uint8_t *i2c_write;
+volatile uint8_t *i2c_read;
+volatile uint16_t i2c_nbytes;
+volatile uint16_t i2c_write_dress;
+volatile uint16_t i2c_read_dress;
+volatile uint8_t i2c_process_flag = 0;
+void ADC0_1_IRQHandler(void) {
+
+	adc_interrupt_flag_clear(ADC0, ADC_INT_FLAG_EOIC);
+	// unblock the PID controller thread
+	if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
+		BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+		if (pidTaskNotification) {
+			vTaskNotifyGiveFromISR(pidTaskNotification, &xHigherPriorityTaskWoken);
+			portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+		}
+	}
+}
+
+volatile uint16_t PWMSafetyTimer = 0;
+volatile uint8_t pendingPWM = 0;
+void TIMER1_IRQHandler(void) {
+
+	if (timer_interrupt_flag_get(TIMER1, TIMER_INT_UP) == SET) {
+		timer_interrupt_flag_clear(TIMER1, TIMER_INT_UP);
+		// rollover turn on output if required
+		if (PWMSafetyTimer && pendingPWM) {
+			timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 50);
+		}
+		if (PWMSafetyTimer) {
+			PWMSafetyTimer--;
+		}
+	}
+	if (timer_interrupt_flag_get(TIMER1, TIMER_INT_CH1) == SET) {
+		timer_interrupt_flag_clear(TIMER1, TIMER_INT_CH1);
+		// This is triggered on pwm setpoint trigger; we want to copy the pending
+		// PWM value into the output control reg
+
+		timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 0);
+		if (pendingPWM) {
+			timer_channel_output_pulse_value_config(TIMER1, TIMER_CH_1, pendingPWM);
+		}
+	}
+}
+
+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 bool fastPWM;
+static void switchToFastPWM(void) {
+	fastPWM = true;
+	totalPWM = powerPWM + tempMeasureTicks * 2;
+	TIMER_CAR(TIMER1) = (uint32_t) totalPWM;
+
+	// ~3.5 Hz rate
+	TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks * 2;
+	// 1 kHz tick rate
+	TIMER_PSC(TIMER1) = 12000;
+	/* generate an update event */
+	TIMER_SWEVG(TIMER1) |= (uint32_t) TIMER_SWEVG_UPG;
+}
+
+static void switchToSlowPWM(void) {
+	fastPWM = false;
+	totalPWM = powerPWM + tempMeasureTicks;
+	TIMER_CAR(TIMER1) = (uint32_t) totalPWM;
+	// ~1.84 Hz rate
+	TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks;
+	// 500 Hz tick rate
+	TIMER_PSC(TIMER1) = 24000;
+	/* generate an update event */
+	TIMER_SWEVG(TIMER1) |= (uint32_t) TIMER_SWEVG_UPG;
+}
+
+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;
+}
+
+void EXTI5_9_IRQHandler(void) {
+#ifdef POW_PD
+	if (RESET != exti_interrupt_flag_get(EXTI_5)) {
+		exti_interrupt_flag_clear(EXTI_5);
+
+		if (RESET == gpio_input_bit_get(FUSB302_IRQ_GPIO_Port, FUSB302_IRQ_Pin)) {
+			if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
+				InterruptHandler::irqCallback();
+			}
+		}
+	}
+#endif
+}
+
+// These are unused for now
+void I2C0_EV_IRQHandler(void) {
+}
+
+void I2C0_ER_IRQHandler(void) {
+}

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

@@ -0,0 +1,56 @@
+/*
+ * Irqs.h
+ *
+ *  Created on: 30 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_MINIWARE_IRQ_H_
+#define BSP_MINIWARE_IRQ_H_
+
+#include "BSP.h"
+#include "I2C_Wrapper.hpp"
+#include "Setup.h"
+#include "gd32vf103.h"
+#include "main.hpp"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+void ADC0_1_IRQHandler(void);
+void TIMER1_IRQHandler(void);
+void EXTI5_9_IRQHandler(void);
+/* handle I2C0 event interrupt request */
+void I2C0_EV_IRQHandler(void);
+/* handle I2C0 error interrupt request */
+void I2C0_ER_IRQHandler(void);
+typedef enum {
+	I2C_SEND_ADDRESS_FIRST = 0, //Sending slave address
+	I2C_CLEAR_ADDRESS_FLAG_FIRST, // Clear address send
+	I2C_TRANSMIT_WRITE_READ_ADD, //Transmit the memory address to read/write from
+	I2C_SEND_ADDRESS_SECOND, //Send address again for read
+	I2C_CLEAR_ADDRESS_FLAG_SECOND, //Clear address again
+	I2C_TRANSMIT_DATA, //Transmit recieve data
+	I2C_STOP, //Send stop
+	I2C_ABORTED, //
+	I2C_DONE,// I2C transfer is complete
+    I2C_START ,
+	I2C_END,
+	I2C_OK,
+    I2C_SEND_ADDRESS,
+    I2C_CLEAR_ADDRESS_FLAG,
+} i2c_process_enum;
+extern volatile uint8_t i2c_slave_address;
+extern volatile uint8_t i2c_read_process;
+extern volatile uint8_t i2c_write_process;
+extern volatile uint8_t i2c_error_code;
+extern volatile uint8_t* i2c_write;
+extern volatile uint8_t* i2c_read;
+extern volatile uint16_t i2c_nbytes;
+extern volatile uint16_t i2c_write_dress;
+extern volatile uint16_t i2c_read_dress;
+extern volatile uint8_t i2c_process_flag;
+#ifdef __cplusplus
+}
+#endif
+#endif /* BSP_MINIWARE_IRQ_H_ */

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

@@ -0,0 +1,31 @@
+/*
+ * 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_Pinecil) == 0
+#error "No model defined!"
+#endif
+
+#ifdef MODEL_Pinecil
+#define POW_PD
+#define POW_QC
+#define POW_DC
+#define POW_QC_20V
+#define ENABLE_QC2
+#define TEMP_TMP36
+#define ACCEL_BMA
+#define HALL_SENSOR
+#define HALL_SI7210
+#define BATTFILTERDEPTH 32
+#endif
+
+#endif /* BSP_MINIWARE_MODEL_CONFIG_H_ */

workspace/TS100/Core/BSP/Pine64/NOTES.md

@@ -0,0 +1,38 @@
+# Notes on RISC-V
+
+## Pinmap
+
+| Pin Number | Name | Function         | Notes       |
+| ---------- | ---- | ---------------- | ----------- |
+| 17         | PB2  | BOOT2            | Pulldown    |
+| 32         |      | IMU INT 1        | N/A         |
+| 30         |      | IMU INT 2        | N/A         |
+|            | PA4  | Handle Temp      | ADC Input ? |
+|            | PA1  | Tip Temp         | ADC Input ? |
+|            | PB1  | B Button         | Active High |
+|            | PB0  | A Button         | Active High |
+|            | PA11 | USB D-           | -           |
+|            | PA12 | USB D+           | -           |
+|            | PA6  | Tip PWM Out      | -  |
+|            | PA0  | Input DC V Sense | ADC Input ? |
+|            | PA9  | OLED Reset       |             |
+|            | PB7  | SDA              | I2C0_SDA    |
+|            | PB6  | SCL              | I2C0_SCL    |
+
+## ADC Configuration
+
+For now running in matching mode for TS100
+
+- X channels DMA in background
+- Sample tip using "Intereted" channels using TIMER 0,1,3 TRGO or timer0,1,2 channels
+- Using just 12 bit mode for now and move to hardware oversampling later
+- use DMA for normal samples and 4x16 bit regs for tip temp
+- It has dual ADC's so run them in pair mode
+
+## Timers
+
+### Timer 2
+
+Timer 2 CH0 is tip drive PWM out.
+This is fixed at 50% duty cycle and used via the cap to turn on the heater tip.
+This should toggle relatively quickly.

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

@@ -0,0 +1,54 @@
+/*
+ * Pins.h
+ *
+ *  Created on: 29 May 2020
+ *      Author: Ralim
+ */
+
+#ifndef BSP_MINIWARE_PINS_H_
+#define BSP_MINIWARE_PINS_H_
+#include "gd32vf103_gpio.h"
+
+#define KEY_B_Pin BIT(1)
+#define KEY_B_GPIO_Port GPIOB
+#define TMP36_INPUT_Pin BIT(4)
+#define TMP36_INPUT_GPIO_Port GPIOA
+#define TMP36_ADC0_CHANNEL ADC_CHANNEL_4
+#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
+#define TIP_TEMP_Pin BIT(1)
+#define TIP_TEMP_GPIO_Port GPIOA
+#define TIP_TEMP_ADC0_CHANNEL ADC_CHANNEL_1
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_1
+
+#define VIN_Pin BIT(0)
+#define VIN_GPIO_Port GPIOA
+#define VIN_ADC0_CHANNEL ADC_CHANNEL_0
+#define VIN_ADC1_CHANNEL ADC_CHANNEL_0
+#define OLED_RESET_Pin BIT(9)
+#define OLED_RESET_GPIO_Port GPIOA
+#define KEY_A_Pin BIT(0)
+#define KEY_A_GPIO_Port GPIOB
+#define PWM_Out_Pin BIT(6)
+#define PWM_Out_GPIO_Port GPIOA
+#define SCL_Pin BIT(6)
+#define SCL_GPIO_Port GPIOB
+#define SDA_Pin BIT(7)
+#define SDA_GPIO_Port GPIOB
+
+
+#define USB_DM_Pin BIT(11)
+#define USB_DM_LOW_GPIO_Port GPIOA
+
+#define QC_DP_LOW_Pin BIT(7)
+#define QC_DP_LOW_GPIO_Port GPIOA
+
+// LOW = low resistance, HIGH = high resistance
+#define QC_DM_LOW_Pin BIT(8)
+#define QC_DM_LOW_GPIO_Port GPIOA
+#define QC_DM_HIGH_Pin BIT(10)
+#define QC_DM_HIGH_GPIO_Port GPIOA
+
+#define FUSB302_IRQ_Pin BIT(5)
+#define FUSB302_IRQ_GPIO_Port GPIOB
+
+#endif /* BSP_MINIWARE_PINS_H_ */

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

@@ -0,0 +1,49 @@
+#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() {
+	//We return false until we are sure we are not using PD
+	if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+		return false;
+	}
+	if (PolicyEngine::pdHasNegotiated()) {
+		return false;	// We are using PD
+	}
+	if (hasQCNegotiated()) {
+		return false; // We are using QC
+	}
+	return true;
+}