Merge 3a6a22c351 into 05158321ba

So that one I2C done, task can directly swap and pickup later if I2C is blocking

.github/workflows/docs.yml

@@ -1,4 +1,3 @@
-
 name: Docs
 
 # Controls when the workflow will run
@@ -10,13 +9,11 @@ on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
-
 # Allow one concurrent deployment
 concurrency:
   group: "pages"
   cancel-in-progress: true
 
-
 jobs:
   deploy-docs:
     # The type of runner that the job will run on
@@ -26,14 +23,16 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v4
-
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12.3'
 
       - run: |
           pip install --upgrade pip &&
           pip install mkdocs mkdocs-gen-files pymdown-extensions \
               mkdocs-git-revision-date-plugin mkdocs-autolinks-plugin \
               mkdocs-awesome-pages-plugin
+
       - run: git config user.name 'github-actions[bot]' && git config user.email 'github-actions[bot]@users.noreply.github.com'
 
       - name: Publish docs

.github/workflows/push.yml

@@ -1,25 +1,41 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+    branches:
+      - master
+      - dev
+      - main
 
 jobs:
-
-
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
-      image: alpine:3.16
+      image: alpine:3.19
     strategy:
       matrix:
-        model: ["TS100", "TS80", "TS80P", "Pinecil", "MHP30", "Pinecilv2", "S60", "TS101"]
+        model:
+          [
+            "TS100",
+            "TS80",
+            "TS80P",
+            "Pinecil",
+            "MHP30",
+            "Pinecilv2",
+            "S60",
+            "S60P",
+            "T55",
+            "TS101",
+          ]
       fail-fast: true
 
     steps:
       - name: Install dependencies (apk)
-        run: apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash
+        run: apk add --no-cache gcc-riscv-none-elf g++-riscv-none-elf gcc-arm-none-eabi g++-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash
 
       - name: Install dependencies (python)
-        run: python3 -m pip install bdflib
+        run: python3 -m pip install --break-system-packages bdflib
 
       - uses: actions/checkout@v4
         with:
@@ -37,32 +53,26 @@ jobs:
       - name: Copy license files
         run: cp LICENSE scripts/LICENSE_RELEASE.md  source/Hexfile/
 
+      - name: Generate json index file
+        run: ./source/metadata.py ${{ matrix.model }}.json
+
       - name: Archive ${{ matrix.model }} artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.model }}
           path: |
             source/Hexfile/${{ matrix.model }}_*.hex
             source/Hexfile/${{ matrix.model }}_*.dfu
             source/Hexfile/${{ matrix.model }}_*.bin
+            source/Hexfile/${{ matrix.model }}.json
             source/Hexfile/LICENSE
             source/Hexfile/LICENSE_RELEASE.md
           if-no-files-found: error
 
-      - name: Generate json index file
-        run: ./source/metadata.py ${{ matrix.model }}.json
-
-      - name: Archive ${{ matrix.model }} index file
-        uses: actions/upload-artifact@v3
-        with:
-          name: metadata
-          path: source/Hexfile/${{ matrix.model }}.json
-
-
   build_multi-lang:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
-      image: alpine:3.16
+      image: alpine:3.19
     strategy:
       matrix:
         model: ["Pinecil", "Pinecilv2"]
@@ -70,9 +80,9 @@ jobs:
 
     steps:
       - name: Install dependencies (apk)
-        run: apk add --no-cache gcc-riscv-none-elf newlib-riscv-none-elf findutils python3 py3-pip make git bash musl-dev
+        run: apk add --no-cache gcc-riscv-none-elf g++-riscv-none-elf gcc-arm-none-eabi g++-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git bash musl-dev
       - name: Install dependencies (python)
-        run: python3 -m pip install bdflib
+        run: python3 -m pip install --break-system-packages bdflib
 
       - uses: actions/checkout@v4
         with:
@@ -85,37 +95,50 @@ jobs:
         run: echo "GITHUB_CI_PR_SHA=${{github.event.pull_request.head.sha}}" >> "${GITHUB_ENV}"
 
       - name: Build ${{ matrix.model }}
-        run: make -C source/ -j$(nproc) model="${{ matrix.model }}" firmware-multi_compressed_European firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian firmware-multi_Chinese+Japanese
+        run: make -C source/ -j$(nproc) model="${{ matrix.model }}" firmware-multi_compressed_European firmware-multi_compressed_Belorussian+Bulgarian+Russian+Serbian+Ukrainian firmware-multi_Chinese+Japanese
 
       - name: Copy license files
         run: cp LICENSE scripts/LICENSE_RELEASE.md  source/Hexfile/
 
+      - name: Generate json index file
+        run: ./source/metadata.py ${{ matrix.model }}_multi-lang.json
+
       - name: Archive ${{ matrix.model }} artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.model }}_multi-lang
           path: |
             source/Hexfile/${{ matrix.model }}_*.hex
             source/Hexfile/${{ matrix.model }}_*.dfu
             source/Hexfile/${{ matrix.model }}_*.bin
+            source/Hexfile/${{ matrix.model }}_multi-lang.json
             source/Hexfile/LICENSE
             source/Hexfile/LICENSE_RELEASE.md
           if-no-files-found: error
 
-      - name: Generate json index file
-        run: ./source/metadata.py ${{ matrix.model }}_multi-lang.json
+  upload_metadata:
+    needs: [build, build_multi-lang]
+    runs-on: ubuntu-20.04
 
-      - name: Archive ${{ matrix.model }} index file
-        uses: actions/upload-artifact@v3
+    steps:
+      - name: Download all prebuilts
+        uses: actions/download-artifact@v4
+        with:
+          path: source/Hexfile/
+          merge-multiple: true
+      - run: ls -R source/Hexfile
+
+      - name: Upload JSONs in bulk as metadata
+        uses: actions/upload-artifact@v4
         with:
           name: metadata
-          path: source/Hexfile/${{ matrix.model }}_multi-lang.json
-
+          path: source/Hexfile/*.json
+          if-no-files-found: error
 
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
-      image: alpine:3.16
+      image: alpine:3.19
 
     steps:
       - name: Install dependencies (apk)
@@ -126,7 +149,7 @@ jobs:
           submodules: true
 
       - name: Install dependencies (python)
-        run: python3 -m pip install bdflib
+        run: python3 -m pip install --break-system-packages bdflib
 
       - name: Run python tests
         run: ./Translations/make_translation_test.py
@@ -134,11 +157,10 @@ jobs:
       - name: Run BriefLZ tests
         run: make  -C source/  Objects/host/brieflz/libbrieflz.so && ./Translations/brieflz_test.py
 
-
   check_c-cpp:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
-      image: alpine:3.16
+      image: alpine:3.19
 
     steps:
       - name: Install dependencies (apk)
@@ -151,11 +173,10 @@ jobs:
       - name: Check format style with clang-format
         run: make  clean  check-style
 
-
   check_python:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container:
-      image: alpine:3.16
+      image: alpine:3.19
 
     steps:
       - name: Install dependencies (apk)
@@ -166,7 +187,7 @@ jobs:
           submodules: true
 
       - name: Install dependencies (python)
-        run: python3 -m pip install bdflib flake8
+        run: python3 -m pip install --break-system-packages bdflib flake8
 
       - name: Check python formatting with black
         run: black --check Translations
@@ -174,7 +195,6 @@ jobs:
       - name: Check python with flake8
         run: flake8 Translations
 
-
   check_shell:
     name: check_shell
     runs-on: ubuntu-latest
@@ -188,19 +208,23 @@ jobs:
           exclude: "./.git/*" # Optional.
           check_all_files_with_shebangs: "false" # Optional.
 
-
-  check_readme:
-    runs-on: ubuntu-20.04
+  check_docs:
+    runs-on: ubuntu-22.04
     container:
-      image: alpine:3.16
+      image: alpine:3.19
 
     steps:
       - name: Install dependencies (apk)
-        run: apk add --no-cache git
+        run: apk add --no-cache git bash grep
 
       - uses: actions/checkout@v4
         with:
           submodules: true
+          fetch-tags: true
+          fetch-depth: 0
 
-      - name: Check autogenerated Documentation/README.md
-        run: /bin/sh ./scripts/deploy.sh docs_readme
+      - name: Git ownership exception
+        run: git config --global --add safe.directory /__w/IronOS/IronOS && git config --global safe.directory "$GITHUB_WORKSPACE"
+
+      - name: Check and verify documentation
+        run: ./scripts/deploy.sh docs

.gitignore

@@ -215,3 +215,4 @@ Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
 
 # Tests/linters/sanitizers
 source/check-style.log
+.ash_history

Documentation/DebugMenu.md

@@ -40,9 +40,9 @@ I.e.:
 
 **Additional scroll-able items appear in this order**:
 
-### Date
+### Timestamp
 
-- This is a date of firmware compilation and it has the following format: `DD-MM-YY` (i.e., `01-07-23` means it has been built in July, 1st, 2023)
+- This is a timestamp of firmware compilation and it has the following format: `YYYYMMDD HHMMSS` (i.e., `20230701 213456` means it has been built in July, 1st, 2023 at 9:34:56 pm)
 
 ### ID
 

Documentation/Development.md

@@ -14,6 +14,42 @@ You will need to update the build settings for include paths and point to the ne
 In the `source` folder there is a `Makefile` that can be used to build the repository using command line tools.
 When running the `make` command, specify which model of the device and the language(s) you would like to use.
 
+### Windows (MSYS2 environment)
+
+1. Download `msys2` install package from the [official website](https://msys2.org) and install it according to the instruction there;
+2. Install requried packages (here and for the future commands use **`mingw64.exe`** terminal):
+```
+$ pacman -S mingw-w64-x86_64-arm-none-eabi-gcc mingw-w64-x86_64-libwinpthread-git python3 python3-pip make unzip git
+```
+3. Download _3rd party RISC-V toolchain_ `xpack-riscv-none-elf-gcc-...-win32-x64.zip` from [this repository](https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases);
+4. Move downloaded `xpack-riscv-none-elf-gcc-...-win32-x64.zip` to `msys64` _Windows_ directory (e.g., `C:\msys64\`);
+5. Extract files from `xpack-riscv-none-elf-gcc-...-win32-x64.zip` and go back to _home_ directory:
+```
+$ cd /
+$ unzip xpack-riscv-none-elf-gcc-...-win32-x64.zip
+$ cd ~
+```
+6. Permanently set `PATH` environment variable, so all required toolchains could be available for `make` and for other build scripts:
+```
+$ echo 'export PATH=/xpack-riscv-none-elf-gcc-.../bin:${PATH}' >> ~/.bashrc
+$ source ~/.bashrc
+```
+7. Additionally, `OpenOCD` and/or `ST-Link` can be installed as well to help with flashing:
+```
+$ pacman -S mingw-w64-x86_64-openocd
+$ pacman -S mingw-w64-x86_64-stlink
+```
+8. Clone _IronOS_ repo:
+```
+$ git clone --recursive https://github.com/Ralim/IronOS.git
+$ cd IronOS
+```
+9. Follow steps _4-8_ from [macOS section](#macos);
+10. `pip` can be updated inside `venv` only:
+```
+$ python3 -m pip install --upgrade pip
+```
+
 ### macOS
 
 Use the following steps to set up a build environment for IronOS on the command line (in Terminal).
@@ -74,7 +110,7 @@ make -j$(nproc) model=Pinecil firmware-multi_European
 To build a Cyrillic compressed multi-language firmware for the Pinecil with as many simultaneous jobs as there are logical processors on macOS:
 
 ```
-make -j$(sysctl -n hw.logicalcpu) model=Pinecil firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian
+make -j$(sysctl -n hw.logicalcpu) model=Pinecil firmware-multi_compressed_Belorussian+Bulgarian+Russian+Serbian+Ukrainian
 ```
 
 To build a custom multi-language firmware including English and Simplified Chinese for the TS80:

Documentation/Flashing/MHP30.md

@@ -26,9 +26,9 @@ Then this works the same as a production release (use the correct file).
 
 # MHP30
 
-This is completely safe, but if it goes wrong just put the `.hex` file from the official website ([MHP30](https://www.minidso.com/forum.php?mod=viewthread&tid=4385&extra=page%3D1) 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/IronOS/releases) The file you want is called MHP30.zip. Inside the zip file (make sure to extract the file before flashing with it) will be a file called `MHP30_{Language-Code}.hex`.
+This is completely safe, but if it goes wrong just put the corresponding `.hex` file from [the official website](https://e-design.com.cn/en/NewsDetail/4203645.html) ([mirror backup](https://github.com/Ralim/IronOS-Meta/tree/main/Firmware/Miniware)) 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/IronOS/releases) The file you want is called MHP30.zip. Inside the zip file (make sure to extract the file before flashing with it) will be a file called `MHP30_{Language-Code}.hex`.
 
-Officially the bootloader on the devices 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/IronOS/wiki/Upgrading-Firmware).
+Officially the bootloader on the devices 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](#mac), and can be made to work under [Linux](#linux) _sometimes_ (look for details below).
 
 1. Hold the button closest to the tip (MHP30 the left button on the back), and plug in the USB to the computer.
 2. The unit will appear as a USB drive. (Screen will say `DFU` on it.)

Documentation/Flashing/Pinecil V2.md

@@ -24,7 +24,7 @@ In general you probably want `master`.
 Once you click on a run, scroll down to the "Artifacts" section and then click on your device model name to download a zip file.
 Then this works the same as a production release (use the correct file).
 
-# Pinecil V2
+## Pinecil V2
 
 - The MCU in Pinecil V2 is Bouffalo BL706 and does _not_ use usb-dfu for flashing as the previous Pinecil V1 MCU did.
 - See the Pinecil Wiki page [here](https://wiki.pine64.org/wiki/Pinecil#Firmware_&_Updates) for instructions.
@@ -34,3 +34,16 @@ Then this works the same as a production release (use the correct file).
 - One advantage of Pinecil is that you cannot permanently damage it doing a firmware update (because BIN is in ROM); an update could render Pinecil temporarily inoperable if you flash an invalid firmware. But no worries, simply re-flashing with a working firmware copy will fix everything.
 - USB-C cable is required to do an update. Generally, all USB controllers work, but some hubs have issues, so it is preferred to avoid USB hubs for updates.
 - Background on the [BL706 chipset](https://lupyuen.github.io/articles/bl706)
+
+### Troubleshooting
+
+If you are running into issues such as timeouts during the programming or bootloader errors, the BL702 has a not-amazing USB PHY built in. This can cause problems on cheap cables (especially "thin" ones that tend not to have shielding). One of the authors (Ralim) has found this especially common on the cables supplied with Apple chargers when used with newer Ryzen processor ports.
+
+It is _strongly_ reccomended to use a good quality cable, ideally _short_.
+Also try other USB ports, as on some devices they can use different hub's or lengths of signalling, and this can fix the issue.
+
+By the PinecilV2's design, by default some of the internal buses are exposed on the USB3 pins, to enable hacking/debugging/mods. This is suspected it _may_ play poorly on some chipsets. Try using a USB2.0 cable. Others have had luck with chaining USB-C->USB-A->USB-C. This may be due to this, as a lot of these adaptors are USB2 or only USB3 5gbps (half USB3 pins).
+
+Another workaround is to put a USB hub somewhere in the chain, as these will re-form the signal and can work around the issue.
+
+_Finally_, some users have reported issues under Windows that were fixed by changing OS (Typically to a Linux live cd).

Documentation/Flashing/TS100.md

@@ -26,9 +26,9 @@ Then this works the same as a production release (use the correct file).
 
 # TS100
 
-This is completely safe, but if it goes wrong just put the `.hex` file from the official website ([TS100](https://www.minidso.com/forum.php?mod=viewthread&tid=868&extra=page%3D1) 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/IronOS/releases) The file you want is called TS100.zip. Inside the zip file (make sure to extract the file before flashing with it) will be a file called `TS100_{Language-Code}.hex`.
+This is completely safe, but if it goes wrong just put the corresponding `.hex` file from [the official website](https://e-design.com.cn/en/NewsDetail/4203645.html) ([mirror backup](https://github.com/Ralim/IronOS-Meta/tree/main/Firmware/Miniware)) 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/IronOS/releases) The file you want is called TS100.zip. Inside the zip file (make sure to extract the file before flashing with it) will be a file called `TS100_{Language-Code}.hex`.
 
-Officially the bootloader on the devices 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/IronOS/wiki/Upgrading-Firmware).
+Officially the bootloader on the devices 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](#mac), and can be made to work under [Linux](#linux) _sometimes_ (look for details below).
 
 1. Hold the button closest to the tip (MHP30 the left button on the back), and plug in the USB to the computer.
 2. The unit will appear as a USB drive. (Screen will say `DFU` on it.)

Documentation/Flashing/TS80(P).md

@@ -26,9 +26,9 @@ Then this works the same as a production release (use the correct file).
 
 # TS80 / TS80P
 
-This is completely safe, but if it goes wrong just put the `.hex` file from the official website ([TS80](https://www.minidso.com/forum.php?mod=viewthread&tid=868&extra=page%3D1)/[TS80P](https://www.minidso.com/forum.php?mod=viewthread&tid=4070&extra=page%3D1) 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/IronOS/releases) The file you want is called TS80.zip or TS80P.zip. Inside the zip file (make sure to extract the file before flashing with it) will be a file called `TS80_{Language-Code}.hex`/`TS80P_{Language-Code}.hex`.
+This is completely safe, but if it goes wrong just put the corresponding `.hex` file from [the official website](https://e-design.com.cn/en/NewsDetail/4203645.html) ([mirror backup](https://github.com/Ralim/IronOS-Meta/tree/main/Firmware/Miniware)) 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/IronOS/releases) The file you want is called TS80.zip or TS80P.zip. Inside the zip file (make sure to extract the file before flashing with it) will be a file called `TS80_{Language-Code}.hex`/`TS80P_{Language-Code}.hex`.
 
-Officially the bootloader on the devices 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/TS80/wiki/Upgrading-Firmware).
+Officially the bootloader on the devices 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](#mac), and can be made to work under [Linux](#linux) _sometimes_ (look for details below).
 
 1. Hold the button closest to the tip (MHP30 the left button on the back), and plug in the USB to the computer.
 2. The unit will appear as a USB drive. (Screen will say `DFU` on it.)
@@ -39,6 +39,8 @@ Officially the bootloader on the devices only works under Windows (use the built
 7. If it didn't work the first time, try copying the file again without disconnecting the device, often it will work on the second shot.
 8. Disconnect the USB and power up the device. You're good to go.
 
+If you get a message when copying: "Are you sure you want to move this file without its properties?" then this can cause an issue where the iron thinks that the file has finished copying before it actually has and can cause a .ERR file. Since this dialog prompt is caused by copying a file from NTFS to FAT (the iron's filesystem) in windows, you can fix this by formatting a thumbdrive as FAT32 and then storing the hex file on that before copying the file to the iron. As there will be no NTFS properties on the file when stored on a FAT32 filesystem, there will be no prompt, and the copy will then proceed normally.
+
 For the more adventurous out there, you can also load this firmware onto the device using an SWD programmer, for easier installation follow the guide at the end of this document.
 
 On the USB port, `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 [IronOS-dfu](https://github.com/Ralim/IronOS-dfu) is recommended as it allows reliable flashing of binary files with [dfu-util](http://dfu-util.sourceforge.net/).

Documentation/GettingStarted.md

@@ -9,7 +9,7 @@ If your device did not come with IronOS already installed, or if you need to upd
 - [TS80 / TS80P](https://ralim.github.io/IronOS/Flashing/TS80%28P%29/)
 - [TS100](https://ralim.github.io/IronOS/Flashing/TS100)
 
-It is recommended to update to the newest stable release.
+It is recommended to update to the newest stable release when you first receive your device to ensure you are up to date.
 
 Once your Iron has been flashed, on first power on it _may_ warn you about the system settings being reset.
 _Do not panic_; this is 100% completely normal. This is here to note to you that they have been reset to handle the internal structure changing.

Documentation/HallSensor.md

@@ -2,11 +2,11 @@
 
 ## Sleep Mode Menu
 
-In Sleep mode, the iron automatically lowers the temperature to 150 °C (default). This default was chosen as it is just below the melting point of many solders. A stand-by lower temperature helps reduce the rate of oxidation and prevents damage to iron tips. In general, when not using the iron, unplug it or let it sleep to increase the longevity of replaceable tips. The default sleep temperature can be customized.
+In sleep mode, the iron automatically lowers the temperature to 150°C (default). This default setting was chosen as it is just below the melting point of a wide range of solders. A lower standby temperature helps reduce the oxidation rate and prevent damage to the soldering tips. As a general rule, when not in use, unplug the unit or let it go into sleep mode to extend the life of the replaceable tips. The default sleep temperature can be adjusted to your preference.
 
-Simply moving the iron or pressing any button will wake it back up into soldering mode.
+Simply moving the iron or pressing any button will wake it back up into soldering mode. The sensitivity is adjustable. It is recommended to adjust this to suit your environment so that it reliably stays in sleep mode when not in use, but does not go into sleep mode when in use. (This may vary depending on the amount of movement during soldering.)
 
-### Optional Hall Effect Feature (Pinecil only):
+### Optional Hall Effect Feature (Pinecil (v1/v2) only):
 
 Inside the [Sleep Menu](https://ralim.github.io/IronOS/Settings/#setting-sleep-temp) is an additional type of sleep setting. Pinecil has an unpopulated footprint (**U14**) for a hall effect sensor, Silicon Labs **Si7210-B-00-IV**. After installing the hall effect sensor (HES), it is possible to auto-trigger Pinecil to enter sleep mode when it enters the stand, and _Zzzz_ will appear (or text in detailed mode). This could be a fun enhancement for any Pinecil and adds a feature typically only found in more expensive high-end irons. The HES is available at many electronic stores for ~$2-$6.
 

Documentation/Hardware.md

@@ -1,36 +1,66 @@
 ## Notes on the various supported hardware
 
+Below are short summaries / notes around the hardware. This is not an in-depth comparison of the features of the units. Please do your own research before purchasing.
+
+Due to descisions out of our control, Miniware no longer provides source-code/schematics/support for any open source firmware on their devices. This does mean that only (TS100/TS80/TS80P) are "open" to any extent. TS80P is pushing that as it was never open at all but just happens to be very close to the TS80. While this generally shouldn't affect the performance of the device, it does mean that their newer products can be slow to be supported or some issues are harder to resolve.
+
+Sequre has so far been supportive of the S60 by providing schematics.
+
+The Pine64 units (Pinecil) are schematics-available (i.e you can download them on the Pine64 Wiki). They are currently the only vendor that has provided financial support of the project. They are also the only vendor that allows contact directly to the engineering teams for hardware issues. This results in generally better support for these devices. It does **not** mean that this firmware is designed around them, but it does help however that they are designed with this firmware in mind as Ralim talks to them. Where possible features are designed to work across all devices but the time for support may vary depending on the hardware and its quirks.
+
+
+## A quick note on power supplies
+
+For all devices listed **except** the MHP30:
+
+These soldering irons do *NOT* contain DC/DC converters.
+This means that your power at the tip is a function of the supplied voltage. Just because the iron "supports" running at a wide range of voltages, you should always use a voltage near the upper limit where possible.
+It is highly recommended to use a PD adapter where possible as this allows the iron to _know_ the limitations of your supply.
+The marked irons can only turn the tip on and off in software, this means that they can't control the maximum power drawn from the supply. This is why when using PD the iron may select a lower voltage than your power supplies maximum. This is to prevent your power supply failing from over current. For more information about power management underhood, please, [see the related documentation section](https://ralim.github.io/IronOS/Power/).
+
+For the MHP30, it contains a buck DC/DC, which means it can utilise most power supplies fairly well, but you should still aim for highest voltage that is reasonable to use.
+
 
 ### TS100
 
-TS100\* is a neat soldering iron:
+The TS100 was the first supported soldering iron, and is generally a very capable device.
+Its now generally not reccomended to buy new as other devices have all of its features and more, and can often be the same price or cheaper. It's still fully supported though, nothing will be taken away from it.
 
 - can run from 9-25V DC;
 - provides a power range that is determined by the input voltage;
 - voltages below 12V don't overly work well for any substantial mass;
-- the default firmware can be found [here](https://www.minidso.com/forum.php?mod=viewthread&tid=892&extra=page%3D1).
+- the original firmware can be found [here](https://e-design.com.cn/en/NewsDetail/4203645.html)([mirror backup](https://github.com/Ralim/IronOS-Meta/tree/main/Firmware/Miniware)).
 
 ![](https://brushlesswhoop.com/images/ts100-og.jpg)
 
+### TS101
+
+The TS101 is the direct replacement of the TS100 with the same tip compatibility.
+It adds a spring pressure tip holding mechanism instead of using a screw so tips are easier to swap on the fly (But are held less securely and can pull out depending on the use case). It adds USB-C PD support and the hardware is compatible with 28V EPR power supplies (under both IronOS and official firmware).
+
+It unfortunately uses an STM32 clone MCU with quirks, so performance of the screen isn't as good as it could be but its perfectly usable. The bootloader for programming is the biggest weakness of this device and programming can be a pain. Fortunately, IronOS is relatively stable feature wise, so you shouldn't need to update the device often.
+
+The Miniware bootup logo is burned into their bootloader, so IronOS cant remove this. IronOS can show your own logo when it starts however. There are quirks to loading a logo on this device, so be sure to read the documentation if you are coming from other devices.
 
 ### TS80
 
-TS80\* is a successor to TS100:
+TS80 is a successor to TS100, it moves to custom smaller tips that perform better at lower wattages. It is optimised for a 9V/2A Quick Charge 3.0 power supply. This is commonly found on older power banks on the USB-A port.
+It does **not** support USB-PD and will not work when powered from a USB-C power supply in most cases.
 
 - uses _Quick Charge 3.0_ / _QC3_ capable charger only (18W max);
 - doesn't support PD as it is not designed on the hardware level;
-- the default firmware can be found [here](https://www.minidso.com/forum.php?mod=viewthread&tid=3208&extra=page%3D1).
+- the original firmware can be found [here](https://e-design.com.cn/en/NewsDetail/4203645.html)([mirror backup](https://github.com/Ralim/IronOS-Meta/tree/main/Firmware/Miniware)).
 
-![](https://core-electronics.com.au/media/catalog/product/4/2/4244-01.jpg)
+![Image of TS80](https://core-electronics.com.au/media/catalog/product/4/2/4244-01.jpg)
 
 
 ### TS80P
 
-TS80P\* is a successor to TS80:
+The TS80P is the direct successor to the TS80 and essentially what the TS80 should have been from its debut. It is nearly identical except it adds USB-PD support for far better compatibility with modern power banks as well as a faster tip removal method.
 
-- supports _Quick Charge 3.0_ (_QC3_: 9V/3A, 18W max);
+- supports _Quick Charge 3.0_ (_QC3_: 9V/2A,12V/1.5A 18W max);
 - supports _Power Delivery_ (_PD_: 9V/3A & 12V/3A, 30W max)\*\*;
-- the default firmware can be found [here](https://www.minidso.com/forum.php?mod=viewthread&tid=4085&extra=page%3D1).
+- the original firmware can be found [here](https://e-design.com.cn/en/NewsDetail/4203645.html)([mirror backup](https://github.com/Ralim/IronOS-Meta/tree/main/Firmware/Miniware)).
 
 \*\*: use valid PD device that supports 12V/3A as power source to get full 30W potential, otherwise the iron will fall back to 9V/18W power mode.
 
@@ -44,12 +74,13 @@ MHP30 is a **M**ini **H**ot **P**late:
 - accelerometer is the MSA301, this is mounted roughly in the middle of the unit;
 - USB-PD is using the FUSB302;
 - the hardware I2C bus on PB6/7 is used for the MSA301 and FUSB302;
-- the OLED is the same SSD1306 as everything else, but it’s on a bit-banged bus.
+- the OLED is the same SSD1306 as everything else, but it’s on a bit-banged bus;
+- the original firmware can be found [here](https://e-design.com.cn/en/NewsDetail/4203645.html)([mirror backup](https://github.com/Ralim/IronOS-Meta/tree/main/Firmware/Miniware)).
 
 
 ### Pinecil
 
-Pincecil\*:
+Pincecil:
 
 - first model of soldering iron from PINE64;
 - the default firmware can be found [here](https://files.pine64.org/os/Pinecil/Pinecil_firmware_20201115.zip).
@@ -57,6 +88,3 @@ Pincecil\*:
 ![](https://pine64.com/wp-content/uploads/2020/11/pinecil-bb2-04.jpg?v=0446c16e2e66)
 
 
-\*: Please note: these soldering irons do *NOT* contain DC/DC converters. This means that your power at the tip is a function of the supplied voltage. Just because the iron "supports" running at a wide range of voltages, you should always use a voltage near the upper limit where possible. It is highly recommended to use a PD adapter where possible as this allows the iron to _know_ the limitations of your supply. The marked irons can only turn the tip on and off in software, this means that they can't control the maximum power drawn from the supply. This is why when using PD the iron may select a lower voltage than your power supplies maximum. This is to prevent your power supply failing from over current. For more information about power management underhood, please, [see the related documentation section](https://ralim.github.io/IronOS/Power/).
-
-

Documentation/History.md

@@ -1,7 +1,51 @@
 # Version Changes
 
 
-# V2.21
+## v2.22
+
+### New Hardware Support
+
+#### Sequre S60
+
+The [Sequre S60](https://sequremall.com/products/sequre-s60-nano-electric-soldering-iron-support-pd-qc-power-supply-compatible-with-c210-soldering-iron-tips-precision-electronic-mobile-phone-repair-tool-anti-static-soldering-pen?variant=42361945096380) uses JBC tips, which makes it quite useful for the smaller tip types and extra options available.
+
+#### TS101
+
+The TS101 is the evolution of the TS100, picking up USB-PD.
+It has otherwise similar tip support to the TS100/Pinecil/PinecilV2.
+
+Absolutely massive kudos goes to @VioletEternity for her work on the reverse engineering of this. If you at all are helped by IronOS running on this device more credit goes to her than to I. Also big thanks to @whitequark for organising + supporting + magic.
+
+### Features & changes
+
+#### PinecilV2 notes
+
+1. BLE is fixed on all devices.
+2. Bootup Logo support is finalised and working.
+3. Improved the tip control, improving accuracy and remove most oscillations.
+
+#### Profile heating mode for MHP30
+
+This lets you define a heat profile and run this profile akin to a proper reflow device.
+This can be used on the MHP30 by long-holding the A button (aka start button).
+Profile can be edited in settings.
+
+#### Note on newer OLED's
+
+To prevent this release being held up forever, the TS101 and S60 are being released with a limitation on the OLED screen.
+The current code will only draw to the upper left corner of the screen.
+Assets have been made for rendering this at full size, but the code is not complete yet.
+
+#### Smaller updates
+
+- Filtering added to MHP tilt-exit to make it less sensitive
+- Warning if a tip is detected to be shorted (TS101 + PinecilV2)
+- Translation updates ❤️
+- Documentation updates
+- Lots of tooling and code cleanups
+
+
+## v2.21
 
 ### Features & changes
 
@@ -20,7 +64,7 @@ Alternatively you can use Spagett1's PineFlash tool that should provide a GUI in
 For a small number of V2 Pinecil devices there appears to be an interference issue between the Bluetooth Low Energy and some devices; more information here. If this occurs to you, please let us know in the issue and rollback to 2.20 for now.
 
 
-# V2.20
+## v2.20
 
 - First "full" release for PinecilV2
 - Loots of documentation updates
@@ -29,7 +73,7 @@ For a small number of V2 Pinecil devices there appears to be an interference iss
 - Cold Junction Calibration was reworked and now occurs _at next boot_ to make it easier to perform when the device is cold
 
 
-# V2.19
+## v2.19
 
 - Bug-fix Infinite Boot Logo
 - Shutdown settings for MHP30
@@ -40,7 +84,7 @@ For a small number of V2 Pinecil devices there appears to be an interference iss
 - Improved documents, added features table
 
 
-# V2.18
+## v2.18
 
 - Support for animated bootup logo's
 - Bootup logo's moved to their own IronOS-Meta repo
@@ -50,7 +94,7 @@ For a small number of V2 Pinecil devices there appears to be an interference iss
 - Better Instructions/documents
 
 
-# V2.17
+## v2.17
 
 ### Features & changes
 
@@ -78,7 +122,7 @@ For a small number of V2 Pinecil devices there appears to be an interference iss
 - -> Release has been updated to build `e065be3` after one bug with the BMA223 was found.
 
 
-# V2.16
+## v2.16
 
 - Overhaul of the Timer+ADC setup with help from @sandmanRO
 - Overhaul of the PID with help from @sandmanRO
@@ -96,7 +140,7 @@ For a small number of V2 Pinecil devices there appears to be an interference iss
 - Romanian language added
 
 
-# V2.15
+## v2.15
 
 ### Features & changes
 
@@ -121,7 +165,7 @@ Programs the same as any one Miniware unit using drag and drop.
 The flood doors are now open for feature requests for this unit :)
 
 
-# V2.14
+## v2.14
 
 - Fixing auto rotation bug in the LIS accelerometer in the TS80/TS80P
 - Adds support for two new accelerometers
@@ -139,7 +183,7 @@ The flood doors are now open for feature requests for this unit :)
 - clang-format spec setup #801
 
 
-# V2.13
+## v2.13
 
 - First _official_ Pinecil release
 - All of the wire for Pinecil releases added
@@ -157,7 +201,7 @@ The flood doors are now open for feature requests for this unit :)
 - Rework of all of the temperature curves for better accuracy
 
 
-# V2.12
+## v2.12
 
 - Only released as pre-release
 - [TS80P] Improvements to the PD negotiation to handle a few more adapters cleanly
@@ -166,21 +210,21 @@ The flood doors are now open for feature requests for this unit :)
 - Removing the very old single line menu style.
 
 
-# V2.11
+## v2.11
 
 - First TS80P support
 - Added in a USB-PD driver stack for the FUSB302
 - Fixed some graphical glitches
 
 
-# V2.10
+## v2.10
 
 - GUI polish (animations and scroll bars)
 - Power pulse to keep power supplies alive
 - Adjustable tip response gain
 
 
-# V2.09
+## v2.09
 
 - Adjustable steps in temperature adjustment
 - Git hash now in build string
@@ -188,19 +232,19 @@ The flood doors are now open for feature requests for this unit :)
 - Some minor QC3 improvements
 
 
-# V2.08
+## v2.08
 
 - Fixes auto start in sleep mode
 - Power limiters
 
 
-# V2.07
+## v2.07
 
 - QC fixes
 - Cosmetic fixes for leading 0's
 
 
-# V2.06
+## v2.06
 
 - Warning on settings reset
 - Temp temp re-write
@@ -209,32 +253,32 @@ The flood doors are now open for feature requests for this unit :)
 - Menu timeouts
 
 
-# V2.05
+## v2.05
 
 - Language updates
 
 
-# V2.04
+## v2.04
 
 - GUI updates
 
 
-# V2.03
+## v2.03
 
 - Support for new accelerometers
 
 
-# V2.02
+## v2.02
 
 - Adds small font
 
 
-# V2.01
+## v2.01
 
 - Newer settings menu
 
 
-# V2.00
+## v2.00
 
 - Complete re-write of the low layer system to use the STM32 HAL for easier development
 - This allowed easier setup for the new ADC auto measuring system
@@ -245,7 +289,7 @@ The flood doors are now open for feature requests for this unit :)
 - Added smaller font for said screen views
 
 
-# V1.17
+## v1.17
 
 - Added blinking cooldown display
 - Allowed smaller sleep timeout values
@@ -253,72 +297,72 @@ The flood doors are now open for feature requests for this unit :)
 - Automatic startup option
 
 
-# V1.16
+## v1.16
 
 - Added automatic rotation support
 - Added power display graph
 
 
-# V1.15
+## v1.15
 
 - Added support for a custom bootup logo to be programmed via the DFU bootloader
 
 
-# V1.14
+## v1.14
 
 - Changed input voltage cutoff to be based on cell count rather than voltage
 
 
-# V1.13
+## v1.13
 
 - Swapped buttons for menu to prevent accidentally changing first menu item
 - Added auto key repeat
 
 
-# V1.12
+## v1.12
 
 - Increases sensitivity options to be 1\*9 with 0 off state
 - Fixes issue where going from COOL \*> soldering can leave screen off
 
 
-# V1.11
+## v1.11
 
 - Boost mode
 - Change sensitivity options to be 1\*8
 
 
-# V1.10
+## v1.10
 
 - Adds help text to settings
 - Improves settings for the display update rate
 
 
-# V1.09
+## v1.09
 
 - Adds display modes, for slowing down or simplifying the display
 
 
-# V1.08
+## v1.08
 
 - Fix settings menu not showing flip display
 
 
-# V1.07
+## v1.07
 
 - Adds shutdown time to automatically shutdown the iron after inactivity
 
 
-# V1.06
+## v1.06
 
 - Changes H and C when the iron is heating to the minidso chevron like images
 
 
-# V1.05
+## v1.05
 
 - Adds ability to calibrate the input voltage measurement
 
 
-# V1.04
+## v1.04
 
 - Increased accuracy of the temperature control
 - Improved PID response slightly
@@ -326,14 +370,14 @@ The flood doors are now open for feature requests for this unit :)
 - Nicer idle screen
 
 
-# V1.03
+## v1.03
 
 - Improved Button handling
 - Ability to set motion sensitivity
 - DC voltmeter page shows input voltage
 
 
-# V1.02
+## v1.02
 
 - Adds hold both buttons on IDLE to access the therometer mode
 - Changes the exit soldering mode to be holding both buttons (Like original firmware)

Documentation/Logo.md

@@ -38,8 +38,8 @@ The model should be replaced by one of the following options:
 - `miniware` for older Miniware Irons -> TS100, TS80, TS80P
 - `pinecilv1` for the Pinecil V1
 - `pinecilv2` for the Pinecil V2
-- `ts101` for the Miniware TS101 [^1]
-- `s60` for the Squire S60 [^1]
+- `ts101` for the Miniware TS101 [^1] [^2]
+- `s60` for the Sequre S60 [^1]
 - `mhp30` for the Miniware MHP30
 
 Different models are used for different flash locations for the image storage.
@@ -50,6 +50,28 @@ After processing its expected to have a `.hex` and `.dfu` file created to be use
 Note: make sure your image file is in the same folder as script files (img2logo.py, output_dfu.py, output_hex.py).
 
 [^1] Note that these devices have larger resolution screens that the logo system supports right now. Fixes are coming for this soon, roughly scheduled for 2.23.
+[^2] The TS101 requires extra steps, see below.
+
+### TS101 Quirks
+
+When Miniware designed the TS101 they cut cost by using an STM32 clone with some odd quirks. They also re-wrote their USB bootloader, which has introduced new bugs for us to deal with.
+Their bootloader appears to have kept the existing limit of not being able to flash small hex files, but they no longer fall for the older "just repeat the content" trick and instead reject the file.
+Additionally, while the MCU in use has 128K of flash, their bootloader (at least for me) fails to write to anything above 99K. It _looks_ like a watchdog reset or hard crash. Unsure.
+
+This has flow on effects, where the settings can still be located in the upper ~28K of flash, but it cant be used for anything we flash over USB.
+Of that 100K we can use, they waste 32K of it for their bootloader (Old bootloaders were 16K).
+This means the main "app" of IronOS is limited to around 67K (100K-32K for bootloader, -1K for logo).
+
+For this device the Logo is not located at the end of flash but instead at the last writable page (99K).
+
+Additionally, as we need to do a large write, to avoid having to waste more flash space; the logo is merged with the normal firmware. This means that the firmware and logo are flashed together once.
+Future updates can be done without merging as it will leave the logo data there as normal firmware doesnt touch that area of flash.
+
+To do this, download the latest version of IronOS and merge it with the logo using the `--merge` command line argument.
+
+To create the logo file for a TS101 the full command looks like `python3 img2logo.py <image file path> <output folder path> -m ts101 --merge <Path to main firmware>`.
+
+For this reason, there are no TS101 logo's generated by the IronOS-Meta repo.
 
 ## Flashing the Logo
 

Documentation/PortingToNewDevice.md

@@ -0,0 +1,72 @@
+# Requesting support for a new device
+
+IronOS is largely designed to run on devices that are using _fairly_ modern microcontrollers at their core. Generally this means an ARM Cortex or RISC-V processor.
+At this point in time it is not planned to support 8051 or similar cored devices. This is largely due to the reliance on FreeRTOS at the moment.
+
+When requesting a port for a new device, please try and find out if the hardware meets the below requirements.
+
+The feature list's below are organised into three categories; Hard requirements that as of current must be met, soft requirements that _should_ be met for full featured performance and the final category of planned _but not yet implemented_ features; which can be implemented but can result in delays as these are not yet implemented.
+
+Aside from the below, keep in mind IronOS is really designed for soldering irons. This has expanded out into hot-plates as they are exceptionally similar devices.
+
+## Hard requirements
+
+1. Supported processor (Arm Cortex or RISC-V). (Though generally anything that has an existing FreeRTOS port is possible).
+2. 64K of flash or larger (See note A)
+3. 16K of ram or larger
+4. Device has one or more heating elements that can be controlled by a main temperature sensor
+5. If the main temperature sensor is a thermocouple, a reference temperature sensor for cold junction compensation must exist and be close to the sensor contacts
+6. Means of the user updating the device without opening
+7. Known pinmap for the microcontroller. (see note B)
+
+## Soft requirements
+
+1. USB-PD is strongly preferred over Quick Charge; Quick Charge only devices are considered legacy and will likely not be prioritiesd.
+2. Open source or at the least schematics available is **strongly** preferred and will prioritise the device.
+3. Likewise friendly vendors will help dramatically with support, due to both questions and also appearances to help the community.
+4. Hardware PWM wired up to the tip control is nice to have but not essential
+5. Very strong preference against devices that use the endless sea of STM32 clones.
+
+## Planned features
+
+These features are planned for eventual support, but will likely not be done until devices need them.
+
+- Colour screens
+- More than 2 buttons for input, or encoder inputs
+- WiFi/Zigbee/ any other networking
+
+## Notes
+
+### Note A - Flash storage space
+
+64KB is generally the minimum recommended size for the hardware to have.
+Larger is _definitely_ preferred as it enables more features or the multi-pack language firmwares.
+Keep in mind that on some devices we loose space to a USB DFU bootloader (Older STM32F1's) so the firmware _can_ work with less. But it can come at the cost of features.
+128KB or larger is **great**.
+For devices that have BLE or WiFi or other features, often code requirements are significantly larger. These are considered non essential features so will be ignored if we run into size issues.
+
+### Note B - Pinmap for the microcontroller
+
+In order to be able to write the interfacing code to communicate with the hardware, we need to know what pins on the microcontroller go to what hardware.
+It is also loosely required to have an understanding of the rest of the device, we do not need details on a lot of the boring aspects,but if for example a USB-PD interface IC is used we would want to know which one.
+
+## Example request for adding a new device
+
+Device Name:
+Device Type:
+Approximate Price:
+Example purchase locations:
+
+### Hardware details
+
+Microcontroller version: `STM32F103C8Tx`
+Flash size (If external to the MCU):`N/A`
+Microcontroller Pinout: <!-- Either link to manufacturer information, a forum documenting this or a discussion where the pinout has been roughly figured out already-->
+Device type: <!-- Soldering Iron/Hot Plate/ Reflow oven etc-->
+Device meets hard requirements list []
+Device meets soft requirements list []
+
+Device features USB-PD []
+Device features USB-QC []
+Device features DC Input []
+Device features BLE []

Documentation/Power.md

@@ -6,13 +6,14 @@ This *means* that the power provided in the tip is 100% controlled by the supply
 
 Irons at their simplest are just a resistor (Ω) connected to your power source via a switch.
 
-- When the switch is on, the power in the resistor is: $P(watts) = V(volts) \times\ I(current=amps)$
-- Current through the resistor is:  $I(amps) = V(volts) ÷ Ω (resistance)$
+- When the switch is on, the power in the resistor is: *`P(watts) = V(volts) \times\ I(current=amps)`*
+- Current through the resistor is:  *`I(amps) = V(volts) ÷ Ω (resistance)`*
 - Combining these gives some common equations for Power
 
-   $P(watts) = V(volts) * I(amps)$ or $P = V^2 ÷ Ω$
+   *`P(watts) = V(volts) * I(amps)`* or *`P = V^2 ÷ Ω`*
 
 The resistance of the tip is a fixed constant in ohms (Ω):
+
 - 6.2 Ω  Pine64 short tip
 - 8.0 Ω  TS100/Pinecil long tip
 - 4.5 Ω  TS80(P)

Documentation/README.md

@@ -27,6 +27,7 @@
       - [Troubleshooting](../Documentation/Troubleshooting.md)
       - [Known Hardware Issues](../Documentation/HardwareIssues.md)
       - [Power sources](../Documentation/PowerSources.md)
+      - [New Hardware Requirements](../Documentation/PortingToNewDevice.md)
   - [Translations](../Documentation/Translation.md)
   - [Development](../Documentation/Development.md)
   - [Changelog](../Documentation/History.md)

Env.yml

@@ -1,4 +1,3 @@
-version: "3"
 name: "ironos"
 services:
   builder:

Makefile

@@ -52,7 +52,7 @@ DOCKER_CMD=$(DOCKER_BIN)  -f $(DOCKER_YML)  run  --rm  builder
 MKDOCS_YML=$(CURDIR)/scripts/IronOS-mkdocs.yml
 
 # supported models
-MODELS=TS100 TS80 TS80P Pinecil MHP30 Pinecilv2 S60 TS101 # target names & dir names
+MODELS=TS100 TS80 TS80P Pinecil MHP30 Pinecilv2 S60 TS101 S60P T55 # target names & dir names
 MODELS_ML=Pinecil  Pinecilv2 # target names
 MODELS_MULTILANG=Pinecil_multi-lang  Pinecilv2_multi-lang # dir names
 
@@ -144,12 +144,12 @@ docs: $(MKDOCS_YML)  Documentation/*  Documentation/Flashing/*  Documentation/im
 docs-deploy: $(MKDOCS_YML)  Documentation/*  Documentation/Flashing/*  Documentation/images/*
 	$(MKDOCS)  gh-deploy  -f $(MKDOCS_YML)  -d ../site
 
-# routine check for autogenerated Documentation/README.md
+# routine check to verify documentation
 test-md:
 	@echo ""
-	@echo "---- Checking REAMDE.md... ----"
+	@echo "---- Checking documentation... ----"
 	@echo ""
-	@/bin/sh  ./scripts/deploy.sh  docs_readme
+	@./scripts/deploy.sh  docs
 
 # shell style & linter check (github CI version of shellcheck is more recent than alpine one so the latter may not catch some policies)
 test-sh:
@@ -199,7 +199,7 @@ build-all:
 # target to build multilang supported builds for Pinecil & PinecilV2
 build-multilang:
 	@for modelml in $(MODELS_ML); do \
-		$(MAKE)  -C source/  -j2  model=$${modelml}  firmware-multi_compressed_European  firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian  firmware-multi_Chinese+Japanese ; \
+		$(MAKE)  -C source/  -j2  model=$${modelml}  firmware-multi_compressed_European  firmware-multi_compressed_Belorussian+Bulgarian+Russian+Serbian+Ukrainian  firmware-multi_Chinese+Japanese ; \
 		mkdir  -p  $(OUT_DIR)/$${modelml}_multi-lang ; \
 		cp  $(OUT_HEX)/$${modelml}_multi_*.bin   $(OUT_DIR)/$${modelml}_multi-lang ; \
 		cp  $(OUT_HEX)/$${modelml}_multi_*.hex   $(OUT_DIR)/$${modelml}_multi-lang ; \

README.md

@@ -3,52 +3,57 @@
 [![Contributors](https://img.shields.io/github/contributors-anon/ralim/ironos?color=blue&style=flat)](https://github.com/Ralim/IronOS/graphs/contributors)
 [![Latest Release](https://img.shields.io/github/v/release/ralim/IronOS)](https://github.com/Ralim/IronOS/releases/latest)
 
-# IronOS - Flexible Soldering iron control Firmware
+# IronOS - Open Source Flexible Firmware for Soldering Hardware
 
 _This repository was formerly known as TS100, it's the same great code. Just with more supported devices._
 
-Originally conceived as an alternative firmware for the TS100, this firmware has evolved into a complex soldering iron control firmware.
+Originally conceived as an alternative firmware for the _TS100_, this firmware has evolved into a complex soldering hardware control firmware.
 
-The firmware implements all of the standard features of a 'smart' soldering iron, with lots of little extras and tweaks.
-I highly recommend reading the installation guide fully when installing on your iron. And after install just explore the settings menu.
+The firmware implements all of the standard features of a _smart_ soldering hardware, with lots of little extras and tweaks.
+I highly recommend reading the installation guide fully when installing on your device. And after install just explore the settings menu.
 
-For soldering irons that are designed to be powered by 'smart' power sources (PD and QC), the firmware supports settings around the negotiated power and voltage.
-For soldering irons that are designed to be powered by batteries (TS100 & Pinecil), settings for a cutoff voltage for battery protection are supported.
+For soldering hardware that is designed to be powered by _smart_ power sources such as _PD_ or _QC_, the firmware supports settings around the negotiated power and voltage.
+For soldering hardware that is designed to be powered by batteries (_TS100_ & _Pinecil_), settings for a cutoff voltage for battery protection are supported.
 
-Currently **31** languages are supported. When downloading the firmware for your soldering iron, take note of the language code in the file name.
+Currently **31** languages are supported. When downloading the firmware for your soldering hardware, 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 project is considered feature complete for use on a daily basis, _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 on a computer and flashed like firmware._
+_This firmware does **NOT** support the USB port while running for changing settings (this is done through the onscreen menu only). Custom logos are edited on a computer and flashed in the same manner as firmware._
 
-|   Device       | DC  | QC  | PD  | EPR | BLE | Tip Sense | Recommended Purchase | Notes                                         |
-| :------------: | :-: | :-: | :-: | :-: | :-: | :-----:   | :------------------: | :-------------------------------------------:|
+## Supported Hardware
+
+|     Device     | DC  | QC  | PD  | EPR\*\*\*\* | BLE | Tip Sense | Recommended Purchase |                  Notes                  |
+| :------------: | :-: | :-: | :-: | :-: | :-: | :-------: | :------------------: | :-------------------------------------: |
 | Miniware MHP30 | ❌  | ❌  | ✔️  | ❌  | ❌  |    ✔️     |          ✔️          |                                         |
-| Pinecil V1     | ✔️  | ✔️  | ✔️  | ❌  | ❌  |   ❌      |      ❌ *            |                                              |
+|   Pinecil V1   | ✔️  | ✔️  | ✔️  | ❌  | ❌  |    ❌     |        ❌ \*         |                                         |
 |   Pinecil V2   | ✔️  | ✔️  | ✔️  | ✔️  | ✔️  |    ✔️     |          ✔️          |                                         |
 | Miniware TS101 | ✔️  | ❌  | ✔️  | ✔️  | ❌  |    ✔️     |          ✔️          | Full OLED resolution not yet supported. |
 |   Sequre S60   | ❌  | ❌  | ✔️  | ❌  | ❌  |    ❌     |          ✔️          | Full OLED resolution not yet supported. |
+|  Sequre S60P   | ❌  | ❌  | ✔️  | ❌  | ❌  |    ❌     |          ✔️          | Full OLED resolution not yet supported. |
+|   Sequre T55   | ❌  | ❌  | ✔️  | ❌  | ❌  |    N/A    |          ✔️          | Full OLED resolution not yet supported. |
 | Miniware TS80P | ❌  | ✔️  | ✔️  | ❌  | ❌  |    N/A    |          ✔️          |                                         |
-| Miniware TS100 | ✔️  | ❌  | ❌  | ❌  | ❌  |   ❌      |      ❌**            |                                              |
-| Miniware TS80  | ❌  | ✔️  | ❌  | ❌  | ❌  |   N/A     |     ❌***            |                                              |
+| Miniware TS100 | ✔️  | ❌  | ❌  | ❌  | ❌  |    ❌     |        ❌\*\*        |                                         |
+| Miniware TS80  | ❌  | ✔️  | ❌  | ❌  | ❌  |    N/A    |       ❌\*\*\*       |                                         |
 
-_Tip Sense_ refers to the device being able to choose between the 'usual' TS100 or Hakko T12 style tips and Pine64's custom shorter tips which have lower resistance and allow for more power. This is N/A for TS80/TS80P as there is only one model of tip for them.
+_Tip Sense_ refers to the device being able to choose between the _"regular"_ _TS100_ or _Hakko T12 style_ tips and _Pine64_'s custom shorter tips which have lower resistance and allow for more power. This is N/A for _TS80(P)_ as there is only one model of tip for them.
 
 _Recommended Purchase_ is only referring to if you are buying a **new** device. Of course all the devices listed are supported and will work excellently for years to come.
 
-The TS101 and S60 feature a higher resolution OLED than other devices. Work is ongoing to support this fully, for now a cropped view is usable.
+The _TS101_ & _S60(P)_ irons and _MHP30_ & _T55_ plates feature a higher resolution OLED than other devices. Work is ongoing to support this fully, for now a cropped view is usable.
 
-\*PinecilV1 stopped being manufactured a long time ago now, all models for sale online are generally clones (or old stock). Vendors are trying to sell these for more than Pine64 sells the V2 for now. Thus the V1 is **_no longer recommended_**.
+\* _PinecilV1_ stopped being manufactured a long time ago now, all models for sale online are generally clones (or old stock). Vendors are trying to sell these for more than _Pine64_ sells the _V2_ for now. Thus the _V1_ is **_no longer recommended_**.
 
-\**Please note that Miniware started shipping TS100's using cloned STM32 Chips. While these do work with IronOS, their DFU bootloader works terribly, and it is hard to get it to successfully flash larger firmware images like IronOS without timing out. This is the main reason why the TS100 is **_no longer recommended_**.
+\*\* Please note that _Miniware_ started shipping _TS100_'s using **cloned STM32 chips**. While these do work with _IronOS_, their **DFU bootloader** works terribly, and it is hard to get it to successfully flash larger firmware images like _IronOS_ without timing out. This is the main reason why the _TS100_ is **_no longer recommended_**.
 
-\**\*TS80 is replaced by TS80P. Production ramped down a long time ago and it's just existing stock clearing the system. It's marked not recommended being optimistic that people might pause and buy the far superior TS80P instead. This is the main reason why the TS80 is **_no longer recommended_**.
+\*\*\* _TS80_ is replaced by _TS80P_. Production ramped down a long time ago and it's just existing stock clearing the system. It's marked not recommended being optimistic that people might pause and buy the far superior _TS80P_ instead. This is the main reason why the _TS80_ is **_no longer recommended_**.
+
+\*\*\*\* **EPR/PPS with 28V support** is _**disabled by default**_ due to [safety concerns](https://github.com/Ralim/IronOS/pull/2073), but to turn it back on set  
+_PD Mode_ option in _Power settings_ submenu to _Safe_ or _Default_.
 
 ## Getting Started
 
-To get started with IronOS firmware, please jump to [Getting Started Guide](https://ralim.github.io/IronOS/GettingStarted/).
-But the [TL;DR](https://www.merriam-webster.com/dictionary/TL%3BDR) is to press the button near the front of the iron to heat up. Use the button near the back of the iron to enter the settings menu.
-Long hold the rear button in soldering mode to exit back to the start screen.
+To get started with _IronOS firmware_, please jump to [Getting Started Guide](https://ralim.github.io/IronOS/GettingStarted/).
 
 ## Installation
 
@@ -60,49 +65,104 @@ For notes on installation for your device, please refer to the flashing guide fo
 - [TS80 / TS80P](https://ralim.github.io/IronOS/Flashing/TS80%28P%29/)
 - [TS100](https://ralim.github.io/IronOS/Flashing/TS100)
 
+## Builds
+
+The links in the table below allow to download available builds directly:
+- current _Stable Release_ is **`v2.22`**;
+- _Development Build_ **dynamically** provides _**the latest successful build**_ from **`dev`** branch.
+
+|        Device         | Stable Release | Development Build |
+|:---------------------:|:--------------:|:-----------------:|
+| Pinecil  V1           | [Pinecil.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/Pinecil.zip)                           | [Pinecil.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/Pinecil.zip)                           |
+| Pinecil  V1/multilang | [Pinecil_multi-lang.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/Pinecil_multi-lang.zip)     | [Pinecil_multi-lang.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/Pinecil_multi-lang.zip)     |
+| Pinecil  V2           | [PinecilV2.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/PinecilV2.zip)                       | [PinecilV2.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/Pinecilv2.zip)                       |
+| Pinecil  V2/multilang | [PinecilV2_multi-lang.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/PinecilV2_multi-lang.zip) | [PinecilV2_multi-lang.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/Pinecilv2_multi-lang.zip) |
+| Miniware TS100        | [TS100.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/TS100.zip)                               | [TS100.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/TS100.zip)                               |
+| Miniware TS101        | [TS101.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/TS101.zip)                               | [TS101.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/TS101.zip)                               |
+| Miniware TS80         | [TS80.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/TS80.zip)                                 | [TS80.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/TS80.zip)                                 |
+| Miniware TS80P        | [TS80P.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/TS80P.zip)                               | [TS80P.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/TS80P.zip)                               |
+| Miniware MHP30        | [MHP30.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/MHP30.zip)                               | [MHP30.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/MHP30.zip)                               |
+| Sequre   S60          | [S60.zip](https://github.com/Ralim/IronOS/releases/download/v2.22/S60.zip)                                   | [S60.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/S60.zip)                                   |
+| Sequre   S60P         | Not Released                                                                                                 | [S60P.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/S60P.zip)                                 |
+| Sequre   T55          | Not Released                                                                                                 | [T55.zip](https://nightly.link/Ralim/IronOS/workflows/push/dev/T55.zip)                                   |
+
 ## Key Features
 
-- PID style iron temperature control
-- Automatic sleep with selectable sensitivity
-- Motion wake support
-- All settings exposed in the intuitive menu
-- (TS100) Set a voltage lower limit for Lithium batteries so you don't kill your battery pack
-- (TS80) Set 18 W or 24 W settings for your power bank
-- (TS80P) Automatically negotiates appropriate PD and falls back to QC mode like TS80
-- (Pinecil) Supports all 3 power modes (PD, QC, DC In).
-- (Pinecilv2) Supports USB-PD EPR for 28V operation.
-- 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)
-- (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](https://ralim.github.io/IronOS/Logo/)[^bootlogo]
-- Automatic LCD rotation based on the orientation
+- PID style iron temperature control;
+- automatic sleep with selectable sensitivity;
+- adjustable & tweakable motion wake support;
+- all settings exposed in the 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;
+- (_TS80P_) automatically negotiates appropriate PD and falls back to QC mode like _TS80_;
+- (_Pinecil_) supports all 3 power modes (PD, QC, DC In);
+- (_Pinecilv2_) supports _USB-PD EPR_ for **28V** operation;
+- improved readability Fonts, supporting multiple languages;
+- use hardware features to improve reliability;
+- boost mode lets you temporarily change the temperature when soldering (i.e. raise the temperature for short periods);
+- (_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](https://ralim.github.io/IronOS/Logo/)[^bootlogo];
+- automatic LCD rotation based on the orientation;
+- ... and many many other cool & hackable features![^changelog]
 
-
-[^bootlogo]: **BOOTUP LOGO NOTICE**:
+[^bootlogo]:
+    **BOOTUP LOGO NOTICE**:
     IronOS supports both a bootup logo _AND_ bootup animations.
     However, _**they are no longer included in this repo**_.
     **Please, [read the docs](https://ralim.github.io/IronOS/Logo/) for more information**.
 
-## Menu System
+[^changelog]:
+    [See the full changelog here](https://ralim.github.io/IronOS/History).
 
-This new firmware uses a new menu system to allow access to the settings on the device.
-When on the main screen and having the tip plugged in, the unit shows a pair of prompts for the two most common operations.
+## Basic Control
 
-- Pressing the button near the tip enters the _soldering mode_
-- Pressing the button near the USB end enters the _settings menu_
-- When not in _soldering mode_, holding down the button near the tip will enter _soldering temperature adjust mode_ (This is the same as the one in the _soldering mode_, but allows to adjust the temperature before heating up), in _soldering mode_ however this will activate _boost mode_ as long as you hold down the button.
-- Holding down the button near the USB end will show the _[debug menu](https://ralim.github.io/IronOS/DebugMenu/)._ In _soldering mode_ this ends the heating.
+Supported device is controlled by two buttons which can be pressed in the following ways:
+ - short: ~1 second or so;
+ - long: more than 1 second;
+ - both (press & hold both of them together).
 
-Operation details are over in the [Menu information.](https://ralim.github.io/IronOS/Menu/)
+Available buttons are:
+ - `+/A` button: near the front closer to the tip (for irons) or on the left side of the device (for plates);
+ - `-/B` button: near the back far from the tip (for irons) or on the right side of the device (for plates).
+
+After powering on the device for the first time with _IronOS_ installed and having the tip/plate plugged in, on the main menu in _standby mode_ the unit shows a pair of prompts for the two most common operations:
+- pressing the `+/A` button enters the _soldering mode_;
+- pressing the `-/B` button enters the _settings menu_;
+- in _soldering mode_:
+  - short press of `+/A` / `-/B` buttons changes the soldering temperature;
+  - long press of the `+/A` button enables _boost mode_ (increasing soldering temperature to the adjustable setting as long as the button is pressed);
+  - long press of the `-/B` button enters _standby mode_ and stops heating;
+- in _standby mode_:
+  - long press of the `+/A` button enters _soldering temperature adjust mode_ (the same as the one in the _soldering mode_, but allows to adjust the temperature before heating up);
+  - long hold of the `-/B` button enters the [_debug menu_](https://ralim.github.io/IronOS/DebugMenu/);
+- in _menu mode_ (to make it short here):
+  - `-/B` scrolls & cycles through menus and submenus;
+  - `+/A` enters to menu & submenu settings or changes their values if they are activated already.
+
+Additional details are described in the [menu information](https://ralim.github.io/IronOS/Menu/).
+
+## Remote Control
+
+### Pinecil V2 only
+
+Pinecil V2 has [_Bluetooth Low Energy_ module](https://ralim.github.io/IronOS/Bluetooth), which is supported by _IronOS_ since `2.21` release to control some of the settings using additional tools like [PineSAM](https://github.com/builder555/PineSAM) or [PineTool](https://github.com/lachlanbell/PineTool). In `2.21` and `2.22` releases the module was _on_ by default. However, **_Bluetooth_ is turned off in the settings by default in current `dev` builds and for the next releases** [due to security concerns](#1856).[^ble]
+
+To enable _Bluetooth_ back:
+- go to _Settings_ menu;
+- press `-/B` button four times to scroll the menu for `Advanced settings`;
+- press `+/A` button to open submenu;
+- press `+/A` button to toggle/enable _Bluetooth_ feature;
+- press `-/B` **and hold it** for just more than five seconds to exit from the _Settings_ menu.
+
+[^ble]:
+    This is related only to situations when a user restores default settings using menu, or when _IronOS_ update is taking place on a new device or on a device with a previous firmware version.
 
 ## Translations
 
 Is your preferred language missing localisation of some of the text?
-Translations are stored as `json` files in the Translations folder.
-PR's are loved and accepted to enhance the firmware.
+Translations are stored as `json` files in the `Translations` folder.
+_Pull requests_ are loved and accepted to enhance the firmware.
 
 ## Thanks
 
@@ -127,13 +187,13 @@ Especially to the following users, who have helped in various ways that are mass
 
 Plus the huge number of people who have contributed translations, your effort is massively appreciated.
 
-## Licence
+## License
 
-The code created by the community is GNU GPLv3. Unless noted elsewhere.
-Other components such as FreeRTOS/USB-PD have their own licence.
+The code created by the community is covered by the [GNU GPLv3](https://www.gnu.org/licenses/gpl-3.0.html#license-text) license **unless noted elsewhere**.
+Other components such as _FreeRTOS_ and _USB-PD_ have their own licenses.
 
 ## Commercial Use
 
-This software is provided as-is, so I cannot provide any commercial support for the firmware.
-However, you are more than welcome to distribute links to the firmware or provide irons with this software on them.
-Please do not re-host the files, but rather link to this page, so that there are no old versions of the firmware scattered around.
+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 hardware with this firmware.
+**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**.

Translations/make_translation.py

@@ -76,13 +76,13 @@ def filter_translation(lang: dict, defs: dict, macros: frozenset):
 
         return False
 
-    for category in ("menuOptions", "menuGroups"):
-        for index, record in enumerate(defs[category]):
+    for category in ("menuOptions", "menuGroups", "menuValues"):
+        for _, record in enumerate(defs[category]):
             if check_excluded(record):
                 lang[category][record["id"]]["displayText"] = ""
                 lang[category][record["id"]]["description"] = ""
 
-    for index, record in enumerate(defs["messagesWarn"]):
+    for _, record in enumerate(defs["messagesWarn"]):
         if check_excluded(record):
             lang["messagesWarn"][record["id"]]["message"] = ""
 
@@ -146,12 +146,13 @@ def get_constants() -> List[Tuple[str, str]]:
         ("SmallSymbolState", "State"),
         ("SmallSymbolNoVBus", "No VBus"),
         ("SmallSymbolVBus", "VBus"),
+        ("LargeSymbolSleep", "Zzz "),
     ]
 
 
 def get_debug_menu() -> List[str]:
     return [
-        datetime.today().strftime("%d-%m-%y"),
+        datetime.today().strftime("%Y%m%d %H%M%S"),
         "ID ",
         "ACC   ",
         "PWR   ",
@@ -202,9 +203,9 @@ def get_letter_counts(defs: dict, lang: dict, build_version: str) -> Dict:
     """From the source definitions, language file and build version; calculates the ranked symbol list
 
     Args:
-        defs (dict): _description_
-        lang (dict): _description_
-        build_version (str): _description_
+        defs (dict): Definitions
+        lang (dict): Language lookup
+        build_version (str): The build version id to ensure its letters are included
 
     Returns:
         Dict: _description_
@@ -248,6 +249,15 @@ def get_letter_counts(defs: dict, lang: dict, build_version: str) -> Dict:
         msg = obj[eid]["description"]
         big_font_messages.append(msg)
 
+    obj = lang["menuValues"]
+    for mod in defs["menuValues"]:
+        eid = mod["id"]
+        msg = obj[eid]["displayText"]
+        if test_is_small_font(msg):
+            small_font_messages.append(msg)
+        else:
+            big_font_messages.append(msg)
+
     obj = lang["menuGroups"]
     for mod in defs["menuGroups"]:
         eid = mod["id"]
@@ -1113,6 +1123,12 @@ def get_translation_strings_and_indices_text(
         encode_string_and_add(
             lang_data["displayText"], "menuOptions" + record["id"] + "displayText"
         )
+    for index, record in enumerate(defs["menuValues"]):
+        lang_data = lang["menuValues"][record["id"]]
+        # Add to translations the menu text and the description
+        encode_string_and_add(
+            lang_data["displayText"], "menuValues" + record["id"] + "displayText"
+        )
 
     for index, record in enumerate(defs["menuGroups"]):
         lang_data = lang["menuGroups"][record["id"]]
@@ -1200,6 +1216,21 @@ def get_translation_strings_and_indices_text(
             f"    .{record['id']} = {start_index}, // {escape(lang_data)}\n"
         )
 
+    for _, record in enumerate(defs["menuValues"]):
+        # Add to translations the menu text and the description
+        lang_data = lang["menuValues"][record["id"]]
+        key = "menuValues" + record["id"] + "displayText"
+        translated_index = translated_string_lookups[key]
+        string_index = translated_index.byte_encoded_translation_index
+        start_index = (
+            string_index_commulative_lengths[string_index]
+            + translated_index.str_start_offset
+        )
+
+        translation_indices_text += (
+            f"    .{record['id']} = {start_index}, // {escape(lang_data)}\n"
+        )
+
     translation_indices_text += "\n"
 
     # Now for the fun ones, where they are nested and ordered
@@ -1229,6 +1260,7 @@ def get_translation_strings_and_indices_text(
     translation_indices_text = write_grouped_indexes(
         translation_indices_text, "SettingsShortNames", "menuOptions", "displayText"
     )
+
     translation_indices_text = write_grouped_indexes(
         translation_indices_text,
         "SettingsMenuEntriesDescriptions",

Translations/translation_BE.json

@@ -31,7 +31,7 @@
       "message": "Некантралюемае\nразаграванне"
     },
     "WarningTipShorted": {
-            "message": "!Tip Shorted!"
+      "message": "!Кароткае замыканне на джале!"
     },
     "SettingsCalibrationWarning": {
       "message": "Пераканайцеся, што пры наступнай загрузцы наканечнік і ручка маюць пакаёвую тэмпературу!"
@@ -51,44 +51,35 @@
     "InputVoltageString": {
       "message": "Сілкаванне В: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Чаканне...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Джала: \n"
     },
-        "OffString": {
-            "message": "Выкл."
-        },
     "ProfilePreheatString": {
-            "message": "Preheat\n"
+      "message": "Разагрэць\n"
     },
     "ProfileCooldownString": {
-            "message": "Cooldown\n"
+      "message": "Астудзіць\n"
     },
     "DeviceFailedValidationWarning": {
       "message": "Ваша прылада, хутчэй за ўсё, падробка!"
     },
     "TooHotToStartProfileWarning": {
-            "message": "Too hot to\nstart profile"
+      "message": "Занадта горача\nкаб запусціць профіль"
     }
   },
   "characters": {
     "SettingRightChar": "П",
     "SettingLeftChar": "Л",
     "SettingAutoChar": "А",
-        "SettingOffChar": "O",
     "SettingSlowChar": "М",
     "SettingMediumChar": "С",
     "SettingFastChar": "Х",
-        "SettingStartNoneChar": "В",
     "SettingStartSolderingChar": "П",
     "SettingStartSleepChar": "Ч",
     "SettingStartSleepOffChar": "К",
-        "SettingLockDisableChar": "А",
     "SettingLockBoostChar": "Т",
     "SettingLockFullChar": "П"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "\nРэжым"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "Няма\nдынамікі"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Бяспечны\nрэжым"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Крыніца\nсілкавання",
@@ -131,8 +151,8 @@
       "displayText": "PD\nпрыпынак",
       "description": "Час чакання ўзгаднення PD з крокам 100 мс для сумяшчальнасці з некаторымі зараднымі зараднымі прыладамі QC (0: адключана)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "PD\nРэжым",
       "description": "Уключае рэжымы PPS & EPR."
     },
     "BoostTemperature": {
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Аўта\nстарт",
-            "description": "Рэжым, у якім запускаецца паяльнік пры падачы сілкавання (В=Выкл. | П=Пайка | Ч=Чаканне | К=Чаканне пры комн. тэмп.)"
+      "description": "Рэжым, у якім запускаецца паяльнік пры падачы сілкавання (П=Пайка | Ч=Чаканне | К=Чаканне пры комн. тэмп.)"
     },
     "TempChangeShortStep": {
       "displayText": "Крок тэмп.\nкар. нац.",
@@ -153,67 +173,67 @@
     },
     "LockingMode": {
       "displayText": "Дазволіць\nблок. кнопак",
-            "description": "Пры рабоце падоўжаны націск дзьвух кнопак блакуе іх (А=Адключана | Т=Толькі турба | П=Поўная блакіроўка)"
+      "description": "Пры рабоце падоўжаны націск дзьвух кнопак блакуе іх (Т=Толькі турба | П=Поўная блакіроўка)"
     },
     "ProfilePhases": {
-            "displayText": "Profile\nPhases",
-            "description": "Number of phases in profile mode"
+      "displayText": "Фазы\nпрофілю",
+      "description": "Колькасць фаз у рэжыме профілю"
     },
     "ProfilePreheatTemp": {
-            "displayText": "Preheat\nTemp",
-            "description": "Preheat to this temperature at the start of profile mode"
+      "displayText": "Тэмпература\nразагравання",
+      "description": "Разагрэйце да гэтай тэмпературы ў пачатку профільнага рэжыму"
     },
     "ProfilePreheatSpeed": {
-            "displayText": "Preheat\nSpeed",
-            "description": "Preheat at this rate (degrees per second)"
+      "displayText": "Хуткасть\nразагравання",
+      "description": "Разагрэйце з гэтай хуткасцю (градусы ў секунду)"
     },
     "ProfilePhase1Temp": {
-            "displayText": "Phase 1\nTemp",
-            "description": "Target temperature for the end of this phase"
+      "displayText": "Фаза 1\nтэмпература",
+      "description": "Мэтавая тэмпература ў канцы гэтай фазы"
     },
     "ProfilePhase1Duration": {
-            "displayText": "Phase 1\nDuration",
-            "description": "Target duration of this phase (seconds)"
+      "displayText": "Фаза 1\nпрацягласць",
+      "description": "Мэтавая працягласць гэтай фазы (секунды)"
     },
     "ProfilePhase2Temp": {
-            "displayText": "Phase 2\nTemp",
-            "description": ""
+      "displayText": "Фаза 2\nтэмпература",
+      "description": "Мэтавая тэмпература ў канцы гэтай фазы"
     },
     "ProfilePhase2Duration": {
-            "displayText": "Phase 2\nDuration",
-            "description": ""
+      "displayText": "Фаза 2\nпрацягласць",
+      "description": "Мэтавая працягласць гэтай фазы (секунды)"
     },
     "ProfilePhase3Temp": {
-            "displayText": "Phase 3\nTemp",
-            "description": ""
+      "displayText": "Фаза 3\nтэмпература",
+      "description": "Мэтавая тэмпература ў канцы гэтай фазы"
     },
     "ProfilePhase3Duration": {
-            "displayText": "Phase 3\nDuration",
-            "description": ""
+      "displayText": "Фаза 3\nпрацягласць",
+      "description": "Мэтавая працягласць гэтай фазы (секунды)"
     },
     "ProfilePhase4Temp": {
-            "displayText": "Phase 4\nTemp",
-            "description": ""
+      "displayText": "Фаза 4\nтэмпература",
+      "description": "Мэтавая тэмпература ў канцы гэтай фазы"
     },
     "ProfilePhase4Duration": {
-            "displayText": "Phase 4\nDuration",
-            "description": ""
+      "displayText": "Фаза 4\nпрацягласць",
+      "description": "Мэтавая працягласць гэтай фазы (секунды)"
     },
     "ProfilePhase5Temp": {
-            "displayText": "Phase 5\nTemp",
-            "description": ""
+      "displayText": "Фаза 5\nтэмпература",
+      "description": "Мэтавая тэмпература ў канцы гэтай фазы"
     },
     "ProfilePhase5Duration": {
-            "displayText": "Phase 5\nDuration",
-            "description": ""
+      "displayText": "Фаза 5\nпрацягласць",
+      "description": "Мэтавая працягласць гэтай фазы (секунды)"
     },
     "ProfileCooldownSpeed": {
-            "displayText": "Cooldown\nSpeed",
-            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "displayText": "Хуткасць\nастывання",
+      "description": "Астуджаць з гэтай хуткасцю ў канцы профільнага рэжыму (градусы ў секунду)"
     },
     "MotionSensitivity": {
       "displayText": "Адчувальнасць\nакселерометра",
-            "description": "Адчувальнасць акселерометра (0=Выкл. | 1=Мін. | ... | 9=Макс.)"
+      "description": "Адчувальнасць акселерометра (1=Мін. | ... | 9=Макс.)"
     },
     "SleepTemperature": {
       "displayText": "Тэмп.\nчакання",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Эфект Хола\nадчувальнасць",
-            "description": "Узровень адчувальнасці датчыка хола ў рэжыме сну (0=Выкл. | 1=Мін. | ... | 9=Макс.)"
+      "description": "Узровень адчувальнасці датчыка хола ў рэжыме сну (1=Мін. | ... | 9=Макс.)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Інтэрвал перад пачаткам \"рэжыму сну\", калі эфект Хола перавышае парог"
     },
     "TemperatureUnit": {
       "displayText": "Адзінкі\nтэмпературы",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Хуткасць\nанімацыі",
-            "description": "Хуткасць анімацыі гузікаў у галоўным меню (Мілісекунды) (А=Адключана | Н=Нізкая | С=Сярэдняя | В=Высокая)"
+      "description": "Хуткасць анімацыі гузікаў у галоўным меню (Мілісекунды) (Н=Нізкая | С=Сярэдняя | В=Высокая)"
     },
     "AnimLoop": {
       "displayText": "Зацыкленая\nанімацыя",
@@ -281,7 +305,7 @@
     },
     "BluetoothLE": {
       "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+      "description": "Уключыць BLE"
     },
     "PowerLimit": {
       "displayText": "Межы\nмагутнасці",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Мова:\n BY  Беларуская",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_BG.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Входно V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Хъррр"
-        },
     "SleepingAdvancedString": {
       "message": "Сън...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Човка:\n"
     },
-        "OffString": {
-            "message": "Изкл."
-        },
     "ProfilePreheatString": {
       "message": "Загряване\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "Д",
     "SettingLeftChar": "Л",
     "SettingAutoChar": "А",
-        "SettingOffChar": "И",
     "SettingSlowChar": "Н",
     "SettingMediumChar": "С",
     "SettingFastChar": "В",
-        "SettingStartNoneChar": "И",
     "SettingStartSolderingChar": "З",
     "SettingStartSleepChar": "С",
     "SettingStartSleepOffChar": "П",
-        "SettingLockDisableChar": "И",
     "SettingLockBoostChar": "Т",
     "SettingLockFullChar": "П"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Вкл.\nPPSиERP"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "Изкл.\n"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Вкл.без\nискане"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Гранично\nнапрежение",
@@ -131,9 +151,9 @@
       "displayText": "PD\nинтервал",
       "description": "PD интервал за договаряне на захранването на стъпки от 100 мс за съвместимост с някои QC захранвания (0=Изкл.)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Включи PPS & EPR"
+    "USBPDMode": {
+      "displayText": "PD\nрежим",
+      "description": "Вкл.без искане: включи PPS и EPR без да искате повече мощност"
     },
     "BoostTemperature": {
       "displayText": "Турбо\nтемп.",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Автоматичен\nработен режим",
-            "description": "Режим на поялника при включване на захранването (И=Изкл. | З=Запояване | С=Сън | П=Покой на стайна температурата)"
+      "description": "Режим на поялника при включване на захранването (З=Запояване | С=Сън | П=Покой на стайна температурата)"
     },
     "TempChangeShortStep": {
       "displayText": "Промяна T\nбързо",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Бутони за\nзаключване",
-            "description": "Докато запоявате, задръжте двата бутона, за да превключите заключването им (И=Изкл. | Т=Турбо режим | П=Пълно)"
+      "description": "Докато запоявате, задръжте двата бутона, за да превключите заключването им (Т=Турбо режим | П=Пълно)"
     },
     "ProfilePhases": {
       "displayText": "Брой\nетапи",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Чувствител.\nна движение",
-            "description": "Чувствителност на движение на акселерометър (0=Изкл. | 1=Слабо | ... | 9=Силно)"
+      "description": "Чувствителност на движение на акселерометър (1=Слабо | ... | 9=Силно)"
     },
     "SleepTemperature": {
       "displayText": "Темп.\nсън",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Датчик\nна Хол",
-            "description": "Чувствителност на сензора към магнитно поле (0=Изкл. | 1=Слабо | ... | 9=Силно)"
+      "description": "Чувствителност на сензора към магнитно поле (1=Слабо | ... | 9=Силно)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Интервалът преди началото на \"режим на заспиване\", когато ефектът на Хол надвиши прага"
     },
     "TemperatureUnit": {
       "displayText": "Единици за\nтемпературата",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Скорост на\nанимацията",
-            "description": "Скорост на анимация на иконата в главното меню (И=Изкл. | Н=Ниска | C=Средна | B=Висока)"
+      "description": "Скорост на анимация на иконата в главното меню (Н=Ниска | C=Средна | B=Висока)"
     },
     "AnimLoop": {
       "displayText": "Анимац.\nцикъл",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Език:\n BG   Български",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_CS.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Napětí: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
     "SleepingAdvancedString": {
       "message": "Režim spánku...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Hrot: \n"
     },
-        "OffString": {
-            "message": "Vyp"
-        },
     "ProfilePreheatString": {
       "message": "Předehřívání\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "P",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "D",
     "SettingSlowChar": "P",
     "SettingMediumChar": "S",
     "SettingFastChar": "R",
-        "SettingStartNoneChar": "V",
     "SettingStartSolderingChar": "P",
     "SettingStartSleepChar": "S",
     "SettingStartSleepOffChar": "M",
-        "SettingLockDisableChar": "Z",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "U"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Zdroj\nnapájení",
@@ -131,8 +151,8 @@
       "displayText": "PD\ntimeout",
       "description": "Maximální prodleva při jednání PD ve 100ms krocích pro kompatibilitu s některými QC nabíječkami"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "PD\nMode",
       "description": "Povoluje režimy PPS & EPR"
     },
     "BoostTemperature": {
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Chování\npři startu",
-            "description": "V=vypnuto | P=pájecí teplota | S=spánková teplota | M=zahřát hrot po pohybu"
+      "description": "P=pájecí teplota | S=spánková teplota | M=zahřát hrot po pohybu"
     },
     "TempChangeShortStep": {
       "displayText": "Krok teploty\nkrátký?",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Povolit zamč.\ntlačítek",
-            "description": "Při pájení podržte obě tlačítka pro jejich zamčení (Z=zakázáno | B=pouze v režimu boost | U=úplné zamčení)"
+      "description": "Při pájení podržte obě tlačítka pro jejich zamčení (B=pouze v režimu boost | U=úplné zamčení)"
     },
     "ProfilePhases": {
       "displayText": "Profilové\nFáze",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Citlivost\nna pohyb",
-            "description": "0=vyp | 1=nejméně citlivé | ... | 9=nejvíce citlivé"
+      "description": "1=nejméně citlivé | ... | 9=nejvíce citlivé"
     },
     "SleepTemperature": {
       "displayText": "Teplota\nve spánku",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Citlivost\nHall. čidla",
-            "description": "Citlivost Hallova čidla pro detekci spánku (0=vypnuto | 1=nejméně citlivé | ... | 9=nejvíce citlivé)"
+      "description": "Citlivost Hallova čidla pro detekci spánku (1=nejméně citlivé | ... | 9=nejvíce citlivé)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval před začátkem \"režimu spánku\", kdy Hallův efekt překročí práh"
     },
     "TemperatureUnit": {
       "displayText": "Jednotka\nteploty",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.\nrychlost",
-            "description": "Tempo animace ikon v menu (O=vypnuto | P=pomalu | S=středně | R=rychle)"
+      "description": "Tempo animace ikon v menu (P=pomalu | S=středně | R=rychle)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nsmyčka",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Jazyk:\n CS       Český",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_DA.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Input V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Dvale...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Tip: \n"
     },
-        "OffString": {
-            "message": "Off"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "H",
     "SettingLeftChar": "V",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
     "SettingFastChar": "F",
-        "SettingStartNoneChar": "S",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "D",
     "SettingStartSleepOffChar": "R",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Strøm\nKilde",
@@ -131,9 +151,9 @@
       "displayText": "PD\ntimeout",
       "description": "PD-forhandlingstimeout i trin på 100 ms for kompatibilitet med nogle QC-opladere"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Boost\ntemp",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Start-up\nOpførsel",
-            "description": "Start automatisk med lodning når strøm sættes til. (S=Slukket | L=Lodning | D=Dvale tilstand | R=Dvale tilstand rumtemperatur)"
+      "description": "Start automatisk med lodning når strøm sættes til. (L=Lodning | D=Dvale tilstand | R=Dvale tilstand rumtemperatur)"
     },
     "TempChangeShortStep": {
       "displayText": "Temp ændring\nkort",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Tillad låsning\naf knapperne",
-            "description": "Hold begge knapper nede under lodning for at låse dem (D=deaktiver | B=kun boost-tilstand | F=fuld låsning)"
+      "description": "Hold begge knapper nede under lodning for at låse dem (B=kun boost-tilstand | F=fuld låsning)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Bevægelses\nfølsomhed",
-            "description": "Bevægelsesfølsomhed (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)"
+      "description": "Bevægelsesfølsomhed (1=Mindst følsom | ... | 9=Mest følsom)"
     },
     "SleepTemperature": {
       "displayText": "Dvale\ntemp",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Hall sensor\nfølsomhed",
-            "description": "følsomhed overfor magneten (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)"
+      "description": "følsomhed overfor magneten (1=Mindst følsom | ... | 9=Mest følsom)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Intervallet før starten af \"dvaletilstand\", når Hall-effekten overskrider tærsklen"
     },
     "TemperatureUnit": {
       "displayText": "Temperatur\nEnhed",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.\nHastighed",
-            "description": "Hastigheden for ikonanimationer i menuen (O=fra | S=langsomt | M=medium | F=hurtigt)"
+      "description": "Hastigheden for ikonanimationer i menuen (S=langsomt | M=medium | F=hurtigt)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nsløfe",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Sprog:\n DA       Dansk",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_DE.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "V Eingang: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Ruhemodus...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Temp: \n"
     },
-        "OffString": {
-            "message": "aus"
-        },
     "ProfilePreheatString": {
       "message": "Vorwärmen\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "A",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
     "SettingFastChar": "S",
-        "SettingStartNoneChar": "A",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "R",
     "SettingStartSleepOffChar": "K",
-        "SettingLockDisableChar": "A",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "V"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Spannungs-\nquelle",
@@ -131,8 +151,8 @@
       "displayText": "PD\ntimeout",
       "description": "PD Abfragedauer in 100ms Schritten (Kompatibilität mit best. QC-Ladegeräten)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "PD\nMode",
       "description": "Aktiviert PPS & EPR"
     },
     "BoostTemperature": {
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Start im\nLötmodus",
-            "description": "Heizverhalten beim Einschalten der Spannungsversorgung (A=aus | L=Lötmodus | R=Ruhemodus | K=Ruhemodus mit kalter Spitze)"
+      "description": "Heizverhalten beim Einschalten der Spannungsversorgung (L=Lötmodus | R=Ruhemodus | K=Ruhemodus mit kalter Spitze)"
     },
     "TempChangeShortStep": {
       "displayText": "Temp-Schritt\nDruck kurz",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Tasten-\nsperre",
-            "description": "Langes Drücken beider Tasten im Lötmodus sperrt diese (A=aus | B=nur Boost | V=vollständig)"
+      "description": "Langes Drücken beider Tasten im Lötmodus sperrt diese (B=nur Boost | V=vollständig)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhasen",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Bewegungs-\nempfindlichk.",
-            "description": "0=aus | 1=minimal | ... | 9=maximal"
+      "description": "1=minimal | ... | 9=maximal"
     },
     "SleepTemperature": {
       "displayText": "Ruhe-\ntemperatur",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Empfindlichkeit\nder Hall-Sonde",
-            "description": "Empfindlichkeit der Hall-Sonde um den Ruhemodus auszulösen (0=aus | 1=minimal | ... | 9=maximal)"
+      "description": "Empfindlichkeit der Hall-Sonde um den Ruhemodus auszulösen (1=minimal | ... | 9=maximal)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Dauer vor dem Wechsel in den \"Ruhemodus\", nachdem die Hall-Sonde auslöst"
     },
     "TemperatureUnit": {
       "displayText": "Temperatur-\neinheit",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.\nGeschw.",
-            "description": "Geschwindigkeit der Icon-Animationen im Menü (A=aus | L=langsam | M=mittel | S=schnell)"
+      "description": "Geschwindigkeit der Icon-Animationen im Menü (L=langsam | M=mittel | S=schnell)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nSchleife",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Sprache:\n DE     Deutsch",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Löt-\nspitzentyp",
+      "description": "Wählen Sie den Typ der eingesetzten Spitze"
     }
   }
 }

Translations/translation_EL.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Είσοδος V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Υπνος...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Μύτη: \n"
     },
-        "OffString": {
-            "message": "Απ."
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "Α",
-        "SettingOffChar": "0",
     "SettingSlowChar": "Α",
     "SettingMediumChar": "Μ",
     "SettingFastChar": "Γ",
-        "SettingStartNoneChar": "0",
     "SettingStartSolderingChar": "Κ",
     "SettingStartSleepChar": "Ζ",
     "SettingStartSleepOffChar": "Υ",
-        "SettingLockDisableChar": "Α",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "Π"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Πηγή\nενέργειας",
@@ -131,8 +151,8 @@
       "displayText": "χρονικό όριο\nPD",
       "description": "Χρονικό όριο διαπραγμάτευσης PD σε βήματα 100ms για συμβατότητα με κάποιους φορτιστές QC"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "PD\nMode",
       "description": "Ενεργοποιεί λειτουργίες PPS & EPR."
     },
     "BoostTemperature": {
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Ζέσταμα\nκατά την εν.",
-            "description": "0=off | Κ=θερμ. κόλλησης | Z=αναμονή σε θερμοκρασία ύπνου μέχρι την κίνηση | Υ=αναμονή χωρίς ζέσταμα μέχρι την κίνηση"
+      "description": "Κ=θερμ. κόλλησης | Z=αναμονή σε θερμοκρασία ύπνου μέχρι την κίνηση | Υ=αναμονή χωρίς ζέσταμα μέχρι την κίνηση"
     },
     "TempChangeShortStep": {
       "displayText": "Αλλαγή θερμοκ.\nστιγμιαίο",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Κλείδωμα\nπλήκτρων",
-            "description": "Κατά την κόλληση, κρατήστε και τα δύο πλήκτρα για κλείδωμα (A=απενεργοποίηση | B=μόνο λειτ. boost | Π=πλήρες κλείδωμα)"
+      "description": "Κατά την κόλληση, κρατήστε και τα δύο πλήκτρα για κλείδωμα (B=μόνο λειτ. boost | Π=πλήρες κλείδωμα)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Ευαισθησία\nκίνησης",
-            "description": "0=off | 1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο"
+      "description": "1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο"
     },
     "SleepTemperature": {
       "displayText": "Θερμοκρ.\nύπνου",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Ευαισθ. αισθ. \nφαιν. Hall",
-            "description": "Ευαισθησία του αισθητήρα φαινομένου Hall για εντοπισμό αδράνειας (0=off | 1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο)"
+      "description": "Ευαισθησία του αισθητήρα φαινομένου Hall για εντοπισμό αδράνειας (1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Το διάστημα πριν από την \"λειτουργία ύπνου\" ξεκινά όταν το εφέ αίθουσας είναι πάνω από το όριο"
     },
     "TemperatureUnit": {
       "displayText": "Μονάδες\nθερμοκρασίας",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Ταχύτητα\nκιν. εικονιδ.",
-            "description": "Ρυθμός κίνησης εικονιδίων στο μενού (0=off | Α=αργός | Μ=μέτριος | Γ=γρήγορος)"
+      "description": "Ρυθμός κίνησης εικονιδίων στο μενού (Α=αργός | Μ=μέτριος | Γ=γρήγορος)"
     },
     "AnimLoop": {
       "displayText": "Επανάληψη\nκιν. εικονιδ.",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Γλώσσα:\n EL    Ελληνικά",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_EN.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Input V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Sleeping...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Tip: \n"
     },
-        "OffString": {
-            "message": "Off"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
     "SettingFastChar": "F",
-        "SettingStartNoneChar": "O",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "Z",
     "SettingStartSleepOffChar": "R",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
@@ -114,10 +105,39 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Power\nsource",
-            "description": "Set cutoff voltage to prevent battery overdrainage (DC 10V) (S=3.3V per cell, disable PWR limit)"
+      "description": "Set cutoff voltage to prevent battery overdischarge (DC=10V) (S=3.3V per cell, disable PWR limit)"
     },
     "MinVolCell": {
       "displayText": "Minimum\nvoltage",
@@ -131,9 +151,9 @@
       "displayText": "PD\ntimeout",
       "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Boost\ntemp",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Start-up\nbehavior",
-            "description": "O=off | S=heat to soldering temp | Z=standby at sleep temp until moved | R=standby without heating until moved"
+      "description": "S=heat to soldering temp | Z=standby at sleep temp until moved | R=standby without heating until moved"
     },
     "TempChangeShortStep": {
       "displayText": "Temp change\nshort",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Allow locking\nbuttons",
-            "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+      "description": "While soldering, hold down both buttons to toggle locking them (B=boost mode only | F=full locking)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Motion\nsensitivity",
-            "description": "0=off | 1=least sensitive | ... | 9=most sensitive"
+      "description": "1=least sensitive | ... | 9=most sensitive"
     },
     "SleepTemperature": {
       "displayText": "Sleep\ntemp",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Hall sensor\nsensitivity",
-            "description": "Sensitivity to magnets (0=off | 1=least sensitive | ... | 9=most sensitive)"
+      "description": "Sensitivity to magnets (1=least sensitive | ... | 9=most sensitive)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
     },
     "TemperatureUnit": {
       "displayText": "Temperature\nunit",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",
-            "description": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
+      "description": "Pace of icon animations in menu (S=slow | M=medium | F=fast)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nloop",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Language:\n EN     English",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_ES.json

@@ -31,7 +31,7 @@
       "message": "Térmico\nFuera de control"
     },
     "WarningTipShorted": {
-            "message": "!Tip Shorted!"
+      "message": "¡Punta en Corto!"
     },
     "SettingsCalibrationWarning": {
       "message": "¡Antes de reiniciar, asegúrese de que la punta y el mango estén a temperatura ambiente!"
@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Voltaje: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Reposo"
-        },
     "SleepingAdvancedString": {
       "message": "En reposo...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Punta: \n"
     },
-        "OffString": {
-            "message": "Apagado"
-        },
     "ProfilePreheatString": {
       "message": "Precalentado\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "D",
     "SettingLeftChar": "I",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
     "SettingFastChar": "R",
-        "SettingStartNoneChar": "N",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "R",
     "SettingStartSleepOffChar": "F",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Modo por\nDefecto"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "Dinámico\nNo"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Modo\nSeguro"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Fuente\nde energía",
@@ -130,10 +150,9 @@
     "PDNegTimeout": {
       "displayText": "PD\ntiempo de espera",
       "description": "Timeout de negociación de PD en pasos de 100ms para compatibilidad con algunos cargadores QC (0: apagado)"
-            
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "PD\nMode",
       "description": "Permite modos PPS & EPR"
     },
     "BoostTemperature": {
@@ -142,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Calentar\nal enchufar",
-            "description": "Calentado automático al iniciar (N=no | S=entrar en modo soldar | R=solo entrar en reposo | F=en reposo pero mantiene la punta fría)"
+      "description": "Calentado automático al iniciar (S=entrar en modo soldar | R=solo entrar en reposo | F=en reposo pero mantiene la punta fría)"
     },
     "TempChangeShortStep": {
       "displayText": "Cambio temp.\npuls. cortas",
@@ -154,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Permitir botones\nbloqueo",
-            "description": "Mientras suelda, mantenga pulsados ambos botones para alternar su bloqueo (D=desactivar | B=sólo modo boost | F=bloqueo total)"
+      "description": "Mientras suelda, mantenga pulsados ambos botones para alternar su bloqueo (B=sólo modo boost | F=bloqueo total)"
     },
     "ProfilePhases": {
       "displayText": "Fases de\nPerfil",
@@ -214,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Detección de\nmovimiento",
-            "description": "Tiempo de reacción al agarrar (0=no | 1=menos sensible | ... | 9=más sensible)"
+      "description": "Tiempo de reacción al agarrar (1=menos sensible | ... | 9=más sensible)"
     },
     "SleepTemperature": {
       "displayText": "Temperatura\nen reposo",
@@ -230,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Hall Eff\nSensibilidad",
-            "description": "Sensibilidad del sensor de efecto Hall en la detección de reposo (0=no | 1=menos sensible | ... | 9=más sensible)"
+      "description": "Sensibilidad del sensor de efecto Hall en la detección de reposo (1=menos sensible | ... | 9=más sensible)"
+    },
+    "HallEffSleepTimeout": {                                           
+      "displayText": "Tiempo reposo\nSensor Hall", 
+      "description": "Intervalo antes de que \"sleep mode\" empiece cuando sensorhall supera límite"
     },
     "TemperatureUnit": {
       "displayText": "Unidad de\ntemperatura",
@@ -254,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.\nvelocidad",
-            "description": "Velocidad de animaciones de iconos en el menú (O=apagado | L=baja | M=media | R=alta)"
+      "description": "Velocidad de animaciones de iconos en el menú (L=baja | M=media | R=alta)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nbucle",
@@ -315,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Idioma:\n ES  Castellano",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_ET.json

@@ -0,0 +1,347 @@
+{
+  "languageCode": "ET",
+  "languageLocalName": "Eesti",
+  "tempUnitFahrenheit": false,
+  "messagesWarn": {
+    "CalibrationDone": {
+      "message": "Kalibreerimine\ntehtud!"
+    },
+    "ResetOKMessage": {
+      "message": "Vaikesätted\ntaastatud"
+    },
+    "SettingsResetMessage": {
+      "message": "Osad seadistused\non muutunud!"
+    },
+    "NoAccelerometerMessage": {
+      "message": "Kiirendusandurit\nei tuvastatud!"
+    },
+    "NoPowerDeliveryMessage": {
+      "message": "USB-PD IC\nei tuvastatud!"
+    },
+    "LockingKeysString": {
+      "message": "LUKUS"
+    },
+    "UnlockingKeysString": {
+      "message": "AVATUD"
+    },
+    "WarningKeysLockedString": {
+      "message": "!LUKUS!"
+    },
+    "WarningThermalRunaway": {
+      "message": "Termiline\närajooks"
+    },
+    "WarningTipShorted": {
+      "message": "!Otsik lühises!"
+    },
+    "SettingsCalibrationWarning": {
+      "message": "Enne taaskäivitamist veenduge, et otsik ja käepide on toatemperatuuril!"
+    },
+    "CJCCalibrating": {
+      "message": "kalibreerimine\n"
+    },
+    "SettingsResetWarning": {
+      "message": "Kas olete kindel, et soovite taastada vaikesätted?"
+    },
+    "UVLOWarningString": {
+      "message": "DC MADAL"
+    },
+    "UndervoltageString": {
+      "message": "Alapinge\n"
+    },
+    "InputVoltageString": {
+      "message": "Sisend V: \n"
+    },
+    "SleepingAdvancedString": {
+      "message": "Unerežiim...\n"
+    },
+    "SleepingTipAdvancedString": {
+      "message": "Otsik: \n"
+    },
+    "ProfilePreheatString": {
+      "message": "Eelkuumutus\n"
+    },
+    "ProfileCooldownString": {
+      "message": "Jahtumine\n"
+    },
+    "DeviceFailedValidationWarning": {
+      "message": "Teie seade on tõenäoliselt võltsing!"
+    },
+    "TooHotToStartProfileWarning": {
+      "message": "Liiga kuum,\net alustada profiili"
+    }
+  },
+  "characters": {
+    "SettingRightChar": "P",
+    "SettingLeftChar": "V",
+    "SettingAutoChar": "A",
+    "SettingSlowChar": "A",
+    "SettingMediumChar": "K",
+    "SettingFastChar": "T",
+    "SettingStartSolderingChar": "J",
+    "SettingStartSleepChar": "Z",
+    "SettingStartSleepOffChar": "P",
+    "SettingLockBoostChar": "B",
+    "SettingLockFullChar": "T"
+  },
+  "menuGroups": {
+    "PowerMenu": {
+      "displayText": "Toiteseaded\n",
+      "description": ""
+    },
+    "SolderingMenu": {
+      "displayText": "Jootmise\nseaded",
+      "description": ""
+    },
+    "PowerSavingMenu": {
+      "displayText": "Unerežiimi\nseaded",
+      "description": ""
+    },
+    "UIMenu": {
+      "displayText": "Kasutaja-\nliides",
+      "description": ""
+    },
+    "AdvancedMenu": {
+      "displayText": "Täpsemad\nseaded",
+      "description": ""
+    }
+  },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
+  "menuOptions": {
+    "DCInCutoff": {
+      "displayText": "Toiteallikas\nDC",
+      "description": "Määrab katkestuspinge, et vältida aku liigset tühjenemist. (DC 10V) (S=3,3V elemendi kohta, eemaldab voolupiirangud)"
+    },
+    "MinVolCell": {
+      "displayText": "Minimaalne\npinge",
+      "description": "Minimaalne lubatud pinge akuelemendi kohta (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+    },
+    "QCMaxVoltage": {
+      "displayText": "QC\npinge",
+      "description": "Maks. QC pinge, mida jootekolb läbirääkima peaks"
+    },
+    "PDNegTimeout": {
+      "displayText": "PD\naegumine",
+      "description": "PD läbirääkimise aegumine 100ms sammudena, et tagada ühilduvus osade QC laadijatega"
+    },
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "Võimaldab PPS- ja EPR-režiimi"
+    },
+    "BoostTemperature": {
+      "displayText": "Boost\ntemp",
+      "description": "Kolviotsiku temperatuur \"boost režiimis\""
+    },
+    "AutoStart": {
+      "displayText": "Käitumine\nkäivitusel",
+      "description": "J=kuumuta jootmistemperatuurini | Z=unerežiim, kuni seadet liigutatakse | P=unerežiim toatemperatuuril, kuni seadet liigutatakse"
+    },
+    "TempChangeShortStep": {
+      "displayText": "Temp. muut\nlühike",
+      "description": "Temperatuuri muutmine lühikese vajutusega"
+    },
+    "TempChangeLongStep": {
+      "displayText": "Temp. muut\npikk",
+      "description": "Temperatuuri muutmine pika vajutusega"
+    },
+    "LockingMode": {
+      "displayText": "Luba nuppude\nlukustamine",
+      "description": "Hoidke jootmise ajal mõlemad nupud all, et lülitada nende lukustamist (B=ainult boostrežiimis | T=täielik lukustamine)."
+    },
+    "ProfilePhases": {
+      "displayText": "Profiil\nfaasid",
+      "description": "Faaside arv profiilirežiimis"
+    },
+    "ProfilePreheatTemp": {
+      "displayText": "Eelkuumutus\ntemp.",
+      "description": "Eelkuumuta sellele temperatuurile profiilirežiimi alguses"
+    },
+    "ProfilePreheatSpeed": {
+      "displayText": "Eelkuumutus\nkiirus",
+      "description": "Eelkuumuta sellise kiirusega (kraadi sekundis)."
+    },
+    "ProfilePhase1Temp": {
+      "displayText": "Faas 1\ntemp.",
+      "description": "Selle faasi lõpu sihttemperatuur"
+    },
+    "ProfilePhase1Duration": {
+      "displayText": "Faas 1\nkestus",
+      "description": "Selle faasi sihtkestus (sekundites)"
+    },
+    "ProfilePhase2Temp": {
+      "displayText": "Faas 2\ntemp.",
+      "description": ""
+    },
+    "ProfilePhase2Duration": {
+      "displayText": "Faas 2\nkestus",
+      "description": ""
+    },
+    "ProfilePhase3Temp": {
+      "displayText": "Faas 3\ntemp.",
+      "description": ""
+    },
+    "ProfilePhase3Duration": {
+      "displayText": "Faas 3\nkestus",
+      "description": ""
+    },
+    "ProfilePhase4Temp": {
+      "displayText": "Faas 4\ntemp.",
+      "description": ""
+    },
+    "ProfilePhase4Duration": {
+      "displayText": "Faas 4\nkestus",
+      "description": ""
+    },
+    "ProfilePhase5Temp": {
+      "displayText": "Faas 5\ntemp.",
+      "description": ""
+    },
+    "ProfilePhase5Duration": {
+      "displayText": "Faas 5\nkestus",
+      "description": ""
+    },
+    "ProfileCooldownSpeed": {
+      "displayText": "Jahtumise\nkiirus",
+      "description": "Jahtumine selle kiirusega profiilirežiimi lõpus (kraadi sekundis)"
+    },
+    "MotionSensitivity": {
+      "displayText": "Liikumise\ntundlikkus",
+      "description": "1=vähetundlikuim | ... | 9=kõige tundlikum"
+    },
+    "SleepTemperature": {
+      "displayText": "Unerežiimi\ntemp",
+      "description": "Kolviotsiku temperatuur \"unerežiimis\""
+    },
+    "SleepTimeout": {
+      "displayText": "Unerežiimi\nviide",
+      "description": "Aeg enne \"unerežiimi\" algust (s=sekundid | m=minutid)"
+    },
+    "ShutdownTimeout": {
+      "displayText": "Seiskumise\nviide",
+      "description": "Aeg enne jootekolvi välja lülitamist (m=minutid)"
+    },
+    "HallEffSensitivity": {
+      "displayText": "Halli anduri\ntundlikkus",
+      "description": "Tundlikkus magnetite suhtes (1=vähetundlikum | ... | 9=kõige tundlikum)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Intervall enne \"unerežiimi\" käivitub, kui saaliefekt on üle läve"
+    },
+    "TemperatureUnit": {
+      "displayText": "Temperatuuri\nühik",
+      "description": "C=°Celsius | F=°Fahrenheit"
+    },
+    "DisplayRotation": {
+      "displayText": "Ekraani\norienteeritus",
+      "description": "P=paremakäeline | V=vasakukäeline | A=automaatne"
+    },
+    "CooldownBlink": {
+      "displayText": "Jahtumisel\nvilkumine",
+      "description": "Vilguta otsiku temperatuuri, kui see jahtub ja on veel ohtlikult kuum"
+    },
+    "ScrollingSpeed": {
+      "displayText": "Kerimise\nkiirus",
+      "description": "Infoteksti kerimise kiirus (A = aeglane | K = kiire)"
+    },
+    "ReverseButtonTempChange": {
+      "displayText": "Vaheta\n+ - nupud",
+      "description": "Temperatuurinuppude asukohtade vahetus"
+    },
+    "AnimSpeed": {
+      "displayText": "Anim.\nkiirus",
+      "description": "Menüüikoonide animatsiooni kiirus (A=aeglane | K=keskmine | T=tempokas)"
+    },
+    "AnimLoop": {
+      "displayText": "Pidevad\nanim.",
+      "description": "Esitage menüüs pidevalt animatsioone"
+    },
+    "Brightness": {
+      "displayText": "Ekraani\nheledus",
+      "description": "Seadista OLED ekraani heledust"
+    },
+    "ColourInversion": {
+      "displayText": "Ekraani\ninverteerimine",
+      "description": "Inverteeri OLED ekraani värvid"
+    },
+    "LOGOTime": {
+      "displayText": "Alguslogo\nkestus",
+      "description": "Aeg, mille jooksul näidatakse logo peale kolvi käivitamist (s=sekundites)"
+    },
+    "AdvancedIdle": {
+      "displayText": "Andmed\npuhkeolekus",
+      "description": "Näita unerežiimis üksikasjalikumat teavet väiksemas kirjas"
+    },
+    "AdvancedSoldering": {
+      "displayText": "Andmed\njootmisel",
+      "description": "Näita jootmisel üksikasjalikumat teavet väiksemas kirjas"
+    },
+    "BluetoothLE": {
+      "displayText": "Bluetooth\n",
+      "description": "Luba BLE"
+    },
+    "PowerLimit": {
+      "displayText": "Võimsus-\npiirang",
+      "description": "Suurim lubatud võimsus mida kolb võib kasutada (W=vatti)"
+    },
+    "CalibrateCJC": {
+      "displayText": "Kalibr. CJC\ntuleval käivit.",
+      "description": "Kalibreeri külmaühenduse kompensatsioon (CJC) järgmisel käivitamisel (ei ole vajalik, kui Delta T on < 5°C)"
+    },
+    "VoltageCalibration": {
+      "displayText": "Kalibreeri\nsisendpinge",
+      "description": "Sisendpinge (VIN) kalibreerimine (väljumiseks vajutage pikalt)"
+    },
+    "PowerPulsePower": {
+      "displayText": "Impulsi\ntugevus",
+      "description": "Ärkvelolekuimpulsi tugevus (vattides). Vajalik, vältimaks akupanga uinumist."
+    },
+    "PowerPulseWait": {
+      "displayText": "Impulsi\nviivitus",
+      "description": "Viivitus enne ärkvelolekuimpulsi käivitumist (x 2,5s)"
+    },
+    "PowerPulseDuration": {
+      "displayText": "Impulsi\nkestus",
+      "description": "Ärkvelolekuimpulsi kestus (x 250ms)"
+    },
+    "SettingsReset": {
+      "displayText": "Taasta\nvaikesätted",
+      "description": "Nulli kõik seadistused vaikesätetele"
+    },
+    "LanguageSwitch": {
+      "displayText": "Keel:\n ET     Eesti",
+      "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
+    }
+  }
+}

Translations/translation_FI.json

@@ -4,13 +4,13 @@
   "tempUnitFahrenheit": false,
   "messagesWarn": {
     "CalibrationDone": {
-            "message": "Calibration\ndone!"
+      "message": "Kalibrointi\nvalmis!"
     },
     "ResetOKMessage": {
-            "message": "Palautus"
+      "message": "Tehdasasetukset\npalautettu!"
     },
     "SettingsResetMessage": {
-            "message": "Asetukset\npalautettu!"
+      "message": "Tehdasasetukset\npalautettu!"
     },
     "NoAccelerometerMessage": {
       "message": "Kiihtyvyysanturi\npuuttuu!"
@@ -19,76 +19,67 @@
       "message": "USB-PD IC\npuuttuu!"
     },
     "LockingKeysString": {
-            "message": " LUKITTU"
+      "message": "Näppäinlukko\nkäytössä."
     },
     "UnlockingKeysString": {
-            "message": "AUKI"
+      "message": "Näppäimet\nkäytössä."
     },
     "WarningKeysLockedString": {
-            "message": "!LUKKO!"
+      "message": "!Näppäimet\nlukittu!"
     },
     "WarningThermalRunaway": {
-            "message": "Thermal\nRunaway"
+      "message": "!Lämmönsäätelyn\nhäiriö!"
     },
     "WarningTipShorted": {
-            "message": "!Tip Shorted!"
+      "message": "!Kärki\noikosulussa!"
     },
     "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+      "message": "Varmista laitteen ja kärjen huoneenlämpöisyys ennen uudelleenkäynnistystä!"
     },
     "CJCCalibrating": {
-            "message": "calibrating\n"
+      "message": "Kalibroidaan\n"
     },
     "SettingsResetWarning": {
       "message": "Haluatko varmasti palauttaa oletusarvot?"
     },
     "UVLOWarningString": {
-            "message": "DC ALH."
+      "message": "DC jännite alhainen."
     },
     "UndervoltageString": {
-            "message": "Alijännite\n"
+      "message": "Alijännite.\n"
     },
     "InputVoltageString": {
       "message": "Jännite: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Lepotila...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Kärki: \n"
     },
-        "OffString": {
-            "message": "Off"
-        },
     "ProfilePreheatString": {
-            "message": "Preheat\n"
+      "message": "Esilämmitetään\n"
     },
     "ProfileCooldownString": {
-            "message": "Cooldown\n"
+      "message": "Jäähtyy\n"
     },
     "DeviceFailedValidationWarning": {
-            "message": "Your device is most likely a counterfeit!"
+      "message": "Laite saattaa olla väärennös!"
     },
     "TooHotToStartProfileWarning": {
-            "message": "Too hot to\nstart profile"
+      "message": "Lämpötila liian korkea\nprofiilin aloitukseen!"
     }
   },
   "characters": {
     "SettingRightChar": "O",
     "SettingLeftChar": "V",
     "SettingAutoChar": "A",
-        "SettingOffChar": "P",
     "SettingSlowChar": "A",
     "SettingMediumChar": "M",
     "SettingFastChar": "S",
-        "SettingStartNoneChar": "E",
     "SettingStartSolderingChar": "J",
     "SettingStartSleepChar": "L",
     "SettingStartSleepOffChar": "H",
-        "SettingLockDisableChar": "P",
     "SettingLockBoostChar": "V",
     "SettingLockFullChar": "K"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "USB-PD\noletus-t"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "USB-PD\nvakaa-ti"
+    },
+    "USBPDModeSafe": {
+      "displayText": "USB-PD\nturva-ti"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Virtalähde\nDC",
@@ -125,95 +145,95 @@
     },
     "QCMaxVoltage": {
       "displayText": "QC\njännite",
-            "description": "Ensisijainen maksimi QC jännite"
+      "description": "Ensisijainen maksimi QC jännite."
     },
     "PDNegTimeout": {
-            "displayText": "PD\ntimeout",
-            "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+      "displayText": "PD\naikakatkais",
+      "description": "PD neuvottelun aikakatkaisu 100ms askelin joitakin QC-latureita varten."
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\ntila",
+      "description": "Vakaa tila ei käytä EPR & PPS, turva-tila ei käytä vastuksen pehmustusta."
     },
     "BoostTemperature": {
       "displayText": "Tehostus-\nlämpötila",
-            "description": "Tehostustilan lämpötila"
+      "description": "Tehostustilan lämpötila."
     },
     "AutoStart": {
       "displayText": "Autom.\nkäynnistys",
-            "description": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. (E=Ei käytössä | J=juotostila | L=Lepotila | H=Lepotila huoneenlämpö)"
+      "description": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. (J=juotostila | L=Lepotila | H=Lepotila huoneenlämpö)"
     },
     "TempChangeShortStep": {
       "displayText": "Lämmön muutos\nlyhyt painal.",
-            "description": "Lämpötilan muutos lyhyellä painalluksella"
+      "description": "Lämpötilan muutos lyhyellä painalluksella."
     },
     "TempChangeLongStep": {
       "displayText": "Lämmön muutos\npitkä painal.",
-            "description": "Lämpötilan muutos pitkällä painalluksella"
+      "description": "Lämpötilan muutos pitkällä painalluksella."
     },
     "LockingMode": {
       "displayText": "Salli nappien\nlukitus",
-            "description": "Kolvatessa paina molempia näppäimiä lukitaksesi ne (P=pois | V=vain tehostus | K=kaikki)"
+      "description": "Kolvatessa paina molempia näppäimiä lukitaksesi ne (V=vain tehostus | K=kaikki)"
     },
     "ProfilePhases": {
-            "displayText": "Profile\nPhases",
-            "description": "Number of phases in profile mode"
+      "displayText": "Profiili\nvaiheet",
+      "description": "Vaiheiden määrä profiilitilassa."
     },
     "ProfilePreheatTemp": {
-            "displayText": "Preheat\nTemp",
-            "description": "Preheat to this temperature at the start of profile mode"
+      "displayText": "Esilämmityksen\nlämpötila",
+      "description": "Esilämmittää tähän lämpötilaan profiilitilan alussa."
     },
     "ProfilePreheatSpeed": {
-            "displayText": "Preheat\nSpeed",
-            "description": "Preheat at this rate (degrees per second)"
+      "displayText": "Esilämmityksen\nnopeus",
+      "description": "Esilämmityksen nopeus (asteita/sekunti)"
     },
     "ProfilePhase1Temp": {
-            "displayText": "Phase 1\nTemp",
-            "description": "Target temperature for the end of this phase"
+      "displayText": "Vaiheen 1\nTemp",
+      "description": "Kohdelämpötila tämän vaiheen lopussa."
     },
     "ProfilePhase1Duration": {
-            "displayText": "Phase 1\nDuration",
-            "description": "Target duration of this phase (seconds)"
+      "displayText": "Vaiheen 1\nkesto",
+      "description": "Tämän vaiheen ajankäyttö (sekunteina) Saattaa kestää kauemmin jos lämmitys hitaampaa."
     },
     "ProfilePhase2Temp": {
-            "displayText": "Phase 2\nTemp",
-            "description": ""
+      "displayText": "Vaiheen 2\nlämpötila",
+      "description": "Kohdelämpötila tämän vaiheen lopussa."
     },
     "ProfilePhase2Duration": {
-            "displayText": "Phase 2\nDuration",
-            "description": ""
+      "displayText": "Vaiheen 2\nkesto",
+      "description": "Tämän vaiheen ajankäyttö (sekunteina) Saattaa kestää kauemmin jos lämmitys hitaampaa."
     },
     "ProfilePhase3Temp": {
-            "displayText": "Phase 3\nTemp",
-            "description": ""
+      "displayText": "Vaiheen 3\nlämpötila",
+      "description": "Kohdelämpötila tämän vaiheen lopussa."
     },
     "ProfilePhase3Duration": {
-            "displayText": "Phase 3\nDuration",
-            "description": ""
+      "displayText": "Vaiheen 3\nkesto",
+      "description": "Tämän vaiheen ajankäyttö (sekunteina) Saattaa kestää kauemmin jos lämmitys hitaampaa."
     },
     "ProfilePhase4Temp": {
-            "displayText": "Phase 4\nTemp",
-            "description": ""
+      "displayText": "Vaiheen 4\nlämpötila",
+      "description": "Kohdelämpötila tämän vaiheen lopussa."
     },
     "ProfilePhase4Duration": {
-            "displayText": "Phase 4\nDuration",
-            "description": ""
+      "displayText": "Vaiheen 4\nkesto",
+      "description": "Tämän vaiheen ajankäyttö (sekunteina) Saattaa kestää kauemmin jos lämmitys hitaampaa."
     },
     "ProfilePhase5Temp": {
-            "displayText": "Phase 5\nTemp",
-            "description": ""
+      "displayText": "Vaiheen 5\nlämpötila",
+      "description": "Kohdelämpötila tämän vaiheen lopussa."
     },
     "ProfilePhase5Duration": {
-            "displayText": "Phase 5\nDuration",
-            "description": ""
+      "displayText": "Vaiheen 5\nkesto",
+      "description": "Tämän vaiheen ajankäyttö (sekunteina) Saattaa kestää kauemmin jos lämmitys hitaampaa."
     },
     "ProfileCooldownSpeed": {
-            "displayText": "Cooldown\nSpeed",
-            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "displayText": "Jäähtymis\nnopeus",
+      "description": "Jäähtymisnopeus profiilitilan lopussa (asteita sekunnissa)"
     },
     "MotionSensitivity": {
       "displayText": "Liikkeen\nherkkyys",
-            "description": "0=pois päältä | 1=vähäinen herkkyys | ... | 9=suurin herkkyys"
+      "description": "1=vähäinen herkkyys | ... | 9=suurin herkkyys"
     },
     "SleepTemperature": {
       "displayText": "Lepotilan\nlämpötila",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Hall-\nherk.",
-            "description": "Hall-efektianturin herkkyys lepotilan tunnistuksessa (0=pois päältä | 1=vähäinen herkkyys | ... | 9=suurin herkkyys)"
+      "description": "Hall-efektianturin herkkyys lepotilan tunnistuksessa (1=vähäinen herkkyys | ... | 9=suurin herkkyys)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Aikaväli ennen \"lepotilaa\" alkaa, kun hall-efekti ylittää kynnyksen"
     },
     "TemperatureUnit": {
       "displayText": "Lämpötilan\nyksikkö",
@@ -253,27 +277,27 @@
     },
     "AnimSpeed": {
       "displayText": "Animaation\nnopeus",
-            "description": "Animaatioiden nopeus valikossa (P=pois | A=alhainen | K=keskiverto | S=suuri)"
+      "description": "Animaatioiden nopeus valikossa (A=alhainen | K=keskiverto | S=suuri)"
     },
     "AnimLoop": {
       "displayText": "Animaation\ntoistaminen",
-            "description": "Toista animaatiot valikossa"
+      "description": "Toista animaatiot valikossa."
     },
     "Brightness": {
-            "displayText": "Screen\nbrightness",
-            "description": "Adjust the OLED screen brightness"
+      "displayText": "Näytön\nkirkkaus",
+      "description": "Säädä OLED-näytön kirkkautta."
     },
     "ColourInversion": {
-            "displayText": "Invert\nscreen",
-            "description": "Invert the OLED screen colors"
+      "displayText": "Käänteiset\nvärit",
+      "description": "Asettaa käänteiset värit OLED-näyttöön."
     },
     "LOGOTime": {
-            "displayText": "Boot logo\nduration",
-            "description": "Set boot logo duration (s=seconds)"
+      "displayText": "Käynnistysl\naika näytöllä",
+      "description": "Aseta käynnistyslogon aika näytöllä (s=sekunteja)"
     },
     "AdvancedIdle": {
       "displayText": "Tiedot\nlepotilassa",
-            "description": "Näyttää yksityiskohtaisemmat pienemmällä fontilla tiedot lepotilassa."
+      "description": "Näyttää yksityiskohtaisemmat tiedot pienellä fontilla lepotilassa."
     },
     "AdvancedSoldering": {
       "displayText": "Tarkempi\njuotosnäyttö",
@@ -281,23 +305,23 @@
     },
     "BluetoothLE": {
       "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+      "description": "BLE käyttöön."
     },
     "PowerLimit": {
       "displayText": "Tehon-\nrajoitus",
       "description": "Suurin sallittu teho (Watti)"
     },
     "CalibrateCJC": {
-            "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+      "displayText": "Kalibroi CJC\nensi käynnist",
+      "description": "Ensi käynnistyksessä kärjen Cold Junction Compensation kalibroidaan (ei tarpeellista jos Delta T on < 5°C)"
     },
     "VoltageCalibration": {
       "displayText": "Kalibroi\ntulojännite?",
-            "description": "Tulojännitten kalibrointi (VIN) (paina pitkään poistuaksesi)"
+      "description": "Tulojännitteen kalibrointi (VIN) (paina pitkään poistuaksesi)"
     },
     "PowerPulsePower": {
       "displayText": "Herätyspulssin\nvoimakkuus",
-            "description": "Herätyspulssin voimakkuus (Watti)"
+      "description": "Herätyspulssin voimakkuus (Watteina)"
     },
     "PowerPulseWait": {
       "displayText": "Pulssin\nodotusaika",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Kieli:\n FI       Suomi",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_FR.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "V d'entrée: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "En veille...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Panne: \n"
     },
-        "OffString": {
-            "message": "Off"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "D",
     "SettingLeftChar": "G",
     "SettingAutoChar": "A",
-        "SettingOffChar": "D",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
     "SettingFastChar": "R",
-        "SettingStartNoneChar": "D",
     "SettingStartSolderingChar": "A",
     "SettingStartSleepChar": "V",
     "SettingStartSleepOffChar": "O",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "V"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Source\nd'alim.",
@@ -131,9 +151,9 @@
       "displayText": "Délai\nexpir. PD",
       "description": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Temp.\nboost",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Chauffer au\ndémarrage",
-            "description": "D=désactivé | A=activé | V=mode veille | O=mode veille à température ambiante"
+      "description": "A=activé | V=mode veille | O=mode veille à température ambiante"
     },
     "TempChangeShortStep": {
       "displayText": "Incrément\nappui court",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Verrouiller\nles boutons",
-            "description": "Pendant la soudure, appuyer sur les deux boutons pour les verrouiller (D=désactivé | B=boost seulement | V=verr. total)"
+      "description": "Pendant la soudure, appuyer sur les deux boutons pour les verrouiller (B=boost seulement | V=verr. total)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Sensibilité\nau mouvement",
-            "description": "0=désactivé | 1=peu sensible | ... | 9=très sensible"
+      "description": "1=peu sensible | ... | 9=très sensible"
     },
     "SleepTemperature": {
       "displayText": "Temp.\nveille",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Sensibilité\ncapteur effet hall",
-            "description": "Sensibilité du capteur à effet Hall pour la mise en veille (0=désactivé | 1=peu sensible | ... | 9=très sensible)"
+      "description": "Sensibilité du capteur à effet Hall pour la mise en veille (1=peu sensible | ... | 9=très sensible)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Intervalle avant le démarrage du \"mode veille\" lorsque l'effet Hall est supérieur au seuil"
     },
     "TemperatureUnit": {
       "displayText": "Unité de\ntempérature",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Vitesse\nanim. icônes",
-            "description": "Vitesse des animations des icônes dans le menu (D=désactivé | L=lente | M=moyenne | R=rapide)"
+      "description": "Vitesse des animations des icônes dans le menu (L=lente | M=moyenne | R=rapide)"
     },
     "AnimLoop": {
       "displayText": "Rejouer\nanim. icônes",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Langue:\n FR    Français",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_HR.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Napon V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
     "SleepingAdvancedString": {
       "message": "SPAVAM...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Vrh: \n"
     },
-        "OffString": {
-            "message": "Off"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "D",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "U",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
     "SettingFastChar": "B",
-        "SettingStartNoneChar": "U",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "T",
     "SettingStartSleepOffChar": "H",
-        "SettingLockDisableChar": "O",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "Z"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Izvor\nnapajanja",
@@ -131,9 +151,9 @@
       "displayText": "USB-PD\ntimeout",
       "description": "Timeout za USB-Power Delivery u koracima od 100ms za kompatibilnost s nekim QC punjačima"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Boost\ntemp",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Auto\nstart",
-            "description": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati. (U=ugašeno | L=lemljenje | T=spavanje toplo | H=spavanje hladno)"
+      "description": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati. (L=lemljenje | T=spavanje toplo | H=spavanje hladno)"
     },
     "TempChangeShortStep": {
       "displayText": "Korak temp\nkratki pritisak",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Zaključavanje\ntipki",
-            "description": "Tokom lemljenja, držite obje tipke kako biste ih zaključali ili otključali (O=otključano | B=zaključan boost | Z=zaključano sve)"
+      "description": "Tokom lemljenja, držite obje tipke kako biste ih zaključali ili otključali (B=zaključan boost | Z=zaključano sve)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Osjetljivost\npokreta",
-            "description": "Osjetljivost prepoznavanja pokreta. (0=ugašeno | 1=najmanje osjetljivo | ... | 9=najosjetljivije)"
+      "description": "Osjetljivost prepoznavanja pokreta. (1=najmanje osjetljivo | ... | 9=najosjetljivije)"
     },
     "SleepTemperature": {
       "displayText": "Temp\nspavanja",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Osjetljivost\nHall senzora",
-            "description": "Osjetljivost senzora magnetskog polja za detekciju spavanja (U=Ugašeno | N=Najmanja | S=Srednja | V=Visoka)"
+      "description": "Osjetljivost senzora magnetskog polja za detekciju spavanja (N=Najmanja | S=Srednja | V=Visoka)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval prije pokretanja \"načina mirovanja\" kada je Hall efekt iznad praga"
     },
     "TemperatureUnit": {
       "displayText": "Jedinica\ntemperature",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Brzina\nanimacije",
-            "description": "Brzina animacije ikona u menijima (U=ugašeno | S=sporo | M=srednje | B=brzo)"
+      "description": "Brzina animacije ikona u menijima (S=sporo | M=srednje | B=brzo)"
     },
     "AnimLoop": {
       "displayText": "Ponavljanje\nanimacije",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Jezik:\n HR    Hrvatski",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_HU.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Bemenet V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Alvás...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Hegy: \n"
     },
-        "OffString": {
-            "message": "Ki"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "J",
     "SettingLeftChar": "B",
     "SettingAutoChar": "A",
-        "SettingOffChar": "0",
     "SettingSlowChar": "L",
     "SettingMediumChar": "K",
     "SettingFastChar": "Gy",
-        "SettingStartNoneChar": "K",
     "SettingStartSolderingChar": "F",
     "SettingStartSleepChar": "A",
     "SettingStartSleepOffChar": "Sz",
-        "SettingLockDisableChar": "K",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "T"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Áram\nforrás",
@@ -131,9 +151,9 @@
       "displayText": "PD\nidőtúllépés",
       "description": "PD egyeztetés időkerete (kompatibilitás QC töltőkkel) (x 100ms)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Boost\nhőmérséklet",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Automatikus\nindítás",
-            "description": "Bekapcsolás után automatikusan lépjen forrasztás módba (K=ki | F=forrasztás | A=alvó mód | Sz=szobahőmérséklet)"
+      "description": "Bekapcsolás után automatikusan lépjen forrasztás módba (F=forrasztás | A=alvó mód | Sz=szobahőmérséklet)"
     },
     "TempChangeShortStep": {
       "displayText": "Hőm. állítás\nrövid",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Lezárás\nengedélyezés",
-            "description": "Forrasztás közben mindkét gombot hosszan lenyomva lezárja a kezelést (K=ki | B=csak \"boost\" módban | T=teljes lezárás)"
+      "description": "Forrasztás közben mindkét gombot hosszan lenyomva lezárja a kezelést (B=csak \"boost\" módban | T=teljes lezárás)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Mozgás\nérzékenység",
-            "description": "Mozgás érzékenység beállítása (0=kikapcsolva | 1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
+      "description": "Mozgás érzékenység beállítása (1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
     },
     "SleepTemperature": {
       "displayText": "Alvási\nhőmérséklet",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Alvásérzékelő\nérzékenység",
-            "description": "Alvásérzékelő gyorsulásmérő érzékenysége (0=kikapcsolva | 1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
+      "description": "Alvásérzékelő gyorsulásmérő érzékenysége (1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Az \"alvó üzemmód\" előtti intervallum akkor kezdődik, amikor a hall-effektus meghaladja a küszöbértéket"
     },
     "TemperatureUnit": {
       "displayText": "Hőmérséklet\nmértékegysége",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Animáció\nsebessége",
-            "description": "Menüikonok animációjának sebessége (0=ki | L=lassú | K=közepes | Gy=gyors)"
+      "description": "Menüikonok animációjának sebessége (L=lassú | K=közepes | Gy=gyors)"
     },
     "AnimLoop": {
       "displayText": "Folytonos\nanimáció",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Nyelv:\n HU      Magyar",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_IT.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "V in: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
     "SleepingAdvancedString": {
       "message": "Riposo\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Punta: \n"
     },
-        "OffString": {
-            "message": "OFF"
-        },
     "ProfilePreheatString": {
       "message": "Preriscaldamento\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "D",
     "SettingLeftChar": "S",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
     "SettingFastChar": "V",
-        "SettingStartNoneChar": "D",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "R",
     "SettingStartSleepOffChar": "A",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "T",
     "SettingLockFullChar": "C"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Modalità\npredefinita"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "Modalità\nstatica"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Modalità\nsicura"
+    },
+    "TipTypeAuto": {
+      "displayText": "Rilevaz.\nauto"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nlunga"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\ncorta"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Sorgente\nalimentaz",
@@ -129,19 +149,19 @@
     },
     "PDNegTimeout": {
       "displayText": "Abilitazione\nUSB PD",
-            "description": "Regola il massimo tempo utile per la negoziazione del protocollo USB Power Delivery con alimentatori compatibili [0: disattiva; multipli di 100 ms]"
+      "description": "Imposta il tempo di negoziazione del protocollo USB Power Delivery con alimentatori compatibili [0: disattiva; multipli di 100 ms]"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "Modalità\nUSB PD",
       "description": "Abilita le modalità Power Delivery PPS ed EPR"
     },
     "BoostTemperature": {
-            "displayText": "Temp\nTurbo",
+      "displayText": "Temp\nturbo",
       "description": "Imposta la temperatura della funzione turbo [°C/°F]"
     },
     "AutoStart": {
       "displayText": "Avvio\nautomatico",
-            "description": "Attiva automaticamente il saldatore quando viene alimentato [D: disattiva; S: saldatura; R: riposo; A: temperatura ambiente]"
+      "description": "Attiva automaticamente il saldatore quando viene alimentato [S: saldatura; R: riposo; A: temperatura ambiente]"
     },
     "TempChangeShortStep": {
       "displayText": "Temp passo\nbreve",
@@ -153,11 +173,11 @@
     },
     "LockingMode": {
       "displayText": "Blocco\ntasti",
-            "description": "Blocca i tasti durante la modalità saldatura; tieni premuto entrambi per bloccare o sbloccare [D: disattiva; T: consenti Turbo; C: blocco completo]"
+      "description": "Blocca i tasti durante la modalità saldatura; tieni premuto entrambi per bloccare o sbloccare [T: consenti Turbo; C: blocco completo]"
     },
     "ProfilePhases": {
       "displayText": "Fasi modalità\nprofilo",
-            "description": "Imposta il numero di fasi da attuare per un profilo di riscaldamento personalizzato"
+      "description": "Imposta il numero di fasi da implementare per un profilo di riscaldamento personalizzato"
     },
     "ProfilePreheatTemp": {
       "displayText": "Temperatura\npreriscaldamento",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Sensibilità\nal movimento",
-            "description": "Imposta la sensibilità al movimento per uscire dalla modalità riposo [0: nessuna; 1: minima; 9: massima]"
+      "description": "Imposta la sensibilità al movimento per uscire dalla modalità riposo [1: minima; 9: massima]"
     },
     "SleepTemperature": {
       "displayText": "Temperatura\nriposo",
@@ -221,15 +241,19 @@
     },
     "SleepTimeout": {
       "displayText": "Timer\nriposo",
-            "description": "Imposta il timer per entrare in modalità riposo [secondi/minuti]"
+      "description": "Imposta un timer per entrare in modalità riposo [secondi/minuti]"
     },
     "ShutdownTimeout": {
       "displayText": "Timer\nspegnimento",
-            "description": "Imposta il timer per lo spegnimento [minuti]"
+      "description": "Imposta un timer per lo spegnimento [minuti]"
     },
     "HallEffSensitivity": {
       "displayText": "Sensore\nHall",
-            "description": "Regola la sensibilità del sensore ad effetto Hall per entrare in modalità riposo [0: nessuna; 1: minima; 9: massima]"
+      "description": "Regola la sensibilità del sensore ad effetto Hall per entrare in modalità riposo [1: minima; 9: massima]"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "Timer\nHall",
+      "description": "Imposta un timer per entrare in modalità riposo quando il sensore ad effetto Hall è al di sopra della soglia di attivazione [secondi]"
     },
     "TemperatureUnit": {
       "displayText": "Unità di\ntemperatura",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Velocità\nanimazioni",
-            "description": "Imposta la velocità di riproduzione delle animazioni del menù principale [O: OFF; L: lenta; M: media; V: veloce]"
+      "description": "Imposta la velocità di riproduzione delle animazioni del menù principale [L: lenta; M: media; V: veloce]"
     },
     "AnimLoop": {
       "displayText": "Ciclo\nanimazioni",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Lingua:\n IT    Italiano",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Tipo di\npunta",
+      "description": "Seleziona il modello della punta in uso"
     }
   }
 }

Translations/translation_JA_JP.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Input V: "
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Sleeping..."
     },
     "SleepingTipAdvancedString": {
       "message": "Tip: "
     },
-        "OffString": {
-            "message": "オフ"
-        },
     "ProfilePreheatString": {
       "message": "Preheat"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "右",
     "SettingLeftChar": "左",
     "SettingAutoChar": "自",
-        "SettingOffChar": "×",
     "SettingSlowChar": "遅",
     "SettingMediumChar": "中",
     "SettingFastChar": "速",
-        "SettingStartNoneChar": "×",
     "SettingStartSolderingChar": "熱",
     "SettingStartSleepChar": "待",
     "SettingStartSleepOffChar": "室",
-        "SettingLockDisableChar": "×",
     "SettingLockBoostChar": "ブ",
     "SettingLockFullChar": "全"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "下限電圧",
@@ -131,9 +151,9 @@
       "displayText": "PD\ntimeout",
       "description": "一部のQC電源との互換性のため、PDネゴシエーションをタイムアウトする時間 <x100ms（ミリ秒）>"
     },
-        "PDVpdo": {
+    "USBPDMode": {
       "displayText": "PD VPDO",
-            "description": "Enables PPS & EPR modes"
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "ブースト温度",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "自動加熱",
-            "description": "電源投入時に自動的に加熱する <×=オフ | 熱=半田付けモード | 待=スタンバイモード | 室=室温スタンバイモード>"
+      "description": "電源投入時に自動的に加熱する <熱=半田付けモード | 待=スタンバイモード | 室=室温スタンバイモード>"
     },
     "TempChangeShortStep": {
       "displayText": "温度変化 短",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "ボタンロック",
-            "description": "半田付けモード時に両方のボタンを長押しし、ボタンロックする <×=オフ | ブ=ブーストのみ許可 | 全=すべてをロック>"
+      "description": "半田付けモード時に両方のボタンを長押しし、ボタンロックする <ブ=ブーストのみ許可 | 全=すべてをロック>"
     },
     "ProfilePhases": {
       "displayText": "Profile Phases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "動きの感度",
-            "description": "0=オフ | 1=最低感度 | ... | 9=最高感度"
+      "description": "1=最低感度 | ... | 9=最高感度"
     },
     "SleepTemperature": {
       "displayText": "待機温度",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "磁界感度",
-            "description": "スタンバイモードに入るのに使用される磁場センサーの感度 <0=オフ | 1=最低感度 | ... | 9=最高感度>"
+      "description": "スタンバイモードに入るのに使用される磁場センサーの感度 <1=最低感度 | ... | 9=最高感度>"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "ホール効果が閾値を超えたときに\"「スリープモード」\"が開始されるまでの間隔"
     },
     "TemperatureUnit": {
       "displayText": "温度単位",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "動画の速度",
-            "description": "メニューアイコンのアニメーションの速さ <×=再生しない | 遅=低速 | 中=中速 | 速=高速>"
+      "description": "メニューアイコンのアニメーションの速さ <遅=低速 | 中=中速 | 速=高速>"
     },
     "AnimLoop": {
       "displayText": "動画をループ",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "言語： 日本語",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_LT.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Įvestis V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Miegu...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Antg: \n"
     },
-        "OffString": {
-            "message": "Išj"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "D",
     "SettingLeftChar": "K",
     "SettingAutoChar": "A",
-        "SettingOffChar": "I",
     "SettingSlowChar": "L",
     "SettingMediumChar": "V",
     "SettingFastChar": "G",
-        "SettingStartNoneChar": "N",
     "SettingStartSolderingChar": "T",
     "SettingStartSleepChar": "M",
     "SettingStartSleepOffChar": "K",
-        "SettingLockDisableChar": "I",
     "SettingLockBoostChar": "T",
     "SettingLockFullChar": "V"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Maitinimo\nšaltinis",
@@ -131,9 +151,9 @@
       "displayText": "PD\nlaikas",
       "description": "PD suderinimo laikas žingsniais po 100ms suderinamumui su kai kuriais QC įkrovikliais"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Turbo\ntemperat.",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Automatinis\npaleidimas",
-            "description": "Ar pradėti kaitininti iš karto įjungus lituoklį (N=Ne | T=Taip | M=Miegas | K=Miegoti kambario temperatūroje)"
+      "description": "Ar pradėti kaitininti iš karto įjungus lituoklį (T=Taip | M=Miegas | K=Miegoti kambario temperatūroje)"
     },
     "TempChangeShortStep": {
       "displayText": "Temp.keitim.\ntrump.spust.",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Mygtukų\nužraktas",
-            "description": "Lituodami, ilgai paspauskite abu mygtukus, kad juos užrakintumėte (I=Išjungta | T=leidžiamas tik Turbo režimas | V=Visiškas užrakinimas)"
+      "description": "Lituodami, ilgai paspauskite abu mygtukus, kad juos užrakintumėte (T=leidžiamas tik Turbo režimas | V=Visiškas užrakinimas)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Judesio\njautrumas",
-            "description": "Judesio jautrumas (0=Išjungta | 1=Mažiausias | ... | 9=Didžiausias)"
+      "description": "Judesio jautrumas (1=Mažiausias | ... | 9=Didžiausias)"
     },
     "SleepTemperature": {
       "displayText": "Miego\ntemperat.",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Holo\njutiklis",
-            "description": "Holo jutiklio jautrumas nustatant miegą (0=Išjungta | 1=Mažiausias | ... | 9=Didžiausias)"
+      "description": "Holo jutiklio jautrumas nustatant miegą (1=Mažiausias | ... | 9=Didžiausias)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Intervalas prieš \"miego režimą\" prasideda, kai salės efektas viršija slenkstį"
     },
     "TemperatureUnit": {
       "displayText": "Temperatūros\nvienetai",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Animacijų\ngreitis",
-            "description": "Paveiksliukų animacijų greitis meniu punktuose (I=Išjungtas | L=Lėtas | V=Vidutinis | G=Greitas)"
+      "description": "Paveiksliukų animacijų greitis meniu punktuose (L=Lėtas | V=Vidutinis | G=Greitas)"
     },
     "AnimLoop": {
       "displayText": "Animacijų\npakartojimas",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Kalba:\n LT    Lietuvių",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_NB.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Innspenn.: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Dvale...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Spiss: \n"
     },
-        "OffString": {
-            "message": "Av"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "H",
     "SettingLeftChar": "V",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
     "SettingFastChar": "F",
-        "SettingStartNoneChar": "I",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "D",
     "SettingStartSleepOffChar": "R",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Kilde\n",
@@ -131,9 +151,9 @@
       "displayText": "PD-\ntidsavb.",
       "description": "PD-forhandlingstidsavbrudd i steg på 100 ms for kompatibilitet med noen QC-ladere"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "KTmp\n",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "AStart\n",
-            "description": "Start automatisk med lodding når strøm kobles til. (I=Inaktiv | L=Lodding | D=Dvale | R=Dvale romtemperatur)"
+      "description": "Start automatisk med lodding når strøm kobles til. (L=Lodding | D=Dvale | R=Dvale romtemperatur)"
     },
     "TempChangeShortStep": {
       "displayText": "Temp-endring\nkort",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Tillat å låse\nknapper",
-            "description": "Mens du lodder, hold nede begge knapper for å bytte mellom låsemodus (D=deaktiver | B=kun boost | F=full lås)"
+      "description": "Mens du lodder, hold nede begge knapper for å bytte mellom låsemodus (B=kun boost | F=full lås)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "BSensr\n",
-            "description": "Bevegelsesfølsomhet (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)"
+      "description": "Bevegelsesfølsomhet (1=Minst følsom | ... | 9=Mest følsom)"
     },
     "SleepTemperature": {
       "displayText": "DTmp\n",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Hall-sensor\nfølsomhet",
-            "description": "Sensitiviteten til Hall-effekt-sensoren for å detektere inaktivitet (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)"
+      "description": "Sensitiviteten til Hall-effekt-sensoren for å detektere inaktivitet (1=Minst følsom | ... | 9=Mest følsom)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Intervall før \"dvalemodus\" starter når halleffekten er over terskelen"
     },
     "TemperatureUnit": {
       "displayText": "TmpEnh\n",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.\nhastighet",
-            "description": "Hastigheten til animasjonene i menyen (O=off | S=slow | M=medium | F=fast)"
+      "description": "Hastigheten til animasjonene i menyen (S=slow | M=medium | F=fast)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nloop",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Språk:\n NB    Norsk bm",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_NL.json

@@ -4,13 +4,13 @@
   "tempUnitFahrenheit": false,
   "messagesWarn": {
     "CalibrationDone": {
-            "message": "Calibration\ndone!"
+      "message": "Kalibratie\nklaar!"
     },
     "ResetOKMessage": {
       "message": "Reset OK"
     },
     "SettingsResetMessage": {
-            "message": "Instellingen\nzijn gereset!"
+      "message": "Sommige instellingen\nzijn veranderd!"
     },
     "NoAccelerometerMessage": {
       "message": "Geen accelerometer\ngedetecteerd!"
@@ -22,22 +22,22 @@
       "message": "GEBLOKKEERD"
     },
     "UnlockingKeysString": {
-            "message": "GEDEBLOKKEERD"
+      "message": "VRIJ"
     },
     "WarningKeysLockedString": {
       "message": "!GEBLOKKEERD!"
     },
     "WarningThermalRunaway": {
-            "message": "Verwarming\nOncontroleerbaar"
+      "message": "Thermisch\nop hol geslagen"
     },
     "WarningTipShorted": {
-            "message": "!Tip Shorted!"
+      "message": "!Kortgesloten Soldeerpunt!"
     },
     "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+      "message": "Voordat je opnieuw opstart: zorg dat de soldeerpunt op kamertemperatuur is!"
     },
     "CJCCalibrating": {
-            "message": "calibrating\n"
+      "message": "Kalibreren\n"
     },
     "SettingsResetWarning": {
       "message": "Weet je zeker dat je de fabrieksinstellingen terug wilt zetten?"
@@ -46,55 +46,46 @@
       "message": "DC Laag"
     },
     "UndervoltageString": {
-            "message": "Onderspanning\n"
+      "message": "Te lage spanning\n"
     },
     "InputVoltageString": {
-            "message": "Voeding V: \n"
-        },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
+      "message": "Ingangs spanning: \n"
     },
     "SleepingAdvancedString": {
-            "message": "Slaapstand...\n"
+      "message": "Slaapt...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Punt: \n"
     },
-        "OffString": {
-            "message": "Uit"
-        },
     "ProfilePreheatString": {
-            "message": "Preheat\n"
+      "message": "Voorverwarmen\n"
     },
     "ProfileCooldownString": {
-            "message": "Cooldown\n"
+      "message": "Afkoelen\n"
     },
     "DeviceFailedValidationWarning": {
-            "message": "Jouw toestel is wellicht een namaak-versie!"
+      "message": "Jou apparaat is waarschijnlijk een namaak!"
     },
     "TooHotToStartProfileWarning": {
-            "message": "Too hot to\nstart profile"
+      "message": "Te warm om\nprofiel te starten"
     }
   },
   "characters": {
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "U",
     "SettingSlowChar": "L",
-        "SettingMediumChar": "G",
+    "SettingMediumChar": "M",
     "SettingFastChar": "S",
-        "SettingStartNoneChar": "U",
-        "SettingStartSolderingChar": "G",
+    "SettingStartSolderingChar": "T",
     "SettingStartSleepChar": "S",
-        "SettingStartSleepOffChar": "B",
-        "SettingLockDisableChar": "U",
+    "SettingStartSleepOffChar": "Z",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "V"
   },
   "menuGroups": {
     "PowerMenu": {
-            "displayText": "Voeding\ninstellingen",
+      "displayText": "Energie-\ninstellingen",
       "description": ""
     },
     "SolderingMenu": {
@@ -102,11 +93,11 @@
       "description": ""
     },
     "PowerSavingMenu": {
-            "displayText": "Slaap\nModes",
+      "displayText": "Slaap-\nstand",
       "description": ""
     },
     "UIMenu": {
-            "displayText": "Weergave\ninstellingen",
+      "displayText": "Gebruiker-\nsomgeving",
       "description": ""
     },
     "AdvancedMenu": {
@@ -114,198 +105,231 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
-            "displayText": "Spannings-\nbron",
-            "description": "Spanningsbron. Stelt drempelspanning in. (DC 10V) (S 3.3V per cel)"
+      "displayText": "Vermogens\nbron",
+      "description": "Minimale spanning om de batterij te beschermen tegen te ver ontladen (DC 10V) (S=3,3V per cell, zet PWR limiet uit)"
     },
     "MinVolCell": {
-            "displayText": "Minimum\nvoltage",
-            "description": "Minimum toegestaan voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+      "displayText": "Minimum\nspanning",
+      "description": "Minimale toegelaten voltage per cel (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
     },
     "QCMaxVoltage": {
-            "displayText": "QC\nvoltage",
-            "description": "Maximaal QC voltage dat gevraagd mag worden"
+      "displayText": "QC\nspanning",
+      "description": "Maximale QC spanning de soldeerbout zou moeten aanvragen"
     },
     "PDNegTimeout": {
-            "displayText": "PD\ntimeout",
-            "description": "PD afstemmingsduur in stappen van 100ms (voor compatibiliteit met sommige QC laders)"
+      "displayText": "PD ver-\nloop tijd",
+      "description": "PD onderhandelings verlooptijd, afstemmingsduur in stappen van 100 ms (voor compatibiliteit met sommige QC laders)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "Zet PPS & EPR modes aan"
     },
     "BoostTemperature": {
       "displayText": "Boost\ntemp",
-            "description": "Punt temperatuur in boostmode"
+      "description": "Tip temperatuur tijdens \"boost-modus\""
     },
     "AutoStart": {
-            "displayText": "Opstart\ngedrag",
-            "description": "Gedrag bij opstarten (U=Uit | G=Gebruiks-temperatuur | S=Slaapstand-temperatuur tot beweging | B=Uit tot beweging)"
+      "displayText": "start-\ngedrag",
+      "description": "T=verwarm naar soldeer temp | S=standby op slaap temp tot bewogen | Z=standby zonder verwarmen tot bewogen"
     },
     "TempChangeShortStep": {
-            "displayText": "Temp veranderen\nkort",
-            "description": "Temperatuur verandering bij kort drukken"
+      "displayText": "temp veran-\ndering kort",
+      "description": "Temperatuur veranderings stap bij korte druk op de knop"
     },
     "TempChangeLongStep": {
-            "displayText": "Temp veranderen\nlang",
-            "description": "Temperatuur verandering bij lang drukken"
+      "displayText": "temp veran-\ndering lang",
+      "description": "Temperatuur veranderings stap bij lange druk op de knop"
     },
     "LockingMode": {
-            "displayText": "Knopblokkering\ninschakelen",
-            "description": "Tijdens solderen lang op beide knoppen drukken blokkeert de knoppen (U=Uit | B=Alleen boost mode | V=Volledig blokkeren)"
+      "displayText": "Vergrendel-\nings knoppen",
+      "description": "Houd tijdens het solderen beide knoppen ingedrukt om de vergrendeling in of uit te schakelen (B=alleen boost-modus | V=volledige vergrendeling)"
     },
     "ProfilePhases": {
-            "displayText": "Profile\nPhases",
-            "description": "Number of phases in profile mode"
+      "displayText": "Profiel\nfases",
+      "description": "Nummer van fases in profiel modus"
     },
     "ProfilePreheatTemp": {
-            "displayText": "Preheat\nTemp",
-            "description": "Preheat to this temperature at the start of profile mode"
+      "displayText": "Voorverwarm\ntemperatuur",
+      "description": "Voorverwarm naar deze temperatuur op de start van profiel modus"
     },
     "ProfilePreheatSpeed": {
-            "displayText": "Preheat\nSpeed",
-            "description": "Preheat at this rate (degrees per second)"
+      "displayText": "Voorverwarm\nsnelheid",
+      "description": "Voorverwarm op deze snelheid (graden per seconden)"
     },
     "ProfilePhase1Temp": {
-            "displayText": "Phase 1\nTemp",
-            "description": "Target temperature for the end of this phase"
+      "displayText": "Fase 1\ntemperatuur",
+      "description": "Doel temperatuur op het einde van deze fase"
     },
     "ProfilePhase1Duration": {
-            "displayText": "Phase 1\nDuration",
-            "description": "Target duration of this phase (seconds)"
+      "displayText": "Fase\nduur",
+      "description": "Doel tijdsduur van deze fase (in seconden)"
     },
     "ProfilePhase2Temp": {
-            "displayText": "Phase 2\nTemp",
+      "displayText": "Fase 2\ntemperatuur",
       "description": ""
     },
     "ProfilePhase2Duration": {
-            "displayText": "Phase 2\nDuration",
+      "displayText": "Fase 2\nduur",
       "description": ""
     },
     "ProfilePhase3Temp": {
-            "displayText": "Phase 3\nTemp",
+      "displayText": "Fase 3\ntemperatuur",
       "description": ""
     },
     "ProfilePhase3Duration": {
-            "displayText": "Phase 3\nDuration",
+      "displayText": "Fase 3\nduur",
       "description": ""
     },
     "ProfilePhase4Temp": {
-            "displayText": "Phase 4\nTemp",
+      "displayText": "Fase 4\ntemperatuur",
       "description": ""
     },
     "ProfilePhase4Duration": {
-            "displayText": "Phase 4\nDuration",
+      "displayText": "Fase 4\nduur",
       "description": ""
     },
     "ProfilePhase5Temp": {
-            "displayText": "Phase 5\nTemp",
+      "displayText": "Fase 5\ntemperatuur",
       "description": ""
     },
     "ProfilePhase5Duration": {
-            "displayText": "Phase 5\nDuration",
+      "displayText": "Fase 5\nduur",
       "description": ""
     },
     "ProfileCooldownSpeed": {
-            "displayText": "Cooldown\nSpeed",
-            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "displayText": "Afkoel\nsnelheid",
+      "description": "De snelheid van afkoelen op het eind van profiel modus (graden per seconden)"
     },
     "MotionSensitivity": {
       "displayText": "Bewegings-\ngevoeligheid",
-            "description": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
+      "description": "Bewegingsgevoeligheid (1=minst gevoelig | ... | 9=meest gevoelig)"
     },
     "SleepTemperature": {
       "displayText": "Slaap\ntemp",
-            "description": "Punt temperatuur in slaapstand"
+      "description": "Temperatuur in slaapstand (°C)"
     },
     "SleepTimeout": {
-            "displayText": "Slaap\ntime-out",
-            "description": "Tijd voordat slaapmodus wordt geactiveerd (S=seconden | M=minuten)"
+      "displayText": "Slaap ver-\ntraging",
+      "description": "Interval voor \"slaap stand\" start (Minuten | Seconden)"
     },
     "ShutdownTimeout": {
-            "displayText": "Uitschakel\ntime-out",
-            "description": "Tijd voordat soldeerbout automatisch uitschakelt (M=minuten)"
+      "displayText": "Uitschakel\nna",
+      "description": "Automatisch afsluiten na (Minuten)"
     },
     "HallEffSensitivity": {
       "displayText": "Hall sensor\ngevoeligheid",
-            "description": "Gevoeligheid van de Hall effect sensor om naar slaapmodus te gaan (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
+      "description": "Gevoeligheid naar de magneten (1=minst gevoelig | ... | 9=meest gevoelig)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval voordat de \"slaapmodus\" start wanneer het Hall-effect boven de drempelwaarde komt"
     },
     "TemperatureUnit": {
       "displayText": "Temperatuur\neenheid",
-            "description": "Temperatuureenheid (C=Celsius | F=Fahrenheit)"
+      "description": "C=°Celsius | F=°Fahrenheit"
     },
     "DisplayRotation": {
       "displayText": "Scherm-\noriëntatie",
-            "description": "Schermoriëntatie (R=Rechtshandig | L=Linkshandig | A=Automatisch)"
+      "description": "R=Rechtshandig | L=Linkshandig | A=Automatisch"
     },
     "CooldownBlink": {
-            "displayText": "Afkoel\nflitsen",
-            "description": "Temperatuur laten flitsen in het hoofdmenu zo lang de punt nog warm is"
+      "displayText": "Afkoel\nknipper",
+      "description": "Temperatuur knippert in hoofdmenu tijdens afkoeling"
     },
     "ScrollingSpeed": {
       "displayText": "Scroll\nsnelheid",
-            "description": "Snelheid waarmee de tekst scrolt (S=Snel | L=Langzaam)"
+      "description": "Scrollsnelheid van de tekst. (Langzaam | Snel)"
     },
     "ReverseButtonTempChange": {
-            "displayText": "Draai\n+ - knoppen om",
-            "description": "Keer de +- knoppen van de temperatuurregeling om"
+      "displayText": "Wissel\n+ - knoppen",
+      "description": "Wissel de knoppen voor temperatuur controle om"
     },
     "AnimSpeed": {
-            "displayText": "Animatie\nsnelheid",
-            "description": "Tempo van de icoon animaties in het hoofdmenu (U=uit | L=langzaam | G=gemiddeld | S=snel)"
+      "displayText": "Anim.\nsnelheid",
+      "description": "Snelheid van de icoon animaties in het menu (Langzaam | Middel | Snel)"
     },
     "AnimLoop": {
-            "displayText": "Animatie\nherhaling",
+      "displayText": "Anim.\nherhaling",
       "description": "Herhaal icoon animaties in hoofdmenu"
     },
     "Brightness": {
       "displayText": "Scherm\nhelderheid",
-            "description": "Pas helderheid van het OLED scherm aan"
+      "description": "Verander de helderheid van het OLED scherm"
     },
     "ColourInversion": {
       "displayText": "Inverteer\nscherm",
-            "description": "Inverteer de kleuren van het OLED scherm"
+      "description": "Keer de kleuren van het OLED scherm om"
     },
     "LOGOTime": {
-            "displayText": "Opstart logo\nduur",
-            "description": "Stelt de weergaveduur van het opstartlogo in (s=seconden)"
+      "displayText": "Opstart\nlogo duur",
+      "description": "Zet het duur van het opstart logo (s=seconden)"
     },
     "AdvancedIdle": {
-            "displayText": "Gedetailleerd\nstartscherm",
-            "description": "Gedetailleerde informatie weergeven in een kleine letters op het startscherm."
+      "displayText": "Detail\nslaapscherm",
+      "description": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm"
     },
     "AdvancedSoldering": {
-            "displayText": "Gedetailleerd\nsoldeerscherm",
-            "description": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm"
+      "displayText": "Detail\nsoldeerscherm",
+      "description": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm"
     },
     "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+      "displayText": "Blue-\ntooth",
+      "description": "Zet Bluetooth aan"
     },
     "PowerLimit": {
-            "displayText": "Vermogen\nlimiet",
-            "description": "Maximaal vermogen (W=Watt)"
+      "displayText": "P\nlimiet",
+      "description": "Gemiddelde maximale vermogen dat de soldeerbout mag gebruiken (W=watt)"
     },
     "CalibrateCJC": {
-            "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+      "displayText": "Kalibreer CJC\nbij opstart",
+      "description": "Bij de volgende opstart tip \"Cold Junction Compensation\" wordt gekalibreerd (niet nodig als Delta T < 5°C)"
     },
     "VoltageCalibration": {
-            "displayText": "Kalibreer\ninput-voltage?",
-            "description": "Start VIN Kalibratie (druk lang om te sluiten)"
+      "displayText": "Kalibreer vo-\nedingsspanning",
+      "description": "VIN Kalibreren (lang in te drukken om te annuleren)"
     },
     "PowerPulsePower": {
-            "displayText": "Stroom\nPuls",
-            "description": "Intensiteit van stroompuls om voeding aan te houden (watt)"
+      "displayText": "Power\npuls",
+      "description": "Power van de aanhoud puls (W=watt)"
     },
     "PowerPulseWait": {
-            "displayText": "Stroompuls\ninterval",
-            "description": "Tijdsduur tussen voeding wakker-blijf-pulsen (x 2.5s)"
+      "displayText": "Energie pulse\nvertraging",
+      "description": "Vertraging voordat de aanhoud puls wordt geactiveerd (x 2,5s)"
     },
     "PowerPulseDuration": {
       "displayText": "Power pulse\nduur",
-            "description": "Duur van voeding-wakker-blijf-pulsen (x 250ms)"
+      "description": "Aanhoud pulse duur (x 250 ms)"
     },
     "SettingsReset": {
       "displayText": "Instellingen\nresetten?",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Taal:\n NL  Nederlands",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_NL_BE.json

@@ -4,19 +4,19 @@
   "tempUnitFahrenheit": false,
   "messagesWarn": {
     "CalibrationDone": {
-            "message": "Calibration\ndone!"
+      "message": "Calibratie\ngedaan!"
     },
     "ResetOKMessage": {
       "message": "Reset OK"
     },
     "SettingsResetMessage": {
-            "message": "Certain settings\nwere changed!"
+      "message": "Sommige settings\nzijn veranderd!"
     },
     "NoAccelerometerMessage": {
-            "message": "No accelerometer\ndetected!"
+      "message": "Geen accelerometer\ngedectecteerd!"
     },
     "NoPowerDeliveryMessage": {
-            "message": "No USB-PD IC\ndetected!"
+      "message": "Geen USB-PD IC\ngedetecteerd!"
     },
     "LockingKeysString": {
       "message": "LOCKED"
@@ -28,22 +28,22 @@
       "message": "!LOCKED!"
     },
     "WarningThermalRunaway": {
-            "message": "Thermal\nRunaway"
+      "message": "Thermisch\nop hol geslagen"
     },
     "WarningTipShorted": {
-            "message": "!Tip Shorted!"
+      "message": "!Soldeerpunt kortgesloten!"
     },
     "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+      "message": "Voordat je opnieuw opstart: stel zeker dat de soldeerpunt op kamertemperatuur is!"
     },
     "CJCCalibrating": {
-            "message": "calibrating\n"
+      "message": "Calibreren\n"
     },
     "SettingsResetWarning": {
-            "message": "Ben je zeker dat je alle standaardwaarden wil resetten?"
+      "message": "Weet je zeker dat je de fabrieksinstellingen terug wilt zetten?"
     },
     "UVLOWarningString": {
-            "message": "Voedingsspanning LAAG"
+      "message": "Onderspanning"
     },
     "UndervoltageString": {
       "message": "Onderspanning\n"
@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Voedingsspanning: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzz "
-        },
     "SleepingAdvancedString": {
       "message": "Slaapstand...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Punt: \n"
     },
-        "OffString": {
-            "message": "Uit"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -70,150 +64,176 @@
       "message": "Cooldown\n"
     },
     "DeviceFailedValidationWarning": {
-            "message": "Your device is most likely a counterfeit!"
+      "message": "Jou apparaat is waarschijnlijk namaak!"
     },
     "TooHotToStartProfileWarning": {
-            "message": "Too hot to\nstart profile"
+      "message": "Te warm om\nprofiel te starten!"
     }
   },
   "characters": {
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "T",
     "SettingMediumChar": "M",
     "SettingFastChar": "S",
-        "SettingStartNoneChar": "F",
     "SettingStartSolderingChar": "T",
     "SettingStartSleepChar": "S",
     "SettingStartSleepOffChar": "K",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
   "menuGroups": {
     "PowerMenu": {
-            "displayText": "Power\nsettings",
+      "displayText": "Vermogens-\ninstellingen",
       "description": ""
     },
     "SolderingMenu": {
-            "displayText": "Soldeer\nInstellingen",
+      "displayText": "Soldeer\ninstellingen",
       "description": ""
     },
     "PowerSavingMenu": {
-            "displayText": "Slaap\nstanden",
+      "displayText": "Slaap-\nstanden",
       "description": ""
     },
     "UIMenu": {
-            "displayText": "Gebruikers-\nInterface",
+      "displayText": "Gebruikers-\ninterface",
       "description": ""
     },
     "AdvancedMenu": {
-            "displayText": "Gevorderde\nInstellingen",
+      "displayText": "Geavanceerde\ninstellingen",
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Spannings-\nbron",
-            "description": "Spanningsbron. Stelt minimumspanning in. (DC 10V) (S 3.3V per cel)"
+      "description": "Minimale toegelate voltage"
     },
     "MinVolCell": {
       "displayText": "Minimum\nvoltage",
-            "description": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+      "description": "Minimale toegelaten voltage per cel (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
     },
     "QCMaxVoltage": {
-            "displayText": "Vermogen\nWatt",
+      "displayText": "Vermogen\nwatt",
       "description": "Vermogen van de adapter"
     },
     "PDNegTimeout": {
       "displayText": "PD\ntimeout",
-            "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+      "description": "PD afstemmingsduur in stappen van 100ms (voor compatibiliteit met sommige QC laders)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "Zet PPS & EPR modes aan"
     },
     "BoostTemperature": {
-            "displayText": "Verhogings\ntemp",
+      "displayText": "Verhog\nings temp",
       "description": "Verhogingstemperatuur"
     },
     "AutoStart": {
-            "displayText": "Auto\nstart",
-            "description": "Breng de soldeerbout op temperatuur bij het opstarten. (F=Uit | T=Soldeertemperatuur | S=Slaapstand-temperatuur | K=Slaapstand kamertemperatuur)"
+      "displayText": "start-\ntemperatuur",
+      "description": "Breng de soldeerbout op temperatuur bij het opstarten. (T=Soldeertemperatuur | S=Slaapstand-temperatuur | K=Slaapstand kamertemperatuur)"
     },
     "TempChangeShortStep": {
-            "displayText": "Temp change\nshort",
-            "description": "Temperature-change-increment on short button press"
+      "displayText": "temp veran\ndering kort",
+      "description": "Temperatuurveranderingsstap bij korte druk op de knop"
     },
     "TempChangeLongStep": {
-            "displayText": "Temp change\nlong",
-            "description": "Temperature-change-increment on long button press"
+      "displayText": "temp veran\ndering lang",
+      "description": "Temperatuurveranderingsstap bij lange druk op de knop"
     },
     "LockingMode": {
-            "displayText": "Allow locking\nbuttons",
-            "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+      "displayText": "Vergrendel-\ning knoppen",
+      "description": "Houd tijdens het solderen beide knoppen ingedrukt om de vergrendeling in of uit te schakelen (B=alleen boost-modus | F=volledige vergrendeling)"
     },
     "ProfilePhases": {
-            "displayText": "Profile\nPhases",
-            "description": "Number of phases in profile mode"
+      "displayText": "Profiel\nfases",
+      "description": "Nummer van fases in profiel modus"
     },
     "ProfilePreheatTemp": {
-            "displayText": "Preheat\nTemp",
-            "description": "Preheat to this temperature at the start of profile mode"
+      "displayText": "Voorverwarm\ntemperatuur",
+      "description": "Voorverwarm naar deze temperatuur op de start van profiel modus"
     },
     "ProfilePreheatSpeed": {
-            "displayText": "Preheat\nSpeed",
-            "description": "Preheat at this rate (degrees per second)"
+      "displayText": "Voorverwarm\nsnelheid",
+      "description": "Voorverwarm op deze snelheid (graden per seconden)"
     },
     "ProfilePhase1Temp": {
-            "displayText": "Phase 1\nTemp",
-            "description": "Target temperature for the end of this phase"
+      "displayText": "Fase 1\ntemperatuur",
+      "description": "Doel temperatuur op het einde van deze fase"
     },
     "ProfilePhase1Duration": {
-            "displayText": "Phase 1\nDuration",
-            "description": "Target duration of this phase (seconds)"
+      "displayText": "Fase\nduur",
+      "description": "Doel tijdsduur van deze fase (in seconden)"
     },
     "ProfilePhase2Temp": {
-            "displayText": "Phase 2\nTemp",
+      "displayText": "Fase 2\ntemperatuur",
       "description": ""
     },
     "ProfilePhase2Duration": {
-            "displayText": "Phase 2\nDuration",
+      "displayText": "Fase 2\nduur",
       "description": ""
     },
     "ProfilePhase3Temp": {
-            "displayText": "Phase 3\nTemp",
+      "displayText": "Fase 3\ntemperatuur",
       "description": ""
     },
     "ProfilePhase3Duration": {
-            "displayText": "Phase 3\nDuration",
+      "displayText": "Fase 3\nduur",
       "description": ""
     },
     "ProfilePhase4Temp": {
-            "displayText": "Phase 4\nTemp",
+      "displayText": "Fase 4\ntemperatuur",
       "description": ""
     },
     "ProfilePhase4Duration": {
-            "displayText": "Phase 4\nDuration",
+      "displayText": "Fase 4\nduur",
       "description": ""
     },
     "ProfilePhase5Temp": {
-            "displayText": "Phase 5\nTemp",
+      "displayText": "Fase 5\ntemperatuur",
       "description": ""
     },
     "ProfilePhase5Duration": {
-            "displayText": "Phase 5\nDuration",
+      "displayText": "Fase 5\nduur",
       "description": ""
     },
     "ProfileCooldownSpeed": {
-            "displayText": "Cooldown\nSpeed",
-            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "displayText": "Afkoel\nsnelheid",
+      "description": "De snelheid van afkoelen op het eind van profiel modus (graden per seconden)"
     },
     "MotionSensitivity": {
       "displayText": "Bewegings-\ngevoeligheid",
-            "description": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
+      "description": "Bewegingsgevoeligheid (1=minst gevoelig | ... | 9=meest gevoelig)"
     },
     "SleepTemperature": {
       "displayText": "Slaap\ntemp",
@@ -228,8 +248,12 @@
       "description": "Automatisch afsluiten time-out (Minuten)"
     },
     "HallEffSensitivity": {
-            "displayText": "Hall sensor\nsensitivity",
-            "description": "Sensitivity to magnets (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
+      "displayText": "Hall sensor\ngevoeligheid",
+      "description": "Gevoeligheid naar de magneten (1=minst gevoelig | ... | 9=meest gevoelig)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval voordat de \"slaapmodus\" start wanneer het Hall-effect boven de drempelwaarde komt"
     },
     "TemperatureUnit": {
       "displayText": "Temperatuur\nschaal",
@@ -244,76 +268,80 @@
       "description": "Temperatuur knippert in hoofdmenu tijdens afkoeling."
     },
     "ScrollingSpeed": {
-            "displayText": "Scrol\nsnelheid",
-            "description": "Scrolsnelheid van de tekst."
+      "displayText": "Scroll\nsnelheid",
+      "description": "Scrollsnelheid van de tekst."
     },
     "ReverseButtonTempChange": {
-            "displayText": "Swap\n+ - keys",
-            "description": "Reverse assignment of buttons for temperature adjustment"
+      "displayText": "Wissel\n+ - knoppen",
+      "description": "Wissel de knoppen voor temperatuur controle"
     },
     "AnimSpeed": {
-            "displayText": "Anim.\nspeed",
-            "description": "Pace of icon animations in menu (O=off | T=slow | M=medium | S=fast)"
+      "displayText": "Anim.\nsnelheid",
+      "description": "Snelheid van de icoon animaties in het menu (T=sloom | M=middel | S=snel)"
     },
     "AnimLoop": {
-            "displayText": "Anim.\nloop",
-            "description": "Loop icon animations in main menu"
+      "displayText": "Anim.\nherhaling",
+      "description": "Herhaal icoon animaties in hoofdmenu"
     },
     "Brightness": {
-            "displayText": "Screen\nbrightness",
-            "description": "Adjust the OLED screen brightness"
+      "displayText": "Scherm\nhelderheid",
+      "description": "Verander de helderheid van het OLED scherm"
     },
     "ColourInversion": {
-            "displayText": "Invert\nscreen",
-            "description": "Invert the OLED screen colors"
+      "displayText": "Omkeer\nscherm",
+      "description": "Omkeer de kleuren van het OLED scherm"
     },
     "LOGOTime": {
-            "displayText": "Boot logo\nduration",
-            "description": "Set boot logo duration (s=seconds)"
+      "displayText": "Opstart\nlogo lengte",
+      "description": "Zet het lengte van het opstart logo (s=seconden)"
     },
     "AdvancedIdle": {
       "displayText": "Gedetailleerd\nslaapscherm",
-            "description": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm."
+      "description": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm"
     },
     "AdvancedSoldering": {
       "displayText": "Gedetailleerd\nsoldeerscherm",
-            "description": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
+      "description": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm"
     },
     "BluetoothLE": {
       "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+      "description": "Zet Bluetooth aan"
     },
     "PowerLimit": {
       "displayText": "Power\nlimit",
-            "description": "Average maximum power the iron can use (W=watt)"
+      "description": "Gemiddelde maximale power dat de soldeerbout mag gebruiken (W=watt)"
     },
     "CalibrateCJC": {
-            "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+      "displayText": "Calibreer CJC\nbij opstart",
+      "description": "Bij de volgende opstart tip Cold Junction Compensation wordt gecalibreerd (niet nodig als Delta T < 5°C)"
     },
     "VoltageCalibration": {
-            "displayText": "Calibreer\nvoedingsspanning?",
+      "displayText": "Calibreervo-\nedingsspanning?",
       "description": "VIN Calibreren. Bevestigen door knoppen lang in te drukken."
     },
     "PowerPulsePower": {
-            "displayText": "Power\npulse",
-            "description": "Intensity of power of keep-awake-pulse (W=watt)"
+      "displayText": "Power\npuls",
+      "description": "Power van de wakker-houd-puls (W=watt)"
     },
     "PowerPulseWait": {
-            "displayText": "Power pulse\ndelay",
-            "description": "Delay before keep-awake-pulse is triggered (x 2.5s)"
+      "displayText": "Power pulse\nvertraging",
+      "description": "Vertraging voordat de wakker-houd-puls wordt geactiveerd (x 2,5s)"
     },
     "PowerPulseDuration": {
-            "displayText": "Power pulse\nduration",
+      "displayText": "Power pulse\nduur",
       "description": "Keep-awake-pulse duration (x 250ms)"
     },
     "SettingsReset": {
       "displayText": "Instellingen\nresetten?",
-            "description": "Alle instellingen resetten."
+      "description": "Alle instellingen resetten"
     },
     "LanguageSwitch": {
       "displayText": "Spraak:\n NL_BE   Vlaams",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_PL.json

@@ -4,7 +4,7 @@
   "tempUnitFahrenheit": false,
   "messagesWarn": {
     "CalibrationDone": {
-            "message": "Kalibracja\nwykonana!"
+      "message": "Skalibrowano!"
     },
     "ResetOKMessage": {
       "message": "Reset OK"
@@ -31,7 +31,7 @@
       "message": "Ucieczka\ntermiczna"
     },
     "WarningTipShorted": {
-            "message": "!Tip Shorted!"
+      "message": "!Zwarty grot!"
     },
     "SettingsCalibrationWarning": {
       "message": "Upewnij się, że końcówka i uchwyt mają temperaturę pokojową podczas następnego rozruchu!"
@@ -51,44 +51,35 @@
     "InputVoltageString": {
       "message": "Nap. wej.: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzz!"
-        },
     "SleepingAdvancedString": {
       "message": "Tr. uśpienia\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Grot: \n"
     },
-        "OffString": {
-            "message": "Wył"
-        },
     "ProfilePreheatString": {
-            "message": "Preheat\n"
+      "message": "Rozgrzewanie\n"
     },
     "ProfileCooldownString": {
-            "message": "Cooldown\n"
+      "message": "Schładzanie\n"
     },
     "DeviceFailedValidationWarning": {
       "message": "Twoje urządzenie jest najprawdopodobniej podróbką!"
     },
     "TooHotToStartProfileWarning": {
-            "message": "Too hot to\nstart profile"
+      "message": "Zbyt gorące, aby\nuruchomić profil"
     }
   },
   "characters": {
     "SettingRightChar": "P",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "W",
     "SettingMediumChar": "M",
     "SettingFastChar": "S",
-        "SettingStartNoneChar": "B",
     "SettingStartSolderingChar": "T",
     "SettingStartSleepChar": "Z",
     "SettingStartSleepOffChar": "O",
-        "SettingLockDisableChar": "W",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "P"
   },
@@ -114,34 +105,63 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Tryb\ndomyślny"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "Nie\ndynamiczny"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Tryb\nbezpieczny"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nwykrycie"
+    },
+    "TipTypeT12Long": {
+      "displayText": "Długi\nTS100"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Krótki\nPine"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Źródło\nzasilania",
-            "description": "Źródło zasilania. Ustaw napięcie odcięcia. (DC 10V) (S 3.3V dla ogniw Li, wyłącz limit mocy)"
+      "description": "Źródło zasilania. Ustaw napięcie odcięcia. (DC 10V) (S=3.3V dla ogniw Li, wyłącz limit mocy)"
     },
     "MinVolCell": {
       "displayText": "Minimalne\nnapięcie",
       "description": "Minimalne dozwolone napięcie na komórkę (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
     },
     "QCMaxVoltage": {
-            "displayText": "QC\nnapięcie",
+      "displayText": "Napięcie QC",
       "description": "Maksymalne napięcie, które lutownica będzie próbowała wynegocjować z ładowarką Quick Charge (V)"
     },
     "PDNegTimeout": {
       "displayText": "Limit czasu\nPD",
       "description": "Limit czasu negocjacji PD w krokach co 100ms dla zgodności z niektórymi ładowarkami QC (0: wyłączone)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "Tryb PD",
       "description": "Włącza tryby PPS & EPR."
     },
     "BoostTemperature": {
       "displayText": "Temp.\nboost",
-            "description": "Temperatura w trybie \"boost\" "
+      "description": "Temp. w trybie \"boost\" "
     },
     "AutoStart": {
       "displayText": "Aut. uruch.\ntr. lutowania",
-            "description": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania. (B: wyłączone | T: lutowanie | Z: uśpienie | O: uśpienie w temp. pokojowej)"
+      "description": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania. (T: lutowanie | Z: uśpienie | O: uśpienie w temp. pokojowej)"
     },
     "TempChangeShortStep": {
       "displayText": "Zm. temp.\nkr. przyc.",
@@ -153,67 +173,67 @@
     },
     "LockingMode": {
       "displayText": "Blokada\nprzycisków",
-            "description": "W trybie lutowania, wciśnij oba przyciski aby je zablokować (O=Wyłączona | B=tylko Boost | P=pełna blokada)"
+      "description": "W trybie lutowania, wciśnij oba przyciski aby je zablokować (B=tylko Boost | P=pełna blokada)"
     },
     "ProfilePhases": {
-            "displayText": "Profile\nPhases",
-            "description": "Number of phases in profile mode"
+      "displayText": "Fazy\nprofilu",
+      "description": "Liczba faz w trybie profilu"
     },
     "ProfilePreheatTemp": {
-            "displayText": "Preheat\nTemp",
-            "description": "Preheat to this temperature at the start of profile mode"
+      "displayText": "Temp.\nrozgrzewania",
+      "description": "Rozgrzanie do tej temp. na początku trybu profilu"
     },
     "ProfilePreheatSpeed": {
-            "displayText": "Preheat\nSpeed",
-            "description": "Preheat at this rate (degrees per second)"
+      "displayText": "Prędk.\nrozgrzewania",
+      "description": "Tempo rozgrzewania (stopnie na sekundę)"
     },
     "ProfilePhase1Temp": {
-            "displayText": "Phase 1\nTemp",
-            "description": "Target temperature for the end of this phase"
+      "displayText": "Temp.\nfazy 1",
+      "description": "Docelowa temp. na koniec tej fazy"
     },
     "ProfilePhase1Duration": {
-            "displayText": "Phase 1\nDuration",
-            "description": "Target duration of this phase (seconds)"
+      "displayText": "Dług.\nfazy 1",
+      "description": "Docelowy czas trwania tej fazy (sekundy)"
     },
     "ProfilePhase2Temp": {
-            "displayText": "Phase 2\nTemp",
+      "displayText": "Temp.\nfazy 2",
       "description": ""
     },
     "ProfilePhase2Duration": {
-            "displayText": "Phase 2\nDuration",
+      "displayText": "Dług.\nfazy 2",
       "description": ""
     },
     "ProfilePhase3Temp": {
-            "displayText": "Phase 3\nTemp",
+      "displayText": "Temp.\nfazy 3",
       "description": ""
     },
     "ProfilePhase3Duration": {
-            "displayText": "Phase 3\nDuration",
+      "displayText": "Dług.\nfazy 3",
       "description": ""
     },
     "ProfilePhase4Temp": {
-            "displayText": "Phase 4\nTemp",
+      "displayText": "Temp.\nfazy 4",
       "description": ""
     },
     "ProfilePhase4Duration": {
-            "displayText": "Phase 4\nDuration",
+      "displayText": "Dług.\nfazy 4",
       "description": ""
     },
     "ProfilePhase5Temp": {
-            "displayText": "Phase 5\nTemp",
+      "displayText": "Temp.\nfazy 5",
       "description": ""
     },
     "ProfilePhase5Duration": {
-            "displayText": "Phase 5\nDuration",
+      "displayText": "Dług.\nfazy 5",
       "description": ""
     },
     "ProfileCooldownSpeed": {
-            "displayText": "Cooldown\nSpeed",
-            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "displayText": "Prędk.\nschładzania",
+      "description": "Tempo schładzania na koniec trybu profilu (stopnie na sekundę)"
     },
     "MotionSensitivity": {
       "displayText": "Czułość\nwykr. ruchu",
-            "description": "Czułość wykrywania ruchu (0: Wyłączona | 1: Minimalna | ... | 9: Maksymalna)"
+      "description": "Czułość wykrywania ruchu (1: Minimalna | ... | 9: Maksymalna)"
     },
     "SleepTemperature": {
       "displayText": "Temp.\nuśpienia",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Czułość\ncz. Halla",
-            "description": "Czułość czujnika Halla, używanego do przechodznia w tryb uśpienia (0: Wyłączona | 1: Minimalna | ... | 9: Maksymalna)"
+      "description": "Czułość czujnika Halla, używanego do przechodznia w tryb uśpienia (1: Minimalna | ... | 9: Maksymalna)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Odstęp przed rozpoczęciem \"trybu uśpienia\", gdy efekt Halla przekracza próg"
     },
     "TemperatureUnit": {
       "displayText": "Jednostka\ntemperatury",
@@ -240,8 +264,8 @@
       "description": "Obrót ekranu (P: dla praworęcznych | L: dla leworęcznych | A: automatycznie)"
     },
     "CooldownBlink": {
-            "displayText": "Mig. podczas\nwychładzania",
-            "description": "Temperatura miga podczas wychładzania, gdy grot jest wciąż gorący"
+      "displayText": "Mig. podczas\nschładzania",
+      "description": "Temperatura miga podczas schładzania, gdy grot jest wciąż gorący"
     },
     "ScrollingSpeed": {
       "displayText": "Sz. przew.\ntekstu",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Prędkosć\nanimacji",
-            "description": "Prędkość animacji ikon w menu (O: wył. | W: mała | M: średnia | S: duża)"
+      "description": "Prędkość animacji ikon w menu (W: mała | M: średnia | S: duża)"
     },
     "AnimLoop": {
       "displayText": "Zapętlona\nanimacja",
@@ -272,7 +296,7 @@
       "description": "Ustawia czas wyświetlania loga podczas uruchamiania (s=sekund)"
     },
     "AdvancedIdle": {
-            "displayText": "Szeczegółowy\nekran bezczy.",
+      "displayText": "Szczegółowy\nekran bezczyn.",
       "description": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynności"
     },
     "AdvancedSoldering": {
@@ -281,7 +305,7 @@
     },
     "BluetoothLE": {
       "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+      "description": "Włącza Bluetooth Low Energy"
     },
     "PowerLimit": {
       "displayText": "Ogr.\nmocy",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Język:\n PL      Polski",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Typ grotu",
+      "description": "Wybierz typ zamontowanego grotu"
     }
   }
 }

Translations/translation_PT.json

@@ -4,7 +4,7 @@
   "tempUnitFahrenheit": false,
   "messagesWarn": {
     "CalibrationDone": {
-            "message": "Calibração\nefetuada!"
+      "message": "Calibração\nfeita!"
     },
     "ResetOKMessage": {
       "message": "Reset OK"
@@ -28,7 +28,7 @@
       "message": "!Bloqueado!"
     },
     "WarningThermalRunaway": {
-            "message": "Thermal\nRunaway"
+      "message": "Avalanche\nTérmica"
     },
     "WarningTipShorted": {
       "message": "!Tip Shorted!"
@@ -37,7 +37,7 @@
       "message": "Antes de reiniciar certifique-se que o ferro está à temperatura ambiente!"
     },
     "CJCCalibrating": {
-            "message": "calibrar\n"
+      "message": "a calibrar\n"
     },
     "SettingsResetWarning": {
       "message": "Definições de fábrica?"
@@ -51,58 +51,49 @@
     "InputVoltageString": {
       "message": "Tensão: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Repouso...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Ponta: \n"
     },
-        "OffString": {
-            "message": "Off"
-        },
     "ProfilePreheatString": {
-            "message": "Preheat\n"
+      "message": "Pré-Aquecer\n"
     },
     "ProfileCooldownString": {
-            "message": "Cooldown\n"
+      "message": "Arrefecer\n"
     },
     "DeviceFailedValidationWarning": {
       "message": "O seu dispositivo provavelmente é falsificado!"
     },
     "TooHotToStartProfileWarning": {
-            "message": "Too hot to\nstart profile"
+      "message": "Demasiado quente para\niniciar perfil"
     }
   },
   "characters": {
     "SettingRightChar": "D",
     "SettingLeftChar": "C",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
     "SettingFastChar": "F",
-        "SettingStartNoneChar": "D",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "H",
     "SettingStartSleepOffChar": "A",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
   "menuGroups": {
     "PowerMenu": {
-            "displayText": "Configurações de\nenergia",
+      "displayText": "Opções de\nEnergia",
       "description": ""
     },
     "SolderingMenu": {
-            "displayText": "Configurações\nSolda",
+      "displayText": "Opções de\nSolda",
       "description": ""
     },
     "PowerSavingMenu": {
-            "displayText": "Modos\nRepouso",
+      "displayText": "Modo de\nRepouso",
       "description": ""
     },
     "UIMenu": {
@@ -110,10 +101,39 @@
       "description": ""
     },
     "AdvancedMenu": {
-            "displayText": "Menu\nAvançado",
+      "displayText": "Opções\nAvançadas",
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Fonte\nalimentação",
@@ -131,17 +151,17 @@
       "displayText": "PD tempo\nlimite",
       "description": "Tempo limite de negoiciação de PD de 100ms para compatibilidade com alguns carregadores é (0: disabled)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "PD\nMode",
       "description": "Activa o modo PPS & EPR"
     },
     "BoostTemperature": {
-            "displayText": "Temp.\nModo turbo",
+      "displayText": "Temp.\nModo Turbo",
       "description": "Ajuste de temperatura do \"modo turbo\""
     },
     "AutoStart": {
       "displayText": "Aquecimento\nautomático",
-            "description": "Aquece a ponta automaticamente ao ligar (D=desligar | S=soldagem | H=hibernar | A=hibernar temp. ambiente)"
+      "description": "Aquece a ponta automaticamente ao ligar (S=soldagem | H=hibernar | A=hibernar temp. ambiente)"
     },
     "TempChangeShortStep": {
       "displayText": "Mudança temp.\ncurta",
@@ -152,68 +172,68 @@
       "description": "A temperatura será aumentada com um click longo"
     },
     "LockingMode": {
-            "displayText": "Permitir bloquear\nbotões",
-            "description": "Durante a solda premir os dois botões para alternar entre (D=desativados | B=modo turbo | F=bloqueio total)"
+      "displayText": "Permitir bloq.\nbotões",
+      "description": "Durante a solda premir os dois botões para alternar entre (B=modo turbo | F=bloqueio total)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
       "description": "Number of phases in profile mode"
     },
     "ProfilePreheatTemp": {
-            "displayText": "Preheat\nTemp",
-            "description": "Preheat to this temperature at the start of profile mode"
+      "displayText": "Temperatura\nPré-aquecimento",
+      "description": "Pré-aquecer a esta temperatura quando o perfil é selecionado"
     },
     "ProfilePreheatSpeed": {
-            "displayText": "Preheat\nSpeed",
-            "description": "Preheat at this rate (degrees per second)"
+      "displayText": "Velocidade\nPré-aquecimento",
+      "description": "Ritmo de pré-aquecimento (graus por segundo)"
     },
     "ProfilePhase1Temp": {
-            "displayText": "Phase 1\nTemp",
-            "description": "Target temperature for the end of this phase"
+      "displayText": "Temp.\nFase 1",
+      "description": "Temperatura alvo no final desta fase"
     },
     "ProfilePhase1Duration": {
-            "displayText": "Phase 1\nDuration",
-            "description": "Target duration of this phase (seconds)"
+      "displayText": "Duração\nFase 1",
+      "description": "Duração alvo desta fase (segundos)"
     },
     "ProfilePhase2Temp": {
-            "displayText": "Phase 2\nTemp",
+      "displayText": "Temp.\nFase 2",
       "description": ""
     },
     "ProfilePhase2Duration": {
-            "displayText": "Phase 2\nDuration",
+      "displayText": "Duração\nFase 2",
       "description": ""
     },
     "ProfilePhase3Temp": {
-            "displayText": "Phase 3\nTemp",
+      "displayText": "Temp.\nFase 3",
       "description": ""
     },
     "ProfilePhase3Duration": {
-            "displayText": "Phase 3\nDuration",
+      "displayText": "Duração\nFase 3",
       "description": ""
     },
     "ProfilePhase4Temp": {
-            "displayText": "Phase 4\nTemp",
+      "displayText": "Temp.\nFase 4",
       "description": ""
     },
     "ProfilePhase4Duration": {
-            "displayText": "Phase 4\nDuration",
+      "displayText": "Duração\nFase 4",
       "description": ""
     },
     "ProfilePhase5Temp": {
-            "displayText": "Phase 5\nTemp",
+      "displayText": "Temp.\nFase 5",
       "description": ""
     },
     "ProfilePhase5Duration": {
-            "displayText": "Phase 5\nDuration",
+      "displayText": "Duração\nFase 5",
       "description": ""
     },
     "ProfileCooldownSpeed": {
-            "displayText": "Cooldown\nSpeed",
-            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "displayText": "Velocidade\nArrefecimento",
+      "description": "Arrefecer a este ritmo após sair do perfil selecionado (graus por segundo)"
     },
     "MotionSensitivity": {
       "displayText": "Sensibilidade\nmovimento",
-            "description": "Sensibilidade ao movimento (0=Desligado | 1=Menor | ... | 9=Maior)"
+      "description": "Sensibilidade ao movimento (1=Menor | ... | 9=Maior)"
     },
     "SleepTemperature": {
       "displayText": "Temperatura\nrepouso",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Sensibilidade de\nmagnetismo",
-            "description": "Sensibilidade de magnetismo (0=Desligado | 1=Menor | ... | 9=Maior)"
+      "description": "Sensibilidade de magnetismo (1=Menor | ... | 9=Maior)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Intervalo antes do início do \"modo de suspensão\" quando o efeito Hall está acima do limite"
     },
     "TemperatureUnit": {
       "displayText": "Unidade\ntemperatura",
@@ -252,8 +276,8 @@
       "description": "Inverte o funcionamento dos botões de ajuste da temperatura"
     },
     "AnimSpeed": {
-            "displayText": "Velocidade de\nanimação",
-            "description": "Velocidade das animações no menu (O=off | S=lenta | M=média | F=rápida)"
+      "displayText": "Velocidade\nde animação",
+      "description": "Velocidade das animações no menu (S=lenta | M=média | F=rápida)"
     },
     "AnimLoop": {
       "displayText": "Repetir\nanimações",
@@ -268,7 +292,7 @@
       "description": "Inverte as cores do ecrã OLED"
     },
     "LOGOTime": {
-            "displayText": "Duração do\nlogo no arranque",
+      "displayText": "Tempo img.\nno arranque",
       "description": "Define a duração do logotipo no arranque em (s=segundos)"
     },
     "AdvancedIdle": {
@@ -284,7 +308,7 @@
       "description": "Ativa o Bluetooth Low Energy (BLE)"
     },
     "PowerLimit": {
-            "displayText": "Limite de\npotência",
+      "displayText": "Limite\npotência",
       "description": "Potência máxima a usar (W=watt)"
     },
     "CalibrateCJC": {
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Idioma:\n PT   Português",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_RO.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Intrare V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Adormit...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Tip: \n"
     },
-        "OffString": {
-            "message": "Nu"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "D",
     "SettingLeftChar": "S",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "Î",
     "SettingMediumChar": "M",
     "SettingFastChar": "R",
-        "SettingStartNoneChar": "O",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "Z",
     "SettingStartSleepOffChar": "R",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Sursa de\nalimentare",
@@ -131,9 +151,9 @@
       "displayText": "PD\ntimeout",
       "description": "Timp limită de negociere pentru tranzacţia PD, în paşi de 100ms, pentru compatibilitate cu alimentatoarele QC"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Modifică\ntemp. impuls",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Auto\nstart",
-            "description": "Start letcon în modul de lipire la pornire (O=oprit | S=lipire | Z=repaus | R=repaus la temperatura camerei)"
+      "description": "Start letcon în modul de lipire la pornire (S=lipire | Z=repaus | R=repaus la temperatura camerei)"
     },
     "TempChangeShortStep": {
       "displayText": "Schimbare temp.\napăsare scută",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Blocare\nbutoane",
-            "description": "Când lipiţi, apăsaţi lung ambele butoane, pentru a le bloca (D=dezactivare | B=numai \"modul boost\" | F=blocare completă)"
+      "description": "Când lipiţi, apăsaţi lung ambele butoane, pentru a le bloca (B=numai \"modul boost\" | F=blocare completă)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Sensibilitate\nla miscare",
-            "description": "Sensibilitate senzor miscare (0=oprit | 1=puţin sensibil | ... | 9=cel mai sensibil)"
+      "description": "Sensibilitate senzor miscare (1=puţin sensibil | ... | 9=cel mai sensibil)"
     },
     "SleepTemperature": {
       "displayText": "Temp\nrepaus",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Sensibilitate\nsenzor Hall",
-            "description": "Sensibilitate senzor cu efect Hall pentru a detecta repausul (0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil)"
+      "description": "Sensibilitate senzor cu efect Hall pentru a detecta repausul (1=putin sensibil | ... | 9=cel mai sensibil)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Intervalul înainte de începerea \"modului de repaus\" când efectul de sală este peste prag"
     },
     "TemperatureUnit": {
       "displayText": "Unitate de\ntemperatură",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Animaţii\nviteză",
-            "description": "Ritmul animaţiilor pictogramei din meniu (O=oprit | Î=încet | M=mediu | R=rapid)"
+      "description": "Ritmul animaţiilor pictogramei din meniu (Î=încet | M=mediu | R=rapid)"
     },
     "AnimLoop": {
       "displayText": "Animaţii\nbuclă",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Limbă:\n RO      Română",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_RU.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Питание(В):\n"
     },
-        "SleepingSimpleString": {
-            "message": "Хххррп"
-        },
     "SleepingAdvancedString": {
       "message": "Сон...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Жало: \n"
     },
-        "OffString": {
-            "message": "Выкл"
-        },
     "ProfilePreheatString": {
       "message": "Преднагрев\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "П",
     "SettingLeftChar": "Л",
     "SettingAutoChar": "А",
-        "SettingOffChar": "О",
     "SettingSlowChar": "М",
     "SettingMediumChar": "С",
     "SettingFastChar": "Б",
-        "SettingStartNoneChar": "О",
     "SettingStartSolderingChar": "П",
     "SettingStartSleepChar": "С",
     "SettingStartSleepOffChar": "К",
-        "SettingLockDisableChar": "О",
     "SettingLockBoostChar": "Т",
     "SettingLockFullChar": "П"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Вкл.\nPPSиEPR"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "Откл.\n"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Вкл.без\nзапроса"
+    },
+    "TipTypeAuto": {
+      "displayText": "Авто\nопред-е"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nстанд."
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nкоротк."
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80(P)\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Предельное\nнапряжение",
@@ -128,12 +148,12 @@
       "description": "Максимальное напряжение для согласования с источником питания по QC"
     },
     "PDNegTimeout": {
-            "displayText": "PD\nинтервал",
+      "displayText": "Интервал\nPD",
       "description": "Интервал согласования питания по Power Delivery с шагом 100 мс для совместимости с некоторыми источниками питания по QC (0=Откл.)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Включить режимы PPS & EPR"
+    "USBPDMode": {
+      "displayText": "Режим\nPD",
+      "description": "Вкл.без запроса: включить PPS и EPR без запроса большей мощности"
     },
     "BoostTemperature": {
       "displayText": "t° турбо\nрежима",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Режим при\nвключении",
-            "description": "Режим, в котором включается паяльник (О=Откл. | П=Пайка | С=Сон | К=Ожидание при комн. темп.)"
+      "description": "Режим, в котором включается паяльник (П=Пайка | С=Сон | К=Ожидание при комн. темп.)"
     },
     "TempChangeShortStep": {
       "displayText": "Шаг t° при\nкор.наж-ии",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Разрешить\nблок. кнопок",
-            "description": "Блокировать кнопки при их долгом нажатии в режиме пайки (О=Откл. | Т=Только турбо | П=Полная блокировка)"
+      "description": "Блокировать кнопки при их долгом нажатии в режиме пайки (Т=Только турбо | П=Полная блокировка)"
     },
     "ProfilePhases": {
       "displayText": "Этапы\nпрофиля",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Чувствительн.\nакселерометра",
-            "description": "Чувствительность акселерометра (0=Откл. | 1=мин. | ... | 9=макс.)"
+      "description": "Чувствительность акселерометра (1=мин. | ... | 9=макс.)"
     },
     "SleepTemperature": {
       "displayText": "t° при\nсне",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Датчик\nХолла",
-            "description": "Чувствительность датчика Холла к магнитному полю (0=Откл. | 1=мин. | ... | 9=макс.)"
+      "description": "Чувствительность датчика Холла к магнитному полю (1=мин. | ... | 9=макс.)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "Интервал\nдатчика Холла",
+      "description": "Время между превышением датчиком Холла порогового значения и режимом сна"
     },
     "TemperatureUnit": {
       "displayText": "Единицы\nизмерения",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Скорость\nанимации",
-            "description": "Скорость анимации иконок в главном меню (О=Откл. | М=Медленная| С=Средняя | Б=Быстрая)"
+      "description": "Скорость анимации иконок в главном меню (М=Медленная| С=Средняя | Б=Быстрая)"
     },
     "AnimLoop": {
       "displayText": "Зацикленная\nанимация",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Язык:\n RU     Русский",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Тип\nжала",
+      "description": "Выбор типа установленного жала"
     }
   }
 }

Translations/translation_SK.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Vstupné U: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Chrr"
-        },
     "SleepingAdvancedString": {
       "message": "Pokojový režim.\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Hrot: \n"
     },
-        "OffString": {
-            "message": "Vyp"
-        },
     "ProfilePreheatString": {
       "message": "Predhrievanie\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "P",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "Z",
     "SettingSlowChar": "P",
     "SettingMediumChar": "S",
     "SettingFastChar": "R",
-        "SettingStartNoneChar": "V",
     "SettingStartSolderingChar": "Z",
     "SettingStartSleepChar": "S",
     "SettingStartSleepOffChar": "I",
-        "SettingLockDisableChar": "Z",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "P"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Zdroj\nnapätia",
@@ -131,8 +151,8 @@
       "displayText": "Čas vypršania\nPower Delivery",
       "description": "Čas vyjednávania Power Delivery v 100ms krokoch pre kompatibilitu s niektorými QC nabíjačkami (0: vypnuté)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "PD\nMode",
       "description": "Zapína PPS & EPR režimy"
     },
     "BoostTemperature": {
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Automatické\nspustenie",
-            "description": "Pri štarte spustiť režim spájkovania (V=Vyp | Z=Spájkovanie | S=Spanok | I=Spanok izbová teplota)"
+      "description": "Pri štarte spustiť režim spájkovania (Z=Spájkovanie | S=Spanok | I=Spanok izbová teplota)"
     },
     "TempChangeShortStep": {
       "displayText": "Malý krok\nteploty",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Povoliť zámok\ntlačidiel",
-            "description": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania (Z=Zakázať | B=Okrem boost | P=Plné zamknutie)"
+      "description": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania (B=Okrem boost | P=Plné zamknutie)"
     },
     "ProfilePhases": {
       "displayText": "Profilové\nFázy",
@@ -204,7 +224,7 @@
       "description": ""
     },
     "ProfilePhase5Duration": {
-            "displayText": "Trvanie\nFáza 4",
+      "displayText": "Trvanie\nFáza 5",
       "description": ""
     },
     "ProfileCooldownSpeed": {
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Citlivosť\npohybu",
-            "description": "Citlivosť detekcie pohybu (0=Vyp | 1=Min | ... | 9=Max)"
+      "description": "Citlivosť detekcie pohybu (1=Min | ... | 9=Max)"
     },
     "SleepTemperature": {
       "displayText": "Pokojová\nteplota",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Citliv.\nHall",
-            "description": "Citlivosť Hallovho senzora pre detekciu spánku (0=Vyp | 1=Min | ... | 9=Max)"
+      "description": "Citlivosť Hallovho senzora pre detekciu spánku (1=Min | ... | 9=Max)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval pred spustením \"režimu spánku\" keď je hall efekt nad prahovou hodnotou"
     },
     "TemperatureUnit": {
       "displayText": "Jednotka\nteploty",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Rýchlosť\nanimácií",
-            "description": "Rýchlosť animácií ikoniek v menu (O=off | P=pomaly | S=stredne | R=rýchlo)"
+      "description": "Rýchlosť animácií ikoniek v menu (P=pomaly | S=stredne | R=rýchlo)"
     },
     "AnimLoop": {
       "displayText": "Opakovanie\nanimácií",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Jazyk:\n SK  Slovenčina",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_SL.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Vhodna U: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Spim...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Konica \n"
     },
-        "OffString": {
-            "message": "Off"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "D",
     "SettingLeftChar": "L",
     "SettingAutoChar": "S",
-        "SettingOffChar": "U",
     "SettingSlowChar": "P",
     "SettingMediumChar": "M",
     "SettingFastChar": "H",
-        "SettingStartNoneChar": "U",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "Z",
     "SettingStartSleepOffChar": "V",
-        "SettingLockDisableChar": "O",
     "SettingLockBoostChar": "L",
     "SettingLockFullChar": "P"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Vir\nnapajanja",
@@ -131,9 +151,9 @@
       "displayText": "PD\ntimeout",
       "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Pospešena\ntemp.",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Samodejni\nzagon",
-            "description": "Samodejno gretje konice ob vklopu (U=ugasnjeno | S=spajkanje | Z=spanje | V=spanje na sobni temperaturi)"
+      "description": "Samodejno gretje konice ob vklopu (S=spajkanje | Z=spanje | V=spanje na sobni temperaturi)"
     },
     "TempChangeShortStep": {
       "displayText": "Kratka sprememba\ntemperature?",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Omogoči\nzaklep gumbov",
-            "description": "Za zaklep med spajkanjem drži oba gumba (O=onemogoči | L=le pospešeno | P=polno)"
+      "description": "Za zaklep med spajkanjem drži oba gumba (L=le pospešeno | P=polno)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Občutljivost\npremikanja",
-            "description": "0=izklopljeno | 1=najmanjša | ... | 9=največja"
+      "description": "1=najmanjša | ... | 9=največja"
     },
     "SleepTemperature": {
       "displayText": "Temp. med\nspanjem",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Občut.\nHall son",
-            "description": "Občutljivost Hallove sonde za zaznavanje spanja (0=izklopljeno | 1=najmanjša | ... | 9=največja)"
+      "description": "Občutljivost Hallove sonde za zaznavanje spanja (1=najmanjša | ... | 9=največja)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval pred začetkom \"načina mirovanja\", ko je Hallov učinek nad pragom"
     },
     "TemperatureUnit": {
       "displayText": "Enota za\ntemperaturo",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",
-            "description": "Pace of icon animations in menu (O=off | P=slow | M=medium | H=fast)"
+      "description": "Pace of icon animations in menu (P=slow | M=medium | H=fast)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nloop",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Jezik:\n SL Slovenščina",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_SR_CYRL.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Ул. напон: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Сан"
-        },
     "SleepingAdvancedString": {
       "message": "Спавање...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Врх: \n"
     },
-        "OffString": {
-            "message": "Иск"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "Д",
     "SettingLeftChar": "Л",
     "SettingAutoChar": "А",
-        "SettingOffChar": "O",
     "SettingSlowChar": "С",
     "SettingMediumChar": "M",
     "SettingFastChar": "Б",
-        "SettingStartNoneChar": "И",
     "SettingStartSolderingChar": "Л",
     "SettingStartSleepChar": "С",
     "SettingStartSleepOffChar": "X",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Врста\nнапајања",
@@ -131,9 +151,9 @@
       "displayText": "PD\ntimeout",
       "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Темп.\nпојачања",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Врући\nстарт",
-            "description": "Лемилица одмах по покретању прелази у режим лемљења и греје се. (И=искључити | Л=лемљење | С=спавати | X=спавати собна температура)"
+      "description": "Лемилица одмах по покретању прелази у режим лемљења и греје се. (Л=лемљење | С=спавати | X=спавати собна температура)"
     },
     "TempChangeShortStep": {
       "displayText": "Temp change\nshort",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Allow locking\nbuttons",
-            "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+      "description": "While soldering, hold down both buttons to toggle locking them (B=boost mode only | F=full locking)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Осетљивост\nна покрет",
-            "description": "Осетљивост сензора покрета. (0=искључено | 1=најмање осетљиво | ... | 9=најосетљивије)"
+      "description": "Осетљивост сензора покрета. (1=најмање осетљиво | ... | 9=најосетљивије)"
     },
     "SleepTemperature": {
       "displayText": "Темп.\nспавања",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Hall sensor\nsensitivity",
-            "description": "Sensitivity to magnets (0=искључено | 1=најмање осетљиво | ... | 9=најосетљивије)"
+      "description": "Sensitivity to magnets (1=најмање осетљиво | ... | 9=најосетљивије)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Интервал пре почетка \"режима спавања\" када је ефекат Хола изнад прага"
     },
     "TemperatureUnit": {
       "displayText": "Јединица\nтемпературе",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",
-            "description": "Pace of icon animations in menu (O=off | С=slow | M=medium | Б=fast)"
+      "description": "Pace of icon animations in menu (С=slow | M=medium | Б=fast)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nloop",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Jезик:\n SR      Српски",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_SR_LATN.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Ul. napon: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzz"
-        },
     "SleepingAdvancedString": {
       "message": "Spavanje...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Vrh: \n"
     },
-        "OffString": {
-            "message": "Isk"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "D",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
     "SettingFastChar": "B",
-        "SettingStartNoneChar": "I",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "S",
     "SettingStartSleepOffChar": "X",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Vrsta\nnapajanja",
@@ -131,9 +151,9 @@
       "displayText": "PD\ntimeout",
       "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Temp.\npojačanja",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Vrući\nstart",
-            "description": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se. (I=isključiti | L=lemljenje | S=spavati | X=spavati sobna temperatura)"
+      "description": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se. (L=lemljenje | S=spavati | X=spavati sobna temperatura)"
     },
     "TempChangeShortStep": {
       "displayText": "Temp change\nshort",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Allow locking\nbuttons",
-            "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+      "description": "While soldering, hold down both buttons to toggle locking them (B=boost mode only | F=full locking)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Osetljivost\nna pokret",
-            "description": "Osetljivost senzora pokreta. (0=isključeno | 1=najmanje osetljivo | ... | 9=najosetljivije)"
+      "description": "Osetljivost senzora pokreta. (1=najmanje osetljivo | ... | 9=najosetljivije)"
     },
     "SleepTemperature": {
       "displayText": "Temp.\nspavanja",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Hall sensor\nsensitivity",
-            "description": "Sensitivity to magnets (0=isključeno | 1=najmanje osetljivo | ... | 9=najosetljivije)"
+      "description": "Sensitivity to magnets (1=najmanje osetljivo | ... | 9=najosetljivije)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
     },
     "TemperatureUnit": {
       "displayText": "Jedinica\ntemperature",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",
-            "description": "Pace of icon animations in menu (O=off | S=slow | M=medium | B=fast)"
+      "description": "Pace of icon animations in menu (S=slow | M=medium | B=fast)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nloop",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Jezik:\n SR      Srpski",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_SV.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Inspän. V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Viloläge...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Spets: \n"
     },
-        "OffString": {
-            "message": "Av"
-        },
     "ProfilePreheatString": {
       "message": "Förvärmning\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "H",
     "SettingLeftChar": "V",
     "SettingAutoChar": "A",
-        "SettingOffChar": "A",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
     "SettingFastChar": "S",
-        "SettingStartNoneChar": "A",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "V",
     "SettingStartSleepOffChar": "R",
-        "SettingLockDisableChar": "A",
     "SettingLockBoostChar": "T",
     "SettingLockFullChar": "F"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Ström-\nkälla",
@@ -131,8 +151,8 @@
       "displayText": "PD\npauser",
       "description": "PD förhandlings pauser i 100ms steg för kompatibilitet med vissa PD laddare"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "PD\nMode",
       "description": "Slår på PPS & EPR lägen"
     },
     "BoostTemperature": {
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Auto\nstart",
-            "description": "Startar automatiskt lödpennan vid uppstart. (A=Av | L=Lödning | V=Viloläge | R=Viloläge Rumstemperatur)"
+      "description": "Startar automatiskt lödpennan vid uppstart. (L=Lödning | V=Viloläge | R=Viloläge Rumstemperatur)"
     },
     "TempChangeShortStep": {
       "displayText": "Temp.just\nkorttryck",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Tillåt lås\nvia knappar",
-            "description": "Vid lödning, håll nere bägge knappar för att slå på lås (A=Av | T=Bara turbo | F=Fullt lås)"
+      "description": "Vid lödning, håll nere bägge knappar för att slå på lås (T=Bara turbo | F=Fullt lås)"
     },
     "ProfilePhases": {
       "displayText": "Profil-\nfaser",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Rörelse-\nkänslighet",
-            "description": "Rörelsekänslighet (0=Av | 1=minst känslig | ... | 9=mest känslig)"
+      "description": "Rörelsekänslighet (1=minst känslig | ... | 9=mest känslig)"
     },
     "SleepTemperature": {
       "displayText": "Vilo-\ntemp",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "Sensor-\nkänslght",
-            "description": "Känslighet för halleffekt-sensorn för viloläges-detektering (0=Av | 1=minst känslig | ... | 9=mest känslig)"
+      "description": "Känslighet för halleffekt-sensorn för viloläges-detektering (1=minst känslig | ... | 9=mest känslig)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
     },
     "TemperatureUnit": {
       "displayText": "Temperatur-\nenheter",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Anim.-\nhastighet",
-            "description": "Animationshastighet för ikoner i menyer (A=av | L=långsam | M=medel | S=snabb)"
+      "description": "Animationshastighet för ikoner i menyer (L=långsam | M=medel | S=snabb)"
     },
     "AnimLoop": {
       "displayText": "Anim.\nloop",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Språk:\n SV     Svenska",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_TR.json

@@ -4,7 +4,7 @@
   "tempUnitFahrenheit": false,
   "messagesWarn": {
     "CalibrationDone": {
-            "message": "Calibration\ndone!"
+      "message": "Kalibrasyon\ntamam!"
     },
     "ResetOKMessage": {
       "message": "Sıfırlama Tamam"
@@ -13,31 +13,31 @@
       "message": "Ayarlar\nSıfırlandı"
     },
     "NoAccelerometerMessage": {
-            "message": "No accelerometer\ndetected!"
+      "message": "İvme sensörü\ntespit edilmedi!"
     },
     "NoPowerDeliveryMessage": {
-            "message": "No USB-PD IC\ndetected!"
+      "message": "USB-PD IC\ntespit edilmedi!"
     },
     "LockingKeysString": {
-            "message": "LOCKED"
+      "message": "KİLİTLİ"
     },
     "UnlockingKeysString": {
-            "message": "UNLOCKED"
+      "message": "KİLİT AÇIK"
     },
     "WarningKeysLockedString": {
-            "message": "!LOCKED!"
+      "message": "!KİLİTLİ!"
     },
     "WarningThermalRunaway": {
-            "message": "Thermal\nRunaway"
+      "message": "Termal\nKaçak"
     },
     "WarningTipShorted": {
-            "message": "!Tip Shorted!"
+      "message": "!Uç Kısa Devre!"
     },
     "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+      "message": "Yeniden başlatmadan önce uç ve sapın oda sıcaklığında olduğundan emin olun!"
     },
     "CJCCalibrating": {
-            "message": "calibrating\n"
+      "message": "kalibre ediliyor\n"
     },
     "SettingsResetWarning": {
       "message": "Ayarları varsayılan değerlere sıfırlamak istediğinizden emin misiniz?"
@@ -51,50 +51,41 @@
     "InputVoltageString": {
       "message": "Giriş V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Bekleme Modu...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Uç: \n"
     },
-        "OffString": {
-            "message": "Kapalı"
-        },
     "ProfilePreheatString": {
-            "message": "Preheat\n"
+      "message": "Ön Isıtma\n"
     },
     "ProfileCooldownString": {
-            "message": "Cooldown\n"
+      "message": "Soğuma\n"
     },
     "DeviceFailedValidationWarning": {
-            "message": "Your device is most likely a counterfeit!"
+      "message": "Cihazınız büyük olasılıkla sahte!"
     },
     "TooHotToStartProfileWarning": {
-            "message": "Too hot to\nstart profile"
+      "message": "Profil başlatmak için\nçok sıcak"
     }
   },
   "characters": {
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "O",
-        "SettingOffChar": "K",
     "SettingSlowChar": "Y",
     "SettingMediumChar": "O",
     "SettingFastChar": "H",
-        "SettingStartNoneChar": "K",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "U",
     "SettingStartSleepOffChar": "S",
-        "SettingLockDisableChar": "K",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
   "menuGroups": {
     "PowerMenu": {
-            "displayText": "Power\nsettings",
+      "displayText": "Güç\nAyarları",
       "description": ""
     },
     "SolderingMenu": {
@@ -114,26 +105,55 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "GÇKYN\n",
       "description": "\"Güç Kaynağı\". En düşük çalışma voltajını ayarlar. (DC 10V) (S 3.3V hücre başına)"
     },
     "MinVolCell": {
-            "displayText": "Minimum\nvoltage",
-            "description": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+      "displayText": "Minimum\nVoltaj",
+      "description": "Pil hücresi başına izin verilen minimum voltaj (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
     },
     "QCMaxVoltage": {
-            "displayText": "QC\nvoltage",
-            "description": "Max QC voltage the iron should negotiate for"
+      "displayText": "QC\nvoltajı",
+      "description": "Max istenecek QC voltajı"
     },
     "PDNegTimeout": {
-            "displayText": "PD\ntimeout",
-            "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+      "displayText": "PD\nTimeout",
+      "description": "Bazı QC şarj cihazlarıyla uyumluluk için 100ms adımlarında PD pazarlık zaman aşımı"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "PPS & EPR modlarını etkinleştirir"
     },
     "BoostTemperature": {
       "displayText": "YKSC\n",
@@ -141,79 +161,79 @@
     },
     "AutoStart": {
       "displayText": "OTOBAŞ\n",
-            "description": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. (K=Kapalı | L=Lehimleme Modu | U=Uyku Modu | S=Uyku Modu Oda Sıcaklığı)"
+      "description": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. (L=Lehimleme Modu | U=Uyku Modu | S=Uyku Modu Oda Sıcaklığı)"
     },
     "TempChangeShortStep": {
-            "displayText": "Temp change\nshort",
+      "displayText": "Sıcaklık değişimi\nkısa",
       "description": "Kısa basışlardaki sıcaklık derecesi atlama oranı"
     },
     "TempChangeLongStep": {
-            "displayText": "Temp change\nlong",
+      "displayText": "Sıcaklık değişimi\nuzun",
       "description": "Uzun başışlardaki sıcaklık derecesi atlama oranı"
     },
     "LockingMode": {
-            "displayText": "Allow locking\nbuttons",
-            "description": "While soldering, hold down both buttons to toggle locking them (K=Kapalı | B=boost mode only | F=full locking)"
+      "displayText": "Kilitleme\nİzni",
+      "description": "Lehimleme sırasında, her iki düğmeye basılı tutarak kilitleme modunu değiştirin (B=Sadece performans modu | F=tam kilit)"
     },
     "ProfilePhases": {
-            "displayText": "Profile\nPhases",
-            "description": "Number of phases in profile mode"
+      "displayText": "Profil\nAşamaları",
+      "description": "Profil modundaki aşamaların sayısı"
     },
     "ProfilePreheatTemp": {
-            "displayText": "Preheat\nTemp",
-            "description": "Preheat to this temperature at the start of profile mode"
+      "displayText": "Ön Isıtma\nSıcaklık",
+      "description": "Profil modunun başlangıcında bu sıcaklığa kadar ön ısıtma yapar"
     },
     "ProfilePreheatSpeed": {
-            "displayText": "Preheat\nSpeed",
-            "description": "Preheat at this rate (degrees per second)"
+      "displayText": "Ön Isıtma\nHızı",
+      "description": "Bu hızda ön ısıtma yapın (saniye başına derece)"
     },
     "ProfilePhase1Temp": {
-            "displayText": "Phase 1\nTemp",
-            "description": "Target temperature for the end of this phase"
+      "displayText": "Aşama 1\nSıcaklık",
+      "description": "Bu aşamanın sonunda hedeflenen sıcaklık"
     },
     "ProfilePhase1Duration": {
-            "displayText": "Phase 1\nDuration",
-            "description": "Target duration of this phase (seconds)"
+      "displayText": "Aşama 1\nSüre",
+      "description": "Bu aşamanın hedef süresi (saniye)"
     },
     "ProfilePhase2Temp": {
-            "displayText": "Phase 2\nTemp",
+      "displayText": "Aşama 2\nSıcaklık",
       "description": ""
     },
     "ProfilePhase2Duration": {
-            "displayText": "Phase 2\nDuration",
+      "displayText": "Aşama 2\nSüre",
       "description": ""
     },
     "ProfilePhase3Temp": {
-            "displayText": "Phase 3\nTemp",
+      "displayText": "Aşama 3\nSıcaklık",
       "description": ""
     },
     "ProfilePhase3Duration": {
-            "displayText": "Phase 3\nDuration",
+      "displayText": "Aşama 3\nSüre",
       "description": ""
     },
     "ProfilePhase4Temp": {
-            "displayText": "Phase 4\nTemp",
+      "displayText": "Aşama 4\nSıcaklık",
       "description": ""
     },
     "ProfilePhase4Duration": {
-            "displayText": "Phase 4\nDuration",
+      "displayText": "Aşama 4\nSüre",
       "description": ""
     },
     "ProfilePhase5Temp": {
-            "displayText": "Phase 5\nTemp",
+      "displayText": "Aşama 5\nSıcaklık",
       "description": ""
     },
     "ProfilePhase5Duration": {
-            "displayText": "Phase 5\nDuration",
+      "displayText": "Aşama 5\nSüre",
       "description": ""
     },
     "ProfileCooldownSpeed": {
-            "displayText": "Cooldown\nSpeed",
-            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "displayText": "Soğuma\nHızı",
+      "description": "Profil modunun sonunda bu hızda soğuma yapın (saniye başına derece)"
     },
     "MotionSensitivity": {
       "displayText": "HARHAS\n",
-            "description": "Hareket Hassasiyeti (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"
+      "description": "Hareket Hassasiyeti (1=En az duyarlı | ... | 9=En duyarlı)"
     },
     "SleepTemperature": {
       "displayText": "BKSC\n",
@@ -228,8 +248,12 @@
       "description": "Kapatma Zaman Aşımı (Dakika)"
     },
     "HallEffSensitivity": {
-            "displayText": "Hall sensor\nsensitivity",
-            "description": "Sensitivity to magnets (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"
+      "displayText": "Hall Sensör\nHassasiyeti",
+      "description": "Mıknatıslara duyarlılık (1=En az duyarlı | ... | 9=En duyarlı)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Hall etkisi eşiğin üzerinde olduğunda \"uyku modu\" başlamadan önceki aralık"
     },
     "TemperatureUnit": {
       "displayText": "SCKBRM\n",
@@ -248,28 +272,28 @@
       "description": "Bu yazının kayma hızı (Y=Yavaş | H=Hızlı)"
     },
     "ReverseButtonTempChange": {
-            "displayText": "Swap\n+ - keys",
+      "displayText": "Düğme Yerleri\nRotasyonu",
       "description": "\"Düğme Yerleri Rotasyonu\" Sıcaklık ayar düğmelerinin yerini değiştirin"
     },
     "AnimSpeed": {
-            "displayText": "Anim.\nspeed",
-            "description": "Pace of icon animations in menu (K=Kapalı | Y=Yavaş | O=Orta | H=Hızlı)"
+      "displayText": "Animasyon\nHızı",
+      "description": "Menüdeki simge animasyonlarının hızı (Y=Yavaş | O=Orta | H=Hızlı)"
     },
     "AnimLoop": {
-            "displayText": "Anim.\nloop",
-            "description": "Loop icon animations in main menu"
+      "displayText": "Animasyon\nDöngüsü",
+      "description": "Ana menüde simge animasyonlarının döngüsü"
     },
     "Brightness": {
-            "displayText": "Screen\nbrightness",
-            "description": "Adjust the OLED screen brightness"
+      "displayText": "Ekran\nparlaklığı",
+      "description": "OLED ekran parlaklığını ayarlar"
     },
     "ColourInversion": {
-            "displayText": "Invert\nscreen",
-            "description": "Invert the OLED screen colors"
+      "displayText": "Ekran\nRenkleri",
+      "description": "OLED ekran renklerini ters çevir"
     },
     "LOGOTime": {
-            "displayText": "Boot logo\nduration",
-            "description": "Set boot logo duration (s=seconds)"
+      "displayText": "Boot Logo\nSüresi",
+      "description": "Boot logo süresi (s=saniye)"
     },
     "AdvancedIdle": {
       "displayText": "AYRBİL\n",
@@ -281,31 +305,31 @@
     },
     "BluetoothLE": {
       "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+      "description": "Bluetooth LE'yi etkinleştirir"
     },
     "PowerLimit": {
-            "displayText": "Power\nlimit",
+      "displayText": "Güç\nlimiti",
       "description": "Havyanın kullanacağı en yüksek güç (W=Watts)"
     },
     "CalibrateCJC": {
-            "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+      "displayText": "CJC Kalibrasyonu\nSonraki Boot'ta",
+      "description": "Sonraki boot'ta uç Soğuk Nokta Kompansasyonu kalibre edilecek (Delta T < 5°C ise gerekmez)"
     },
     "VoltageCalibration": {
       "displayText": "VOL KAL?\n",
       "description": "Voltaj Girişi Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas."
     },
     "PowerPulsePower": {
-            "displayText": "Power\npulse",
+      "displayText": "Güç\nDarbeleri",
       "description": "Güç girişi voltajı ölçüm yoğunluğunu sık tut."
     },
     "PowerPulseWait": {
-            "displayText": "Power pulse\ndelay",
-            "description": "Delay before keep-awake-pulse is triggered (x 2.5s)"
+      "displayText": "Güç Darbesi\nGecikmesi",
+      "description": "Uyanık tutma darbesinin tetiklenmeden önceki gecikme süresi (x 2.5s)"
     },
     "PowerPulseDuration": {
-            "displayText": "Power pulse\nduration",
-            "description": "Keep-awake-pulse duration (x 250ms)"
+      "displayText": "Güç Darbesi\nSüresi",
+      "description": "Uyanık tutma darbesi süresi (x 250ms)"
     },
     "SettingsReset": {
       "displayText": "SIFIRLA?\n",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Dil:\n TR      Türkçe",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_UK.json

@@ -31,7 +31,7 @@
       "message": "Некерований\nрозігрів"
     },
     "WarningTipShorted": {
-            "message": "!Tip Shorted!"
+      "message": "!Жало закорочено!"
     },
     "SettingsCalibrationWarning": {
       "message": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну температуру!"
@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Жив.(B): \n"
     },
-        "SleepingSimpleString": {
-            "message": "ZzZzz"
-        },
     "SleepingAdvancedString": {
-            "message": "Очікування...\n"
+      "message": "Сон...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Жало: \n"
     },
-        "OffString": {
-            "message": "Вимк"
-        },
     "ProfilePreheatString": {
       "message": "Попередній\nрозігрів"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "П",
     "SettingLeftChar": "Л",
     "SettingAutoChar": "A",
-        "SettingOffChar": "B",
     "SettingSlowChar": "Н",
     "SettingMediumChar": "С",
     "SettingFastChar": "М",
-        "SettingStartNoneChar": "В",
     "SettingStartSolderingChar": "П",
-        "SettingStartSleepChar": "О",
+    "SettingStartSleepChar": "С",
     "SettingStartSleepOffChar": "К",
-        "SettingLockDisableChar": "В",
     "SettingLockBoostChar": "Т",
     "SettingLockFullChar": "П"
   },
@@ -102,7 +93,7 @@
       "description": ""
     },
     "PowerSavingMenu": {
-            "displayText": "Режим\nсну",
+      "displayText": "Режим сну\n",
       "description": ""
     },
     "UIMenu": {
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Режим\nЗамовчуванню"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "Без\nДинамічного"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Безпечний\nРежим"
+    },
+    "TipTypeAuto": {
+      "displayText": "Авто\nВизначення"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nДовге"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nКоротке"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Джерело\nживлення",
@@ -125,35 +145,35 @@
     },
     "QCMaxVoltage": {
       "displayText": "Потужність\nдж. живлення",
-            "description": "Потужність джерела живлення в Ватах"
+      "description": "Потужність ДЖ в Ватах"
     },
     "PDNegTimeout": {
-            "displayText": "PD\nзатримка",
-            "description": "Затримка у 100мс інкрементах для PD для сумісності з деякими QC зарядними пристроями (0: вимкнено)"
+      "displayText": "PD\nЗатримка",
+      "description": "Затримка у 100мс інкрементах для PD для сумісності з деякими версіями QC (0: вимкнена)"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
+    "USBPDMode": {
+      "displayText": "PD\nРежим",
       "description": "Вмикає режими PPS & EPR."
     },
     "BoostTemperature": {
       "displayText": "Темпер.\nТурбо",
-            "description": "Температура в \"Турбо\" режимі"
+      "description": "Температура \"Турбо\" режиму"
     },
     "AutoStart": {
       "displayText": "Гарячий\nстарт",
-            "description": "Режим в якому запускається паяльник при ввімкненні (В=Вимк. | П=Пайка | О=Очікування | К=Очікування при кімн. темп.)"
+      "description": "Режим запуску паяльника (П=Пайка | С=Сон | К=Сон при кімн. темп.)"
     },
     "TempChangeShortStep": {
-            "displayText": "Зміна темп.\nкоротко?",
-            "description": "Змінювати температуру при короткому натисканні!"
+      "displayText": "Зміна темп.\nкоротким",
+      "description": "Зміна температуру при короткому натисканні!"
     },
     "TempChangeLongStep": {
-            "displayText": "Зміна темп.\nдовго?",
-            "description": "Змінювати температуру при довгому натисканні!"
+      "displayText": "Зміна темп.\nдовгим",
+      "description": "Зміна температуру при довгому натисканні!"
     },
     "LockingMode": {
       "displayText": "Дозволити\nблок. кнопок",
-            "description": "Під час пайки тривале натискання обох кнопок заблокує їх (В=Вимк | Т=Тільки турбо | П=Повне)"
+      "description": "Під час пайки тривале натискання обох кнопок заблокує їх (Т=Тільки турбо | П=Повне)"
     },
     "ProfilePhases": {
       "displayText": "Етапи\nпрофілів",
@@ -165,15 +185,15 @@
     },
     "ProfilePreheatSpeed": {
       "displayText": "Швидкість\nПоп.Розігріву",
-            "description": "Розігрівати з такою швидкістю (градусів в секунду)"
+      "description": "Розігрівати з швидкістю (t° у сек)"
     },
     "ProfilePhase1Temp": {
       "displayText": "Етап 1\nТемпература",
-            "description": "Температура в кінці цього етапу"
+      "description": "Температура на кінці цього етапу"
     },
     "ProfilePhase1Duration": {
       "displayText": "Етап 1\nТривалість",
-            "description": "Тривалість цього етапу (секунд)"
+      "description": "Тривалість цього етапу (сек)"
     },
     "ProfilePhase2Temp": {
       "displayText": "Етап 2\nТемпература",
@@ -209,39 +229,43 @@
     },
     "ProfileCooldownSpeed": {
       "displayText": "Швидкість\nОхолодження",
-            "description": "Швидкість охолодження в кінці режиму профілів (градусів в секунду)"
+      "description": "Швидкість охолодження на кінці режиму профілів (t° у сек)"
     },
     "MotionSensitivity": {
-            "displayText": "Чутливість\nсенсору руху",
-            "description": "Акселерометр (0=Вимк. | 1=мін. чутливості | ... | 9=макс. чутливості)"
+      "displayText": "Чутливість\nдатчику руху",
+      "description": "Акселерометр (1=мін. чутливості | ... | 9=макс. чутливість)"
     },
     "SleepTemperature": {
       "displayText": "Темпер.\nсну",
-            "description": "Температура режиму очікування (C° | F°)"
+      "description": "Температура режиму сну (C° | F°)"
     },
     "SleepTimeout": {
       "displayText": "Тайм-аут\nсну",
-            "description": "Час до переходу в режим очікування (Хвилини | Секунди)"
+      "description": "Час до переходу до сну (Хв | Сек)"
     },
     "ShutdownTimeout": {
       "displayText": "Часу до\nвимкнення",
-            "description": "Час до вимкнення (Хвилини)"
+      "description": "Час до вимкнення (Хв)"
     },
     "HallEffSensitivity": {
-            "displayText": "Чутливість\nЕфекту Холла",
-            "description": "Чутливість датчика ефекту Холла при виявленні сну (0=Вимк. | 1=мін. чутливості | ... | 9=макс. чутливості)"
+      "displayText": "Чутливість\nДатчику Холла",
+      "description": "Чутливість датчика Холла при виявленні сну (1=мін. чутливість | ... | 9=макс. чутливість)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "Датчик Холла\nЧас сну",
+      "description": "Проміжок часу до \"часу сну\" за умови спрацювання датчику Холла"
     },
     "TemperatureUnit": {
       "displayText": "Формат темпе-\nратури(C°/F°)",
       "description": "Одиниця виміру температури (C=Цельсій | F=Фаренгейт)"
     },
     "DisplayRotation": {
-            "displayText": "Автоповорот\nекрану",
-            "description": "Орієнтація дисплея (П=Правша | Л=Лівша | A=Автоповорот)"
+      "displayText": "Обертання\nекрану",
+      "description": "Орієнтація екрану (П=Правша | Л=Лівша | A=Автооберт.)"
     },
     "CooldownBlink": {
       "displayText": "Показ t° при\nохолодженні",
-            "description": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран моргає"
+      "description": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран мерехтить"
     },
     "ScrollingSpeed": {
       "displayText": "Швидкість\nтексту",
@@ -253,11 +277,11 @@
     },
     "AnimSpeed": {
       "displayText": "Швидкість\nанімації",
-            "description": "Швидкість анімації іконок у головному меню (В=Вимк | Н=Низькa | С=Середня | М=Максимальна)"
+      "description": "Швидкість анімації іконок у меню (Н=Низькa | С=Середня | М=Максимальна)"
     },
     "AnimLoop": {
       "displayText": "Циклічна\nанімація",
-            "description": "Циклічна анімація іконок в головному меню"
+      "description": "Циклічна анімація іконок у меню"
     },
     "Brightness": {
       "displayText": "Яскравість\nекрану",
@@ -268,8 +292,8 @@
       "description": "Інвертувати кольори на OLED екрані"
     },
     "LOGOTime": {
-            "displayText": "Тривалість\nлоготипу завантаження",
-            "description": "Встановити тривалість показу лого при завантаженні (с=секунд)"
+      "displayText": "Тривалість\nлоготипу при запуску",
+      "description": "Поточна тривалість показу лого при запуску (сек)"
     },
     "AdvancedIdle": {
       "displayText": "Детальний ре-\nжим очікуван.",
@@ -285,11 +309,11 @@
     },
     "PowerLimit": {
       "displayText": "Макс.\nпотуж.",
-            "description": "Макс. потужність, яку може використовувати паяльник (Ват)"
+      "description": "Макс. потужність, яку може використовувати паяльник (Ватт)"
     },
     "CalibrateCJC": {
-            "displayText": "Калібрувати КХС\nпри наступному завантаженні",
-            "description": "При наступному завантаження буде відкалібровано Компенсацію Холодного Спаю жала (непотрібне при різниці температур < 5°C)"
+      "displayText": "Калібрувати КХС\nпри наступному запуску",
+      "description": "При наступному запуску буде відкалібровано Компенсацію Холодного Спаю жала (непотрібне при різниці температур < 5°C)"
     },
     "VoltageCalibration": {
       "displayText": "Калібрування\nнапруги",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "Мова:\n UK  Українська",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Тип Жала",
+      "description": "Оберіть відповідний тип жала"
     }
   }
 }

Translations/translation_UZ.json

@@ -0,0 +1,347 @@
+{
+  "languageCode": "UZ",
+  "languageLocalName": "O'zbek",
+  "tempUnitFahrenheit": false,
+  "messagesWarn": {
+    "CalibrationDone": {
+      "message": "Kalibrovka\nyakunlandi!"
+    },
+    "ResetOKMessage": {
+      "message": "Sozlamalar\ntiklandi"
+    },
+    "SettingsResetMessage": {
+      "message": "Ayrim sozlamalar\no'zgartirildi"
+    },
+    "NoAccelerometerMessage": {
+      "message": "Akselerometr\ntopilmadi!"
+    },
+    "NoPowerDeliveryMessage": {
+      "message": "USB-PD IC\ntopilmadi!"
+    },
+    "LockingKeysString": {
+      "message": "QULFLANDI"
+    },
+    "UnlockingKeysString": {
+      "message": "QULF OCHILDI"
+    },
+    "WarningKeysLockedString": {
+      "message": "!QULFLANGAN!"
+    },
+    "WarningThermalRunaway": {
+      "message": "Issiqlik\nqochishi"
+    },
+    "WarningTipShorted": {
+      "message": "!Uchida qisqa tutashuv!"
+    },
+    "SettingsCalibrationWarning": {
+      "message": "Qayta yuklashdan oldin, uchi va tutqich xona haroratida ekanligiga ishonch hosil qiling!"
+    },
+    "CJCCalibrating": {
+      "message": "Kalibrovka\nqilinmoqda"
+    },
+    "SettingsResetWarning": {
+      "message": "Sozlamalarni standart holatga qaytarishni istaysizmi?"
+    },
+    "UVLOWarningString": {
+      "message": "DC PAST"
+    },
+    "UndervoltageString": {
+      "message": "Past kuchlanish\n"
+    },
+    "InputVoltageString": {
+      "message": "Kirish kuchlanishi: \n"
+    },
+    "SleepingAdvancedString": {
+      "message": "Uyqu holati...\n"
+    },
+    "SleepingTipAdvancedString": {
+      "message": "Uch: \n"
+    },
+    "ProfilePreheatString": {
+      "message": "Qizdirish\n"
+    },
+    "ProfileCooldownString": {
+      "message": "Sovutish\n"
+    },
+    "DeviceFailedValidationWarning": {
+      "message": "Qurilmangiz soxta bo'lishi mumkin!"
+    },
+    "TooHotToStartProfileWarning": {
+      "message": "Profilni boshlash uchun\njuda issiq"
+    }
+  },
+  "characters": {
+    "SettingRightChar": "O",
+    "SettingLeftChar": "C",
+    "SettingAutoChar": "A",
+    "SettingSlowChar": "S",
+    "SettingMediumChar": "O",
+    "SettingFastChar": "T",
+    "SettingStartSolderingChar": "P",
+    "SettingStartSleepChar": "U",
+    "SettingStartSleepOffChar": "X",
+    "SettingLockBoostChar": "B",
+    "SettingLockFullChar": "T"
+  },
+  "menuGroups": {
+    "PowerMenu": {
+      "displayText": "Quvvat\nsozlamalari",
+      "description": ""
+    },
+    "SolderingMenu": {
+      "displayText": "Paylash\nsozlamalari",
+      "description": ""
+    },
+    "PowerSavingMenu": {
+      "displayText": "Uyqu\nrejimi",
+      "description": ""
+    },
+    "UIMenu": {
+      "displayText": "Foydalanuvchi\ninterfeysi",
+      "description": ""
+    },
+    "AdvancedMenu": {
+      "displayText": "Kengaytirilgan\nsozlamalar",
+      "description": ""
+    }
+  },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
+  "menuOptions": {
+    "DCInCutoff": {
+      "displayText": "Quvvat\nmanbai",
+      "description": "Batareya haddan tashqari zaryadsizlanishini oldini olish uchun kuchlanish chegarasini o'rnatish (DC 10V) (S=3.3V har bir yacheyka uchun, quvvat PWR chegarasini o'chirish)"
+    },
+    "MinVolCell": {
+      "displayText": "Minimal\nkuchlanish",
+      "description": "Batareya yacheyka uchun minimal ruxsat etilgan kuchlanish (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"   
+    },
+    "QCMaxVoltage": {
+      "displayText": "QC\nvoltage",
+      "description": "Max QC voltage the iron should negotiate for"
+    },
+    "PDNegTimeout": {
+      "displayText": "PD\ntimeout",
+      "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+    },
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
+    },
+    "BoostTemperature": {
+      "displayText": "Kuchaytirish\nharorati",
+      "description": "\"Boost mode\" rejimida uch harorati"
+    },
+    "AutoStart": {
+      "displayText": "Boshlash\nholati",
+      "description": "P=paylash temperaturasigacha qizdirish | U=qo'zg'atilmagunicha uyqu rejimida ushlash | X=qo'zg'atilmagunicha qizdirilmagan holda ushlash"
+    },
+    "TempChangeShortStep": {
+      "displayText": "Tugmaning qisqa\nbosilishi",
+      "description": "Qisqa bosilgandagi harorat o'zgarishi-oshirish"
+    },
+    "TempChangeLongStep": {
+      "displayText": "Tugmaning uzoqroq\nbosilishi",
+      "description": "Uzoqroq bosilgandagi harorat o'zgarishi-oshirish"
+    },
+    "LockingMode": {
+      "displayText": "Tugmalarni qulflashni\nfaollashtirish",
+      "description": "Qulflash uchun paylash davomida ikkala tugmani bosib turing (B=faqat boost mode uchun | T=to'liq qulflash)"
+    },
+    "ProfilePhases": {
+      "displayText": "Profil\nbosqichlari",
+      "description": "Profil rejimlarida bosqichlar soni"
+    },
+    "ProfilePreheatTemp": {
+      "displayText": "Dastlabgi\nHarorat",
+      "description": "Profil rejimida dastlab ushbu haroratga qizdirish"
+    },
+    "ProfilePreheatSpeed": {
+      "displayText": "Qizdirish\nTezligi",
+      "description": "Ushbu tezlikda qizdirish (1 sekundda shuncha daraja)"
+    },
+    "ProfilePhase1Temp": {
+      "displayText": "1-faza\nHarorati",
+      "description": "Bu fazaning oxirida mo'ljallangan harorat"
+    },
+    "ProfilePhase1Duration": {
+      "displayText": "1-faza\nDavomiyligi",
+      "description": "Ushbu fazaning davomiyligi (sekund)"
+    },
+    "ProfilePhase2Temp": {
+      "displayText": "2-faza\nHarorati",
+      "description": ""
+    },
+    "ProfilePhase2Duration": {
+      "displayText": "2-faza\nDavomiyligi",
+      "description": ""
+    },
+    "ProfilePhase3Temp": {
+      "displayText": "3-faza\nHarorati",
+      "description": ""
+    },
+    "ProfilePhase3Duration": {
+      "displayText": "3-faza\nDavomiyligi",
+      "description": ""
+    },
+    "ProfilePhase4Temp": {
+      "displayText": "4-faza\nHarorati",
+      "description": ""
+    },
+    "ProfilePhase4Duration": {
+      "displayText": "4-faza\nDavomiyligi",
+      "description": ""
+    },
+    "ProfilePhase5Temp": {
+      "displayText": "5-faza\nHarorati",
+      "description": ""
+    },
+    "ProfilePhase5Duration": {
+      "displayText": "5-faza\nDavomiyligi",
+      "description": ""
+    },
+    "ProfileCooldownSpeed": {
+      "displayText": "Sovutish\ntezligi",
+      "description": "Profil rejimi oxirida bu tezlikda sovutish (1 sekundda shuncha daraja)"
+    },
+    "MotionSensitivity": {
+      "displayText": "Harakat\nsezgirligi",
+      "description": "1=quyi sezgirlik | ... | 9=eng yuqori sezgirlik"
+    },
+    "SleepTemperature": {
+      "displayText": "Uyqu\nharorati",
+      "description": "\"Uyqu holati\"dagi uch harorati"
+    },
+    "SleepTimeout": {
+      "displayText": "Uyquga ketish\nvaqti",
+      "description": "\"Uyqu holati\" boshlanishidan oldingi interval sleep mode (s=sekund | m=minut)"
+    },
+    "ShutdownTimeout": {
+      "displayText": "O'chish\nvaqti",
+      "description": "Temirni o'chirishdan oldingi interval (m=minut)"
+    },
+    "HallEffSensitivity": {
+      "displayText": "Hall sensori\nsezgirligi",
+      "description": "Magnitlarga nisbatan sezgirlik darajasi (1=quyi sezgirlik | ... | 9=eng yuqori sezgirlik)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
+    "TemperatureUnit": {
+      "displayText": "Harorat o'lchov\nbirligi",
+      "description": "C=°Selsiy | F=°Fahrenheit"
+    },
+    "DisplayRotation": {
+      "displayText": "Ekran\nyo'nalishi",
+      "description": "O=o'ng qo'l | C=chap qo'l | A=avtomatik"
+    },
+    "CooldownBlink": {
+      "displayText": "Sovutish\nindikatori",
+      "description": "Uchi qizigan bo'sh turgan holatida harorat o'lchovini yangilab turish"
+    },
+    "ScrollingSpeed": {
+      "displayText": "Matn aylanish\ntezligi",
+      "description": "Matn aylanish tezligini sozlash (S=sekin | T=tez)"
+    },
+    "ReverseButtonTempChange": {
+      "displayText": "(+) va (-) tugmalarni\nalmashtirish",
+      "description": "Harorat o'zgarishi uchun tugmachalarni vazifasini almashish"
+    },
+    "AnimSpeed": {
+      "displayText": "Anim.\ntezligi",
+      "description": "Menyudagi ikonka animatsiyalari tezligini sozlash (S=sekin | O=o'rtacha | T=tez)"
+    },
+    "AnimLoop": {
+      "displayText": "Anim.\nqaytarilishi",
+      "description": "Bosh menyudagi ikonka anim. qaytarilishi"
+    },
+    "Brightness": {
+      "displayText": "Ekran\nyorqinligi",
+      "description": "OLED ekran yorqinligini sozlash"
+    },
+    "ColourInversion": {
+      "displayText": "Ranglarni\ninvert qilish",
+      "description": "OLED ekran ranglarini teskari qilish"
+    },
+    "LOGOTime": {
+      "displayText": "Yuklanish logosi\ndavomiyligi",
+      "description": "Yuklanish logosi davomiyligini o'rnatish (s=sekund)"
+    },
+    "AdvancedIdle": {
+      "displayText": "Batafsil\nbo'sh turgandagi ekran",
+      "description": "B'sh turgandagi ekranda kichik shriftda batafsil ma’lumotni ko'rsatish"
+    },
+    "AdvancedSoldering": {
+      "displayText": "Batafsil\npayvandlash ekrani",
+      "description": "Payvandlash ekrani uchun kichik shrift bilan batafsil ma’lumotni ko'rsatish"
+    },
+    "BluetoothLE": {
+      "displayText": "Bluetooth\n",
+      "description": "Faollashtirish BLE"
+    },
+    "PowerLimit": {
+      "displayText": "Quvvat\nchegarasi",
+      "description": "Temir foydalanishi mumkin bo'lgan o'rtacha maksimal quvvat (W=watt)"
+    },
+    "CalibrateCJC": {
+      "displayText": "Keyingi yuklashda\nCJC kalibrovkasi",
+      "description": "Keyingi yuklashda Sovuq Tugun Kompensatsiyasini (CJC) kalibrlash (Delta T < 5°C bo'lsa, talab qilinmaydi)"
+    },
+    "VoltageCalibration": {
+      "displayText": "Kirish kuchlanishini\nkalibrlash",
+      "description": "VIN kalibrovkasini boshlash (chiqish uchun uzoq bosib turing)"
+    },
+    "PowerPulsePower": {
+      "displayText": "Quvvat\npulsi",
+      "description": "Uxlashdan saqlash pulsining quvvat intensivligi (W=watt)"
+    },
+    "PowerPulseWait": {
+      "displayText": "Quvvat pulsi\nkechikishi",
+      "description": "Uxlashdan saqlash pulsi boshlanishigacha bo'lgan kechikish (x 2.5 soniya)"
+    },
+    "PowerPulseDuration": {
+      "displayText": "Quvvat pulsi\ndavomiyligi",
+      "description": "Uxlashdan saqlash pulsi davomiyligi (x 250ms)"
+    },
+    "SettingsReset": {
+      "displayText": "Sozlamalarni\nqayta tiklash",
+      "description": "Barcha sozlamalarni odatiy holatga qaytarish"
+    },
+    "LanguageSwitch": {
+      "displayText": "Til:\n UZ   O'zbek tili",
+      "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
+    }
+  }
+}

Translations/translation_VI.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Đau vào V: \n"
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Đang ngu...\n"
     },
     "SleepingTipAdvancedString": {
       "message": "Meo: \n"
     },
-        "OffString": {
-            "message": "Tat"
-        },
     "ProfilePreheatString": {
       "message": "Preheat\n"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-        "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
     "SettingFastChar": "F",
-        "SettingStartNoneChar": "O",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "Z",
     "SettingStartSleepOffChar": "R",
-        "SettingLockDisableChar": "D",
     "SettingLockBoostChar": "B",
     "SettingLockFullChar": "F"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "Nguon\nđien",
@@ -131,9 +151,9 @@
       "displayText": "PD\nsau",
       "description": "Thoi gian cho đàm phán PD trong các buoc 100ms đe tuong thích voi mot so bo sac QC"
     },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+    "USBPDMode": {
+      "displayText": "PD\nMode",
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "Tăng\nnhiet đo",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "Nhiet đo\nđang tăng",
-            "description": "- O=tat | S=nhiet đo hàn | Z=cho o nhiet đo ngu đen khi cu đong | R=cho mà không gia nhiet đen khi cu đong"
+      "description": "S=nhiet đo hàn | Z=cho o nhiet đo ngu đen khi cu đong | R=cho mà không gia nhiet đen khi cu đong"
     },
     "TempChangeShortStep": {
       "displayText": "Thay đoi n.đo\nan nút nhanh",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "Cho phép khóa\ncác nút",
-            "description": "Trong khi hàn, giu ca 2 nút đe khóa(D=tat | B=chi che đo tăng cuong | F=khóa hoàn toàn)"
+      "description": "Trong khi hàn, giu ca 2 nút đe khóa (B=chi che đo tăng cuong | F=khóa hoàn toàn)"
     },
     "ProfilePhases": {
       "displayText": "Profile\nPhases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "Cam bien\ncu đong",
-            "description": "- 0=tat | 1=đo nhay thap nhat| ... | 9=đo nhay cao nhat"
+      "description": "1=đo nhay thap nhat| ... | 9=đo nhay cao nhat"
     },
     "SleepTemperature": {
       "displayText": "Nhiet đo\nkhi ngu",
@@ -221,15 +241,19 @@
     },
     "SleepTimeout": {
       "displayText": "Ngu\nsau",
-            "description": "- thoi gian truoc khi \"Che đo ngu\" bat đau (s=giây | m=phút)"
+      "description": "thoi gian truoc khi \"Che đo ngu\" bat đau (s=giây | m=phút)"
     },
     "ShutdownTimeout": {
       "displayText": "Tat\nsau",
-            "description": "- khoang thoi gian truoc khi tay hàn tat (m=phút)"
+      "description": "khoang thoi gian truoc khi tay hàn tat (m=phút)"
     },
     "HallEffSensitivity": {
       "displayText": "Hall\nđo nhay",
-            "description": "Đo nhay cam bien Hall đe phát hien che đo ngu (0=tat | 1=ít nhay nhat |...| 9=nhay nhat)"
+      "description": "Đo nhay cam bien Hall đe phát hien che đo ngu (1=ít nhay nhat |...| 9=nhay nhat)"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
     },
     "TemperatureUnit": {
       "displayText": "Đon vi\nnhiet đo",
@@ -237,11 +261,11 @@
     },
     "DisplayRotation": {
       "displayText": "Huong\nhien thi",
-            "description": "- R=huong tay phai | L=huong tay trái | A=tu đong"
+      "description": "R=huong tay phai | L=huong tay trái | A=tu đong"
     },
     "CooldownBlink": {
       "displayText": "Nguoi đi\nchop mat",
-            "description": "-Nhap nháy nhiet đo sau khi viec gia nhiet tam dung trong khi mui hàn van nóng"
+      "description": "Nhap nháy nhiet đo sau khi viec gia nhiet tam dung trong khi mui hàn van nóng"
     },
     "ScrollingSpeed": {
       "displayText": "Toc đo\ncuon",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "Toc đo\nhoat anh",
-            "description": "-Toc đo cua hoat anh menu (O=tat | S=cham | M=trung bình | F=nhanh)"
+      "description": "Toc đo cua hoat anh menu (S=cham | M=trung bình | F=nhanh)"
     },
     "AnimLoop": {
       "displayText": "Hoat anh\nlap lai",
@@ -261,11 +285,11 @@
     },
     "Brightness": {
       "displayText": "Đo tuong phan\nmàn hình",
-            "description": "-Đieu chinh đo sáng màn hình OLED"
+      "description": "Đieu chinh đo sáng màn hình OLED"
     },
     "ColourInversion": {
       "displayText": "Đao nguoc màu\nmàn hình",
-            "description": "-Đao nguoc màu màn hình OLED"
+      "description": "Đao nguoc màu màn hình OLED"
     },
     "LOGOTime": {
       "displayText": "Boot logo\nduration",
@@ -273,11 +297,11 @@
     },
     "AdvancedIdle": {
       "displayText": "Chi tiet\nmàn hình cho",
-            "description": "- hien thi thông tin chi tiet bang phông chu nho hon trên màn hình cho"
+      "description": "hien thi thông tin chi tiet bang phông chu nho hon trên màn hình cho"
     },
     "AdvancedSoldering": {
       "displayText": "Chi tiet\nmàn hình hàn",
-            "description": "-Hien thi thông tin bang phông chu nho hon trên màn hình hàn"
+      "description": "Hien thi thông tin bang phông chu nho hon trên màn hình hàn"
     },
     "BluetoothLE": {
       "displayText": "Bluetooth\n",
@@ -285,19 +309,19 @@
     },
     "PowerLimit": {
       "displayText": "Công suat\ngioi han",
-            "description": "-Công suat toi đa mà tay hàn có the su dung (W=watt)"
+      "description": "Công suat toi đa mà tay hàn có the su dung (W=watt)"
     },
     "CalibrateCJC": {
       "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+      "description": "Calbrate Cold Junction Compensation at next boot (not required if Delta T is < 5°C)"
     },
     "VoltageCalibration": {
       "displayText": "Hieu chinh\nđien áp đau vào?",
-            "description": "-bat đau hieu chuan VIN (nhan và giu đe thoát)"
+      "description": "bat đau hieu chuan VIN (nhan và giu đe thoát)"
     },
     "PowerPulsePower": {
       "displayText": "Công suat\nkích nguon",
-            "description": "-Cuong đo công suat kích nguon (watt)"
+      "description": "Cuong đo công suat kích nguon (watt)"
     },
     "PowerPulseWait": {
       "displayText": "Trì hoãn\nđien áp kích",
@@ -305,15 +329,19 @@
     },
     "PowerPulseDuration": {
       "displayText": "Thoi luong\nkích nguon",
-            "description": "-thoi luong kích nguon (x 250ms)"
+      "description": "thoi luong kích nguon (x 250ms)"
     },
     "SettingsReset": {
       "displayText": "Khôi phuc\ncài đat goc?",
-            "description": "-đat lai tat ca cài đat ve mac đinh"
+      "description": "đat lai tat ca cài đat ve mac đinh"
     },
     "LanguageSwitch": {
       "displayText": "Ngôn ngu:\n VI  Tieng Viet",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_YUE_HK.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Input V: "
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Sleeping..."
     },
     "SleepingTipAdvancedString": {
       "message": "Tip: "
     },
-        "OffString": {
-            "message": "關"
-        },
     "ProfilePreheatString": {
       "message": "Preheat"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "右",
     "SettingLeftChar": "左",
     "SettingAutoChar": "自",
-        "SettingOffChar": "關",
     "SettingSlowChar": "慢",
     "SettingMediumChar": "中",
     "SettingFastChar": "快",
-        "SettingStartNoneChar": "無",
     "SettingStartSolderingChar": "焊",
     "SettingStartSleepChar": "待",
     "SettingStartSleepOffChar": "室",
-        "SettingLockDisableChar": "無",
     "SettingLockBoostChar": "增",
     "SettingLockFullChar": "全"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "電源",
@@ -131,9 +151,9 @@
       "displayText": "PD逾時",
       "description": "設定USB PD協定交涉嘅逾時時限；為兼容某啲QC電源而設 <x100ms（亳秒）>"
     },
-        "PDVpdo": {
+    "USBPDMode": {
       "displayText": "PD VPDO",
-            "description": "Enables PPS & EPR modes"
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     "BoostTemperature": {
       "displayText": "增熱温度",
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "自動啓用",
-            "description": "開機時自動啓用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室温待機>"
+      "description": "開機時自動啓用 <焊=焊接模式 | 待=待機模式 | 室=室温待機>"
     },
     "TempChangeShortStep": {
       "displayText": "温度調整 短",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "撳掣鎖定",
-            "description": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=淨係容許增熱模式 | 全=鎖定全部>"
+      "description": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <增=淨係容許增熱模式 | 全=鎖定全部>"
     },
     "ProfilePhases": {
       "displayText": "Profile Phases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "動作敏感度",
-            "description": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
+      "description": "1=最低敏感度 | ... | 9=最高敏感度"
     },
     "SleepTemperature": {
       "displayText": "待機温度",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "磁場敏感度",
-            "description": "磁場感應器用嚟啓動待機模式嘅敏感度 <0=停用 | 1=最低敏感度 | ... | 9=最高敏感度>"
+      "description": "磁場感應器用嚟啓動待機模式嘅敏感度 <1=最低敏感度 | ... | 9=最高敏感度>"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
     },
     "TemperatureUnit": {
       "displayText": "温度單位",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "動畫速度",
-            "description": "功能表圖示動畫嘅速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
+      "description": "功能表圖示動畫嘅速度 <慢=慢速 | 中=中速 | 快=快速>"
     },
     "AnimLoop": {
       "displayText": "動畫循環",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "語言： 廣東話",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translation_ZH_CN.json

@@ -46,13 +46,10 @@
       "message": "电压过低"
     },
     "UndervoltageString": {
-            "message": "Undervoltage"
+      "message": "欠压"
     },
     "InputVoltageString": {
-            "message": "VIN: "
-        },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
+      "message": "VIN: \n"
     },
     "SleepingAdvancedString": {
       "message": "Zzzz..."
@@ -60,35 +57,29 @@
     "SleepingTipAdvancedString": {
       "message": "<--- "
     },
-        "OffString": {
-            "message": "关"
-        },
     "ProfilePreheatString": {
-            "message": "Preheat"
+      "message": "预热中"
     },
     "ProfileCooldownString": {
-            "message": "Cooldown"
+      "message": "冷却"
     },
     "DeviceFailedValidationWarning": {
       "message": "这支电烙铁很有可能是冒牌货！"
     },
     "TooHotToStartProfileWarning": {
-            "message": "Too hot to start profile"
+      "message": "设备过热"
     }
   },
   "characters": {
     "SettingRightChar": "右",
     "SettingLeftChar": "左",
     "SettingAutoChar": "自",
-        "SettingOffChar": "关",
     "SettingSlowChar": "慢",
     "SettingMediumChar": "中",
     "SettingFastChar": "快",
-        "SettingStartNoneChar": "无",
     "SettingStartSolderingChar": "焊",
     "SettingStartSleepChar": "待",
     "SettingStartSleepOffChar": "室",
-        "SettingLockDisableChar": "无",
     "SettingLockBoostChar": "增",
     "SettingLockFullChar": "全"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "默认模式"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "安全模式"
+    },
+    "TipTypeAuto": {
+      "displayText": "自动检测"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "下限电压",
@@ -131,8 +151,8 @@
       "displayText": "PD超时",
       "description": "设定USB-PD协议交涉的超时时限；为兼容某些QC电源而设 <x100ms（亳秒）>"
     },
-        "PDVpdo": {
-            "displayText": "PD VPDO",
+    "USBPDMode": {
+      "displayText": "PD\nVPDO",
       "description": "启用PPS和EPR快充支持"
     },
     "BoostTemperature": {
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "自动启动",
-            "description": "开机时自动启动 <无=禁用 | 焊=焊接模式 | 待=待机模式 | 室=室温待机>"
+      "description": "开机时自动启动 <焊=焊接模式 | 待=待机模式 | 室=室温待机>"
     },
     "TempChangeShortStep": {
       "displayText": "短按温度调整",
@@ -153,67 +173,67 @@
     },
     "LockingMode": {
       "displayText": "按键锁定",
-            "description": "焊接模式时，同时长按两个按键启用按键锁定 <无=禁用 | 增=只容许增热模式 | 全=完全锁定>"
+      "description": "焊接模式时，同时长按两个按键启用按键锁定 <增=只容许增热模式 | 全=完全锁定>"
     },
     "ProfilePhases": {
-            "displayText": "Profile Phases",
-            "description": "Number of phases in profile mode"
+      "displayText": "配置阶数",
+      "description": "配置模式下的阶段数量"
     },
     "ProfilePreheatTemp": {
-            "displayText": "Preheat Temp",
-            "description": "Preheat to this temperature at the start of profile mode"
+      "displayText": "预热温度",
+      "description": "配置开始时的目标温度"
     },
     "ProfilePreheatSpeed": {
-            "displayText": "Preheat Speed",
-            "description": "Preheat at this rate (degrees per second)"
+      "displayText": "预热速度",
+      "description": "将以此速度进行预热 (度/秒)"
     },
     "ProfilePhase1Temp": {
-            "displayText": "Phase 1 Temp",
-            "description": "Target temperature for the end of this phase"
+      "displayText": "阶段1温度",
+      "description": "此阶段结束时的目标温度"
     },
     "ProfilePhase1Duration": {
-            "displayText": "Phase 1 Duration",
-            "description": "Target duration of this phase (seconds)"
+      "displayText": "阶段1时间",
+      "description": "此阶段的目标持续时间（秒）"
     },
     "ProfilePhase2Temp": {
-            "displayText": "Phase 2 Temp",
-            "description": ""
+      "displayText": "阶段2温度",
+      "description": "此阶段结束时的目标温度"
     },
     "ProfilePhase2Duration": {
-            "displayText": "Phase 2 Duration",
-            "description": ""
+      "displayText": "阶段2时间",
+      "description": "此阶段的目标持续时间（秒）"
     },
     "ProfilePhase3Temp": {
-            "displayText": "Phase 3 Temp",
-            "description": ""
+      "displayText": "阶段3温度",
+      "description": "此阶段结束时的目标温度"
     },
     "ProfilePhase3Duration": {
-            "displayText": "Phase 3 Duration",
-            "description": ""
+      "displayText": "阶段3时间",
+      "description": "此阶段的目标持续时间（秒）"
     },
     "ProfilePhase4Temp": {
-            "displayText": "Phase 4 Temp",
-            "description": ""
+      "displayText": "阶段4温度",
+      "description": "此阶段结束时的目标温度"
     },
     "ProfilePhase4Duration": {
-            "displayText": "Phase 4 Duration",
-            "description": ""
+      "displayText": "阶段4时间",
+      "description": "此阶段的目标持续时间（秒）"
     },
     "ProfilePhase5Temp": {
-            "displayText": "Phase 5 Temp",
-            "description": ""
+      "displayText": "阶段5温度",
+      "description": "此阶段结束时的目标温度"
     },
     "ProfilePhase5Duration": {
-            "displayText": "Phase 5 Duration",
-            "description": ""
+      "displayText": "阶段5时间",
+      "description": "此阶段的目标持续时间（秒）"
     },
     "ProfileCooldownSpeed": {
-            "displayText": "Cooldown Speed",
-            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "displayText": "冷却速度",
+      "description": "在配置模式结束时以此速度进行冷却（度/秒）"
     },
     "MotionSensitivity": {
       "displayText": "动作灵敏度",
-            "description": "0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度"
+      "description": "1=最低灵敏度 | ... | 9=最高灵敏度"
     },
     "SleepTemperature": {
       "displayText": "待机温度",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "磁场灵敏度",
-            "description": "霍尔效应传感器用作启动待机模式的灵敏度 <0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度>"
+      "description": "霍尔效应传感器用作启动待机模式的灵敏度 <1=最低灵敏度 | ... | 9=最高灵敏度>"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "霍尔传感器休眠时间",
+      "description": "当霍尔传感器检测值高于阈值时，进入“睡眠模式”前的间隔时间"
     },
     "TemperatureUnit": {
       "displayText": "温度单位",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "动画速度",
-            "description": "主菜单中功能图标动画的播放速度 <关=不显示动画 | 慢=慢速 | 中=中速 | 快=快速>"
+      "description": "主菜单中功能图标动画的播放速度 <慢=慢速 | 中=中速 | 快=快速>"
     },
     "AnimLoop": {
       "displayText": "动画循环",
@@ -292,7 +316,7 @@
       "description": "在下次重启时校正烙铁头热电偶冷接点补偿值（CJC）（温差小于5摄氏度时无需校正）"
     },
     "VoltageCalibration": {
-            "displayText": "输入电压校正？",
+      "displayText": "输入电压校正",
       "description": "开始校正输入电压（VIN）<长按以退出>"
     },
     "PowerPulsePower": {
@@ -308,12 +332,16 @@
       "description": "为保持电源处于唤醒状态，每次通电脉冲的时间长度 <x250ms（亳秒）>"
     },
     "SettingsReset": {
-            "displayText": "全部重置？",
+      "displayText": "全部重置",
       "description": "将所有设定重置为默认值"
     },
     "LanguageSwitch": {
       "displayText": "语言：简体中文",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "焊接头类型",
+      "description": "选择安装合适的尖端类型"
     }
   }
 }

Translations/translation_ZH_TW.json

@@ -51,18 +51,12 @@
     "InputVoltageString": {
       "message": "Input V: "
     },
-        "SleepingSimpleString": {
-            "message": "Zzzz"
-        },
     "SleepingAdvancedString": {
       "message": "Sleeping..."
     },
     "SleepingTipAdvancedString": {
       "message": "Tip: "
     },
-        "OffString": {
-            "message": "關"
-        },
     "ProfilePreheatString": {
       "message": "Preheat"
     },
@@ -80,15 +74,12 @@
     "SettingRightChar": "右",
     "SettingLeftChar": "左",
     "SettingAutoChar": "自",
-        "SettingOffChar": "關",
     "SettingSlowChar": "慢",
     "SettingMediumChar": "中",
     "SettingFastChar": "快",
-        "SettingStartNoneChar": "無",
     "SettingStartSolderingChar": "焊",
     "SettingStartSleepChar": "待",
     "SettingStartSleepOffChar": "室",
-        "SettingLockDisableChar": "無",
     "SettingLockBoostChar": "增",
     "SettingLockFullChar": "全"
   },
@@ -114,6 +105,35 @@
       "description": ""
     }
   },
+  "menuValues": {
+    "USBPDModeDefault": {
+      "displayText": "Default\nMode"
+    },
+    "USBPDModeNoDynamic": {
+      "displayText": "No\nDynamic"
+    },
+    "USBPDModeSafe": {
+      "displayText": "Safe\nMode"
+    },
+    "TipTypeAuto": {
+      "displayText": "Auto\nSense"
+    },
+    "TipTypeT12Long": {
+      "displayText": "TS100\nLong"
+    },
+    "TipTypeT12Short": {
+      "displayText": "Pine\nShort"
+    },
+    "TipTypeT12PTS": {
+      "displayText": "PTS\n200"
+    },
+    "TipTypeTS80": {
+      "displayText": "TS80\n"
+    },
+    "TipTypeJBCC210": {
+      "displayText": "JBC\nC210"
+    }
+  },
   "menuOptions": {
     "DCInCutoff": {
       "displayText": "電源",
@@ -131,7 +151,7 @@
       "displayText": "PD逾時",
       "description": "設定USB PD協定交涉的逾時時限；為兼容某些QC電源而設 <x100ms（亳秒）>"
     },
-        "PDVpdo": {
+    "USBPDMode": {
       "displayText": "PD VPDO",
       "description": "開啟PPS及EPR支援"
     },
@@ -141,7 +161,7 @@
     },
     "AutoStart": {
       "displayText": "自動啟用",
-            "description": "開機時自動啟用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室溫待機>"
+      "description": "開機時自動啟用 <焊=焊接模式 | 待=待機模式 | 室=室溫待機>"
     },
     "TempChangeShortStep": {
       "displayText": "溫度調整 短",
@@ -153,7 +173,7 @@
     },
     "LockingMode": {
       "displayText": "按鍵鎖定",
-            "description": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=只容許增熱模式 | 全=鎖定全部>"
+      "description": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <增=只容許增熱模式 | 全=鎖定全部>"
     },
     "ProfilePhases": {
       "displayText": "Profile Phases",
@@ -213,7 +233,7 @@
     },
     "MotionSensitivity": {
       "displayText": "動作敏感度",
-            "description": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
+      "description": "1=最低敏感度 | ... | 9=最高敏感度"
     },
     "SleepTemperature": {
       "displayText": "待機溫度",
@@ -229,7 +249,11 @@
     },
     "HallEffSensitivity": {
       "displayText": "磁場敏感度",
-            "description": "磁場感應器用作啟動待機模式的敏感度 <0=停用 | 1=最低敏感度 | ... | 9=最高敏感度>"
+      "description": "磁場感應器用作啟動待機模式的敏感度 <1=最低敏感度 | ... | 9=最高敏感度>"
+    },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
     },
     "TemperatureUnit": {
       "displayText": "溫標",
@@ -253,7 +277,7 @@
     },
     "AnimSpeed": {
       "displayText": "動畫速度",
-            "description": "功能表圖示動畫的速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
+      "description": "功能表圖示動畫的速度 <慢=慢速 | 中=中速 | 快=快速>"
     },
     "AnimLoop": {
       "displayText": "動畫循環",
@@ -314,6 +338,10 @@
     "LanguageSwitch": {
       "displayText": "語言：正體中文",
       "description": ""
+    },
+    "SolderingTipType": {
+      "displayText": "Soldering\nTip Type",
+      "description": "Select the tip type fitted"
     }
   }
 }

Translations/translations_definitions.json

@@ -1,5 +1,6 @@
 {
-    "messagesWarn": [{
+  "messagesWarn": [
+    {
       "id": "CalibrationDone",
       "description": "Confirmation message indicating calibration is complete."
     },
@@ -17,9 +18,7 @@
     },
     {
       "id": "NoPowerDeliveryMessage",
-            "include": [
-                "POW_PD"
-            ],
+      "include": ["POW_PD"],
       "description": "The IC required for USB-PD could not be communicated with. This is an error warning that USB-PD WILL NOT FUNCTION. Generally indicative of either a hardware or software issues."
     },
     {
@@ -57,73 +56,46 @@
     {
       "id": "UVLOWarningString",
       "maxLen": 8,
-            "include": [
-                "POW_DC"
-            ],
+      "include": ["POW_DC"],
       "description": "Warning text shown when the unit turns off due to undervoltage in simple mode."
     },
     {
       "id": "UndervoltageString",
       "maxLen": 15,
-            "include": [
-                "POW_DC"
-            ],
+      "include": ["POW_DC"],
       "description": "Warning text shown when the unit turns off due to undervoltage in advanced mode."
     },
     {
       "id": "InputVoltageString",
       "maxLen": 11,
       "note": "Preferably end with a space",
-            "include": [
-                "POW_DC"
-            ],
+      "include": ["POW_DC"],
       "description": "Prefix text for 'Input Voltage' shown before showing the input voltage reading."
     },
     {
       "id": "ProfilePreheatString",
       "maxLen": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Shown in profile mode while preheating"
     },
     {
       "id": "ProfileCooldownString",
       "maxLen": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Shown in profile mode while cooling down"
     },
-        {
-            "id": "SleepingSimpleString",
-            "maxLen": 4,
-            "exclude": [
-                "NO_SLEEP_MODE"
-            ],
-            "description": "The text shown to indicate the unit is in sleep mode when the advanced view is NOT on."
-        },
     {
       "id": "SleepingAdvancedString",
       "maxLen": 15,
-            "exclude": [
-                "NO_SLEEP_MODE"
-            ],
+      "exclude": ["NO_SLEEP_MODE"],
       "description": "The text shown to indicate the unit is in sleep mode when the advanced view is turned on."
     },
     {
       "id": "SleepingTipAdvancedString",
       "maxLen": 6,
-            "exclude": [
-                "NO_SLEEP_MODE"
-            ],
+      "exclude": ["NO_SLEEP_MODE"],
       "description": "The prefix text shown before tip temperature when the unit is sleeping with advanced view on."
     },
-        {
-            "id": "OffString",
-            "maxLen": 3,
-            "description": "Shown when a setting is turned off."
-        },
     {
       "id": "DeviceFailedValidationWarning",
       "default": "Device may be\ncounterfeit",
@@ -132,9 +104,7 @@
     {
       "id": "TooHotToStartProfileWarning",
       "default": "Too hot to\nstart profile",
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Shown when profile mode is started while the device is too hot."
     }
   ],
@@ -154,11 +124,6 @@
       "len": 1,
       "description": "Shown for automatic display rotation."
     },
-        {
-            "id": "SettingOffChar",
-            "len": 1,
-            "description": "Shown when a setting is turned off"
-        },
     {
       "id": "SettingSlowChar",
       "len": 1,
@@ -174,11 +139,6 @@
       "len": 1,
       "description": "Shown when a setting is set to a fast value i.e. animation speed"
     },
-        {
-            "id": "SettingStartNoneChar",
-            "len": 1,
-            "description": "Shown when autostart state is to do nothing and go to a normal boot"
-        },
     {
       "id": "SettingStartSolderingChar",
       "len": 1,
@@ -194,12 +154,6 @@
       "len": 1,
       "description": "Shown when the auto start state is set to go to an off state, but on movement wake into soldering mode."
     },
-        {
-            "id": "SettingLockDisableChar",
-            "len": 1,
-            "default": "D",
-            "description": "Shown when locking mode is turned off."
-        },
     {
       "id": "SettingLockBoostChar",
       "len": 1,
@@ -218,10 +172,7 @@
       "id": "PowerMenu",
       "maxLen": 5,
       "maxLen2": 11,
-            "include": [
-                "POW_DC",
-                "POW_QC"
-            ],
+      "include": ["POW_DC", "POW_QC"],
       "description": "Menu for settings related to power. Main settings to do with the input voltage."
     },
     {
@@ -249,51 +200,79 @@
       "description": "Advanced settings. Misc catchall for settings that don't fit anywhere else or settings that require some thought before use."
     }
   ],
+  "menuValues": [
+    {
+      "id": "USBPDModeDefault",
+      "description": "When in this mode we enable all PD features, and we pad resistance slightly to account for cable and PCB trace loss"
+    },
+    {
+      "id": "USBPDModeNoDynamic",
+      "description": "When in this mode we only enable fixed voltage USB-PD options, and we pad resistance slightly to account for cable and PCB trace loss"
+    },
+    {
+      "id": "USBPDModeSafe",
+      "description": "When in this mode we enable all PD features, but we don't pad resistance slightly to account for cable and PCB trace loss"
+    },
+    {
+      "id": "TipTypeAuto",
+      "description": "This is for automatic best-effort tip selection based on resistance"
+    },
+    {
+      "id": "TipTypeT12Long",
+      "description": "Hakko T12 or older (long) TS100 tips"
+    },
+    {
+      "id": "TipTypeT12Short",
+      "description": "Pine 6.2 ohm short TS100 style tips"
+    },
+    {
+      "id": "TipTypeT12PTS",
+      "description": "PTS200 4 ohm short TS100 style tips"
+    },
+    {
+      "id": "TipTypeTS80",
+      "description": "Miniware TS80(P) tips"
+    },
+    {
+      "id": "TipTypeJBCC210",
+      "description": "JBC (or clone) tips"
+    }
+  ],
   "menuOptions": [
     {
       "id": "DCInCutoff",
       "maxLen": 5,
       "maxLen2": 11,
-            "include": [
-                "POW_DC"
-            ],
+      "include": ["POW_DC"],
       "description": "When the device is powered by a battery, this adjusts the low voltage threshold for when the unit should turn off the heater to protect the battery."
     },
     {
       "id": "MinVolCell",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "POW_DC"
-            ],
+      "include": ["POW_DC"],
       "description": "When powered by a battery, this adjusts the minimum voltage per cell before shutdown. (This is multiplied by the cell count.)"
     },
     {
       "id": "QCMaxVoltage",
       "maxLen": 8,
       "maxLen2": 15,
-            "include": [
-                "POW_QC"
-            ],
+      "include": ["POW_QC"],
       "description": "This adjusts the maximum voltage the QC negotiation will adjust to. Does NOT affect USB-PD. Should be set safely based on the current rating of your power supply."
     },
     {
       "id": "PDNegTimeout",
       "maxLen": 8,
       "maxLen2": 15,
-            "include": [
-                "POW_PD"
-            ],
+      "include": ["POW_PD"],
       "description": "How long until firmware stops trying to negotiate for USB-PD and tries QC instead. Longer times may help dodgy / old PD adapters, faster times move onto PD quickly. Units of 100ms. Recommended to keep small values."
     },
     {
-            "id": "PDVpdo",
+      "id": "USBPDMode",
       "maxLen": 7,
       "maxLen2": 15,
-            "include": [
-                "POW_PD"
-            ],
-            "description": "Enabled PPS & EPR modes."
+      "include": ["POW_PD"],
+      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
     },
     {
       "id": "BoostTemperature",
@@ -329,126 +308,98 @@
       "id": "ProfilePhases",
       "maxLen": 6,
       "maxLen2": 13,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "set the number of phases for profile mode."
     },
     {
       "id": "ProfilePreheatTemp",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Preheat to this temperature at the start of profile mode."
     },
     {
       "id": "ProfilePreheatSpeed",
       "maxLen": 5,
       "maxLen2": 11,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "How fast the temperature is allowed to rise during the preheat phase at the start of profile mode."
     },
     {
       "id": "ProfilePhase1Temp",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Target temperature for the end of phase 1 of profile mode."
     },
     {
       "id": "ProfilePhase1Duration",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Duration of phase 1 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
     },
     {
       "id": "ProfilePhase2Temp",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Target temperature for the end of phase 2 of profile mode."
     },
     {
       "id": "ProfilePhase2Duration",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Duration of phase 2 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
     },
     {
       "id": "ProfilePhase3Temp",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Target temperature for the end of phase 3 of profile mode."
     },
     {
       "id": "ProfilePhase3Duration",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Duration of phase 3 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
     },
     {
       "id": "ProfilePhase4Temp",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Target temperature for the end of phase 5 of profile mode."
     },
     {
       "id": "ProfilePhase4Duration",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
     },
     {
       "id": "ProfilePhase5Temp",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Target temperature for the end of phase 5 of profile mode."
     },
     {
       "id": "ProfilePhase5Duration",
       "maxLen": 4,
       "maxLen2": 9,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
     },
     {
       "id": "ProfileCooldownSpeed",
       "maxLen": 5,
       "maxLen2": 11,
-            "include": [
-                "PROFILE_SUPPORT"
-            ],
+      "include": ["PROFILE_SUPPORT"],
       "description": "How fast the temperature is allowed to drop during the cooldown phase at the end of profile mode."
     },
     {
@@ -461,18 +412,14 @@
       "id": "SleepTemperature",
       "maxLen": 4,
       "maxLen2": 9,
-            "exclude": [
-                "NO_SLEEP_MODE"
-            ],
+      "exclude": ["NO_SLEEP_MODE"],
       "description": "Temperature the device will drop down to while asleep. Typically around halfway between off and soldering temperature."
     },
     {
       "id": "SleepTimeout",
       "maxLen": 4,
       "maxLen2": 9,
-            "exclude": [
-                "NO_SLEEP_MODE"
-            ],
+      "exclude": ["NO_SLEEP_MODE"],
       "description": "How long of a period without movement / button-pressing is required before the device drops down to the sleep temperature."
     },
     {
@@ -485,11 +432,16 @@
       "id": "HallEffSensitivity",
       "maxLen": 6,
       "maxLen2": 13,
-            "include": [
-                "HALL_SENSOR"
-            ],
+      "include": ["HALL_SENSOR"],
       "description": "If the unit has a hall effect sensor (Pinecil), this adjusts how sensitive it is at detecting a magnet to put the device into sleep mode."
     },
+    {
+      "id": "HallEffSleepTimeout",
+      "maxLen": 10,
+      "maxLen2": 10,
+      "include": ["HALL_SENSOR"],
+      "description": "If the unit has a hall effect sensor (Pinecil), this adjusts how long the device takes before it drops down to the sleep temperature when hall sensor is over threshold."
+    },
     {
       "id": "TemperatureUnit",
       "maxLen": 6,
@@ -500,9 +452,7 @@
       "id": "DisplayRotation",
       "maxLen": 6,
       "maxLen2": 13,
-            "exclude": [
-                "NO_DISPLAY_ROTATE"
-            ],
+      "exclude": ["NO_DISPLAY_ROTATE"],
       "description": "If the display should rotate automatically or if it should be fixed for left- or right-handed mode."
     },
     {
@@ -569,9 +519,7 @@
       "id": "BluetoothLE",
       "maxLen": 7,
       "maxLen2": 15,
-            "include": [
-                "BLE_ENABLED"
-            ],
+      "include": ["BLE_ENABLED"],
       "description": "Should BLE be enabled at boot time."
     },
     {
@@ -621,6 +569,12 @@
       "maxLen": 7,
       "maxLen2": 15,
       "description": "Changes the device language on multi-lingual builds."
+    },
+    {
+      "id": "SolderingTipType",
+      "maxLen": 7,
+      "maxLen2": 15,
+      "description": "For manually selecting the type of tip fitted"
     }
   ]
 }

scripts/IronOS-mkdocs.yml

@@ -41,6 +41,7 @@ nav:
       - Troubleshooting: Troubleshooting.md
       - Known Hardware Issues: HardwareIssues.md
       - Power sources: PowerSources.md
+      - New Hardware Requirements: PortingToNewDevice.md
   - Translations: Translation.md
   - Development: Development.md
   - Changelog: History.md

scripts/IronOS.Dockerfile

@@ -1,6 +1,7 @@
 # Default Reference Distro for development env & deploy:
-# * Alpine Linux, version 3.16 *
-FROM alpine:3.16
+# * Alpine Linux, version 3.21 *
+
+FROM alpine:3.21
 LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
 
 # Default current dir when container starts
@@ -14,7 +15,7 @@ WORKDIR /build/ironos
 ## - clang (required for clang-format to check C++ code formatting)
 ## - shellcheck (to check sh scripts)
 
-ARG APK_COMPS="gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi"
+ARG APK_COMPS="gcc-riscv-none-elf g++-riscv-none-elf gcc-arm-none-eabi g++-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi"
 ARG APK_PYTHON="python3 py3-pip black"
 ARG APK_MISC="findutils make git diffutils zip"
 ARG APK_DEV="musl-dev clang bash clang-extra-tools shellcheck"
@@ -25,8 +26,8 @@ ARG PIP_PKGS='bdflib flake8 pymdown-extensions mkdocs mkdocs-autolinks-plugin mk
 # Install system packages using alpine package manager
 RUN apk add --no-cache ${APK_COMPS} ${APK_PYTHON} ${APK_MISC} ${APK_DEV}
 
-# Install Python3 packages as modules using pip
-RUN python3 -m pip install ${PIP_PKGS}
+# Install Python3 packages as modules using pip, yes we dont care if packages break
+RUN python3 -m pip install --break-system-packages ${PIP_PKGS}
 
 # Git trust to avoid related warning
 RUN git config --global --add safe.directory /build/ironos

scripts/deploy.sh

@@ -19,7 +19,9 @@ usage()
 	echo -e "\tbuild - compile builds of IronOS inside docker container for supported hardware"
 	echo -e "\tclean - delete created docker image for IronOS & its build cache objects\n"
 	echo "CMD (helper routines):"
+	echo -e "\tdocs - high level target to run docs_readme and docs_history (see below)\n"
 	echo -e "\tdocs_readme - generate & OVERWRITE(!) README.md inside Documentation/ based on nav section from mkdocs.yml if it changed\n"
+	echo -e "\tdocs_history - check if History.md has the changelog for the latest stable release\n"
 	echo -e "\tcheck_style_file SRC - run code style checks based on clang-format & custom parsers for source code file SRC\n"
 	echo -e "\tcheck_style_log - run clang-format using source/Makefile and generate gcc-compatible error log in source/check-style.log\n"
 	echo -e "STORAGE NOTICE: for \"shell\" and \"build\" commands extra files will be downloaded so make sure that you have ~5GB of free space.\n"
@@ -71,6 +73,76 @@ EOF
 	return "${ret}"
 }
 
+# Documentation/History.md automagical changelog routine
+docs_history()
+{
+	md="Documentation/History.md"
+	ver_md="$(sed -ne 's/^## //1p' "${md}" | head -1)"
+	echo "Latest changelog: ${ver_md}"
+	ver_git="$(git tag -l | sort | grep -e "^v" | grep -v "rc" | tail -1)"
+	echo "Latest release tag: ${ver_git}"
+	ret=0
+	if [ "${ver_md}" != "${ver_git}" ]; then
+		ret=1
+		echo "It seems there is no changelog information for ${ver_git} in ${md} yet."
+		echo "Please, update changelog information in ${md}."
+	fi;
+	return "${ret}"
+}
+
+# Check for links to release builds in README.md
+docs_links()
+{
+	ver_git="$(git tag -l | sort | grep -e "^v" | grep -v "rc" | tail -1)"
+	md="README.md"
+	test -f "${md}" || (echo "deploy.sh: docs_links: ERROR with the project directory structure!" && exit 1)
+	ver_md="$(grep -c "${ver_git}" "${md}")"
+	ret=0
+	if [ "${ver_md}" -eq 0 ]; then
+		ret=1
+		echo "Please, update mention & links in ${md} inside Builds section for release builds with version ${ver_git}."
+	fi;
+	return "${ret}"
+}
+
+# source/Makefile:ALL_LANGUAGES & Translations/*.json automagical routine
+build_langs()
+{
+	mk="../source/Makefile"
+	cd Translations/ || (echo "deploy.sh: build_langs: ERROR with the project directory structure!" && exit 1)
+	langs="$(echo "$(find ./*.json | sed -ne 's,^\./translation_,,; s,\.json$,,; /[A-Z]/p' ; sed -ne 's/^ALL_LANGUAGES=//p;' "${mk}")" | sed 's, ,\n,g; s,\r,,g' | sort | uniq -u)"
+	if [ -n "${langs}" ]; then
+		echo "It seems there is mismatch between supported languages and enabled builds."
+		echo "Please, check files in Translations/ and ALL_LANGUAGES variable in source/Makefile for:"
+		echo "${langs}"
+		return 1
+	fi;
+	cd ..
+	
+	echo -ne "\n"
+	grep -nH $'\11' Translations/translation*.json
+	ret="${?}"
+	if [ "${ret}" -eq 0 ]; then
+		echo -ne "\t^^^^\t^^^^\n"
+		echo "Please, remove any tabs as indention from json file(s) in Translations/ directory (see the exact files & lines in the list above)."
+		echo "Use spaces only to indent in the future, please."
+		echo -ne "\n"
+		return 1
+	fi;
+	
+	grep -nEH -e "^( {1}| {3}| {5}| {7}| {9}| {11})[^ ]" Translations/translation*.json
+	ret="${?}"
+	if [ "${ret}" -eq 0 ]; then
+		echo -ne "\t^^^^\t^^^^\n"
+		echo "Please, remove any odd amount of extra spaces as indention from json file(s) in Translations/ directory (see the exact files & lines in the list above)."
+		echo "Use even amount of spaces to indent in the future, please (two actual spaces per one indent, not tab)."
+		echo -ne "\n"
+		return 1
+	fi;
+	
+	return 0
+}
+
 # Helper function to check code style using clang-format & grep/sed custom parsers:
 # - basic logic moved from source/Makefile : `check-style` target for better maintainance since a lot of sh script involved;
 # - output goes in gcc-like error compatible format for IDEs/editors.
@@ -91,21 +163,6 @@ check_style_file()
 		fi;
 		ret=1
 	fi;
-	# - clang-format has neat option for { } in condition blocks but it's available only since version 15:
-	#   * https://clang.llvm.org/docs/ClangFormatStyleOptions.html#insertbraces
-	# - since reference env is alpine 3.16 with clang-format 13, implement custom parser to do the similar thing here with grep:
-	#   it used to trace missing { and } for if/else/do/while/for BUT IT'S VERY SPECULATIVE, very-very hacky & dirty.
-	# - if file is problematic but filename only requested make final grep in pipe silent ... UPD: make code messy but shellcheck happy
-	if [ -z "${LIST}" ]; then
-		grep -H -n  -e "^ .*if .*)$"  -e "^ .*else$"  -e "^ .* do$"  -e "^ .*while .*)$"  -e "^ .*for .*)$"  "${src}" | grep -v  -e "^.*//"  -e "^.*:.*: .*if ((.*[^)])$" | sed 's,^,\n\n,; s,: ,:1: error: probably missing { or } for conditional or loop block:\n>>>,;' | grep -e "^.*$"
-	else
-		grep -H -n  -e "^ .*if .*)$"  -e "^ .*else$"  -e "^ .* do$"  -e "^ .*while .*)$"  -e "^ .*for .*)$"  "${src}" | grep -v  -e "^.*//"  -e "^.*:.*: .*if ((.*[^)])$" | sed 's,^,\n\n,; s,: ,:1: error: probably missing { or } for conditional or loop block:\n>>>,;' | grep -q -e "^.*$"
-	fi;
-	if [ "${?}" -ne 1 ]; then
-		# ... and only print the filename
-		test -z "${LIST}" || echo "${src}"
-		ret=1;
-	fi;
 	return "${ret}"
 }
 
@@ -141,27 +198,46 @@ docker_file="-f ${root_dir}/${docker_conf}"
 # (compose sub-command must be included, i.e. DOCKER_BIN="/usr/local/bin/docker compose" ./deploy.sh)
 
 if [ -z "${DOCKER_BIN}" ]; then
-	docker_bin=""
+	docker_app=""
 else
-	docker_bin="${DOCKER_BIN}"
+	docker_app="${DOCKER_BIN}"
 fi;
 
 # detect availability of docker
 
 docker_compose="$(command -v docker-compose)"
-if [ -n "${docker_compose}" ] && [ -z "${docker_bin}" ]; then
-	docker_bin="${docker_compose}"
+if [ -n "${docker_compose}" ] && [ -z "${docker_app}" ]; then
+	docker_app="${docker_compose}"
 fi;
 
 docker_tool="$(command -v docker)"
-if [ -n "${docker_tool}" ] && [ -z "${docker_bin}" ]; then
-	docker_bin="${docker_tool}  compose"
+if [ -n "${docker_tool}" ] && [ -z "${docker_app}" ]; then
+	docker_app="${docker_tool}  compose"
 fi;
 
 # give function argument a name
 
 cmd="${1}"
 
+# meta target to verify markdown documents
+
+if [ "docs" = "${cmd}" ]; then
+	docs_readme
+	readme="${?}"
+	docs_history
+	hist="${?}"
+	build_langs
+	langs="${?}"
+	docs_links
+	links="${?}"
+	if [ "${readme}" -eq 0 ] && [ "${hist}" -eq 0 ] && [ "${langs}" -eq 0 ] && [ "${links}" -eq 0 ]; then
+		ret=0
+	else
+		ret=1
+	fi;
+	exit ${ret}
+fi;
+
 # if only README.md for Documentation update is required then run it & exit
 
 if [ "docs_readme" = "${cmd}" ]; then
@@ -169,6 +245,23 @@ if [ "docs_readme" = "${cmd}" ]; then
 	exit "${?}"
 fi;
 
+# if only History.md for Documentation update is required then run it & exit
+
+if [ "docs_history" = "${cmd}" ]; then
+	docs_history
+	exit "${?}"
+fi;
+
+if [ "build_langs" = "${cmd}" ]; then
+	build_langs
+	exit "${?}"
+fi;
+
+if [ "docs_links" = "${cmd}" ]; then
+	docs_links
+	exit "${?}"
+fi;
+
 if [ "check_style_file" = "${cmd}" ]; then
 	check_style_file "${2}"
 	exit "${?}"
@@ -181,7 +274,7 @@ fi;
 
 # if docker is not presented in any way show warning & exit
 
-if [ -z "${docker_bin}" ]; then
+if [ -z "${docker_app}" ]; then
 	echo "ERROR: Can't find docker-compose nor docker tool. Please, install docker and try again."
 	exit 1
 fi;
@@ -209,6 +302,6 @@ if [ "${cmd}" = "shell" ]; then
 echo -e "\t* type \"exit\" to end the session when done;"
 fi;
 echo -e "\t* type \"${0} clean\" to delete created container (but not cached data)"
-echo -e "\n====>>>> ${docker_bin}  ${docker_file}  ${docker_cmd}\n"
-eval "${docker_bin}  ${docker_file}  ${docker_cmd}"
+echo -e "\n====>>>> ${docker_app}  ${docker_file}  ${docker_cmd}\n"
+eval "${docker_app}  ${docker_file}  ${docker_cmd}"
 exit "${?}"

scripts/flash_ts100_linux.sh

@@ -75,7 +75,7 @@ umount_ts100() {
         echo "Failed to unmount $DIR_TMP"
         exit 1
     fi
-    rmdir "$DIR_TMP"
+    sudo rmdir "$DIR_TMP"
 }
 
 check_flash() {
@@ -126,14 +126,13 @@ echo "Found TS100 config disk device on $DEVICE"
 
 mount_ts100
 echo "Mounted config disk drive, flashing..."
-cp -v "$1" "$HEX_FIRMWARE"
-sync
+dd if="$1" of="$HEX_FIRMWARE" oflag=direct
+umount_ts100
 
 echo "Waiting for TS100 to flash"
 sleep 5
 
 echo "Remounting config disk drive"
-umount_ts100
 wait_for_ts100
 mount_ts100
 check_flash

source/.clang-format

@@ -1,139 +1,236 @@
-# Roughly based on LLVM, tweaked a tad for readability on wide screens
 ---
 Language: Cpp
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
-AlignConsecutiveMacros: true
-AlignConsecutiveAssignments: true
-AlignConsecutiveDeclarations: true
-AlignEscapedNewlines: Left
-AlignOperands:   true
-AlignTrailingComments: true
+AlignArrayOfStructures: Right
+AlignConsecutiveAssignments:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  PadOperators: true
+AlignConsecutiveBitFields:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  PadOperators: false
+AlignConsecutiveDeclarations:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  PadOperators: false
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCompound: false
+  PadOperators: false
+AlignConsecutiveShortCaseStatements:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: false
+  AlignCaseColons: false
+AlignEscapedNewlines: Right
+AlignOperands: Align
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 0
 AllowAllArgumentsOnNextLine: true
-AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: Empty
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
-AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
 AllowShortLoopsOnASingleLine: false
-AllowShortEnumsOnASingleLine: false ### <<< Keeps enums as is
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: MultiLine
+AttributeMacros:
+  - __capability
 BinPackArguments: true
 BinPackParameters: true
+BitFieldColonSpacing: Both
 BraceWrapping:
   AfterCaseLabel: false
   AfterClass: false
-  AfterControlStatement: false
+  AfterControlStatement: Never
   AfterEnum: false
+  AfterExternBlock: false
   AfterFunction: false
   AfterNamespace: false
   AfterObjCDeclaration: false
   AfterStruct: false
   AfterUnion: false
-  AfterExternBlock: false
   BeforeCatch: false
   BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
   IndentBraces: false
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: true
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
+BreakAfterAttributes: Never
 BreakAfterJavaFieldAnnotations: false
+BreakArrays: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
 BreakStringLiterals: true
 ColumnLimit: 200
-CommentPragmas:  '^ IWYU pragma:'
+CommentPragmas: "^ IWYU pragma:"
 CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DeriveLineEnding: true
 DerivePointerAlignment: false
 DisableFormat: false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
 IncludeBlocks: Preserve
 IncludeCategories:
   - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
     Priority: 2
     SortPriority: 0
+    CaseSensitive: false
   - Regex: '^(<|"(gtest|gmock|isl|json)/)'
     Priority: 3
     SortPriority: 0
-  - Regex:           '.*'
+    CaseSensitive: false
+  - Regex: ".*"
     Priority: 1
     SortPriority: 0
-IncludeIsMainRegex: '(Test)?$'
-IncludeIsMainSourceRegex: ''
+    CaseSensitive: false
+IncludeIsMainRegex: "(Test)?$"
+IncludeIsMainSourceRegex: ""
+IndentAccessModifiers: false
+IndentCaseBlocks: false
 IndentCaseLabels: false
+IndentExternBlock: AfterExternBlock
 IndentGotoLabels: true
 IndentPPDirectives: None
+IndentRequiresClause: true
 IndentWidth: 2
 IndentWrappedFunctionNames: false
+InsertBraces: false
+InsertNewlineAtEOF: false
+InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary: 0
+  BinaryMinDigits: 0
+  Decimal: 0
+  DecimalMinDigits: 0
+  Hex: 0
+  HexMinDigits: 0
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
+KeepEmptyLinesAtEOF: false
+LambdaBodyIndentation: Signature
+LineEnding: DeriveLF
+MacroBlockBegin: ""
+MacroBlockEnd: ""
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
+PPIndentWidth: -1
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
 ReflowComments: true
-SortIncludes:    true
-SortUsingDeclarations: true
+RemoveBracesLLVM: false
+RemoveParentheses: Leave
+RemoveSemicolon: false
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes: CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: LexicographicNumeric
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: false
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
+SpaceBeforeJsonColon: false
 SpaceBeforeParens: ControlStatements
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros: true
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
 SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyBlock: false
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInConditionalStatement: false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
 SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: Never
+SpacesInContainerLiterals: true
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
+SpacesInParens: Never
+SpacesInParensOptions:
+  InCStyleCasts: false
+  InConditionalStatements: false
+  InEmptyParentheses: false
+  Other: false
+SpacesInSquareBrackets: false
 Standard: Latest
+StatementAttributeLikeMacros:
+  - Q_EMIT
 StatementMacros:
   - Q_UNUSED
   - QT_REQUIRE_VERSION
 TabWidth: 8
-UseCRLF:         false
 UseTab: Never
-...
+VerilogBreakBetweenInstancePorts: true
+WhitespaceSensitiveMacros:
+  - BOOST_PP_STRINGIZE
+  - CF_SWIFT_NAME
+  - NS_SWIFT_NAME
+  - PP_STRINGIZE
+  - STRINGIZE
+---
 

source/Core/BSP/BSP_Power.h

@@ -8,6 +8,8 @@
 
 #ifndef BSP_POWER_H_
 #define BSP_POWER_H_
+#include "Types.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -22,6 +24,8 @@ uint8_t getTipResistanceX10();
 uint16_t getTipThermalMass();
 uint16_t getTipInertia();
 
+TemperatureType_t getCustomTipMaxInC();
+
 #ifdef __cplusplus
 }
 #endif

source/Core/BSP/MHP30/BSP.cpp

@@ -6,7 +6,7 @@
 #include "Pins.h"
 #include "Setup.h"
 #include "TipThermoModel.h"
-#include "Utils.h"
+#include "Utils.hpp"
 #include "WS2812.h"
 #include "configuration.h"
 #include "history.hpp"
@@ -230,8 +230,9 @@ uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
   static uint32_t samples[BATTFILTERDEPTH];
   static uint8_t  index = 0;
   if (preFillneeded) {
-    for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
+    for (uint8_t i = 0; i < BATTFILTERDEPTH; i++) {
       samples[i] = getADC(1);
+    }
     preFillneeded--;
   }
   if (sample) {
@@ -240,8 +241,9 @@ uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
   }
   uint32_t sum = 0;
 
-  for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
+  for (uint8_t i = 0; i < BATTFILTERDEPTH; i++) {
     sum += samples[i];
+  }
 
   sum /= BATTFILTERDEPTH;
   if (divisor == 0) {
@@ -263,25 +265,6 @@ void unstick_I2C() {
   int              timeout     = 100;
   int              timeout_cnt = 0;
 
-  // 1. Clear PE bit.
-  hi2c1.Instance->CR1 &= ~(0x0001);
-  /**I2C1 GPIO Configuration
-   PB6     ------> I2C1_SCL
-   PB7     ------> I2C1_SDA
-   */
-  //  2. Configure the SCL and SDA I/Os as General Purpose Output Open-Drain, High level (Write 1 to GPIOx_ODR).
-  GPIO_InitStruct.Mode  = GPIO_MODE_OUTPUT_OD;
-  GPIO_InitStruct.Pull  = GPIO_PULLUP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-
-  GPIO_InitStruct.Pin = SCL_Pin;
-  HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
-  HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
-
-  GPIO_InitStruct.Pin = SDA_Pin;
-  HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
-  HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
-
   while (GPIO_PIN_SET != HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin)) {
     // Move clock to release I2C
     HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET);
@@ -292,39 +275,10 @@ void unstick_I2C() {
     HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
 
     timeout_cnt++;
-    if (timeout_cnt > timeout)
+    if (timeout_cnt > timeout) {
       return;
     }
-
-  // 12. Configure the SCL and SDA I/Os as Alternate function Open-Drain.
-  GPIO_InitStruct.Mode  = GPIO_MODE_AF_OD;
-  GPIO_InitStruct.Pull  = GPIO_PULLUP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-
-  GPIO_InitStruct.Pin = SCL_Pin;
-  HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
-
-  GPIO_InitStruct.Pin = SDA_Pin;
-  HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct);
-
-  HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
-  HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET);
-
-  // 13. Set SWRST bit in I2Cx_CR1 register.
-  hi2c1.Instance->CR1 |= 0x8000;
-
-  asm("nop");
-
-  // 14. Clear SWRST bit in I2Cx_CR1 register.
-  hi2c1.Instance->CR1 &= ~0x8000;
-
-  asm("nop");
-
-  // 15. Enable the I2C peripheral by setting the PE bit in I2Cx_CR1 register
-  hi2c1.Instance->CR1 |= 0x0001;
-
-  // Call initialization function.
-  HAL_I2C_Init(&hi2c1);
+  }
 }
 
 uint8_t getButtonA() { return HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ? 1 : 0; }
@@ -341,15 +295,9 @@ void setPlatePullup(bool pullingUp) {
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   GPIO_InitStruct.Pin   = PLATE_SENSOR_PULLUP_Pin;
   GPIO_InitStruct.Pull  = GPIO_NOPULL;
-  if (pullingUp) {
-    GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-    HAL_GPIO_WritePin(PLATE_SENSOR_PULLUP_GPIO_Port, PLATE_SENSOR_PULLUP_Pin, GPIO_PIN_SET);
-  } else {
-    // Hi-z
-    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-    HAL_GPIO_WritePin(PLATE_SENSOR_PULLUP_GPIO_Port, PLATE_SENSOR_PULLUP_Pin, GPIO_PIN_RESET);
-  }
+  GPIO_InitStruct.Mode  = pullingUp ? GPIO_MODE_OUTPUT_PP : GPIO_MODE_INPUT;
   HAL_GPIO_Init(PLATE_SENSOR_PULLUP_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_WritePin(PLATE_SENSOR_PULLUP_GPIO_Port, PLATE_SENSOR_PULLUP_Pin, pullingUp ? GPIO_PIN_SET : GPIO_PIN_RESET);
 }
 
 void performTipMeasurementStep(bool start) {

source/Core/BSP/MHP30/FreeRTOSConfig.h

@@ -105,12 +105,12 @@ extern uint32_t SystemCoreClock;
 #define configMINIMAL_STACK_SIZE                ((uint16_t)256)
 #define configTOTAL_HEAP_SIZE                   ((size_t)1024 * 14) /*Currently use about 9000*/
 #define configMAX_TASK_NAME_LEN                 (32)
-#define configUSE_16_BIT_TICKS                  0
 #define configUSE_MUTEXES                       1
 #define configQUEUE_REGISTRY_SIZE               8
 #define configUSE_TIMERS                        0
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
 #define configCHECK_FOR_STACK_OVERFLOW          2 /*Bump this to 2 during development and bug hunting*/
+#define configTICK_TYPE_WIDTH_IN_BITS           TICK_TYPE_WIDTH_32_BITS
 
 /* Co-routine definitions. */
 #define configUSE_CO_ROUTINES           0

source/Core/BSP/MHP30/I2C_Wrapper.cpp

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

source/Core/BSP/MHP30/IRQ.cpp

@@ -27,12 +27,6 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc) {
     }
   }
 }
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
 
 extern osThreadId POWTaskHandle;
 void              HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {

source/Core/BSP/MHP30/IRQ.h

@@ -18,12 +18,6 @@
 extern "C" {
 #endif
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc);
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
 void HAL_GPIO_EXTI_Callback(uint16_t);
 
 #ifdef __cplusplus

source/Core/BSP/MHP30/Setup.c

@@ -11,10 +11,6 @@ ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
 
-I2C_HandleTypeDef hi2c1;
-DMA_HandleTypeDef hdma_i2c1_rx;
-DMA_HandleTypeDef hdma_i2c1_tx;
-
 IWDG_HandleTypeDef hiwdg;
 TIM_HandleTypeDef  htim2;
 TIM_HandleTypeDef  htim3;
@@ -25,7 +21,7 @@ uint32_t ADCReadings[ADC_SAMPLES * ADC_CHANNELS]; // room for 32 lots of the pai
 // Functions
 static void SystemClock_Config(void);
 static void MX_ADC1_Init(void);
-static void MX_I2C1_Init(void);
+
 static void MX_IWDG_Init(void);
 static void MX_TIM3_Init(void);
 static void MX_TIM2_Init(void);
@@ -39,7 +35,7 @@ void        Setup_HAL() {
 
   MX_GPIO_Init();
   MX_DMA_Init();
-  MX_I2C1_Init();
+
   MX_ADC1_Init();
   MX_ADC2_Init();
   MX_TIM3_Init();
@@ -196,19 +192,6 @@ static void MX_ADC2_Init(void) {
     ;
   }
 }
-/* I2C1 init function */
-static void MX_I2C1_Init(void) {
-  hi2c1.Instance             = I2C1;
-  hi2c1.Init.ClockSpeed      = 300000;
-  hi2c1.Init.DutyCycle       = I2C_DUTYCYCLE_2;
-  hi2c1.Init.OwnAddress1     = 0;
-  hi2c1.Init.AddressingMode  = I2C_ADDRESSINGMODE_7BIT;
-  hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
-  hi2c1.Init.OwnAddress2     = 0;
-  hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
-  hi2c1.Init.NoStretchMode   = I2C_NOSTRETCH_DISABLE;
-  HAL_I2C_Init(&hi2c1);
-}
 
 /* IWDG init function */
 static void MX_IWDG_Init(void) {
@@ -353,8 +336,8 @@ static void MX_GPIO_Init(void) {
   GPIO_InitStruct.Pin  = GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3 | GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7 | GPIO_PIN_8 | GPIO_PIN_10 | GPIO_PIN_15;
   GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-  GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3 | GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7 | GPIO_PIN_8 | GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_11 | GPIO_PIN_12
-                        | GPIO_PIN_13 | GPIO_PIN_14 | GPIO_PIN_15;
+  GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1 | GPIO_PIN_2 | GPIO_PIN_3 | GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7 | GPIO_PIN_8 | GPIO_PIN_9 | GPIO_PIN_10 | GPIO_PIN_11 | GPIO_PIN_12 |
+                        GPIO_PIN_13 | GPIO_PIN_14 | GPIO_PIN_15;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
   /*Configure GPIO pins : KEY_B_Pin KEY_A_Pin */

source/Core/BSP/MHP30/Setup.h

@@ -20,7 +20,6 @@ extern DMA_HandleTypeDef hdma_adc1;
 
 extern DMA_HandleTypeDef hdma_i2c1_rx;
 extern DMA_HandleTypeDef hdma_i2c1_tx;
-extern I2C_HandleTypeDef hi2c1;
 
 extern IWDG_HandleTypeDef hiwdg;
 

source/Core/BSP/MHP30/Software_I2C.h

@@ -18,13 +18,26 @@
 #define SOFT_SDA2_LOW()  HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_RESET)
 #define SOFT_SDA2_READ() (HAL_GPIO_ReadPin(SDA2_GPIO_Port, SDA2_Pin) == GPIO_PIN_SET ? 1 : 0)
 #define SOFT_SCL2_READ() (HAL_GPIO_ReadPin(SCL2_GPIO_Port, SCL2_Pin) == GPIO_PIN_SET ? 1 : 0)
+
+#endif
+
+#ifdef I2C_SOFT_BUS_1
+#define SOFT_SCL1_HIGH() HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET)
+#define SOFT_SCL1_LOW()  HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA1_HIGH() HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET)
+#define SOFT_SDA1_LOW()  HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA1_READ() (HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin) == GPIO_PIN_SET ? 1 : 0)
+#define SOFT_SCL1_READ() (HAL_GPIO_ReadPin(SCL_GPIO_Port, SCL_Pin) == GPIO_PIN_SET ? 1 : 0)
+
+#endif
+
 #define SOFT_I2C_DELAY()              \
   {                                   \
-    for (int xx = 0; xx < 20; xx++) { \
+    for (int xx = 0; xx < 15; xx++) { \
       asm("nop");                     \
     }                                 \
   }
 
-#endif
+// 40 ~= 100kHz; 15 gives around 250kHz or so which is fast _and_ stable
 
 #endif /* BSP_MINIWARE_SOFTWARE_I2C_H_ */

source/Core/BSP/MHP30/ThermoModel.cpp

@@ -7,7 +7,7 @@
 #include "Setup.h"
 #include "TipThermoModel.h"
 #include "Types.h"
-#include "Utils.h"
+#include "Utils.hpp"
 #include "configuration.h"
 
 extern uint16_t   tipSenseResistancex10Ohms;

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h

@@ -1,728 +0,0 @@
-/**
- ******************************************************************************
- * @file    stm32f1xx_hal_i2c.h
- * @author  MCD Application Team
- * @brief   Header file of I2C HAL module.
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
- * All rights reserved.</center></h2>
- *
- * This software component is licensed by ST under BSD 3-Clause license,
- * the "License"; You may not use this file except in compliance with the
- * License. You may obtain a copy of the License at:
- *                        opensource.org/licenses/BSD-3-Clause
- *
- ******************************************************************************
- */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F1xx_HAL_I2C_H
-#define __STM32F1xx_HAL_I2C_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f1xx_hal_def.h"
-
-/** @addtogroup STM32F1xx_HAL_Driver
- * @{
- */
-
-/** @addtogroup I2C
- * @{
- */
-
-/* Exported types ------------------------------------------------------------*/
-/** @defgroup I2C_Exported_Types I2C Exported Types
- * @{
- */
-
-/** @defgroup I2C_Configuration_Structure_definition I2C Configuration Structure definition
- * @brief  I2C Configuration Structure definition
- * @{
- */
-typedef struct {
-  uint32_t ClockSpeed; /*!< Specifies the clock frequency.
-                            This parameter must be set to a value lower than 400kHz */
-
-  uint32_t DutyCycle; /*!< Specifies the I2C fast mode duty cycle.
-                           This parameter can be a value of @ref I2C_duty_cycle_in_fast_mode */
-
-  uint32_t OwnAddress1; /*!< Specifies the first device own address.
-                             This parameter can be a 7-bit or 10-bit address. */
-
-  uint32_t AddressingMode; /*!< Specifies if 7-bit or 10-bit addressing mode is selected.
-                                This parameter can be a value of @ref I2C_addressing_mode */
-
-  uint32_t DualAddressMode; /*!< Specifies if dual addressing mode is selected.
-                                 This parameter can be a value of @ref I2C_dual_addressing_mode */
-
-  uint32_t OwnAddress2; /*!< Specifies the second device own address if dual addressing mode is selected
-                             This parameter can be a 7-bit address. */
-
-  uint32_t GeneralCallMode; /*!< Specifies if general call mode is selected.
-                                 This parameter can be a value of @ref I2C_general_call_addressing_mode */
-
-  uint32_t NoStretchMode; /*!< Specifies if nostretch mode is selected.
-                               This parameter can be a value of @ref I2C_nostretch_mode */
-
-} I2C_InitTypeDef;
-
-/**
- * @}
- */
-
-/** @defgroup HAL_state_structure_definition HAL state structure definition
- * @brief  HAL State structure definition
- * @note  HAL I2C State value coding follow below described bitmap :
- *          b7-b6  Error information
- *             00 : No Error
- *             01 : Abort (Abort user request on going)
- *             10 : Timeout
- *             11 : Error
- *          b5     Peripheral initilisation status
- *             0  : Reset (Peripheral not initialized)
- *             1  : Init done (Peripheral initialized and ready to use. HAL I2C Init function called)
- *          b4     (not used)
- *             x  : Should be set to 0
- *          b3
- *             0  : Ready or Busy (No Listen mode ongoing)
- *             1  : Listen (Peripheral in Address Listen Mode)
- *          b2     Intrinsic process state
- *             0  : Ready
- *             1  : Busy (Peripheral busy with some configuration or internal operations)
- *          b1     Rx state
- *             0  : Ready (no Rx operation ongoing)
- *             1  : Busy (Rx operation ongoing)
- *          b0     Tx state
- *             0  : Ready (no Tx operation ongoing)
- *             1  : Busy (Tx operation ongoing)
- * @{
- */
-typedef enum {
-  HAL_I2C_STATE_RESET          = 0x00U, /*!< Peripheral is not yet Initialized         */
-  HAL_I2C_STATE_READY          = 0x20U, /*!< Peripheral Initialized and ready for use  */
-  HAL_I2C_STATE_BUSY           = 0x24U, /*!< An internal process is ongoing            */
-  HAL_I2C_STATE_BUSY_TX        = 0x21U, /*!< Data Transmission process is ongoing      */
-  HAL_I2C_STATE_BUSY_RX        = 0x22U, /*!< Data Reception process is ongoing         */
-  HAL_I2C_STATE_LISTEN         = 0x28U, /*!< Address Listen Mode is ongoing            */
-  HAL_I2C_STATE_BUSY_TX_LISTEN = 0x29U, /*!< Address Listen Mode and Data Transmission
-                                            process is ongoing                         */
-  HAL_I2C_STATE_BUSY_RX_LISTEN = 0x2AU, /*!< Address Listen Mode and Data Reception
-                                            process is ongoing                         */
-  HAL_I2C_STATE_ABORT   = 0x60U,        /*!< Abort user request ongoing                */
-  HAL_I2C_STATE_TIMEOUT = 0xA0U,        /*!< Timeout state                             */
-  HAL_I2C_STATE_ERROR   = 0xE0U         /*!< Error                                     */
-
-} HAL_I2C_StateTypeDef;
-
-/**
- * @}
- */
-
-/** @defgroup HAL_mode_structure_definition HAL mode structure definition
- * @brief  HAL Mode structure definition
- * @note  HAL I2C Mode value coding follow below described bitmap :\n
- *          b7     (not used)\n
- *             x  : Should be set to 0\n
- *          b6\n
- *             0  : None\n
- *             1  : Memory (HAL I2C communication is in Memory Mode)\n
- *          b5\n
- *             0  : None\n
- *             1  : Slave (HAL I2C communication is in Slave Mode)\n
- *          b4\n
- *             0  : None\n
- *             1  : Master (HAL I2C communication is in Master Mode)\n
- *          b3-b2-b1-b0  (not used)\n
- *             xxxx : Should be set to 0000
- * @{
- */
-typedef enum {
-  HAL_I2C_MODE_NONE   = 0x00U, /*!< No I2C communication on going             */
-  HAL_I2C_MODE_MASTER = 0x10U, /*!< I2C communication is in Master Mode       */
-  HAL_I2C_MODE_SLAVE  = 0x20U, /*!< I2C communication is in Slave Mode        */
-  HAL_I2C_MODE_MEM    = 0x40U  /*!< I2C communication is in Memory Mode       */
-
-} HAL_I2C_ModeTypeDef;
-
-/**
- * @}
- */
-
-/** @defgroup I2C_Error_Code_definition I2C Error Code definition
- * @brief  I2C Error Code definition
- * @{
- */
-#define HAL_I2C_ERROR_NONE      0x00000000U /*!< No error              */
-#define HAL_I2C_ERROR_BERR      0x00000001U /*!< BERR error            */
-#define HAL_I2C_ERROR_ARLO      0x00000002U /*!< ARLO error            */
-#define HAL_I2C_ERROR_AF        0x00000004U /*!< AF error              */
-#define HAL_I2C_ERROR_OVR       0x00000008U /*!< OVR error             */
-#define HAL_I2C_ERROR_DMA       0x00000010U /*!< DMA transfer error    */
-#define HAL_I2C_ERROR_TIMEOUT   0x00000020U /*!< Timeout Error         */
-#define HAL_I2C_ERROR_SIZE      0x00000040U /*!< Size Management error */
-#define HAL_I2C_ERROR_DMA_PARAM 0x00000080U /*!< DMA Parameter Error   */
-#define HAL_I2C_WRONG_START     0x00000200U /*!< Wrong start Error     */
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-#define HAL_I2C_ERROR_INVALID_CALLBACK 0x00000100U /*!< Invalid Callback error */
-#endif                                             /* USE_HAL_I2C_REGISTER_CALLBACKS */
-/**
- * @}
- */
-
-/** @defgroup I2C_handle_Structure_definition I2C handle Structure definition
- * @brief  I2C handle Structure definition
- * @{
- */
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-typedef struct __I2C_HandleTypeDef
-#else
-typedef struct
-#endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
-{
-  I2C_TypeDef *Instance; /*!< I2C registers base address               */
-
-  I2C_InitTypeDef Init; /*!< I2C communication parameters             */
-
-  uint8_t *pBuffPtr; /*!< Pointer to I2C transfer buffer           */
-
-  uint16_t XferSize; /*!< I2C transfer size                        */
-
-  __IO uint16_t XferCount; /*!< I2C transfer counter                     */
-
-  __IO uint32_t XferOptions; /*!< I2C transfer options                     */
-
-  __IO uint32_t PreviousState; /*!< I2C communication Previous state and mode
-                                    context for internal usage               */
-
-  DMA_HandleTypeDef *hdmatx; /*!< I2C Tx DMA handle parameters             */
-
-  DMA_HandleTypeDef *hdmarx; /*!< I2C Rx DMA handle parameters             */
-
-  HAL_LockTypeDef Lock; /*!< I2C locking object                       */
-
-  __IO HAL_I2C_StateTypeDef State; /*!< I2C communication state                  */
-
-  __IO HAL_I2C_ModeTypeDef Mode; /*!< I2C communication mode                   */
-
-  __IO uint32_t ErrorCode; /*!< I2C Error code                           */
-
-  __IO uint32_t Devaddress; /*!< I2C Target device address                */
-
-  __IO uint32_t Memaddress; /*!< I2C Target memory address                */
-
-  __IO uint32_t MemaddSize; /*!< I2C Target memory address  size          */
-
-  __IO uint32_t EventCount; /*!< I2C Event counter                        */
-#ifndef USE_HAL_I2C_REGISTER_CALLBACKS
-#define USE_HAL_I2C_REGISTER_CALLBACKS 0
-#endif
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-  void (*MasterTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c); /*!< I2C Master Tx Transfer completed callback */
-  void (*MasterRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c); /*!< I2C Master Rx Transfer completed callback */
-  void (*SlaveTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);  /*!< I2C Slave Tx Transfer completed callback  */
-  void (*SlaveRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);  /*!< I2C Slave Rx Transfer completed callback  */
-  void (*ListenCpltCallback)(struct __I2C_HandleTypeDef *hi2c);   /*!< I2C Listen Complete callback              */
-  void (*MemTxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);    /*!< I2C Memory Tx Transfer completed callback */
-  void (*MemRxCpltCallback)(struct __I2C_HandleTypeDef *hi2c);    /*!< I2C Memory Rx Transfer completed callback */
-  void (*ErrorCallback)(struct __I2C_HandleTypeDef *hi2c);        /*!< I2C Error callback                        */
-  void (*AbortCpltCallback)(struct __I2C_HandleTypeDef *hi2c);    /*!< I2C Abort callback                        */
-
-  void (*AddrCallback)(struct __I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode); /*!< I2C Slave Address Match callback */
-
-  void (*MspInitCallback)(struct __I2C_HandleTypeDef *hi2c);   /*!< I2C Msp Init callback                     */
-  void (*MspDeInitCallback)(struct __I2C_HandleTypeDef *hi2c); /*!< I2C Msp DeInit callback                   */
-
-#endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
-} I2C_HandleTypeDef;
-
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-/**
- * @brief  HAL I2C Callback ID enumeration definition
- */
-typedef enum {
-  HAL_I2C_MASTER_TX_COMPLETE_CB_ID = 0x00U, /*!< I2C Master Tx Transfer completed callback ID  */
-  HAL_I2C_MASTER_RX_COMPLETE_CB_ID = 0x01U, /*!< I2C Master Rx Transfer completed callback ID  */
-  HAL_I2C_SLAVE_TX_COMPLETE_CB_ID  = 0x02U, /*!< I2C Slave Tx Transfer completed callback ID   */
-  HAL_I2C_SLAVE_RX_COMPLETE_CB_ID  = 0x03U, /*!< I2C Slave Rx Transfer completed callback ID   */
-  HAL_I2C_LISTEN_COMPLETE_CB_ID    = 0x04U, /*!< I2C Listen Complete callback ID               */
-  HAL_I2C_MEM_TX_COMPLETE_CB_ID    = 0x05U, /*!< I2C Memory Tx Transfer callback ID            */
-  HAL_I2C_MEM_RX_COMPLETE_CB_ID    = 0x06U, /*!< I2C Memory Rx Transfer completed callback ID  */
-  HAL_I2C_ERROR_CB_ID              = 0x07U, /*!< I2C Error callback ID                         */
-  HAL_I2C_ABORT_CB_ID              = 0x08U, /*!< I2C Abort callback ID                         */
-
-  HAL_I2C_MSPINIT_CB_ID   = 0x09U, /*!< I2C Msp Init callback ID                      */
-  HAL_I2C_MSPDEINIT_CB_ID = 0x0AU  /*!< I2C Msp DeInit callback ID                    */
-
-} HAL_I2C_CallbackIDTypeDef;
-
-/**
- * @brief  HAL I2C Callback pointer definition
- */
-typedef void (*pI2C_CallbackTypeDef)(I2C_HandleTypeDef *hi2c);                                                        /*!< pointer to an I2C callback function */
-typedef void (*pI2C_AddrCallbackTypeDef)(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode); /*!< pointer to an I2C Address Match callback function */
-
-#endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
-/**
- * @}
- */
-
-/**
- * @}
- */
-/* Exported constants --------------------------------------------------------*/
-
-/** @defgroup I2C_Exported_Constants I2C Exported Constants
- * @{
- */
-
-/** @defgroup I2C_duty_cycle_in_fast_mode I2C duty cycle in fast mode
- * @{
- */
-#define I2C_DUTYCYCLE_2    0x00000000U
-#define I2C_DUTYCYCLE_16_9 I2C_CCR_DUTY
-/**
- * @}
- */
-
-/** @defgroup I2C_addressing_mode I2C addressing mode
- * @{
- */
-#define I2C_ADDRESSINGMODE_7BIT  0x00004000U
-#define I2C_ADDRESSINGMODE_10BIT (I2C_OAR1_ADDMODE | 0x00004000U)
-/**
- * @}
- */
-
-/** @defgroup I2C_dual_addressing_mode  I2C dual addressing mode
- * @{
- */
-#define I2C_DUALADDRESS_DISABLE 0x00000000U
-#define I2C_DUALADDRESS_ENABLE  I2C_OAR2_ENDUAL
-/**
- * @}
- */
-
-/** @defgroup I2C_general_call_addressing_mode I2C general call addressing mode
- * @{
- */
-#define I2C_GENERALCALL_DISABLE 0x00000000U
-#define I2C_GENERALCALL_ENABLE  I2C_CR1_ENGC
-/**
- * @}
- */
-
-/** @defgroup I2C_nostretch_mode I2C nostretch mode
- * @{
- */
-#define I2C_NOSTRETCH_DISABLE 0x00000000U
-#define I2C_NOSTRETCH_ENABLE  I2C_CR1_NOSTRETCH
-/**
- * @}
- */
-
-/** @defgroup I2C_Memory_Address_Size I2C Memory Address Size
- * @{
- */
-#define I2C_MEMADD_SIZE_8BIT  0x00000001U
-#define I2C_MEMADD_SIZE_16BIT 0x00000010U
-/**
- * @}
- */
-
-/** @defgroup I2C_XferDirection_definition I2C XferDirection definition
- * @{
- */
-#define I2C_DIRECTION_RECEIVE  0x00000000U
-#define I2C_DIRECTION_TRANSMIT 0x00000001U
-/**
- * @}
- */
-
-/** @defgroup I2C_XferOptions_definition I2C XferOptions definition
- * @{
- */
-#define I2C_FIRST_FRAME          0x00000001U
-#define I2C_FIRST_AND_NEXT_FRAME 0x00000002U
-#define I2C_NEXT_FRAME           0x00000004U
-#define I2C_FIRST_AND_LAST_FRAME 0x00000008U
-#define I2C_LAST_FRAME_NO_STOP   0x00000010U
-#define I2C_LAST_FRAME           0x00000020U
-
-/* List of XferOptions in usage of :
- * 1- Restart condition in all use cases (direction change or not)
- */
-#define I2C_OTHER_FRAME          (0x00AA0000U)
-#define I2C_OTHER_AND_LAST_FRAME (0xAA000000U)
-/**
- * @}
- */
-
-/** @defgroup I2C_Interrupt_configuration_definition I2C Interrupt configuration definition
- * @brief I2C Interrupt definition
- *        Elements values convention: 0xXXXXXXXX
- *           - XXXXXXXX  : Interrupt control mask
- * @{
- */
-#define I2C_IT_BUF I2C_CR2_ITBUFEN
-#define I2C_IT_EVT I2C_CR2_ITEVTEN
-#define I2C_IT_ERR I2C_CR2_ITERREN
-/**
- * @}
- */
-
-/** @defgroup I2C_Flag_definition I2C Flag definition
- * @{
- */
-
-#define I2C_FLAG_OVR     0x00010800U
-#define I2C_FLAG_AF      0x00010400U
-#define I2C_FLAG_ARLO    0x00010200U
-#define I2C_FLAG_BERR    0x00010100U
-#define I2C_FLAG_TXE     0x00010080U
-#define I2C_FLAG_RXNE    0x00010040U
-#define I2C_FLAG_STOPF   0x00010010U
-#define I2C_FLAG_ADD10   0x00010008U
-#define I2C_FLAG_BTF     0x00010004U
-#define I2C_FLAG_ADDR    0x00010002U
-#define I2C_FLAG_SB      0x00010001U
-#define I2C_FLAG_DUALF   0x00100080U
-#define I2C_FLAG_GENCALL 0x00100010U
-#define I2C_FLAG_TRA     0x00100004U
-#define I2C_FLAG_BUSY    0x00100002U
-#define I2C_FLAG_MSL     0x00100001U
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/* Exported macros -----------------------------------------------------------*/
-
-/** @defgroup I2C_Exported_Macros I2C Exported Macros
- * @{
- */
-
-/** @brief Reset I2C handle state.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @retval None
- */
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-#define __HAL_I2C_RESET_HANDLE_STATE(__HANDLE__)           \
-  do {                                                     \
-    (__HANDLE__)->State             = HAL_I2C_STATE_RESET; \
-    (__HANDLE__)->MspInitCallback   = NULL;                \
-    (__HANDLE__)->MspDeInitCallback = NULL;                \
-  } while (0)
-#else
-#define __HAL_I2C_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_I2C_STATE_RESET)
-#endif
-
-/** @brief  Enable or disable the specified I2C interrupts.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @param  __INTERRUPT__ specifies the interrupt source to enable or disable.
- *         This parameter can be one of the following values:
- *            @arg I2C_IT_BUF: Buffer interrupt enable
- *            @arg I2C_IT_EVT: Event interrupt enable
- *            @arg I2C_IT_ERR: Error interrupt enable
- * @retval None
- */
-#define __HAL_I2C_ENABLE_IT(__HANDLE__, __INTERRUPT__)  SET_BIT((__HANDLE__)->Instance->CR2, (__INTERRUPT__))
-#define __HAL_I2C_DISABLE_IT(__HANDLE__, __INTERRUPT__) CLEAR_BIT((__HANDLE__)->Instance->CR2, (__INTERRUPT__))
-
-/** @brief  Checks if the specified I2C interrupt source is enabled or disabled.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @param  __INTERRUPT__ specifies the I2C interrupt source to check.
- *          This parameter can be one of the following values:
- *            @arg I2C_IT_BUF: Buffer interrupt enable
- *            @arg I2C_IT_EVT: Event interrupt enable
- *            @arg I2C_IT_ERR: Error interrupt enable
- * @retval The new state of __INTERRUPT__ (TRUE or FALSE).
- */
-#define __HAL_I2C_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->CR2 & (__INTERRUPT__)) == (__INTERRUPT__)) ? SET : RESET)
-
-/** @brief  Checks whether the specified I2C flag is set or not.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @param  __FLAG__ specifies the flag to check.
- *         This parameter can be one of the following values:
- *            @arg I2C_FLAG_OVR: Overrun/Underrun flag
- *            @arg I2C_FLAG_AF: Acknowledge failure flag
- *            @arg I2C_FLAG_ARLO: Arbitration lost flag
- *            @arg I2C_FLAG_BERR: Bus error flag
- *            @arg I2C_FLAG_TXE: Data register empty flag
- *            @arg I2C_FLAG_RXNE: Data register not empty flag
- *            @arg I2C_FLAG_STOPF: Stop detection flag
- *            @arg I2C_FLAG_ADD10: 10-bit header sent flag
- *            @arg I2C_FLAG_BTF: Byte transfer finished flag
- *            @arg I2C_FLAG_ADDR: Address sent flag
- *                                Address matched flag
- *            @arg I2C_FLAG_SB: Start bit flag
- *            @arg I2C_FLAG_DUALF: Dual flag
- *            @arg I2C_FLAG_GENCALL: General call header flag
- *            @arg I2C_FLAG_TRA: Transmitter/Receiver flag
- *            @arg I2C_FLAG_BUSY: Bus busy flag
- *            @arg I2C_FLAG_MSL: Master/Slave flag
- * @retval The new state of __FLAG__ (TRUE or FALSE).
- */
-#define __HAL_I2C_GET_FLAG(__HANDLE__, __FLAG__)                                                                                                            \
-  ((((uint8_t)((__FLAG__) >> 16U)) == 0x01U) ? (((((__HANDLE__)->Instance->SR1) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)) ? SET : RESET) \
-                                             : (((((__HANDLE__)->Instance->SR2) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)) ? SET : RESET))
-
-/** @brief  Clears the I2C pending flags which are cleared by writing 0 in a specific bit.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @param  __FLAG__ specifies the flag to clear.
- *         This parameter can be any combination of the following values:
- *            @arg I2C_FLAG_OVR: Overrun/Underrun flag (Slave mode)
- *            @arg I2C_FLAG_AF: Acknowledge failure flag
- *            @arg I2C_FLAG_ARLO: Arbitration lost flag (Master mode)
- *            @arg I2C_FLAG_BERR: Bus error flag
- * @retval None
- */
-#define __HAL_I2C_CLEAR_FLAG(__HANDLE__, __FLAG__) ((__HANDLE__)->Instance->SR1 = ~((__FLAG__)&I2C_FLAG_MASK))
-
-/** @brief  Clears the I2C ADDR pending flag.
- * @param  __HANDLE__ specifies the I2C Handle.
- *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
- * @retval None
- */
-#define __HAL_I2C_CLEAR_ADDRFLAG(__HANDLE__)            \
-  do {                                                  \
-    __IO uint32_t tmpreg = 0x00U;                       \
-    tmpreg               = (__HANDLE__)->Instance->SR1; \
-    tmpreg               = (__HANDLE__)->Instance->SR2; \
-    UNUSED(tmpreg);                                     \
-  } while (0)
-
-/** @brief  Clears the I2C STOPF pending flag.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @retval None
- */
-#define __HAL_I2C_CLEAR_STOPFLAG(__HANDLE__)            \
-  do {                                                  \
-    __IO uint32_t tmpreg = 0x00U;                       \
-    tmpreg               = (__HANDLE__)->Instance->SR1; \
-    SET_BIT((__HANDLE__)->Instance->CR1, I2C_CR1_PE);   \
-    UNUSED(tmpreg);                                     \
-  } while (0)
-
-/** @brief  Enable the specified I2C peripheral.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @retval None
- */
-#define __HAL_I2C_ENABLE(__HANDLE__) SET_BIT((__HANDLE__)->Instance->CR1, I2C_CR1_PE)
-
-/** @brief  Disable the specified I2C peripheral.
- * @param  __HANDLE__ specifies the I2C Handle.
- * @retval None
- */
-#define __HAL_I2C_DISABLE(__HANDLE__) CLEAR_BIT((__HANDLE__)->Instance->CR1, I2C_CR1_PE)
-
-/**
- * @}
- */
-
-/* Exported functions --------------------------------------------------------*/
-/** @addtogroup I2C_Exported_Functions
- * @{
- */
-
-/** @addtogroup I2C_Exported_Functions_Group1 Initialization and de-initialization functions
- * @{
- */
-/* Initialization and de-initialization functions******************************/
-HAL_StatusTypeDef HAL_I2C_Init(I2C_HandleTypeDef *hi2c);
-HAL_StatusTypeDef HAL_I2C_DeInit(I2C_HandleTypeDef *hi2c);
-void              HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c);
-void              HAL_I2C_MspDeInit(I2C_HandleTypeDef *hi2c);
-
-/* Callbacks Register/UnRegister functions  ***********************************/
-#if (USE_HAL_I2C_REGISTER_CALLBACKS == 1)
-HAL_StatusTypeDef HAL_I2C_RegisterCallback(I2C_HandleTypeDef *hi2c, HAL_I2C_CallbackIDTypeDef CallbackID, pI2C_CallbackTypeDef pCallback);
-HAL_StatusTypeDef HAL_I2C_UnRegisterCallback(I2C_HandleTypeDef *hi2c, HAL_I2C_CallbackIDTypeDef CallbackID);
-
-HAL_StatusTypeDef HAL_I2C_RegisterAddrCallback(I2C_HandleTypeDef *hi2c, pI2C_AddrCallbackTypeDef pCallback);
-HAL_StatusTypeDef HAL_I2C_UnRegisterAddrCallback(I2C_HandleTypeDef *hi2c);
-#endif /* USE_HAL_I2C_REGISTER_CALLBACKS */
-/**
- * @}
- */
-
-/** @addtogroup I2C_Exported_Functions_Group2 Input and Output operation functions
- * @{
- */
-/* IO operation functions  ****************************************************/
-/******* Blocking mode: Polling */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Mem_Write(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Mem_Read(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_IsDeviceReady(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint32_t Trials, uint32_t Timeout);
-
-/******* Non-Blocking mode: Interrupt */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Master_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Write_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Read_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-
-HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Seq_Transmit_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Seq_Receive_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_EnableListen_IT(I2C_HandleTypeDef *hi2c);
-HAL_StatusTypeDef HAL_I2C_DisableListen_IT(I2C_HandleTypeDef *hi2c);
-HAL_StatusTypeDef HAL_I2C_Master_Abort_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress);
-
-/******* Non-Blocking mode: DMA */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Master_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Write_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Read_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-
-HAL_StatusTypeDef HAL_I2C_Master_Seq_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Master_Seq_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Seq_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Seq_Receive_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-/**
- * @}
- */
-
-/** @addtogroup I2C_IRQ_Handler_and_Callbacks IRQ Handler and Callbacks
- * @{
- */
-/******* I2C IRQHandler and Callbacks used in non blocking modes (Interrupt and DMA) */
-void HAL_I2C_EV_IRQHandler(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_ER_IRQHandler(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_SlaveTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode);
-void HAL_I2C_ListenCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
-/**
- * @}
- */
-
-/** @addtogroup I2C_Exported_Functions_Group3 Peripheral State, Mode and Error functions
- * @{
- */
-/* Peripheral State, Mode and Error functions  *********************************/
-HAL_I2C_StateTypeDef HAL_I2C_GetState(I2C_HandleTypeDef *hi2c);
-HAL_I2C_ModeTypeDef  HAL_I2C_GetMode(I2C_HandleTypeDef *hi2c);
-uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-/* Private types -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private constants ---------------------------------------------------------*/
-/** @defgroup I2C_Private_Constants I2C Private Constants
- * @{
- */
-#define I2C_FLAG_MASK              0x0000FFFFU
-#define I2C_MIN_PCLK_FREQ_STANDARD 2000000U /*!< 2 MHz                     */
-#define I2C_MIN_PCLK_FREQ_FAST     4000000U /*!< 4 MHz                     */
-/**
- * @}
- */
-
-/* Private macros ------------------------------------------------------------*/
-/** @defgroup I2C_Private_Macros I2C Private Macros
- * @{
- */
-
-#define I2C_MIN_PCLK_FREQ(__PCLK__, __SPEED__)              (((__SPEED__) <= 100000U) ? ((__PCLK__) < I2C_MIN_PCLK_FREQ_STANDARD) : ((__PCLK__) < I2C_MIN_PCLK_FREQ_FAST))
-#define I2C_CCR_CALCULATION(__PCLK__, __SPEED__, __COEFF__) (((((__PCLK__)-1U) / ((__SPEED__) * (__COEFF__))) + 1U) & I2C_CCR_CCR)
-#define I2C_FREQRANGE(__PCLK__)                             ((__PCLK__) / 1000000U)
-#define I2C_RISE_TIME(__FREQRANGE__, __SPEED__)             (((__SPEED__) <= 100000U) ? ((__FREQRANGE__) + 1U) : ((((__FREQRANGE__)*300U) / 1000U) + 1U))
-#define I2C_SPEED_STANDARD(__PCLK__, __SPEED__)             ((I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U) < 4U) ? 4U : I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U))
-#define I2C_SPEED_FAST(__PCLK__, __SPEED__, __DUTYCYCLE__) \
-  (((__DUTYCYCLE__) == I2C_DUTYCYCLE_2) ? I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 3U) : (I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 25U) | I2C_DUTYCYCLE_16_9))
-#define I2C_SPEED(__PCLK__, __SPEED__, __DUTYCYCLE__)                                                                                 \
-  (((__SPEED__) <= 100000U)                                                           ? (I2C_SPEED_STANDARD((__PCLK__), (__SPEED__))) \
-   : ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__)) & I2C_CCR_CCR) == 0U) ? 1U                                            \
-                                                                                      : ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__))) | I2C_CCR_FS))
-
-#define I2C_7BIT_ADD_WRITE(__ADDRESS__) ((uint8_t)((__ADDRESS__) & (uint8_t)(~I2C_OAR1_ADD0)))
-#define I2C_7BIT_ADD_READ(__ADDRESS__)  ((uint8_t)((__ADDRESS__) | I2C_OAR1_ADD0))
-
-#define I2C_10BIT_ADDRESS(__ADDRESS__)      ((uint8_t)((uint16_t)((__ADDRESS__) & (uint16_t)0x00FF)))
-#define I2C_10BIT_HEADER_WRITE(__ADDRESS__) ((uint8_t)((uint16_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)0x0300)) >> 7) | (uint16_t)0x00F0)))
-#define I2C_10BIT_HEADER_READ(__ADDRESS__)  ((uint8_t)((uint16_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)0x0300)) >> 7) | (uint16_t)(0x00F1))))
-
-#define I2C_MEM_ADD_MSB(__ADDRESS__) ((uint8_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)0xFF00)) >> 8)))
-#define I2C_MEM_ADD_LSB(__ADDRESS__) ((uint8_t)((uint16_t)((__ADDRESS__) & (uint16_t)0x00FF)))
-
-/** @defgroup I2C_IS_RTC_Definitions I2C Private macros to check input parameters
- * @{
- */
-#define IS_I2C_DUTY_CYCLE(CYCLE)        (((CYCLE) == I2C_DUTYCYCLE_2) || ((CYCLE) == I2C_DUTYCYCLE_16_9))
-#define IS_I2C_ADDRESSING_MODE(ADDRESS) (((ADDRESS) == I2C_ADDRESSINGMODE_7BIT) || ((ADDRESS) == I2C_ADDRESSINGMODE_10BIT))
-#define IS_I2C_DUAL_ADDRESS(ADDRESS)    (((ADDRESS) == I2C_DUALADDRESS_DISABLE) || ((ADDRESS) == I2C_DUALADDRESS_ENABLE))
-#define IS_I2C_GENERAL_CALL(CALL)       (((CALL) == I2C_GENERALCALL_DISABLE) || ((CALL) == I2C_GENERALCALL_ENABLE))
-#define IS_I2C_NO_STRETCH(STRETCH)      (((STRETCH) == I2C_NOSTRETCH_DISABLE) || ((STRETCH) == I2C_NOSTRETCH_ENABLE))
-#define IS_I2C_MEMADD_SIZE(SIZE)        (((SIZE) == I2C_MEMADD_SIZE_8BIT) || ((SIZE) == I2C_MEMADD_SIZE_16BIT))
-#define IS_I2C_CLOCK_SPEED(SPEED)       (((SPEED) > 0U) && ((SPEED) <= 400000U))
-#define IS_I2C_OWN_ADDRESS1(ADDRESS1)   (((ADDRESS1)&0xFFFFFC00U) == 0U)
-#define IS_I2C_OWN_ADDRESS2(ADDRESS2)   (((ADDRESS2)&0xFFFFFF01U) == 0U)
-#define IS_I2C_TRANSFER_OPTIONS_REQUEST(REQUEST)                                                                                                                                          \
-  (((REQUEST) == I2C_FIRST_FRAME) || ((REQUEST) == I2C_FIRST_AND_NEXT_FRAME) || ((REQUEST) == I2C_NEXT_FRAME) || ((REQUEST) == I2C_FIRST_AND_LAST_FRAME) || ((REQUEST) == I2C_LAST_FRAME) \
-   || ((REQUEST) == I2C_LAST_FRAME_NO_STOP) || IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(REQUEST))
-
-#define IS_I2C_TRANSFER_OTHER_OPTIONS_REQUEST(REQUEST) (((REQUEST) == I2C_OTHER_FRAME) || ((REQUEST) == I2C_OTHER_AND_LAST_FRAME))
-
-#define I2C_CHECK_FLAG(__ISR__, __FLAG__)    ((((__ISR__) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)) ? SET : RESET)
-#define I2C_CHECK_IT_SOURCE(__CR1__, __IT__) ((((__CR1__) & (__IT__)) == (__IT__)) ? SET : RESET)
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/* Private functions ---------------------------------------------------------*/
-/** @defgroup I2C_Private_Functions I2C Private Functions
- * @{
- */
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __STM32F1xx_HAL_I2C_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c

@@ -139,8 +139,8 @@ HAL_TickFreqTypeDef uwTickFreq = HAL_TICK_FREQ_DEFAULT;     /* 1KHz */
 HAL_StatusTypeDef HAL_Init(void) {
   /* Configure Flash prefetch */
 #if (PREFETCH_ENABLE != 0)
-#if defined(STM32F101x6) || defined(STM32F101xB) || defined(STM32F101xE) || defined(STM32F101xG) || defined(STM32F102x6) || defined(STM32F102xB) || defined(STM32F103x6) || defined(STM32F103xB) \
-    || defined(STM32F103xE) || defined(STM32F103xG) || defined(STM32F105xC) || defined(STM32F107xC)
+#if defined(STM32F101x6) || defined(STM32F101xB) || defined(STM32F101xE) || defined(STM32F101xG) || defined(STM32F102x6) || defined(STM32F102xB) || defined(STM32F103x6) || defined(STM32F103xB) ||    \
+    defined(STM32F103xE) || defined(STM32F103xG) || defined(STM32F105xC) || defined(STM32F107xC)
 
   /* Prefetch buffer is not available on value line devices */
   __HAL_FLASH_PREFETCH_BUFFER_ENABLE();
@@ -347,7 +347,8 @@ __weak void HAL_Delay(uint32_t Delay) {
     wait += (uint32_t)(uwTickFreq);
   }
 
-  while ((HAL_GetTick() - tickstart) < wait) {}
+  while ((HAL_GetTick() - tickstart) < wait) {
+  }
 }
 
 /**

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c

@@ -620,12 +620,12 @@ HAL_StatusTypeDef HAL_ADC_DeInit(ADC_HandleTypeDef *hadc) {
     __HAL_ADC_CLEAR_FLAG(hadc, (ADC_FLAG_AWD | ADC_FLAG_JEOC | ADC_FLAG_EOC | ADC_FLAG_JSTRT | ADC_FLAG_STRT));
 
     /* Reset register CR1 */
-    CLEAR_BIT(hadc->Instance->CR1, (ADC_CR1_AWDEN | ADC_CR1_JAWDEN | ADC_CR1_DISCNUM | ADC_CR1_JDISCEN | ADC_CR1_DISCEN | ADC_CR1_JAUTO | ADC_CR1_AWDSGL | ADC_CR1_SCAN | ADC_CR1_JEOCIE | ADC_CR1_AWDIE
-                                    | ADC_CR1_EOCIE | ADC_CR1_AWDCH));
+    CLEAR_BIT(hadc->Instance->CR1, (ADC_CR1_AWDEN | ADC_CR1_JAWDEN | ADC_CR1_DISCNUM | ADC_CR1_JDISCEN | ADC_CR1_DISCEN | ADC_CR1_JAUTO | ADC_CR1_AWDSGL | ADC_CR1_SCAN | ADC_CR1_JEOCIE |
+                                    ADC_CR1_AWDIE | ADC_CR1_EOCIE | ADC_CR1_AWDCH));
 
     /* Reset register CR2 */
-    CLEAR_BIT(hadc->Instance->CR2, (ADC_CR2_TSVREFE | ADC_CR2_SWSTART | ADC_CR2_JSWSTART | ADC_CR2_EXTTRIG | ADC_CR2_EXTSEL | ADC_CR2_JEXTTRIG | ADC_CR2_JEXTSEL | ADC_CR2_ALIGN | ADC_CR2_DMA
-                                    | ADC_CR2_RSTCAL | ADC_CR2_CAL | ADC_CR2_CONT | ADC_CR2_ADON));
+    CLEAR_BIT(hadc->Instance->CR2, (ADC_CR2_TSVREFE | ADC_CR2_SWSTART | ADC_CR2_JSWSTART | ADC_CR2_EXTTRIG | ADC_CR2_EXTSEL | ADC_CR2_JEXTTRIG | ADC_CR2_JEXTSEL | ADC_CR2_ALIGN | ADC_CR2_DMA |
+                                    ADC_CR2_RSTCAL | ADC_CR2_CAL | ADC_CR2_CONT | ADC_CR2_ADON));
 
     /* Reset register SMPR1 */
     CLEAR_BIT(hadc->Instance->SMPR1, (ADC_SMPR1_SMP17 | ADC_SMPR1_SMP16 | ADC_SMPR1_SMP15 | ADC_SMPR1_SMP14 | ADC_SMPR1_SMP13 | ADC_SMPR1_SMP12 | ADC_SMPR1_SMP11 | ADC_SMPR1_SMP10));
@@ -1874,8 +1874,8 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_AnalogWDG
   assert_param(IS_ADC_RANGE(AnalogWDGConfig->HighThreshold));
   assert_param(IS_ADC_RANGE(AnalogWDGConfig->LowThreshold));
 
-  if ((AnalogWDGConfig->WatchdogMode == ADC_ANALOGWATCHDOG_SINGLE_REG) || (AnalogWDGConfig->WatchdogMode == ADC_ANALOGWATCHDOG_SINGLE_INJEC)
-      || (AnalogWDGConfig->WatchdogMode == ADC_ANALOGWATCHDOG_SINGLE_REGINJEC)) {
+  if ((AnalogWDGConfig->WatchdogMode == ADC_ANALOGWATCHDOG_SINGLE_REG) || (AnalogWDGConfig->WatchdogMode == ADC_ANALOGWATCHDOG_SINGLE_INJEC) ||
+      (AnalogWDGConfig->WatchdogMode == ADC_ANALOGWATCHDOG_SINGLE_REGINJEC)) {
     assert_param(IS_ADC_CHANNEL(AnalogWDGConfig->Channel));
   }
 

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c

@@ -941,8 +941,8 @@ HAL_StatusTypeDef HAL_ADCEx_InjectedConfigChannel(ADC_HandleTypeDef *hadc, ADC_I
 
                  ADC_JSQR_JL | ADC_JSQR_RK_JL(ADC_JSQR_JSQ1, sConfigInjected->InjectedRank, sConfigInjected->InjectedNbrOfConversion),
 
-                 ADC_JSQR_JL_SHIFT(sConfigInjected->InjectedNbrOfConversion)
-                     | ADC_JSQR_RK_JL(sConfigInjected->InjectedChannel, sConfigInjected->InjectedRank, sConfigInjected->InjectedNbrOfConversion));
+                 ADC_JSQR_JL_SHIFT(sConfigInjected->InjectedNbrOfConversion) |
+                     ADC_JSQR_RK_JL(sConfigInjected->InjectedChannel, sConfigInjected->InjectedRank, sConfigInjected->InjectedNbrOfConversion));
     } else {
       /* Clear the old SQx bits for the selected rank */
       MODIFY_REG(hadc->Instance->JSQR,

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c

@@ -305,9 +305,9 @@ void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_Init) {
     assert_param(IS_MPU_REGION_SIZE(MPU_Init->Size));
 
     MPU->RBAR = MPU_Init->BaseAddress;
-    MPU->RASR = ((uint32_t)MPU_Init->DisableExec << MPU_RASR_XN_Pos) | ((uint32_t)MPU_Init->AccessPermission << MPU_RASR_AP_Pos) | ((uint32_t)MPU_Init->TypeExtField << MPU_RASR_TEX_Pos)
-                | ((uint32_t)MPU_Init->IsShareable << MPU_RASR_S_Pos) | ((uint32_t)MPU_Init->IsCacheable << MPU_RASR_C_Pos) | ((uint32_t)MPU_Init->IsBufferable << MPU_RASR_B_Pos)
-                | ((uint32_t)MPU_Init->SubRegionDisable << MPU_RASR_SRD_Pos) | ((uint32_t)MPU_Init->Size << MPU_RASR_SIZE_Pos) | ((uint32_t)MPU_Init->Enable << MPU_RASR_ENABLE_Pos);
+    MPU->RASR = ((uint32_t)MPU_Init->DisableExec << MPU_RASR_XN_Pos) | ((uint32_t)MPU_Init->AccessPermission << MPU_RASR_AP_Pos) | ((uint32_t)MPU_Init->TypeExtField << MPU_RASR_TEX_Pos) |
+                ((uint32_t)MPU_Init->IsShareable << MPU_RASR_S_Pos) | ((uint32_t)MPU_Init->IsCacheable << MPU_RASR_C_Pos) | ((uint32_t)MPU_Init->IsBufferable << MPU_RASR_B_Pos) |
+                ((uint32_t)MPU_Init->SubRegionDisable << MPU_RASR_SRD_Pos) | ((uint32_t)MPU_Init->Size << MPU_RASR_SIZE_Pos) | ((uint32_t)MPU_Init->Enable << MPU_RASR_ENABLE_Pos);
   } else {
     MPU->RBAR = 0x00U;
     MPU->RASR = 0x00U;

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c

@@ -387,8 +387,8 @@ HAL_StatusTypeDef HAL_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct) {
     assert_param(IS_RCC_CALIBRATION_VALUE(RCC_OscInitStruct->HSICalibrationValue));
 
     /* Check if HSI is used as system clock or as PLL source when PLL is selected as system clock */
-    if ((__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_HSI)
-        || ((__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_PLLCLK) && (__HAL_RCC_GET_PLL_OSCSOURCE() == RCC_PLLSOURCE_HSI_DIV2))) {
+    if ((__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_HSI) ||
+        ((__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_PLLCLK) && (__HAL_RCC_GET_PLL_OSCSOURCE() == RCC_PLLSOURCE_HSI_DIV2))) {
       /* When HSI is used as system clock it will not disabled */
       if ((__HAL_RCC_GET_FLAG(RCC_FLAG_HSIRDY) != RESET) && (RCC_OscInitStruct->HSIState != RCC_HSI_ON)) {
         return HAL_ERROR;
@@ -535,8 +535,8 @@ HAL_StatusTypeDef HAL_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct) {
   if ((RCC_OscInitStruct->PLL2.PLL2State) != RCC_PLL2_NONE) {
     /* This bit can not be cleared if the PLL2 clock is used indirectly as system
       clock (i.e. it is used as PLL clock entry that is used as system clock). */
-    if ((__HAL_RCC_GET_PLL_OSCSOURCE() == RCC_PLLSOURCE_HSE) && (__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_PLLCLK)
-        && ((READ_BIT(RCC->CFGR2, RCC_CFGR2_PREDIV1SRC)) == RCC_CFGR2_PREDIV1SRC_PLL2)) {
+    if ((__HAL_RCC_GET_PLL_OSCSOURCE() == RCC_PLLSOURCE_HSE) && (__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_PLLCLK) &&
+        ((READ_BIT(RCC->CFGR2, RCC_CFGR2_PREDIV1SRC)) == RCC_CFGR2_PREDIV1SRC_PLL2)) {
       return HAL_ERROR;
     } else {
       if ((RCC_OscInitStruct->PLL2.PLL2State) == RCC_PLL2_ON) {

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c

@@ -654,8 +654,8 @@ HAL_StatusTypeDef HAL_RCCEx_EnablePLL2(RCC_PLL2InitTypeDef *PLL2Init) {
 
   /* This bit can not be cleared if the PLL2 clock is used indirectly as system
     clock (i.e. it is used as PLL clock entry that is used as system clock). */
-  if ((__HAL_RCC_GET_PLL_OSCSOURCE() == RCC_PLLSOURCE_HSE) && (__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_PLLCLK)
-      && ((READ_BIT(RCC->CFGR2, RCC_CFGR2_PREDIV1SRC)) == RCC_CFGR2_PREDIV1SRC_PLL2)) {
+  if ((__HAL_RCC_GET_PLL_OSCSOURCE() == RCC_PLLSOURCE_HSE) && (__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_PLLCLK) &&
+      ((READ_BIT(RCC->CFGR2, RCC_CFGR2_PREDIV1SRC)) == RCC_CFGR2_PREDIV1SRC_PLL2)) {
     return HAL_ERROR;
   } else {
     /* Check the parameters */
@@ -714,8 +714,8 @@ HAL_StatusTypeDef HAL_RCCEx_DisablePLL2(void) {
 
   /* This bit can not be cleared if the PLL2 clock is used indirectly as system
     clock (i.e. it is used as PLL clock entry that is used as system clock). */
-  if ((__HAL_RCC_GET_PLL_OSCSOURCE() == RCC_PLLSOURCE_HSE) && (__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_PLLCLK)
-      && ((READ_BIT(RCC->CFGR2, RCC_CFGR2_PREDIV1SRC)) == RCC_CFGR2_PREDIV1SRC_PLL2)) {
+  if ((__HAL_RCC_GET_PLL_OSCSOURCE() == RCC_PLLSOURCE_HSE) && (__HAL_RCC_GET_SYSCLK_SOURCE() == RCC_SYSCLKSOURCE_STATUS_PLLCLK) &&
+      ((READ_BIT(RCC->CFGR2, RCC_CFGR2_PREDIV1SRC)) == RCC_CFGR2_PREDIV1SRC_PLL2)) {
     return HAL_ERROR;
   } else {
     /* Disable the main PLL2. */

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c

@@ -2450,8 +2450,8 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_Start(TIM_HandleTypeDef *htim, uint32_t Outpu
   UNUSED(OutputChannel);
 
   /* Check the TIM channels state */
-  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
-      || (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
+  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY) ||
+      (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
     return HAL_ERROR;
   }
 
@@ -2541,8 +2541,8 @@ HAL_StatusTypeDef HAL_TIM_OnePulse_Start_IT(TIM_HandleTypeDef *htim, uint32_t Ou
   UNUSED(OutputChannel);
 
   /* Check the TIM channels state */
-  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
-      || (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
+  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY) ||
+      (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
     return HAL_ERROR;
   }
 
@@ -2874,8 +2874,8 @@ HAL_StatusTypeDef HAL_TIM_Encoder_Start(TIM_HandleTypeDef *htim, uint32_t Channe
       TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_BUSY);
     }
   } else {
-    if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
-        || (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
+    if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY) ||
+        (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
       return HAL_ERROR;
     } else {
       TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_BUSY);
@@ -2997,8 +2997,8 @@ HAL_StatusTypeDef HAL_TIM_Encoder_Start_IT(TIM_HandleTypeDef *htim, uint32_t Cha
       TIM_CHANNEL_N_STATE_SET(htim, TIM_CHANNEL_2, HAL_TIM_CHANNEL_STATE_BUSY);
     }
   } else {
-    if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
-        || (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
+    if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY) ||
+        (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
       return HAL_ERROR;
     } else {
       TIM_CHANNEL_STATE_SET(htim, TIM_CHANNEL_1, HAL_TIM_CHANNEL_STATE_BUSY);
@@ -3142,11 +3142,11 @@ HAL_StatusTypeDef HAL_TIM_Encoder_Start_DMA(TIM_HandleTypeDef *htim, uint32_t Ch
       return HAL_ERROR;
     }
   } else {
-    if ((channel_1_state == HAL_TIM_CHANNEL_STATE_BUSY) || (channel_2_state == HAL_TIM_CHANNEL_STATE_BUSY) || (complementary_channel_1_state == HAL_TIM_CHANNEL_STATE_BUSY)
-        || (complementary_channel_2_state == HAL_TIM_CHANNEL_STATE_BUSY)) {
+    if ((channel_1_state == HAL_TIM_CHANNEL_STATE_BUSY) || (channel_2_state == HAL_TIM_CHANNEL_STATE_BUSY) || (complementary_channel_1_state == HAL_TIM_CHANNEL_STATE_BUSY) ||
+        (complementary_channel_2_state == HAL_TIM_CHANNEL_STATE_BUSY)) {
       return HAL_BUSY;
-    } else if ((channel_1_state == HAL_TIM_CHANNEL_STATE_READY) && (channel_2_state == HAL_TIM_CHANNEL_STATE_READY) && (complementary_channel_1_state == HAL_TIM_CHANNEL_STATE_READY)
-               && (complementary_channel_2_state == HAL_TIM_CHANNEL_STATE_READY)) {
+    } else if ((channel_1_state == HAL_TIM_CHANNEL_STATE_READY) && (channel_2_state == HAL_TIM_CHANNEL_STATE_READY) && (complementary_channel_1_state == HAL_TIM_CHANNEL_STATE_READY) &&
+               (complementary_channel_2_state == HAL_TIM_CHANNEL_STATE_READY)) {
       if ((((pData1 == NULL) || (pData2 == NULL))) && (Length > 0U)) {
         return HAL_ERROR;
       } else {

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c

@@ -311,8 +311,8 @@ HAL_StatusTypeDef HAL_TIMEx_HallSensor_Start(TIM_HandleTypeDef *htim) {
   assert_param(IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(htim->Instance));
 
   /* Check the TIM channels state */
-  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
-      || (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
+  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY) ||
+      (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
     return HAL_ERROR;
   }
 
@@ -382,8 +382,8 @@ HAL_StatusTypeDef HAL_TIMEx_HallSensor_Start_IT(TIM_HandleTypeDef *htim) {
   assert_param(IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(htim->Instance));
 
   /* Check the TIM channels state */
-  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY)
-      || (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
+  if ((channel_1_state != HAL_TIM_CHANNEL_STATE_READY) || (channel_2_state != HAL_TIM_CHANNEL_STATE_READY) || (complementary_channel_1_state != HAL_TIM_CHANNEL_STATE_READY) ||
+      (complementary_channel_2_state != HAL_TIM_CHANNEL_STATE_READY)) {
     return HAL_ERROR;
   }
 

source/Core/BSP/MHP30/configuration.h

@@ -1,6 +1,5 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
-#include "Settings.h"
 #include <stdint.h>
 /**
  * Configuration.h
@@ -57,6 +56,7 @@
  *
  */
 #define ORIENTATION_MODE           0 // 0: Right 1:Left 2:Automatic - Default right
+#define MAX_ORIENTATION_MODE       1 // Unlikely to ever change
 #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
 
 /**
@@ -103,8 +103,8 @@
 #define DETAILED_IDLE      0 // 0: Disable 1: Enable - Default 0
 
 // Due to large thermal mass of the PCB being heated we need to pull this back a bit
-#define THERMAL_RUNAWAY_TIME_SEC 45
-#define THERMAL_RUNAWAY_TEMP_C   3
+#define THERMAL_RUNAWAY_TIME_SEC 20
+#define THERMAL_RUNAWAY_TEMP_C   2
 
 #define CUT_OUT_SETTING          0  // default to no cut-off voltage
 #define RECOM_VOL_CELL           33 // Minimum voltage per cell (Recommended 3.3V (33))
@@ -146,16 +146,20 @@
 #define MIN_BOOST_TEMP_F       300                     // The min settable temp for boost mode °F
 #define NO_DISPLAY_ROTATE                              // Disable OLED rotation by accel
 #define SLEW_LIMIT             50                      // Limit to 3.0 Watts per 64ms pid loop update rate slew rate
-
+#define TIPTYPE_MHP30          1                       // It's own special tip
 #define ACCEL_SC7
 #define ACCEL_MSA
 
 #define PROFILE_SUPPORT
-
+#define OLED_96x16         1
 #define POW_PD             1
 #define POW_PD_EXT         0
+#define USB_PD_EPR_WATTAGE 0 /*No EPR*/
 #define TEMP_NTC
-#define I2C_SOFT_BUS_2
+#define I2C_SOFT_BUS_2  1
+#define I2C_SOFT_BUS_1  1
+#define OLED_I2CBB1     1
+#define ACCEL_I2CBB1    1
 #define BATTFILTERDEPTH 8
 #define OLED_I2CBB2
 #define ACCEL_EXITS_ON_MOVEMENT

source/Core/BSP/MHP30/fusb_user.cpp

@@ -1,13 +1,13 @@
 #include "configuration.h"
 #ifdef POW_PD
 #include "BSP.h"
-#include "I2C_Wrapper.hpp"
+#include "I2CBB1.hpp"
 #include "Pins.h"
 #include "Setup.h"
 #include "USBPD.h"
-bool fusb_read_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return FRToSI2C::Mem_Read(deviceAddr, registerAdd, buf, size); }
+bool fusb_read_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB1::Mem_Read(deviceAddr, registerAdd, buf, size); }
 
-bool fusb_write_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return FRToSI2C::Mem_Write(deviceAddr, registerAdd, (uint8_t *)buf, size); }
+bool fusb_write_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB1::Mem_Write(deviceAddr, registerAdd, (uint8_t *)buf, size); }
 
 void setupFUSBIRQ() {
   GPIO_InitTypeDef GPIO_InitStruct;

source/Core/BSP/MHP30/preRTOS.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "BSP.h"
+#include "I2CBB1.hpp"
 #include "I2CBB2.hpp"
 #include "Pins.h"
 #include "Setup.h"
@@ -18,6 +19,5 @@ void preRToSInit() {
   Setup_HAL(); // Setup all the HAL objects
   BSPInit();
   I2CBB2::init();
-  /* Init the IPC objects */
-  FRToSI2C::FRToSInit();
+  I2CBB1::init();
 }

source/Core/BSP/MHP30/stm32f1xx_hal_msp.c

@@ -60,7 +60,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc) {
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
     HAL_GPIO_Init(TIP_TEMP_GPIO_Port, &GPIO_InitStruct);
     GPIO_InitStruct.Pin  = TMP36_INPUT_Pin;
-    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+    GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
     HAL_GPIO_Init(TMP36_INPUT_GPIO_Port, &GPIO_InitStruct);
     GPIO_InitStruct.Pin  = VIN_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
@@ -75,55 +75,6 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc) {
   }
 }
 
-void HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c) {
-
-  GPIO_InitTypeDef GPIO_InitStruct;
-  /**I2C1 GPIO Configuration
-   PB6     ------> I2C1_SCL
-   PB7     ------> I2C1_SDA
-   */
-  GPIO_InitStruct.Pin   = SCL_Pin | SDA_Pin;
-  GPIO_InitStruct.Mode  = GPIO_MODE_AF_OD;
-  GPIO_InitStruct.Pull  = GPIO_PULLUP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-
-  /* Peripheral clock enable */
-  __HAL_RCC_I2C1_CLK_ENABLE();
-  /* I2C1 DMA Init */
-  /* I2C1_RX Init */
-  hdma_i2c1_rx.Instance                 = DMA1_Channel7;
-  hdma_i2c1_rx.Init.Direction           = DMA_PERIPH_TO_MEMORY;
-  hdma_i2c1_rx.Init.PeriphInc           = DMA_PINC_DISABLE;
-  hdma_i2c1_rx.Init.MemInc              = DMA_MINC_ENABLE;
-  hdma_i2c1_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-  hdma_i2c1_rx.Init.MemDataAlignment    = DMA_MDATAALIGN_BYTE;
-  hdma_i2c1_rx.Init.Mode                = DMA_NORMAL;
-  hdma_i2c1_rx.Init.Priority            = DMA_PRIORITY_LOW;
-  HAL_DMA_Init(&hdma_i2c1_rx);
-
-  __HAL_LINKDMA(hi2c, hdmarx, hdma_i2c1_rx);
-
-  /* I2C1_TX Init */
-  hdma_i2c1_tx.Instance                 = DMA1_Channel6;
-  hdma_i2c1_tx.Init.Direction           = DMA_MEMORY_TO_PERIPH;
-  hdma_i2c1_tx.Init.PeriphInc           = DMA_PINC_DISABLE;
-  hdma_i2c1_tx.Init.MemInc              = DMA_MINC_ENABLE;
-  hdma_i2c1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-  hdma_i2c1_tx.Init.MemDataAlignment    = DMA_MDATAALIGN_BYTE;
-  hdma_i2c1_tx.Init.Mode                = DMA_NORMAL;
-  hdma_i2c1_tx.Init.Priority            = DMA_PRIORITY_MEDIUM;
-  HAL_DMA_Init(&hdma_i2c1_tx);
-
-  __HAL_LINKDMA(hi2c, hdmatx, hdma_i2c1_tx);
-
-  /* I2C1 interrupt Init */
-  HAL_NVIC_SetPriority(I2C1_EV_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(I2C1_EV_IRQn);
-  HAL_NVIC_SetPriority(I2C1_ER_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(I2C1_ER_IRQn);
-}
-
 void HAL_TIM_Base_MspInit(TIM_HandleTypeDef *htim_base) {
 
   if (htim_base->Instance == TIM3) {

source/Core/BSP/MHP30/stm32f1xx_it.c

@@ -44,10 +44,5 @@ void ADC1_2_IRQHandler(void) { HAL_ADC_IRQHandler(&hadc1); }
 
 // used for hal ticks
 void TIM4_IRQHandler(void) { HAL_TIM_IRQHandler(&htim4); }
-void I2C1_EV_IRQHandler(void) { HAL_I2C_EV_IRQHandler(&hi2c1); }
-void I2C1_ER_IRQHandler(void) { HAL_I2C_ER_IRQHandler(&hi2c1); }
 
-void DMA1_Channel6_IRQHandler(void) { HAL_DMA_IRQHandler(&hdma_i2c1_tx); }
-
-void DMA1_Channel7_IRQHandler(void) { HAL_DMA_IRQHandler(&hdma_i2c1_rx); }
 void EXTI9_5_IRQHandler(void) { HAL_GPIO_EXTI_IRQHandler(INT_PD_Pin); }

source/Core/BSP/Miniware/BSP.cpp

@@ -4,6 +4,7 @@
 #include "BootLogo.h"
 #include "I2C_Wrapper.hpp"
 #include "Pins.h"
+#include "Settings.h"
 #include "Setup.h"
 #include "TipThermoModel.h"
 #include "USBPD.h"
@@ -207,9 +208,10 @@ void unstick_I2C() {
     HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET);
 
     timeout_cnt++;
-    if (timeout_cnt > timeout)
+    if (timeout_cnt > timeout) {
       return;
     }
+  }
 
   // 12. Configure the SCL and SDA I/Os as Alternate function Open-Drain.
   GPIO_InitStruct.Mode  = GPIO_MODE_AF_OD;
@@ -307,6 +309,8 @@ void FinishMeasureTipResistance() {
     return;
   } else if (reading < 200) {
     tipShorted = true;
+  } else if (reading < 520) {
+    newRes = 40;
   } else if (reading < 800) {
     newRes = 62;
   } else {
@@ -359,14 +363,7 @@ uint8_t preStartChecks() {
   }
 
 #endif
-#ifdef POW_PD
-  // If we are in the middle of negotiating PD, wait until timeout
-  // Before turning on the heater
-  if (!USBPowerDelivery::negotiationComplete()) {
-    return 0;
-  }
 
-#endif
   return 1;
 }
 uint64_t getDeviceID() {
@@ -386,9 +383,18 @@ uint8_t getTipResistanceX10() {
 #ifdef TIP_RESISTANCE_SENSE_Pin
   // Return tip resistance in x10 ohms
   // We can measure this using the op-amp
-  return lastTipResistance;
+  uint8_t user_selected_tip = getUserSelectedTipResistance();
+  if (user_selected_tip == 0) {
+    return lastTipResistance; // Auto mode
+  }
+  return user_selected_tip;
+
 #else
-  return TIP_RESISTANCE;
+  uint8_t user_selected_tip = getUserSelectedTipResistance();
+  if (user_selected_tip == 0) {
+    return TIP_RESISTANCE; // Auto mode
+  }
+  return user_selected_tip;
 #endif
 }
 #ifdef TIP_RESISTANCE_SENSE_Pin

source/Core/BSP/Miniware/FreeRTOSConfig.h

@@ -105,12 +105,12 @@ extern uint32_t SystemCoreClock;
 #define configMINIMAL_STACK_SIZE                ((uint16_t)256)
 #define configTOTAL_HEAP_SIZE                   ((size_t)1024 * 14) /*Currently use about 9000*/
 #define configMAX_TASK_NAME_LEN                 (32)
-#define configUSE_16_BIT_TICKS                  0
 #define configUSE_MUTEXES                       1
 #define configQUEUE_REGISTRY_SIZE               8
 #define configUSE_TIMERS                        0
 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
 #define configCHECK_FOR_STACK_OVERFLOW          2 /*Bump this to 2 during development and bug hunting*/
+#define configTICK_TYPE_WIDTH_IN_BITS           TICK_TYPE_WIDTH_32_BITS
 
 /* Co-routine definitions. */
 #define configUSE_CO_ROUTINES           0

source/Core/BSP/Miniware/I2C_Wrapper.cpp

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

source/Core/BSP/Miniware/IRQ.cpp

@@ -23,12 +23,6 @@ void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc) {
     }
   }
 }
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCallback(); }
 
 extern osThreadId POWTaskHandle;
 

source/Core/BSP/Miniware/IRQ.h

@@ -18,12 +18,6 @@
 extern "C" {
 #endif
 void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc);
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
 void HAL_GPIO_EXTI_Callback(uint16_t);
 
 #ifdef __cplusplus

source/Core/BSP/Miniware/Setup.cpp

@@ -7,16 +7,13 @@
 #include "Setup.h"
 #include "BSP.h"
 #include "Pins.h"
+#include "configuration.h"
 #include "history.hpp"
 #include <stdint.h>
 ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
 
-I2C_HandleTypeDef hi2c1;
-DMA_HandleTypeDef hdma_i2c1_rx;
-DMA_HandleTypeDef hdma_i2c1_tx;
-
 IWDG_HandleTypeDef hiwdg;
 TIM_HandleTypeDef  htimADC;
 TIM_HandleTypeDef  htimTip;
@@ -27,7 +24,6 @@ uint16_t ADCReadings[ADC_SAMPLES]; // Used to store the adc readings for the han
 // Functions
 static void SystemClock_Config(void);
 static void MX_ADC1_Init(void);
-static void MX_I2C1_Init(void);
 static void MX_IWDG_Init(void);
 static void MX_TIP_CONTROL_TIMER_Init(void);
 static void MX_ADC_CONTROL_TIMER_Init(void);
@@ -46,7 +42,7 @@ void        Setup_HAL() {
   MX_GPIO_Init();
   MX_DMA_Init();
 #ifndef I2C_SOFT_BUS_1
-  MX_I2C1_Init();
+#error "Only Bit-Bang now"
 #endif
   MX_ADC1_Init();
   MX_ADC2_Init();
@@ -277,20 +273,6 @@ static void MX_ADC2_Init(void) {
     ;
   }
 }
-/* I2C1 init function */
-static void MX_I2C1_Init(void) {
-  hi2c1.Instance        = I2C1;
-  hi2c1.Init.ClockSpeed = 75000;
-  // OLED doesnt handle >100k when its asleep (off).
-  hi2c1.Init.DutyCycle       = I2C_DUTYCYCLE_2;
-  hi2c1.Init.OwnAddress1     = 0;
-  hi2c1.Init.AddressingMode  = I2C_ADDRESSINGMODE_7BIT;
-  hi2c1.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
-  hi2c1.Init.OwnAddress2     = 0;
-  hi2c1.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
-  hi2c1.Init.NoStretchMode   = I2C_NOSTRETCH_DISABLE;
-  HAL_I2C_Init(&hi2c1);
-}
 
 /* IWDG init function */
 static void MX_IWDG_Init(void) {

source/Core/BSP/Miniware/Setup.h

@@ -18,10 +18,6 @@ extern ADC_HandleTypeDef hadc1;
 extern ADC_HandleTypeDef hadc2;
 extern DMA_HandleTypeDef hdma_adc1;
 
-extern DMA_HandleTypeDef hdma_i2c1_rx;
-extern DMA_HandleTypeDef hdma_i2c1_tx;
-extern I2C_HandleTypeDef hi2c1;
-
 extern IWDG_HandleTypeDef hiwdg;
 
 extern TIM_HandleTypeDef htimADC;

source/Core/BSP/Miniware/Startup/startup_stm32f103t8ux.S

@@ -0,0 +1,344 @@
+/**
+  ******************************************************************************
+  * @file      startup_stm32.s
+  * @author    Ac6
+  * @version   V1.0.0
+  * @date      12-June-2014
+  ******************************************************************************
+  */
+
+  .syntax unified
+  .cpu cortex-m3
+  .thumb
+
+.global	g_pfnVectors
+.global	Default_Handler
+
+/* start address for the initialization values of the .data section.
+defined in linker script */
+.word	_sidata
+/* start address for the .data section. defined in linker script */
+.word	_sdata
+/* end address for the .data section. defined in linker script */
+.word	_edata
+/* start address for the .bss section. defined in linker script */
+.word	_sbss
+/* end address for the .bss section. defined in linker script */
+.word	_ebss
+
+.equ  BootRAM,        0xF1E0F85F
+/**
+ * @brief  This is the code that gets called when the processor first
+ *          starts execution following a reset event. Only the absolutely
+ *          necessary set is performed, after which the application
+ *          supplied main() routine is called.
+ * @param  None
+ * @retval : None
+*/
+
+    .section	.text.Reset_Handler
+	.weak	Reset_Handler
+	.type	Reset_Handler, %function
+Reset_Handler:
+
+/* Copy the data segment initializers from flash to SRAM */
+  movs	r1, #0
+  b	LoopCopyDataInit
+
+CopyDataInit:
+	ldr	r3, =_sidata
+	ldr	r3, [r3, r1]
+	str	r3, [r0, r1]
+	adds	r1, r1, #4
+
+LoopCopyDataInit:
+	ldr	r0, =_sdata
+	ldr	r3, =_edata
+	adds	r2, r0, r1
+	cmp	r2, r3
+	bcc	CopyDataInit
+	ldr	r2, =_sbss
+	b	LoopFillZerobss
+/* Zero fill the bss segment. */
+FillZerobss:
+	movs r3, #0
+ 	str  r3, [r2]
+	adds r2, r2, #4
+
+LoopFillZerobss:
+	ldr	r3, = _ebss
+	cmp	r2, r3
+	bcc	FillZerobss
+
+/* Call the clock system intitialization function.*/
+    bl  SystemInit
+/* Call static constructors */
+    bl __libc_init_array
+/* Call the application's entry point.*/
+	bl	main
+
+LoopForever:
+    b LoopForever
+
+.size	Reset_Handler, .-Reset_Handler
+
+/**
+ * @brief  This is the code that gets called when the processor receives an
+ *         unexpected interrupt.  This simply enters an infinite loop, preserving
+ *         the system state for examination by a debugger.
+ *
+ * @param  None
+ * @retval : None
+*/
+    .section	.text.Default_Handler,"ax",%progbits
+Default_Handler:
+Infinite_Loop:
+	b	Infinite_Loop
+	.size	Default_Handler, .-Default_Handler
+/******************************************************************************
+*
+* The minimal vector table for a Cortex-M.  Note that the proper constructs
+* must be placed on this to ensure that it ends up at physical address
+* 0x0000.0000.
+*
+******************************************************************************/
+ 	.section	.isr_vector,"a",%progbits
+	.type	g_pfnVectors, %object
+	.size	g_pfnVectors, .-g_pfnVectors
+
+g_pfnVectors:
+	.word _estack
+  .word Reset_Handler
+  .word NMI_Handler
+  .word HardFault_Handler
+  .word MemManage_Handler
+  .word BusFault_Handler
+  .word UsageFault_Handler
+  .word 0
+  .word 0
+  .word 0
+  .word 0
+  .word SVC_Handler
+  .word DebugMon_Handler
+  .word 0
+  .word PendSV_Handler
+  .word SysTick_Handler
+  .word WWDG_IRQHandler
+  .word PVD_IRQHandler
+  .word TAMPER_IRQHandler
+  .word RTC_IRQHandler
+  .word FLASH_IRQHandler
+  .word RCC_IRQHandler
+  .word EXTI0_IRQHandler
+  .word EXTI1_IRQHandler
+  .word EXTI2_IRQHandler
+  .word EXTI3_IRQHandler
+  .word EXTI4_IRQHandler
+  .word DMA1_Channel1_IRQHandler
+  .word DMA1_Channel2_IRQHandler
+  .word DMA1_Channel3_IRQHandler
+  .word DMA1_Channel4_IRQHandler
+  .word DMA1_Channel5_IRQHandler
+  .word DMA1_Channel6_IRQHandler
+  .word DMA1_Channel7_IRQHandler
+  .word ADC1_2_IRQHandler
+  .word USB_HP_CAN1_TX_IRQHandler
+  .word USB_LP_CAN1_RX0_IRQHandler
+  .word CAN1_RX1_IRQHandler
+  .word CAN1_SCE_IRQHandler
+  .word EXTI9_5_IRQHandler
+  .word TIM1_BRK_IRQHandler
+  .word TIM1_UP_IRQHandler
+  .word TIM1_TRG_COM_IRQHandler
+  .word TIM1_CC_IRQHandler
+  .word TIM2_IRQHandler
+  .word TIM3_IRQHandler
+  .word TIM4_IRQHandler
+  .word I2C1_EV_IRQHandler
+  .word I2C1_ER_IRQHandler
+  .word I2C2_EV_IRQHandler
+  .word I2C2_ER_IRQHandler
+  .word SPI1_IRQHandler
+  .word SPI2_IRQHandler
+  .word USART1_IRQHandler
+  .word USART2_IRQHandler
+  .word USART3_IRQHandler
+  .word EXTI15_10_IRQHandler
+  .word RTC_Alarm_IRQHandler
+  .word USBWakeUp_IRQHandler
+  .word 0
+  .word 0
+  .word 0
+  .word 0
+  .word 0
+  .word 0
+  .word 0
+  .word BootRAM          /* @0x108. This is for boot in RAM mode for
+                            STM32F10x Medium Density devices. */
+
+/*******************************************************************************
+*
+* Provide weak aliases for each Exception handler to the Default_Handler.
+* As they are weak aliases, any function with the same name will override
+* this definition.
+*
+*******************************************************************************/
+
+  	.weak NMI_Handler
+  .thumb_set NMI_Handler,Default_Handler
+
+  .weak HardFault_Handler
+  .thumb_set HardFault_Handler,Default_Handler
+
+  .weak MemManage_Handler
+  .thumb_set MemManage_Handler,Default_Handler
+
+  .weak BusFault_Handler
+  .thumb_set BusFault_Handler,Default_Handler
+
+  .weak UsageFault_Handler
+  .thumb_set UsageFault_Handler,Default_Handler
+
+  .weak SVC_Handler
+  .thumb_set SVC_Handler,Default_Handler
+
+  .weak DebugMon_Handler
+  .thumb_set DebugMon_Handler,Default_Handler
+
+  .weak PendSV_Handler
+  .thumb_set PendSV_Handler,Default_Handler
+
+  .weak SysTick_Handler
+  .thumb_set SysTick_Handler,Default_Handler
+
+  .weak WWDG_IRQHandler
+  .thumb_set WWDG_IRQHandler,Default_Handler
+
+  .weak PVD_IRQHandler
+  .thumb_set PVD_IRQHandler,Default_Handler
+
+  .weak TAMPER_IRQHandler
+  .thumb_set TAMPER_IRQHandler,Default_Handler
+
+  .weak RTC_IRQHandler
+  .thumb_set RTC_IRQHandler,Default_Handler
+
+  .weak FLASH_IRQHandler
+  .thumb_set FLASH_IRQHandler,Default_Handler
+
+  .weak RCC_IRQHandler
+  .thumb_set RCC_IRQHandler,Default_Handler
+
+  .weak EXTI0_IRQHandler
+  .thumb_set EXTI0_IRQHandler,Default_Handler
+
+  .weak EXTI1_IRQHandler
+  .thumb_set EXTI1_IRQHandler,Default_Handler
+
+  .weak EXTI2_IRQHandler
+  .thumb_set EXTI2_IRQHandler,Default_Handler
+
+  .weak EXTI3_IRQHandler
+  .thumb_set EXTI3_IRQHandler,Default_Handler
+
+  .weak EXTI4_IRQHandler
+  .thumb_set EXTI4_IRQHandler,Default_Handler
+
+  .weak DMA1_Channel1_IRQHandler
+  .thumb_set DMA1_Channel1_IRQHandler,Default_Handler
+
+  .weak DMA1_Channel2_IRQHandler
+  .thumb_set DMA1_Channel2_IRQHandler,Default_Handler
+
+  .weak DMA1_Channel3_IRQHandler
+  .thumb_set DMA1_Channel3_IRQHandler,Default_Handler
+
+  .weak DMA1_Channel4_IRQHandler
+  .thumb_set DMA1_Channel4_IRQHandler,Default_Handler
+
+  .weak DMA1_Channel5_IRQHandler
+  .thumb_set DMA1_Channel5_IRQHandler,Default_Handler
+
+  .weak DMA1_Channel6_IRQHandler
+  .thumb_set DMA1_Channel6_IRQHandler,Default_Handler
+
+  .weak DMA1_Channel7_IRQHandler
+  .thumb_set DMA1_Channel7_IRQHandler,Default_Handler
+
+  .weak ADC1_2_IRQHandler
+  .thumb_set ADC1_2_IRQHandler,Default_Handler
+
+  .weak USB_HP_CAN1_TX_IRQHandler
+  .thumb_set USB_HP_CAN1_TX_IRQHandler,Default_Handler
+
+  .weak USB_LP_CAN1_RX0_IRQHandler
+  .thumb_set USB_LP_CAN1_RX0_IRQHandler,Default_Handler
+
+  .weak CAN1_RX1_IRQHandler
+  .thumb_set CAN1_RX1_IRQHandler,Default_Handler
+
+  .weak CAN1_SCE_IRQHandler
+  .thumb_set CAN1_SCE_IRQHandler,Default_Handler
+
+  .weak EXTI9_5_IRQHandler
+  .thumb_set EXTI9_5_IRQHandler,Default_Handler
+
+  .weak TIM1_BRK_IRQHandler
+  .thumb_set TIM1_BRK_IRQHandler,Default_Handler
+
+  .weak TIM1_UP_IRQHandler
+  .thumb_set TIM1_UP_IRQHandler,Default_Handler
+
+  .weak TIM1_TRG_COM_IRQHandler
+  .thumb_set TIM1_TRG_COM_IRQHandler,Default_Handler
+
+  .weak TIM1_CC_IRQHandler
+  .thumb_set TIM1_CC_IRQHandler,Default_Handler
+
+  .weak TIM2_IRQHandler
+  .thumb_set TIM2_IRQHandler,Default_Handler
+
+  .weak TIM3_IRQHandler
+  .thumb_set TIM3_IRQHandler,Default_Handler
+
+  .weak TIM4_IRQHandler
+  .thumb_set TIM4_IRQHandler,Default_Handler
+
+  .weak I2C1_EV_IRQHandler
+  .thumb_set I2C1_EV_IRQHandler,Default_Handler
+
+  .weak I2C1_ER_IRQHandler
+  .thumb_set I2C1_ER_IRQHandler,Default_Handler
+
+  .weak I2C2_EV_IRQHandler
+  .thumb_set I2C2_EV_IRQHandler,Default_Handler
+
+  .weak I2C2_ER_IRQHandler
+  .thumb_set I2C2_ER_IRQHandler,Default_Handler
+
+  .weak SPI1_IRQHandler
+  .thumb_set SPI1_IRQHandler,Default_Handler
+
+  .weak SPI2_IRQHandler
+  .thumb_set SPI2_IRQHandler,Default_Handler
+
+  .weak USART1_IRQHandler
+  .thumb_set USART1_IRQHandler,Default_Handler
+
+  .weak USART2_IRQHandler
+  .thumb_set USART2_IRQHandler,Default_Handler
+
+  .weak USART3_IRQHandler
+  .thumb_set USART3_IRQHandler,Default_Handler
+
+  .weak EXTI15_10_IRQHandler
+  .thumb_set EXTI15_10_IRQHandler,Default_Handler
+
+  .weak RTC_Alarm_IRQHandler
+  .thumb_set RTC_Alarm_IRQHandler,Default_Handler
+
+  .weak USBWakeUp_IRQHandler
+  .thumb_set USBWakeUp_IRQHandler,Default_Handler
+
+
+/************************ (C) COPYRIGHT Ac6 *****END OF FILE****/

source/Core/BSP/Miniware/ThermoModel.cpp

@@ -5,7 +5,7 @@
  *      Author: Ralim
  */
 #include "TipThermoModel.h"
-#include "Utils.h"
+#include "Utils.hpp"
 #include "configuration.h"
 
 #ifdef TEMP_uV_LOOKUP_HAKKO

source/Core/BSP/Miniware/Vendor/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h

@@ -1,639 +1,5 @@
-/**
- ******************************************************************************
- * @file    stm32f1xx_hal_i2c.h
- * @author  MCD Application Team
- * @brief   Header file of I2C HAL module.
- ******************************************************************************
- * @attention
- *
- * <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *   1. Redistributions 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 its contributors
- *      may be used to endorse or promote products derived from this software
- *      without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER 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.
- *
- ******************************************************************************
- */
 
-/* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F1xx_HAL_I2C_H
 #define __STM32F1xx_HAL_I2C_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32f1xx_hal_def.h"
-
-/** @addtogroup STM32F1xx_HAL_Driver
- * @{
- */
-
-/** @addtogroup I2C
- * @{
- */
-
-/* Exported types ------------------------------------------------------------*/
-/** @defgroup I2C_Exported_Types I2C Exported Types
- * @{
- */
-
-/**
- * @brief  I2C Configuration Structure definition
- */
-typedef struct {
-  uint32_t ClockSpeed; /*!< Specifies the clock frequency.
-                            This parameter must be set to a value lower than 400kHz */
-
-  uint32_t DutyCycle; /*!< Specifies the I2C fast mode duty cycle.
-                           This parameter can be a value of @ref I2C_duty_cycle_in_fast_mode */
-
-  uint32_t OwnAddress1; /*!< Specifies the first device own address.
-                             This parameter can be a 7-bit or 10-bit address. */
-
-  uint32_t AddressingMode; /*!< Specifies if 7-bit or 10-bit addressing mode is selected.
-                                This parameter can be a value of @ref I2C_addressing_mode */
-
-  uint32_t DualAddressMode; /*!< Specifies if dual addressing mode is selected.
-                                 This parameter can be a value of @ref I2C_dual_addressing_mode */
-
-  uint32_t OwnAddress2; /*!< Specifies the second device own address if dual addressing mode is selected
-                             This parameter can be a 7-bit address. */
-
-  uint32_t GeneralCallMode; /*!< Specifies if general call mode is selected.
-                                 This parameter can be a value of @ref I2C_general_call_addressing_mode */
-
-  uint32_t NoStretchMode; /*!< Specifies if nostretch mode is selected.
-                               This parameter can be a value of @ref I2C_nostretch_mode */
-
-} I2C_InitTypeDef;
-
-/**
- * @brief  HAL State structure definition
- * @note  HAL I2C State value coding follow below described bitmap :
- *          b7-b6  Error information
- *             00 : No Error
- *             01 : Abort (Abort user request on going)
- *             10 : Timeout
- *             11 : Error
- *          b5     IP initilisation status
- *             0  : Reset (IP not initialized)
- *             1  : Init done (IP initialized and ready to use. HAL I2C Init function called)
- *          b4     (not used)
- *             x  : Should be set to 0
- *          b3
- *             0  : Ready or Busy (No Listen mode ongoing)
- *             1  : Listen (IP in Address Listen Mode)
- *          b2     Intrinsic process state
- *             0  : Ready
- *             1  : Busy (IP busy with some configuration or internal operations)
- *          b1     Rx state
- *             0  : Ready (no Rx operation ongoing)
- *             1  : Busy (Rx operation ongoing)
- *          b0     Tx state
- *             0  : Ready (no Tx operation ongoing)
- *             1  : Busy (Tx operation ongoing)
- */
-typedef enum {
-  HAL_I2C_STATE_RESET          = 0x00U, /*!< Peripheral is not yet Initialized         */
-  HAL_I2C_STATE_READY          = 0x20U, /*!< Peripheral Initialized and ready for use  */
-  HAL_I2C_STATE_BUSY           = 0x24U, /*!< An internal process is ongoing            */
-  HAL_I2C_STATE_BUSY_TX        = 0x21U, /*!< Data Transmission process is ongoing      */
-  HAL_I2C_STATE_BUSY_RX        = 0x22U, /*!< Data Reception process is ongoing         */
-  HAL_I2C_STATE_LISTEN         = 0x28U, /*!< Address Listen Mode is ongoing            */
-  HAL_I2C_STATE_BUSY_TX_LISTEN = 0x29U, /*!< Address Listen Mode and Data Transmission
-                                            process is ongoing                         */
-  HAL_I2C_STATE_BUSY_RX_LISTEN = 0x2AU, /*!< Address Listen Mode and Data Reception
-                                            process is ongoing                         */
-  HAL_I2C_STATE_ABORT   = 0x60U,        /*!< Abort user request ongoing                */
-  HAL_I2C_STATE_TIMEOUT = 0xA0U,        /*!< Timeout state                             */
-  HAL_I2C_STATE_ERROR   = 0xE0U         /*!< Error                                     */
-
-} HAL_I2C_StateTypeDef;
-
-/**
- * @brief  HAL Mode structure definition
- * @note  HAL I2C Mode value coding follow below described bitmap :
- *          b7     (not used)
- *             x  : Should be set to 0
- *          b6
- *             0  : None
- *             1  : Memory (HAL I2C communication is in Memory Mode)
- *          b5
- *             0  : None
- *             1  : Slave (HAL I2C communication is in Slave Mode)
- *          b4
- *             0  : None
- *             1  : Master (HAL I2C communication is in Master Mode)
- *          b3-b2-b1-b0  (not used)
- *             xxxx : Should be set to 0000
- */
-typedef enum {
-  HAL_I2C_MODE_NONE   = 0x00U, /*!< No I2C communication on going             */
-  HAL_I2C_MODE_MASTER = 0x10U, /*!< I2C communication is in Master Mode       */
-  HAL_I2C_MODE_SLAVE  = 0x20U, /*!< I2C communication is in Slave Mode        */
-  HAL_I2C_MODE_MEM    = 0x40U  /*!< I2C communication is in Memory Mode       */
-
-} HAL_I2C_ModeTypeDef;
-
-/**
- * @brief  I2C handle Structure definition
- */
-typedef struct {
-  I2C_TypeDef *Instance; /*!< I2C registers base address               */
-
-  I2C_InitTypeDef Init; /*!< I2C communication parameters             */
-
-  uint8_t *pBuffPtr; /*!< Pointer to I2C transfer buffer           */
-
-  uint16_t XferSize; /*!< I2C transfer size                        */
-
-  __IO uint16_t XferCount; /*!< I2C transfer counter                     */
-
-  __IO uint32_t XferOptions; /*!< I2C transfer options                     */
-
-  __IO uint32_t PreviousState; /*!< I2C communication Previous state and mode
-                                    context for internal usage               */
-
-  DMA_HandleTypeDef *hdmatx; /*!< I2C Tx DMA handle parameters             */
-
-  DMA_HandleTypeDef *hdmarx; /*!< I2C Rx DMA handle parameters             */
-
-  HAL_LockTypeDef Lock; /*!< I2C locking object                       */
-
-  __IO HAL_I2C_StateTypeDef State; /*!< I2C communication state                  */
-
-  __IO HAL_I2C_ModeTypeDef Mode; /*!< I2C communication mode                   */
-
-  __IO uint32_t ErrorCode; /*!< I2C Error code                           */
-
-  __IO uint32_t Devaddress; /*!< I2C Target device address                */
-
-  __IO uint32_t Memaddress; /*!< I2C Target memory address                */
-
-  __IO uint32_t MemaddSize; /*!< I2C Target memory address  size          */
-
-  __IO uint32_t EventCount; /*!< I2C Event counter                        */
-
-} I2C_HandleTypeDef;
-
-/**
- * @}
- */
-
-/* Exported constants --------------------------------------------------------*/
-/** @defgroup I2C_Exported_Constants I2C Exported Constants
- * @{
- */
-
-/** @defgroup I2C_Error_Code I2C Error Code
- * @brief    I2C Error Code
- * @{
- */
-#define HAL_I2C_ERROR_NONE    0x00000000U /*!< No error           */
-#define HAL_I2C_ERROR_BERR    0x00000001U /*!< BERR error         */
-#define HAL_I2C_ERROR_ARLO    0x00000002U /*!< ARLO error         */
-#define HAL_I2C_ERROR_AF      0x00000004U /*!< AF error           */
-#define HAL_I2C_ERROR_OVR     0x00000008U /*!< OVR error          */
-#define HAL_I2C_ERROR_DMA     0x00000010U /*!< DMA transfer error */
-#define HAL_I2C_ERROR_TIMEOUT 0x00000020U /*!< Timeout Error      */
-/**
- * @}
- */
-
-/** @defgroup I2C_duty_cycle_in_fast_mode I2C duty cycle in fast mode
- * @{
- */
-#define I2C_DUTYCYCLE_2    0x00000000U
-#define I2C_DUTYCYCLE_16_9 I2C_CCR_DUTY
-/**
- * @}
- */
-
-/** @defgroup I2C_addressing_mode I2C addressing mode
- * @{
- */
-#define I2C_ADDRESSINGMODE_7BIT 0x00004000U
-// #define I2C_ADDRESSINGMODE_10BIT (I2C_OAR1_ADDMODE | 0x00004000U)
-/**
- * @}
- */
-
-/** @defgroup I2C_dual_addressing_mode  I2C dual addressing mode
- * @{
- */
-#define I2C_DUALADDRESS_DISABLE 0x00000000U
-#define I2C_DUALADDRESS_ENABLE  I2C_OAR2_ENDUAL
-/**
- * @}
- */
-
-/** @defgroup I2C_general_call_addressing_mode I2C general call addressing mode
- * @{
- */
-#define I2C_GENERALCALL_DISABLE 0x00000000U
-#define I2C_GENERALCALL_ENABLE  I2C_CR1_ENGC
-/**
- * @}
- */
-
-/** @defgroup I2C_nostretch_mode I2C nostretch mode
- * @{
- */
-#define I2C_NOSTRETCH_DISABLE 0x00000000U
-#define I2C_NOSTRETCH_ENABLE  I2C_CR1_NOSTRETCH
-/**
- * @}
- */
-
-/** @defgroup I2C_Memory_Address_Size I2C Memory Address Size
- * @{
- */
-#define I2C_MEMADD_SIZE_8BIT  0x00000001U
-#define I2C_MEMADD_SIZE_16BIT 0x00000010U
-/**
- * @}
- */
-
-/** @defgroup I2C_XferDirection_definition I2C XferDirection definition
- * @{
- */
-#define I2C_DIRECTION_RECEIVE  0x00000000U
-#define I2C_DIRECTION_TRANSMIT 0x00000001U
-/**
- * @}
- */
-
-/** @defgroup I2C_XferOptions_definition I2C XferOptions definition
- * @{
- */
-#define I2C_FIRST_FRAME          0x00000001U
-#define I2C_NEXT_FRAME           0x00000002U
-#define I2C_FIRST_AND_LAST_FRAME 0x00000004U
-#define I2C_LAST_FRAME           0x00000008U
-/**
- * @}
- */
-
-/** @defgroup I2C_Interrupt_configuration_definition I2C Interrupt configuration definition
- * @{
- */
-#define I2C_IT_BUF I2C_CR2_ITBUFEN
-#define I2C_IT_EVT I2C_CR2_ITEVTEN
-#define I2C_IT_ERR I2C_CR2_ITERREN
-/**
- * @}
- */
-
-/** @defgroup I2C_Flag_definition I2C Flag definition
- * @{
- */
-#define I2C_FLAG_SMBALERT 0x00018000U
-#define I2C_FLAG_TIMEOUT  0x00014000U
-#define I2C_FLAG_PECERR   0x00011000U
-#define I2C_FLAG_OVR      0x00010800U
-#define I2C_FLAG_AF       0x00010400U
-#define I2C_FLAG_ARLO     0x00010200U
-#define I2C_FLAG_BERR     0x00010100U
-#define I2C_FLAG_TXE      0x00010080U
-#define I2C_FLAG_RXNE     0x00010040U
-#define I2C_FLAG_STOPF    0x00010010U
-// #define I2C_FLAG_ADD10      0x00010008U
-#define I2C_FLAG_BTF        0x00010004U
-#define I2C_FLAG_ADDR       0x00010002U
-#define I2C_FLAG_SB         0x00010001U
-#define I2C_FLAG_DUALF      0x00100080U
-#define I2C_FLAG_SMBHOST    0x00100040U
-#define I2C_FLAG_SMBDEFAULT 0x00100020U
-#define I2C_FLAG_GENCALL    0x00100010U
-#define I2C_FLAG_TRA        0x00100004U
-#define I2C_FLAG_BUSY       0x00100002U
-#define I2C_FLAG_MSL        0x00100001U
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/* Exported macro ------------------------------------------------------------*/
-/** @defgroup I2C_Exported_Macros I2C Exported Macros
- * @{
- */
-
-/** @brief Reset I2C handle state
- * @param  __HANDLE__: specifies the I2C Handle.
- *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
- * @retval None
- */
-#define __HAL_I2C_RESET_HANDLE_STATE(__HANDLE__) ((__HANDLE__)->State = HAL_I2C_STATE_RESET)
-
-/** @brief  Enable or disable the specified I2C interrupts.
- * @param  __HANDLE__: specifies the I2C Handle.
- *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
- * @param  __INTERRUPT__: specifies the interrupt source to enable or disable.
- *         This parameter can be one of the following values:
- *            @arg I2C_IT_BUF: Buffer interrupt enable
- *            @arg I2C_IT_EVT: Event interrupt enable
- *            @arg I2C_IT_ERR: Error interrupt enable
- * @retval None
- */
-#define __HAL_I2C_ENABLE_IT(__HANDLE__, __INTERRUPT__)  ((__HANDLE__)->Instance->CR2 |= (__INTERRUPT__))
-#define __HAL_I2C_DISABLE_IT(__HANDLE__, __INTERRUPT__) ((__HANDLE__)->Instance->CR2 &= (~(__INTERRUPT__)))
-
-/** @brief  Checks if the specified I2C interrupt source is enabled or disabled.
- * @param  __HANDLE__: specifies the I2C Handle.
- *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
- * @param  __INTERRUPT__: specifies the I2C interrupt source to check.
- *          This parameter can be one of the following values:
- *            @arg I2C_IT_BUF: Buffer interrupt enable
- *            @arg I2C_IT_EVT: Event interrupt enable
- *            @arg I2C_IT_ERR: Error interrupt enable
- * @retval The new state of __INTERRUPT__ (TRUE or FALSE).
- */
-#define __HAL_I2C_GET_IT_SOURCE(__HANDLE__, __INTERRUPT__) ((((__HANDLE__)->Instance->CR2 & (__INTERRUPT__)) == (__INTERRUPT__)) ? SET : RESET)
-
-/** @brief  Checks whether the specified I2C flag is set or not.
- * @param  __HANDLE__: specifies the I2C Handle.
- *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
- * @param  __FLAG__: specifies the flag to check.
- *         This parameter can be one of the following values:
- *            @arg I2C_FLAG_SMBALERT: SMBus Alert flag
- *            @arg I2C_FLAG_TIMEOUT: Timeout or Tlow error flag
- *            @arg I2C_FLAG_PECERR: PEC error in reception flag
- *            @arg I2C_FLAG_OVR: Overrun/Underrun flag
- *            @arg I2C_FLAG_AF: Acknowledge failure flag
- *            @arg I2C_FLAG_ARLO: Arbitration lost flag
- *            @arg I2C_FLAG_BERR: Bus error flag
- *            @arg I2C_FLAG_TXE: Data register empty flag
- *            @arg I2C_FLAG_RXNE: Data register not empty flag
- *            @arg I2C_FLAG_STOPF: Stop detection flag
- *            @arg I2C_FLAG_ADD10: 10-bit header sent flag
- *            @arg I2C_FLAG_BTF: Byte transfer finished flag
- *            @arg I2C_FLAG_ADDR: Address sent flag
- *                                Address matched flag
- *            @arg I2C_FLAG_SB: Start bit flag
- *            @arg I2C_FLAG_DUALF: Dual flag
- *            @arg I2C_FLAG_SMBHOST: SMBus host header
- *            @arg I2C_FLAG_SMBDEFAULT: SMBus default header
- *            @arg I2C_FLAG_GENCALL: General call header flag
- *            @arg I2C_FLAG_TRA: Transmitter/Receiver flag
- *            @arg I2C_FLAG_BUSY: Bus busy flag
- *            @arg I2C_FLAG_MSL: Master/Slave flag
- * @retval The new state of __FLAG__ (TRUE or FALSE).
- */
-#define __HAL_I2C_GET_FLAG(__HANDLE__, __FLAG__)                                                                                            \
-  ((((uint8_t)((__FLAG__) >> 16U)) == 0x01U) ? ((((__HANDLE__)->Instance->SR1) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)) \
-                                             : ((((__HANDLE__)->Instance->SR2) & ((__FLAG__)&I2C_FLAG_MASK)) == ((__FLAG__)&I2C_FLAG_MASK)))
-
-/** @brief  Clears the I2C pending flags which are cleared by writing 0 in a specific bit.
- * @param  __HANDLE__: specifies the I2C Handle.
- *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
- * @param  __FLAG__: specifies the flag to clear.
- *         This parameter can be any combination of the following values:
- *            @arg I2C_FLAG_SMBALERT: SMBus Alert flag
- *            @arg I2C_FLAG_TIMEOUT: Timeout or Tlow error flag
- *            @arg I2C_FLAG_PECERR: PEC error in reception flag
- *            @arg I2C_FLAG_OVR: Overrun/Underrun flag (Slave mode)
- *            @arg I2C_FLAG_AF: Acknowledge failure flag
- *            @arg I2C_FLAG_ARLO: Arbitration lost flag (Master mode)
- *            @arg I2C_FLAG_BERR: Bus error flag
- * @retval None
- */
-#define __HAL_I2C_CLEAR_FLAG(__HANDLE__, __FLAG__) ((__HANDLE__)->Instance->SR1 = ~((__FLAG__)&I2C_FLAG_MASK))
-
-/** @brief  Clears the I2C ADDR pending flag.
- * @param  __HANDLE__: specifies the I2C Handle.
- *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
- * @retval None
- */
-#define __HAL_I2C_CLEAR_ADDRFLAG(__HANDLE__)            \
-  do {                                                  \
-    __IO uint32_t tmpreg = 0x00U;                       \
-    tmpreg               = (__HANDLE__)->Instance->SR1; \
-    tmpreg               = (__HANDLE__)->Instance->SR2; \
-    UNUSED(tmpreg);                                     \
-  } while (0U)
-
-/** @brief  Clears the I2C STOPF pending flag.
- * @param  __HANDLE__: specifies the I2C Handle.
- *         This parameter can be I2C where x: 1, 2, or 3 to select the I2C peripheral.
- * @retval None
- */
-#define __HAL_I2C_CLEAR_STOPFLAG(__HANDLE__)            \
-  do {                                                  \
-    __IO uint32_t tmpreg = 0x00U;                       \
-    tmpreg               = (__HANDLE__)->Instance->SR1; \
-    (__HANDLE__)->Instance->CR1 |= I2C_CR1_PE;          \
-    UNUSED(tmpreg);                                     \
-  } while (0U)
-
-/** @brief  Enable the I2C peripheral.
- * @param  __HANDLE__: specifies the I2C Handle.
- *         This parameter can be I2Cx where x: 1 or 2  to select the I2C peripheral.
- * @retval None
- */
-#define __HAL_I2C_ENABLE(__HANDLE__) ((__HANDLE__)->Instance->CR1 |= I2C_CR1_PE)
-
-/** @brief  Disable the I2C peripheral.
- * @param  __HANDLE__: specifies the I2C Handle.
- *         This parameter can be I2Cx where x: 1 or 2  to select the I2C peripheral.
- * @retval None
- */
-#define __HAL_I2C_DISABLE(__HANDLE__) ((__HANDLE__)->Instance->CR1 &= ~I2C_CR1_PE)
-
-/**
- * @}
- */
-
-/* Exported functions --------------------------------------------------------*/
-/** @addtogroup I2C_Exported_Functions
- * @{
- */
-
-/** @addtogroup I2C_Exported_Functions_Group1
- * @{
- */
-/* Initialization/de-initialization functions  **********************************/
-HAL_StatusTypeDef HAL_I2C_Init(I2C_HandleTypeDef *hi2c);
-HAL_StatusTypeDef HAL_I2C_DeInit(I2C_HandleTypeDef *hi2c);
-void              HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c);
-void              HAL_I2C_MspDeInit(I2C_HandleTypeDef *hi2c);
-/**
- * @}
- */
-
-/** @addtogroup I2C_Exported_Functions_Group2
- * @{
- */
-/* I/O operation functions  *****************************************************/
-/******* Blocking mode: Polling */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Master_Receive(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Mem_Write(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_Mem_Read(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size, uint32_t Timeout);
-HAL_StatusTypeDef HAL_I2C_IsDeviceReady(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint32_t Trials, uint32_t Timeout);
-
-/******* Non-Blocking mode: Interrupt */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Master_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Write_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Read_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-
-HAL_StatusTypeDef HAL_I2C_Master_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Slave_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size, uint32_t XferOptions);
-HAL_StatusTypeDef HAL_I2C_Master_Abort_IT(I2C_HandleTypeDef *hi2c, uint16_t DevAddress);
-HAL_StatusTypeDef HAL_I2C_EnableListen_IT(I2C_HandleTypeDef *hi2c);
-HAL_StatusTypeDef HAL_I2C_DisableListen_IT(I2C_HandleTypeDef *hi2c);
-
-/******* Non-Blocking mode: DMA */
-HAL_StatusTypeDef HAL_I2C_Master_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Master_Receive_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Transmit_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Slave_Receive_DMA(I2C_HandleTypeDef *hi2c, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Write_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_I2C_Mem_Read_DMA(I2C_HandleTypeDef *hi2c, uint16_t DevAddress, uint16_t MemAddress, uint16_t MemAddSize, uint8_t *pData, uint16_t Size);
-
-/******* I2C IRQHandler and Callbacks used in non blocking modes (Interrupt and DMA) */
-void HAL_I2C_EV_IRQHandler(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_ER_IRQHandler(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MasterRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_SlaveTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, uint16_t AddrMatchCode);
-void HAL_I2C_ListenCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemTxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_MemRxCpltCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c);
-void HAL_I2C_AbortCpltCallback(I2C_HandleTypeDef *hi2c);
-/**
- * @}
- */
-
-/** @addtogroup I2C_Exported_Functions_Group3
- * @{
- */
-/* Peripheral State, Mode and Errors functions  *********************************/
-HAL_I2C_StateTypeDef HAL_I2C_GetState(I2C_HandleTypeDef *hi2c);
-HAL_I2C_ModeTypeDef  HAL_I2C_GetMode(I2C_HandleTypeDef *hi2c);
-uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-/* Private types -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* Private constants ---------------------------------------------------------*/
-/** @defgroup I2C_Private_Constants I2C Private Constants
- * @{
- */
-#define I2C_FLAG_MASK              0x0000FFFFU
-#define I2C_MIN_PCLK_FREQ_STANDARD 2000000U /*!< 2 MHz                     */
-#define I2C_MIN_PCLK_FREQ_FAST     4000000U /*!< 4 MHz                     */
-/**
- * @}
- */
-
-/* Private macros ------------------------------------------------------------*/
-/** @defgroup I2C_Private_Macros I2C Private Macros
- * @{
- */
-
-#define I2C_MIN_PCLK_FREQ(__PCLK__, __SPEED__)              (((__SPEED__) <= 100000U) ? ((__PCLK__) < I2C_MIN_PCLK_FREQ_STANDARD) : ((__PCLK__) < I2C_MIN_PCLK_FREQ_FAST))
-#define I2C_CCR_CALCULATION(__PCLK__, __SPEED__, __COEFF__) (((((__PCLK__)-1U) / ((__SPEED__) * (__COEFF__))) + 1U) & I2C_CCR_CCR)
-#define I2C_FREQRANGE(__PCLK__)                             ((__PCLK__) / 1000000U)
-#define I2C_RISE_TIME(__FREQRANGE__, __SPEED__)             (((__SPEED__) <= 100000U) ? ((__FREQRANGE__) + 1U) : ((((__FREQRANGE__)*300U) / 1000U) + 1U))
-#define I2C_SPEED_STANDARD(__PCLK__, __SPEED__)             ((I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U) < 4U) ? 4U : I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U))
-#define I2C_SPEED_FAST(__PCLK__, __SPEED__, __DUTYCYCLE__) \
-  (((__DUTYCYCLE__) == I2C_DUTYCYCLE_2) ? I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 3U) : (I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 25U) | I2C_DUTYCYCLE_16_9))
-#define I2C_SPEED(__PCLK__, __SPEED__, __DUTYCYCLE__)                                                                                 \
-  (((__SPEED__) <= 100000U)                                                           ? (I2C_SPEED_STANDARD((__PCLK__), (__SPEED__))) \
-   : ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__)) & I2C_CCR_CCR) == 0U) ? 1U                                            \
-                                                                                      : ((I2C_SPEED_FAST((__PCLK__), (__SPEED__), (__DUTYCYCLE__))) | I2C_CCR_FS))
-
-#define I2C_7BIT_ADD_WRITE(__ADDRESS__) ((uint8_t)((__ADDRESS__) & (~I2C_OAR1_ADD0)))
-#define I2C_7BIT_ADD_READ(__ADDRESS__)  ((uint8_t)((__ADDRESS__) | I2C_OAR1_ADD0))
-
-#define I2C_10BIT_ADDRESS(__ADDRESS__)      ((uint8_t)((uint16_t)((__ADDRESS__) & (uint16_t)(0x00FFU))))
-#define I2C_10BIT_HEADER_WRITE(__ADDRESS__) ((uint8_t)((uint16_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)(0x0300U))) >> 7U) | (uint16_t)(0x00F0U))))
-#define I2C_10BIT_HEADER_READ(__ADDRESS__)  ((uint8_t)((uint16_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)(0x0300U))) >> 7U) | (uint16_t)(0x00F1U))))
-
-#define I2C_MEM_ADD_MSB(__ADDRESS__) ((uint8_t)((uint16_t)(((uint16_t)((__ADDRESS__) & (uint16_t)(0xFF00U))) >> 8U)))
-#define I2C_MEM_ADD_LSB(__ADDRESS__) ((uint8_t)((uint16_t)((__ADDRESS__) & (uint16_t)(0x00FFU))))
-
-/** @defgroup I2C_IS_RTC_Definitions I2C Private macros to check input parameters
- * @{
- */
-#define IS_I2C_DUTY_CYCLE(CYCLE)                 (((CYCLE) == I2C_DUTYCYCLE_2) || ((CYCLE) == I2C_DUTYCYCLE_16_9))
-#define IS_I2C_ADDRESSING_MODE(ADDRESS)          (((ADDRESS) == I2C_ADDRESSINGMODE_7BIT) || ((ADDRESS) == I2C_ADDRESSINGMODE_10BIT))
-#define IS_I2C_DUAL_ADDRESS(ADDRESS)             (((ADDRESS) == I2C_DUALADDRESS_DISABLE) || ((ADDRESS) == I2C_DUALADDRESS_ENABLE))
-#define IS_I2C_GENERAL_CALL(CALL)                (((CALL) == I2C_GENERALCALL_DISABLE) || ((CALL) == I2C_GENERALCALL_ENABLE))
-#define IS_I2C_NO_STRETCH(STRETCH)               (((STRETCH) == I2C_NOSTRETCH_DISABLE) || ((STRETCH) == I2C_NOSTRETCH_ENABLE))
-#define IS_I2C_MEMADD_SIZE(SIZE)                 (((SIZE) == I2C_MEMADD_SIZE_8BIT) || ((SIZE) == I2C_MEMADD_SIZE_16BIT))
-#define IS_I2C_CLOCK_SPEED(SPEED)                (((SPEED) > 0) && ((SPEED) <= 400000U))
-#define IS_I2C_OWN_ADDRESS1(ADDRESS1)            (((ADDRESS1) & (uint32_t)(0xFFFFFC00U)) == 0U)
-#define IS_I2C_OWN_ADDRESS2(ADDRESS2)            (((ADDRESS2) & (uint32_t)(0xFFFFFF01U)) == 0U)
-#define IS_I2C_TRANSFER_OPTIONS_REQUEST(REQUEST) (((REQUEST) == I2C_FIRST_FRAME) || ((REQUEST) == I2C_NEXT_FRAME) || ((REQUEST) == I2C_FIRST_AND_LAST_FRAME) || ((REQUEST) == I2C_LAST_FRAME))
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/* Private functions ---------------------------------------------------------*/
-/** @defgroup I2C_Private_Functions I2C Private Functions
- * @{
- */
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* __STM32F1xx_HAL_I2C_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/