Fix #1089

* Remove unused includes

* Adding in submodule

* Move fusb functions to the BSP

* Remove old code

* Creating IronOS PD integration wrapper

* Redirect to wrapper

* pd lib updates

* fix Docker build

* Finish linking across

* Cleanup

* Update Makefile

* Update push.yml

* Update push.yml

* PD -> Compensate for different tick rates

* Update codeql-analysis.yml

* Fix PD #define for @Firebie

* Check irq low at start

* Update BSP.h

* Update main.cpp

* Closer delay

* Update OLED.cpp

* Bugfix trying to start QC too early

* Missing fusb shouldnt hang qc

* Update FreeRTOSConfig.h

* Update the GD drivers

* Update Pinecil IRQ setup

* Redirect printf() to uart

* Update Power.cpp

* Adding extras to PD state

* Update USBPD.cpp

* Delay in printf

* Iterate once before delay on start

* Update usb-pd

* master usb-pd now

* Format gd libs

* Update gd32vf103_bkp.c

* Guard with PD timeout

* Remove CodeQL

* Slow for testing, fix runt pulses at start

* Fix runt pulse in read size 1

* Cleaner probing setup

* Testing delay during stop gen in read 1

* Update I2C driver

* Update gd32vf103_i2c.c

* Cleaning up i2c wrapper a little, given up on dma for rx

* Update preRTOS.cpp

* Update Setup.cpp

* Update MOVThread.cpp

* Slow down UART to work with new clock config

* Better ack setup for 2 byte read

* Cleanup POW_PD so cant be lost in #includes

* tipResistance -> TIP_RESISTANCE

* handle NOP race on len==2

* Update configuration.h

* Dont use neg timeout to mask anymore

* Not required for MHP

* Fix up source display Miniware

* Fix race on PD init

* Update POWThread.cpp

* Update formatting

* MHP format

* Update push.yml

* Faster TS80P I2C

* Bugfix for IRQ handlers

* Correctly handle I2C race on PD access

* Fix CI error (unused var) and MHP IRQ

* Test Pinecil alt ADC mode

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: Ralim
+
+---
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+
+**Details on your device:**
+ <!-- You can get these from the  debug menu by holding the rear button down and then using the front one to cycle through-->
+ - Device: [e.g. TS80/Pinecil etc]
+ - Release: [eg 2.15.40087E6]
+ - Power adapter being used:
+ - If this is an acceleromter related issue, please include its model number here:
+
+**Additional context**
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/everything-else--questions--notes-etc-.md

@@ -0,0 +1,10 @@
+---
+name: Everything else (Questions, notes etc)
+about: For remarking questions or notes
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- **Questions are preferred to be kept to the discussions tab where possible, but otherwise go for it. be polite and as clear as possible.** -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: Ralim
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->

.github/workflows/codeql-analysis.yml

@@ -1,69 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-  schedule:
-    - cron: "38 23 * * 6"
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ["cpp", "python"]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-
-      - name: chmod
-        run: chmod +x setup.sh && chmod +x source/build.sh && sudo mkdir -p /build/cache && sudo chmod -R 777 /build
-
-      - name: Cached compiler source files
-        uses: actions/cache@v2.1.5
-        env:
-          cache-name: cache-compilers
-        with:
-          path: /build/cache
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-          restore-keys: |
-            ${{ runner.os }}-
-
-      - name: setup
-        run: ./setup.sh && cd source && ./build.sh
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1

.github/workflows/push.yml

@@ -12,12 +12,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - name: chmod
         run: chmod +x setup.sh && chmod +x source/build.sh && sudo mkdir -p /build/cache && sudo chmod -R 777 /build
 
       - name: Cached compiler source files
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         env:
           cache-name: cache-compilers
         with:
@@ -43,7 +45,7 @@ jobs:
           name: ${{ matrix.model }}
           path: |
             source/Hexfile/${{ matrix.model }}_*.hex
-            source/Hexfile/${{ matrix.model }}_*.bin
+            source/Hexfile/${{ matrix.model }}_*.dfu
             source/Hexfile/LICENSE
             source/Hexfile/LICENSE_RELEASE.md
           if-no-files-found: error
@@ -57,12 +59,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - name: chmod
         run: chmod +x setup.sh && chmod +x source/build.sh && sudo mkdir -p /build/cache && sudo chmod -R 777 /build
 
       - name: Cached compiler source files
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         env:
           cache-name: cache-compilers
         with:
@@ -88,7 +92,7 @@ jobs:
           name: ${{ matrix.model }}_multi-lang
           path: |
             source/Hexfile/${{ matrix.model }}_*.hex
-            source/Hexfile/${{ matrix.model }}_*.bin
+            source/Hexfile/${{ matrix.model }}_*.dfu
             source/Hexfile/LICENSE
             source/Hexfile/LICENSE_RELEASE.md
           if-no-files-found: error
@@ -97,6 +101,8 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - name: Setup
         run: sudo apt-get update && sudo apt-get install -y python3 && pip3 install bdflib
@@ -117,12 +123,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: true
 
       - name: chmod
         run: chmod +x setup.sh && chmod +x source/build.sh && sudo mkdir -p /build/cache && sudo chmod -R 777 /build
 
       - name: Cached compiler source files
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         env:
           cache-name: cache-compilers
         with:
@@ -133,8 +141,7 @@ jobs:
             ${{ runner.os }}-
 
       - name: setup
-        run: ./setup.sh
+        run: sudo apt-get update && sudo apt-get install -y make clang git python3 python3-pip && python3 -m pip install bdflib black flake8
-
       - name: Check formatting with clang-format
         run: cd source && make clean && make check-style
 

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "source/Core/Drivers/usb-pd"]
+	path = source/Core/Drivers/usb-pd
+	url = https://github.com/Ralim/usb-pd.git

Dockerfile

@@ -6,7 +6,7 @@ WORKDIR /build
 RUN echo "deb mirror://mirrors.ubuntu.com/mirrors.txt focal main restricted universe multiverse" > /etc/apt/sources.list && \
   echo "deb mirror://mirrors.ubuntu.com/mirrors.txt focal-updates main restricted universe multiverse" >> /etc/apt/sources.list && \
   echo "deb mirror://mirrors.ubuntu.com/mirrors.txt focal-security main restricted universe multiverse" >> /etc/apt/sources.list && \
-    DEBIAN_FRONTEND=noninteractive apt-get update
+  DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y ca-certificates 
 # Install dependencies to build the firmware
 RUN apt-get install -y \
   make \
@@ -14,6 +14,8 @@ RUN apt-get install -y \
   git \
   python3 \
   python3-pip \
+  clang-format \
+  dfu-util \
   wget --no-install-recommends && \
   apt-get clean
 RUN python3 -m pip install bdflib

Documentation/DebugMenu.md

@@ -1,7 +1,7 @@
 # Debugging Menu
 
-In this firmware there is extra debugging information hidden under and extra menu.
+In this firmware there is extra debugging information hidden under an extra menu.
-This is accessed by holding the rear (B) button on the iron while its on the home screen.
+This is accessed by holding the rear (B) button on the iron while it is on the home screen.
 
 This menu is meant to be simple, so it has no fancy GUI animations.
 
@@ -27,7 +27,7 @@ This indicates the High Water mark for the stack for the PID thread. The smaller
 
 ### Time
 
-This just shows how many seconds the unit has been powered for.
+This just shows how many deciseconds the unit has been powered for.
 
 ### Move
 
@@ -52,27 +52,26 @@ This is shown in degrees C x10, so 200 == 20.0C
 
 The input voltage as read by the internal ADC. Can be used to sanity check its being read correctly.
 
-### PCB 
+### ACC 
 
-This is slightly miss-named, but preserving the name for now.
-This indicates the PCB "version" number, which comes from the TS100 changing the model of accelerometer without warning.
 This indicates the accelerometer that is fitted inside the unit.
 
-- 1 = MMA8652
+- MMA8652
-- 2 = LIS2DH12
+- LIS2DH12
-- 3 = BMA223
+- BMA223
-- 4 = MSA301
+- MSA301
-- 5 = SC7A20
+- SC7A20
-- 99 = None detected (running in fallback without movement detection)
+- None detected -> running in fallback without movement detection
+- Scanning -> Still searching I2C for one
 
 ### PWR 
 
 This indicates the current power source for the iron.
 This may change during power up as the sources are negotiated in turn.
 
-- 0 = DC input (dumb)
+- **DC** input (dumb)
-- 1 = QC input (We used QC2/3 negotiation for current supply)
+- **QC** input (We used QC2/3 negotiation for current supply)
-- 2 = PD input (We used the PD subsystem to negotiate for the current supply)
+- **PD** input (We used the PD subsystem to negotiate for the current supply)
 
 ### Max 
 

Documentation/Development.md

@@ -24,7 +24,7 @@ To update the language translation files & associated font map, execute the `mak
 
 ## Building Pinecil
 
-I highly reccomend using the command line tools and using docker to run the compiler.
+I highly recommend using the command line tools and using docker to run the compiler.
-Its a bit more fussy on setup than the STM tooling and this is by far the easiest way.
+It's a bit more fussy on setup than the STM tooling and this is by far the easiest way.
 If you _need_ an IDE I have used [Nuclei's IDE](https://nucleisys.com/download.php)
 And follow same idea as the STM Cube IDE notes above.

Documentation/Flashing.md

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

Documentation/GettingStarted.md

@@ -3,14 +3,14 @@
 Getting started with Iron OS on your Pinecil/TS80/TS80P/TS100.
 If your device did not come with Iron OS already installed, or if you need to update to the latest version; please see the [Flashing Guide](/Documentation/Flashing.md).
 
-Once your Iron has been flashed, one first power on it _may_ warn you about the system settings being reset.
+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.
 
 If you receive a warning about the accelerometer or USB-PD not being detected, please see [here](/Documentation/HardwareIssues.md).
 
 ## The Home screen (or idle screen)
 
-This is the landing page of the firmware, from here you can choose to either go into the [settings menu](##-Settings-Menu) or go into [soldering mode](##-Soldering-Mode).
+This is the landing page of the firmware, from here you can choose to either go into the [settings menu](#Settings-Menu) or go into [soldering mode](#Soldering-Mode).
 
 By default this will show a screen similar to the one below:
 

Documentation/History.md

@@ -1,5 +1,48 @@
 # Version Changes
 
+## V2.16
+
+* Overhaul of the Timer+ADC setup with help from @sandmanRO
+* Overhaul of the PID with help from @sandmanRO
+* Settings _should_ now upgrade in place to future versions, with resets only happening to new/changed settings
+* Shows error if tip runaway (failed temperature sensor) is detected
+* USB-PD now has a timeout, to allow forcing QC3 negotiation to start faster
+* QC3 Voltages are now adjustable to user desired setpoint
+* Added a small tolerance to allow "overvoltage" on QC3 above unit specifications.
+* * Please note: Doing this is entirely at your own risk!
+* New Advanced view that is much nicer to use and a very good daily driver option from @Mel-kior
+* OLED brightness and contrast thanks to @alvinhochun
+* Scrollbar is fixed so it doesnt jump around when menus are shown/hidden
+* Moved to `.dfu` files from `.bin` to make flashing commands easier
+* Every language had translation updates I believe
+* Romanian language added
+
+
+## V2.15
+
+
+## Feature upgrades:
+
+* MHP30 support
+* Multi-lingual firmware combinations now exist for Pinecil
+* More fine grained voltage controlled options
+* USB-PD improvements (version one and two)
+* More configuration options for power pulse
+* All font / character encoding has been very reworked
+* More translation updates than one can count 
+* More languages 😱 
+
+### MHP30
+
+The MHP30 is a small reflow station from Miniware.
+Thanks to a massive amount of help from @g3gg0 this firmware brings the beginnings of support for this unit.
+Also kudo's to @Vinigas  and @GoJian for helping with testing.
+This is not a _final_ version I'm sure, but this is a working, usable version of firmware support.
+Programs the same as any one Miniware unit using drag and drop.
+**Note: The boot logo scripts will need updates for this unit, so not supported yet.**
+
+The flood doors are now open for feature requests for this unit :)
+
 ## V2.14
 
 - Fixing auto rotation bug in the LIS accelerometer in the TS80/TS80P

Documentation/Menu.md

@@ -17,7 +17,7 @@ Note that settings are not saved until you exit the menu.
 If you leave the unit alone (ie don't press any buttons) on a setting, after 3 seconds the screen will scroll a rough description of the setting.
 
 The menu is arranged so that the most often used settings are first.
-With submenu's being selected to enter using the front button (as if you were going to change the setting).
+With submenus being selected to enter using the front button (as if you were going to change the setting).
 Scrolling through the submenu will return you back to its entry location after you scroll through all of the options.
 
 ### Calibrating input voltage
@@ -34,7 +34,7 @@ To calibrate your iron:
 4. Under the advanced submenu
 5. Select the calibrate voltage option
 6. Use the front and back buttons to adjust the displayed voltage to minimize the error to your original measurement
-7. Hold both buttons to save and exit to the menu
+7. Press both buttons at the same time to save and exit to the menu
 
 ### Calibrating tip offset (Set tip model)
 
@@ -48,7 +48,7 @@ Some tips will have an offset on their readings, to calibrate this out perform t
 6. The display will start to scroll a warning message to check that the tip is at ambient temperature!
 7. Press the button near the tip of the iron to confirm
 8. The display will go to "...." for a short period of time as the unit measures the tip temperature and the handle temperature and compares them
-9. The display will then go back to *TMP CAL* and it will display a number, this is your offset number. You generally dont need it unless debugging issues
+9. The display will then go back to *TMP CAL* and it will display a number, this is your offset number. You generally don't need it unless debugging issues
 10. Calibration is done, just exit the settings menu as normal
 11. You're done, enjoy your iron!
 

Documentation/Power.md

@@ -2,7 +2,7 @@
 
 All of the irons are PWM controlled resistive heating elements.
 This means that the electronics in the handle can only turn the heating element on and off.
-This *means* that the power proivded in the tip is 100% controlled by the supply voltage used.
+This *means* that the power provided in the tip is 100% controlled by the supply voltage used.
 
 Both irons at their simplest are just a resistor connected to your power source via a switch.
 

ISSUE_TEMPLATE.md

@@ -1,31 +0,0 @@
-Please edit this template and fill out all the information you can (where relevant). Failure to provide essential information can delay the response you receive.
-
-_This is a [Bug/Feature Request/Question/Complaint]_
-
-* **I have**
-  - [ ] Searched previous issues 
-  - [ ] This is in _this_ firmware, not vendor "offical" firmware
-  - [ ] This is not a bug in the vendor bootloader (aka DFU)
-  - [ ] I have checked this is not already covered in the docs in `/Documentation`
-
-* **What is the current behavior?**
-
-* **What is the expected behavior?**
-
-***Steps to reproduce the bug:***
-
-- Turn on...
-- Hold....
-
-* **What is the motivation / use case for changing the behavior?**
-
-
-
-* **What are you running:**
-
-On the idle screen, you can hold the settings button and it will show you the firmware & PCB version.
-If using a USB-C supply please note model number
-
-  - Firmware Version: 2.x?
-  - PCB Version: (1/2)
-  - Power Supply (Voltage and Current Rating) :

PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,17 @@
 
-Please try and fill out this template where possible, not all fields are required and can be removed.
+<!-- Please try and fill out this template where possible, not all fields are required and can be removed. -->
 
 * **Please check if the PR fulfills these requirements**
 - [] The changes have been tested locally
 - [] There are no breaking changes
 
 * **What kind of change does this PR introduce?**
-(Bug fix, feature, docs update, ...)
+<!-- (Bug fix, feature, docs update, ...) -->
 
 
 
 * **What is the current behavior?**
-(You can also link to an open issue here)
+<!-- (You can also just link to an open issue here) -->
 
 * **What is the new behavior (if this is a feature change)?**
 

README.md

@@ -4,12 +4,12 @@
 
 # IronOS - Flexible Soldering iron control Firmware
 
-_This repository was formerly known as TS100, its the same great code. Just with more supported devices_
+_This repository was formerly known as TS100, it's the same great code. Just with more supported devices_
 
-Originally concieved as an alternative firmware for the TS100, this firmware has evolved into a complex soldering iron control firmware.
+Originally conceived as an alternative firmware for the TS100, this firmware has evolved into a complex soldering iron control firmware.
 
 The firmware implements all of the standard features of a "smart" soldering iron, with lots of little extras and tweaks.
-I highly reccomend reading the installation guide fully when installing on your iron. And after install just explore the settings menu.
+I highly recommend reading the installation guide fully when installing on your iron. And after install just explore the settings menu.
 
 For soldering irons that are designed to be powered by "smart" power sources (QC and PD), the firmware supports settings around the negotiated power and voltage.
 For soldering irons that are designed to be powered by batteries (TS100), settings for a cutoff voltage for battery protection are supported.
@@ -27,7 +27,7 @@ To get started with this firmware, please jump over to [here](Documentation/Gett
 - PID style iron temperature control
 - Automatic sleep with selectable sensitivity
 - Motion wake support
-- All settings exposed in intuitive menu
+- 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
@@ -35,7 +35,7 @@ To get started with this firmware, please jump over to [here](Documentation/Gett
 - Improved readability Fonts, supporting multiple languages
 - Use hardware features to improve reliability
 - Can disable movement detection if desired
-- Boost mode lets you temporarily change the temperature when soldering (i.e. raise the temperature for short periods of time)
+- 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](Documentation/Logo.md)
@@ -43,14 +43,14 @@ To get started with this firmware, please jump over to [here](Documentation/Gett
 
 ## Installation
 
-For installation for your device, please refer to the [Flashing Guide](Documentation/Flashing.md).
+For notes on installation for your device, please refer to the [Flashing Guide](Documentation/Flashing.md).
 
 ## Menu System
 
 This new firmware uses a new menu system to allow access to the settings on the device.
-When on the main screen, the unit shows prompts for the two most common operations.
+When on the main screen, the unit shows a pair of prompts for the two most common operations.
 
-- Pressing the button near the tip enters soldering mode
+- Pressing the button near the tip enters the soldering mode
 - Pressing the button near the USB enters the settings menu
 - Holding the button near the tip will enter soldering temperature adjust mode (This is the same as the one in the soldering menu, just to let you edit before heating up)
 - Holding the button near the USB end will show the [debug menu](Documentation/DebugMenu.md)
@@ -88,5 +88,5 @@ Other components such as FreeRTOS/USB-PD have their own licence.
 ## Commercial Use
 
 This software is provided as-is, so I cannot provide any commercial support for the firmware.
-However, you are more than welcome to distribute links to the firmware, or provide irons with this software on them.
+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.

Translations/make_translation.py

@@ -3,6 +3,7 @@
 import argparse
 import functools
 import json
+import hashlib
 import logging
 import os
 import pickle
@@ -41,6 +42,16 @@ def load_json(filename: str, skip_first_line: bool) -> dict:
         return json.loads(f.read())
 
 
+def get_language_unqiue_id(language_ascii_name: str):
+    """
+    Given a language code, it will return a unique (enough) uint16_t id code
+    When we have a collision here we can tweak this, but language list should be fairly stable from now on
+    """
+    return (
+        int(hashlib.sha1(language_ascii_name.encode("utf-8")).hexdigest(), 16) % 0xFFFF
+    )
+
+
 def read_translation(json_root: Union[str, Path], lang_code: str) -> dict:
     filename = f"translation_{lang_code}.json"
 
@@ -113,12 +124,32 @@ def get_debug_menu() -> List[str]:
         "CTip ",
         "CHan ",
         "Vin  ",
-        "PCB  ",
+        "ACC  ",
         "PWR  ",
         "Max  ",
     ]
 
 
+def get_accel_names_list() -> List[str]:
+    return [
+        "Scanning",
+        "None",
+        "MMA8652FC",
+        "LIS2DH12",
+        "BMA223",
+        "MSA301",
+        "SC7A20",
+    ]
+
+
+def get_power_source_list() -> List[str]:
+    return [
+        "DC",
+        "QC",
+        "PD",
+    ]
+
+
 def get_letter_counts(
     defs: dict, lang: dict, build_version: str
 ) -> Tuple[List[str], Dict[str, int]]:
@@ -178,6 +209,8 @@ def get_letter_counts(
     for x in constants:
         text_list.append(x[1])
     text_list.extend(get_debug_menu())
+    text_list.extend(get_accel_names_list())
+    text_list.extend(get_power_source_list())
 
     # collapse all strings down into the composite letters and store totals for these
 
@@ -868,10 +901,10 @@ def write_languages(
         f.write("const LanguageMeta LanguageMetas[] = {\n")
         for lang in data.langs:
             lang_code = lang["languageCode"]
+            lang_id = get_language_unqiue_id(lang_code)
             f.write(
                 "  {\n"
-                # NOTE: Cannot specify C99 designator here due to GCC (g++) bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55227
+                f"    .uniqueID = {lang_id},\n"
-                f'    /* .code = */ "{lang_code}",\n'
                 f"    .translation_data = reinterpret_cast<const uint8_t *>(&translation_{lang_code}),\n"
                 f"    .translation_size = sizeof(translation_{lang_code}),\n"
                 f"    .translation_is_compressed = false,\n"
@@ -898,10 +931,10 @@ def write_languages(
         f.write("const LanguageMeta LanguageMetas[] = {\n")
         for lang in data.langs:
             lang_code = lang["languageCode"]
+            lang_id = get_language_unqiue_id(lang_code)
             f.write(
                 "  {\n"
-                # NOTE: Cannot specify C99 designator here due to GCC (g++) bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55227
+                f"    .uniqueID = {lang_id},\n"
-                f'    /* .code = */ "{lang_code}",\n'
                 f"    .translation_data = translation_data_brieflz_{lang_code},\n"
                 f"    .translation_size = sizeof(translation_data_brieflz_{lang_code}),\n"
                 f"    .translation_is_compressed = true,\n"
@@ -937,6 +970,25 @@ def get_translation_common_text(
             f'\t "{convert_string(symbol_conversion_table, c)}",//{c} \n'
         )
     translation_common_text += "};\n\n"
+
+    # accel names
+    translation_common_text += "const char* AccelTypeNames[] = {\n"
+
+    for c in get_accel_names_list():
+        translation_common_text += (
+            f'\t "{convert_string(symbol_conversion_table, c)}",//{c} \n'
+        )
+    translation_common_text += "};\n\n"
+
+    # power source types
+    translation_common_text += "const char* PowerSourceNames[] = {\n"
+
+    for c in get_power_source_list():
+        translation_common_text += (
+            f'\t "{convert_string(symbol_conversion_table, c)}",//{c} \n'
+        )
+    translation_common_text += "};\n\n"
+
     return translation_common_text
 
 

Translations/make_translation_test.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+import json
+import os
 import unittest
 
 
@@ -30,6 +32,23 @@ class TestMakeTranslation(unittest.TestCase):
         self.assertEqual(bytes_to_c_hex(b"\x00"), "0x00,")
         self.assertEqual(bytes_to_c_hex(b"\xF1\xAB"), "0xF1, 0xAB,")
 
+    def test_no_language_id_collisions(self):
+        """
+        Asserting that we have no language collisions and that the has works ok
+        """
+        from make_translation import get_language_unqiue_id
+
+        seen_ids = []
+        for filename in os.listdir("."):
+            if filename.endswith(".json") and filename.startswith("translation_"):
+                with open(filename) as f:
+                    data = json.loads(f.read())
+                    lang_code = data.get("languageCode")
+                    self.assertNotEqual(lang_code, None)
+                    id = get_language_unqiue_id(lang_code)
+                    self.assertFalse(id in seen_ids)
+                    seen_ids.append(id)
+
 
 if __name__ == "__main__":
     unittest.main()

Translations/translation_BG.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "BG",
   "languageLocalName": "Български",
-	"fonts": [
+  "fonts": ["ascii_basic", "cyrillic"],
-		"ascii_basic",
-		"cyrillic"
-	],
   "messages": {
     "SettingsCalibrationDone": "Калибрацията завършена!",
     "SettingsCalibrationWarning": "Уверете се, че върха на поялника е със стайна температура преди да продължите!",
@@ -27,37 +24,27 @@
     "YourGainMessage": "Усилване:"
   },
   "messagesWarn": {
-		"ResetOKMessage": [
+    "ResetOKMessage": "Нулиране",
-			"Нулиране",
+    "SettingsResetMessage": ["Настройките бяха", "нулирани!"],
-			"завършено"
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-		],
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		"SettingsResetMessage": [
-			"Настройките бяха",
-			"нулирани!"
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": " LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "F",
+    "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "F",
-		"SettingStartSolderingChar": "T",
+    "SettingStartNoneChar": "И",
-		"SettingStartSleepChar": "S",
+    "SettingStartSolderingChar": "Р",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepChar": "С",
+    "SettingStartSleepOffChar": "П",
     "SettingStartNoneChar": "F",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
@@ -70,251 +57,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Поялник", "Настройки"],
-				"Поялник",
-				"Настройки"
-			],
       "desc": "Настройки на поялника"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Режими", "Настройки"],
-				"Режими",
-				"Настройки"
-			],
       "desc": "Настройки енергоспестяване"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Интерфейс", "Настройки"],
-				"Интерфейс",
-				"Настройки"
-			],
       "desc": "Настройки на интерфейса"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Разширени", "Настройки"],
-				"Разширени",
-				"Настройки"
-			],
       "desc": "Допълнителни настройки"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Източник", "захранване"],
-				"Източник",
+      "desc": "Източник на захранване. Минимално напрежение. (DC 10V) (S 3,3V за клетка)"
-				"захранване"
-			],
-			"desc": "Източник на захранване. Минимално напрежение. <DC 10V> <S 3.3V за клетка>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Темп.", "сън"],
-				"Темп.",
+      "desc": "Температура при режим \"сън\" (C)"
-				"сън"
-			],
-			"desc": "Температура при режим \"сън\" <C>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Време", "сън"],
-				"Време",
+      "desc": "Включване в режим \"сън\" след: (Минути | Секунди)"
-				"сън"
-			],
-			"desc": "Включване в режим \"сън\" след: <Минути/Секунди>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Време", "изкл."],
-				"Време",
+      "desc": "Изключване след (Минути)"
-				"изкл."
-			],
-			"desc": "Изключване след <Минути>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Усещане", "за движение"],
-				"Усещане",
+      "desc": "Усещане за движение (0=Изключено | 1=Слабо | ... | 9=Силно)"
-				"за движение"
-			],
-			"desc": "Усещане за движение <0.Изключено 1.Слабо 9.Силно>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Единици за", "температура"],
-				"Единици за",
+      "desc": "Единици за температура (C=Целзии | F=Фаренхайт)"
-				"температура"
-			],
-			"desc": "Единици за температура <C=Целзии F=Фаренхайт>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Детайлен", "екран в покой"],
-				"Детайлен",
-				"екран в покой"
-			],
       "desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Ориентация", "на дисплея"],
-				"Ориентация",
+      "desc": "Ориентация на дисплея (R=Дясна Ръка | L=Лява Ръка | A=Автоматично)"
-				"на дисплея"
-			],
-			"desc": "Ориентация на дисплея <A. Автоматично L. Лява Ръка R. Дясна Ръка>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Турбо", "темп."],
-				"Турбо",
-				"темп."
-			],
       "desc": "Температура за \"турбо\" режим"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Автоматичен", "работен режим"],
-				"Автоматичен",
+      "desc": "Режим на поялника при включване на захранването. (И=Изключен | Р=Работен | С=Сън | П=Сън температура помещение)"
-				"работен режим"
-			],
-			"desc": "Режим на поялника при включване на захранването. T=Работен, S=Сън, F=Изключен"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Мигай при", "топъл поялник"],
-				"Мигай при",
-				"топъл поялник"
-			],
       "desc": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Калибриране", "температура?"],
-				"Калибриране",
-				"температура?"
-			],
       "desc": "Калибриране на температурата"
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Фабрични", "настройки?"],
-				"Фабрични",
-				"настройки?"
-			],
       "desc": "Връщане на фабрични настройки"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Калибриране", "напрежение?"],
-				"Калибриране",
-				"напрежение?"
-			],
       "desc": "Калибриране на входното напрежение. Задръжте бутонa за изход"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Детайлен", "работен екран"],
-				"Детайлен",
-				"работен екран"
-			],
       "desc": "Детайлна информация в работен режим при запояване"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Скорост", "на текста"],
-				"Скорост",
-				"на текста"
-			],
       "desc": "Скорост на движение на този текст"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Мощност на", "захранване"],
-				"Мощност на",
-				"захранване"
-			],
       "desc": "Мощност на избраното захранване"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Лимит на", "мощност"],
-				"Лимит на",
+      "desc": "Максимална мощност на поялника (Watt)"
-				"мощност"
-			],
-			"desc": "Максимална мощност на поялника <W>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Размяна", "бутони +-?"],
-				"Размяна",
-				"бутони +-?"
-			],
       "desc": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника"
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Промяна T", "бързо?"],
-				"Промяна T",
-				"бързо?"
-			],
       "desc": "Промяна на температура при бързо натискане на бутон!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Промяна Т", "задържане?"],
-				"Промяна Т",
-				"задържане?"
-			],
       "desc": "Промяна на температура при задържане на бутон!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Захранващ", "импулс"],
-				"Захранващ",
-				"импулс"
-			],
       "desc": "Поддържане на интензивност на захранващия импулс"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
+      "desc": "Time to wait before triggering every keep-awake pulse (x 2,5с)"
-				"wait time"
-			],
-			"desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
+      "desc": "Keep-awake-pulse duration (x 250мс)"
-				"duration"
-			],
-			"desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Език:", " BG   Български"],
-				"Language:",
-				" BG   Български"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_CS.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "CS",
   "languageLocalName": "Český",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Kalibrace dokončena!",
     "SettingsCalibrationWarning": "Ujistěte se, že hrot má pokojovou teplotu!",
@@ -28,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Tov. nas. obnov.", ""],
-			"Tov. nas. obnov.",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			""
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": " LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "P",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "R",
+    "SettingOffChar": "O",
     "SettingSlowChar": "P",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "R",
-		"SettingStartSolderingChar": "T",
+    "SettingStartNoneChar": "O",
+    "SettingStartSolderingChar": "P",
     "SettingStartSleepChar": "S",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepOffChar": "M",
-		"SettingStartNoneChar": "F",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Pájecí", "nastavení"],
-				"Pájecí",
-				"nastavení"
-			],
       "desc": "Nastavení pájení (boost, auto start...)."
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Režim", "spánku"],
-				"Režim",
-				"spánku"
-			],
       "desc": "Nastavení režimu spánku, automatického vypnutí..."
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Uživatelské", "rozhraní"],
-				"Uživatelské",
-				"rozhraní"
-			],
       "desc": "Nastavení uživatelského rozhraní."
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Pokročilé", "volby"],
-				"Pokročilé",
-				"volby"
-			],
       "desc": "Pokročilé volby (detailní obrazovky, kalibrace, tovární nastavení...)."
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Zdroj", "napájení"],
-				"Zdroj",
+      "desc": "Při nižším napětí ukončí pájení (DC=10V | ?S=?x3,3V pro LiPo, LiIon...)."
-				"napájení"
-			],
-			"desc": "Při nižším napětí ukončí pájení <DC=10V, ?S=?x3.3V pro LiPo, LiIon...>."
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Teplota v", "r. spánku"],
-				"Teplota v",
-				"r. spánku"
-			],
       "desc": "Teplota v režimu spánku."
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Čas do", "r. spánku"],
-				"Čas do",
+      "desc": "Čas do režimu spánku (Minut | Sekund)."
-				"r. spánku"
-			],
-			"desc": "Čas do režimu spánku <Minut/Sekund>."
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Čas do", "vypnutí"],
-				"Čas do",
+      "desc": "Čas do automatického vypnutí (Minut)."
-				"vypnutí"
-			],
-			"desc": "Čas do automatického vypnutí <Minut>."
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Citlivost", "det. pohybu"],
-				"Citlivost",
+      "desc": "Citlivost detekce pohybu (0=Vyp | 1=Min | ... | 9=Max)."
-				"det. pohybu"
-			],
-			"desc": "Citlivost detekce pohybu <0=Vyp, 1=Min, ... 9=Max>."
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Jednotky", "teploty"],
-				"Jednotky",
+      "desc": "Jednotky měření teploty (C=Celsius | F=Fahrenheit)."
-				"teploty"
-			],
-			"desc": "Jednotky měření teploty <C=Celsius, F=Fahrenheit>."
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Podrobnosti", "na vých. obr."],
-				"Podrobnosti",
-				"na vých. obr."
-			],
       "desc": "Zobrazit podrobnosti na výchozí obrazovce?"
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Orientace", "obrazovky"],
-				"Orientace",
+      "desc": "Orientace obrazovky (P=Pravák | L=Levák | A=Auto)."
-				"obrazovky"
-			],
-			"desc": "Orientace obrazovky <A=Auto, L=Levák, P=Pravák>."
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Teplota v", "r. boost"],
-				"Teplota v",
-				"r. boost"
-			],
       "desc": "Teplota v režimu boost."
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Automatický", "start"],
-				"Automatický",
+      "desc": "Při startu ihned nahřát hrot? (O=Pryč | P=Pájení | S=Spát | M=Spát teplota místnosti)"
-				"start"
-			],
-			"desc": "Při startu ihned nahřát hrot?"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Blikáni při", "chladnutí"],
-				"Blikáni při",
-				"chladnutí"
-			],
       "desc": "Blikání teploty při chladnutí, dokud je hrot horký?"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Kalibrovat", "teplotu?"],
-				"Kalibrovat",
-				"teplotu?"
-			],
       "desc": "Kalibrace měření teploty."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Tovární", "nastavení?"],
-				"Tovární",
-				"nastavení?"
-			],
       "desc": "Obnovení továrního nastavení."
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Kalibrovat", "vstupní napětí?"],
-				"Kalibrovat",
-				"vstupní napětí?"
-			],
       "desc": "Kalibrace vstupního napětí. Tlačítky uprav, podržením potvrď."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Podrobnosti", "při pájení"],
-				"Podrobnosti",
-				"při pájení"
-			],
       "desc": "Zobrazit podrobnosti při pájení?"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Rychlost", "popisků"],
-				"Rychlost",
+      "desc": "Rychlost posuvu popisků podobných tomuto (P=Pomalu | R=Rychle)"
-				"popisků"
-			],
-			"desc": "Rychlost posuvu popisků podobných tomuto <P=Pomalu, R=Rychle>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Výkon", "ve wattech"],
-				"Výkon",
-				"ve wattech"
-			],
       "desc": "Výkon použítého napájecího adaptéru ve wattech."
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Omezení", "Výkonu"],
-				"Omezení",
+      "desc": "Maximální příkon (Watty)"
-				"Výkonu"
-			],
-			"desc": "Maximální příkon <Watty>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Prohodit", "tl. +-?"],
-				"Prohodit",
-				"tl. +-?"
-			],
       "desc": "Prohodí tlačítka plus a minus pro změnu teploty hrotu."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Krok teploty", "krátký?"],
-				"Krok teploty",
-				"krátký?"
-			],
       "desc": "Velikost skoku při změně teploty krátkým stiskem tlačítka!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Krok teploty", "dlouhý?"],
-				"Krok teploty",
-				"dlouhý?"
-			],
       "desc": "Velikost skoku při změně teploty dlouhým stiskem tlačítka!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Intenzita", "Výkon. pulsu"],
-				"Intenzita",
-				"Výkon. pulsu"
-			],
       "desc": "Puls pro udržení zařízení v chodu (kvůli power bankám)."
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
+      "desc": "Time to wait before triggering every keep-awake pulse (x 2,5s)"
-				"wait time"
-			],
-			"desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Řeč:", " CS       Český"],
-				"Language:",
-				" CS       Český"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_DA.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "DA",
   "languageLocalName": "Dansk",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Calibration done!",
     "SettingsCalibrationWarning": "Sørg for at loddespidsen er ved stuetemperatur, inden du fortsætter!",
@@ -28,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Settings were", "reset!"],
-			"Settings were",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"reset!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": " LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "H",
     "SettingLeftChar": "V",
     "SettingAutoChar": "A",
-		"SettingFastChar": "F",
+    "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "F",
+    "SettingStartNoneChar": "S",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "D",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepOffChar": "R",
-		"SettingStartNoneChar": "S",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Soldering", "Settings"],
-				"Soldering",
-				"Settings"
-			],
       "desc": "Soldering settings"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Sleep", "Modes"],
-				"Sleep",
-				"Modes"
-			],
       "desc": "Power Saving Settings"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["User", "Interface"],
-				"User",
-				"Interface"
-			],
       "desc": "User Interface settings"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Advanced", "Options"],
-				"Advanced",
-				"Options"
-			],
       "desc": "Advanced options"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Power", "source"],
-				"Power",
+      "desc": "Strømforsyning. Indstil Cutoff Spændingen. (DC 10V) (S 3,3V per cell)"
-				"source"
-			],
-			"desc": "Strømforsyning. Indstil Cutoff Spændingen. <DC 10V <S 3.3V per cell"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Sleep", "temp"],
-				"Sleep",
+      "desc": "Dvale Temperatur (C)"
-				"temp"
-			],
-			"desc": "Dvale Temperatur <C>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Sleep", "timeout"],
-				"Sleep",
+      "desc": "Dvale Timeout (Minutter | Sekunder)"
-				"timeout"
-			],
-			"desc": "Dvale Timeout <Minutter/Sekunder"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Shutdown", "timeout"],
-				"Shutdown",
+      "desc": "sluknings Timeout (Minutter)"
-				"timeout"
-			],
-			"desc": "sluknings Timeout <Minutter"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Motion", "sensitivity"],
-				"Motion",
+      "desc": "Bevægelsesfølsomhed (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)"
-				"sensitivity"
-			],
-			"desc": "Bevægelsesfølsomhed <0.Slukket 1.Mindst følsom 9.Mest følsom"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Temperature", "unit"],
-				"Temperature",
+      "desc": "Temperatur Enhed (C=Celsius | F=Fahrenheit)"
-				"unit"
-			],
-			"desc": "Temperatur Enhed <C=Celsius F=Fahrenheit"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Detailed", "idle screen"],
-				"Detailed",
-				"idle screen"
-			],
       "desc": "Vis detialieret information med en mindre skriftstørrelse på standby skærmen."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Display", "orientation"],
-				"Display",
+      "desc": "Skærm Orientering (H=Højre Håndet | V=Venstre Håndet | A=Automatisk)"
-				"orientation"
-			],
-			"desc": "Skærm Orientering <A. Automatisk V. Venstre Håndet H. Højre Håndet"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Boost", "temp"],
-				"Boost",
-				"temp"
-			],
       "desc": "Temperatur i \"boost\" mode"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Auto", "start"],
-				"Auto",
+      "desc": "Start automatisk med lodning når strøm sættes til. (S=Slukket | L=Lodning | D=Dvale tilstand | R=Dvale tilstand rumtemperatur)"
-				"start"
-			],
-			"desc": "Start automatisk med lodning når strøm sættes til. L=Lodning, D= Dvale tilstand,S=Slukket"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Cooldown", "blink"],
-				"Cooldown",
-				"blink"
-			],
       "desc": "Blink temperaturen på skærmen, mens spidsen stadig er varm."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Calibrate", "temperature?"],
-				"Calibrate",
-				"temperature?"
-			],
       "desc": "kalibrere spids temperatur."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Factory", "Reset?"],
-				"Factory",
-				"Reset?"
-			],
       "desc": "Gendan alle indstillinger"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Calibrate", "input voltage?"],
-				"Calibrate",
-				"input voltage?"
-			],
       "desc": "VIN kalibrering. Knapperne justere, Lang tryk for at gå ud"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Detailed", "solder screen"],
-				"Detailed",
-				"solder screen"
-			],
       "desc": "Vis detialieret information mens der loddes"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Scrolling", "speed"],
-				"Scrolling",
-				"speed"
-			],
       "desc": "Speed this text scrolls past at"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Power", "Wattage"],
-				"Power",
-				"Wattage"
-			],
       "desc": "Power Wattage of the power adapter used"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Power", "Limit"],
-				"Power",
+      "desc": "Maximum power the iron can use (Watts)"
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Key +-", "reverse?"],
-				"Key +-",
-				"reverse?"
-			],
       "desc": "Reverse the tip temperature change buttons plus minus assignment."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp change", "short?"],
-				"Temp change",
-				"short?"
-			],
       "desc": "Temperature change steps on short button press!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp change", "long?"],
-				"Temp change",
-				"long?"
-			],
       "desc": "Temperature change steps on long button press!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "Pulse W"],
-				"Power",
-				"Pulse W"
-			],
       "desc": "Keep awake pulse power intensity"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
+      "desc": "Time to wait before triggering every keep-awake pulse (x 2,5s)"
-				"wait time"
-			],
-			"desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Sprog :", " DA       Dansk"],
-				"Language:",
-				" DA       Dansk"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_DE.json

@@ -1,62 +1,45 @@
 {
   "languageCode": "DE",
   "languageLocalName": "Deutsch",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "tempUnitFahrenheit": false,
   "messages": {
-		"SettingsCalibrationDone": "Kalibrierung abgeschlossen!",
     "SettingsCalibrationWarning": "Vor dem Fortfahren muss die Lötspitze vollständig abgekühlt sein!",
     "SettingsResetWarning": "Sicher, dass alle Werte zurückgesetzt werden sollen?",
     "UVLOWarningString": "V niedr.",
     "UndervoltageString": "Unterspannung",
     "InputVoltageString": "V Eingang: ",
-		"WarningTipTempString": "Temperatur: ",
-		"BadTipString": "Spitze Defekt",
     "SleepingSimpleString": "Zzzz",
     "SleepingAdvancedString": "Ruhemodus...",
-		"WarningSimpleString": "HEISS!",
-		"WarningAdvancedString": "! Achtung Heiß !",
     "SleepingTipAdvancedString": "Temp:",
     "IdleTipString": "Ist:",
     "IdleSetString": " Soll:",
     "TipDisconnectedString": "Spitze fehlt",
     "SolderingAdvancedPowerPrompt": "Leistung: ",
-		"OffString": "Aus",
+    "OffString": "Aus"
-		"YourGainMessage": "Dein Faktor:"
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Einstellungen", "zurückgesetzt!"],
-			"Einstellungen",
+    "NoAccelerometerMessage": ["Bewegungssensor", "nicht erkannt!"],
-			"zurückgesetzt!"
+    "NoPowerDeliveryMessage": ["USB-PD IC", "nicht erkannt!"],
-		],
-		"NoAccelerometerMessage": [
-			"Bewegungssensor",
-			"nicht erkannt!"
-		],
-		"NoPowerDeliveryMessage": [
-			"USB-PD IC",
-			"nicht erkannt!"
-		],
     "LockingKeysString": "GESPERRT",
     "UnlockingKeysString": "ENTSPERRT",
-		"WarningKeysLockedString": "!GESPERRT!"
+    "WarningKeysLockedString": "!GESPERRT!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "S",
+    "SettingOffChar": "A",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
-		"SettingOffChar": "A",
+    "SettingFastChar": "S",
+    "SettingStartNoneChar": "A",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "R",
     "SettingStartSleepOffChar": "K",
-		"SettingStartNoneChar": "A",
     "SettingSensitivityOff": "A",
     "SettingSensitivityLow": "N",
     "SettingSensitivityMedium": "M",
@@ -68,251 +51,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Energie-", "einstellungen"],
-				"Energie-",
-				"einstellungen"
-			],
       "desc": "Energieeinstellungen"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Löt-", "einstellungen"],
-				"Löt-",
-				"einstellungen"
-			],
       "desc": "Löteinstellungen"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Ruhe-", "modus"],
-				"Ruhe-",
-				"modus"
-			],
       "desc": "Energiespareinstellungen"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Anzeige-", "einstellungen"],
-				"Anzeige-",
-				"einstellungen"
-			],
       "desc": "Menüeinstellungen"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Erweiterte", "Einstellungen"],
-				"Erweiterte",
-				"Optionen"
-			],
       "desc": "Erweiterte Einstellungen"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Spannungs-", "quelle"],
-				"Spannungs-",
+      "desc": "Spannungsquelle (Abschaltspannung) (DC=10V | nS=n*3.3V für n LiIon-Zellen)"
-				"quelle"
-			],
-			"desc": "Spannungsquelle (Abschaltspannung) <DC=10V, nS=n*3.3V für n LiIon-Zellen>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Ruhe-", "temperatur"],
-				"Ruhe-",
-				"temperatur"
-			],
       "desc": "Ruhetemperatur der Spitze"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Ruhever-", "zögerung"],
-				"Ruhever-",
+      "desc": "Dauer vor Übergang in den Ruhemodus (S=Sekunden | M=Minuten)"
-				"zögerung"
-			],
-			"desc": "Dauer vor Übergang in den Ruhemodus <S=Sekunden | M=Minuten>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Abschalt-", "verzög."],
-				"Abschalt-",
+      "desc": "Dauer vor automatischer Abschaltung (M=Minuten)"
-				"verzög."
-			],
-			"desc": "Dauer vor automatischer Abschaltung <M=Minuten>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Bewegungs-", "empfindlichk."],
-				"Bewegungs-",
-				"empfindlichk."
-			],
       "desc": "0=aus | 1=minimal | ... | 9=maximal"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Temperatur-", "einheit"],
-				"Temperatur-",
-				"einheit"
-			],
       "desc": "C=Celsius | F=Fahrenheit"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Detaillierte", "Ruheansicht"],
-				"Detaillierte",
-				"Ruheansicht"
-			],
       "desc": "Detaillierte Anzeige im Ruhemodus"
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Anzeige-", "ausrichtung"],
-				"Anzeige-",
+      "desc": "R=rechtshändig | L=linkshändig | A=automatisch"
-				"ausrichtung"
-			],
-			"desc": "A=automatisch | L=linkshändig | R=rechtshändig"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Boost-", "temperatur"],
-				"Boost-",
-				"temperatur"
-			],
       "desc": "Temperatur der Lötspitze im Boostmodus"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Start im", "Lötmodus"],
-				"Start im",
+      "desc": "Heizverhalten beim Einschalten der Spannungsversorgung (A=aus | L=Lötmodus | R=Ruhemodus | K=Ruhemodus mit kalter Spitze)"
-				"Lötmodus"
-			],
-			"desc": "Heizverhalten beim Einschalten der Spannungsversorgung <A=aus | L=Lötmodus | R=Ruhemodus | K=Ruhemodus mit kalter Spitze>"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Abkühl-", "blinken"],
-				"Abkühl-",
-				"blinken"
-			],
       "desc": "Temperaturanzeige blinkt beim Abkühlen, solange Spitze heiß ist"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Temperatur", "kalibrieren?"],
-				"Temperatur",
-				"kalibrieren?"
-			],
       "desc": "Kalibrierung der Lötspitzentemperatur"
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Einstellungen", "zurücksetzen?"],
-				"Einstellungen",
-				"zurücksetzen?"
-			],
       "desc": "Werte auf Werkseinstellungen zurücksetzen"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Eingangsspannung", "kalibrieren?"],
-				"Eingangsspannung",
+      "desc": "Kalibrierung der Eingangsspannung (Langer Tastendruck zum Verlassen)"
-				"kalibrieren?"
-			],
-			"desc": "Kalibrierung der Eingangsspannung <Langer Tastendruck zum Verlassen>"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Detaillierte", "Lötansicht"],
-				"Detaillierte",
-				"Lötansicht"
-			],
       "desc": "Detaillierte Anzeige im Lötmodus"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Scroll-", "geschw."],
-				"Scroll-",
+      "desc": "Scrollgeschwindigkeit der Erläuterungen (L=langsam | S=schnell)"
-				"geschw."
-			],
-			"desc": "Scrollgeschwindigkeit der Erläuterungen <L=langsam | S=schnell>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Spannungs-", "maximum"],
-				"Spannungs-",
+      "desc": "Maximal zulässige Spannung der verwendeten Spannungsversorgung (V=Volt)"
-				"maximum"
+    },
-			],
+    "PDNegTimeout": {
-			"desc": "Maximal zulässige Spannung der verwendeten Spannungsversorgung <V=Volt>"
+      "text2": ["PD", "timeout"],
+      "desc": "PD Abfragedauer in 100ms Schritten (Kompatibilität mit best. QC-Ladegeräten)"
     },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Leistungs-", "maximum"],
-				"Leistungs-",
+      "desc": "Maximal zulässige Leistungsaufnahme des Lötkolbens (W=Watt)"
-				"maximum"
-			],
-			"desc": "Maximale zulässige Leistungsaufnahme des Lötkolbens <W=Watt>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["+- Tasten", "umkehren?"],
-				"+- Tasten",
-				"umkehren?"
-			],
       "desc": "Tastenbelegung zur Temperaturänderung umkehren"
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp-Schritt", "Druck kurz"],
-				"Temp-Schritt",
-				"Druck kurz"
-			],
       "desc": "Schrittweite für Temperaturwechsel bei kurzem Tastendruck"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp-Schritt", "Druck lang"],
-				"Temp-Schritt",
-				"Druck lang"
-			],
       "desc": "Schrittweite für Temperaturwechsel bei langem Tastendruck"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Leistungs-", "impuls"],
-				"Leistungs-",
+      "desc": "Powerbank mit einem Impuls wach halten (Watt)"
-				"impuls"
-			],
-			"desc": "Powerbank mit einem Impuls wach halten <Watt>"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Empfindlichkeit", "der Hall-Sonde"],
-				"Empfindlichkeit",
+      "desc": "Empfindlichkeit der Hall-Sonde beim Erkennen des Ruhemodus (A=aus | N=niedrig | M=mittel | H=hoch)"
-				"der Hall-Sonde"
-			],
-			"desc": "Empfindlichkeit der Hall-Sonde beim Erkennen des Ruhemodus <A=aus | N=niedrig | M=mittel | H=hoch>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Tasten-", "sperre"],
-				"Tasten-",
+      "desc": "Langes drücken beider Tasten im Lötmodus sperrt diese (A=aus | B=nur Boost | V=vollständig)"
-				"sperre"
-			],
-			"desc": "Langes drücken beider Tasten im Lötmodus sperrt diese <A=aus | B=nur Boost | V=vollständig>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimale", "Spannung"],
-				"Minimale",
+      "desc": "Minimal zulässige Spannung pro Zelle (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-				"Spannung"
-			],
-			"desc": "Minimal zulässige Spannung pro Zelle <3S: 3,0V - 3,7V | 4/5/6S: 2,4V - 3,7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "Schleife"],
-				"Anim.",
-				"Schleife"
-			],
       "desc": "Icon-Animationen im Hauptmenü wiederholen"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "Geschw."],
-				"Anim.",
+      "desc": "Geschwindigkeit der Icon-Animationen im Menü (A=aus | L=langsam | M=mittel | S=schnell)"
-				"Geschw."
-			],
-			"desc": "Geschwindigkeit der Icon-Animationen im Menü <A=aus | L=langsam | M=mittel | S=schnell>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Impuls-", "verzögerung"],
-				"Impuls-",
+      "desc": "Dauer vor Abgabe von Wachhalteimpulsen (x 2,5s)"
-				"verzögerung"
-			],
-			"desc": "Dauer vor Abgabe von Wachhalteimpulsen <x 2,5s>"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Impuls-", "dauer"],
-				"Impuls-",
+      "desc": "Dauer des Wachhalteimpulses (x 250ms)"
-				"dauer"
-			],
-			"desc": "Dauer des Wachhalteimpulses <x 0,25s>"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Sprache:", " DE     Deutsch"],
-				"Sprache:",
-				" DE     Deutsch"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Bildschirm-", "kontrast"],
+      "desc": "Verändert die Helligkeit des OLED-Displays"
+    },
+    "ColourInversion": {
+      "text2": ["Farben", "umkehren"],
+      "desc": "Invertiert die Farben des OLED-Displays"
     }
   }
 }

Translations/translation_EN.json

@@ -1,61 +1,45 @@
 {
   "languageCode": "EN",
   "languageLocalName": "English",
-	"fonts": [
+  "fonts": ["ascii_basic"],
-		"ascii_basic"
-	],
   "tempUnitFahrenheit": true,
   "messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+    "SettingsCalibrationWarning": "Please ensure the tip is at room temperature, before proceeding!",
-		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature, before continuing!",
     "SettingsResetWarning": "Sure you want to restore default settings?",
     "UVLOWarningString": "DC LOW",
     "UndervoltageString": "Undervoltage",
     "InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip temp: ",
-		"BadTipString": "BAD TIP",
     "SleepingSimpleString": "Zzzz",
     "SleepingAdvancedString": "Sleeping...",
-		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "!!! HOT TIP !!!",
     "SleepingTipAdvancedString": "Tip:",
     "IdleTipString": "Tip:",
     "IdleSetString": " Set:",
     "TipDisconnectedString": "NO TIP",
     "SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "Off",
+    "OffString": "Off"
-		"YourGainMessage": "Your gain:"
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Some settings", "changed"],
-			"Settings were",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"reset!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "F",
+    "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "F",
+    "SettingStartNoneChar": "O",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "Z",
     "SettingStartSleepOffChar": "R",
-		"SettingStartNoneChar": "O",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -67,251 +51,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Soldering", "settings"],
-				"Soldering",
-				"settings"
-			],
       "desc": "Soldering settings"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Sleep", "mode"],
-				"Sleep",
-				"mode"
-			],
       "desc": "Power saving settings"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["User", "interface"],
-				"User",
-				"interface"
-			],
       "desc": "User interface settings"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Advanced", "settings"],
-				"Advanced",
+      "desc": "Advanced settings"
-				"options"
-			],
-			"desc": "Advanced options"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Power", "source"],
-				"Power",
+      "desc": "Power source. Sets cutoff voltage. (DC 10V) (S 3.3V per cell, disable power limit)"
-				"source"
-			],
-			"desc": "Power source. Sets cutoff voltage. <DC 10V> <S 3.3V per cell, disable power limit>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Sleep", "temp"],
-				"Sleep",
-				"temp"
-			],
       "desc": "Tip temperature while in \"sleep mode\""
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Sleep", "timeout"],
-				"Sleep",
+      "desc": "Interval before \"sleep mode\" kicks in (S=seconds | M=minutes)"
-				"timeout"
-			],
-			"desc": "Interval before \"sleep mode\" kicks in <S=seconds | M=minutes>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Shutdown", "timeout"],
-				"Shutdown",
+      "desc": "Interval before the iron shuts down (M=minutes)"
-				"timeout"
-			],
-			"desc": "Interval before the iron shuts down <M=minutes>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Motion", "sensitivity"],
-				"Motion",
-				"sensitivity"
-			],
       "desc": "0=off | 1=least sensitive | ... | 9=most sensitive"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Temperature", "unit"],
-				"Temperature",
-				"unit"
-			],
       "desc": "C=Celsius | F=Fahrenheit"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Detailed", "idle screen"],
-				"Detailed",
-				"idle screen"
-			],
       "desc": "Display detailed information in a smaller font on the idle screen"
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Display", "orientation"],
-				"Display",
+      "desc": "R=right-handed | L=left-handed | A=automatic"
-				"orientation"
-			],
-			"desc": "A=automatic | L=left-handed | R=right-handed"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Boost", "temp"],
-				"Boost",
-				"temp"
-			],
       "desc": "Temperature used in \"boost mode\""
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Heat", "on power up"],
-				"Auto",
+      "desc": "O=off | S=soldering temp | Z=standby at sleep temp until moved | R=standby without heating until moved"
-				"start"
-			],
-			"desc": "Starts the iron into soldering mode on power up <O=off | S=soldering | Z=sleep | R=sleep at room temperature>"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Cooldown", "blink"],
-				"Cooldown",
+      "desc": "Flash the temperature reading after heating was halted while the tip is still hot"
-				"blink"
-			],
-			"desc": "Flash the temperature after heating was halted, while the tip is still hot"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Calibrate", "temperature?"],
-				"Calibrate",
-				"temperature?"
-			],
       "desc": "Start tip temperature offset calibration"
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Factory", "reset?"],
-				"Factory",
-				"reset?"
-			],
       "desc": "Reset settings to default"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Calibrate", "input voltage?"],
-				"Calibrate",
+      "desc": "Start VIN calibration (long press to exit)"
-				"input voltage?"
-			],
-			"desc": "Start VIN calibration <long press to exit>"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Detailed", "solder screen"],
-				"Detailed",
-				"solder screen"
-			],
       "desc": "Display detailed information in a smaller font on soldering screen"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Scrolling", "speed"],
-				"Scrolling",
+      "desc": "Speed info text scrolls past at (S=slow | F=fast)"
-				"speed"
-			],
-			"desc": "Speed info text scrolls past at <S=slow | F=fast>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["QC", "voltage"],
-				"QC",
+      "desc": "Max QC voltage the iron should negotiate for"
-				"voltage"
+    },
-			],
+    "PDNegTimeout": {
-			"desc": "Desired max QC voltage the iron negotiates for"
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
     },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Power", "limit"],
-				"Power",
+      "desc": "Maximum power the iron can use (W=watt)"
-				"limit"
-			],
-			"desc": "Maximum power the iron can use <W=watt>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Reverse", "+ - keys"],
-				"Reverse",
+      "desc": "Reverse assignment of buttons for temperature adjustment"
-				"+ - keys"
-			],
-			"desc": "Reverse assignment of temperature adjustment buttons"
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp change", "short"],
-				"Temp change",
+      "desc": "Temperature-change-increment on short button press"
-				"short"
-			],
-			"desc": "Temperature change increment on short button press"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp change", "long"],
-				"Temp change",
+      "desc": "Temperature-change-increment on long button press"
-				"long"
-			],
-			"desc": "Temperature change increment on long button press"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "pulse"],
-				"Power",
+      "desc": "Intensity of power of keep-awake-pulse (watt)"
-				"pulse"
-			],
-			"desc": "Intensity of power of keep-awake-pulse <watt>"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall sensor", "sensitivity"],
-				"Hall sensor",
+      "desc": "Sensitivity of the Hall effect sensor to detect sleep (O=off | L=low | M=medium | H=high)"
-				"sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor to detect sleep <O=off | L=low | M=medium | H=high>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow locking", "buttons"],
-				"Allow locking",
+      "desc": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
-				"buttons"
-			],
-			"desc": "When soldering, long press both buttons, to lock them <D=disable | B=\"boost mode\" only | F=full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in main menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
-				"speed"
-			],
-			"desc": "Pace of icon animations in menu <O=off | S=slow | M=medium | F=fast>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "delay"],
-				"Power pulse",
+      "desc": "Delay before keep-awake-pulse is triggered (x 2.5s)"
-				"delay"
-			],
-			"desc": "Delay before keep-awake pulse is triggered (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Language:", " EN     English"],
-				"Language:",
+      "desc": "Current firmware language"
-				" EN     English"
+    },
-			],
+    "Brightness": {
-			"desc": ""
+      "text2": ["Screen", "contrast"],
+      "desc": "Adjust the brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Invert", "screen"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_ES.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "ES",
   "languageLocalName": "Castellano",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "¡Calibrada!",
     "SettingsCalibrationWarning": "¡Asegúrate que la punta esté a temperatura ambiente antes de empezar!",
@@ -29,34 +26,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Hecho.",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Los ajustes fueron", "¡Reinicio!"],
-			"Los ajustes fueron",
+    "NoAccelerometerMessage": ["Sin acelerómetro", "¡Detectado!"],
-			"¡Reinicio!"
+    "NoPowerDeliveryMessage": ["Sin USB-PD IC", "¡Detectado!"],
-		],
-		"NoAccelerometerMessage": [
-			"Sin acelerómetro",
-			"¡Detectado!"
-		],
-		"NoPowerDeliveryMessage": [
-			"Sin USB-PD IC",
-			"¡Detectado!"
-		],
     "LockingKeysString": " BLOQUEADO",
     "UnlockingKeysString": "DESBLOQUEADO",
-		"WarningKeysLockedString": "¡BLOQUEADO!"
+    "WarningKeysLockedString": "¡BLOQUEADO!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "D",
     "SettingLeftChar": "I",
     "SettingAutoChar": "A",
-		"SettingFastChar": "R",
+    "SettingOffChar": "O",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "R",
+    "SettingStartNoneChar": "N",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "R",
     "SettingStartSleepOffChar": "F",
-		"SettingStartNoneChar": "N",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -68,251 +57,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Potencia", "ajustes"],
-				"Potencia",
-				"ajustes"
-			],
       "desc": "Ajustes de potencia"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Ajustes de", "soldadura"],
-				"Ajustes de",
-				"soldadura"
-			],
       "desc": "Ajustes para soldar."
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Modos de", "reposo"],
-				"Modos de",
-				"reposo"
-			],
       "desc": "Ajustes de ahorro energético."
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Interfaz", "de usuario"],
-				"Interfaz",
-				"de usuario"
-			],
       "desc": "Ajustes de interfaz de usuario."
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Ajustes", "avanzados"],
-				"Ajustes",
-				"avanzados"
-			],
       "desc": "Ajustes avanzados."
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Fuente", "de energía"],
-				"Fuente",
+      "desc": "Elige el tipo de fuente para limitar el voltaje (DC 10V) (S 3,3V por pila, ilimitado)"
-				"de energía"
-			],
-			"desc": "Elige el tipo de fuente para limitar el voltaje <DC 10V> <S 3,3V por pila, ilimitado>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Temperatura", "en reposo"],
-				"Temperatura",
-				"en reposo"
-			],
       "desc": "Temperatura de la punta en reposo."
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Entrar", "en reposo"],
-				"Entrar",
+      "desc": "Tiempo de inactividad para entrar en reposo (min | seg)"
-				"en reposo"
-			],
-			"desc": "Tiempo de inactividad para entrar en reposo <min/seg>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Tiempo de", "apagado"],
-				"Tiempo de",
+      "desc": "Tiempo de inactividad para apagarse (en minutos)"
-				"apagado"
-			],
-			"desc": "Tiempo de inactividad para apagarse <en minutos>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Detección de", "movimiento"],
-				"Detección de",
+      "desc": "Tiempo de reacción al agarrar (0=no | 1=menos sensible | ... | 9=más sensible)"
-				"movimiento"
-			],
-			"desc": "Tiempo de reacción al agarrar <0=no 1=menos sensible 9=más sensible>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Unidad de", "temperatura"],
-				"Unidad de",
+      "desc": "Unidad de temperatura (C=centígrados | F=Fahrenheit)"
-				"temperatura"
-			],
-			"desc": "Unidad de temperatura <C=centígrados F=Fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Info extra en", "modo reposo"],
-				"Info extra en",
-				"modo reposo"
-			],
       "desc": "Muestra información detallada en letra pequeña al reposar."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Orientación", "de pantalla"],
-				"Orientación",
+      "desc": "Orientación de la pantalla (D=diestro | I=zurdo | A=automático)"
-				"de pantalla"
-			],
-			"desc": "Orientación de la pantalla <A=automático I=zurdo D=diestro>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Ajustar la", "temp. extra"],
-				"Ajustar la",
-				"temp. extra"
-			],
       "desc": "Temperatura momentánea que se alcanza al apretar el botón del modo extra."
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Calentar", "al enchufar"],
-				"Calentar",
+      "desc": "Se calienta él solo al arrancar (N=no | S=entrar en modo soldar | R=solo entrar en reposo | F=en reposo pero mantiene la punta fría)"
-				"al enchufar"
-			],
-			"desc": "Se calienta él solo al arrancar <S=entrar en modo soldar R=solo entrar en reposo F=en reposo pero mantiene la punta fría N=no>"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Parpadear", "al enfriar"],
-				"Parpadear",
-				"al enfriar"
-			],
       "desc": "La temperatura en pantalla parpadea mientras la punta siga caliente."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Calibrar temp.", "de la punta"],
-				"Calibrar temp.",
-				"de la punta"
-			],
       "desc": "Calibra la desviación térmica de la punta."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Volver a ajustes", "de fábrica"],
-				"Volver a ajustes",
-				"de fábrica"
-			],
       "desc": "Restablece todos los ajustes a los valores originales."
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Calibrar voltaje", "de entrada"],
-				"Calibrar voltaje",
-				"de entrada"
-			],
       "desc": "Calibra VIN. Ajusta con ambos botones y mantén pulsado para salir."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Info extra", "al soldar"],
-				"Info extra",
-				"al soldar"
-			],
       "desc": "Muestra más datos por pantalla cuando se está soldando."
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Velocidad", "del texto"],
-				"Velocidad",
+      "desc": "Velocidad de desplazamiento del texto (R=rápida | L=lenta)"
-				"del texto"
-			],
-			"desc": "Velocidad de desplazamiento del texto <R=rápida L=lenta>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Potencia de", "entrada"],
-				"Potencia de",
-				"entrada"
-			],
       "desc": "Potencia en vatios del adaptador de corriente utilizado."
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Ajustar la", "potenc. máx."],
-				"Ajustar la",
+      "desc": "Elige el límite de potencia máxima del soldador (en vatios)"
-				"potenc. máx."
-			],
-			"desc": "Elige el límite de potencia máxima del soldador <en vatios>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Invertir", "botones +/-"],
-				"Invertir",
-				"botones +/-"
-			],
       "desc": "Intercambia las funciones de subir y bajar la temperatura de los botones +/- para que funcionen al revés."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Cambio temp.", "puls. cortas"],
-				"Cambio temp.",
-				"puls. cortas"
-			],
       "desc": "Subir y bajar X grados de temperatura con cada pulsación corta de los botones +/-."
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Cambio temp.", "puls. largas"],
-				"Cambio temp.",
-				"puls. largas"
-			],
       "desc": "Subir y bajar X grados de temperatura con cada pulsación larga de los botones +/-."
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Pulsos bat.", "constantes"],
-				"Pulsos bat.",
-				"constantes"
-			],
       "desc": "Aplica unos pulsos necesarios para mantener encendidas ciertas baterías portátiles. En vatios."
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensibilidad"],
-				"Hall Eff",
+      "desc": "Sensibilidad del sensor de efecto Hall en la detección de reposo (O=Off | L=Low | M=Medium | H=High)"
-				"Sensibilidad"
-			],
-			"desc": "Sensibilidad del sensor de efecto Hall en la detección de reposo <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Permitir botones", "bloqueo"],
-				"Permitir botones",
+      "desc": "Al soldar, una pulsación larga en ambos botones los bloquea (D=desactivar | B=sólo potenciar | F=bloqueo total)."
-				"bloqueo"
-			],
-			"desc": "Al soldar, una pulsación larga en ambos botones los bloquea <D=desactivar, B=sólo potenciar, F=bloqueo total>."
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Mínimo", "voltaje"],
-				"Mínimo",
+      "desc": "voltaje mínimo permitido por célula (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-				"voltaje"
-			],
-			"desc": "voltaje mínimo permitido por célula <Voltios> <3S: 3,0V - 3,7V, 4/5/6S: 2,4V - 3,7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "bucle"],
-				"Anim.",
-				"bucle"
-			],
       "desc": "Animaciones de iconos en bucle en el menú raíz"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "velocidad"],
-				"Anim.",
+      "desc": "Velocidad de las animaciones de los iconos en el menú (O=off | L=low | M=medium | H=high)"
-				"velocidad"
-			],
-			"desc": "Velocidad de las animaciones de los iconos en el menú <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Impulso de potencia", "tiempo de espera"],
-				"Impulso de potencia",
-				"tiempo de espera"
-			],
       "desc": "Tiempo de espera antes de disparar cada pulso de mantenimiento de la vigilia (x 2,5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Impulso de potencia", "duración"],
-				"Impulso de potencia",
-				"duración"
-			],
       "desc": "Duración del impulso de mantenimiento de la vigilia (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Language:", " ES  Castellano"],
-				"Language:",
-				" ES  Castellano"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_FI.json

@@ -1,18 +1,20 @@
 {
   "languageCode": "FI",
   "languageLocalName": "Suomi",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
+    "SettingsCalibrationDone": "Kalibrointi tehty!",
     "SettingsCalibrationWarning": "Varmista että kärki on huoneenlämpöinen ennen jatkamista!",
     "SettingsResetWarning": "Haluatko varmasti palauttaa oletusarvot?",
     "UVLOWarningString": "DC ALH.",
     "UndervoltageString": "Alijännite",
     "InputVoltageString": "Jännite: ",
+    "WarningTipTempString": "Kärjet lämpö: ",
+    "BadTipString": "PAHA KÄRJET",
     "SleepingSimpleString": "Zzzz",
     "SleepingAdvancedString": "Lepotila...",
+    "WarningSimpleString": "KUUMA!",
+    "WarningAdvancedString": "!!! KUUMA KÄRJET !!!",
     "SleepingTipAdvancedString": "Kärki:",
     "IdleTipString": "Pää:",
     "IdleSetString": "Aseta:",
@@ -21,38 +23,27 @@
     "OffString": "Off"
   },
   "messagesWarn": {
-		"ResetOKMessage": [
+    "ResetOKMessage": "Palautus",
-			"Palautus",
+    "SettingsResetMessage": ["Asetukset", "palautettu!"],
-			"onnistui"
+    "NoAccelerometerMessage": ["Kiihtyvyysanturi", "puuttuu!"],
-		],
+    "NoPowerDeliveryMessage": ["USB-PD IC", "puuttuu!"],
-		"SettingsResetMessage": [
-			"Asetukset",
-			"palautettu!"
-		],
-		"NoAccelerometerMessage": [
-			"Kiihtyvyysanturi",
-			"puuttuu!"
-		],
-		"NoPowerDeliveryMessage": [
-			"USB-PD IC",
-			"puuttuu!"
-		],
     "LockingKeysString": " LUKITTU",
     "UnlockingKeysString": "AUKI",
-		"WarningKeysLockedString": "!LUKKO!"
+    "WarningKeysLockedString": "!LUKKO!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "O",
     "SettingLeftChar": "V",
     "SettingAutoChar": "A",
-		"SettingFastChar": "N",
+    "SettingOffChar": "P",
     "SettingSlowChar": "H",
     "SettingMediumChar": "M",
-		"SettingOffChar": "P",
+    "SettingFastChar": "N",
-		"SettingStartSolderingChar": "K",
-		"SettingStartSleepChar": "L",
-		"SettingStartSleepOffChar": "N",
     "SettingStartNoneChar": "E",
+    "SettingStartSolderingChar": "J",
+    "SettingStartSleepChar": "L",
+    "SettingStartSleepOffChar": "H",
     "SettingSensitivityOff": "P",
     "SettingSensitivityLow": "A",
     "SettingSensitivityMedium": "K",
@@ -64,251 +55,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Virta-", "asetukset"],
-				"Virta-",
-				"asetukset"
-			],
       "desc": "Virta-asetukset"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Juotos-", "asetukset"],
-				"Juotos-",
-				"asetukset"
-			],
       "desc": "Juotosasetukset"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Lepotilan", "asetukset"],
-				"Lepotilan",
-				"asetukset"
-			],
       "desc": "Virransäästöasetukset"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Käyttö-", "liittymä"],
-				"Käyttö-",
-				"liittymä"
-			],
       "desc": "Käyttöliittymän asetukset"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Lisä-", "asetukset"],
-				"Lisä-",
-				"asetukset"
-			],
       "desc": "Lisäasetukset"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Virtalähde", "DC"],
-				"Virtalähde",
+      "desc": "Virtalähde. Asettaa katkaisujännitteen. (DC 10V) (S 3.3V per kenno, poistaa virtarajoitukset)"
-				"DC"
-			],
-			"desc": "Virtalähde. Asettaa katkaisujännitteen. <DC 10V> <S 3.3V per kenno, poistaa virtarajoitukset>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Lepotilan", "lämpötila"],
-				"Lepotilan",
-				"lämpötila"
-			],
       "desc": "Kärjen lämpötila \"lepotilassa\""
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Lepotilan", "viive"],
-				"Lepotilan",
+      "desc": "\"Lepotilan\" ajastus (S=sekuntia | M=minuuttia)"
-				"viive"
-			],
-			"desc": "\"Lepotilan\" ajastus <S=sekuntia | M=minuuttia>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Sammutus", "viive"],
-				"Sammutus",
+      "desc": "Automaattisen sammutuksen ajastus (M=minuuttia)"
-				"viive"
-			],
-			"desc": "Automaattisen sammutuksen ajastus <M=minuuttia>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Liikkeen", "herkkyys"],
-				"Liikkeen",
-				"herkkyys"
-			],
       "desc": "0=pois päältä | 1=vähäinen herkkyys | ... | 9=suurin herkkyys"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Lämpötilan", "yksikkö"],
-				"Lämpötilan",
+      "desc": "C=celsius, F=fahrenheit"
-				"yksikkö"
-			],
-			"desc": "<C=celsius, F=fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Tiedot", "lepotilassa"],
-				"Tiedot",
-				"lepotilassa"
-			],
       "desc": "Näyttää yksityiskohtaisemmat pienemmällä fontilla tiedot lepotilassa."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Näytön", "kierto"],
-				"Näytön",
+      "desc": "O=oikeakätinen | V=vasenkätinen | A=automaattinen"
-				"kierto"
-			],
-			"desc": "A=automaattinen | V=vasenkätinen | O=oikeakätinen"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Tehostus-", "lämpötila"],
-				"Tehostus-",
-				"lämpötila"
-			],
       "desc": "Tehostustilan lämpötila"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Autom.", "käynnistys"],
-				"Autom.",
+      "desc": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. (E=Ei käytössä | J=juotostila | L=Lepotila | H=Lepotila huoneenlämpö)"
-				"käynnistys"
-			],
-			"desc": "Käynnistää virrat kytkettäessä juotostilan automaattisesti. T=juotostila, S=Lepotila, F=Ei käytössä"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Jäähdytyksen", "vilkutus"],
-				"Jäähdytyksen",
-				"vilkutus"
-			],
       "desc": "Vilkuttaa jäähtyessä juotoskärjen lämpötilaa sen ollessa vielä vaarallisen kuuma"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Kalibroi", "lämpötila?"],
-				"Kalibroi",
-				"lämpötila?"
-			],
       "desc": "Kalibroi kärjen lämpötilaeron"
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Palauta", "tehdasasetukset?"],
-				"Palauta",
-				"tehdasasetukset?"
-			],
       "desc": "Palauta kaikki asetukset oletusarvoihin"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Kalibroi", "tulojännite?"],
-				"Kalibroi",
+      "desc": "Tulojännitten kalibrointi (VIN) (paina pitkään poistuaksesi)"
-				"tulojännite?"
-			],
-			"desc": "Tulojännitten kalibrointi (VIN) <paina pitkään poistuaksesi>"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Tarkempi", "juotosnäyttö"],
-				"Tarkempi",
-				"juotosnäyttö"
-			],
       "desc": "Näyttää yksityiskohtaisemmat tiedot pienellä fontilla juotostilassa"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Selityksien", "nopeus"],
-				"Selityksien",
+      "desc": "Selityksien vieritysnopeus (H=hidas | N=nopea)"
-				"nopeus"
-			],
-			"desc": "Selityksien vieritysnopeus <H=hidas | N=nopea>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["QC", "jännite"],
-				"QC",
-				"jännite"
-			],
       "desc": "Ensisijainen maksimi QC jännite"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Tehon-", "rajoitus"],
-				"Tehon-",
+      "desc": "Suurin sallittu teho (Watti)"
-				"rajoitus"
-			],
-			"desc": "Suurin sallittu teho <Watti>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Suunnanvaihto", "+ - näppäimille"],
-				"Suunnanvaihto",
-				"+ - näppäimille"
-			],
       "desc": "Lämpötilapainikkeiden suunnan vaihtaminen"
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Lämmön muutos", "lyhyt painal."],
-				"Lämmön muutos",
-				"lyhyt painal."
-			],
       "desc": "Lämpötilan muutos lyhyellä painalluksella"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Lämmön muutos", "pitkä painal."],
-				"Lämmön muutos",
-				"pitkä painal."
-			],
       "desc": "Lämpötilan muutos pitkällä painalluksella"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Herätyspulssin", "voimakkuus"],
-				"Herätyspulssin",
+      "desc": "Herätyspulssin voimakkuus (watti)"
-				"voimakkuus"
-			],
-			"desc": "Herätyspulssin voimakkuus <watti>"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall-", "herk."],
-				"Hall-",
+      "desc": "Hall-efektianturin herkkyys lepotilan tunnistuksessa  (P=pois | A=alhainen | K=keskiverto | S=suuri)"
-				"herk."
-			],
-			"desc": "Hall-efektianturin herkkyys lepotilan tunnistuksessa  <P=pois | A=alhainen | K=keskiverto | S=suuri>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Salli nappien", "lukitus"],
-				"Salli nappien",
+      "desc": "Kolvatessa paina molempia näppäimiä lukitaksesi ne (P=pois | V=vain tehostus | K=kaikki)"
-				"lukitus"
-			],
-			"desc": "Kolvatessa paina molempia näppäimiä lukitaksesi ne <P=pois | V=vain tehostus | K=kaikki>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Pienin", "jännite"],
-				"Pienin",
+      "desc": "Pienin sallittu jännite per kenno (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"jännite"
-			],
-			"desc": "Pienin sallittu jännite per kenno <Voltit> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Animaation", "toistaminen"],
-				"Animaation",
-				"toistaminen"
-			],
       "desc": "Toista animaatiot valikossa"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Animaation", "nopeus"],
-				"Animaation",
+      "desc": "Animaatioiden nopeus valikossa (P=pois | A=alhainen | K=keskiverto | S=suuri)"
-				"nopeus"
-			],
-			"desc": "Animaatioiden nopeus valikossa <P=pois | A=alhainen | K=keskiverto | S=suuri>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Pulssin", "odotusaika"],
-				"Pulssin",
-				"odotusaika"
-			],
       "desc": "Odotusaika herätyspulssin lähetykseen (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Pulssin", "kesto"],
-				"Pulssin",
-				"kesto"
-			],
       "desc": "Herätyspulssin kesto (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Kieli:", " FI       Suomi"],
-				"Language:",
-				" FI       Suomi"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_FR.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "FR",
   "languageLocalName": "Français",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Calibration effectuée !",
     "SettingsCalibrationWarning": "Assurez-vous que la panne soit à température ambiante avant de continuer !",
@@ -22,40 +19,32 @@
     "IdleTipString": "Act:",
     "IdleSetString": " Reg:",
     "TipDisconnectedString": "PANNE DÉBRANCHÉE",
-		"SolderingAdvancedPowerPrompt": "Puissance : ",
+    "SolderingAdvancedPowerPrompt": "Puiss.:",
     "OffString": "Off",
     "YourGainMessage": "Gain : "
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Réglages", "réinitialisés !"],
-			"Réglage",
+    "NoAccelerometerMessage": ["Accéléromètre", "non détecté !"],
-			"réinit. !"
+    "NoPowerDeliveryMessage": ["USB-PD", "non détecté !"],
-		],
-		"NoAccelerometerMessage": [
-			"Accéléromètre",
-			"non détecté !"
-		],
-		"NoPowerDeliveryMessage": [
-			"Pas d'USB-PD",
-			"détecté !"
-		],
     "LockingKeysString": "VERROUIL",
     "UnlockingKeysString": "DEVERROU",
-		"WarningKeysLockedString": "! VERR. !"
+    "WarningKeysLockedString": "! VERR. !",
+    "WarningThermalRunaway": ["Emballement", "thermique"]
   },
   "characters": {
     "SettingRightChar": "D",
     "SettingLeftChar": "G",
     "SettingAutoChar": "A",
-		"SettingFastChar": "R",
+    "SettingOffChar": "D",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
-		"SettingOffChar": "D",
+    "SettingFastChar": "R",
+    "SettingStartNoneChar": "D",
     "SettingStartSolderingChar": "A",
     "SettingStartSleepChar": "V",
     "SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "D",
     "SettingSensitivityOff": "D",
     "SettingSensitivityLow": "B",
     "SettingSensitivityMedium": "M",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Paramètres", "d'alim."],
-				"Paramètres",
-				"d'alim."
-			],
       "desc": "Paramètres d'alimentation"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Paramètres", "de soudure"],
-				"Paramètres",
-				"de soudure"
-			],
       "desc": "Paramètres de soudure"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Mode", "veille"],
-				"Mode",
-				"veille"
-			],
       "desc": "Paramètres d'économie d'énergie"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Interface", "utilisateur"],
-				"Interface",
-				"utilisateur"
-			],
       "desc": "Paramètres de l'interface utilisateur"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Options", "avancées"],
-				"Options",
-				"avancées"
-			],
       "desc": "Options avancées"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Source", "d'alim."],
-				"Source",
+      "desc": "Source d'alimentation. Règle la tension de coupure (DC 10V) (S 3.3V par cellules, désactive la limite de puissance)"
-				"d'alim."
-			],
-			"desc": "Source d'alimentation. Règle la tension de coupure <DC=10V> <S=3.3V par cellules>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Temp.", "veille"],
-				"Temp.",
+      "desc": "Température de la panne en \"mode veille\""
-				"veille"
-			],
-			"desc": "Température en veille <C>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Délai", "veille"],
-				"Délai",
+      "desc": "Délai avant mise en veille (S=secondes | M=minutes)"
-				"veille"
-			],
-			"desc": "Délai avant mise en veille <S=secondes | M=minutes>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Délai", "extinction"],
-				"Délai",
+      "desc": "Délai avant extinction (M=minutes)"
-				"extinction"
-			],
-			"desc": "Délai avant extinction <M=minutes>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Sensibilité", "au mouvement"],
-				"Sensibilité",
+      "desc": "0=désactivé | 1=peu sensible | ... | 9=très sensible"
-				"au mouvement"
-			],
-			"desc": "0=inactif | 1=peu sensible | ... | 9=très sensible"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Unité de", "température"],
-				"Unité de",
+      "desc": "C=Celsius | F=Fahrenheit"
-				"température"
-			],
-			"desc": "Unité de température <C=Celsius | F=Fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Écran veille", "détaillé"],
-				"Écran veille",
+      "desc": "Afficher les informations détaillées sur l'écran de veille"
-				"détaillé"
-			],
-			"desc": "Afficher les informations détaillées lors de la veille."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Orientation", "de l'écran"],
-				"Orientation",
+      "desc": "D=droitier | G=gaucher | A=automatique"
-				"de l'écran"
-			],
-			"desc": "Orientation de l'affichage <A=automatique | G=gaucher | D=droitier>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Temp.", "boost"],
-				"Temp.",
+      "desc": "Température utilisée en \"mode boost\""
-				"Boost"
-			],
-			"desc": "Température du mode \"Boost\""
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Chauffer au", "démarrage"],
-				"Démarrage",
+      "desc": "D=désactivé | A=activé | V=mode veille | O=mode veille à température ambiante"
-				"automatique"
-			],
-			"desc": "Démarrer automatiquement la soudure à l'allumage <D=désactivé | A=activé | V=mode veille | O=mode veille à température ambiante>"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Refroidir en", "clignotant"],
-				"Refroidir en",
+      "desc": "Faire clignoter la température lors du refroidissement tant que la panne est chaude"
-				"clignotant"
-			],
-			"desc": "Faire clignoter la température lors du refroidissement tant que la panne est chaude."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Étalonner", "température"],
-				"Étalonner",
+      "desc": "Étalonner température de la panne"
-				"température"
-			],
-			"desc": "Étalonner température de la panne."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Réinitialisation", "d'usine"],
-				"Réinitialisation",
-				"d'usine"
-			],
       "desc": "Réinitialiser tous les réglages"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Étalonner", "tension d'entrée"],
-				"Étalonner",
+      "desc": "Étalonner tension d'entrée (appui long pour quitter)"
-				"tension d'entrée"
-			],
-			"desc": "Étalonner tension d'entrée <appui long pour quitter>"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Écran soudure", "détaillé"],
-				"Écran soudure",
+      "desc": "Afficher les informations détaillées sur l'écran de soudure"
-				"détaillé"
-			],
-			"desc": "Afficher les informations détaillées pendant la soudure"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Vitesse de", "défilement"],
-				"Vitesse de",
+      "desc": "Vitesse de défilement du texte (R=rapide | L=lent)"
-				"défilement"
-			],
-			"desc": "Vitesse de défilement du texte <R=rapide | L=lent>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Tension", "QC"],
-				"Tension",
-				"max. QC"
-			],
       "desc": "Tension maximale désirée avec une alimentation QC"
     },
+    "PDNegTimeout": {
+      "text2": ["Délai", "expiration PD"],
+      "desc": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC (0: désactivé)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Limite de", "puissance"],
-				"Limite de",
+      "desc": "Puissance maximale utilisable (W=watts)"
-				"puissance"
-			],
-			"desc": "Puissance maximale utilisable <W=watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Inverser les", "touches + -"],
-				"Inverser les",
+      "desc": "Inverser les boutons d'ajustement de température"
-				"touches + -"
-			],
-			"desc": "Inverser l'assignation des boutons d'ajustement de température de la panne."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Incrément", "appui court"],
-				"Incrément",
+      "desc": "Incrément de changement de température sur appui court"
-				"appui court"
-			],
-			"desc": "Incrément de changement de température sur appui court."
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Incrément", "appui long"],
-				"Incrément",
+      "desc": "Incrément de changement de température sur appui long"
-				"appui long"
-			],
-			"desc": "Incrément de changement de température sur appui long."
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Puissance des", "impulsions"],
-				"Puissance des",
+      "desc": "Puissance des impulsions pour éviter la mise en veille des batteries (watts)"
-				"impulsions"
-			],
-			"desc": "Puissance des impulsions pour éviter la mise en veille des batteries <watt>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Verrouiller", "les boutons"],
-				"Verrouiller",
+      "desc": "Pendant la soudure, appuyer sur les deux boutons pour les verrouiller (D=désactivé | B=boost seulement | V=verr. total)"
-				"les boutons"
-			],
-			"desc": "Pendant la soudure, appuyer sur les deux boutons pour les verrouiller <D=désactivé | B=boost seulement | V=verr. total>"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Sensibilité", "capteur effet hall"],
-				"Sensibilité",
+      "desc": "Sensibilité du capteur à effet Hall pour la mise en veille (D=désactivé | B=basse | M=moyenne | H=haute)"
-				"capteur effet hall"
-			],
-			"desc": "Sensibilité du capteur à effet Hall lors de la détection de mise en veille <D=désactivé | B=basse | M=moyenne | H=haute>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Tension", "minimale"],
-				"Tension",
+      "desc": "Tension minimale autorisée par cellule (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"minimale"
-			],
-			"desc": "Tension minimale autorisée par cellule <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Rejouer", "anim. icônes"],
-				"Rejouer",
-				"anim. icônes"
-			],
       "desc": "Rejouer en boucle les animations des icônes dans le menu principal"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Vitesse", "anim. icônes"],
-				"Vitesse",
+      "desc": "Vitesse des animations des icônes dans le menu (D=désactivé | L=lente | M=moyenne | R=rapide)"
-				"anim. icônes"
-			],
-			"desc": "Vitesse des animations des icônes dans le menu <D=désactivé | L=lente | M=moyenne | R=rapide>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Délai entre", "les impulsions"],
-				"Délai entre",
+      "desc": "Délai entre chaque impulsion pour empêcher la mise en veille (x 2.5s)"
-				"les impulsions"
-			],
-			"desc": "Délai entre chaque impulsions pour empêcher la mise en veille (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Durée des", "impulsions"],
-				"Durée des",
-				"impulsions"
-			],
       "desc": "Durée des impulsions pour empêcher la mise en veille (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Langue :", " FR    Français"],
-				"Langue :",
-				" FR    Français"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Luminosité", "de l'écran"],
+      "desc": "Ajuster le contraste/luminosité de l'écran OLED"
+    },
+    "ColourInversion": {
+      "text2": ["Inverser", "les couleurs"],
+      "desc": "Inverser les couleurs de l'écran OLED"
     }
   }
 }

Translations/translation_HR.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "HR",
   "languageLocalName": "Hrvatski",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Kalibracija gotova!",
     "SettingsCalibrationWarning": "Provjerite da je vršak ohlađen na sobnu temperaturu prije nego što nastavite!",
@@ -28,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Settings were", "reset!"],
-			"Settings were",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"reset!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": " LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "D",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "B",
+    "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "B",
-		"SettingStartSolderingChar": "T",
+    "SettingStartNoneChar": "I",
-		"SettingStartSleepChar": "S",
+    "SettingStartSolderingChar": "L",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepChar": "R",
-		"SettingStartNoneChar": "F",
+    "SettingStartSleepOffChar": "S",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Postavke", "lemljenja"],
-				"Postavke",
-				"lemljenja"
-			],
       "desc": "Postavke pri lemljenju"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Ušteda", "energije"],
-				"Ušteda",
-				"energije"
-			],
       "desc": "Postavke spavanja i štednje energije"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Korisničko", "sučelje"],
-				"Korisničko",
-				"sučelje"
-			],
       "desc": "Postavke korisničkog sučelja"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Napredne", "opcije"],
-				"Napredne",
-				"opcije"
-			],
       "desc": "Upravljanje naprednim opcijama"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Izvor", "napajanja"],
-				"Izvor",
+      "desc": "Izvor napajanja. Postavlja napon isključivanja. (DC 10V) (S 3.3V po ćeliji)"
-				"napajanja"
-			],
-			"desc": "Izvor napajanja. Postavlja napon isključivanja. <DC 10V> <S 3.3V po ćeliji>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Temp", "spavanja"],
-				"Temp",
+      "desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. (C | F)"
-				"spavanja"
-			],
-			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Vrijeme", "spavanja"],
-				"Vrijeme",
+      "desc": "Vrijeme mirovanja nakon kojega lemilica spušta temperaturu. (Minute | Sekunde)"
-				"spavanja"
-			],
-			"desc": "Vrijeme mirovanja nakon kojega lemilica spušta temperaturu. <Minute/Sekunde>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Vrijeme", "gašenja"],
-				"Vrijeme",
+      "desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti. (Minute)"
-				"gašenja"
-			],
-			"desc": "Vrijeme mirovanja nakon kojega će se lemilica ugasiti. <Minute>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Osjetljivost", "pokreta"],
-				"Osjetljivost",
+      "desc": "Osjetljivost prepoznavanja pokreta. (0=Ugašeno | 1=Najmanje osjetljivo | ... | 9=Najosjetljivije)"
-				"pokreta"
-			],
-			"desc": "Osjetljivost prepoznavanja pokreta. <0=Ugašeno, 1=Najmanje osjetljivo, 9=Najosjetljivije>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Jedinica", "temperature"],
-				"Jedinica",
+      "desc": "Jedinica temperature. (C=Celzij | F=Fahrenheit)"
-				"temperature"
-			],
-			"desc": "Jedinica temperature. <C=Celzij, F=Fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Detalji", "pri čekanju"],
-				"Detalji",
-				"pri čekanju"
-			],
       "desc": "Prikazivanje detaljnih informacija tijekom čekanja."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Rotacija", "ekrana"],
-				"Rotacija",
+      "desc": "Orijentacija ekrana. (D=Desnoruki | L=Ljevoruki | A=Automatski)"
-				"ekrana"
-			],
-			"desc": "Orijentacija ekrana. <A=Automatski, L=Ljevoruki, D=Desnoruki>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Boost", "temp"],
-				"Boost",
-				"temp"
-			],
       "desc": "Temperatura u pojačanom (Boost) načinu."
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Auto", "start"],
-				"Auto",
+      "desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati. (I=isključeno | L=lemljenje | R=rezervni | S=rezervni sobna temperatura)"
-				"start"
-			],
-			"desc": "Ako je aktivno, lemilica po uključivanju napajanja odmah počinje grijati."
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Upozorenje", "pri hlađenju"],
-				"Upozorenje",
-				"pri hlađenju"
-			],
       "desc": "Bljeskanje temperature prilikom hlađenja, ako je lemilica vruća."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Kalibracija", "temperature"],
-				"Kalibracija",
-				"temperature"
-			],
       "desc": "Kalibriranje temperature mjeri razliku temperatura vrška i drške, dok je lemilica hladna."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Tvorničke", "postavke"],
-				"Tvorničke",
-				"postavke"
-			],
       "desc": "Vraćanje svih postavki na tvorničke vrijednosti."
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Kalibracija", "napona napajanja"],
-				"Kalibracija",
-				"napona napajanja"
-			],
       "desc": "Kalibracija ulaznog napona. Podešavanje gumbima, dugački pritisak za kraj."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Detalji", "pri lemljenju"],
-				"Detalji",
-				"pri lemljenju"
-			],
       "desc": "Prikazivanje detaljnih informacija tijekom lemljenja."
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Brzina", "poruka"],
-				"Brzina",
+      "desc": "Brzina kretanja dugačkih poruka. (B=brzo | S=sporo)"
-				"poruka"
-			],
-			"desc": "Brzina kretanja dugačkih poruka. <B=brzo, S=sporo>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Snaga", "napajanja"],
-				"Snaga",
-				"napajanja"
-			],
       "desc": "Snaga modula za napajanje"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Power", "Limit"],
-				"Power",
+      "desc": "Maximum power the iron can use (Watts)"
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Key +-", "reverse?"],
-				"Key +-",
-				"reverse?"
-			],
       "desc": "Reverse the tip temperature change buttons plus minus assignment."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp change", "short?"],
-				"Temp change",
-				"short?"
-			],
       "desc": "Temperature change steps on short button press!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp change", "long?"],
-				"Temp change",
-				"long?"
-			],
       "desc": "Temperature change steps on long button press!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "Pulse W"],
-				"Power",
-				"Pulse W"
-			],
       "desc": "Keep awake pulse power intensity"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V, 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
-				"wait time"
-			],
       "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Jezik:", " HR    Hrvatski"],
-				"Language:",
-				" HR    Hrvatski"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_HU.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "HU",
   "languageLocalName": "Magyar",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Kalibráció befejezve!",
     "SettingsCalibrationWarning": "Folytatás előtt győződjön meg róla, hogy a páka szobahőmérsékletű!",
@@ -27,38 +24,27 @@
     "YourGainMessage": "Erősítés:"
   },
   "messagesWarn": {
-		"ResetOKMessage": [
+    "ResetOKMessage": ["Törlés OK", ""],
-			"Törlés OK",
+    "SettingsResetMessage": ["Beállítások", "törölve!"],
-			""
+    "NoAccelerometerMessage": ["Nincs", "gyorsulásmérő!"],
-		],
+    "NoPowerDeliveryMessage": ["Nincs USB-PD IC!", ""],
-		"SettingsResetMessage": [
-			"Beállítások",
-			"törölve!"
-		],
-		"NoAccelerometerMessage": [
-			"Nincs",
-			"gyorsulásmérő!"
-		],
-		"NoPowerDeliveryMessage": [
-			"Nincs USB-PD IC!",
-			""
-		],
     "LockingKeysString": "LEZÁRVA",
     "UnlockingKeysString": "FELOLDVA",
-		"WarningKeysLockedString": "!LEZÁRVA!"
+    "WarningKeysLockedString": "!LEZÁRVA!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "J",
     "SettingLeftChar": "B",
     "SettingAutoChar": "A",
-		"SettingFastChar": "G",
+    "SettingOffChar": "0",
     "SettingSlowChar": "L",
     "SettingMediumChar": "K",
-		"SettingOffChar": "0",
+    "SettingFastChar": "G",
-		"SettingStartSolderingChar": "F",
-		"SettingStartSleepChar": "Z",
-		"SettingStartSleepOffChar": "S",
     "SettingStartNoneChar": "K",
+    "SettingStartSolderingChar": "F",
+    "SettingStartSleepChar": "A",
+    "SettingStartSleepOffChar": "S",
     "SettingSensitivityOff": "0",
     "SettingSensitivityLow": "A",
     "SettingSensitivityMedium": "K",
@@ -70,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Táp", "beállítások"],
-				"Táp",
-				"beállítások"
-			],
       "desc": "Táp beállítások"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Forrasztási", "beállítások"],
-				"Forrasztási",
-				"beállítások"
-			],
       "desc": "Forrasztási beállítások"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Alvási", "módok"],
-				"Alvási",
-				"módok"
-			],
       "desc": "Energiatakarékossági beállítások"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Felhasználói", "felület"],
-				"Felhasználói",
-				"felület"
-			],
       "desc": "Felhasználói felület beállításai"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Haladó", "beállítások"],
-				"Haladó",
-				"beállítások"
-			],
       "desc": "Haladó beállítások"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Áram", "forrás"],
-				"Áram",
+      "desc": "Kikapcsolási feszültség beállítása (DC:10V | S:3.3V/LiPo cella)"
-				"forrás"
-			],
-			"desc": "Kikapcsolási feszültség beállítása (DC:10V, S:3.3V/LiPo cella)"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Alvási", "hőmérséklet"],
-				"Alvási",
+      "desc": "Hőmérséklet alvó módban (C | F)"
-				"hőmérséklet"
-			],
-			"desc": "Hőmérséklet alvó módban <C/F>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Alvás", "időzítő"],
-				"Alvás",
+      "desc": "Alvási időzítő (perc | másodperc)"
-				"időzítő"
-			],
-			"desc": "Alvási időzítő <perc/másodperc>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Kikapcsolás", "időzítő"],
-				"Kikapcsolás",
+      "desc": "Kikapcsolási időzítő (perc)"
-				"időzítő"
-			],
-			"desc": "Kikapcsolási időzítő <perc>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Mozgás", "érzékenység"],
-				"Mozgás",
+      "desc": "Mozgás érzékenység beállítása (0=kikapcsolva | 1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
-				"érzékenység"
-			],
-			"desc": "Mozgás érzékenység beállítása (0=kikapcsolva 1=legkevésbé érzékeny 9=legérzékenyebb)"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Hőmérséklet", "mértékegysége"],
-				"Hőmérséklet",
+      "desc": "Hőmérséklet mértékegysége (C=Celsius | F=Fahrenheit)"
-				"mértékegysége"
-			],
-			"desc": "Hőmérséklet mértékegysége (C=Celsius F=Fahrenheit)"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Részletes", "készenlét"],
-				"Részletes",
-				"készenlét"
-			],
       "desc": "Részletes információk megjelenítése kisebb betűméretben a készenléti képernyőn"
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Kijelző", "tájolása"],
-				"Kijelző",
+      "desc": "Kijelző tájolása (J=jobbkezes | B=balkezes | A=automatikus)"
-				"tájolása"
-			],
-			"desc": "Kijelző tájolása (A=automatikus B=balkezes J=jobbkezes)"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Boost", "hőmérséklet"],
-				"Boost",
-				"hőmérséklet"
-			],
       "desc": "Hőmérséklet \"boost\" módban"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Automatikus", "indítás"],
-				"Automatikus",
+      "desc": "Bekapcsolás után automatikusan lépjen forrasztás módba (K=ki | F=forrasztás | A=alvó mód | S=szobahőmérséklet)"
-				"indítás"
-			],
-			"desc": "Bekapcsolás után automatikusan lépjen forrasztás módba (F=forrasztás S=szobahőmérséklet Z=alvó mód K=ki)"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Villogás", "hűléskor"],
-				"Villogás",
-				"hűléskor"
-			],
       "desc": "Villogjon a hőmérséklet hűlés közben, amíg a páka forró"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Hőmérséklet", "kalibrálása?"],
-				"Hőmérséklet",
-				"kalibrálása?"
-			],
       "desc": "Páka hőmérséklet-érzékelőjének kalibrálása"
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Gyári", "beállítások?"],
-				"Gyári",
-				"beállítások?"
-			],
       "desc": "Beállítások alaphelyzetbe állítása"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Bemeneti fesz.", "kalibrálása?"],
-				"Bemeneti fesz.",
-				"kalibrálása?"
-			],
       "desc": "Bemeneti feszültség kalibrálása (röviden megnyomva módosítás, hosszan megnyomva kilépés)"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Részletes", "forrasztás"],
-				"Részletes",
-				"forrasztás"
-			],
       "desc": "Részletes információk megjelenítése forrasztás közben"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Görgetés", "sebessége"],
-				"Görgetés",
-				"sebessége"
-			],
       "desc": "Szöveggörgetés sebessége"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Max. USB", "feszültség"],
-				"Max. USB",
-				"feszültség"
-			],
       "desc": "Maximális USB feszültség (QuickCharge)"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "időtúllépés"],
+      "desc": "PD egyeztetési leidőzítés 100ms lépésekben megadva néhány QC töltővel való kompatibilitás érdekében (0: kikapcsolva)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Teljesítmény", "maximum"],
-				"Teljesítmény",
-				"maximum"
-			],
       "desc": "Maximális felvett teljesitmény beállitása"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["+/- gomb", "fordítva"],
-				"+/- gomb",
-				"fordítva"
-			],
       "desc": "Páka hőmérséklet növelés/csökkentés gombok felcserélése"
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Hőm. váltás", "rövid"],
-				"Hőm. váltás",
+      "desc": "Hőmérséklet váltás rövid gombnyomásra (C | F)"
-				"rövid"
-			],
-			"desc": "Hőmérséklet váltás rövid gombnyomásra <C/F>"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Hőm. váltás", "hosszú"],
-				"Hőm. váltás",
+      "desc": "Hőmérséklet váltás hosszú gombnyomásra (C | F)"
-				"hosszú"
-			],
-			"desc": "Hőmérséklet váltás hosszú gombnyomásra <C/F>"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Ébr. pulzus", "nagysága"],
-				"Ébr. pulzus",
+      "desc": "Powerbankot ébrentartó áramfelvételi pulzusok nagysága (W)"
-				"nagysága"
-			],
-			"desc": "Powerbankot ébrentartó áramfelvételi pulzusok nagysága <W>"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Alvásérzékelő", "érzékenység"],
-				"Alvásérzékelő",
+      "desc": "Alvásérzékelő gyorsulásmérő érzékenysége (0=ki | A=alacsony | K=közepes | M=magas)"
-				"érzékenység"
-			],
-			"desc": "Alvásérzékelő gyorsulásmérő érzékenysége (0=ki A=alacsony K=közepes M=magas)"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Lezárás", "engedélyezés"],
-				"Lezárás",
+      "desc": "Forrasztás közben mindkét gombot hosszan lenyomva rögzíti a hőmérsékletet (K=ki | B=csak \"boost\" mód | T=teljes lezárás)"
-				"engedélyezés"
-			],
-			"desc": "Forrasztás közben mindkét gombot hosszan lenyomva rögzíti a hőmérsékletet (K=ki B=csak \"boost\" mód T=teljes lezárás)"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "feszültség"],
-				"Minimum",
+      "desc": "Minimális engedélyezett cellafeszültség (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"feszültség"
-			],
-			"desc": "Minimális engedélyezett cellafeszültség <V> (3S: 3.0V-3.7V, 4/5/6S: 2.4V-3.7V)"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Folytonos", "animáció"],
-				"Folytonos",
-				"animáció"
-			],
       "desc": "Főmenü ikonjainak folytonos animációja"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Animáció", "sebessége"],
-				"Animáció",
+      "desc": "Menüikonok animációjának sebessége (0=ki | L=lassú | K=közepes | G=gyors)"
-				"sebessége"
-			],
-			"desc": "Menüikonok animációjának sebessége (0=ki L=lassú K=közepes G=gyors)"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Ébr. pulzus", "időköze"],
-				"Ébr. pulzus",
+      "desc": "Powerbankot ébrentartó áramfelvételi pulzusok időköze (x2.5s)"
-				"időköze"
-			],
-			"desc": "Powerbankot ébrentartó áramfelvételi pulzusok időköze <x2.5s>"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Ébr. pulzus", "időtartama"],
-				"Ébr. pulzus",
+      "desc": "Powerbankot ébrentartó áramfelvételi pulzusok időtartama (x250ms)"
-				"időtartama"
-			],
-			"desc": "Powerbankot ébrentartó áramfelvételi pulzusok időtartama <x250ms>"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Nyelv:", " HU      Magyar"],
-				"Language:",
-				" HU      Magyar"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_IT.json

@@ -6,25 +6,19 @@
 		"latin_extended"
 	],
 	"messages": {
-		"SettingsCalibrationDone": "Calibrazione effettuata",
+		"SettingsCalibrationWarning": "Assicurarsi che la punta si trovi a temperatura ambiente prima di continuare!",
-		"SettingsCalibrationWarning": "Assicurati che la punta si trovi a temperatura ambiente prima di continuare!",
 		"SettingsResetWarning": "Ripristinare le impostazioni iniziali?",
 		"UVLOWarningString": "DC BASSA",
 		"UndervoltageString": "DC INSUFFICIENTE",
-		"InputVoltageString": "V ingresso:",
+		"InputVoltageString": "V in:",
-		"WarningTipTempString": "Temp punta:",
-		"BadTipString": "PUNTA KO",
 		"SleepingSimpleString": "Zzz ",
 		"SleepingAdvancedString": "Riposo",
-		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "PUNTA CALDA!",
 		"SleepingTipAdvancedString": "Punta:",
 		"IdleTipString": "T punta:",
 		"IdleSetString": "/",
 		"TipDisconnectedString": "PUNTA ASSENTE",
 		"SolderingAdvancedPowerPrompt": "Potenz:",
-		"OffString": "OFF",
+		"OffString": "OFF"
-		"YourGainMessage": "Guad.: "
 	},
 	"messagesWarn": {
 		"ResetOKMessage": "Reset OK",
@@ -37,25 +31,29 @@
 			"non rilevato"
 		],
 		"NoPowerDeliveryMessage": [
-			"USB-PD non",
+			"USB PD",
-			"disponibile"
+			"non rilevato"
 		],
 		"LockingKeysString": "Blocc.",
 		"UnlockingKeysString": "Sblocc.",
-		"WarningKeysLockedString": "BLOCCATO"
+		"WarningKeysLockedString": "BLOCCATO",
+		"WarningThermalRunaway": [
+			"Temperatura",
+			"fuori controllo"
+		]
 	},
 	"characters": {
 		"SettingRightChar": "D",
 		"SettingLeftChar": "S",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "V",
+		"SettingOffChar": "O",
 		"SettingSlowChar": "L",
 		"SettingMediumChar": "M",
-		"SettingOffChar": "O",
+		"SettingFastChar": "V",
+		"SettingStartNoneChar": "D",
 		"SettingStartSolderingChar": "S",
 		"SettingStartSleepChar": "R",
 		"SettingStartSleepOffChar": "A",
-		"SettingStartNoneChar": "D",
 		"SettingSensitivityOff": "O",
 		"SettingSensitivityLow": "B",
 		"SettingSensitivityMedium": "M",
@@ -155,9 +153,9 @@
 		"DisplayRotation": {
 			"text2": [
 				"Orientamento",
-				"display"
+				"schermo"
 			],
-			"desc": "Imposta l'orientamento del display [A: automatico; S: mano sinistra; D: mano destra]"
+			"desc": "Imposta l'orientamento dello schermo [D: mano destra; S: mano sinistra; A: automatico]"
 		},
 		"BoostTemperature": {
 			"text2": [
@@ -192,7 +190,7 @@
 				"Ripristino",
 				"impostazioni"
 			],
-			"desc": "Ripristina tutte le impostazioni"
+			"desc": "Ripristina le impostazioni allo stato iniziale"
 		},
 		"VoltageCalibration": {
 			"text2": [
@@ -220,7 +218,14 @@
 				"Voltaggio",
 				"QC"
 			],
-			"desc": "Imposta il massimo voltaggio negoziabile con un alimentatore Quick Charge"
+			"desc": "Imposta il massimo voltaggio negoziabile con un alimentatore Quick Charge [volt]"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"Abilitazione",
+				"USB PD"
+			],
+			"desc": "Regola il massimo tempo utile per la negoziazione del protocollo USB Power Delivery con alimentatori compatibili [0: disattiva; multipli di 100 ms]"
 		},
 		"PowerLimit": {
 			"text2": [
@@ -241,14 +246,14 @@
 				"Temp passo",
 				"breve"
 			],
-			"desc": "Imposta il \"passo\" dei valori di temperatura per una breve pressione dei tasti"
+			"desc": "Imposta il passo dei valori di temperatura per una breve pressione dei tasti"
 		},
 		"TempChangeLongStep": {
 			"text2": [
 				"Temp passo",
 				"lungo"
 			],
-			"desc": "Imposta il \"passo\" dei valori di temperatura per una lunga pressione dei tasti"
+			"desc": "Imposta il passo dei valori di temperatura per una lunga pressione dei tasti"
 		},
 		"PowerPulsePower": {
 			"text2": [
@@ -259,7 +264,7 @@
 		},
 		"HallEffSensitivity": {
 			"text2": [
-				"Effetto",
+				"Sensore",
 				"Hall"
 			],
 			"desc": "Regola la sensibilità alla rilevazione di supporti metallici per entrare in modalità Riposo [O: OFF; B: bassa; M: media; A: alta]"
@@ -311,7 +316,21 @@
 				"Lingua:",
 				" IT Italiano"
 			],
-			"desc": ""
+			"desc": "Imposta la lingua del dispositivo"
+		},
+		"Brightness": {
+			"text2": [
+				"Luminosità",
+				"schermo"
+			],
+			"desc": "Regola la luminosità dello schermo [1: minimo; 10: massimo]"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Inverti",
+				"colori"
+			],
+			"desc": "Inverti i colori dello schermo"
 		}
 	}
 }

Translations/translation_JA_JP.json

@@ -1,64 +1,56 @@
 {
   "languageCode": "JA_JP",
   "languageLocalName": "日本語",
-	"fonts": [
+  "fonts": ["ascii_basic", "cjk"],
-		"ascii_basic",
-		"cjk"
-	],
   "tempUnitFahrenheit": true,
   "messages": {
     "SettingsCalibrationDone": "校正完了",
-		"SettingsCalibrationWarning": "続行する前に、コテが室温になっていることを確認してください",
+    "SettingsCalibrationWarning": "続行する前に、コテ先が室温と同じになっていることを確認してください",
     "SettingsResetWarning": "設定をリセットしますか？",
-		"UVLOWarningString": "電圧が低すぎます",
+    "UVLOWarningString": "DC電圧が低すぎます",
-		"UndervoltageString": "Undervoltage",
+    "UndervoltageString": "電圧不足",
-		"InputVoltageString": "Input V: ",
+    "InputVoltageString": "入力電圧 V: ",
-		"WarningTipTempString": "Tip temp: ",
+    "WarningTipTempString": "コテ先温度: ",
-		"BadTipString": "BAD TIP",
+    "BadTipString": "コテ先エラー",
     "SleepingSimpleString": "Zzzz",
-		"SleepingAdvancedString": "Sleeping...",
+    "SleepingAdvancedString": "スリープ中...",
-		"WarningSimpleString": "HOT!",
+    "WarningSimpleString": "高温注意!",
-		"WarningAdvancedString": "!!! HOT TIP !!!",
+    "WarningAdvancedString": "!!! コテ先高温 !!!",
-		"SleepingTipAdvancedString": "Tip:",
+    "SleepingTipAdvancedString": "コテ先:",
-		"IdleTipString": "Tip:",
+    "IdleTipString": "コテ先:",
-		"IdleSetString": " Set:",
+    "IdleSetString": " 設定:",
-		"TipDisconnectedString": "NO TIP",
+    "TipDisconnectedString": "コテ先が接続されていません",
-		"SolderingAdvancedPowerPrompt": "Power: ",
+    "SolderingAdvancedPowerPrompt": "電源: ",
     "OffString": "オフ",
-		"YourGainMessage": "Your gain:"
+    "YourGainMessage": "ゲイン:"
   },
   "messagesWarn": {
     "ResetOKMessage": "リセットOK",
     "SettingsResetMessage": "初期化されました",
-		"NoAccelerometerMessage": [
+    "NoAccelerometerMessage": "加速度計未検出",
-			"No accelerometer",
+    "NoPowerDeliveryMessage": "PD IC未検出",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "ボタンロック",
     "UnlockingKeysString": "ロックを解除",
-		"WarningKeysLockedString": "!入力ロック中!"
+    "WarningKeysLockedString": "!入力ロック中!",
+    "WarningThermalRunaway": "過熱"
   },
   "characters": {
     "SettingRightChar": "右",
     "SettingLeftChar": "左",
     "SettingAutoChar": "自",
-		"SettingFastChar": "早",
+    "SettingOffChar": "×",
     "SettingSlowChar": "遅",
     "SettingMediumChar": "中",
-		"SettingOffChar": "X",
+    "SettingFastChar": "速",
+    "SettingStartNoneChar": "×",
     "SettingStartSolderingChar": "熱",
     "SettingStartSleepChar": "待",
     "SettingStartSleepOffChar": "室",
-		"SettingStartNoneChar": "X",
+    "SettingSensitivityOff": "×",
-		"SettingSensitivityOff": "X",
     "SettingSensitivityLow": "低",
     "SettingSensitivityMedium": "中",
     "SettingSensitivityHigh": "高",
-		"SettingLockDisableChar": "X",
+    "SettingLockDisableChar": "×",
     "SettingLockBoostChar": "ブ",
     "SettingLockFullChar": "全",
     "SettingNAChar": "非適用"
@@ -70,7 +62,7 @@
     },
     "SolderingMenu": {
       "text2": "半田付け設定",
-			"desc": "はんだ付け設定"
+      "desc": "半田付け設定"
     },
     "PowerSavingMenu": {
       "text2": "待機設定",
@@ -87,8 +79,8 @@
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": "電源",
+      "text2": "下限電圧",
-			"desc": "電源設定。下限電圧を指定します。 <DC=10V> <S=セルあたり3.3V、電力制限は無効化されます>"
+      "desc": "下限電圧を指定する <DC=10V | S=セルあたり3.3V、電力制限を無効化>"
     },
     "SleepTemperature": {
       "text2": "待機温度",
@@ -100,7 +92,7 @@
     },
     "ShutdownTimeout": {
       "text2": "自動オフ",
-			"desc": "自動電源オフするまでの待機時間 <M=分>"
+      "desc": "自動電源オフまでの待機時間 <M=分>"
     },
     "MotionSensitivity": {
       "text2": "動きの感度",
@@ -108,79 +100,83 @@
     },
     "TemperatureUnit": {
       "text2": "温度単位",
-			"desc": "C=摂氏度 | F=華氏度"
+      "desc": "C=摂氏 | F=華氏"
     },
     "AdvancedIdle": {
       "text2": "詳細な待受画面",
-			"desc": "待ち受け画面に小さな英語のテキストで詳細情報を表示する"
+      "desc": "待ち受け画面に詳細情報を表示する"
     },
     "DisplayRotation": {
       "text2": "画面の向き",
-			"desc": "自=自動 | 左=左利き | 右=右利き"
+      "desc": "右=右利き | 左=左利き | 自=自動"
     },
     "BoostTemperature": {
       "text2": "ブースト温度",
       "desc": "ブーストモードで使用される温度"
     },
     "AutoStart": {
-			"text2": "自動起動",
+      "text2": "自動加熱",
-			"desc": "電源投入時に自動的に起動します <X=オフ | 熱=はんだ加熱モード | 待=スタンバイモード | 室=室温スタンバイモード>"
+      "desc": "電源投入時に自動的に加熱する <×=オフ | 熱=半田付けモード | 待=スタンバイモード | 室=室温スタンバイモード>"
     },
     "CooldownBlink": {
       "text2": "冷却中に点滅",
-			"desc": "加熱を停止した後、コテ先がまだ熱い間は温度テキストを点滅させます"
+      "desc": "加熱の停止後、コテ先が熱い間は温度表示を点滅する"
     },
     "TemperatureCalibration": {
-			"text2": "温度を校正する？",
+      "text2": "温度校正",
-			"desc": "コテ先の温度の校正を開始します"
+      "desc": "コテ先の温度校正を開始する"
     },
     "SettingsReset": {
-			"text2": "設定をリセット？",
+      "text2": "設定をリセット",
-			"desc": "すべての設定をデフォルトに初期化します"
+      "desc": "すべての設定を初期化する"
     },
     "VoltageCalibration": {
-			"text2": "電圧を校正する？",
+      "text2": "電圧校正",
-			"desc": "入力電圧VINの校正を開始します <長押しして終了します>"
+      "desc": "入力電圧(VIN)の校正を開始する <長押しで終了>"
     },
     "AdvancedSoldering": {
       "text2": "詳細な作業画面",
-			"desc": "はんだ付け画面に小さな英語のテキストで詳細情報を表示する"
+      "desc": "半田付け画面に詳細情報を表示する"
     },
     "ScrollingSpeed": {
       "text2": "スクロール速度",
-			"desc": "説明テキストがスクロールする速度 <遅=遅い | 早=早い>"
+      "desc": "テキストをスクロールする速さ <遅=遅い | 速=速い>"
     },
     "QCMaxVoltage": {
       "text2": "QC電圧",
       "desc": "QC電源使用時に要求する目標電圧"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "一部のQC電源との互換性のため、PDネゴシエーションをタイムアウトする時間 <x100ms（ミリ秒）>"
+    },
     "PowerLimit": {
       "text2": "電力制限",
-			"desc": "はんだ付てが使用できる最大電力を制限する <W=ワット>"
+      "desc": "最大電力を制限する <W=ワット>"
     },
     "ReverseButtonTempChange": {
-			"text2": "キーを交換する",
+      "text2": "キー入れ替え",
-			"desc": "温度設定時に+ボタンと-ボタンの機能を逆にする"
+      "desc": "温度設定時に+ボタンと-ボタンを入れ替える"
     },
     "TempChangeShortStep": {
       "text2": "温度変化 短",
-			"desc": "ボタンを短く押した際の温度変化値"
+      "desc": "ボタンを短く押した時の温度変化値"
     },
     "TempChangeLongStep": {
       "text2": "温度変化 長",
-			"desc": "ボタンを長押しした際の温度変化値"
+      "desc": "ボタンを長押しした時の温度変化値"
     },
     "PowerPulsePower": {
       "text2": "電力パルス",
-			"desc": "電源供給元をオンに保つための電力パルス <ワット>"
+      "desc": "電源をオンに保つための電力パルス <ワット>"
     },
     "HallEffSensitivity": {
       "text2": "磁界感度",
-			"desc": "スタンバイモードに入るのに使用される磁場センサーの感度 <X=オフ | 低=最低感度 | 中=中程度の感度 | 高=最高感度>"
+      "desc": "スタンバイモードに入るのに使用される磁場センサーの感度 <×=オフ | 低=最低感度 | 中=中程度の感度 | 高=最高感度>"
     },
     "LockingMode": {
       "text2": "ボタンロック",
-			"desc": "はんだ付けモードの場合、2つのボタンを長押ししてボタンロックをオンにします <X=オフ | ブ=ブーストのみ許可 | 全=すべてをロック>"
+      "desc": "半田付けモード時に両方のボタンを長押しし、ボタンロックする <×=オフ | ブ=ブーストのみ許可 | 全=すべてをロック>"
     },
     "MinVolCell": {
       "text2": "最低電圧",
@@ -188,23 +184,31 @@
     },
     "AnimLoop": {
       "text2": "動画をループ",
-			"desc": "メニューアイコンをループする"
+      "desc": "メニューアイコンのアニメーションをループする"
     },
     "AnimSpeed": {
       "text2": "動画の速度",
-			"desc": "メニューアイコンのアニメーションの再生速度 <X=アニメーションを再生しない | 遅=低速 | 中=中速 | 早=高速>"
+      "desc": "メニューアイコンのアニメーションの速さ <×=再生しない | 遅=低速 | 中=中速 | 速=高速>"
     },
     "PowerPulseWait": {
       "text2": "パルス間隔",
-			"desc": "電源供給元をオンに保つために使用される、電力パルス間の時間間隔 <x2.5s（秒）>"
+      "desc": "電源をオンに保つための電力パルスの時間間隔 <x2.5s（秒）>"
     },
     "PowerPulseDuration": {
       "text2": "パルス時間長",
-			"desc": "電源供給元をオンに保つために使用される、電力パルスの時間長 <x250ms（ミリ秒）>"
+      "desc": "電源をオンに保つための電力パルスの時間長 <x250ms（ミリ秒）>"
     },
     "LanguageSwitch": {
       "text2": "言語： 日本語",
       "desc": ""
+    },
+    "Brightness": {
+      "text2": "画面輝度",
+      "desc": "画面の明るさ・コントラストを変更する"
+    },
+    "ColourInversion": {
+      "text2": "色反転",
+      "desc": "画面の色を反転する"
     }
   }
 }

Translations/translation_LT.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "LT",
   "languageLocalName": "Lietuvių",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Kalibravimas atliktas!",
     "SettingsCalibrationWarning": "Prieš tęsdami įsitikinkite, kad antgalis yra kambario temperatūros!",
@@ -27,38 +24,27 @@
     "YourGainMessage": "Greitis:"
   },
   "messagesWarn": {
-		"ResetOKMessage": [
+    "ResetOKMessage": "Atstatytas OK",
-			"Atstatytas OK",
+    "SettingsResetMessage": ["Nust. atstatyti!", ""],
-			""
+    "NoAccelerometerMessage": ["Nerastas", "akselerometras!"],
-		],
+    "NoPowerDeliveryMessage": ["Nerastas", "USB-PD IC !"],
-		"SettingsResetMessage": [
-			"Nust. atstatyti!",
-			""
-		],
-		"NoAccelerometerMessage": [
-			"Nerastas",
-			"akselerometras!"
-		],
-		"NoPowerDeliveryMessage": [
-			"Nerastas",
-			"USB-PD IC !"
-		],
     "LockingKeysString": " UŽRAKIN",
     "UnlockingKeysString": "ATRAKIN",
-		"WarningKeysLockedString": "!UŽRAK!"
+    "WarningKeysLockedString": "!UŽRAK!",
+    "WarningThermalRunaway": ["Perkaitimo", "pavojus"]
   },
   "characters": {
     "SettingRightChar": "D",
     "SettingLeftChar": "K",
     "SettingAutoChar": "A",
-		"SettingFastChar": "G",
+    "SettingOffChar": "I",
     "SettingSlowChar": "L",
     "SettingMediumChar": "V",
-		"SettingOffChar": "I",
+    "SettingFastChar": "G",
+    "SettingStartNoneChar": "N",
     "SettingStartSolderingChar": "T",
     "SettingStartSleepChar": "M",
     "SettingStartSleepOffChar": "K",
-		"SettingStartNoneChar": "N",
     "SettingSensitivityOff": "I",
     "SettingSensitivityLow": "Ž",
     "SettingSensitivityMedium": "V",
@@ -70,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Maitinimo", "nustatymai"],
-				"Maitinimo",
-				"nustatymai"
-			],
       "desc": "Su maitinblokiu susiję nustatymai"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Litavimo", "nustatymai"],
-				"Litavimo",
-				"nustatymai"
-			],
       "desc": "Litavimo nustatymai"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Miego", "režimai"],
-				"Miego",
-				"režimai"
-			],
       "desc": "Energijos tausojimo nustatymai"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Naudotojo", "sąsaja"],
-				"Naudotojo",
-				"sąsaja"
-			],
       "desc": "Naudotojo sąsajos nustatymai"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Išplėsti.", "nustatymai"],
-				"Išplėsti.",
-				"nustatymai"
-			],
       "desc": "Išplėstiniai nustatymai"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Maitinimo", "šaltinis"],
-				"Maitinimo",
+      "desc": "Išjungimo įtampa. (DC 10V) (arba celių [S] kiekis [3.3V per celę])"
-				"šaltinis"
-			],
-			"desc": "Išjungimo įtampa. <DC 10V> arba celių (S) kiekis (3.3V per celę)>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Miego", "temperat."],
-				"Miego",
-				"temperat."
-			],
       "desc": "Miego temperatūra"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Miego", "laikas"],
-				"Miego",
+      "desc": "Užmigimo laikas (sekundės | minutės)"
-				"laikas"
-			],
-			"desc": "Užmigimo laikas <sekundės/minutės>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Išjungimo", "laikas"],
-				"Išjungimo",
+      "desc": "Išjungimo laikas (minutės)"
-				"laikas"
-			],
-			"desc": "Išjungimo laikas <minutės>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Judesio", "jautrumas"],
-				"Judesio",
+      "desc": "Judesio jautrumas (0=Išjungta | 1=Mažiausias | ... | 9=Didžiausias)"
-				"jautrumas"
-			],
-			"desc": "Judesio jautrumas <0=Išjungta, 1=Mažiausias, 9=Didžiausias>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Temperatūros", "vienetai"],
-				"Temperatūros",
+      "desc": "Temperatūros vienetai (C=Celsijus | F=Farenheitas)"
-				"vienetai"
-			],
-			"desc": "Temperatūros vienetai <C=Celsijus, F=Farenheitas>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Detalus lau-", "kimo ekranas"],
-				"Detalus lau-",
-				"kimo ekranas"
-			],
       "desc": "Ar rodyti papildomą informaciją mažesniu šriftu laukimo ekrane"
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Ekrano", "orientacija"],
-				"Ekrano",
+      "desc": "Ekrano orientacija (D=Dešiniarankiams | K=Kairiarankiams | A=Automatinė)"
-				"orientacija"
-			],
-			"desc": "Ekrano orientacija <A=Automatinė, K=Kairiarankiams, D=Dešiniarankiams>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Turbo", "temperat."],
-				"Turbo",
-				"temperat."
-			],
       "desc": "Temperatūra turbo režimu"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Automatinis", "paleidimas"],
-				"Automatinis",
+      "desc": "Ar pradėti kaitininti iš karto įjungus lituoklį (N=Ne | T=Taip | M=Miegas | K=Miegoti kambario temperatūroje)"
-				"paleidimas"
-			],
-			"desc": "Ar pradėti kaitininti iš karto įjungus lituoklį <N=Ne, T=Taip, M=Miegas, K=Miegoti kambario temperatūroje>"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Atvėsimo", "mirksėjimas"],
-				"Atvėsimo",
-				"mirksėjimas"
-			],
       "desc": "Ar mirksėti temperatūrą ekrane kol vėstantis antgalis vis dar karštas?"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Kalibruoti", "temperatūrą?"],
-				"Kalibruoti",
-				"temperatūrą?"
-			],
       "desc": "Antgalio temperatūros kalibravimas"
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Atstatyti", "nustatymus?"],
-				"Atstatyti",
-				"nustatymus?"
-			],
       "desc": "Nustato nustatymus į numatytuosius"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Kalibruoti", "įvesties įtampą?"],
-				"Kalibruoti",
-				"įvesties įtampą?"
-			],
       "desc": "Įvesties įtampos kalibravimas. Trumpai paspauskite, norėdami nustatyti, ilgai paspauskite, kad išeitumėte."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Detalus lita-", "vimo ekranas"],
-				"Detalus lita-",
-				"vimo ekranas"
-			],
       "desc": "Ar rodyti išsamią informaciją lituojant"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Aprašymo", "greitis"],
-				"Aprašymo",
-				"greitis"
-			],
       "desc": "Greitis, kuriuo šis tekstas slenka"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["QC mait.", "įtampa"],
-				"QC mait.",
-				"įtampa"
-			],
       "desc": "Maksimali QC maitinimo bloko įtampa"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Galios", "riba"],
-				"Galios",
+      "desc": "Didžiausia galia, kurią gali naudoti lituoklis (Vatai)"
-				"riba"
-			],
-			"desc": "Didžiausia galia, kurią gali naudoti lituoklis <Vatai>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Sukeisti + -", "mygtukus?"],
-				"Sukeisti + -",
-				"mygtukus?"
-			],
       "desc": "Sukeisti + - temperatūros keitimo mygtukus vietomis."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp.keitim.", "trump.spust."],
-				"Temp.keitim.",
-				"trump.spust."
-			],
       "desc": "Temperatūros keitimo žingsnis trumpai spustėlėjus mygtuką!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp.keitim.", "ilgas pasp."],
-				"Temp.keitim.",
-				"ilgas pasp."
-			],
       "desc": "Temperatūros keitimo žingsnis ilgai paspaudus mygtuką!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Galios", "pulso W"],
-				"Galios",
-				"pulso W"
-			],
       "desc": "Periodinis galios pulso intensyvumas maitinblokiui, neleidžiantis jam užmigti."
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Holo", "jutiklis"],
-				"Holo",
+      "desc": "Holo jutiklio jautrumas nustatant miegą (I=Išjungtas | Ž=Žemas | V=Vidutinis | A=Aukštas)"
-				"jutiklis"
-			],
-			"desc": "Holo jutiklio jautrumas nustatant miegą <I=Išjungtas, Ž=Žemas, V=Vidutinis, A=Aukštas>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Mygtukų", "užraktas"],
-				"Mygtukų",
+      "desc": "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)"
-				"užraktas"
-			],
-			"desc": "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>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimalus", "voltažas"],
-				"Minimalus",
+      "desc": "Minimalus voltažas, kuris yra leidžiamas kiekvienam baterijos elementui (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltažas"
-			],
-			"desc": "Minimalus voltažas, kuris yra leidžiamas kiekvienam baterijos elementui <Voltai> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Animacijų", "pakartojimas"],
-				"Animacijų",
-				"pakartojimas"
-			],
       "desc": "Leidžia kartoti animacijas be sustojimo pagrindiniame meniu."
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Animacijų", "greitis"],
-				"Animacijų",
+      "desc": "Paveiksliukų animacijų greitis meniu punktuose (I=Išjungtas | L=Lėtas | V=Vidutinis | G=Greitas)"
-				"greitis"
-			],
-			"desc": "Paveiksliukų animacijų greitis meniu punktuose <I=Išjungtas | L=Lėtas | V=Vidutinis | G=Greitas>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Galios pulso", "dažnumas"],
-				"Galios pulso",
-				"dažnumas"
-			],
       "desc": "Pasikartojantis laiko intervalas (x 2.5s), ties kuriuo kartojamas galios pulsas maitinblokiui, neleidžiantis jam užmigti."
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Galios pulso", "trukmė"],
-				"Galios pulso",
-				"trukmė"
-			],
       "desc": "Galios pulso aktyvioji trukmė (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Kalba:", " LT    Lietuvių"],
-				"Kalba:",
-				" LT    Lietuvių"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Ekrano", "šviesumas"],
+      "desc": "Nustato OLED ekrano kontrastą/šviesumą."
+    },
+    "ColourInversion": {
+      "text2": ["Ekrano", "invertavimas"],
+      "desc": "Invertuoja OLED ekrano spalvas."
     }
   }
 }

Translations/translation_NL.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "NL",
   "languageLocalName": "Nederlands",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Calibratie klaar!",
     "SettingsCalibrationWarning": "Zorg ervoor dat te punt op kamertemperatuur is voor je verder gaat!",
@@ -28,299 +25,189 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Instellingen", "zijn gereset!"],
-			"Instellingen",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"zijn gereset!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
+    "LockingKeysString": " GEBLOKKEERD",
-		"NoAccelerometerMessage": [
+    "UnlockingKeysString": "GEDEBLOKKEERD",
-			"No accelerometer",
+    "WarningKeysLockedString": "!GEBLOKKEERD!",
-			"detected!"
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
-		"LockingKeysString": [
-			" GEBLOKKEERD",
-			""
-		],
-		"UnlockingKeysString": [
-			"GEDEBLOKKEERD",
-			""
-		],
-		"WarningKeysLockedString": [
-			"!GEBLOKKEERD!",
-			""
-		]
   },
   "characters": {
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "F",
+    "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "F",
+    "SettingStartNoneChar": "F",
     "SettingStartSolderingChar": "T",
     "SettingStartSleepChar": "S",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepOffChar": "K",
-		"SettingStartNoneChar": "F",
-		"SettingLockDisableChar": "U",
-		"SettingLockBoostChar": "B",
-		"SettingLockFullChar": "V",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
     "SettingSensitivityHigh": "H",
+    "SettingLockDisableChar": "U",
+    "SettingLockBoostChar": "B",
+    "SettingLockFullChar": "V",
     "SettingNAChar": "N/A"
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Soldeer", "Instellingen"],
-				"Soldeer",
-				"Instellingen"
-			],
       "desc": "Soldeer instellingen"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Slaap", "Modes"],
-				"Slaap",
-				"Modes"
-			],
       "desc": "Stroom besparings instellingen"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Gebruikers-", "interface"],
-				"Gebruikers-",
-				"interface"
-			],
       "desc": "Gebruikers-interface instellingen"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Geavanceerde", "Instellingen"],
-				"Geavanceerde",
-				"Instellingen"
-			],
       "desc": "Geavanceerde Instellingen"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Spannings-", "bron"],
-				"Spannings-",
+      "desc": "Spanningsbron. Stelt drempelspanning in. (DC 10V) (S 3.3V per cel)"
-				"bron"
-			],
-			"desc": "Spanningsbron. Stelt drempelspanning in. <DC 10V> <S 3.3V per cel>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Slaap", "temp"],
-				"Slaap",
-				"temp"
-			],
       "desc": "Temperatuur in slaapstand"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Slaap", "time-out"],
-				"Slaap",
+      "desc": "Slaap time-out (Minuten | Seconden)"
-				"time-out"
-			],
-			"desc": "Slaap time-out <Minuten/Seconden>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Uitschakel", "time-out"],
-				"Uitschakel",
+      "desc": "Automatisch afsluiten time-out (Minuten)"
-				"time-out"
-			],
-			"desc": "Automatisch afsluiten time-out <Minuten>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Bewegings-", "gevoeligheid"],
-				"Bewegings-",
+      "desc": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
-				"gevoeligheid"
-			],
-			"desc": "Bewegingsgevoeligheid <0=uit 1=minst gevoelig 9=meest gevoelig>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Temperatuur", "eenheid"],
-				"Temperatuur",
+      "desc": "Temperatuureenheid (C=Celsius | F=Fahrenheit)"
-				"eenheid"
-			],
-			"desc": "Temperatuureenheid <C=Celsius F=Fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Gedetailleerd", "startscherm"],
-				"Gedetailleerd",
-				"startscherm"
-			],
       "desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het startscherm."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Scherm-", "oriëntatie"],
-				"Scherm-",
+      "desc": "Schermoriëntatie (R=Rechtshandig | L=Linkshandig | A=Automatisch)"
-				"oriëntatie"
-			],
-			"desc": "Schermoriëntatie <A=Automatisch L=Linkshandig R=Rechtshandig>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Boost", "temp"],
-				"Boost",
-				"temp"
-			],
       "desc": "Temperatuur in boostmode"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Auto", "start"],
-				"Auto",
+      "desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. (F=Uit | T=Soldeertemperatuur | S=Slaapstand-temperatuur | K=Slaapstand kamertemperatuur)"
-				"start"
-			],
-			"desc": "Breng de soldeerbout direct op temperatuur bij het opstarten. <T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit>"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Afkoel", "flikker"],
-				"Afkoel",
-				"flikker"
-			],
       "desc": "Temperatuur laten flikkeren in het hoofdmenu als de soldeerpunt aan het afkoelen is."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Calibreer", "temperatuur?"],
-				"Calibreer",
-				"temperatuur?"
-			],
       "desc": "Temperatuursafwijking van de soldeerpunt calibreren."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Instellingen", "resetten?"],
-				"Instellingen",
-				"resetten?"
-			],
       "desc": "Alle instellingen terugzetten."
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Calibreer", "input-voltage?"],
-				"Calibreer",
+      "desc": "VIN Calibreren. (druk lang om te sluiten)."
-				"input-voltage?"
-			],
-			"desc": "VIN Calibreren. <druk lang om te sluiten>."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Gedetailleerd", "soldeerscherm"],
-				"Gedetailleerd",
-				"soldeerscherm"
-			],
       "desc": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm."
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Scroll", "snelheid"],
-				"Scroll",
-				"snelheid"
-			],
       "desc": "Snelheid waarmee de tekst scrolt."
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Power", "Wattage"],
-				"Power",
-				"Wattage"
-			],
       "desc": "Wattage van de gebruikte voeding"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Vermogen", "limiet"],
-				"Vermogen",
+      "desc": "Maximaal vermogen (Watts)"
-				"limiet"
-			],
-			"desc": "Maximaal vermogen <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Draai", "+ - knoppen om"],
-				"Draai",
-				"+ - knoppen om"
-			],
       "desc": "Keer de +- knoppen om de termperatuur van de punt te regelen om."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp veranderen", "kort"],
-				"Temp veranderen",
-				"kort"
-			],
       "desc": "Temperatuur verandering bij kort drukken"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp veranderen", "lang"],
-				"Temp veranderen",
-				"lang"
-			],
       "desc": "Temperatuur verandering bij lang drukken"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Vermogen", "Puls W"],
-				"Vermogen",
-				"Puls W"
-			],
       "desc": "Vermogen van puls om soldeerbout aan te houden"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Blokkeer", "knoppen"],
-				"Blokkeer",
+      "desc": "Tijdens solderen lang op beide knoppen drukken, blokkeert ze. (U=Uit | B=Alleen boost | V=Volledig blokkeren)"
-				"knoppen"
-			],
-			"desc": "Tijdens solderen lang op beide knoppen drukken, blokkeert ze. <U=Uit, B=Alleen boost, V=Volledig blokkeren>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
-				"wait time"
-			],
       "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Spraak :", " NL  Nederlands"],
-				"Language:",
-				" NL  Nederlands"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_NL_BE.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "NL_BE",
   "languageLocalName": "Vlaams",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Gecalibreerd!",
     "SettingsCalibrationWarning": "Zorg vooraf dat de punt op kamertemperatuur is!",
@@ -28,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Settings were", "reset!"],
-			"Settings were",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"reset!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": " LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "S",
+    "SettingOffChar": "O",
     "SettingSlowChar": "T",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "S",
+    "SettingStartNoneChar": "F",
     "SettingStartSolderingChar": "T",
     "SettingStartSleepChar": "S",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepOffChar": "K",
-		"SettingStartNoneChar": "F",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Soldeer", "Instellingen"],
-				"Soldeer",
-				"Instellingen"
-			],
       "desc": "Soldeerinstellingen"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Slaap", "standen"],
-				"Slaap",
-				"standen"
-			],
       "desc": "Batterijspaarstanden"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Gebruikers-", "Interface"],
-				"Gebruikers-",
-				"Interface"
-			],
       "desc": "Gebruikersinterface Instellingen"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Gevorderde", "Instellingen"],
-				"Gevorderde",
-				"Instellingen"
-			],
       "desc": "Gevorderde Instellingen"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Spannings-", "bron"],
-				"Spannings-",
+      "desc": "Spanningsbron. Stelt minimumspanning in. (DC 10V) (S 3.3V per cel)"
-				"bron"
-			],
-			"desc": "Spanningsbron. Stelt minimumspanning in. <DC 10V> <S 3.3V per cel>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Slaap", "temp"],
-				"Slaap",
+      "desc": "Temperatuur in slaapstand (°C)"
-				"temp"
-			],
-			"desc": "Temperatuur in slaapstand <°C>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Slaap", "time-out"],
-				"Slaap",
+      "desc": "Slaapstand time-out (Minuten | Seconden)"
-				"time-out"
-			],
-			"desc": "Slaapstand time-out <Minuten/Seconden>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Uitschakel", "time-out"],
-				"Uitschakel",
+      "desc": "Automatisch afsluiten time-out (Minuten)"
-				"time-out"
-			],
-			"desc": "Automatisch afsluiten time-out <Minuten>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Bewegings-", "gevoeligheid"],
-				"Bewegings-",
+      "desc": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
-				"gevoeligheid"
-			],
-			"desc": "Bewegingsgevoeligheid <0.uit 1.minst gevoelig 9.meest gevoelig>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Temperatuur", "schaal"],
-				"Temperatuur",
+      "desc": "Temperatuurschaal (°C=Celsius | °F=Fahrenheit)"
-				"schaal"
-			],
-			"desc": "Temperatuurschaal <°C=Celsius °F=Fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Gedetailleerd", "slaapscherm"],
-				"Gedetailleerd",
-				"slaapscherm"
-			],
       "desc": "Gedetailleerde informatie in een kleiner lettertype in het slaapscherm."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Scherm-", "oriëntatie"],
-				"Scherm-",
+      "desc": "Schermoriëntatie (R=Rechtshandig | L=Linkshandig | A=Automatisch)"
-				"oriëntatie"
-			],
-			"desc": "Schermoriëntatie <A. Automatisch L. Linkshandig R. Rechtshandig>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Verhogings", "temp"],
-				"Verhogings",
-				"temp"
-			],
       "desc": "Verhogingstemperatuur"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Auto", "start"],
-				"Auto",
+      "desc": "Breng de soldeerbout op temperatuur bij het opstarten. (F=Uit | T=Soldeertemperatuur | S=Slaapstand-temperatuur | K=Slaapstand kamertemperatuur)"
-				"start"
-			],
-			"desc": "Breng de soldeerbout op temperatuur bij het opstarten. T=Soldeertemperatuur, S=Slaapstand-temperatuur, F=Uit"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Afkoel", "knipper"],
-				"Afkoel",
-				"knipper"
-			],
       "desc": "Temperatuur knippert in hoofdmenu tijdens afkoeling."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Calibreer", "temperatuur?"],
-				"Calibreer",
-				"temperatuur?"
-			],
       "desc": "Temperatuur van de punt calibreren."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Instellingen", "resetten?"],
-				"Instellingen",
-				"resetten?"
-			],
       "desc": "Alle instellingen resetten."
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Calibreer", "voedingsspanning?"],
-				"Calibreer",
-				"voedingsspanning?"
-			],
       "desc": "VIN Calibreren. Bevestigen door knoppen lang in te drukken."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Gedetailleerd", "soldeerscherm"],
-				"Gedetailleerd",
-				"soldeerscherm"
-			],
       "desc": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Scrol", "snelheid"],
-				"Scrol",
-				"snelheid"
-			],
       "desc": "Scrolsnelheid van de tekst."
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Vermogen", "Watt"],
-				"Vermogen",
-				"Watt"
-			],
       "desc": "Vermogen van de adapter"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Power", "Limit"],
-				"Power",
+      "desc": "Maximum power the iron can use (Watts)"
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Key +-", "reverse?"],
-				"Key +-",
-				"reverse?"
-			],
       "desc": "Reverse the tip temperature change buttons plus minus assignment."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp change", "short?"],
-				"Temp change",
-				"short?"
-			],
       "desc": "Temperature change steps on short button press!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp change", "long?"],
-				"Temp change",
-				"long?"
-			],
       "desc": "Temperature change steps on long button press!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "Pulse W"],
-				"Power",
-				"Pulse W"
-			],
       "desc": "Keep awake pulse power intensity"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
-				"wait time"
-			],
       "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Spraak:", " NL_BE   Vlaams"],
-				"Language:",
-				" NL_BE   Vlaams"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_NO.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "NO",
   "languageLocalName": "Norsk",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Calibration done!",
     "SettingsCalibrationWarning": "Sørg for at loddespissen har romtemperatur før du fortsetter!",
@@ -28,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Settings were", "reset!"],
-			"Settings were",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"reset!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": " LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "H",
     "SettingLeftChar": "V",
     "SettingAutoChar": "A",
-		"SettingFastChar": "H",
+    "SettingOffChar": "O",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "H",
+    "SettingStartNoneChar": "I",
     "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "D",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepOffChar": "R",
-		"SettingStartNoneChar": "I",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Lodde-", "innst."],
-				"Lodde-",
-				"innst."
-			],
       "desc": "Loddeinnstillinger"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Dvale-", "innst."],
-				"Dvale-",
-				"innst."
-			],
       "desc": "Dvaleinnstillinger"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Bruker-", "grensesn."],
-				"Bruker-",
-				"grensesn."
-			],
       "desc": "Brukergrensesnitt-innstillinger"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Avanserte", "valg"],
-				"Avanserte",
-				"valg"
-			],
       "desc": "Avanserte valg"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Kilde", ""],
-				"Kilde",
+      "desc": "Strømforsyning. Sett nedre spenning for automatisk nedstenging. (DC 10V) (S 3.3V per celle)"
-				""
-			],
-			"desc": "Strømforsyning. Sett nedre spenning for automatisk nedstenging. <DC 10V <S 3.3V per celle"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["DTmp", ""],
-				"DTmp",
+      "desc": "Dvaletemperatur (C)"
-				""
-			],
-			"desc": "Dvaletemperatur <C>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["DTid", ""],
-				"DTid",
+      "desc": "Tid før dvale (Minutter | Sekunder)"
-				""
-			],
-			"desc": "Tid før dvale <Minutter/Sekunder"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["AvTid", ""],
-				"AvTid",
+      "desc": "Tid før automatisk nedstenging (Minutter)"
-				""
-			],
-			"desc": "Tid før automatisk nedstenging <Minutter"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["BSensr", ""],
-				"BSensr",
+      "desc": "Bevegelsesfølsomhet (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)"
-				""
-			],
-			"desc": "Bevegelsesfølsomhet <0.Inaktiv 1.Minst følsom 9.Mest følsom"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["TmpEnh", ""],
-				"TmpEnh",
+      "desc": "Temperaturskala (C=Celsius | F=Fahrenheit)"
-				""
-			],
-			"desc": "Temperaturskala <C=Celsius F=Fahrenheit"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["AvDvSk", ""],
-				"AvDvSk",
-				""
-			],
       "desc": "Vis detaljert informasjon med liten skrift på dvaleskjermen."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["SkRetn", ""],
-				"SkRetn",
+      "desc": "Skjermretning (H=Høyrehendt | V=Venstrehendt | A=Automatisk)"
-				""
-			],
-			"desc": "Skjermretning <A. Automatisk V. Venstrehendt H. Høyrehendt"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["KTmp", ""],
-				"KTmp",
-				""
-			],
       "desc": "Temperatur i \"kraft\"-modus"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["AStart", ""],
-				"AStart",
+      "desc": "Start automatisk med lodding når strøm kobles til. (I=Inaktiv | L=Lodding | D=Dvale | R=Dvale romtemperatur)"
-				""
-			],
-			"desc": "Start automatisk med lodding når strøm kobles til. L=Lodding, D=Dvale, I=Inaktiv"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["KjBlnk", ""],
-				"KjBlnk",
-				""
-			],
       "desc": "Blink temperaturen på skjermen mens spissen fortsatt er varm."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["TempKal?", ""],
-				"TempKal?",
-				""
-			],
       "desc": "Kalibrer spiss-temperatur."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["TilbStl?", ""],
-				"TilbStl?",
-				""
-			],
       "desc": "Tilbakestill alle innstillinger"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["KalSpIn?", ""],
-				"KalSpIn?",
-				""
-			],
       "desc": "Kalibrer spenning. Knappene justerer. Langt trykk for å gå ut"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["AvLdSk", ""],
-				"AvLdSk",
-				""
-			],
       "desc": "Vis detaljert informasjon ved lodding"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["RullHa", ""],
-				"RullHa",
-				""
-			],
       "desc": "Hastigheten på rulletekst"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Power", "Wattage"],
-				"Power",
-				"Wattage"
-			],
       "desc": "Power Wattage of the power adapter used"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Power", "Limit"],
-				"Power",
+      "desc": "Maximum power the iron can use (Watts)"
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Key +-", "reverse?"],
-				"Key +-",
-				"reverse?"
-			],
       "desc": "Reverse the tip temperature change buttons plus minus assignment."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp change", "short?"],
-				"Temp change",
-				"short?"
-			],
       "desc": "Temperature change steps on short button press!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp change", "long?"],
-				"Temp change",
-				"long?"
-			],
       "desc": "Temperature change steps on long button press!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "Pulse W"],
-				"Power",
-				"Pulse W"
-			],
       "desc": "Keep awake pulse power intensity"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
-				"wait time"
-			],
       "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Språk:", " NO       Norsk"],
-				"Language:",
-				" NO       Norsk"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_PL.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "PL",
   "languageLocalName": "Polski",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "tempUnitFahrenheit": false,
   "messages": {
     "SettingsCalibrationDone": "Kalibracja udana!",
@@ -29,34 +26,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Ust. zresetowane", ""],
-			"Ust. zresetowane",
+    "NoAccelerometerMessage": ["Nie rozpoznano", "akcelerometru!"],
-			""
+    "NoPowerDeliveryMessage": ["Nie rozpoznano", "kont. USB-PD IC!"],
-		],
-		"NoAccelerometerMessage": [
-			"Nie rozpoznano",
-			"akcelerometru!"
-		],
-		"NoPowerDeliveryMessage": [
-			"Nie rozpoznano",
-			"kont. USB-PD IC!"
-		],
     "LockingKeysString": " ZABLOK.",
     "UnlockingKeysString": "ODBLOK.",
-		"WarningKeysLockedString": "!ZABLOK!"
+    "WarningKeysLockedString": "!ZABLOK!",
+    "WarningThermalRunaway": ["Ucieczka", "termiczna"]
   },
   "characters": {
     "SettingRightChar": "P",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "S",
+    "SettingOffChar": "O",
     "SettingSlowChar": "W",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "S",
+    "SettingStartNoneChar": "B",
     "SettingStartSolderingChar": "T",
     "SettingStartSleepChar": "Z",
     "SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "B",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "N",
     "SettingSensitivityMedium": "Ś",
@@ -68,251 +57,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Ustawienia", "zasilania"],
-				"Ustawienia",
-				"zasilania"
-			],
       "desc": "Zasilanie i minimalne napięcie na komórkę"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Lutowanie", ""],
-				"Lutowanie",
-				""
-			],
       "desc": "Ustawienia trybu lutowania"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Oszcz.", "energii"],
-				"Oszcz.",
-				"energii"
-			],
       "desc": "Ustawienia oszczędzania energii"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Interfejs", "użytkownika"],
-				"Interfejs",
-				"użytkownika"
-			],
       "desc": "Ustawienia interfejsu użytkownika"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Ustawienia", "zaawans."],
-				"Ustawienia",
-				"zaawans."
-			],
       "desc": "Ustawienia zaawansowane"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Źródło", "zasilania"],
-				"Źródło",
+      "desc": "Źródło zasilania. Ustaw napięcie odcięcia. (DC 10V) (S 3.3V dla ogniw Li, wyłącz limit mocy)"
-				"zasilania"
-			],
-			"desc": "Źródło zasilania. Ustaw napięcie odcięcia. <DC 10V> <S 3.3V dla ogniw Li, wyłącz limit mocy>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Temp.", "uśpienia"],
-				"Temp.",
+      "desc": "Temperatura w trybie uśpienia (°C)"
-				"uśpienia"
-			],
-			"desc": "Temperatura w trybie uśpienia <°C>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Czas do", "uśpienia"],
-				"Czas do",
+      "desc": "Czas do przejścia w tryb uśpienia (minuty | sekundy)"
-				"uśpienia"
-			],
-			"desc": "Czas do przejścia w tryb uśpienia <minuty/sekundy>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Czas do", "wyłączenia"],
-				"Czas do",
+      "desc": "Czas do wyłączenia (minuty)"
-				"wyłączenia"
-			],
-			"desc": "Czas do wyłączenia <minuty>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Czułość", "wykr. ruchu"],
-				"Czułość",
+      "desc": "Czułość wykrywania ruchu (0: Wyłączona | 1: Minimalna | ... | 9: Maksymalna)"
-				"wykr. ruchu"
-			],
-			"desc": "Czułość wykrywania ruchu <0-Wyłączona, 1-Minimalna, 9-Maksymalna>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Jednostka", "temperatury"],
-				"Jednostka",
+      "desc": "Jednostka temperatury (C: Celciusz | F: Fahrenheit)"
-				"temperatury"
-			],
-			"desc": "Jednostka temperatury <C-Celciusz, F-Fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Szeczegółowy", "ekran bezczy."],
-				"Szeczegółowy",
-				"ekran bezczy."
-			],
       "desc": "Wyświetla szczegółowe informacje za pomocą mniejszej czcionki na ekranie bezczynności"
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Obrót", "ekranu"],
-				"Obrót",
+      "desc": "Obrót ekranu (P: dla praworęcznych | L: dla leworęcznych | A: automatycznie)"
-				"ekranu"
-			],
-			"desc": "Obrót ekranu <A-automatycznie, L-dla leworęcznych, P-dla praworęcznych>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Temp.", "boost"],
-				"Temp.",
-				"boost"
-			],
       "desc": "Temperatura w trybie \"boost\" "
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Aut. uruch.", "tr. lutowania"],
-				"Aut. uruch.",
+      "desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania. (B: wyłączone | T: lutowanie | Z: uśpienie | O: uśpienie w temp. pokojowej)"
-				"tr. lutowania"
-			],
-			"desc": "Automatyczne uruchamianie trybu lutowania po włączeniu zasilania.<B - wyłączone, T - lutowanie, Z - uśpienie, O - uśpienie w temp. pokojowej"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Mig. podczas", "wychładzania"],
-				"Mig. podczas",
-				"wychładzania"
-			],
       "desc": "Temperatura miga podczas wychładzania, gdy grot jest wciąż gorący"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Kalibracja", "temp. grotu"],
-				"Kalibracja",
-				"temp. grotu"
-			],
       "desc": "Kalibracja temperatury grotu lutownicy"
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Ustawienia", "fabryczne"],
-				"Ustawienia",
-				"fabryczne"
-			],
       "desc": "Resetuje wszystkie ustawienia"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Kalibracja", "napięcia"],
-				"Kalibracja",
-				"napięcia"
-			],
       "desc": "Kalibracja napięcia wejściowego. Krótkie naciśnięcie, aby ustawić, długie naciśnięcie, aby wyjść."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Sz. inf. w", "tr. lutowania"],
-				"Sz. inf. w",
-				"tr. lutowania"
-			],
       "desc": "Wyświetl szczegółowe informacje w trybie lutowania"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Sz. przew.", "tekstu"],
-				"Sz. przew.",
-				"tekstu"
-			],
       "desc": "Szybkość przewijania tekstu"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Moc", "w W"],
-				"Moc",
+      "desc": "Moc używanego zasilacza w (W)"
-				"w W"
+    },
-			],
+    "PDNegTimeout": {
-			"desc": "Moc używanego zasilacza w <W>"
+      "text2": ["Limit czasu", "PD"],
+      "desc": "Limit czasu negocjacji PD w krokach co 100 ms dla zgodności z niektórymi ładowarkami QC (0: wyłączone)"
     },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Ogr.", "mocy"],
-				"Ogr.",
+      "desc": "Maksymalna moc (W), jakiej może użyć lutownica"
-				"mocy"
-			],
-			"desc": "Maksymalna moc <W>, jakiej może użyć lutownica"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Zamień przyc.", "+ -"],
-				"Zamień przyc.",
-				"+ -"
-			],
       "desc": "Zamienia działanie przycisków zmiany temperatury grotu"
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Zm. temp.", "kr. przyc."],
-				"Zm. temp.",
+      "desc": "Wartość zmiany temperatury, po krótkim przyciśnięciu (°C)"
-				"kr. przyc."
-			],
-			"desc": "Wartość zmiany temperatury, po krótkim przyciśnięciu <°C>"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Zm. temp.", "dł. przyc."],
-				"Zm. temp.",
+      "desc": "Wartość zmiany temperatury, po długim przyciśnięciu (°C)"
-				"dł. przyc."
-			],
-			"desc": "Wartość zmiany temperatury, po długim przyciśnięciu <°C>"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Moc", "impulsu"],
-				"Moc",
+      "desc": "W przypadku używania powerbanku, utrzymuj moc na poziomie (W) aby nie uśpić powerbanku"
-				"impulsu"
-			],
-			"desc": "W przypadku używania powerbanku, utrzymuj moc na poziomie <W> aby nie uśpić powerbanku"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Czułość", "cz. Halla"],
-				"Czułość",
+      "desc": "Czułość czujnika Halla, używanego do przechodznia w tryb uśpienia (O=Wył | N=Niska | Ś=Średnia | W=Wysoka)"
-				"cz.Halla"
-			],
-			"desc": "Czułość czujnika Halla, używanego do przechodznia w tryb uśpienia <O-Wył,N-Niska,Ś=Średnia,W=Wysoka>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Blokada", "przycisków"],
-				"Blokada",
+      "desc": "W trybie lutowania, wciśnij oba przyciski aby je zablokować (O=Wyłączona | B=tylko Boost | P=pełna blokada)"
-				"przycisków"
-			],
-			"desc": "W trybie lutowania, wciśnij oba przyciski aby je zablokować <O-Wyłączona, B-tylko Boost, P-pełna blokada>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimalne", "napięcie"],
-				"Minimalne",
+      "desc": "Minimalne dozwolone napięcie na komórkę (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-				"napięcie"
-			],
-			"desc": "Minimalne dozwolone napięcie na komórkę <W woltach> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Zapętlona", "animacja"],
-				"Zapętlona",
-				"animacja"
-			],
       "desc": "Zapętla animację ikon w menu głównym"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Prędkosć", "animacji"],
-				"Prędkosć",
+      "desc": "Prędkość animacji ikon w menu (O: wył. | L: mała | M: średnia | H: duża)"
-				"animacji"
-			],
-			"desc": "Prędkość animacji ikon w menu <O=wył. | L=mała | M=średnia | H=duża>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Czas między", "imp. mocy"],
-				"Czas między",
+      "desc": "Czas między kolejnymi impulsami mocy zapobiegającymi usypianiu powerbanku (x2,5 s)"
-				"imp. mocy"
-			],
-			"desc": "Czas między kolejnymi impulsami mocy zapobiegającymi usypianiu powerbanku (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Długość", "impulsu mocy"],
-				"Długość",
-				"impulsu mocy"
-			],
       "desc": "Długość impulsu mocy zapobiegającego usypianiu powerbanku (x250 ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Język :", " PL      Polski"],
-				"Language:",
-				" PL      Polski"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Jasność", "wyświetlacza"],
+      "desc": "Regulacja kontrastu/jasności wyświetlacza OLED"
+    },
+    "ColourInversion": {
+      "text2": ["Odwrócenie", "kolorów"],
+      "desc": "Odwrócenie kolorów wyświetlacza OLED"
     }
   }
 }

Translations/translation_PT.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "PT",
   "languageLocalName": "Português",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Calibração terminada!",
     "SettingsCalibrationWarning": "A ponta deve estar à temperatura ambiente antes de continuar!",
@@ -28,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Settings were", "reset!"],
-			"Settings were",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"reset!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "D",
     "SettingLeftChar": "C",
     "SettingAutoChar": "A",
-		"SettingFastChar": "R",
+    "SettingOffChar": "O",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "R",
-		"SettingStartSolderingChar": "T",
+    "SettingStartNoneChar": "D",
-		"SettingStartSleepChar": "S",
+    "SettingStartSolderingChar": "S",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepChar": "H",
-		"SettingStartNoneChar": "F",
+    "SettingStartSleepOffChar": "A",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Configurações", "Solda"],
-				"Configurações",
-				"Solda"
-			],
       "desc": "Configurações de soldagem"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Modos", "Repouso"],
-				"Modos",
-				"Repouso"
-			],
       "desc": "Configurações de economia de energia"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Interface", "Utilizador"],
-				"Interface",
-				"Utilizador"
-			],
       "desc": "Configurações do interface do utilizador"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Menu", "Avançado"],
-				"Menu",
-				"Avançado"
-			],
       "desc": "Opções avançadas"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Fonte", "alimentação"],
-				"Fonte",
+      "desc": "Fonte de alimentação. Define a tensão de corte. (DC=10V) (S=3.3V/célula)"
-				"alimentação"
-			],
-			"desc": "Fonte de alimentação. Define a tensão de corte. <DC=10V> <S=3.3V/célula>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Temperat.", "repouso"],
-				"Temperat.",
+      "desc": "Temperatura de repouso (C)"
-				"repouso"
-			],
-			"desc": "Temperatura de repouso <C>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Tempo", "repouso"],
-				"Tempo",
+      "desc": "Tempo para repouso (Minutos | Segundos)"
-				"repouso"
-			],
-			"desc": "Tempo para repouso <Minutos/Segundos>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Tempo", "desligam."],
-				"Tempo",
+      "desc": "Tempo para desligamento (Minutos)"
-				"desligam."
-			],
-			"desc": "Tempo para desligamento <Minutos>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Sensibilidade", "movimento"],
-				"Sensibilidade",
+      "desc": "Sensibilidade ao movimento (0=Desligado | 1=Menor | ... | 9=Maior)"
-				"movimento"
-			],
-			"desc": "Sensibilidade ao movimento <0=Desligado 1=Menor 9=Maior>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Unidade", "temperatura"],
-				"Unidade",
+      "desc": "Unidade de temperatura (C=Celsius | F=Fahrenheit)"
-				"temperatura"
-			],
-			"desc": "Unidade de temperatura <C=Celsius F=Fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Tela repouso", "avançada"],
-				"Tela repouso",
-				"avançada"
-			],
       "desc": "Exibe informações avançadas quando em espera"
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Orientação", "tela"],
-				"Orientação",
+      "desc": "Orientação da tela (D=estro | C=anhoto | A=utomática)"
-				"tela"
-			],
-			"desc": "Orientação da tela <A.utomática C.anhoto D.estro>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Modo turbo", "temperat."],
-				"Modo turbo",
-				"temperat."
-			],
       "desc": "Ajuste de temperatura do modo \"turbo\""
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Partida", "automática"],
-				"Partida",
+      "desc": "Aquece a ponta automaticamente ao ligar (D=desligar | S=soldagem | H=hibernar | A=hibernar temp. ambiente)"
-				"automática"
-			],
-			"desc": "Aquece a ponta automaticamente ao ligar"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Piscar ao", "arrefecer"],
-				"Piscar ao",
-				"arrefecer"
-			],
       "desc": "Faz o valor da temperatura piscar durante o arrefecimento"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Calibrar", "temperatura"],
-				"Calibrar",
-				"temperatura"
-			],
       "desc": "Calibra a temperatura"
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Reset de", "fábrica?"],
-				"Reset de",
-				"fábrica?"
-			],
       "desc": "Reverte todos ajustes"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Calibrar", "tensão"],
-				"Calibrar",
-				"tensão"
-			],
       "desc": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Tela trabalho", "avançada"],
-				"Tela trabalho",
-				"avançada"
-			],
       "desc": "Exibe informações avançadas durante o uso"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Velocidade", "texto ajuda"],
-				"Velocidade",
-				"texto ajuda"
-			],
       "desc": "Velocidade a que o texto é exibido"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Potência", "Fonte"],
-				"Potência",
-				"Fonte"
-			],
       "desc": "Potência da fonte usada (Watt)"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Power", "Limit"],
-				"Power",
+      "desc": "Maximum power the iron can use (Watts)"
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Key +-", "reverse?"],
-				"Key +-",
-				"reverse?"
-			],
       "desc": "Reverse the tip temperature change buttons plus minus assignment."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp change", "short?"],
-				"Temp change",
-				"short?"
-			],
       "desc": "Temperature change steps on short button press!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp change", "long?"],
-				"Temp change",
-				"long?"
-			],
       "desc": "Temperature change steps on long button press!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "Pulse W"],
-				"Power",
-				"Pulse W"
-			],
       "desc": "Keep awake pulse power intensity"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
-				"wait time"
-			],
       "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Idioma :", " PT   Português"],
-				"Language:",
-				" PT   Português"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_RO.json

@@ -0,0 +1,214 @@
+{
+  "languageCode": "RO",
+  "languageLocalName": "Română",
+  "fonts": ["ascii_basic", "latin_extended"],
+  "tempUnitFahrenheit": true,
+  "messages": {
+    "SettingsCalibrationDone": "Calibrare completa!",
+    "SettingsCalibrationWarning": "Vă rugăm să vă asigurati că vârful este la temperatura camerei, înainte de a continua!",
+    "SettingsResetWarning": "Sigur doriti să restaurati la setările implicite?",
+    "UVLOWarningString": "DC LOW",
+    "UndervoltageString": "Sub tensiune",
+    "InputVoltageString": "Intrare V: ",
+    "WarningTipTempString": "Temp. varf: ",
+    "BadTipString": "VARF DEFECT",
+    "SleepingSimpleString": "Zzzz",
+    "SleepingAdvancedString": "Adormit...",
+    "WarningSimpleString": "FIERBINTE!",
+    "WarningAdvancedString": "!!! VARF FIERBINTE !!!",
+    "SleepingTipAdvancedString": "Tip:",
+    "IdleTipString": "Tip:",
+    "IdleSetString": " Set:",
+    "TipDisconnectedString": "FĂRĂ VARF",
+    "SolderingAdvancedPowerPrompt": "Putere: ",
+    "OffString": "Nu",
+    "YourGainMessage": "Coeficient:"
+  },
+  "messagesWarn": {
+    "ResetOKMessage": "Reset OK",
+    "SettingsResetMessage": ["Setările au fost", "resetate!"],
+    "NoAccelerometerMessage": ["Nu accelerometru", "detectat!"],
+    "NoPowerDeliveryMessage": ["Fără USB-PD IC", "detectat!"],
+    "LockingKeysString": "BLOCAT",
+    "UnlockingKeysString": "DEBLOCAT",
+    "WarningKeysLockedString": "!BLOCAT!",
+    "WarningThermalRunaway": ["Incalzire", "Esuata"]
+  },
+  "characters": {
+    "SettingRightChar": "D",
+    "SettingLeftChar": "S",
+    "SettingAutoChar": "A",
+    "SettingOffChar": "O",
+    "SettingSlowChar": "Î",
+    "SettingMediumChar": "M",
+    "SettingFastChar": "R",
+    "SettingStartNoneChar": "O",
+    "SettingStartSolderingChar": "S",
+    "SettingStartSleepChar": "Z",
+    "SettingStartSleepOffChar": "R",
+    "SettingSensitivityOff": "O",
+    "SettingSensitivityLow": "L",
+    "SettingSensitivityMedium": "M",
+    "SettingSensitivityHigh": "H",
+    "SettingLockDisableChar": "D",
+    "SettingLockBoostChar": "B",
+    "SettingLockFullChar": "F",
+    "SettingNAChar": "N/A"
+  },
+  "menuGroups": {
+    "PowerMenu": {
+      "text2": ["Setări de", "alimentare"],
+      "desc": "Setări de alimentare"
+    },
+    "SolderingMenu": {
+      "text2": ["Setări de", "lipire"],
+      "desc": "Setări de lipire"
+    },
+    "PowerSavingMenu": {
+      "text2": ["Modul", "repaus"],
+      "desc": "Setări de economisire a energiei"
+    },
+    "UIMenu": {
+      "text2": ["Interfată", "utilizator"],
+      "desc": "Setări interfată utilizator"
+    },
+    "AdvancedMenu": {
+      "text2": ["Optiuni", "avansate"],
+      "desc": "Optiuni avansate"
+    }
+  },
+  "menuOptions": {
+    "DCInCutoff": {
+      "text2": ["Sursa de", "alimentare"],
+      "desc": "Sursa de alimentare. Setează tensiunea de întrerupere. (DC 10V) (S 3.3V per celulă, dezactivati limita de alimentare)"
+    },
+    "SleepTemperature": {
+      "text2": ["Temp", "repaus"],
+      "desc": "Temperatura vârfului în \"modul repaus\""
+    },
+    "SleepTimeout": {
+      "text2": ["Expirare", "repaus"],
+      "desc": "Interval înainte de lansarea \"modului de repaus\" în (S=secunde | M=minute)"
+    },
+    "ShutdownTimeout": {
+      "text2": ["Expirare", "oprire"],
+      "desc": "Interval înainte ca letconul să se oprească (M=minute)"
+    },
+    "MotionSensitivity": {
+      "text2": ["Sensibilitate", "la mişcare"],
+      "desc": "0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil"
+    },
+    "TemperatureUnit": {
+      "text2": ["Unitate de", "temperatură"],
+      "desc": "C=Celsius | F=Fahrenheit"
+    },
+    "AdvancedIdle": {
+      "text2": ["Detalii,", "ecran inactiv"],
+      "desc": "Afisati informatii detaliate într-un font mai mic pe ecranul de repaus"
+    },
+    "DisplayRotation": {
+      "text2": ["Orientare", "ecran"],
+      "desc": "R=dreptaci | L=stângaci | A=auto"
+    },
+    "BoostTemperature": {
+      "text2": ["Boost", "temp"],
+      "desc": "Temperatura utilizată în \"modul boost\""
+    },
+    "AutoStart": {
+      "text2": ["Auto", "start"],
+      "desc": "Start letcon în modul de lipire la pornire (O=oprit | S=lipire | Z=repaus | R=repaus la temperatura camerei)"
+    },
+    "CooldownBlink": {
+      "text2": ["Clipeste", "la răcire"],
+      "desc": "Clipeste temperatura după oprirea încălzirii, în timp ce vârful este încă fierbinte"
+    },
+    "TemperatureCalibration": {
+      "text2": ["Calibrare", "temperatură?"],
+      "desc": "Începeti calibrarea compensării de temperatură a vârfului"
+    },
+    "SettingsReset": {
+      "text2": ["Setări", "din fabrică"],
+      "desc": "Reveniti la setările din fabrică"
+    },
+    "VoltageCalibration": {
+      "text2": ["Calibrare tens.", "de intrare?"],
+      "desc": "Porniti calibrarea VIN (apăsati lung pentru a iesi)"
+    },
+    "AdvancedSoldering": {
+      "text2": ["Detalii", "ecran lipire"],
+      "desc": "Afisati informatii detaliate într-un font mai mic pe ecranul de lipire"
+    },
+    "ScrollingSpeed": {
+      "text2": ["Viteză", "derulare"],
+      "desc": "Viteză derulare text cu informatii la (S=lent | F=rapid)"
+    },
+    "QCMaxVoltage": {
+      "text2": ["QC", "voltaj"],
+      "desc": "Tensiunea maximă QC dorită pentru care negociază letconul"
+    },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "Timp limita de negociere pentru tranzactia PD, in pasi de 100ms, pentru compatibilitate cu alimentatoarele QC"
+    },
+    "PowerLimit": {
+      "text2": ["Putere", "limită"],
+      "desc": "Puterea maximă pe care letconul o poate folosi (W=watt)"
+    },
+    "ReverseButtonTempChange": {
+      "text2": ["Inversare", "+ - butoane"],
+      "desc": "Inversarea butoanelor de reglare a temperaturii"
+    },
+    "TempChangeShortStep": {
+      "text2": ["Schimbare temp.", "apăsare scută"],
+      "desc": "Schimbarea temperaturii la apăsarea scurtă a butonului"
+    },
+    "TempChangeLongStep": {
+      "text2": ["Schimbare temp.", "apăsare lungă"],
+      "desc": "Schimbarea temperaturii la apăsarea lungă a butonului"
+    },
+    "PowerPulsePower": {
+      "text2": ["Putere", "puls"],
+      "desc": "Puterea pulsului de mentinere activa a blocului de alimentare (watt)"
+    },
+    "HallEffSensitivity": {
+      "text2": ["Sensibilitate", "senzor Hall"],
+      "desc": "Sensibilitate senzor cu efect Hall pentru a detecta repausul (O=oprit | L=scăzut | M=mediu | H=înalt)"
+    },
+    "LockingMode": {
+      "text2": ["Blocare", "butoane"],
+      "desc": "Când lipiti, apăsati lung ambele butoane, pentru a le bloca (D=dezactivare | B=numai \"modul boost\" | F=blocare completă)"
+    },
+    "MinVolCell": {
+      "text2": ["Voltaj", "minim"],
+      "desc": "Tensiunea minimă admisă pe celulă (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+    },
+    "AnimLoop": {
+      "text2": ["Animatii", "buclă"],
+      "desc": "Animatii de pictograme în meniul principal"
+    },
+    "AnimSpeed": {
+      "text2": ["Animatii", "viteză"],
+      "desc": "Ritmul animatiilor pictogramei din meniu (O=oprit | S=încet | M=mediu | F=rapid)"
+    },
+    "PowerPulseWait": {
+      "text2": ["Întârziere", "puls putere"],
+      "desc": "Perioada pulsului de mentinere (x 2.5s)"
+    },
+    "PowerPulseDuration": {
+      "text2": ["Durată", "puls putere"],
+      "desc": "Durata pulsului de mentinere (x 250ms)"
+    },
+    "LanguageSwitch": {
+      "text2": ["Limbă:", " RO     Română"],
+      "desc": "Limba curenta"
+    },
+    "Brightness": {
+        "text2": ["Ecranului", "luminozitatea"],
+        "desc": "Ajusteaza luminozitatea ecranului"
+    },
+    "ColourInversion": {
+        "text2": ["Inverseaza", "culoarea"],
+        "desc": "Inverseaza culoarea ecranului"
+    }
+  }
+}

Translations/translation_RU.json

@@ -1,11 +1,7 @@
 {
   "languageCode": "RU",
   "languageLocalName": "Русский",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended", "cyrillic"],
-		"ascii_basic",
-		"latin_extended",
-		"cyrillic"
-	],
   "messages": {
     "SettingsCalibrationDone": "Калибровка завершена!",
     "SettingsCalibrationWarning": "Прежде чем продолжить, пожалуйста, убедитесь, что жало имеет комнатную температуру!",
@@ -29,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Сброс OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Настройки", "сброшены!"],
-			"Настройки",
+    "NoAccelerometerMessage": ["Не определен", "акселерометр!"],
-			"сброшены!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"Не определен",
-			"акселерометр!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "П",
     "SettingLeftChar": "Л",
     "SettingAutoChar": "А",
-		"SettingFastChar": "Б",
+    "SettingOffChar": "O",
     "SettingSlowChar": "М",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "Б",
+    "SettingStartNoneChar": "В",
     "SettingStartSolderingChar": "П",
     "SettingStartSleepChar": "О",
     "SettingStartSleepOffChar": "К",
-		"SettingStartNoneChar": "В",
     "SettingSensitivityOff": "О",
     "SettingSensitivityLow": "Н",
     "SettingSensitivityMedium": "С",
@@ -68,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Параметры", "питания"],
-				"Параметры",
-				"питания"
-			],
       "desc": "Источник питания и минимальное напряжение на ячейку"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Параметры", "пайки"],
-				"Параметры",
-				"пайки"
-			],
       "desc": "Параметры пайки"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Режимы", "сна"],
-				"Режимы",
-				"сна"
-			],
       "desc": "Настройки режима ожидания"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Параметры", "интерфейса"],
-				"Параметры",
-				"интерфейса"
-			],
       "desc": "Настройки пользовательского интерфейса"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Дополнител.", "настройки"],
-				"Дополнител.",
-				"настройки"
-			],
       "desc": "Дополнительные настройки"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Источник", "питания"],
-				"Источник",
+      "desc": "Источник питания. Устанавливает напряжение отсечки. (DC 10В) (S 3,3В на ячейку, без лимита мощности)"
-				"питания"
-			],
-			"desc": "Источник питания. Устанавливает напряжение отсечки. <DC 10В> <S 3.3В на ячейку, без лимита мощности>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Темп.", "ожидания"],
-				"Темп.",
-				"ожидания"
-			],
       "desc": "Температура режима ожидания"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Таймаут", "ожидания"],
-				"Таймаут",
+      "desc": "Время до перехода в режим ожидания (Минуты | Секунды)"
-				"ожидания"
-			],
-			"desc": "Время до перехода в режим ожидания <Минуты/Секунды>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Таймаут", "выключения"],
-				"Таймаут",
+      "desc": "Время до отключения паяльника (Минуты)"
-				"выключения"
-			],
-			"desc": "Время до отключения паяльника <Минуты>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Чувствительн.", "акселерометра"],
-				"Чувствительн.",
+      "desc": "Чувствительность акселерометра (0=Выкл. | 1=Мин. | ... | 9=Макс.)"
-				"акселерометра"
-			],
-			"desc": "Чувствительность акселерометра <0=Выкл., 1=Мин., 9=Макс.>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Единицы", "температуры"],
-				"Единицы",
+      "desc": "Единицы измерения температуры (C=Цельcия | F=Фаренгейта)"
-				"температуры"
-			],
-			"desc": "Единицы измерения температуры <C=Цельcия, F=Фаренгейта>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Подробный", "реж. ожидания"],
-				"Подробный",
-				"реж. ожидания"
-			],
       "desc": "Отображать детальную информацию уменьшенным шрифтом на экране ожидания"
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Ориентация", "экрана"],
-				"Ориентация",
+      "desc": "Ориентация экрана (П=Правая рука | Л=Левая рука | А=Авто)"
-				"экрана"
-			],
-			"desc": "Ориентация экрана <А=Авто, Л=Левая рука, П=Правая рука>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["t° турбо", "режима"],
-				"t° турбо",
-				"режима"
-			],
       "desc": "Температура жала в турбо-режиме"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Авто", "старт"],
-				"Авто",
+      "desc": "Режим, в котором запускается паяльник при подаче питания (В=Выкл. | П=Пайка | О=Ожидание | К=Ожидание при комн. темп.)"
-				"старт"
-			],
-			"desc": "Режим, в котором запускается паяльник при подаче питания <П=Пайка, О=Ожидание, К=Ожидание при комн. темп., В=Выкл.>"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Мигание t°", "при остывании"],
-				"Мигание t°",
-				"при остывании"
-			],
       "desc": "Мигать температурой на экране охлаждения, пока жало еще горячее"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Калибровка", "температуры"],
-				"Калибровка",
-				"температуры"
-			],
       "desc": "Калибровка термодатчика жала"
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Сброс", "Настроек"],
-				"Сброс",
-				"Настроек"
-			],
       "desc": "Сброс настроек к значеням по умолчанию"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Калибровка", "напряжения"],
-				"Калибровка",
+      "desc": "Калибровка входного напряжения (длинное нажатие для выхода)"
-				"напряжения"
-			],
-			"desc": "Калибровка входного напряжения <длинное нажатие для выхода>"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Подробный", "экран пайки"],
-				"Подробный",
-				"экран пайки"
-			],
       "desc": "Показывать детальную информацию на экране пайки"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Скорость", "текста"],
-				"Скорость",
+      "desc": "Скорость прокрутки текста (М=медленно | Б=быстро)"
-				"текста"
-			],
-			"desc": "Скорость прокрутки текста <М=медленно, Б=быстро>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Мощность", "питания"],
-				"Мощность",
-				"питания"
-			],
       "desc": "Мощность используемого источника питания"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Предел", "мощности"],
-				"Предел",
+      "desc": "Максимальная мощность, которую может использовать паяльник (Ватт)"
-				"мощности"
-			],
-			"desc": "Максимальная мощность, которую может использовать паяльник <Ватт>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Инвертировать", "кнопки"],
-				"Инвертировать",
-				"кнопки"
-			],
       "desc": "Инвертировать кнопки изменения температуры"
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Шаг темп.", "кор. наж."],
-				"Шаг темп.",
-				"кор. наж."
-			],
       "desc": "Шаг изменения температуры при коротком нажатии кнопок"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Шаг темп.", "длин. наж."],
-				"Шаг темп.",
-				"длин. наж."
-			],
       "desc": "Шаг изменения температуры при длинном нажатии кнопок"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Сила имп.", "питания Вт"],
-				"Сила имп.",
-				"питания Вт"
-			],
       "desc": "Сила импульса удерживающего от сна повербанк или другой источник питания"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Эффект Холла", "чувствительность"],
-				"Эффект Холла",
+      "desc": "Уровень чувствительности датчика холла в режиме сна (О=Отключено | Н=Низкий | С=Средний | В=Высокий)"
-				"чувствительность"
-			],
-			"desc": "Уровень чувствительности датчика холла в режиме сна <О=Отключено, Н=Низкий, С=Средний, В=Высокий>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Разрешить", "блок. кнопок"],
-				"Разрешить",
+      "desc": "При работе длинное нажатие обеих кнопок блокирует их (О=Отключено | Т=Только турбо | П=Полная блокировка)"
-				"блок. кнопок"
-			],
-			"desc": "При работе длинное нажатие обеих кнопок блокирует их <О=Отключено, Т=Только турбо, П=Полная блокировка>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Мин.", "напр."],
-				"Мин.",
+      "desc": "Минимальное разрешенное напряжение на ячейку (3S: 3 - 3,7V | 4-S: 2,4 - 3,7V)"
-				"напр."
-			],
-			"desc": "Минимальное разрешенное напряжение на ячейку <В вольтах> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Зацикленная", "анимация"],
-				"Зацикленная",
-				"анимация"
-			],
       "desc": "Зацикленная анимация иконок в главном меню"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Скорость", "анимации"],
-				"Скорость",
+      "desc": "Скорость анимации иконок в главном меню (Милисекунды) (О=Отключено | Н=Низкий | С=Средний | В=Высокий)"
-				"анимации"
-			],
-			"desc": "Скорость анимации иконок в главном меню <Милисекунды> <О=Отключено, Н=Низкий, С=Средний, В=Высокий>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
+      "desc": "Time to wait before triggering every keep-awake pulse (x 2,5с)"
-				"wait time"
-			],
-			"desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
+      "desc": "Keep-awake-pulse duration (x 250мс)"
-				"duration"
-			],
-			"desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Язык:", " RU     Русский"],
-				"Language:",
-				" RU     Русский"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_SK.json

@@ -6,56 +6,54 @@
 		"latin_extended"
 	],
 	"messages": {
-		"SettingsCalibrationDone": "Kalibrácia hotová!",
 		"SettingsCalibrationWarning": "Najprv sa prosím uistite, že hrot má izbovú teplotu!",
-		"SettingsResetWarning": "Naozaj chcete obnovit továrenské nastavenia?",
+		"SettingsResetWarning": "Naozaj chcete obnoviť továrenské nastavenia?",
 		"UVLOWarningString": "Nízke U!",
 		"UndervoltageString": "Nízke napätie",
 		"InputVoltageString": "Vstupné U: ",
-		"WarningTipTempString": "Tep. hrotu: ",
-		"BadTipString": "ZLÝ HROT",
 		"SleepingSimpleString": "Chrr",
 		"SleepingAdvancedString": "Pokojový režim..",
-		"WarningSimpleString": "PÁLI",
-		"WarningAdvancedString": "HROT JE HORÚCI !",
 		"SleepingTipAdvancedString": "Hrot:",
 		"IdleTipString": "Hrot:",
 		"IdleSetString": "Cieľ:",
 		"TipDisconnectedString": "HROT ODPOJENÝ",
 		"SolderingAdvancedPowerPrompt": "Výkon: ",
-		"OffString": "Vyp",
+		"OffString": "Vyp"
-		"YourGainMessage": "Zisk:"
 	},
 	"messagesWarn": {
 		"ResetOKMessage": "Reset OK",
 		"SettingsResetMessage": [
-			"Tov. nas. obnov.",
+			"Nastavenia",
-			""
+			"resetované"
 		],
 		"NoAccelerometerMessage": [
-			"Bez pohyb. senz.",
+			"Bez pohybového",
-			""
+			"senzora!"
 		],
 		"NoPowerDeliveryMessage": [
-			"Chýba čip USB-PD",
+			"Chýba čip",
-			""
+			"USB-PD!"
 		],
 		"LockingKeysString": "ZABLOK.",
 		"UnlockingKeysString": "ODBLOK.",
-		"WarningKeysLockedString": "!ZABLOK!"
+		"WarningKeysLockedString": "!ZABLOK!",
+		"WarningThermalRunaway": [
+			"Únik",
+			"Tepla"
+		]
 	},
 	"characters": {
 		"SettingRightChar": "P",
 		"SettingLeftChar": "L",
 		"SettingAutoChar": "A",
-		"SettingFastChar": "R",
-		"SettingSlowChar": "P",
-		"SettingMediumChar": "M",
 		"SettingOffChar": "Z",
-		"SettingStartSolderingChar": "S",
+		"SettingSlowChar": "P",
-		"SettingStartSleepChar": "K",
+		"SettingMediumChar": "S",
-		"SettingStartSleepOffChar": "O",
+		"SettingFastChar": "R",
-		"SettingStartNoneChar": "N",
+		"SettingStartNoneChar": "V",
+		"SettingStartSolderingChar": "Z",
+		"SettingStartSleepChar": "S",
+		"SettingStartSleepOffChar": "I",
 		"SettingSensitivityOff": "Z",
 		"SettingSensitivityLow": "N",
 		"SettingSensitivityMedium": "S",
@@ -68,10 +66,10 @@
 	"menuGroups": {
 		"PowerMenu": {
 			"text2": [
-				"Power",
+				"Nastavenie",
-				"settings"
+				"výkonu"
 			],
-			"desc": "Power settings"
+			"desc": "Nastavenie výkonu"
 		},
 		"SolderingMenu": {
 			"text2": [
@@ -108,7 +106,7 @@
 				"Zdroj",
 				"napätia"
 			],
-			"desc": "Zdroj napätia. Nastavenie napätia pre vypnutie (cutoff)  <DC=10V, nS=n*3.3V pre LiIon články>"
+			"desc": "Zdroj napätia. Nastavenie napätia pre vypnutie (cutoff)  (DC=10V | nS=n*3.3V pre LiIon články)"
 		},
 		"SleepTemperature": {
 			"text2": [
@@ -122,42 +120,42 @@
 				"Pokojový",
 				"režim po"
 			],
-			"desc": "Pokojový režim po <S=sekundách/M=minútach>"
+			"desc": "Pokojový režim po (S=sekundách | M=minútach)"
 		},
 		"ShutdownTimeout": {
 			"text2": [
 				"Vypnutie",
 				"po"
 			],
-			"desc": "Čas na vypnutie <minúty>"
+			"desc": "Čas na vypnutie (minúty)"
 		},
 		"MotionSensitivity": {
 			"text2": [
 				"Citlivosť",
 				"pohybu"
 			],
-			"desc": "Citlivosť detekcie pohybu <0=Vyp, 1=Min ... 9=Max>"
+			"desc": "Citlivosť detekcie pohybu (0=Vyp | 1=Min | ... | 9=Max)"
 		},
 		"TemperatureUnit": {
 			"text2": [
 				"Jednotka",
 				"teploty"
 			],
-			"desc": "Jednotky merania teploty <C=stupne Celzia, F=stupne Fahrenheita>"
+			"desc": "Jednotky merania teploty (C=stupne Celzia | F=stupne Fahrenheita)"
 		},
 		"AdvancedIdle": {
 			"text2": [
 				"Detaily v",
 				"pokoj. režime"
 			],
-			"desc": "Zobraziť detailné informácie v pokojovom režime <T=Zap, F=Vyp>"
+			"desc": "Zobraziť detailné informácie v pokojovom režime (T=Zap | F=Vyp)"
 		},
 		"DisplayRotation": {
 			"text2": [
 				"Orientácia",
 				"displeja"
 			],
-			"desc": "Orientácia displeja <A=Auto, L=Ľavák, P=Pravák>"
+			"desc": "Orientácia displeja (P=Pravák | L=Ľavák | A=Auto)"
 		},
 		"BoostTemperature": {
 			"text2": [
@@ -171,7 +169,7 @@
 				"Automatické",
 				"spustenie"
 			],
-			"desc": "Pri štarte spustiť režim spájkovania <S=Zap, N=Vyp, K=Spanok>"
+			"desc": "Pri štarte spustiť režim spájkovania (V=Vyp | Z=Spájkovanie | S=Spanok | I=Spanok izbová teplota)"
 		},
 		"CooldownBlink": {
 			"text2": [
@@ -217,17 +215,24 @@
 		},
 		"QCMaxVoltage": {
 			"text2": [
-				"Obmedzenie",
+				"Obmedzenie QC",
-				"výkonu"
+				"napätia"
 			],
-			"desc": "Obmedzenie výkonu podľa použitého zdroja"
+			"desc": "Maximálne QC napätie ktoré si má systém vyžiadať"
+		},
+		"PDNegTimeout": {
+			"text2": [
+				"Čas vypršania",
+				"Power Delivery"
+			],
+			"desc": "Čas vyjednávania Power Delivery v 100ms krokoch pre kompatibilitu s niektorými QC nabíjačkami (0: vypnuté)"
 		},
 		"PowerLimit": {
 			"text2": [
 				"Obmedzenie",
 				"výkonu"
 			],
-			"desc": "Obmedzenie výkonu podľa použitého zdroja <watt>"
+			"desc": "Obmedzenie výkonu podľa použitého zdroja (watt)"
 		},
 		"ReverseButtonTempChange": {
 			"text2": [
@@ -255,63 +260,77 @@
 				"Intenzita",
 				"impulzu"
 			],
-			"desc": "Impulz udržujúci napájací zdroj zapnutý (power banky) <watt>"
+			"desc": "Impulz udržujúci napájací zdroj zapnutý (power banky) (watt)"
 		},
 		"HallEffSensitivity": {
 			"text2": [
 				"Citliv.",
 				"Hall"
 			],
-			"desc": "Citlivosť Halloveho senzora pre detekciu spánku <Z=Zakázať,N=Nízka,S=Stredná,V=Vysoká>"
+			"desc": "Citlivosť Hallovho senzora pre detekciu spánku (Z=Zakázať | N=Nízka | S=Stredná | V=Vysoká)"
 		},
 		"LockingMode": {
 			"text2": [
 				"Povoliť zámok",
 				"tlačidiel"
 			],
-			"desc": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania <Z=Zakázať, B=Okrem boost, P=Plné zamknutie>"
+			"desc": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania (Z=Zakázať | B=Okrem boost | P=Plné zamknutie)"
 		},
 		"MinVolCell": {
 			"text2": [
-				"Minimum",
+				"Minimálne",
-				"voltage"
+				"napätie"
 			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
+			"desc": "Minimálne napätie povolené na jeden článok (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
 		},
 		"AnimLoop": {
 			"text2": [
-				"Anim.",
+				"Opakovanie",
-				"loop"
+				"animácií"
 			],
-			"desc": "Loop icon animations in root menu"
+			"desc": "Opakovanie animácií ikoniek v hlavnom menu"
 		},
 		"AnimSpeed": {
 			"text2": [
-				"Anim.",
+				"Rýchlosť",
-				"speed"
+				"animácií"
 			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
+			"desc": "Rýchlosť animácií ikoniek v menu (O=off | P=pomaly | S=stredne | R=rýchlo)"
 		},
 		"PowerPulseWait": {
 			"text2": [
-				"Power pulse",
+				"Interval",
-				"wait time"
+				"impulzu"
 			],
-			"desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
+			"desc": "Interval medzi impulzami udržujúcimi napájací zdroj zapnutý (x 2.5s)"
 		},
 		"PowerPulseDuration": {
 			"text2": [
-				"Power pulse",
+				"Dĺžka impulzu",
-				"duration"
+				""
 			],
-			"desc": "Keep-awake-pulse duration (x 250ms)"
+			"desc": "Dĺžka impulzu udržujúci napájací zdroj zapnutý (x 250ms)"
 		},
 		"LanguageSwitch": {
 			"text2": [
-				"Language:",
+				"Jazyk:",
 				" SK  Slovenčina"
 			],
-			"desc": ""
+			"desc": "Aktuálny jazyk"
+		},
+		"Brightness": {
+			"text2": [
+				"Jas",
+				"obrazovky"
+			],
+			"desc": "Mení jas/kontrast OLED displeja"
+		},
+		"ColourInversion": {
+			"text2": [
+				"Invertovať",
+				"obrazovku"
+			],
+			"desc": "Invertovať farby OLED displeja"
 		}
 	}
 }

Translations/translation_SL.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "SL",
   "languageLocalName": "Slovenščina",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Kalibracija opravljena!",
     "SettingsCalibrationWarning": "Pred nadaljevanjem mora biti konica segreta na sobno temperaturo!",
@@ -28,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Nastavitve OK!", ""],
-			"Nastavitve OK!",
+    "NoAccelerometerMessage": ["Ni pospeševalnik", ""],
-			""
+    "NoPowerDeliveryMessage": ["Ni USB-PD čipa!", ""],
-		],
-		"NoAccelerometerMessage": [
-			"Ni pospeševalnik",
-			""
-		],
-		"NoPowerDeliveryMessage": [
-			"Ni USB-PD čipa!",
-			""
-		],
     "LockingKeysString": "ZAKLENJ.",
     "UnlockingKeysString": "ODKLENJ.",
-		"WarningKeysLockedString": "ZAKLENJ."
+    "WarningKeysLockedString": "ZAKLENJ.",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "D",
     "SettingLeftChar": "L",
     "SettingAutoChar": "S",
-		"SettingFastChar": "H",
+    "SettingOffChar": "U",
     "SettingSlowChar": "P",
     "SettingMediumChar": "M",
-		"SettingOffChar": "U",
+    "SettingFastChar": "H",
+    "SettingStartNoneChar": "U",
     "SettingStartSolderingChar": "S",
     "SettingStartSleepChar": "Z",
     "SettingStartSleepOffChar": "V",
-		"SettingStartNoneChar": "U",
     "SettingSensitivityOff": "U",
     "SettingSensitivityLow": "N",
     "SettingSensitivityMedium": "S",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Nastavitve", "spajkanja"],
-				"Nastavitve",
-				"spajkanja"
-			],
       "desc": "Nastavitve spajkanja"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Način", "spanja"],
-				"Način",
-				"spanja"
-			],
       "desc": "Nastavitve varčevanja z energijo"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Uporabniški", "vmesnik"],
-				"Uporabniški",
-				"vmesnik"
-			],
       "desc": "Nastavitve uporabniškega vmesnika"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Napredne", "možnosti"],
-				"Napredne",
-				"možnosti"
-			],
       "desc": "Napredne možnosti"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Vir", "napajanja"],
-				"Vir",
+      "desc": "Vir napajanja. Nastavi napetost izklopa. (DC 10V) (S 3.3V na celico)"
-				"napajanja"
-			],
-			"desc": "Vir napajanja. Nastavi napetost izklopa. <DC 10V> <S 3.3V na celico>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Temp. med", "spanjem"],
-				"Temp. med",
-				"spanjem"
-			],
       "desc": "Temperatura med spanjem"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Čas do", "spanja"],
-				"Čas do",
+      "desc": "Čas pred spanjem (S=sekunde | M=minute)"
-				"spanja"
-			],
-			"desc": "Čas pred spanjem <S=sekunde | M=minute>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Čas do", "izklopa"],
-				"Čas do",
+      "desc": "Čas do izklopa (M=minute)"
-				"izklopa"
-			],
-			"desc": "Čas do izklopa <M=minute>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Občutljivost", "premikanja"],
-				"Občutljivost",
-				"premikanja"
-			],
       "desc": "0=izklopljeno | 1=najmanjša | ... | 9=največja"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Enota za", "temperaturo"],
-				"Enota za",
+      "desc": "Enota za temperaturo (C=celzij | F=fahrenheit)"
-				"temperaturo"
-			],
-			"desc": "Enota za temperaturo <C=celzij | F=fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Več info. na", "mir. zaslonu"],
-				"Več info. na",
-				"mir. zaslonu"
-			],
       "desc": "Prikaži več informacij z manjšo pisavo na mirovalnem zaslonu."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Orientacija", "zaslona"],
-				"Orientacija",
+      "desc": "D=desničar | L=levičar | S=samodejno"
-				"zaslona"
-			],
-			"desc": "S=samodejno | L=levičar | D=desničar"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Pospešena", "temp."],
-				"Pospešena",
-				"temp."
-			],
       "desc": "Temperatura v pospešenem načinu"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Samodejni", "zagon"],
-				"Samodejni",
+      "desc": "Samodejno gretje konice ob vklopu (U=ugasnjeno | S=spajkanje | Z=spanje | V=spanje na sobni temperaturi)"
-				"zagon"
-			],
-			"desc": "Samodejno gretje konice ob vklopu <U=ugasnjeno | S=spajkanje | Z=spanje | V=spanje na sobni temperaturi>"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Utripanje med", "hlajenjem"],
-				"Utripanje med",
-				"hlajenjem"
-			],
       "desc": "Ko je konica še vroča, utripaj prikaz temperature med hlajenjem."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Kalibriram", "temperaturo?"],
-				"Kalibriram",
-				"temperaturo?"
-			],
       "desc": "Kalibracija temperature na konici."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Tovarniške", "nastavitve?"],
-				"Tovarniške",
-				"nastavitve?"
-			],
       "desc": "Ponastavitev vseh nastavitev"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Kalibriram", "vhodno napetost?"],
-				"Kalibriram",
+      "desc": "Kalibracija VIN (nastavitve z gumbi, dolg pritisk za izhod)"
-				"vhodno napetost?"
-			],
-			"desc": "Kalibracija VIN <nastavitve z gumbi, dolg pritisk za izhod>"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Več info na", "zaslonu spaj."],
-				"Več info na",
-				"zaslonu spaj."
-			],
       "desc": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Hitrost", "besedila"],
-				"Hitrost",
+      "desc": "Hitrost, s katero se prikazuje besedilo (P=počasi | H=hitro)"
-				"besedila"
-			],
-			"desc": "Hitrost, s katero se prikazuje besedilo <P=počasi | H=hitro>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["QC", "napetost"],
-				"QC",
-				"napetost"
-			],
       "desc": "Moč napajalnega vira v vatih [W]"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Meja", "moči"],
-				"Meja",
-				"moči"
-			],
       "desc": "Največja dovoljena moč v vatih [W]"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Obrni", "tipki + -?"],
-				"Obrni",
-				"tipki + -?"
-			],
       "desc": "Zamenjaj funkciji gumbov."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Kratka sprememba", "temperature?"],
-				"Kratka sprememba",
-				"temperature?"
-			],
       "desc": "Temperatura se spremeni ob kratkem pritisku na gumb."
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Dolga sprememba", "temperature?"],
-				"Dolga sprememba",
-				"temperature?"
-			],
       "desc": "Temperatura se spremeni ob dolgem pritisku na gumb."
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Pulz", "moči"],
-				"Pulz",
-				"moči"
-			],
       "desc": "Velikost moči za vzdrževanje budnosti."
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Občut.", "Hall son"],
-				"Občut.",
+      "desc": "Občutljivost Hallove sonde za zaznavanje spanja (U=ugasnjen | N=nizka | S=srednja | V=visoka)"
-				"Hall son"
-			],
-			"desc": "Občutljivost Hallove sonde za zaznavanje spanja <U=ugasnjen | N=nizka | S=srednja | V=visoka>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Omogoči", "zaklep gumbov"],
-				"Omogoči",
+      "desc": "Za zaklep med spajkanjem drži oba gumba (O=onemogoči | L=le pospešeno | P=polno)"
-				"zaklep gumbov"
-			],
-			"desc": "Za zaklep med spajkanjem drži oba gumba <O=onemogoči | L=le pospešeno | P=polno>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
-				"wait time"
-			],
       "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Jezik:", " SL Slovenščina"],
-				"Language:",
-				" SL Slovenščina"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_SR_CYRL.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "SR_CYRL",
   "languageLocalName": "Српски",
-	"fonts": [
+  "fonts": ["ascii_basic", "cyrillic"],
-		"ascii_basic",
-		"cyrillic"
-	],
   "messages": {
     "SettingsCalibrationDone": "Калибрација готова",
     "SettingsCalibrationWarning": "Проверите да ли је врх охлађен на собну температуру пре него што наставите",
@@ -28,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Settings were", "reset!"],
-			"Settings were",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"reset!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "Д",
     "SettingLeftChar": "Л",
     "SettingAutoChar": "А",
-		"SettingFastChar": "Б",
+    "SettingOffChar": "O",
     "SettingSlowChar": "С",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "Б",
-		"SettingStartSolderingChar": "T",
+    "SettingStartNoneChar": "И",
-		"SettingStartSleepChar": "S",
+    "SettingStartSolderingChar": "Л",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepChar": "С",
-		"SettingStartNoneChar": "F",
+    "SettingStartSleepOffChar": "X",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Поставке", "лемљења"],
-				"Поставке",
-				"лемљења"
-			],
       "desc": "Поставке режима лемљења."
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Уштеда", "енергије"],
-				"Уштеда",
-				"енергије"
-			],
       "desc": "Поставке режима мировања."
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Корисничко", "сучеље"],
-				"Корисничко",
-				"сучеље"
-			],
       "desc": "Поставке корисничког сучеља."
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Напредне", "поставке"],
-				"Напредне",
-				"поставке"
-			],
       "desc": "Напредне поставке."
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Врста", "напајања"],
-				"Врста",
+      "desc": "Тип напајања; одређује најнижи радни напон. (DC=адаптер [10V] | S=батерија [3,3V по ћелији])"
-				"напајања"
-			],
-			"desc": "Тип напајања; одређује најнижи радни напон. <DC=адаптер (10V), S=батерија (3,3V по ћелији)>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Темп.", "спавања"],
-				"Темп.",
+      "desc": "Температура на коју се спушта лемилица након одређеног времена мировања. (C | F)"
-				"спавања"
-			],
-			"desc": "Температура на коју се спушта лемилица након одређеног времена мировања. <C/F>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Време до", "спавања"],
-				"Време до",
+      "desc": "Време мировања након кога лемилица спушта температуру. (M=минути | S=секунде)"
-				"спавања"
-			],
-			"desc": "Време мировања након кога лемилица спушта температуру. <M=минути, S=секунде>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Време до", "гашења"],
-				"Време до",
+      "desc": "Време мировања након кога се лемилица гаси. (M=минути)"
-				"гашења"
-			],
-			"desc": "Време мировања након кога се лемилица гаси. <M=минути>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Осетљивост", "на покрет"],
-				"Осетљивост",
+      "desc": "Осетљивост сензора покрета. (0=искључено | 1=најмање осетљиво | ... | 9=најосетљивије)"
-				"на покрет"
-			],
-			"desc": "Осетљивост сензора покрета. <0=искључено, 1=најмање осетљиво, 9=најосетљивије>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Јединица", "температуре"],
-				"Јединица",
+      "desc": "Јединице у којима се приказује температура. (C=целзијус | F=фаренхајт)"
-				"температуре"
-			],
-			"desc": "Јединице у којима се приказује температура. <C=целзијус, F=фаренхајт>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Детаљи током", "мировања"],
-				"Детаљи током",
-				"мировања"
-			],
       "desc": "Приказивање детаљних информација на екрану током мировања."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Оријентација", "екрана"],
-				"Оријентација",
+      "desc": "Како је окренут екран. (Д=за десноруке | Л=за леворуке | А=аутоматски)"
-				"екрана"
-			],
-			"desc": "Како је окренут екран. <А=аутоматски, Л=за леворуке, Д=за десноруке>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Темп.", "појачања"],
-				"Темп.",
-				"појачања"
-			],
       "desc": "Температура врха лемилице у току појачања."
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Врући", "старт"],
-				"Врући",
+      "desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се. (И=искључити | Л=лемљење | С=спавати | X=спавати собна температура)"
-				"старт"
-			],
-			"desc": "Лемилица одмах по покретању прелази у режим лемљења и греје се."
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Упозорење", "при хлађењу"],
-				"Упозорење",
-				"при хлађењу"
-			],
       "desc": "Приказ температуре трепће приликом хлађења докле год је врх и даље врућ."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Калибрација", "температуре"],
-				"Калибрација",
-				"температуре"
-			],
       "desc": "Калибрисање одступања температуре врха у односу на дршку."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Фабричке", "поставке"],
-				"Фабричке",
-				"поставке"
-			],
       "desc": "Враћање свих поставки на фабричке вредности."
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Калибрација", "улазног напона"],
-				"Калибрација",
-				"улазног напона"
-			],
       "desc": "Калибрисање улазног напона. Подешава се на тастере; дуги притисак за крај."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Детаљи током", "лемљења"],
-				"Детаљи током",
-				"лемљења"
-			],
       "desc": "Приказивање детаљних информација на екрану током лемљења."
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Брзина", "порука"],
-				"Брзина",
+      "desc": "Брзина кретања описних порука попут ове. (С=споро | Б=брзо)"
-				"порука"
-			],
-			"desc": "Брзина кретања описних порука попут ове. <С=споро, Б=брзо>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Улазна", "снага"],
-				"Улазна",
-				"снага"
-			],
       "desc": "Снага напајања у ватима."
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Power", "Limit"],
-				"Power",
+      "desc": "Maximum power the iron can use (Watts)"
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Key +-", "reverse?"],
-				"Key +-",
-				"reverse?"
-			],
       "desc": "Reverse the tip temperature change buttons plus minus assignment."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp change", "short?"],
-				"Temp change",
-				"short?"
-			],
       "desc": "Temperature change steps on short button press!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp change", "long?"],
-				"Temp change",
-				"long?"
-			],
       "desc": "Temperature change steps on long button press!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "Pulse W"],
-				"Power",
-				"Pulse W"
-			],
       "desc": "Keep awake pulse power intensity"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
+      "desc": "Time to wait before triggering every keep-awake pulse (x 2.5с)"
-				"wait time"
-			],
-			"desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
+      "desc": "Keep-awake-pulse duration (x 250мс)"
-				"duration"
-			],
-			"desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Jезик:", " SR      Српски"],
-				"Language:",
-				" SR      Српски"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_SR_LATN.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "SR_LATN",
   "languageLocalName": "Srpski",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Kalibracija gotova",
     "SettingsCalibrationWarning": "Proverite da li je vrh ohlađen na sobnu temperaturu pre nego što nastavite",
@@ -28,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Settings were", "reset!"],
-			"Settings were",
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"reset!"
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "D",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "B",
+    "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "B",
-		"SettingStartSolderingChar": "T",
+    "SettingStartNoneChar": "I",
+    "SettingStartSolderingChar": "L",
     "SettingStartSleepChar": "S",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepOffChar": "X",
-		"SettingStartNoneChar": "F",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -67,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Postavke", "lemljenja"],
-				"Postavke",
-				"lemljenja"
-			],
       "desc": "Postavke režima lemljenja."
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Ušteda", "energije"],
-				"Ušteda",
-				"energije"
-			],
       "desc": "Postavke režima mirovanja."
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Korisničko", "sučelje"],
-				"Korisničko",
-				"sučelje"
-			],
       "desc": "Postavke korisničkog sučelja."
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Napredne", "postavke"],
-				"Napredne",
-				"postavke"
-			],
       "desc": "Napredne postavke."
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Vrsta", "napajanja"],
-				"Vrsta",
+      "desc": "Tip napajanja; određuje najniži radni napon. (DC=adapter [10V], S=baterija [3,3V po ćeliji])"
-				"napajanja"
-			],
-			"desc": "Tip napajanja; određuje najniži radni napon. <DC=adapter (10V), S=baterija (3,3V po ćeliji)>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Temp.", "spavanja"],
-				"Temp.",
+      "desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. (C | F)"
-				"spavanja"
-			],
-			"desc": "Temperatura na koju se spušta lemilica nakon određenog vremena mirovanja. <C/F>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Vreme do", "spavanja"],
-				"Vreme do",
+      "desc": "Vreme mirovanja nakon koga lemilica spušta temperaturu. (M=minuti | S=sekunde)"
-				"spavanja"
-			],
-			"desc": "Vreme mirovanja nakon koga lemilica spušta temperaturu. <M=minuti, S=sekunde>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Vreme do", "gašenja"],
-				"Vreme do",
+      "desc": "Vreme mirovanja nakon koga se lemilica gasi. (M=minuti)"
-				"gašenja"
-			],
-			"desc": "Vreme mirovanja nakon koga se lemilica gasi. <M=minuti>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Osetljivost", "na pokret"],
-				"Osetljivost",
+      "desc": "Osetljivost senzora pokreta. (0=isključeno | 1=najmanje osetljivo | ... | 9=najosetljivije)"
-				"na pokret"
-			],
-			"desc": "Osetljivost senzora pokreta. <0=isključeno, 1=najmanje osetljivo, 9=najosetljivije>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Jedinica", "temperature"],
-				"Jedinica",
+      "desc": "Jedinice u kojima se prikazuje temperatura. (C=celzijus | F=farenhajt)"
-				"temperature"
-			],
-			"desc": "Jedinice u kojima se prikazuje temperatura. <C=celzijus, F=farenhajt>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Detalji tokom", "mirovanja"],
-				"Detalji tokom",
-				"mirovanja"
-			],
       "desc": "Prikazivanje detaljnih informacija na ekranu tokom mirovanja."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Orijentacija", "ekrana"],
-				"Orijentacija",
+      "desc": "Kako je okrenut ekran. (D=za desnoruke | L=za levoruke | A=automatski)"
-				"ekrana"
-			],
-			"desc": "Kako je okrenut ekran. <A=automatski, L=za levoruke, D=za desnoruke>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Temp.", "pojačanja"],
-				"Temp.",
-				"pojačanja"
-			],
       "desc": "Temperatura vrha lemilice u toku pojačanja."
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Vrući", "start"],
-				"Vrući",
+      "desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se. (I=isključiti | L=lemljenje | S=spavati | X=spavati sobna temperatura)"
-				"start"
-			],
-			"desc": "Lemilica odmah po pokretanju prelazi u režim lemljenja i greje se."
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Upozorenje", "pri hlađenju"],
-				"Upozorenje",
-				"pri hlađenju"
-			],
       "desc": "Prikaz temperature trepće prilikom hlađenja dokle god je vrh i dalje vruć."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Kalibracija", "temperature"],
-				"Kalibracija",
-				"temperature"
-			],
       "desc": "Kalibrisanje odstupanja temperature vrha u odnosu na dršku."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Fabričke", "postavke"],
-				"Fabričke",
-				"postavke"
-			],
       "desc": "Vraćanje svih postavki na fabričke vrednosti."
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Kalibracija", "ulaznog napona"],
-				"Kalibracija",
-				"ulaznog napona"
-			],
       "desc": "Kalibrisanje ulaznog napona. Podešava se na tastere; dugi pritisak za kraj."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Detalji tokom", "lemljenja"],
-				"Detalji tokom",
-				"lemljenja"
-			],
       "desc": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja."
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Brzina", "poruka"],
-				"Brzina",
+      "desc": "Brzina kretanja opisnih poruka poput ove. (S=sporo | B=brzo)"
-				"poruka"
-			],
-			"desc": "Brzina kretanja opisnih poruka poput ove. <S=sporo, B=brzo>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Ulazna", "snaga"],
-				"Ulazna",
-				"snaga"
-			],
       "desc": "Snaga napajanja u vatima."
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Power", "Limit"],
-				"Power",
+      "desc": "Maximum power the iron can use (Watts)"
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Key +-", "reverse?"],
-				"Key +-",
-				"reverse?"
-			],
       "desc": "Reverse the tip temperature change buttons plus minus assignment."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp change", "short?"],
-				"Temp change",
-				"short?"
-			],
       "desc": "Temperature change steps on short button press!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp change", "long?"],
-				"Temp change",
-				"long?"
-			],
       "desc": "Temperature change steps on long button press!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "Pulse W"],
-				"Power",
-				"Pulse W"
-			],
       "desc": "Keep awake pulse power intensity"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
-				"wait time"
-			],
       "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Jezik:", " SR      Srpski"],
-				"Language:",
-				" SR      Srpski"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_SV.json

@@ -1,317 +1,207 @@
 {
   "languageCode": "SV",
   "languageLocalName": "Svenska",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
-		"SettingsCalibrationDone": "Calibration done!",
+    "SettingsCalibrationWarning": "Se till att spetsen är rumstemererad innan du fortsätter!",
-		"SettingsCalibrationWarning": "Please ensure the tip is at room temperature before continuing!",
+    "SettingsResetWarning": "Är du säker på att du vill återställa inställningarna?",
-		"SettingsResetWarning": "Are you sure you want to reset settings to default values?",
     "UVLOWarningString": "DC LÅG",
     "UndervoltageString": "Underspänning",
     "InputVoltageString": "Inspän. V: ",
-		"WarningTipTempString": "Spetstemp: ",
-		"BadTipString": "SPETSFEL",
     "SleepingSimpleString": "Zzzz",
     "SleepingAdvancedString": "Viloläge...",
-		"WarningSimpleString": "VARM",
-		"WarningAdvancedString": "!! SPETS VARM !!",
     "SleepingTipAdvancedString": "Spets:",
-		"IdleTipString": "Spets:",
+    "IdleTipString": "Spts:",
-		"IdleSetString": " Ange:",
+    "IdleSetString": " Ang:",
     "TipDisconnectedString": "SPETS URTAGEN",
     "SolderingAdvancedPowerPrompt": "Ström: ",
-		"OffString": "Av",
+    "OffString": "Av"
-		"YourGainMessage": "Your gain:"
   },
   "messagesWarn": {
     "ResetOKMessage": "Reset OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Inställningar", "återställda"],
-			"Settings were",
+    "NoAccelerometerMessage": ["Ingen", "accelerometer"],
-			"reset!"
+    "NoPowerDeliveryMessage": ["Ingen USB-PD IC", "hittades!"],
-		],
+    "LockingKeysString": "LÅST",
-		"NoAccelerometerMessage": [
+    "UnlockingKeysString": "UPPLÅST",
-			"No accelerometer",
+    "WarningKeysLockedString": "!LÅST!",
-			"detected!"
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
-		"LockingKeysString": " LOCKED",
-		"UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
   },
   "characters": {
     "SettingRightChar": "H",
     "SettingLeftChar": "V",
     "SettingAutoChar": "A",
-		"SettingFastChar": "S",
+    "SettingOffChar": "A",
     "SettingSlowChar": "L",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "S",
-		"SettingStartSolderingChar": "T",
+    "SettingStartNoneChar": "A",
-		"SettingStartSleepChar": "S",
+    "SettingStartSolderingChar": "L",
-		"SettingStartSleepOffChar": "O",
+    "SettingStartSleepChar": "V",
-		"SettingStartNoneChar": "F",
+    "SettingStartSleepOffChar": "R",
-		"SettingSensitivityOff": "O",
+    "SettingSensitivityOff": "A",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
     "SettingSensitivityHigh": "H",
-		"SettingLockDisableChar": "D",
+    "SettingLockDisableChar": "A",
-		"SettingLockBoostChar": "B",
+    "SettingLockBoostChar": "T",
     "SettingLockFullChar": "F",
     "SettingNAChar": "N/A"
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Effekt-", "inställning"],
-				"Power",
+      "desc": "Effektinställningar"
-				"settings"
-			],
-			"desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Lödnings-", "inställning"],
-				"Lödnings-",
-				"inställningar"
-			],
       "desc": "Lödningsinställningar"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Vilo-", "läge"],
-				"Vilo-",
-				"lägen"
-			],
       "desc": "Viloläges-inställningar"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Användar-", "gränssnitt"],
-				"Användar-",
-				"gränssnitt"
-			],
       "desc": "Användargränssnitts-inställningar"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Avancerade", "alternativ"],
-				"Avancerade",
-				"alternativ"
-			],
       "desc": "Avancerade alternativ"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Ström-", "källa"],
-				"Ström-",
+      "desc": "Strömkälla. Anger lägsta spänning. (DC 10V) (S 3.3V per cell)"
-				"källa"
-			],
-			"desc": "Strömkälla. Anger lägsta spänning. <DC 10V> <S 3.3V per cell>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Vilo-", "temp"],
-				"Vilo-",
+      "desc": "Vilotemperatur (C)"
-				"temp"
-			],
-			"desc": "Vilotemperatur <C>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Vilo-", "timeout"],
-				"Vilo-",
+      "desc": "Vilo-timeout (M=Minuter | S=Sekunder)"
-				"timeout"
-			],
-			"desc": "Vilo-timeout <Minuter/Seconder>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Avstängn.", "timeout"],
-				"Avstängn.",
+      "desc": "Avstängnings-timeout (Minuter)"
-				"timeout"
-			],
-			"desc": "Avstängnings-timeout <Minuter>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Rörelse-", "känslighet"],
-				"Rörelse-",
+      "desc": "Rörelsekänslighet (0=Av | 1=minst känslig | ... | 9=mest känslig)"
-				"känslighet"
-			],
-			"desc": "Rörelsekänslighet <0.Av 1.minst känslig 9.mest känslig>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Temperatur-", "enheter"],
-				"Temperatur-",
+      "desc": "Temperaturenhet (C=Celsius | F=Fahrenheit)"
-				"enheter"
-			],
-			"desc": "Temperaturenhet <C=Celsius F=Fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Detaljerad", "vid inaktiv"],
-				"Detaljerad",
-				"vid inaktiv"
-			],
       "desc": "Visa detaljerad information i mindre typsnitt när inaktiv."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Visnings", "läge"],
-				"Visnings",
+      "desc": "Visningsläge (H=Högerhänt | V=Vänsterhänt | A=Automatisk)"
-				"läge"
-			],
-			"desc": "Visningsläge <A. Automatisk V. Vänsterhänt H. Högerhänt>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Turbo-", "temp"],
-				"Turbo-",
-				"temp"
-			],
       "desc": "Temperatur i \"turbo\"-läge"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Auto", "start"],
-				"Auto",
+      "desc": "Startar automatiskt lödpennan vid uppstart. (A=Av | L=Lödning | V=Viloläge | R=Viloläge Rumstemperatur)"
-				"start"
-			],
-			"desc": "Startar automatiskt lödpennan vid uppstart. T=Lödning, S=Viloläge, F=Av"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Nedkylnings-", "blink"],
-				"Nedkylnings-",
-				"blink"
-			],
       "desc": "Blinka temperaturen medan spetsen kyls av och fortfarande är varm."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Kalibrera", "temperatur?"],
-				"Kalibrera",
-				"temperatur?"
-			],
       "desc": "Kalibrera spets-kompensation."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Fabriks-", "inställ?"],
-				"Fabriks-",
-				"inställ?"
-			],
       "desc": "Återställ alla inställningar"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Kalibrera", "inspänning?"],
-				"Kalibrera",
-				"inspänning?"
-			],
       "desc": "Inspänningskalibrering. Knapparna justerar, håll inne för avslut"
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Detaljerad", "lödng.skärm"],
-				"Detaljerad",
-				"lödng.skärm"
-			],
       "desc": "Visa detaljerad information vid lödning"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Beskrivning", "rullhast."],
-				"Beskrivning",
-				"rullhast."
-			],
       "desc": "Hastighet som den här texten rullar i"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["QC", "spänning"],
-				"Power",
+      "desc": "Maximal QC-spänning enheten skall efterfråga"
-				"Wattage"
+    },
-			],
+    "PDNegTimeout": {
-			"desc": "Power Wattage of the power adapter used"
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
     },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Max-", "effekt"],
-				"Power",
+      "desc": "Maximal effekt som enheten kan använda (Watt)"
-				"Limit"
-			],
-			"desc": "Maximum power the iron can use <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Omvända", "+- knappar"],
-				"Key +-",
+      "desc": "Omvänd ordning för temperaturjustering via plus/minus knapparna"
-				"reverse?"
-			],
-			"desc": "Reverse the tip temperature change buttons plus minus assignment."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp.just", "korttryck"],
-				"Temp change",
+      "desc": "Temperaturjustering vid kort knapptryckning"
-				"short?"
-			],
-			"desc": "Temperature change steps on short button press!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp.just", "långtryck"],
-				"Temp change",
+      "desc": "Temperaturjustering vid lång knapptryckning"
-				"long?"
-			],
-			"desc": "Temperature change steps on long button press!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "Pulse W"],
-				"Power",
-				"Pulse W"
-			],
       "desc": "Keep awake pulse power intensity"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Sensor-", "känslght"],
-				"Hall Eff",
+      "desc": "Känslighet för halleffekt-sensorn för viloläges-detektering (A=Av | L=Låg | M=Medium | H=Hög)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Tillåt lås", "via knappar"],
-				"Allow buttons",
+      "desc": "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)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimim-", "spänning"],
-				"Minimum",
+      "desc": "Minimumspänning per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
+      "desc": "Loopa animationer i huvudmeny"
-				"loop"
-			],
-			"desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.-", "hastighet"],
-				"Anim.",
+      "desc": "Animationshastighet för ikoner i menyer (A=av | L=långsam | M=medel | S=snabb)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
-				"wait time"
-			],
       "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Språk:", " SV     Svenska"],
-				"Language:",
-				" SV     Svenska"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_TR.json

@@ -1,10 +1,7 @@
 {
   "languageCode": "TR",
   "languageLocalName": "Türkçe",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
-		"latin_extended"
-	],
   "messages": {
     "SettingsCalibrationDone": "Kalibrasyon tamamlandı!",
     "SettingsCalibrationWarning": "Lütfen devam etmeden önce ucun oda sıcaklığında olduğunu garantiye alın!",
@@ -27,38 +24,27 @@
     "YourGainMessage": "Kazancınız:"
   },
   "messagesWarn": {
-		"ResetOKMessage": [
+    "ResetOKMessage": ["Sıfırlama Tamam", ""],
-			"Sıfırlama Tamam",
+    "SettingsResetMessage": ["Ayarlar", "Sıfırlandı"],
-			""
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-		],
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		"SettingsResetMessage": [
-			"Ayarlar",
-			"Sıfırlandı"
-		],
-		"NoAccelerometerMessage": [
-			"No accelerometer",
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "LOCKED",
     "UnlockingKeysString": "UNLOCKED",
-		"WarningKeysLockedString": "!LOCKED!"
+    "WarningKeysLockedString": "!LOCKED!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "R",
     "SettingLeftChar": "L",
     "SettingAutoChar": "A",
-		"SettingFastChar": "F",
+    "SettingOffChar": "O",
     "SettingSlowChar": "S",
     "SettingMediumChar": "M",
-		"SettingOffChar": "O",
+    "SettingFastChar": "F",
-		"SettingStartSolderingChar": "T",
+    "SettingStartNoneChar": "K",
-		"SettingStartSleepChar": "S",
+    "SettingStartSolderingChar": "L",
+    "SettingStartSleepChar": "U",
     "SettingStartSleepOffChar": "O",
-		"SettingStartNoneChar": "F",
     "SettingSensitivityOff": "O",
     "SettingSensitivityLow": "L",
     "SettingSensitivityMedium": "M",
@@ -70,272 +56,170 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Power", "settings"],
-				"Power",
-				"settings"
-			],
       "desc": "Power settings"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Lehimleme", "Ayarları"],
-				"Lehimleme",
-				"Ayarları"
-			],
       "desc": "Lehimleme Ayarları"
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Uyku", "Modları"],
-				"Uyku",
-				"Modları"
-			],
       "desc": "Güç Tasarrufu Ayarları"
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Kullanıcı", "Arayüzü"],
-				"Kullanıcı",
-				"Arayüzü"
-			],
       "desc": "Kullanıcı Arayüzü Ayarları"
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Gelişmiş", "Ayarlar"],
-				"Gelişmiş",
-				"Ayarlar"
-			],
       "desc": "Gelişmiş Ayarlar"
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["GÇKYN", ""],
-				"GÇKYN",
+      "desc": "\"Güç Kaynağı\". En düşük çalışma voltajını ayarlar. (DC 10V) (S 3.3V hücre başına)"
-				""
-			],
-			"desc": "\"Güç Kaynağı\". En düşük çalışma voltajını ayarlar. <DC 10V> <S 3.3V hücre başına>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["BKSC", ""],
-				"BKSC",
+      "desc": "Bekleme Modu Sıcaklığı (C)"
-				""
-			],
-			"desc": "Bekleme Modu Sıcaklığı <C>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["BMZA", ""],
-				"BMZA",
+      "desc": "Bekleme Modu Zaman Aşımı (Dakika | Saniye)"
-				""
-			],
-			"desc": "Bekleme Modu Zaman Aşımı <Dakika/Saniye>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["KPTZA", ""],
-				"KPTZA",
+      "desc": "Kapatma Zaman Aşımı (Dakika)"
-				""
-			],
-			"desc": "Kapatma Zaman Aşımı <Dakika>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["HARHAS", ""],
-				"HARHAS",
+      "desc": "Hareket Hassasiyeti (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"
-				""
-			],
-			"desc": "Hareket Hassasiyeti <0.Kapalı 1.En az duyarlı 9.En duyarlı>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["SCKBRM", ""],
-				"SCKBRM",
+      "desc": "Sıcaklık Birimi (C=Celsius | F=Fahrenheit)"
-				""
-			],
-			"desc": "Sıcaklık Birimi <C=Celsius F=Fahrenheit>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["AYRBİL", ""],
-				"AYRBİL",
-				""
-			],
       "desc": "Boş ekranda ayrıntılı bilgileri daha küçük bir yazı tipi ile göster."
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["GRNYÖN", ""],
-				"GRNYÖN",
+      "desc": "Görüntü Yönlendirme (R=Sağlak | L=Solak | A=Otomatik)"
-				""
-			],
-			"desc": "Görüntü Yönlendirme <A. Otomatik L. Solak R. Sağlak>"
     },
     "BoostEnabled": {
-			"text2": [
+      "text2": ["YÜKPER", ""],
-				"YÜKPER",
-				""
-			],
       "desc": "Lehimleme yaparken ön tuşa basmak anlık sıcaklık yükselişi sağlar. (450C)"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["YKSC", ""],
-				"YKSC",
-				""
-			],
       "desc": "Yüksek Performans Modu Sıcaklığı"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["OTOBAŞ", ""],
-				"OTOBAŞ",
+      "desc": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. (K=Kapalı | L=Lehimleme Modu | U=Uyku Modu | O=Uyku Modu Oda Sıcaklığı)"
-				""
-			],
-			"desc": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. T=Lehimleme Modu, S= Uyku Modu,F=Kapalı"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["SĞGÖST", ""],
-				"SĞGÖST",
-				""
-			],
       "desc": "Soğutma ekranında uç hala sıcakken derece gösterilsin."
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["SCK KAL?", ""],
-				"SCK KAL?",
-				""
-			],
       "desc": "Ucu kalibre et."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["SIFIRLA?", ""],
-				"SIFIRLA?",
-				""
-			],
       "desc": "Bütün ayarları sıfırlar"
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["VOL KAL?", ""],
-				"VOL KAL?",
-				""
-			],
       "desc": "Voltaj Girişi Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["GELLHM", ""],
-				"GELLHM",
-				""
-			],
       "desc": "\"Gelişmiş Lehimleme\" Lehimleme yaparken detaylı bilgi göster"
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["YZKYHZ", ""],
-				"YZKYHZ",
+      "desc": "Bu yazının kayma hızı (S=Yavaş | F=Hızlı)"
-				""
-			],
-			"desc": "Bu yazının kayma hızı S= Yavaş, F= Hızlı"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["QC", "Voltage"],
-				"QC",
-				"Voltage"
-			],
       "desc": "Desired max QC Voltage negotiated for"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerInput": {
-			"text2": [
+      "text2": ["Güç", "Miktarı(W)"],
-				"Güç",
-				"Miktarı(W)"
-			],
       "desc": "Kullanılan adaptörün watt biriminden güç miktarı"
     },
     "PowerLimitEnable": {
-			"text2": [
+      "text2": ["P Limit", "Enable"],
-				"P Limit",
-				"Enable"
-			],
       "desc": "Güç sınırlamayı aç"
     },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Power", "Limit"],
-				"Power",
+      "desc": "Havyanın kullanacağı en yüksek güç (Watts)"
-				"Limit"
-			],
-			"desc": "Havyanın kullanacağı en yüksek güç <Watts>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Key +-", "reverse?"],
-				"Key +-",
-				"reverse?"
-			],
       "desc": "\"Düğme Yerleri Rotasyonu\" Sıcaklık ayar düğmelerinin yerini değiştirin"
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Temp change", "short?"],
-				"Temp change",
-				"short?"
-			],
       "desc": "Kısa basışlardaki sıcaklık derecesi atlama oranı"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Temp change", "long?"],
-				"Temp change",
-				"long?"
-			],
       "desc": "Uzun başışlardaki sıcaklık derecesi atlama oranı"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Power", "Pulse W"],
-				"Power",
-				"Pulse W"
-			],
       "desc": "Güç girişi voltajı ölçüm yoğunluğunu sık tut."
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Hall Eff", "Sensitivity"],
-				"Hall Eff",
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Allow buttons", "locking"],
-				"Allow buttons",
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Minimum", "voltage"],
-				"Minimum",
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Anim.", "loop"],
-				"Anim.",
-				"loop"
-			],
       "desc": "Loop icon animations in root menu"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Anim.", "speed"],
-				"Anim.",
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Power pulse",
-				"wait time"
-			],
       "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Power pulse", "duration"],
-				"Power pulse",
-				"duration"
-			],
       "desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Dil:", " TR      Türkçe"],
-				"Language:",
-				" TR      Türkçe"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_UK.json

@@ -1,15 +1,11 @@
 {
   "languageCode": "UK",
   "languageLocalName": "Українська",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended", "cyrillic"],
-		"ascii_basic",
-		"latin_extended",
-		"cyrillic"
-	],
   "messages": {
     "SettingsCalibrationDone": "Калібрування виконане!",
     "SettingsCalibrationWarning": "Переконайтеся, що жало охололо до кімнатної температури, перш ніж продовжувати!",
-		"SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? <A - Так, В - Ні>",
+    "SettingsResetWarning": "Ви дійсно хочете скинути налаштування до значень за замовчуванням? (A=Так, В=Ні)",
     "UVLOWarningString": "АККУМ--",
     "UndervoltageString": "Низька напруга",
     "InputVoltageString": "Жив.(B): ",
@@ -29,34 +25,26 @@
   },
   "messagesWarn": {
     "ResetOKMessage": "Скид. OK",
-		"SettingsResetMessage": [
+    "SettingsResetMessage": ["Налаштування", "скинуті!"],
-			"Налаштування",
+    "NoAccelerometerMessage": ["Акселерометр", "не виявлено!"],
-			"скинуті!"
+    "NoPowerDeliveryMessage": ["USB-PD IC", "не виявлено!"],
-		],
-		"NoAccelerometerMessage": [
-			"Акселерометр",
-			"не виявлено!"
-		],
-		"NoPowerDeliveryMessage": [
-			"USB-PD IC",
-			"не виявлено!"
-		],
     "LockingKeysString": "ЗАБЛОК.",
     "UnlockingKeysString": "РОЗБЛОК.",
-		"WarningKeysLockedString": "!ЗАБЛОК!"
+    "WarningKeysLockedString": "!ЗАБЛОК!",
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
   },
   "characters": {
     "SettingRightChar": "П",
     "SettingLeftChar": "Л",
     "SettingAutoChar": "A",
-		"SettingFastChar": "Ш",
+    "SettingOffChar": "B",
     "SettingSlowChar": "П",
     "SettingMediumChar": "M",
-		"SettingOffChar": "B",
+    "SettingFastChar": "Ш",
+    "SettingStartNoneChar": "В",
     "SettingStartSolderingChar": "П",
     "SettingStartSleepChar": "О",
     "SettingStartSleepOffChar": "К",
-		"SettingStartNoneChar": "В",
     "SettingSensitivityOff": "В",
     "SettingSensitivityLow": "Н",
     "SettingSensitivityMedium": "С",
@@ -68,251 +56,158 @@
   },
   "menuGroups": {
     "PowerMenu": {
-			"text2": [
+      "text2": ["Параметри", "живлення"],
-				"Параметри",
-				"живлення"
-			],
       "desc": "Джерело живлення, та мінамільна напруга на комірку"
     },
     "SolderingMenu": {
-			"text2": [
+      "text2": ["Параметри", "пайки"],
-				"Параметри",
-				"пайки"
-			],
       "desc": "Налаштування для режиму пайки. Діють при увімкненому жалі."
     },
     "PowerSavingMenu": {
-			"text2": [
+      "text2": ["Режим", "сну"],
-				"Режим",
-				"сну"
-			],
       "desc": "Налаштування при бездіяльності. Корисно що б не обпектися і з часом не спалити житло."
     },
     "UIMenu": {
-			"text2": [
+      "text2": ["Параметри", "інтерфейсу"],
-				"Параметри",
-				"інтерфейсу"
-			],
       "desc": "Параметри користувальницького інтерфейсу."
     },
     "AdvancedMenu": {
-			"text2": [
+      "text2": ["Додаткові", "параметри"],
-				"Додаткові",
-				"параметри"
-			],
       "desc": "Розширені налаштування. Додаткові зручності."
     }
   },
   "menuOptions": {
     "DCInCutoff": {
-			"text2": [
+      "text2": ["Джерело", "живлення"],
-				"Джерело",
+      "desc": "Встановлює напругу відсічки. (DC - 10V) (3S - 9.9V | 4S - 13.2V | 5S - 16.5V | 6S - 19.8V)"
-				"живлення"
-			],
-			"desc": "Встановлює напругу відсічки. <DC - 10V, 3S - 9.9V, 4S - 13.2V, 5S - 16.5V, 6S - 19.8V>"
     },
     "SleepTemperature": {
-			"text2": [
+      "text2": ["Темпер.", "сну"],
-				"Темпер.",
+      "desc": "Температура режиму очікування (C° | F°)"
-				"сну"
-			],
-			"desc": "Температура режиму очікування <C°/F°>"
     },
     "SleepTimeout": {
-			"text2": [
+      "text2": ["Тайм-аут", "сну"],
-				"Тайм-аут",
+      "desc": "Час до переходу в режим очікування (Хвилини | Секунди)"
-				"сну"
-			],
-			"desc": "Час до переходу в режим очікування <Хвилини/Секунди>"
     },
     "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Часу до", "вимкнення"],
-				"Часу до",
+      "desc": "Час до вимкнення (Хвилини)"
-				"вимкнення"
-			],
-			"desc": "Час до вимкнення <Хвилини>"
     },
     "MotionSensitivity": {
-			"text2": [
+      "text2": ["Чутливість", "сенсору руху"],
-				"Чутливість",
+      "desc": "Акселерометр (0=Вимк. | 1=мін. чутливості | ... | 9=макс. чутливості)"
-				"сенсору руху"
-			],
-			"desc": "Акселерометр <0 - Вимк. 1 - мін. чутливості 9 - макс. чутливості>"
     },
     "TemperatureUnit": {
-			"text2": [
+      "text2": ["Формат темпе-", "ратури(C°/F°)"],
-				"Формат темпе-",
+      "desc": "Одиниця виміру температури (C=Цельсій | F=Фаренгейт)"
-				"ратури(C°/F°)"
-			],
-			"desc": "Одиниця виміру температури <C - Цельсій, F - Фаренгейт>"
     },
     "AdvancedIdle": {
-			"text2": [
+      "text2": ["Детальний ре-", "жим очікуван."],
-				"Детальний ре-",
-				"жим очікуван."
-			],
       "desc": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
     },
     "DisplayRotation": {
-			"text2": [
+      "text2": ["Автоповорот", "екрану"],
-				"Автоповорот",
+      "desc": "Орієнтація дисплея (П=Правша | Л=Лівша | A=Автоповорот)"
-				"екрану"
-			],
-			"desc": "Орієнтація дисплея <A - Автоповорот, Л - Лівша, П - Правша>"
     },
     "BoostTemperature": {
-			"text2": [
+      "text2": ["Темпер.", "Турбо"],
-				"Темпер.",
-				"Турбо"
-			],
       "desc": "Температура в \"Турбо\" режимі"
     },
     "AutoStart": {
-			"text2": [
+      "text2": ["Гарячий", "старт"],
-				"Гарячий",
+      "desc": "Режим в якому запускається паяльник при ввімкненні (В=Вимк. | П=Пайка | О=Очікування | К=Очікування при кімн. темп.)"
-				"старт"
-			],
-			"desc": "Режим в якому запускається паяльник при ввімкненні <П=Пайка, О=Очікування, К=Очікування при кімн. темп., В=Вимк.>"
     },
     "CooldownBlink": {
-			"text2": [
+      "text2": ["Показ t° при", "охолодженні"],
-				"Показ t° при",
-				"охолодженні"
-			],
       "desc": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран моргає"
     },
     "TemperatureCalibration": {
-			"text2": [
+      "text2": ["Калібрування", "температури"],
-				"Калібрування",
-				"температури"
-			],
       "desc": "Калібрування температурного датчика."
     },
     "SettingsReset": {
-			"text2": [
+      "text2": ["Скинути всі", "налаштування?"],
-				"Скинути всі",
-				"налаштування?"
-			],
       "desc": "Скидання всіх параметрів до стандартних значень."
     },
     "VoltageCalibration": {
-			"text2": [
+      "text2": ["Калібрування", "напруги"],
-				"Калібрування",
-				"напруги"
-			],
       "desc": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
     },
     "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Детальний", "режим пайки"],
-				"Детальний",
-				"режим пайки"
-			],
       "desc": "Показувати детальну інформацію при пайці."
     },
     "ScrollingSpeed": {
-			"text2": [
+      "text2": ["Швидкість", "тексту"],
-				"Швидкість",
+      "desc": "Швидкість прокрутки тексту (П=повільно | Ш=швидко)"
-				"тексту"
-			],
-			"desc": "Швидкість прокрутки тексту <П=повільно, Ш=швидко>"
     },
     "QCMaxVoltage": {
-			"text2": [
+      "text2": ["Потужність", "дж. живлення"],
-				"Потужність",
-				"дж. живлення"
-			],
       "desc": "Потужність джерела живлення в Ватах"
     },
+    "PDNegTimeout": {
+      "text2": ["PD", "timeout"],
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+    },
     "PowerLimit": {
-			"text2": [
+      "text2": ["Макс.", "потуж."],
-				"Макс.",
+      "desc": "Макс. потужність, яку може використовувати паяльник (Ват)"
-				"потуж."
-			],
-			"desc": "Макс. потужність, яку може використовувати паяльник <Ват>"
     },
     "ReverseButtonTempChange": {
-			"text2": [
+      "text2": ["Інвертувати", "кнопки +-?"],
-				"Інвертувати",
-				"кнопки +-?"
-			],
       "desc": "Інвертувати кнопки зміни температури."
     },
     "TempChangeShortStep": {
-			"text2": [
+      "text2": ["Зміна темп.", "коротко?"],
-				"Зміна темп.",
-				"коротко?"
-			],
       "desc": "Змінювати температуру при короткому натисканні!"
     },
     "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Зміна темп.", "довго?"],
-				"Зміна темп.",
-				"довго?"
-			],
       "desc": "Змінювати температуру при довгому натисканні!"
     },
     "PowerPulsePower": {
-			"text2": [
+      "text2": ["Пульс.", "Навантаж."],
-				"Пульс.",
-				"Навантаж."
-			],
       "desc": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії)"
     },
     "HallEffSensitivity": {
-			"text2": [
+      "text2": ["Чутливість", "Ефекту Холла"],
-				"Чутливість",
+      "desc": "Чутливість датчика ефекту Холла при виявленні сну (В=Вимк | Н=Низький | С=Середній | М=Макс)"
-				"Ефекту Холла"
-			],
-			"desc": "Чутливість датчика ефекту Холла при виявленні сну <В=Вимк,Н=Низький,С=Середній,М=Макс>"
     },
     "LockingMode": {
-			"text2": [
+      "text2": ["Дозволити", "блок. кнопок"],
-				"Дозволити",
+      "desc": "Під час пайки тривале натискання обох кнопок заблокує їх (В=Вимк | Т=Тільки турбо | П=Повне)"
-				"блок. кнопок"
-			],
-			"desc": "Під час пайки тривале натискання обох кнопок заблокує їх <В=Вимк, Т=Тільки турбо, П=Повне>"
     },
     "MinVolCell": {
-			"text2": [
+      "text2": ["Мін.", "напруга"],
-				"Мін.",
+      "desc": "Мінімальна дозволена напруга на комірку (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-				"напруга"
-			],
-			"desc": "Мінімальна дозволена напруга на комірку <В вольтах> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
     },
     "AnimLoop": {
-			"text2": [
+      "text2": ["Зациклена", "анімація"],
-				"Зациклена",
-				"анімація"
-			],
       "desc": "Зациклена анімація іконок в головному меню"
     },
     "AnimSpeed": {
-			"text2": [
+      "text2": ["Швидкість", "анімації"],
-				"Швидкість",
+      "desc": "Швидкість анімації іконок у головному меню (Мілісекунди) (В=Вимк | Н=Низькa | С=Середня | М=Макс)"
-				"анімації"
-			],
-			"desc": "Швидкість анімації іконок у головному меню <Мілісекунди> <В=Вимк, Н=Низькa, С=Середня, М=Макс>"
     },
     "PowerPulseWait": {
-			"text2": [
+      "text2": ["Час між імп.", "напруги"],
-				"Power pulse",
+      "desc": "Час між імпульсами напруги яка не дає PowerBank-у заснути (x 2.5с)"
-				"wait time"
-			],
-			"desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
     },
     "PowerPulseDuration": {
-			"text2": [
+      "text2": ["Тривалість", "імп. напруги"],
-				"Power pulse",
+      "desc": "Тривалість імпульсу напруги яка не дає PowerBank-у заснути (x 250мс)"
-				"duration"
-			],
-			"desc": "Keep-awake-pulse duration (x 250ms)"
     },
     "LanguageSwitch": {
-			"text2": [
+      "text2": ["Мова:", " UK  Українська"],
-				"Language:",
-				" UK  Українська"
-			],
       "desc": ""
+    },
+    "Brightness": {
+      "text2": ["Screen", "Brightness"],
+      "desc": "Adjust the contrast/brightness of the OLED screen"
+    },
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
     }
   }
 }

Translations/translation_YUE_HK.json

@@ -1,59 +1,45 @@
 {
   "languageCode": "YUE_HK",
   "languageLocalName": "廣東話 (香港)",
-	"fonts": [
+  "fonts": ["ascii_basic", "cjk"],
-		"ascii_basic",
-		"cjk"
-	],
   "tempUnitFahrenheit": true,
   "messages": {
-		"SettingsCalibrationDone": "校正完成！",
     "SettingsCalibrationWarning": "開始温度校正之前，請先確定辣雞咀係處於室温！",
     "SettingsResetWarning": "你係咪確定要將全部設定重設到預設值？",
     "UVLOWarningString": "電壓過低",
     "UndervoltageString": "Undervoltage",
     "InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip temp: ",
-		"BadTipString": "BAD TIP",
     "SleepingSimpleString": "Zzzz",
     "SleepingAdvancedString": "Sleeping...",
-		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "!!! HOT TIP !!!",
     "SleepingTipAdvancedString": "Tip:",
     "IdleTipString": "Tip:",
     "IdleSetString": " Set:",
     "TipDisconnectedString": "NO TIP",
     "SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "關",
+    "OffString": "關"
-		"YourGainMessage": "Your gain:"
   },
   "messagesWarn": {
     "ResetOKMessage": "已重設！",
     "SettingsResetMessage": "設定已被重設！",
-		"NoAccelerometerMessage": [
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"No accelerometer",
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "已鎖定",
     "UnlockingKeysString": "已解除鎖定",
-		"WarningKeysLockedString": "!撳掣鎖定!"
+    "WarningKeysLockedString": "!撳掣鎖定!",
+    "WarningThermalRunaway": "加熱失控"
   },
   "characters": {
     "SettingRightChar": "右",
     "SettingLeftChar": "左",
     "SettingAutoChar": "自",
-		"SettingFastChar": "快",
+    "SettingOffChar": "關",
     "SettingSlowChar": "慢",
     "SettingMediumChar": "中",
-		"SettingOffChar": "關",
+    "SettingFastChar": "快",
+    "SettingStartNoneChar": "無",
     "SettingStartSolderingChar": "焊",
     "SettingStartSleepChar": "待",
     "SettingStartSleepOffChar": "室",
-		"SettingStartNoneChar": "無",
     "SettingSensitivityOff": "關",
     "SettingSensitivityLow": "低",
     "SettingSensitivityMedium": "中",
@@ -116,7 +102,7 @@
     },
     "DisplayRotation": {
       "text2": "畫面方向",
-			"desc": "自=自動 | 左=使用左手 | 右=使用右手"
+      "desc": "右=使用右手 | 左=使用左手 | 自=自動"
     },
     "BoostTemperature": {
       "text2": "增熱温度",
@@ -154,6 +140,10 @@
       "text2": "QC電壓",
       "desc": "使用QC電源時請求嘅最高目標電壓"
     },
+    "PDNegTimeout": {
+      "text2": "PD逾時",
+      "desc": "設定USB PD協定交涉嘅逾時時限；為兼容某啲QC電源而設 <x100ms（亳秒）>"
+    },
     "PowerLimit": {
       "text2": "功率限制",
       "desc": "限制辣雞可用嘅最大功率 <W=watt（火）>"
@@ -205,6 +195,14 @@
     "LanguageSwitch": {
       "text2": "語言： 廣東話",
       "desc": ""
+    },
+    "Brightness": {
+      "text2": "熒幕亮度",
+      "desc": "設定OLED熒幕嘅亮度"
+    },
+    "ColourInversion": {
+      "text2": "熒幕反轉色",
+      "desc": "反轉OLED熒幕嘅黑白色"
     }
   }
 }

Translations/translation_ZH_CN.json

@@ -1,59 +1,45 @@
 {
   "languageCode": "ZH_CN",
   "languageLocalName": "简体中文",
-	"fonts": [
+  "fonts": ["ascii_basic", "cjk"],
-		"ascii_basic",
-		"cjk"
-	],
   "tempUnitFahrenheit": true,
   "messages": {
-		"SettingsCalibrationDone": "校正完成！",
     "SettingsCalibrationWarning": "开始温度校正前，请先确定铬铁头正处于室温！",
     "SettingsResetWarning": "你是否确定要将全部设置重置为默认值？",
     "UVLOWarningString": "电压过低",
     "UndervoltageString": "Undervoltage",
     "InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip temp: ",
-		"BadTipString": "BAD TIP",
     "SleepingSimpleString": "Zzzz",
     "SleepingAdvancedString": "Sleeping...",
-		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "!!! HOT TIP !!!",
     "SleepingTipAdvancedString": "Tip:",
     "IdleTipString": "Tip:",
     "IdleSetString": " Set:",
     "TipDisconnectedString": "NO TIP",
     "SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "关",
+    "OffString": "关"
-		"YourGainMessage": "Your gain:"
   },
   "messagesWarn": {
     "ResetOKMessage": "已重置！",
     "SettingsResetMessage": "设置已被重置！",
-		"NoAccelerometerMessage": [
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"No accelerometer",
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "已锁定",
     "UnlockingKeysString": "已解除锁定",
-		"WarningKeysLockedString": "!按键锁定!"
+    "WarningKeysLockedString": "!按键锁定!",
+    "WarningThermalRunaway": "加热失控"
   },
   "characters": {
     "SettingRightChar": "右",
     "SettingLeftChar": "左",
     "SettingAutoChar": "自",
-		"SettingFastChar": "快",
+    "SettingOffChar": "关",
     "SettingSlowChar": "慢",
     "SettingMediumChar": "中",
-		"SettingOffChar": "关",
+    "SettingFastChar": "快",
+    "SettingStartNoneChar": "无",
     "SettingStartSolderingChar": "焊",
     "SettingStartSleepChar": "待",
     "SettingStartSleepOffChar": "室",
-		"SettingStartNoneChar": "无",
     "SettingSensitivityOff": "关",
     "SettingSensitivityLow": "低",
     "SettingSensitivityMedium": "中",
@@ -116,7 +102,7 @@
     },
     "DisplayRotation": {
       "text2": "画面方向",
-			"desc": "自=自动 | 左=使用左手 | 右=使用右手"
+      "desc": "右=使用右手 | 左=使用左手 | 自=自动"
     },
     "BoostTemperature": {
       "text2": "增热温度",
@@ -154,6 +140,10 @@
       "text2": "QC电压",
       "desc": "使用QC电源时请求的最高目标电压"
     },
+    "PDNegTimeout": {
+      "text2": "PD超时",
+      "desc": "设定USB PD协议交涉的超时时限；为兼容某些QC电源而设 <x100ms（亳秒）>"
+    },
     "PowerLimit": {
       "text2": "功率限制",
       "desc": "限制铬铁可用的最大功率 <W=watt（瓦特）>"
@@ -205,6 +195,14 @@
     "LanguageSwitch": {
       "text2": "语言：简体中文",
       "desc": ""
+    },
+    "Brightness": {
+      "text2": "屏幕亮度",
+      "desc": "设定OLED屏幕的亮度"
+    },
+    "ColourInversion": {
+      "text2": "螢幕反轉色",
+      "desc": "反转OLED屏幕的黑白色彩"
     }
   }
 }

Translations/translation_ZH_TW.json

@@ -1,59 +1,45 @@
 {
   "languageCode": "ZH_TW",
   "languageLocalName": "正體中文",
-	"fonts": [
+  "fonts": ["ascii_basic", "cjk"],
-		"ascii_basic",
-		"cjk"
-	],
   "tempUnitFahrenheit": true,
   "messages": {
-		"SettingsCalibrationDone": "校正完成！",
     "SettingsCalibrationWarning": "開始溫度校正前，請先確定鉻鐵頭正處於室溫！",
     "SettingsResetWarning": "你是否確定要將全部設定重設到預設值？",
     "UVLOWarningString": "電壓過低",
     "UndervoltageString": "Undervoltage",
     "InputVoltageString": "Input V: ",
-		"WarningTipTempString": "Tip temp: ",
-		"BadTipString": "BAD TIP",
     "SleepingSimpleString": "Zzzz",
     "SleepingAdvancedString": "Sleeping...",
-		"WarningSimpleString": "HOT!",
-		"WarningAdvancedString": "!!! HOT TIP !!!",
     "SleepingTipAdvancedString": "Tip:",
     "IdleTipString": "Tip:",
     "IdleSetString": " Set:",
     "TipDisconnectedString": "NO TIP",
     "SolderingAdvancedPowerPrompt": "Power: ",
-		"OffString": "關",
+    "OffString": "關"
-		"YourGainMessage": "Your gain:"
   },
   "messagesWarn": {
     "ResetOKMessage": "已重設！",
     "SettingsResetMessage": "設定已被重設！",
-		"NoAccelerometerMessage": [
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-			"No accelerometer",
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-			"detected!"
-		],
-		"NoPowerDeliveryMessage": [
-			"No USB-PD IC",
-			"detected!"
-		],
     "LockingKeysString": "已鎖定",
     "UnlockingKeysString": "已解除鎖定",
-		"WarningKeysLockedString": "!按鍵鎖定!"
+    "WarningKeysLockedString": "!按鍵鎖定!",
+    "WarningThermalRunaway": "加熱失控"
   },
   "characters": {
     "SettingRightChar": "右",
     "SettingLeftChar": "左",
     "SettingAutoChar": "自",
-		"SettingFastChar": "快",
+    "SettingOffChar": "關",
     "SettingSlowChar": "慢",
     "SettingMediumChar": "中",
-		"SettingOffChar": "關",
+    "SettingFastChar": "快",
+    "SettingStartNoneChar": "無",
     "SettingStartSolderingChar": "焊",
     "SettingStartSleepChar": "待",
     "SettingStartSleepOffChar": "室",
-		"SettingStartNoneChar": "無",
     "SettingSensitivityOff": "關",
     "SettingSensitivityLow": "低",
     "SettingSensitivityMedium": "中",
@@ -116,7 +102,7 @@
     },
     "DisplayRotation": {
       "text2": "畫面方向",
-			"desc": "自=自動 | 左=使用左手 | 右=使用右手"
+      "desc": "右=使用右手 | 左=使用左手 | 自=自動"
     },
     "BoostTemperature": {
       "text2": "增熱溫度",
@@ -154,6 +140,10 @@
       "text2": "QC電壓",
       "desc": "使用QC電源時請求的最高目標電壓"
     },
+    "PDNegTimeout": {
+      "text2": "PD逾時",
+      "desc": "設定USB PD協定交涉的逾時時限；為兼容某些QC電源而設 <x100ms（亳秒）>"
+    },
     "PowerLimit": {
       "text2": "功率限制",
       "desc": "限制鉻鐵可用的最大功率 <W=watt（瓦特）>"
@@ -205,6 +195,14 @@
     "LanguageSwitch": {
       "text2": "語言：正體中文",
       "desc": ""
+    },
+    "Brightness": {
+      "text2": "螢幕亮度",
+      "desc": "設定OLED螢幕的亮度"
+    },
+    "ColourInversion": {
+      "text2": "螢幕反轉色",
+      "desc": "反轉OLED螢幕的黑白色彩"
     }
   }
 }

Translations/translations_def.js

@@ -83,6 +83,9 @@ var def =
 		},
 		{
 			"id": "WarningKeysLockedString"
+		},
+		{
+			"id": "WarningThermalRunaway"
 		}
 	],
 	"characters": [
@@ -280,6 +283,12 @@ var def =
 			"maxLen": 8,
 			"maxLen2": 16
 		},
+		{
+			"id": "PDNegTimeout",
+			"maxLen": 8,
+			"maxLen2": 16
+		},
+
 		{
 			"id": "PowerLimit",
 			"maxLen": 5,
@@ -344,6 +353,16 @@ var def =
 			"id": "LanguageSwitch",
 			"maxLen": 7,
 			"maxLen2": 15
+		},
+		{
+			"id": "Brightness",
+			"maxLen": 7,
+			"maxLen2": 15
+		},
+		{
+			"id": "ColourInversion",
+			"maxLen": 7,
+			"maxLen2": 15
 		}
 	]
 }

setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 # Setup shell file to setup the environment on an ubuntu machine
-sudo apt-get update && sudo apt-get install -y make bzip2 git python3 python3-pip wget 
+sudo apt-get update && sudo apt-get install -y make bzip2 git python3 python3-pip wget  dfu-util
 python3 -m pip install bdflib black flake8
 sudo mkdir -p /build
 cd /build
@@ -16,16 +16,16 @@ if md5sum -c $MDPATH/ci/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2.
     echo "Good MD5 ARM"
 else
     echo "ARM MD5 Mismatch, downloading fresh"
+    rm -rf /build/cache/gcc-arm*.bz2 || true
     sudo wget -q "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2" -O gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
-    rm -rf $MDPATH/ci/gcc-arm*.bz2 || true
 fi
 
 if md5sum -c $MDPATH/ci/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2.md5; then
     echo "Good MD5 RISCV"
 else
     echo "RISCV MD5 Mismatch, downloading fresh"
+    rm -rf /build/cache/nuclei*.bz2 || true
     sudo wget -q "https://github.com/Ralim/nuclei-compiler/releases/download/2020.08/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2" -O nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2
-    rm -rf $MDPATH/ci/nuclei*.bz2 || true
 fi
 
 echo "Extracting compilers"

source/Core/BSP/BSP.h

@@ -1,8 +1,9 @@
 #include "BSP_Flash.h"
+#include "BSP_PD.h"
 #include "BSP_Power.h"
 #include "BSP_QC.h"
 #include "Defines.h"
-#include "Model_Config.h"
+#include "configuration.h"
 #include <stdbool.h>
 #include <stdint.h>
 /*
@@ -33,16 +34,13 @@ void BSPInit(void);
 // Called to reset the hardware watchdog unit
 void resetWatchdog();
 // Accepts a output level of 0.. to use to control the tip output PWM
-void setTipPWM(uint8_t pulse);
+void setTipPWM(const uint8_t pulse, const bool shouldUseFastModePWM);
 // Returns the Handle temp in C, X10
-uint16_t getHandleTemperature();
+uint16_t getHandleTemperature(uint8_t sample);
 // Returns the Tip temperature ADC reading in raw units
 uint16_t getTipRawTemp(uint8_t refresh);
 // Returns the main DC input voltage, using the adjustable divisor + sample flag
 uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample);
-// Switch to the most suitable PWM freq given the desired period;
-// returns true if the switch was performed and totalPWM changed
-bool tryBetterPWM(uint8_t pwm);
 
 // Readers for the two buttons
 // !! Returns 1 if held down, 0 if released
@@ -61,8 +59,7 @@ void reboot();
 uint8_t showBootLogoIfavailable();
 // delay wrapper for delay using the hardware timer (used before RTOS)
 void delay_ms(uint16_t count);
-// Used to allow knowledge of if usb_pd is being used
+// Probe if the Hall sensor is fitted to the unit
-uint8_t usb_pd_detect();
 bool getHallSensorFitted();
 // If the iron has a hall effect sensor in the handle, return an signed count of the reading
 // If the sensor is single polarity (or polarity insensitive) just return 0..32768

source/Core/BSP/BSP_PD.h

@@ -8,5 +8,8 @@
 #ifndef USER_BSP_PD_H_
 #define USER_BSP_PD_H_
 #include "BSP.h"
-
+bool fusb_write_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf);
+bool fusb_read_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf);
+void setupFUSBIRQ();
+bool getFUS302IRQLow();
 #endif /* USER_BSP_PD_H_ */

source/Core/BSP/MHP30/BSP.cpp

@@ -2,7 +2,6 @@
 
 #include "BSP.h"
 #include "I2C_Wrapper.hpp"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "Setup.h"
 #include "TipThermoModel.h"
@@ -201,7 +200,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
     HAL_IncTick();
   }
 }
-uint16_t getHandleTemperature() {
+uint16_t getHandleTemperature(uint8_t sample) {
   int32_t result = getADC(0);
   return Utils::InterpolateLookupTable(NTCHandleLookup, NTCHandleLookupItems, result);
 }
@@ -246,11 +245,7 @@ uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
   }
   return sum * 4 / divisor;
 }
-bool tryBetterPWM(uint8_t pwm) {
+void setTipPWM(const uint8_t pulse, const bool shouldUseFastModePWM) {
-  // We dont need this for the MHP30
-  return false;
-}
-void setTipPWM(uint8_t pulse) {
   // We can just set the timer directly
   if (htim3.Instance->PSC > 20) {
     htim3.Instance->CCR1 = 0;

source/Core/BSP/MHP30/IRQ.cpp

@@ -7,7 +7,7 @@
 
 #include "IRQ.h"
 #include "Pins.h"
-#include "int_n.h"
+#include "configuration.h"
 
 /*
  * Catch the IRQ that says that the conversion is done on the temperature
@@ -34,13 +34,22 @@ void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCal
 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) {
   (void)GPIO_Pin;
-  InterruptHandler::irqCallback();
+  // Notify POW thread that an irq occured
+  if (POWTaskHandle != nullptr) {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    xTaskNotifyFromISR(POWTaskHandle, 1, eSetBits, &xHigherPriorityTaskWoken);
+    /* Force a context switch if xHigherPriorityTaskWoken is now set to pdTRUE.
+    The macro used to do this is dependent on the port and may be called
+    portEND_SWITCHING_ISR. */
+    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+  }
 }
 
 bool getFUS302IRQLow() {
-#ifdef POW_PD
+#if POW_PD
   // Return true if the IRQ line is still held low
   return HAL_GPIO_ReadPin(INT_PD_GPIO_Port, INT_PD_Pin) == GPIO_PIN_RESET;
 #else

source/Core/BSP/MHP30/Model_Config.h

@@ -1,30 +0,0 @@
-/*
- * Model_Config.h
- *
- *  Created on: 25 Jul 2020
- *      Author: Ralim
- */
-
-#ifndef BSP_MINIWARE_MODEL_CONFIG_H_
-#define BSP_MINIWARE_MODEL_CONFIG_H_
-/*
- * Lookup for mapping features <-> Models
- */
-
-#ifndef MODEL_MHP30
-#error "No model defined!"
-#endif
-
-#ifdef MODEL_MHP30
-#define ACCEL_MSA
-#define POW_PD
-#define TEMP_NTC
-#define I2C_SOFT
-#define BATTFILTERDEPTH 8
-#define OLED_I2CBB
-#define ACCEL_EXITS_ON_MOVEMENT
-#endif
-#ifdef ACCEL_EXITS_ON_MOVEMENT
-#define NO_SLEEP_MODE
-#endif
-#endif /* BSP_MINIWARE_MODEL_CONFIG_H_ */

source/Core/BSP/MHP30/Pins.h

@@ -7,7 +7,7 @@
 
 #ifndef BSP_MINIWARE_PINS_H_
 #define BSP_MINIWARE_PINS_H_
-#include "Model_Config.h"
+#include "configuration.h"
 
 // MHP30 pin map
 #define KEY_B_Pin                     GPIO_PIN_0

source/Core/BSP/MHP30/Power.cpp

@@ -1,44 +1,19 @@
 #include "BSP.h"
 #include "BSP_Power.h"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "QC3.h"
 #include "Settings.h"
-#include "fusb_user.h"
+#include "USBPD.h"
-#include "fusbpd.h"
+#include "configuration.h"
-#include "int_n.h"
-#include "policy_engine.h"
-bool FUSB302_present = false;
-bool FUSB302_probed  = false;
 
 void power_check() {
-#ifdef POW_PD
+#if POW_PD
-  if (FUSB302_present) {
+
-    PolicyEngine::PPSTimerCallback();
   // Cant start QC until either PD works or fails
-    if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+  if (USBPowerDelivery::negotiationComplete()) {
     return;
   }
-    if (PolicyEngine::pdHasNegotiated()) {
-      return;
-    }
-  }
 #endif
-#ifdef POW_QC
-  QC_resync();
-#endif
-}
-uint8_t usb_pd_detect() {
-#ifdef POW_PD
-  if (FUSB302_probed) {
-    return FUSB302_present;
-  } else {
-    FUSB302_present = fusb302_detect();
-    FUSB302_probed  = true;
-  }
-  return FUSB302_present;
-#endif
-  return false;
 }
 
 bool getIsPoweredByDCIN() { return false; }

source/Core/BSP/MHP30/QC_GPIO.cpp

@@ -5,11 +5,12 @@
  *      Author: Ralim
  */
 #include "BSP.h"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "QC3.h"
 #include "Settings.h"
+#include "configuration.h"
 #include "stm32f1xx_hal.h"
+
 #ifdef POW_QC
 void QC_DPlusZero_Six() {
   HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET); // pull down D+
@@ -70,7 +71,6 @@ uint8_t QC_DM_PulledDown() { return HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO
 #endif
 void QC_resync() {
 #ifdef POW_QC
-  seekQC((systemSettings.QCIdealVoltage) ? 120 : 90,
+  seekQC(systemSettings.QCIdealVoltage, systemSettings.voltageDiv); // Run the QC seek again if we have drifted too much
-         systemSettings.voltageDiv); // Run the QC seek again if we have drifted too much
 #endif
 }

source/Core/BSP/MHP30/Software_I2C.h

@@ -8,7 +8,7 @@
 #ifndef BSP_MINIWARE_SOFTWARE_I2C_H_
 #define BSP_MINIWARE_SOFTWARE_I2C_H_
 #include "BSP.h"
-#include "Model_Config.h"
+#include "configuration.h"
 #include "stm32f1xx_hal.h"
 #ifdef I2C_SOFT
 

source/Core/BSP/MHP30/Vendor/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

@@ -1899,16 +1899,20 @@ extern "C" {
 #if defined(STM32F301x8) || defined(STM32F302x8) || defined(STM32F318xx) || defined(STM32F303x8) || defined(STM32F334x8) || defined(STM32F328xx)
 #define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                     \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                     \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                     \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__) \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
 #define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__) \
@@ -1920,133 +1924,111 @@ extern "C" {
 #endif
 #if defined(STM32F302xE) || defined(STM32F302xC)
 #define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                    \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                     \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                     \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                      \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                   \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                           \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_IT()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
 #define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                   \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                            \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_IT()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_IT() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() : __HAL_COMP_COMP6_EXTI_DISABLE_IT())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_IT())
 #define __HAL_COMP_EXTI_GET_FLAG(__FLAG__)                                   \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)    \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_GET_FLAG() \
-       ? __HAL_COMP_COMP1_EXTI_GET_FLAG()  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_GET_FLAG() \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_GET_FLAG() : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_GET_FLAG() : __HAL_COMP_COMP6_EXTI_GET_FLAG())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_GET_FLAG() \
+                                          : __HAL_COMP_COMP6_EXTI_GET_FLAG())
 #define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                   \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)      \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG() \
-       ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG()  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() : __HAL_COMP_COMP6_EXTI_CLEAR_FLAG())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() \
+                                          : __HAL_COMP_COMP6_EXTI_CLEAR_FLAG())
 #endif
 #if defined(STM32F303xE) || defined(STM32F398xx) || defined(STM32F303xC) || defined(STM32F358xx)
 #define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                      \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_RISING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE()                                                                                                                                        \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                          \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_RISING_EDGE()                                                                                                                                  \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_RISING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE() \
                                               : __HAL_COMP_COMP7_EXTI_ENABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                       \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                 \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_RISING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE()                                                                                                                                        \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                           \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_RISING_EDGE()                                                                                                                                  \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_RISING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE() \
                                               : __HAL_COMP_COMP7_EXTI_DISABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                       \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                 \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_FALLING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                        \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                           \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                  \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_FALLING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE() \
                                               : __HAL_COMP_COMP7_EXTI_ENABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                        \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                  \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_FALLING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                        \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                            \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                  \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_FALLING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE() \
                                               : __HAL_COMP_COMP7_EXTI_DISABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                   \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                             \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_IT()                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                       \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_IT() \
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_IT()                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                 \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_IT()                                                  \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4)                                           \
-                         ? __HAL_COMP_COMP4_EXTI_ENABLE_IT()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_IT() \
-                                                                    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_IT() : __HAL_COMP_COMP7_EXTI_ENABLE_IT())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_IT() \
+                                              : __HAL_COMP_COMP7_EXTI_ENABLE_IT())
 #define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                   \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                              \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_IT()                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_IT() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_IT() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_IT()                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                  \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_IT()                                                  \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4)                                            \
-                         ? __HAL_COMP_COMP4_EXTI_DISABLE_IT()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_IT() \
-                                                                    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_IT() : __HAL_COMP_COMP7_EXTI_DISABLE_IT())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_IT() \
+                                              : __HAL_COMP_COMP7_EXTI_DISABLE_IT())
 #define __HAL_COMP_EXTI_GET_FLAG(__FLAG__)                                   \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)                                                            \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_GET_FLAG() \
-       ? __HAL_COMP_COMP1_EXTI_GET_FLAG()                                                          \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_GET_FLAG() \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2)                                                      \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_GET_FLAG() \
-             ? __HAL_COMP_COMP2_EXTI_GET_FLAG()                                                    \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_GET_FLAG() \
-             : ((__FLAG__) == COMP_EXTI_LINE_COMP3)                                                \
-                   ? __HAL_COMP_COMP3_EXTI_GET_FLAG()                                              \
-                   : ((__FLAG__) == COMP_EXTI_LINE_COMP4)                                          \
-                         ? __HAL_COMP_COMP4_EXTI_GET_FLAG()                                        \
    : ((__FLAG__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_GET_FLAG() \
-                                                                : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_GET_FLAG() : __HAL_COMP_COMP7_EXTI_GET_FLAG())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_GET_FLAG() \
+                                          : __HAL_COMP_COMP7_EXTI_GET_FLAG())
 #define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                   \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)                                                              \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG() \
-       ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG()                                                          \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2)                                                        \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_CLEAR_FLAG() \
-             ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG()                                                    \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() \
-             : ((__FLAG__) == COMP_EXTI_LINE_COMP3)                                                  \
-                   ? __HAL_COMP_COMP3_EXTI_CLEAR_FLAG()                                              \
-                   : ((__FLAG__) == COMP_EXTI_LINE_COMP4)                                            \
-                         ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG()                                        \
    : ((__FLAG__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_CLEAR_FLAG() \
-                                                                : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_CLEAR_FLAG() : __HAL_COMP_COMP7_EXTI_CLEAR_FLAG())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_CLEAR_FLAG() \
+                                          : __HAL_COMP_COMP7_EXTI_CLEAR_FLAG())
 #endif
 #if defined(STM32F373xC) || defined(STM32F378xx)
 #define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)   (((__EXTILINE__) == COMP_EXTI_LINE_COMP1) ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() : __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE())

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

@@ -54,27 +54,18 @@ extern "C" {
  * @retval The specified transfer complete flag index.
  */
 #define __HAL_DMA_GET_TC_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                                       \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_TC1 \
-       ? DMA_FLAG_TC1                                                                                                      \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_TC2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_TC3 \
-             ? DMA_FLAG_TC2                                                                                                \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_TC4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                                           \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_TC5 \
-                   ? DMA_FLAG_TC3                                                                                          \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TC6 \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                                     \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7)) ? DMA_FLAG_TC7 \
-                         ? DMA_FLAG_TC4                                                                                    \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1)) ? DMA_FLAG_TC1 \
-                         : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5))                               \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2)) ? DMA_FLAG_TC2 \
-                               ? DMA_FLAG_TC5                                                                              \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) ? DMA_FLAG_TC3 \
-                               : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6))                         \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_TC4 \
-                                     ? DMA_FLAG_TC6                                                                        \
+                                                                       : DMA_FLAG_TC5)
-                                     : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7))                   \
-                                           ? DMA_FLAG_TC7                                                                  \
-                                           : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1))             \
-                                                 ? DMA_FLAG_TC1                                                            \
-                                                 : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2))       \
-                                                       ? DMA_FLAG_TC2                                                      \
-                                                       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) \
-                                                             ? DMA_FLAG_TC3                                                \
-                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_TC4 : DMA_FLAG_TC5)
 
 /**
  * @brief  Returns the current DMA Channel half transfer complete flag.
@@ -82,27 +73,18 @@ extern "C" {
  * @retval The specified half transfer complete flag index.
  */
 #define __HAL_DMA_GET_HT_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                                       \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_HT1 \
-       ? DMA_FLAG_HT1                                                                                                      \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_HT2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_HT3 \
-             ? DMA_FLAG_HT2                                                                                                \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_HT4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                                           \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_HT5 \
-                   ? DMA_FLAG_HT3                                                                                          \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_HT6 \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                                     \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7)) ? DMA_FLAG_HT7 \
-                         ? DMA_FLAG_HT4                                                                                    \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1)) ? DMA_FLAG_HT1 \
-                         : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5))                               \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2)) ? DMA_FLAG_HT2 \
-                               ? DMA_FLAG_HT5                                                                              \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) ? DMA_FLAG_HT3 \
-                               : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6))                         \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_HT4 \
-                                     ? DMA_FLAG_HT6                                                                        \
+                                                                       : DMA_FLAG_HT5)
-                                     : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7))                   \
-                                           ? DMA_FLAG_HT7                                                                  \
-                                           : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1))             \
-                                                 ? DMA_FLAG_HT1                                                            \
-                                                 : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2))       \
-                                                       ? DMA_FLAG_HT2                                                      \
-                                                       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) \
-                                                             ? DMA_FLAG_HT3                                                \
-                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_HT4 : DMA_FLAG_HT5)
 
 /**
  * @brief  Returns the current DMA Channel transfer error flag.
@@ -110,27 +92,18 @@ extern "C" {
  * @retval The specified transfer error flag index.
  */
 #define __HAL_DMA_GET_TE_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                                       \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_TE1 \
-       ? DMA_FLAG_TE1                                                                                                      \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_TE2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_TE3 \
-             ? DMA_FLAG_TE2                                                                                                \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_TE4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                                           \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_TE5 \
-                   ? DMA_FLAG_TE3                                                                                          \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TE6 \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                                     \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7)) ? DMA_FLAG_TE7 \
-                         ? DMA_FLAG_TE4                                                                                    \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1)) ? DMA_FLAG_TE1 \
-                         : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5))                               \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2)) ? DMA_FLAG_TE2 \
-                               ? DMA_FLAG_TE5                                                                              \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) ? DMA_FLAG_TE3 \
-                               : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6))                         \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_TE4 \
-                                     ? DMA_FLAG_TE6                                                                        \
+                                                                       : DMA_FLAG_TE5)
-                                     : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7))                   \
-                                           ? DMA_FLAG_TE7                                                                  \
-                                           : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1))             \
-                                                 ? DMA_FLAG_TE1                                                            \
-                                                 : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2))       \
-                                                       ? DMA_FLAG_TE2                                                      \
-                                                       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) \
-                                                             ? DMA_FLAG_TE3                                                \
-                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_TE4 : DMA_FLAG_TE5)
 
 /**
  * @brief  Return the current DMA Channel Global interrupt flag.
@@ -138,27 +111,18 @@ extern "C" {
  * @retval The specified transfer error flag index.
  */
 #define __HAL_DMA_GET_GI_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                                       \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_GL1 \
-       ? DMA_FLAG_GL1                                                                                                      \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_GL2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_GL3 \
-             ? DMA_FLAG_GL2                                                                                                \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_GL4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                                           \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_GL5 \
-                   ? DMA_FLAG_GL3                                                                                          \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_GL6 \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                                     \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7)) ? DMA_FLAG_GL7 \
-                         ? DMA_FLAG_GL4                                                                                    \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1)) ? DMA_FLAG_GL1 \
-                         : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5))                               \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2)) ? DMA_FLAG_GL2 \
-                               ? DMA_FLAG_GL5                                                                              \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) ? DMA_FLAG_GL3 \
-                               : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6))                         \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_GL4 \
-                                     ? DMA_FLAG_GL6                                                                        \
+                                                                       : DMA_FLAG_GL5)
-                                     : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7))                   \
-                                           ? DMA_FLAG_GL7                                                                  \
-                                           : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1))             \
-                                                 ? DMA_FLAG_GL1                                                            \
-                                                 : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2))       \
-                                                       ? DMA_FLAG_GL2                                                      \
-                                                       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) \
-                                                             ? DMA_FLAG_GL3                                                \
-                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_GL4 : DMA_FLAG_GL5)
 
 /**
  * @brief  Get the DMA Channel pending flags.
@@ -201,16 +165,13 @@ extern "C" {
  * @retval The specified transfer complete flag index.
  */
 #define __HAL_DMA_GET_TC_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                        \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_TC1 \
-       ? DMA_FLAG_TC1                                                                                       \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_TC2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                  \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_TC3 \
-             ? DMA_FLAG_TC2                                                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_TC4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                            \
-                   ? DMA_FLAG_TC3                                                                           \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                      \
-                         ? DMA_FLAG_TC4                                                                     \
    : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_TC5 \
-                                                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TC6 : DMA_FLAG_TC7)
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TC6 \
+                                                                       : DMA_FLAG_TC7)
 
 /**
  * @brief  Return the current DMA Channel half transfer complete flag.
@@ -218,16 +179,13 @@ extern "C" {
  * @retval The specified half transfer complete flag index.
  */
 #define __HAL_DMA_GET_HT_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                        \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_HT1 \
-       ? DMA_FLAG_HT1                                                                                       \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_HT2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                  \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_HT3 \
-             ? DMA_FLAG_HT2                                                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_HT4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                            \
-                   ? DMA_FLAG_HT3                                                                           \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                      \
-                         ? DMA_FLAG_HT4                                                                     \
    : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_HT5 \
-                                                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_HT6 : DMA_FLAG_HT7)
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_HT6 \
+                                                                       : DMA_FLAG_HT7)
 
 /**
  * @brief  Return the current DMA Channel transfer error flag.
@@ -235,16 +193,13 @@ extern "C" {
  * @retval The specified transfer error flag index.
  */
 #define __HAL_DMA_GET_TE_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                        \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_TE1 \
-       ? DMA_FLAG_TE1                                                                                       \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_TE2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                  \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_TE3 \
-             ? DMA_FLAG_TE2                                                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_TE4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                            \
-                   ? DMA_FLAG_TE3                                                                           \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                      \
-                         ? DMA_FLAG_TE4                                                                     \
    : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_TE5 \
-                                                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TE6 : DMA_FLAG_TE7)
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TE6 \
+                                                                       : DMA_FLAG_TE7)
 
 /**
  * @brief  Return the current DMA Channel Global interrupt flag.
@@ -252,16 +207,13 @@ extern "C" {
  * @retval The specified transfer error flag index.
  */
 #define __HAL_DMA_GET_GI_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                        \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_GL1 \
-       ? DMA_FLAG_GL1                                                                                       \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_GL2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                  \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_GL3 \
-             ? DMA_FLAG_GL2                                                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_GL4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                            \
-                   ? DMA_FLAG_GL3                                                                           \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                      \
-                         ? DMA_FLAG_GL4                                                                     \
    : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_GL5 \
-                                                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_GL6 : DMA_FLAG_GL7)
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_GL6 \
+                                                                       : DMA_FLAG_GL7)
 
 /**
  * @brief  Get the DMA Channel pending flags.

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

@@ -800,9 +800,13 @@ extern "C" {
 #define GPIO_GET_INDEX(__GPIOx__) (((__GPIOx__) == (GPIOA)) ? 0uL : ((__GPIOx__) == (GPIOB)) ? 1uL : ((__GPIOx__) == (GPIOC)) ? 2uL : ((__GPIOx__) == (GPIOD)) ? 3uL : 4uL)
 #elif defined(STM32F100xE) || defined(STM32F101xE) || defined(STM32F101xG) || defined(STM32F103xE) || defined(STM32F103xG)
 #define GPIO_GET_INDEX(__GPIOx__)   \
-  (((__GPIOx__) == (GPIOA))       \
+  (((__GPIOx__) == (GPIOA))   ? 0uL \
-       ? 0uL                      \
+   : ((__GPIOx__) == (GPIOB)) ? 1uL \
-       : ((__GPIOx__) == (GPIOB)) ? 1uL : ((__GPIOx__) == (GPIOC)) ? 2uL : ((__GPIOx__) == (GPIOD)) ? 3uL : ((__GPIOx__) == (GPIOE)) ? 4uL : ((__GPIOx__) == (GPIOF)) ? 5uL : 6uL)
+   : ((__GPIOx__) == (GPIOC)) ? 2uL \
+   : ((__GPIOx__) == (GPIOD)) ? 3uL \
+   : ((__GPIOx__) == (GPIOE)) ? 4uL \
+   : ((__GPIOx__) == (GPIOF)) ? 5uL \
+                              : 6uL)
 #endif
 
 #define AFIO_REMAP_ENABLE(REMAP_PIN) \

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

@@ -661,7 +661,8 @@ uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
   (((__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))
+   : ((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))

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

@@ -1375,10 +1375,10 @@ mode.
  *            @arg TIM_ICPSC_DIV8: capture is done once every 8 events
  */
 #define __HAL_TIM_GET_ICPRESCALER(__HANDLE__, __CHANNEL__)                                         \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                                    \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCMR1 & TIM_CCMR1_IC1PSC)         \
-       ? ((__HANDLE__)->Instance->CCMR1 & TIM_CCMR1_IC1PSC)                                            \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? (((__HANDLE__)->Instance->CCMR1 & TIM_CCMR1_IC2PSC) >> 8U) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 & TIM_CCMR2_IC3PSC) : (((__HANDLE__)->Instance->CCMR2 & TIM_CCMR2_IC4PSC)) >> 8U)
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 & TIM_CCMR2_IC3PSC)         \
+                                      : (((__HANDLE__)->Instance->CCMR2 & TIM_CCMR2_IC4PSC)) >> 8U)
 
 /**
  * @brief  Set the TIM Capture Compare Register value on runtime without calling another time ConfigChannel function.
@@ -1393,10 +1393,10 @@ mode.
  * @retval None
  */
 #define __HAL_TIM_SET_COMPARE(__HANDLE__, __CHANNEL__, __COMPARE__)                    \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                        \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCR1 = (__COMPARE__)) \
-       ? ((__HANDLE__)->Instance->CCR1 = (__COMPARE__))                                    \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCR2 = (__COMPARE__)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCR3 = (__COMPARE__)) : ((__HANDLE__)->Instance->CCR4 = (__COMPARE__)))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCR3 = (__COMPARE__)) \
+                                      : ((__HANDLE__)->Instance->CCR4 = (__COMPARE__)))
 
 /**
  * @brief  Get the TIM Capture Compare Register value on runtime.
@@ -1410,9 +1410,10 @@ mode.
  * @retval 16-bit or 32-bit value of the capture/compare register (TIMx_CCRy)
  */
 #define __HAL_TIM_GET_COMPARE(__HANDLE__, __CHANNEL__)                 \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                    \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCR1) \
-       ? ((__HANDLE__)->Instance->CCR1)                \
+   : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCR2) \
-       : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCR2) : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCR3) : ((__HANDLE__)->Instance->CCR4))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCR3) \
+                                      : ((__HANDLE__)->Instance->CCR4))
 
 /**
  * @brief  Set the TIM Output compare preload.
@@ -1426,10 +1427,10 @@ mode.
  * @retval None
  */
 #define __HAL_TIM_ENABLE_OCxPRELOAD(__HANDLE__, __CHANNEL__)                               \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                            \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC1PE) \
-       ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC1PE)                                    \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC2PE) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC3PE) : ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC4PE))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC3PE) \
+                                      : ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC4PE))
 
 /**
  * @brief  Reset the TIM Output compare preload.
@@ -1443,10 +1444,10 @@ mode.
  * @retval None
  */
 #define __HAL_TIM_DISABLE_OCxPRELOAD(__HANDLE__, __CHANNEL__)                               \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                             \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_OC1PE) \
-       ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_OC1PE)                                    \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_OC2PE) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC3PE) : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC4PE))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC3PE) \
+                                      : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC4PE))
 
 /**
  * @brief  Enable fast mode for a given channel.
@@ -1464,10 +1465,10 @@ mode.
  * @retval None
  */
 #define __HAL_TIM_ENABLE_OCxFAST(__HANDLE__, __CHANNEL__)                                  \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                            \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC1FE) \
-       ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC1FE)                                    \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC2FE) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC3FE) : ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC4FE))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC3FE) \
+                                      : ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC4FE))
 
 /**
  * @brief  Disable fast mode for a given channel.
@@ -1485,10 +1486,10 @@ mode.
  * @retval None
  */
 #define __HAL_TIM_DISABLE_OCxFAST(__HANDLE__, __CHANNEL__)                                  \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                             \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_OC1FE) \
-       ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_OC1FE)                                    \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_OC2FE) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC3FE) : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC4FE))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC3FE) \
+                                      : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC4FE))
 
 /**
  * @brief  Set the Update Request Source (URS) bit of the TIMx_CR1 register.
@@ -1692,39 +1693,40 @@ mode.
 #define IS_TIM_SLAVEMODE_TRIGGER_ENABLED(__TRIGGER__) ((__TRIGGER__) == TIM_SLAVEMODE_TRIGGER)
 
 #define TIM_SET_ICPRESCALERVALUE(__HANDLE__, __CHANNEL__, __ICPSC__)                           \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                                \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCMR1 |= (__ICPSC__))         \
-       ? ((__HANDLE__)->Instance->CCMR1 |= (__ICPSC__))                                            \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCMR1 |= ((__ICPSC__) << 8U)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= (__ICPSC__)) : ((__HANDLE__)->Instance->CCMR2 |= ((__ICPSC__) << 8U)))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= (__ICPSC__))         \
+                                      : ((__HANDLE__)->Instance->CCMR2 |= ((__ICPSC__) << 8U)))
 
 #define TIM_RESET_ICPRESCALERVALUE(__HANDLE__, __CHANNEL__)                                  \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                              \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_IC1PSC) \
-       ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_IC1PSC)                                    \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_IC2PSC) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_IC3PSC) : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_IC4PSC))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_IC3PSC) \
+                                      : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_IC4PSC))
 
 #define TIM_SET_CAPTUREPOLARITY(__HANDLE__, __CHANNEL__, __POLARITY__)                           \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                                  \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCER |= (__POLARITY__))         \
-       ? ((__HANDLE__)->Instance->CCER |= (__POLARITY__))                                            \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCER |= ((__POLARITY__) << 4U)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCER |= ((__POLARITY__) << 8U)) : ((__HANDLE__)->Instance->CCER |= (((__POLARITY__) << 12U))))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCER |= ((__POLARITY__) << 8U)) \
+                                      : ((__HANDLE__)->Instance->CCER |= (((__POLARITY__) << 12U))))
 
 #define TIM_RESET_CAPTUREPOLARITY(__HANDLE__, __CHANNEL__)                                                  \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                                             \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC1P | TIM_CCER_CC1NP)) \
-       ? ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC1P | TIM_CCER_CC1NP))                                    \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC2P | TIM_CCER_CC2NP)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC3P)) : ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC4P)))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC3P))                  \
+                                      : ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC4P)))
 
 #define TIM_CHANNEL_STATE_GET(__HANDLE__, __CHANNEL__)                \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                    \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? (__HANDLE__)->ChannelState[0] \
-       ? (__HANDLE__)->ChannelState[0]                 \
+   : ((__CHANNEL__) == TIM_CHANNEL_2) ? (__HANDLE__)->ChannelState[1] \
-       : ((__CHANNEL__) == TIM_CHANNEL_2) ? (__HANDLE__)->ChannelState[1] : ((__CHANNEL__) == TIM_CHANNEL_3) ? (__HANDLE__)->ChannelState[2] : (__HANDLE__)->ChannelState[3])
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? (__HANDLE__)->ChannelState[2] \
+                                      : (__HANDLE__)->ChannelState[3])
 
 #define TIM_CHANNEL_STATE_SET(__HANDLE__, __CHANNEL__, __CHANNEL_STATE__)                     \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                               \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->ChannelState[0] = (__CHANNEL_STATE__)) \
-       ? ((__HANDLE__)->ChannelState[0] = (__CHANNEL_STATE__))                                    \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->ChannelState[1] = (__CHANNEL_STATE__)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->ChannelState[2] = (__CHANNEL_STATE__)) : ((__HANDLE__)->ChannelState[3] = (__CHANNEL_STATE__)))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->ChannelState[2] = (__CHANNEL_STATE__)) \
+                                      : ((__HANDLE__)->ChannelState[3] = (__CHANNEL_STATE__)))
 
 #define TIM_CHANNEL_STATE_SET_ALL(__HANDLE__, __CHANNEL_STATE__) \
   do {                                                           \
@@ -1735,15 +1737,16 @@ mode.
   } while (0)
 
 #define TIM_CHANNEL_N_STATE_GET(__HANDLE__, __CHANNEL__)               \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                      \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? (__HANDLE__)->ChannelNState[0] \
-       ? (__HANDLE__)->ChannelNState[0]                  \
+   : ((__CHANNEL__) == TIM_CHANNEL_2) ? (__HANDLE__)->ChannelNState[1] \
-       : ((__CHANNEL__) == TIM_CHANNEL_2) ? (__HANDLE__)->ChannelNState[1] : ((__CHANNEL__) == TIM_CHANNEL_3) ? (__HANDLE__)->ChannelNState[2] : (__HANDLE__)->ChannelNState[3])
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? (__HANDLE__)->ChannelNState[2] \
+                                      : (__HANDLE__)->ChannelNState[3])
 
 #define TIM_CHANNEL_N_STATE_SET(__HANDLE__, __CHANNEL__, __CHANNEL_STATE__)                    \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                                \
+  (((__CHANNEL__) == TIM_CHANNEL_1)   ? ((__HANDLE__)->ChannelNState[0] = (__CHANNEL_STATE__)) \
-       ? ((__HANDLE__)->ChannelNState[0] = (__CHANNEL_STATE__))                                    \
    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->ChannelNState[1] = (__CHANNEL_STATE__)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->ChannelNState[2] = (__CHANNEL_STATE__)) : ((__HANDLE__)->ChannelNState[3] = (__CHANNEL_STATE__)))
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->ChannelNState[2] = (__CHANNEL_STATE__)) \
+                                      : ((__HANDLE__)->ChannelNState[3] = (__CHANNEL_STATE__)))
 
 #define TIM_CHANNEL_N_STATE_SET_ALL(__HANDLE__, __CHANNEL_STATE__) \
   do {                                                             \

source/Core/BSP/MHP30/configuration.h

@@ -0,0 +1,156 @@
+#ifndef CONFIGURATION_H_
+#define CONFIGURATION_H_
+#include "Settings.h"
+#include "configuration.h"
+#include <stdint.h>
+/**
+ * Configuration.h
+ * Define here your default pre settings for TS80 or TS100
+ *
+ */
+
+//===========================================================================
+//============================= Default Settings ============================
+//===========================================================================
+/**
+ * Default soldering temp is 320.0 C
+ * Temperature the iron sleeps at - default 150.0 C
+ */
+
+#define SLEEP_TEMP         150 // Default sleep temperature
+#define BOOST_TEMP         420 // Default boost temp.
+#define BOOST_MODE_ENABLED 1   // 0: Disable 1: Enable
+
+/**
+ * Blink the temperature on the cooling screen when its > 50C
+ */
+#define COOLING_TEMP_BLINK 0 // 0: Disable 1: Enable
+
+/**
+ * How many seconds/minutes we wait until going to sleep/shutdown.
+ * Values -> SLEEP_TIME * 10; i.e. 5*10 = 50 Seconds!
+ */
+#define SLEEP_TIME    5  // x10 Seconds
+#define SHUTDOWN_TIME 10 // Minutes
+
+/**
+ * Auto start off for safety.
+ * Pissible values are:
+ *  0 - none
+ *  1 - Soldering Temperature
+ *  2 - Sleep Temperature
+ *  3 - Sleep Off Temperature
+ */
+#define AUTO_START_MODE 0 // Default to none
+
+/**
+ * Locking Mode
+ * When in soldering mode a long press on both keys toggle the lock of the buttons
+ * Possible values are:
+ *  0 - Desactivated
+ *  1 - Lock except boost
+ *  2 - Full lock
+ */
+#define LOCKING_MODE 0 // Default to desactivated for safety
+
+/**
+ * OLED Orientation
+ *
+ */
+#define ORIENTATION_MODE           0 // 0: Right 1:Left 2:Automatic - Default right
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
+
+/**
+ * Temp change settings
+ */
+#define TEMP_CHANGE_SHORT_STEP     1  // Default temp change short step +1
+#define TEMP_CHANGE_LONG_STEP      10 // Default temp change long step +10
+#define TEMP_CHANGE_SHORT_STEP_MAX 50 // Temp change short step MAX value
+#define TEMP_CHANGE_LONG_STEP_MAX  90 // Temp change long step MAX value
+
+/* Power pulse for keeping power banks awake*/
+#define POWER_PULSE_INCREMENT    1
+#define POWER_PULSE_MAX          100 // x10 max watts
+#define POWER_PULSE_WAIT_MAX     9   // 9*2.5s = 22.5 seconds
+#define POWER_PULSE_DURATION_MAX 9   // 9*250ms = 2.25 seconds
+
+#ifdef MODEL_TS100
+#define POWER_PULSE_DEFAULT 0
+#else
+#define POWER_PULSE_DEFAULT 5
+#endif
+#define POWER_PULSE_WAIT_DEFAULT     4 // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s
+#define POWER_PULSE_DURATION_DEFAULT 1 // Default duration of the power pulse: 1*250 = 250 ms
+
+/**
+ * OLED Orientation Sensitivity on Automatic mode!
+ * Motion Sensitivity <0=Off 1=Least Sensitive 9=Most Sensitive>
+ */
+#define SENSITIVITY 7 // Default 7
+
+/**
+ * Detailed soldering screen
+ * Detailed idle screen (off for first time users)
+ */
+#define DETAILED_SOLDERING 0 // 0: Disable 1: Enable - Default 0
+#define DETAILED_IDLE      0 // 0: Disable 1: Enable - Default 0
+
+#define THERMAL_RUNAWAY_TIME_SEC 20
+#define THERMAL_RUNAWAY_TEMP_C   20
+
+#define CUT_OUT_SETTING          0  // default to no cut-off voltage
+#define RECOM_VOL_CELL           33 // Minimum voltage per cell (Recommended 3.3V (33))
+#define TEMPERATURE_INF          0  // default to 0
+#define DESCRIPTION_SCROLL_SPEED 0  // 0: Slow 1: Fast - default to slow
+#define ANIMATION_LOOP           1  // 0: off 1: on
+#define ANIMATION_SPEED          settingOffSpeed_t::MEDIUM
+
+#define OP_AMP_Rf_MHP30  268500 //  268.5  Kilo-ohms -> Measured
+#define OP_AMP_Rin_MHP30 1600   //  1.6  Kilo-ohms -> Measured
+
+#define OP_AMP_GAIN_STAGE_MHP30 (1 + (OP_AMP_Rf_MHP30 / OP_AMP_Rin_MHP30))
+// Deriving the Voltage div:
+// Vin_max = (3.3*(r1+r2))/(r2)
+// vdiv = (32768*4)/(vin_max*10)
+
+#ifndef MODEL_MHP30
+#error "No model defined!"
+#endif
+
+#ifdef MODEL_MHP30
+#define SOLDERING_TEMP     200                     // Default soldering temp is 200.0 °C
+#define VOLTAGE_DIV        360                     // Default for MHP30
+#define PID_POWER_LIMIT    65                      // Sets the max pwm power limit
+#define CALIBRATION_OFFSET 0                       // the adc offset in uV - MHP compensates automagically
+#define POWER_LIMIT        65                      // 65 watts default power limit
+#define MAX_POWER_LIMIT    65                      //
+#define POWER_LIMIT_STEPS  1                       //
+#define OP_AMP_GAIN_STAGE  OP_AMP_GAIN_STAGE_MHP30 //
+#define USB_PD_VMAX        20                      // Maximum voltage for PD to negotiate
+#define MODEL_HAS_DCDC                             // Has inductor to current filter
+#define PID_TIM_HZ         (16)                    //
+#define MAX_TEMP_C         300                     // Max soldering temp selectable °C
+#define MAX_TEMP_F         570                     // Max soldering temp selectable °F
+#define MIN_TEMP_C         10                      // Min soldering temp selectable °C
+#define MIN_TEMP_F         60                      // Min soldering temp selectable °F
+#define MIN_BOOST_TEMP_C   150                     // The min settable temp for boost mode °C
+#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 ACCEL_MSA
+#define POW_PD 1
+#define TEMP_NTC
+#define I2C_SOFT
+#define BATTFILTERDEPTH 8
+#define OLED_I2CBB
+#define ACCEL_EXITS_ON_MOVEMENT
+
+#define HARDWARE_MAX_WATTAGE_X10 650
+#define TIP_THERMAL_MASS         65 // TODO, needs refinement
+#define TIP_RESISTANCE           60 // x10 ohms, ~6 typical
+#endif
+
+#ifdef ACCEL_EXITS_ON_MOVEMENT
+#define NO_SLEEP_MODE
+#endif
+#endif

source/Core/BSP/MHP30/fusb_user.cpp

@@ -1,20 +1,13 @@
-#include "Model_Config.h"
+#include "configuration.h"
-#ifdef POW_PD
+#if POW_PD
 #include "BSP.h"
 #include "I2C_Wrapper.hpp"
 #include "Pins.h"
 #include "Setup.h"
-#include "fusb302b.h"
+#include "USBPD.h"
-#include "fusb_user.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(uint8_t addr, uint8_t size, uint8_t *buf) { return FRToSI2C::Mem_Read(FUSB302B_ADDR, addr, 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(uint8_t addr, uint8_t size, const uint8_t *buf) { return FRToSI2C::Mem_Write(FUSB302B_ADDR, addr, (uint8_t *)buf, size); }
-
-bool fusb302_detect() {
-  // Probe the I2C bus for its address
-  return FRToSI2C::probe(FUSB302B_ADDR);
-}
 
 void setupFUSBIRQ() {
   GPIO_InitTypeDef GPIO_InitStruct;

source/Core/BSP/MHP30/postRTOS.cpp

@@ -4,7 +4,6 @@
 #include "QC3.h"
 #include "Settings.h"
 #include "cmsis_os.h"
-#include "fusbpd.h"
 #include "main.hpp"
 #include "power.hpp"
 #include "stdlib.h"

source/Core/BSP/MHP30/preRTOS.cpp

@@ -7,11 +7,10 @@
 
 #include "BSP.h"
 #include "I2CBB.hpp"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "Setup.h"
-#include "fusbpd.h"
 #include <I2C_Wrapper.hpp>
+
 void preRToSInit() {
   /* Reset of all peripherals, Initializes the Flash interface and the Systick.
    */

source/Core/BSP/Miniware/BSP.cpp

@@ -2,7 +2,6 @@
 
 #include "BSP.h"
 #include "I2C_Wrapper.hpp"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "Setup.h"
 #include "TipThermoModel.h"
@@ -10,6 +9,7 @@
 #include "history.hpp"
 #include "main.hpp"
 #include <IRQ.h>
+
 volatile uint16_t PWMSafetyTimer = 0;
 volatile uint8_t  pendingPWM     = 0;
 
@@ -21,8 +21,6 @@ uint16_t totalPWM; // htim2.Init.Period, the full PWM cycle
 
 static bool fastPWM;
 
-// 2 second filter (ADC is PID_TIM_HZ Hz)
-history<uint16_t, PID_TIM_HZ> rawTempFilter = {{0}, 0, 0};
 void resetWatchdog() { HAL_IWDG_Refresh(&hiwdg); }
 #ifdef TEMP_NTC
 // Lookup table for the NTC
@@ -93,12 +91,12 @@ static const uint16_t NTCHandleLookup[] = {
 };
 #endif
 
-uint16_t getHandleTemperature() {
+uint16_t getHandleTemperature(uint8_t sample) {
+  int32_t result = getADCHandleTemp(sample);
 #ifdef TEMP_NTC
   // TS80P uses 100k NTC resistors instead
   // NTCG104EF104FT1X from TDK
   // For now not doing interpolation
-  int32_t result = getADC(0);
   for (uint32_t i = 0; i < (sizeof(NTCHandleLookup) / (2 * sizeof(uint16_t))); i++) {
     if (result > NTCHandleLookup[(i * 2) + 0]) {
       return NTCHandleLookup[(i * 2) + 1] * 10;
@@ -114,7 +112,6 @@ uint16_t getHandleTemperature() {
   // mV per count So we need to subtract an offset of 0.5V to center on 0C
   // (4964.8 counts)
   //
-  int32_t result = getADC(0);
   result -= 4965; // remove 0.5V offset
   // 10mV per C
   // 99.29 counts per Deg C above 0C. Tends to read a tad over across all of my sample units
@@ -122,37 +119,7 @@ uint16_t getHandleTemperature() {
   result /= 994;
   return result;
 #endif
-}
+  return 0;
-
-uint16_t getTipInstantTemperature() {
-  uint16_t sum = 0; // 12 bit readings * 8 -> 15 bits
-  uint16_t readings[8];
-  // Looking to reject the highest outlier readings.
-  // As on some hardware these samples can run into the op-amp recovery time
-  // Once this time is up the signal stabilises quickly, so no need to reject minimums
-  readings[0] = hadc1.Instance->JDR1;
-  readings[1] = hadc1.Instance->JDR2;
-  readings[2] = hadc1.Instance->JDR3;
-  readings[3] = hadc1.Instance->JDR4;
-  readings[4] = hadc2.Instance->JDR1;
-  readings[5] = hadc2.Instance->JDR2;
-  readings[6] = hadc2.Instance->JDR3;
-  readings[7] = hadc2.Instance->JDR4;
-
-  for (int i = 0; i < 8; i++) {
-    sum += readings[i];
-  }
-  return sum; // 8x over sample
-}
-
-uint16_t getTipRawTemp(uint8_t refresh) {
-  if (refresh) {
-    uint16_t lastSample = getTipInstantTemperature();
-    rawTempFilter.update(lastSample);
-    return lastSample;
-  } else {
-    return rawTempFilter.average();
-  }
 }
 
 uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
@@ -160,78 +127,42 @@ uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
   // Therefore we can divide down from there
   // Multiplying ADC max by 4 for additional calibration options,
   // ideal term is 467
-#ifdef MODEL_TS100
+  uint32_t res = getADCVin(sample);
-#define BATTFILTERDEPTH 32
+  res *= 4;
-#else
+  res /= divisor;
-#define BATTFILTERDEPTH 8
+  return res;
-
-#endif
-  static uint8_t  preFillneeded = 10;
-  static uint32_t samples[BATTFILTERDEPTH];
-  static uint8_t  index = 0;
-  if (preFillneeded) {
-    for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
-      samples[i] = getADC(1);
-    preFillneeded--;
-  }
-  if (sample) {
-    samples[index] = getADC(1);
-    index          = (index + 1) % BATTFILTERDEPTH;
-  }
-  uint32_t sum = 0;
-
-  for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
-    sum += samples[i];
-
-  sum /= BATTFILTERDEPTH;
-  if (divisor == 0) {
-    divisor = 1;
-  }
-  return sum * 4 / divisor;
-}
-
-void setTipPWM(uint8_t pulse) {
-  PWMSafetyTimer = 10; // This is decremented in the handler for PWM so that the tip pwm is
-                       // disabled if the PID task is not scheduled often enough.
-
-  pendingPWM = pulse;
 }
 
 static void switchToFastPWM(void) {
+  // 10Hz
   fastPWM              = true;
-  totalPWM            = powerPWM + tempMeasureTicks * 2 + holdoffTicks;
+  totalPWM             = powerPWM + tempMeasureTicks + holdoffTicks;
   htim2.Instance->ARR  = totalPWM;
-  // ~3.5 Hz rate
+  htim2.Instance->CCR1 = powerPWM + holdoffTicks;
-  htim2.Instance->CCR1 = powerPWM + holdoffTicks * 2;
+  htim2.Instance->PSC  = 2690;
-  // 2 MHz timer clock/2000 = 1 kHz tick rate
-  htim2.Instance->PSC = 2000;
 }
 
 static void switchToSlowPWM(void) {
+  // 5Hz
   fastPWM              = false;
-  totalPWM            = powerPWM + tempMeasureTicks + holdoffTicks;
+  totalPWM             = powerPWM + tempMeasureTicks / 2 + holdoffTicks / 2;
   htim2.Instance->ARR  = totalPWM;
-  // ~1.84 Hz rate
+  htim2.Instance->CCR1 = powerPWM + holdoffTicks / 2;
-  htim2.Instance->CCR1 = powerPWM + holdoffTicks;
+  htim2.Instance->PSC  = 2690 * 2;
-  // 2 MHz timer clock/4000 = 500 Hz tick rate
-  htim2.Instance->PSC = 4000;
 }
 
-bool tryBetterPWM(uint8_t pwm) {
+void setTipPWM(const uint8_t pulse, const bool shouldUseFastModePWM) {
-  if (fastPWM && pwm == powerPWM) {
+  PWMSafetyTimer = 10; // This is decremented in the handler for PWM so that the tip pwm is
-    // maximum power for fast PWM reached, need to go slower to get more
+                       // disabled if the PID task is not scheduled often enough.
-    switchToSlowPWM();
+  pendingPWM = pulse;
-    return true;
+  if (fastPWM != shouldUseFastModePWM) {
-  } else if (!fastPWM && pwm < 230) {
+    if (shouldUseFastModePWM) {
-    // 254 in fast PWM mode gives the same power as 239 in slow
-    // allow for some reasonable hysteresis by switching only when it goes
-    // below 230 (equivalent to 245 in fast mode)
       switchToFastPWM();
-    return true;
+    } else {
+      switchToSlowPWM();
+    }
   }
-  return false;
 }
-
 // These are called by the HAL after the corresponding events from the system
 // timers.
 

source/Core/BSP/Miniware/IRQ.cpp

@@ -7,7 +7,7 @@
 
 #include "IRQ.h"
 #include "Pins.h"
-#include "int_n.h"
+#include "configuration.h"
 
 /*
  * Catch the IRQ that says that the conversion is done on the temperature
@@ -30,13 +30,23 @@ void HAL_I2C_ErrorCallback(I2C_HandleTypeDef *hi2c __unused) { FRToSI2C::CpltCal
 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) {
   (void)GPIO_Pin;
-  InterruptHandler::irqCallback();
+  // Notify POW thread that an irq occured
+  if (POWTaskHandle != nullptr) {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    xTaskNotifyFromISR(POWTaskHandle, 1, eSetBits, &xHigherPriorityTaskWoken);
+    /* Force a context switch if xHigherPriorityTaskWoken is now set to pdTRUE.
+    The macro used to do this is dependent on the port and may be called
+    portEND_SWITCHING_ISR. */
+    portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+  }
 }
 
 bool getFUS302IRQLow() {
-#ifdef POW_PD
+#if POW_PD
   // Return true if the IRQ line is still held low
   return HAL_GPIO_ReadPin(INT_PD_GPIO_Port, INT_PD_Pin) == GPIO_PIN_RESET;
 #else

source/Core/BSP/Miniware/Model_Config.h

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

source/Core/BSP/Miniware/Pins.h

@@ -7,7 +7,7 @@
 
 #ifndef BSP_MINIWARE_PINS_H_
 #define BSP_MINIWARE_PINS_H_
-#include "Model_Config.h"
+#include "configuration.h"
 
 #ifdef MODEL_TS100
 
@@ -78,8 +78,6 @@
 #define SCL2_GPIO_Port            GPIOA
 #define SDA2_Pin                  GPIO_PIN_1
 #define SDA2_GPIO_Port            GPIOA
-#define INT_PD_Pin                GPIO_PIN_9
-#define INT_PD_GPIO_Port          GPIOA
 
 #endif
 #ifdef MODEL_TS80P

source/Core/BSP/Miniware/Power.cpp

@@ -1,45 +1,25 @@
 #include "BSP.h"
 #include "BSP_Power.h"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "QC3.h"
 #include "Settings.h"
-#include "fusb_user.h"
+#include "USBPD.h"
-#include "fusbpd.h"
+#include "configuration.h"
-#include "int_n.h"
-#include "policy_engine.h"
-bool FUSB302_present = false;
-bool FUSB302_probed  = false;
 
 void power_check() {
-#ifdef POW_PD
+#if POW_PD
-  if (FUSB302_present) {
-    PolicyEngine::PPSTimerCallback();
   // Cant start QC until either PD works or fails
-    if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+  if (!USBPowerDelivery::negotiationComplete()) {
-      return;
-    }
-    if (PolicyEngine::pdHasNegotiated()) {
     return;
   }
+  if (USBPowerDelivery::negotiationHasWorked()) {
+    return; // We are using PD
   }
 #endif
 #ifdef POW_QC
   QC_resync();
 #endif
 }
-uint8_t usb_pd_detect() {
-#ifdef POW_PD
-  if (FUSB302_probed) {
-    return FUSB302_present;
-  } else {
-    FUSB302_present = fusb302_detect();
-    FUSB302_probed  = true;
-  }
-  return FUSB302_present;
-#endif
-  return false;
-}
 
 bool getIsPoweredByDCIN() {
 #ifdef MODEL_TS80

source/Core/BSP/Miniware/QC_GPIO.cpp

@@ -5,11 +5,12 @@
  *      Author: Ralim
  */
 #include "BSP.h"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "QC3.h"
 #include "Settings.h"
+#include "configuration.h"
 #include "stm32f1xx_hal.h"
+
 #ifdef POW_QC
 void QC_DPlusZero_Six() {
   HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET); // pull down D+
@@ -70,7 +71,6 @@ uint8_t QC_DM_PulledDown() { return HAL_GPIO_ReadPin(GPIOA, GPIO_PIN_11) == GPIO
 #endif
 void QC_resync() {
 #ifdef POW_QC
-  seekQC((systemSettings.QCIdealVoltage) ? 120 : 90,
+  seekQC(getSettingValue(SettingsOptions::QCIdealVoltage), getSettingValue(SettingsOptions::VoltageDiv)); // Run the QC seek again if we have drifted too much
-         systemSettings.voltageDiv); // Run the QC seek again if we have drifted too much
 #endif
 }

source/Core/BSP/Miniware/Setup.cpp

@@ -5,7 +5,10 @@
  *      Author: Ben V. Brown
  */
 #include "Setup.h"
+#include "BSP.h"
 #include "Pins.h"
+#include "history.hpp"
+#include <stdint.h>
 ADC_HandleTypeDef hadc1;
 ADC_HandleTypeDef hadc2;
 DMA_HandleTypeDef hdma_adc1;
@@ -17,9 +20,9 @@ DMA_HandleTypeDef hdma_i2c1_tx;
 IWDG_HandleTypeDef hiwdg;
 TIM_HandleTypeDef  htim2;
 TIM_HandleTypeDef  htim3;
-#define ADC_CHANNELS 2
+#define ADC_FILTER_LEN 4
 #define ADC_SAMPLES    16
-uint32_t ADCReadings[ADC_SAMPLES * ADC_CHANNELS]; // room for 32 lots of the pair of readings
+uint16_t ADCReadings[ADC_SAMPLES]; // Used to store the adc readings for the handle cold junction temp
 
 // Functions
 static void SystemClock_Config(void);
@@ -48,24 +51,53 @@ void        Setup_HAL() {
   MX_TIM3_Init();
   MX_TIM2_Init();
   MX_IWDG_Init();
-  HAL_ADC_Start(&hadc2);
+  HAL_ADC_Start_DMA(&hadc1, (uint32_t *)ADCReadings, (ADC_SAMPLES)); // start DMA of normal readings
-  HAL_ADCEx_MultiModeStart_DMA(&hadc1, ADCReadings, (ADC_SAMPLES * ADC_CHANNELS)); // start DMA of normal readings
   HAL_ADCEx_InjectedStart(&hadc1);                                   // enable injected readings
   HAL_ADCEx_InjectedStart(&hadc2);                                   // enable injected readings
 }
 
-// channel 0 -> temperature sensor, 1-> VIN
+uint16_t getADCHandleTemp(uint8_t sample) {
-uint16_t getADC(uint8_t channel) {
+  static history<uint16_t, ADC_FILTER_LEN> filter = {{0}, 0, 0};
+  if (sample) {
     uint32_t sum = 0;
     for (uint8_t i = 0; i < ADC_SAMPLES; i++) {
-    uint16_t adc1Sample = ADCReadings[channel + (i * ADC_CHANNELS)];
+      sum += ADCReadings[i];
-    uint16_t adc2Sample = ADCReadings[channel + (i * ADC_CHANNELS)] >> 16;
-
-    sum += (adc1Sample + adc2Sample);
     }
-  return sum >> 2;
+    filter.update(sum);
+  }
+  return filter.average() >> 1;
 }
 
+uint16_t getADCVin(uint8_t sample) {
+  static history<uint16_t, ADC_FILTER_LEN> filter = {{0}, 0, 0};
+  if (sample) {
+    uint16_t latestADC = 0;
+
+    latestADC += hadc2.Instance->JDR1;
+    latestADC += hadc2.Instance->JDR2;
+    latestADC += hadc2.Instance->JDR3;
+    latestADC += hadc2.Instance->JDR4;
+    latestADC <<= 3;
+    filter.update(latestADC);
+  }
+  return filter.average();
+}
+// Returns either average or instant value. When sample is set the samples from the injected ADC are copied to the filter and then the raw reading is returned
+uint16_t getTipRawTemp(uint8_t sample) {
+  static history<uint16_t, ADC_FILTER_LEN> filter = {{0}, 0, 0};
+  if (sample) {
+    uint16_t latestADC = 0;
+
+    latestADC += hadc1.Instance->JDR1;
+    latestADC += hadc1.Instance->JDR2;
+    latestADC += hadc1.Instance->JDR3;
+    latestADC += hadc1.Instance->JDR4;
+    latestADC <<= 1;
+    filter.update(latestADC);
+    return latestADC;
+  }
+  return filter.average();
+}
 /** System Clock Configuration
  */
 void SystemClock_Config(void) {
@@ -113,7 +145,6 @@ void SystemClock_Config(void) {
 
 /* ADC1 init function */
 static void MX_ADC1_Init(void) {
-  ADC_MultiModeTypeDef multimode;
 
   ADC_ChannelConfTypeDef   sConfig;
   ADC_InjectionConfTypeDef sConfigInjected;
@@ -125,14 +156,9 @@ static void MX_ADC1_Init(void) {
   hadc1.Init.DiscontinuousConvMode = DISABLE;
   hadc1.Init.ExternalTrigConv      = ADC_SOFTWARE_START;
   hadc1.Init.DataAlign             = ADC_DATAALIGN_RIGHT;
-  hadc1.Init.NbrOfConversion       = ADC_CHANNELS;
+  hadc1.Init.NbrOfConversion       = 1;
   HAL_ADC_Init(&hadc1);
 
-  /**Configure the ADC multi-mode
-   */
-  multimode.Mode = ADC_DUALMODE_REGSIMULT_INJECSIMULT;
-  HAL_ADCEx_MultiModeConfigChannel(&hadc1, &multimode);
-
   /**Configure Regular Channel
    */
   sConfig.Channel      = TMP36_ADC1_CHANNEL;
@@ -140,12 +166,6 @@ static void MX_ADC1_Init(void) {
   sConfig.SamplingTime = ADC_SAMPLETIME_71CYCLES_5;
   HAL_ADC_ConfigChannel(&hadc1, &sConfig);
 
-  /**Configure Regular Channel
-   */
-  sConfig.Channel = VIN_ADC1_CHANNEL;
-  sConfig.Rank    = ADC_REGULAR_RANK_2;
-  HAL_ADC_ConfigChannel(&hadc1, &sConfig);
-
   /**Configure Injected Channel
    */
   // F in = 10.66 MHz
@@ -157,15 +177,13 @@ static void MX_ADC1_Init(void) {
   sConfigInjected.InjectedChannel               = TIP_TEMP_ADC1_CHANNEL;
   sConfigInjected.InjectedRank                  = 1;
   sConfigInjected.InjectedNbrOfConversion       = 4;
-  sConfigInjected.InjectedSamplingTime          = ADC_SAMPLETIME_1CYCLE_5;
+  sConfigInjected.InjectedSamplingTime          = ADC_SAMPLETIME_28CYCLES_5;
-  sConfigInjected.ExternalTrigInjecConv         = ADC_EXTERNALTRIGINJECCONV_T2_CC1;
+  sConfigInjected.ExternalTrigInjecConv         = ADC_EXTERNALTRIGINJECCONV_T2_TRGO;
   sConfigInjected.AutoInjectedConv              = DISABLE;
   sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
   sConfigInjected.InjectedOffset                = 0;
 
   HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
-  sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5;
-
   sConfigInjected.InjectedRank = 2;
   HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
   sConfigInjected.InjectedRank = 3;
@@ -180,44 +198,30 @@ static void MX_ADC1_Init(void) {
 
 /* ADC2 init function */
 static void MX_ADC2_Init(void) {
-  ADC_ChannelConfTypeDef   sConfig;
   ADC_InjectionConfTypeDef sConfigInjected;
 
   /**Common config
    */
   hadc2.Instance                   = ADC2;
-  hadc2.Init.ScanConvMode          = ADC_SCAN_ENABLE;
+  hadc2.Init.ScanConvMode          = ADC_SCAN_DISABLE;
   hadc2.Init.ContinuousConvMode    = ENABLE;
   hadc2.Init.DiscontinuousConvMode = DISABLE;
   hadc2.Init.ExternalTrigConv      = ADC_SOFTWARE_START;
   hadc2.Init.DataAlign             = ADC_DATAALIGN_RIGHT;
-  hadc2.Init.NbrOfConversion       = ADC_CHANNELS;
+  hadc2.Init.NbrOfConversion       = 0;
   HAL_ADC_Init(&hadc2);
 
-  /**Configure Regular Channel
-   */
-  sConfig.Channel      = TMP36_ADC2_CHANNEL;
-  sConfig.Rank         = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_71CYCLES_5;
-  HAL_ADC_ConfigChannel(&hadc2, &sConfig);
-
-  sConfig.Channel = VIN_ADC2_CHANNEL;
-  sConfig.Rank    = ADC_REGULAR_RANK_2;
-  HAL_ADC_ConfigChannel(&hadc2, &sConfig);
-
   /**Configure Injected Channel
    */
-  sConfigInjected.InjectedChannel               = TIP_TEMP_ADC2_CHANNEL;
+  sConfigInjected.InjectedChannel               = VIN_ADC2_CHANNEL;
   sConfigInjected.InjectedRank                  = ADC_INJECTED_RANK_1;
   sConfigInjected.InjectedNbrOfConversion       = 4;
-  sConfigInjected.InjectedSamplingTime          = ADC_SAMPLETIME_1CYCLE_5;
+  sConfigInjected.InjectedSamplingTime          = ADC_SAMPLETIME_28CYCLES_5;
-  sConfigInjected.ExternalTrigInjecConv         = ADC_EXTERNALTRIGINJECCONV_T2_CC1;
+  sConfigInjected.ExternalTrigInjecConv         = ADC_EXTERNALTRIGINJECCONV_T2_TRGO;
   sConfigInjected.AutoInjectedConv              = DISABLE;
   sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
   sConfigInjected.InjectedOffset                = 0;
   HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
-  sConfigInjected.InjectedSamplingTime = ADC_SAMPLETIME_1CYCLE_5;
-
   sConfigInjected.InjectedRank = ADC_INJECTED_RANK_2;
   HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
   sConfigInjected.InjectedRank = ADC_INJECTED_RANK_3;
@@ -322,7 +326,8 @@ static void MX_TIM2_Init(void) {
   // These values give a rate of around 3.5 Hz for "fast" mode and 1.84 Hz for "slow"
   htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
   // dummy value, will be reconfigured by BSPInit()
-  htim2.Init.Period            = 255 + 17 * 2;
+  htim2.Init.Period = powerPWM + 14 * 2;
+
   htim2.Init.ClockDivision     = TIM_CLOCKDIVISION_DIV4; // 8 MHz (x2 APB1) before divide
   htim2.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
   htim2.Init.RepetitionCounter = 0;
@@ -334,13 +339,13 @@ static void MX_TIM2_Init(void) {
   HAL_TIM_PWM_Init(&htim2);
   HAL_TIM_OC_Init(&htim2);
 
-  sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
+  sMasterConfig.MasterOutputTrigger = TIM_TRGO_OC1;
   sMasterConfig.MasterSlaveMode     = TIM_MASTERSLAVEMODE_DISABLE;
   HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
 
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
   // dummy value, will be reconfigured by BSPInit() in the BSP.cpp
-  sConfigOC.Pulse = 255 + 13 * 2; // 13 -> Delay of 7 ms
+  sConfigOC.Pulse = powerPWM + 14; // 13 -> Delay of 7 ms
   // 255 is the largest time period of the drive signal, and then offset ADC sample to be a bit delayed after this
   /*
    * It takes 4 milliseconds for output to be stable after PWM turns off.

source/Core/BSP/Miniware/Setup.h

@@ -27,8 +27,8 @@ extern IWDG_HandleTypeDef hiwdg;
 extern TIM_HandleTypeDef htim2;
 extern TIM_HandleTypeDef htim3;
 void                     Setup_HAL();
-uint16_t                 getADC(uint8_t channel);
+uint16_t                 getADCHandleTemp(uint8_t sample);
-
+uint16_t                 getADCVin(uint8_t sample);
 void                     HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); // Since the hal header file does not define this one
 
 #ifdef __cplusplus

source/Core/BSP/Miniware/Software_I2C.h

@@ -8,7 +8,7 @@
 #ifndef BSP_MINIWARE_SOFTWARE_I2C_H_
 #define BSP_MINIWARE_SOFTWARE_I2C_H_
 #include "BSP.h"
-#include "Model_Config.h"
+#include "configuration.h"
 #include "stm32f1xx_hal.h"
 #ifdef I2C_SOFT
 
@@ -20,11 +20,12 @@
 #define SOFT_SCL_READ() (HAL_GPIO_ReadPin(SCL2_GPIO_Port, SCL2_Pin) == GPIO_PIN_SET ? 1 : 0)
 #define SOFT_I2C_DELAY()              \
   {                                   \
-    for (int xx = 0; xx < 40; xx++) { \
+    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/Miniware/Vendor/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

@@ -1424,16 +1424,20 @@ extern "C" {
 #if defined(STM32F301x8) || defined(STM32F302x8) || defined(STM32F318xx) || defined(STM32F303x8) || defined(STM32F334x8) || defined(STM32F328xx)
 #define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                     \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                     \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                     \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__) \
   (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
 #define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__) \
@@ -1445,133 +1449,111 @@ extern "C" {
 #endif
 #if defined(STM32F302xE) || defined(STM32F302xC)
 #define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                    \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                     \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                     \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                      \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                   \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                           \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_IT()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
 #define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                   \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                            \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_IT()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_IT() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() : __HAL_COMP_COMP6_EXTI_DISABLE_IT())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_IT())
 #define __HAL_COMP_EXTI_GET_FLAG(__FLAG__)                                   \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)    \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_GET_FLAG() \
-       ? __HAL_COMP_COMP1_EXTI_GET_FLAG()  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_GET_FLAG() \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_GET_FLAG() : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_GET_FLAG() : __HAL_COMP_COMP6_EXTI_GET_FLAG())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_GET_FLAG() \
+                                          : __HAL_COMP_COMP6_EXTI_GET_FLAG())
 #define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                   \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)      \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG() \
-       ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG()  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() : __HAL_COMP_COMP6_EXTI_CLEAR_FLAG())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() \
+                                          : __HAL_COMP_COMP6_EXTI_CLEAR_FLAG())
 #endif
 #if defined(STM32F303xE) || defined(STM32F398xx) || defined(STM32F303xC) || defined(STM32F358xx)
 #define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                      \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_RISING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE()                                                                                                                                        \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                          \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_RISING_EDGE()                                                                                                                                  \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_RISING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE() \
                                               : __HAL_COMP_COMP7_EXTI_ENABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                       \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                 \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_RISING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE()                                                                                                                                        \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                           \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_RISING_EDGE()                                                                                                                                  \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_RISING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE() \
                                               : __HAL_COMP_COMP7_EXTI_DISABLE_RISING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                       \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                 \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_FALLING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                        \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                           \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                  \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_FALLING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE() \
                                               : __HAL_COMP_COMP7_EXTI_ENABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                        \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                  \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_FALLING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                        \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                            \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                  \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_FALLING_EDGE() \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE() \
                                               : __HAL_COMP_COMP7_EXTI_DISABLE_FALLING_EDGE())
 #define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                   \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                             \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_IT()                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                       \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_IT() \
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_IT()                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                 \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_IT()                                                  \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4)                                           \
-                         ? __HAL_COMP_COMP4_EXTI_ENABLE_IT()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_IT() \
-                                                                    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_IT() : __HAL_COMP_COMP7_EXTI_ENABLE_IT())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_IT() \
+                                              : __HAL_COMP_COMP7_EXTI_ENABLE_IT())
 #define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                   \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                              \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_IT()                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_IT() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_IT() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_IT()                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                  \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_IT()                                                  \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4)                                            \
-                         ? __HAL_COMP_COMP4_EXTI_DISABLE_IT()                                            \
    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_IT() \
-                                                                    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_IT() : __HAL_COMP_COMP7_EXTI_DISABLE_IT())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_IT() \
+                                              : __HAL_COMP_COMP7_EXTI_DISABLE_IT())
 #define __HAL_COMP_EXTI_GET_FLAG(__FLAG__)                                   \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)                                                            \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_GET_FLAG() \
-       ? __HAL_COMP_COMP1_EXTI_GET_FLAG()                                                          \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_GET_FLAG() \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2)                                                      \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_GET_FLAG() \
-             ? __HAL_COMP_COMP2_EXTI_GET_FLAG()                                                    \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_GET_FLAG() \
-             : ((__FLAG__) == COMP_EXTI_LINE_COMP3)                                                \
-                   ? __HAL_COMP_COMP3_EXTI_GET_FLAG()                                              \
-                   : ((__FLAG__) == COMP_EXTI_LINE_COMP4)                                          \
-                         ? __HAL_COMP_COMP4_EXTI_GET_FLAG()                                        \
    : ((__FLAG__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_GET_FLAG() \
-                                                                : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_GET_FLAG() : __HAL_COMP_COMP7_EXTI_GET_FLAG())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_GET_FLAG() \
+                                          : __HAL_COMP_COMP7_EXTI_GET_FLAG())
 #define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                   \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)                                                              \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG() \
-       ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG()                                                          \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2)                                                        \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_CLEAR_FLAG() \
-             ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG()                                                    \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() \
-             : ((__FLAG__) == COMP_EXTI_LINE_COMP3)                                                  \
-                   ? __HAL_COMP_COMP3_EXTI_CLEAR_FLAG()                                              \
-                   : ((__FLAG__) == COMP_EXTI_LINE_COMP4)                                            \
-                         ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG()                                        \
    : ((__FLAG__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_CLEAR_FLAG() \
-                                                                : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_CLEAR_FLAG() : __HAL_COMP_COMP7_EXTI_CLEAR_FLAG())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_CLEAR_FLAG() \
+                                          : __HAL_COMP_COMP7_EXTI_CLEAR_FLAG())
 #endif
 #if defined(STM32F373xC) || defined(STM32F378xx)
 #define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)   (((__EXTILINE__) == COMP_EXTI_LINE_COMP1) ? __HAL_COMP_COMP1_EXTI_ENABLE_RISING_EDGE() : __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE())

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

@@ -70,27 +70,18 @@ extern "C" {
  * @retval The specified transfer complete flag index.
  */
 #define __HAL_DMA_GET_TC_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                                       \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_TC1 \
-       ? DMA_FLAG_TC1                                                                                                      \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_TC2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_TC3 \
-             ? DMA_FLAG_TC2                                                                                                \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_TC4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                                           \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_TC5 \
-                   ? DMA_FLAG_TC3                                                                                          \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TC6 \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                                     \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7)) ? DMA_FLAG_TC7 \
-                         ? DMA_FLAG_TC4                                                                                    \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1)) ? DMA_FLAG_TC1 \
-                         : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5))                               \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2)) ? DMA_FLAG_TC2 \
-                               ? DMA_FLAG_TC5                                                                              \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) ? DMA_FLAG_TC3 \
-                               : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6))                         \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_TC4 \
-                                     ? DMA_FLAG_TC6                                                                        \
+                                                                       : DMA_FLAG_TC5)
-                                     : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7))                   \
-                                           ? DMA_FLAG_TC7                                                                  \
-                                           : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1))             \
-                                                 ? DMA_FLAG_TC1                                                            \
-                                                 : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2))       \
-                                                       ? DMA_FLAG_TC2                                                      \
-                                                       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) \
-                                                             ? DMA_FLAG_TC3                                                \
-                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_TC4 : DMA_FLAG_TC5)
 
 /**
  * @brief  Returns the current DMA Channel half transfer complete flag.
@@ -98,27 +89,18 @@ extern "C" {
  * @retval The specified half transfer complete flag index.
  */
 #define __HAL_DMA_GET_HT_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                                       \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_HT1 \
-       ? DMA_FLAG_HT1                                                                                                      \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_HT2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_HT3 \
-             ? DMA_FLAG_HT2                                                                                                \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_HT4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                                           \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_HT5 \
-                   ? DMA_FLAG_HT3                                                                                          \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_HT6 \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                                     \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7)) ? DMA_FLAG_HT7 \
-                         ? DMA_FLAG_HT4                                                                                    \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1)) ? DMA_FLAG_HT1 \
-                         : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5))                               \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2)) ? DMA_FLAG_HT2 \
-                               ? DMA_FLAG_HT5                                                                              \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) ? DMA_FLAG_HT3 \
-                               : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6))                         \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_HT4 \
-                                     ? DMA_FLAG_HT6                                                                        \
+                                                                       : DMA_FLAG_HT5)
-                                     : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7))                   \
-                                           ? DMA_FLAG_HT7                                                                  \
-                                           : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1))             \
-                                                 ? DMA_FLAG_HT1                                                            \
-                                                 : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2))       \
-                                                       ? DMA_FLAG_HT2                                                      \
-                                                       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) \
-                                                             ? DMA_FLAG_HT3                                                \
-                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_HT4 : DMA_FLAG_HT5)
 
 /**
  * @brief  Returns the current DMA Channel transfer error flag.
@@ -126,27 +108,18 @@ extern "C" {
  * @retval The specified transfer error flag index.
  */
 #define __HAL_DMA_GET_TE_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                                       \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_TE1 \
-       ? DMA_FLAG_TE1                                                                                                      \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_TE2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_TE3 \
-             ? DMA_FLAG_TE2                                                                                                \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_TE4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                                           \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_TE5 \
-                   ? DMA_FLAG_TE3                                                                                          \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TE6 \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                                     \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7)) ? DMA_FLAG_TE7 \
-                         ? DMA_FLAG_TE4                                                                                    \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1)) ? DMA_FLAG_TE1 \
-                         : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5))                               \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2)) ? DMA_FLAG_TE2 \
-                               ? DMA_FLAG_TE5                                                                              \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) ? DMA_FLAG_TE3 \
-                               : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6))                         \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_TE4 \
-                                     ? DMA_FLAG_TE6                                                                        \
+                                                                       : DMA_FLAG_TE5)
-                                     : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7))                   \
-                                           ? DMA_FLAG_TE7                                                                  \
-                                           : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1))             \
-                                                 ? DMA_FLAG_TE1                                                            \
-                                                 : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2))       \
-                                                       ? DMA_FLAG_TE2                                                      \
-                                                       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) \
-                                                             ? DMA_FLAG_TE3                                                \
-                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_TE4 : DMA_FLAG_TE5)
 
 /**
  * @brief  Return the current DMA Channel Global interrupt flag.
@@ -154,27 +127,18 @@ extern "C" {
  * @retval The specified transfer error flag index.
  */
 #define __HAL_DMA_GET_GI_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                                       \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_GL1 \
-       ? DMA_FLAG_GL1                                                                                                      \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_GL2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_GL3 \
-             ? DMA_FLAG_GL2                                                                                                \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_GL4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                                           \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_GL5 \
-                   ? DMA_FLAG_GL3                                                                                          \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_GL6 \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                                     \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7)) ? DMA_FLAG_GL7 \
-                         ? DMA_FLAG_GL4                                                                                    \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1)) ? DMA_FLAG_GL1 \
-                         : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5))                               \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2)) ? DMA_FLAG_GL2 \
-                               ? DMA_FLAG_GL5                                                                              \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) ? DMA_FLAG_GL3 \
-                               : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6))                         \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_GL4 \
-                                     ? DMA_FLAG_GL6                                                                        \
+                                                                       : DMA_FLAG_GL5)
-                                     : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel7))                   \
-                                           ? DMA_FLAG_GL7                                                                  \
-                                           : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel1))             \
-                                                 ? DMA_FLAG_GL1                                                            \
-                                                 : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel2))       \
-                                                       ? DMA_FLAG_GL2                                                      \
-                                                       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel3)) \
-                                                             ? DMA_FLAG_GL3                                                \
-                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA2_Channel4)) ? DMA_FLAG_GL4 : DMA_FLAG_GL5)
 
 /**
  * @brief  Get the DMA Channel pending flags.
@@ -217,16 +181,13 @@ extern "C" {
  * @retval The specified transfer complete flag index.
  */
 #define __HAL_DMA_GET_TC_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                        \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_TC1 \
-       ? DMA_FLAG_TC1                                                                                       \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_TC2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                  \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_TC3 \
-             ? DMA_FLAG_TC2                                                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_TC4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                            \
-                   ? DMA_FLAG_TC3                                                                           \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                      \
-                         ? DMA_FLAG_TC4                                                                     \
    : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_TC5 \
-                                                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TC6 : DMA_FLAG_TC7)
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TC6 \
+                                                                       : DMA_FLAG_TC7)
 
 /**
  * @brief  Return the current DMA Channel half transfer complete flag.
@@ -234,16 +195,13 @@ extern "C" {
  * @retval The specified half transfer complete flag index.
  */
 #define __HAL_DMA_GET_HT_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                        \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_HT1 \
-       ? DMA_FLAG_HT1                                                                                       \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_HT2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                  \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_HT3 \
-             ? DMA_FLAG_HT2                                                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_HT4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                            \
-                   ? DMA_FLAG_HT3                                                                           \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                      \
-                         ? DMA_FLAG_HT4                                                                     \
    : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_HT5 \
-                                                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_HT6 : DMA_FLAG_HT7)
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_HT6 \
+                                                                       : DMA_FLAG_HT7)
 
 /**
  * @brief  Return the current DMA Channel transfer error flag.
@@ -251,16 +209,13 @@ extern "C" {
  * @retval The specified transfer error flag index.
  */
 #define __HAL_DMA_GET_TE_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                        \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_TE1 \
-       ? DMA_FLAG_TE1                                                                                       \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_TE2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                  \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_TE3 \
-             ? DMA_FLAG_TE2                                                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_TE4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                            \
-                   ? DMA_FLAG_TE3                                                                           \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                      \
-                         ? DMA_FLAG_TE4                                                                     \
    : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_TE5 \
-                                                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TE6 : DMA_FLAG_TE7)
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_TE6 \
+                                                                       : DMA_FLAG_TE7)
 
 /**
  * @brief  Return the current DMA Channel Global interrupt flag.
@@ -268,16 +223,13 @@ extern "C" {
  * @retval The specified transfer error flag index.
  */
 #define __HAL_DMA_GET_GI_FLAG_INDEX(__HANDLE__)                                       \
-  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))                                        \
+  (((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel1))   ? DMA_FLAG_GL1 \
-       ? DMA_FLAG_GL1                                                                                       \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2)) ? DMA_FLAG_GL2 \
-       : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel2))                                  \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3)) ? DMA_FLAG_GL3 \
-             ? DMA_FLAG_GL2                                                                                 \
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4)) ? DMA_FLAG_GL4 \
-             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel3))                            \
-                   ? DMA_FLAG_GL3                                                                           \
-                   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel4))                      \
-                         ? DMA_FLAG_GL4                                                                     \
    : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel5)) ? DMA_FLAG_GL5 \
-                                                                                             : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_GL6 : DMA_FLAG_GL7)
+   : ((uint32_t)((__HANDLE__)->Instance) == ((uint32_t)DMA1_Channel6)) ? DMA_FLAG_GL6 \
+                                                                       : DMA_FLAG_GL7)
 
 /**
  * @brief  Get the DMA Channel pending flags.

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

@@ -579,7 +579,8 @@ uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
   (((__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))
+   : ((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))

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

@@ -2,40 +2,24 @@
  ******************************************************************************
  * @file    stm32f1xx_hal_tim_ex.h
  * @author  MCD Application Team
- * @brief   Header file of TIM HAL Extension module.
+ * @brief   Header file of TIM HAL Extended module.
  ******************************************************************************
  * @attention
  *
- * <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
+ * <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
+ * All rights reserved.</center></h2>
  *
- * Redistribution and use in source and binary forms, with or without modification,
+ * This software component is licensed by ST under BSD 3-Clause license,
- * are permitted provided that the following conditions are met:
+ * the "License"; You may not use this file except in compliance with the
- *   1. Redistributions of source code must retain the above copyright notice,
+ * License. You may obtain a copy of the License at:
- *      this list of conditions and the following disclaimer.
+ *                        opensource.org/licenses/BSD-3-Clause
- *   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_TIM_EX_H
+#ifndef STM32F1xx_HAL_TIM_EX_H
-#define __STM32F1xx_HAL_TIM_EX_H
+#define STM32F1xx_HAL_TIM_EX_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,7 +37,7 @@ extern "C" {
  */
 
 /* Exported types ------------------------------------------------------------*/
-/** @defgroup TIMEx_Exported_Types TIMEx Exported Types
+/** @defgroup TIMEx_Exported_Types TIM Extended Exported Types
  * @{
  */
 
@@ -62,7 +46,6 @@ extern "C" {
  */
 
 typedef struct {
-
   uint32_t IC1Polarity; /*!< Specifies the active edge of the input signal.
                              This parameter can be a value of @ref TIM_Input_Capture_Polarity */
 
@@ -71,60 +54,23 @@ typedef struct {
 
   uint32_t IC1Filter; /*!< Specifies the input capture filter.
                            This parameter can be a number between Min_Data = 0x0 and Max_Data = 0xF */
+
   uint32_t Commutation_Delay; /*!< Specifies the pulse value to be loaded into the Capture Compare Register.
                                    This parameter can be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF */
 } TIM_HallSensor_InitTypeDef;
-
-#if defined(STM32F100xB) || defined(STM32F100xE) || defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || defined(STM32F105xC) || defined(STM32F107xC)
-
-/**
- * @brief  TIM Break and Dead time configuration Structure definition
- */
-typedef struct {
-  uint32_t OffStateRunMode;  /*!< TIM off state in run mode
-                                This parameter can be a value of @ref TIM_OSSR_Off_State_Selection_for_Run_mode_state */
-  uint32_t OffStateIDLEMode; /*!< TIM off state in IDLE mode
-                                This parameter can be a value of @ref TIM_OSSI_Off_State_Selection_for_Idle_mode_state */
-  uint32_t LockLevel;        /*!< TIM Lock level
-                                This parameter can be a value of @ref TIM_Lock_level */
-  uint32_t DeadTime;         /*!< TIM dead Time
-                                This parameter can be a number between Min_Data = 0x00 and Max_Data = 0xFF */
-  uint32_t BreakState;       /*!< TIM Break State
-                                This parameter can be a value of @ref TIM_Break_Input_enable_disable */
-  uint32_t BreakPolarity;    /*!< TIM Break input polarity
-                                This parameter can be a value of @ref TIM_Break_Polarity */
-  uint32_t AutomaticOutput;  /*!< TIM Automatic Output Enable state
-                                This parameter can be a value of @ref TIM_AOE_Bit_Set_Reset */
-} TIM_BreakDeadTimeConfigTypeDef;
-
-#endif /* defined(STM32F100xB) || defined(STM32F100xE) ||                                                 */
-       /* defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || */
-       /* defined(STM32F105xC) || defined(STM32F107xC)                                                    */
-
-/**
- * @brief  TIM Master configuration Structure definition
- */
-typedef struct {
-  uint32_t MasterOutputTrigger; /*!< Trigger output (TRGO) selection
-                                   This parameter can be a value of @ref TIM_Master_Mode_Selection */
-  uint32_t MasterSlaveMode;     /*!< Master/slave mode selection
-                                   This parameter can be a value of @ref TIM_Master_Slave_Mode */
-} TIM_MasterConfigTypeDef;
-
 /**
  * @}
  */
+/* End of exported types -----------------------------------------------------*/
 
 /* Exported constants --------------------------------------------------------*/
-#if defined(STM32F100xB) || defined(STM32F100xE) || defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || defined(STM32F105xC) || defined(STM32F107xC)
+/** @defgroup TIMEx_Exported_Constants TIM Extended Exported Constants
-/** @defgroup TIMEx_Exported_Constants TIMEx Exported Constants
  * @{
  */
 
-/** @defgroup TIMEx_Clock_Filter TIMEx Clock Filter
+/** @defgroup TIMEx_Remap TIM Extended Remapping
  * @{
  */
-#define IS_TIM_DEADTIME(DEADTIME) ((DEADTIME) <= 0xFFU) /*!< BreakDead Time */
 /**
  * @}
  */
@@ -132,51 +78,35 @@ typedef struct {
 /**
  * @}
  */
-#endif /* defined(STM32F100xB) || defined(STM32F100xE) ||                                                 */
+/* End of exported constants -------------------------------------------------*/
-       /* defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || */
-       /* defined(STM32F105xC) || defined(STM32F107xC)                                                    */
 
 /* Exported macro ------------------------------------------------------------*/
-/**
+/** @defgroup TIMEx_Exported_Macros TIM Extended Exported Macros
- * @brief  Sets the TIM Output compare preload.
- * @param  __HANDLE__: TIM handle.
- * @param  __CHANNEL__: TIM Channels to be configured.
- *          This parameter can be one of the following values:
- *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
- *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
- *            @arg TIM_CHANNEL_3: TIM Channel 3 selected
- *            @arg TIM_CHANNEL_4: TIM Channel 4 selected
- * @retval None
- */
-#define __HAL_TIM_ENABLE_OCxPRELOAD(__HANDLE__, __CHANNEL__)                                   \
-  (((__CHANNEL__) == TIM_CHANNEL_1)                                                            \
-       ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC1PE)                                    \
-       : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC2PE) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC3PE) : ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC4PE))
-
-/**
- * @brief  Resets the TIM Output compare preload.
- * @param  __HANDLE__: TIM handle.
- * @param  __CHANNEL__: TIM Channels to be configured.
- *          This parameter can be one of the following values:
- *            @arg TIM_CHANNEL_1: TIM Channel 1 selected
- *            @arg TIM_CHANNEL_2: TIM Channel 2 selected
- *            @arg TIM_CHANNEL_3: TIM Channel 3 selected
- *            @arg TIM_CHANNEL_4: TIM Channel 4 selected
- * @retval None
- */
-#define __HAL_TIM_DISABLE_OCxPRELOAD(__HANDLE__, __CHANNEL__)                                                                                                             \
-  (((__CHANNEL__) == TIM_CHANNEL_1) ? ((__HANDLE__)->Instance->CCMR1 &= (uint16_t)~TIM_CCMR1_OC1PE)                                                                       \
-                                    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCMR1 &= (uint16_t)~TIM_CCMR1_OC2PE)                                    \
-                                                                       : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= (uint16_t)~TIM_CCMR2_OC3PE) \
-                                                                                                          : ((__HANDLE__)->Instance->CCMR2 &= (uint16_t)~TIM_CCMR2_OC4PE))
-
-/* Exported functions --------------------------------------------------------*/
-/** @addtogroup TIMEx_Exported_Functions
  * @{
  */
 
-/** @addtogroup TIMEx_Exported_Functions_Group1
+/**
+ * @}
+ */
+/* End of exported macro -----------------------------------------------------*/
+
+/* Private macro -------------------------------------------------------------*/
+/** @defgroup TIMEx_Private_Macros TIM Extended Private Macros
+ * @{
+ */
+
+/**
+ * @}
+ */
+/* End of private macro ------------------------------------------------------*/
+
+/* Exported functions --------------------------------------------------------*/
+/** @addtogroup TIMEx_Exported_Functions TIM Extended Exported Functions
+ * @{
+ */
+
+/** @addtogroup TIMEx_Exported_Functions_Group1 Extended Timer Hall Sensor functions
+ *  @brief    Timer Hall Sensor functions
  * @{
  */
 /*  Timer Hall Sensor functions  **********************************************/
@@ -199,9 +129,8 @@ HAL_StatusTypeDef HAL_TIMEx_HallSensor_Stop_DMA(TIM_HandleTypeDef *htim);
  * @}
  */
 
-#if defined(STM32F100xB) || defined(STM32F100xE) || defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || defined(STM32F105xC) || defined(STM32F107xC)
+/** @addtogroup TIMEx_Exported_Functions_Group2 Extended Timer Complementary Output Compare functions
-
+ *  @brief   Timer Complementary Output Compare functions
-/** @addtogroup TIMEx_Exported_Functions_Group2
  * @{
  */
 /*  Timer Complementary Output Compare functions  *****************************/
@@ -220,7 +149,8 @@ HAL_StatusTypeDef HAL_TIMEx_OCN_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Chann
  * @}
  */
 
-/** @addtogroup TIMEx_Exported_Functions_Group3
+/** @addtogroup TIMEx_Exported_Functions_Group3 Extended Timer Complementary PWM functions
+ *  @brief    Timer Complementary PWM functions
  * @{
  */
 /*  Timer Complementary PWM functions  ****************************************/
@@ -238,7 +168,8 @@ HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop_DMA(TIM_HandleTypeDef *htim, uint32_t Chan
  * @}
  */
 
-/** @addtogroup TIMEx_Exported_Functions_Group4
+/** @addtogroup TIMEx_Exported_Functions_Group4 Extended Timer Complementary One Pulse functions
+ *  @brief    Timer Complementary One Pulse functions
  * @{
  */
 /*  Timer Complementary One Pulse functions  **********************************/
@@ -252,49 +183,44 @@ HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Stop_IT(TIM_HandleTypeDef *htim, uint32_t
 /**
  * @}
  */
-#endif /* defined(STM32F100xB) || defined(STM32F100xE) ||                                                 */
-       /* defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || */
-       /* defined(STM32F105xC) || defined(STM32F107xC)                                                    */
 
-/** @addtogroup TIMEx_Exported_Functions_Group5
+/** @addtogroup TIMEx_Exported_Functions_Group5 Extended Peripheral Control functions
+ *  @brief    Peripheral Control functions
  * @{
  */
 /* Extended Control functions  ************************************************/
-#if defined(STM32F100xB) || defined(STM32F100xE) || defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || defined(STM32F105xC) || defined(STM32F107xC)
+HAL_StatusTypeDef HAL_TIMEx_ConfigCommutEvent(TIM_HandleTypeDef *htim, uint32_t InputTrigger, uint32_t CommutationSource);
-HAL_StatusTypeDef HAL_TIMEx_ConfigCommutationEvent(TIM_HandleTypeDef *htim, uint32_t InputTrigger, uint32_t CommutationSource);
+HAL_StatusTypeDef HAL_TIMEx_ConfigCommutEvent_IT(TIM_HandleTypeDef *htim, uint32_t InputTrigger, uint32_t CommutationSource);
-HAL_StatusTypeDef HAL_TIMEx_ConfigCommutationEvent_IT(TIM_HandleTypeDef *htim, uint32_t InputTrigger, uint32_t CommutationSource);
+HAL_StatusTypeDef HAL_TIMEx_ConfigCommutEvent_DMA(TIM_HandleTypeDef *htim, uint32_t InputTrigger, uint32_t CommutationSource);
-HAL_StatusTypeDef HAL_TIMEx_ConfigCommutationEvent_DMA(TIM_HandleTypeDef *htim, uint32_t InputTrigger, uint32_t CommutationSource);
-HAL_StatusTypeDef HAL_TIMEx_ConfigBreakDeadTime(TIM_HandleTypeDef *htim, TIM_BreakDeadTimeConfigTypeDef *sBreakDeadTimeConfig);
-#endif /* defined(STM32F100xB) || defined(STM32F100xE) ||                                                 */
-       /* defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || */
-       /* defined(STM32F105xC) || defined(STM32F107xC)                                                    */
 HAL_StatusTypeDef HAL_TIMEx_MasterConfigSynchronization(TIM_HandleTypeDef *htim, TIM_MasterConfigTypeDef *sMasterConfig);
+HAL_StatusTypeDef HAL_TIMEx_ConfigBreakDeadTime(TIM_HandleTypeDef *htim, TIM_BreakDeadTimeConfigTypeDef *sBreakDeadTimeConfig);
+HAL_StatusTypeDef HAL_TIMEx_RemapConfig(TIM_HandleTypeDef *htim, uint32_t Remap);
 /**
  * @}
  */
 
-/** @addtogroup TIMEx_Exported_Functions_Group6
+/** @addtogroup TIMEx_Exported_Functions_Group6 Extended Callbacks functions
+ * @brief    Extended Callbacks functions
  * @{
  */
-/* Extension Callback *********************************************************/
+/* Extended Callback **********************************************************/
-void HAL_TIMEx_CommutationCallback(TIM_HandleTypeDef *htim);
+void HAL_TIMEx_CommutCallback(TIM_HandleTypeDef *htim);
+void HAL_TIMEx_CommutHalfCpltCallback(TIM_HandleTypeDef *htim);
 void HAL_TIMEx_BreakCallback(TIM_HandleTypeDef *htim);
 /**
  * @}
  */
 
-#if defined(STM32F100xB) || defined(STM32F100xE) || defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || defined(STM32F105xC) || defined(STM32F107xC)
+/** @addtogroup TIMEx_Exported_Functions_Group7 Extended Peripheral State functions
-/** @addtogroup TIMEx_Exported_Functions_Group7
+ * @brief    Extended Peripheral State functions
  * @{
  */
-/* Extension Peripheral State functions  **************************************/
+/* Extended Peripheral State functions  ***************************************/
 HAL_TIM_StateTypeDef        HAL_TIMEx_HallSensor_GetState(TIM_HandleTypeDef *htim);
+HAL_TIM_ChannelStateTypeDef HAL_TIMEx_GetChannelNState(TIM_HandleTypeDef *htim, uint32_t ChannelN);
 /**
  * @}
  */
-#endif /* defined(STM32F100xB) || defined(STM32F100xE) ||                                                 */
-       /* defined(STM32F103x6) || defined(STM32F103xB) || defined(STM32F103xE) || defined(STM32F103xG) || */
-       /* defined(STM32F105xC) || defined(STM32F107xC)                                                    */
 
 /**
  * @}
@@ -302,10 +228,11 @@ HAL_TIM_StateTypeDef HAL_TIMEx_HallSensor_GetState(TIM_HandleTypeDef *htim);
 /* End of exported functions -------------------------------------------------*/
 
 /* Private functions----------------------------------------------------------*/
-/** @defgroup TIMEx_Private_Functions TIMEx Private Functions
+/** @addtogroup TIMEx_Private_Functions TIMEx Private Functions
  * @{
  */
 void TIMEx_DMACommutationCplt(DMA_HandleTypeDef *hdma);
+void TIMEx_DMACommutationHalfCplt(DMA_HandleTypeDef *hdma);
 /**
  * @}
  */
@@ -323,6 +250,6 @@ void TIMEx_DMACommutationCplt(DMA_HandleTypeDef *hdma);
 }
 #endif
 
-#endif /* __STM32F1xx_HAL_TIM_EX_H */
+#endif /* STM32F1xx_HAL_TIM_EX_H */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

source/Core/BSP/Miniware/configuration.h

@@ -1,10 +1,10 @@
-#pragma once
+#ifndef CONFIGURATION_H_
-#include "Model_Config.h"
+#define CONFIGURATION_H_
 #include "Settings.h"
 #include <stdint.h>
 /**
  * Configuration.h
- * Define here your default pre settings for TS80 or TS100
+ * Define here your default pre settings for TS80(P) or TS100
  *
  */
 
@@ -57,7 +57,7 @@
  *
  */
 #define ORIENTATION_MODE           0 // 0: Right 1:Left 2:Automatic - Default right
-#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperatur change
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
 
 /**
  * Temp change settings
@@ -78,8 +78,8 @@
 #else
 #define POWER_PULSE_DEFAULT 5
 #endif
-#define POWER_PULSE_WAIT_DEFAULT     4; // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s
+#define POWER_PULSE_WAIT_DEFAULT     4 // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s
-#define POWER_PULSE_DURATION_DEFAULT 1; // Default duration of the power pulse: 1*250 = 250 ms
+#define POWER_PULSE_DURATION_DEFAULT 1 // Default duration of the power pulse: 1*250 = 250 ms
 
 /**
  * OLED Orientation Sensitivity on Automatic mode!
@@ -94,6 +94,9 @@
 #define DETAILED_SOLDERING 0 // 0: Disable 1: Enable - Default 0
 #define DETAILED_IDLE      0 // 0: Disable 1: Enable - Default 0
 
+#define THERMAL_RUNAWAY_TIME_SEC 20
+#define THERMAL_RUNAWAY_TEMP_C   20
+
 #define CUT_OUT_SETTING          0  // default to no cut-off voltage
 #define RECOM_VOL_CELL           33 // Minimum voltage per cell (Recommended 3.3V (33))
 #define TEMPERATURE_INF          0  // default to 0
@@ -111,21 +114,23 @@
 
 #define OP_AMP_GAIN_STAGE_TS80 (1 + (OP_AMP_Rf_TS80 / OP_AMP_Rin_TS80))
 
-#define OP_AMP_Rf_MHP30  268500 //  268.5  Kilo-ohms -> Measured
-#define OP_AMP_Rin_MHP30 1600   //  1.6  Kilo-ohms -> Measured
-
-#define OP_AMP_GAIN_STAGE_MHP30 (1 + (OP_AMP_Rf_MHP30 / OP_AMP_Rin_MHP30))
 // Deriving the Voltage div:
 // Vin_max = (3.3*(r1+r2))/(r2)
 // vdiv = (32768*4)/(vin_max*10)
 
+#if defined(MODEL_TS100) + defined(MODEL_TS80) + defined(MODEL_TS80P) > 1
+#error "Multiple models defined!"
+#elif defined(MODEL_TS100) + defined(MODEL_TS80) + defined(MODEL_TS80P) == 0
+#error "No model defined!"
+#endif
+
 #ifdef MODEL_TS100
 #define SOLDERING_TEMP       320                     // Default soldering temp is 320.0 °C
 #define VOLTAGE_DIV          467                     // 467 - Default divider from schematic
 #define CALIBRATION_OFFSET   900                     // 900 - Default adc offset in uV
 #define PID_POWER_LIMIT      70                      // Sets the max pwm power limit
 #define POWER_LIMIT          0                       // 0 watts default limit
-#define MAX_POWER_LIMIT      65                      //
+#define MAX_POWER_LIMIT      70                      //
 #define POWER_LIMIT_STEPS    5                       //
 #define OP_AMP_GAIN_STAGE    OP_AMP_GAIN_STAGE_TS100 //
 #define TEMP_uV_LOOKUP_HAKKO                         //
@@ -137,26 +142,11 @@
 #define MIN_TEMP_F           60                      // Min soldering temp selectable °F
 #define MIN_BOOST_TEMP_C     250                     // The min settable temp for boost mode °C
 #define MIN_BOOST_TEMP_F     480                     // The min settable temp for boost mode °F
-#endif
+#define POW_DC
-
+#define ACCEL_MMA
-#ifdef MODEL_Pinecil
+#define POW_PD 0
-#define SOLDERING_TEMP       320                     // Default soldering temp is 320.0 °C
+#define ACCEL_LIS
-#define VOLTAGE_DIV          467                     // 467 - Default divider from schematic
+#define TEMP_TMP36
-#define CALIBRATION_OFFSET   900                     // 900 - Default adc offset in uV
-#define PID_POWER_LIMIT      70                      // Sets the max pwm power limit
-#define POWER_LIMIT          0                       // 0 watts default limit
-#define MAX_POWER_LIMIT      65                      //
-#define POWER_LIMIT_STEPS    5                       //
-#define OP_AMP_GAIN_STAGE    OP_AMP_GAIN_STAGE_TS100 // Uses TS100 resistors
-#define TEMP_uV_LOOKUP_HAKKO                         // Use Hakko lookup table
-#define USB_PD_VMAX          20                      // Maximum voltage for PD to negotiate
-#define PID_TIM_HZ           (8)                     // Tick rate of the PID loop
-#define MAX_TEMP_C           450                     // Max soldering temp selectable °C
-#define MAX_TEMP_F           850                     // Max soldering temp selectable °F
-#define MIN_TEMP_C           10                      // Min soldering temp selectable °C
-#define MIN_TEMP_F           60                      // Min soldering temp selectable °F
-#define MIN_BOOST_TEMP_C     250                     // The min settable temp for boost mode °C
-#define MIN_BOOST_TEMP_F     480                     // The min settable temp for boost mode °F
 #endif
 
 #ifdef MODEL_TS80
@@ -165,7 +155,7 @@
 #define PID_POWER_LIMIT     24                     // Sets the max pwm power limit
 #define CALIBRATION_OFFSET  900                    // the adc offset in uV
 #define POWER_LIMIT         24                     // 24 watts default power limit
-#define MAX_POWER_LIMIT     30                     //
+#define MAX_POWER_LIMIT     40                     //
 #define POWER_LIMIT_STEPS   2                      //
 #define OP_AMP_GAIN_STAGE   OP_AMP_GAIN_STAGE_TS80 //
 #define TEMP_uV_LOOKUP_TS80                        //
@@ -177,6 +167,12 @@
 #define MIN_TEMP_F          60                     // Min soldering temp selectable °F
 #define MIN_BOOST_TEMP_C    250                    // The min settable temp for boost mode °C
 #define MIN_BOOST_TEMP_F    480                    // The min settable temp for boost mode °F
+#define ACCEL_LIS
+#define POW_QC
+#define POW_PD 0
+#define TEMP_TMP36
+#define LIS_ORI_FLIP
+#define OLED_FLIP
 #endif
 
 #ifdef MODEL_TS80P
@@ -185,7 +181,7 @@
 #define PID_POWER_LIMIT     35                     // Sets the max pwm power limit
 #define CALIBRATION_OFFSET  1500                   // the adc offset in uV
 #define POWER_LIMIT         30                     // 30 watts default power limit
-#define MAX_POWER_LIMIT     35                     //
+#define MAX_POWER_LIMIT     40                     //
 #define POWER_LIMIT_STEPS   2                      //
 #define OP_AMP_GAIN_STAGE   OP_AMP_GAIN_STAGE_TS80 //
 #define TEMP_uV_LOOKUP_TS80                        //
@@ -197,53 +193,31 @@
 #define MIN_TEMP_F          60                     // Min soldering temp selectable °F
 #define MIN_BOOST_TEMP_C    250                    // The min settable temp for boost mode °C
 #define MIN_BOOST_TEMP_F    480                    // The min settable temp for boost mode °F
-
+#define ACCEL_LIS
-#endif
+#define ACCEL_MSA
-
+#define POW_PD 1
-#ifdef MODEL_MHP30
+#define POW_QC 1
-#define SOLDERING_TEMP          200                     // Default soldering temp is 200.0 °C
+#define TEMP_NTC
-#define VOLTAGE_DIV             360                     // Default for MHP30
+#define I2C_SOFT
-#define PID_POWER_LIMIT         65                      // Sets the max pwm power limit
+#define LIS_ORI_FLIP
-#define CALIBRATION_OFFSET      0                       // the adc offset in uV - MHP compensates automagically
+#define OLED_FLIP
-#define POWER_LIMIT             65                      // 65 watts default power limit
-#define MAX_POWER_LIMIT         65                      //
-#define POWER_LIMIT_STEPS       1                       //
-#define OP_AMP_GAIN_STAGE       OP_AMP_GAIN_STAGE_MHP30 //
-#define USB_PD_VMAX             20                      // Maximum voltage for PD to negotiate
-#define MODEL_HAS_DCDC                                  // Has inductor to current filter
-#define PID_TIM_HZ              (16)                    //
-#define THERMAL_MASS_OVERSHOOTS                         // We have overshoot so reverse direction of compensation
-#define MAX_TEMP_C              300                     // Max soldering temp selectable °C
-#define MAX_TEMP_F              570                     // Max soldering temp selectable °F
-#define MIN_TEMP_C              10                      // Min soldering temp selectable °C
-#define MIN_TEMP_F              60                      // Min soldering temp selectable °F
-#define MIN_BOOST_TEMP_C        150                     // The min settable temp for boost mode °C
-#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
 #endif
 
 #ifdef MODEL_TS100
-const int32_t tipMass       = 65; // X10 watts to raise 1 deg C in 1 second
+#define HARDWARE_MAX_WATTAGE_X10 750
-const uint8_t tipResistance = 75; // x10 ohms, 7.5 typical for ts100 tips
+#define TIP_THERMAL_MASS         65 // X10 watts to raise 1 deg C in 1 second
-#endif
+#define TIP_RESISTANCE           75 // x10 ohms, 7.5 typical for ts100 tips
-
-#ifdef MODEL_Pinecil
-const int32_t tipMass       = 45; // X10 watts to raise 1 deg C in 1 second
-const uint8_t tipResistance = 75; // x10 ohms, 7.5 typical for ts100 tips
 #endif
 
 #ifdef MODEL_TS80
-const uint32_t tipMass       = 40;
+#define HARDWARE_MAX_WATTAGE_X10 180
-const uint8_t  tipResistance = 45; // x10 ohms, 4.5 typical for ts80 tips
+#define TIP_THERMAL_MASS         40
+#define TIP_RESISTANCE           45 // x10 ohms, 4.5 typical for ts80 tips
 #endif
 
 #ifdef MODEL_TS80P
-const uint32_t tipMass       = 40;
+#define HARDWARE_MAX_WATTAGE_X10 300
-const uint8_t  tipResistance = 45; // x10 ohms, 4.5 typical for ts80 tips
+#define TIP_THERMAL_MASS         40
+#define TIP_RESISTANCE           45 // x10 ohms, 4.5 typical for ts80 tips
 #endif
-
-#ifdef MODEL_MHP30
-const uint32_t tipMass       = 45; // TODO
-const uint8_t  tipResistance = 60; // x10 ohms, ~6 typical
 #endif