Update History.md

Update GUIThread.cpp

.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

@@ -17,7 +17,7 @@ jobs:
         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 +43,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
@@ -62,7 +62,7 @@ jobs:
         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 +88,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
@@ -122,7 +122,7 @@ jobs:
         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:
@@ -134,7 +134,6 @@ jobs:
 
       - name: setup
         run: ./setup.sh
-
       - name: Check formatting with clang-format
         run: cd source && make clean && make check-style
 

Dockerfile

@@ -4,9 +4,9 @@ LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
 WORKDIR /build
 # Add extra mirrors for options
 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-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 && \
+  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
 # 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,18 +52,17 @@ 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 
 

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,52 +80,62 @@ 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)
+Once the device is connected while holding the button, the screen will stay **off**.
+
+This is normal, and then you can use the appropriate tool to load the .hex or .bin file as per your OS.
+
+You can also refer to the Pine64 [Wiki](https://wiki.pine64.org/wiki/Pinecil).
 
 ### Linux and Mac
+
 Using `dfu-util` you can flash the firmware using a command line as such:
 
 ```
-dfu-util -d 28e9:0189 -a 0 -D Pinecil_EN.bin -s 0x08000000:mass-erase:force
+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.
 
 1. Attach the iron in DFU mode
 2. Copy the hex file to the device
 3. The device disconnects and connects with the `.ERR` file
-4. Copy the same hex file again  **DO NOT TRY AND DELETE THE OLD ONE**
+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,15 +27,15 @@ 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
-- (Pinecil) Supports all 3 power modes (PD,QC, DC In).
+- (Pinecil) Supports all 3 power modes (PD, QC, DC In).
 - Improved readability Fonts, supporting multiple languages
 - Use hardware features to improve reliability
 - Can disable movement detection if desired
-- Boost mode lets you temporarily change the temperature when soldering (i.e. raise the temperature for short periods of time)
+- 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,24 @@ 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_letter_counts(
     defs: dict, lang: dict, build_version: str
 ) -> Tuple[List[str], Dict[str, int]]:
@@ -178,6 +201,7 @@ 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())
 
     # collapse all strings down into the composite letters and store totals for these
 
@@ -868,10 +892,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 +922,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 +961,16 @@ 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"
+
     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,320 +1,214 @@
 {
-	"languageCode": "BG",
+  "languageCode": "BG",
-	"languageLocalName": "Български",
+  "languageLocalName": "Български",
-	"fonts": [
+  "fonts": ["ascii_basic", "cyrillic"],
-		"ascii_basic",
+  "messages": {
-		"cyrillic"
+    "SettingsCalibrationDone": "Калибрацията завършена!",
-	],
+    "SettingsCalibrationWarning": "Уверете се, че върха на поялника е със стайна температура преди да продължите!",
-	"messages": {
+    "SettingsResetWarning": "Сигурни ли сте, че искате да върнете фабричните настройки?",
-		"SettingsCalibrationDone": "Калибрацията завършена!",
+    "UVLOWarningString": "Ниско DC Напрежение",
-		"SettingsCalibrationWarning": "Уверете се, че върха на поялника е със стайна температура преди да продължите!",
+    "UndervoltageString": "Ниско Напрежение",
-		"SettingsResetWarning": "Сигурни ли сте, че искате да върнете фабричните настройки?",
+    "InputVoltageString": "Входно V: ",
-		"UVLOWarningString": "Ниско DC Напрежение",
+    "WarningTipTempString": "Темп.: ",
-		"UndervoltageString": "Ниско Напрежение",
+    "BadTipString": "ЛОШ ВРЪХ",
-		"InputVoltageString": "Входно V: ",
+    "SleepingSimpleString": "Сън",
-		"WarningTipTempString": "Темп.: ",
+    "SleepingAdvancedString": "Хър Хър Хър...",
-		"BadTipString": "ЛОШ ВРЪХ",
+    "WarningSimpleString": "ОХ!",
-		"SleepingSimpleString": "Сън",
+    "WarningAdvancedString": "ВНИМАНИЕ! ТОПЛО!",
-		"SleepingAdvancedString": "Хър Хър Хър...",
+    "SleepingTipAdvancedString": "Връх:",
-		"WarningSimpleString": "ОХ!",
+    "IdleTipString": "Връх:",
-		"WarningAdvancedString": "ВНИМАНИЕ! ТОПЛО!",
+    "IdleSetString": " Настройка:",
-		"SleepingTipAdvancedString": "Връх:",
+    "TipDisconnectedString": "ПРЕКЪСНАТ ВРЪХ",
-		"IdleTipString": "Връх:",
+    "SolderingAdvancedPowerPrompt": "Захранване: ",
-		"IdleSetString": " Настройка:",
+    "OffString": "Изкл.",
-		"TipDisconnectedString": "ПРЕКЪСНАТ ВРЪХ",
+    "YourGainMessage": "Усилване:"
-		"SolderingAdvancedPowerPrompt": "Захранване: ",
+  },
-		"OffString": "Изкл.",
+  "messagesWarn": {
-		"YourGainMessage": "Усилване:"
+    "ResetOKMessage": "Нулиране",
-	},
+    "SettingsResetMessage": ["Настройките бяха", "нулирани!"],
-	"messagesWarn": {
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-		"ResetOKMessage": [
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-			"Нулиране",
+    "LockingKeysString": " LOCKED",
-			"завършено"
+    "UnlockingKeysString": "UNLOCKED",
-		],
+    "WarningKeysLockedString": "!LOCKED!",
-		"SettingsResetMessage": [
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
-			"Настройките бяха",
+  },
-			"нулирани!"
+  "characters": {
-		],
+    "SettingRightChar": "R",
-		"NoAccelerometerMessage": [
+    "SettingLeftChar": "L",
-			"No accelerometer",
+    "SettingAutoChar": "A",
-			"detected!"
+    "SettingOffChar": "O",
-		],
+    "SettingSlowChar": "S",
-		"NoPowerDeliveryMessage": [
+    "SettingMediumChar": "M",
-			"No USB-PD IC",
+    "SettingFastChar": "F",
-			"detected!"
+    "SettingStartNoneChar": "И",
-		],
+    "SettingStartSolderingChar": "Р",
-		"LockingKeysString": " LOCKED",
+    "SettingStartSleepChar": "С",
-		"UnlockingKeysString": "UNLOCKED",
+    "SettingStartSleepOffChar": "П",
-		"WarningKeysLockedString": "!LOCKED!"
+    "SettingStartNoneChar": "F",
-	},
+    "SettingSensitivityOff": "O",
-	"characters": {
+    "SettingSensitivityLow": "L",
-		"SettingRightChar": "R",
+    "SettingSensitivityMedium": "M",
-		"SettingLeftChar": "L",
+    "SettingSensitivityHigh": "H",
-		"SettingAutoChar": "A",
+    "SettingLockDisableChar": "D",
-		"SettingFastChar": "F",
+    "SettingLockBoostChar": "B",
-		"SettingSlowChar": "S",
+    "SettingLockFullChar": "F",
-		"SettingMediumChar": "M",
+    "SettingNAChar": "N/A"
-		"SettingOffChar": "O",
+  },
-		"SettingStartSolderingChar": "T",
+  "menuGroups": {
-		"SettingStartSleepChar": "S",
+    "PowerMenu": {
-		"SettingStartSleepOffChar": "O",
+      "text2": ["Power", "settings"],
-		"SettingStartNoneChar": "F",
+      "desc": "Power settings"
-		"SettingSensitivityOff": "O",
+    },
-		"SettingSensitivityLow": "L",
+    "SolderingMenu": {
-		"SettingSensitivityMedium": "M",
+      "text2": ["Поялник", "Настройки"],
-		"SettingSensitivityHigh": "H",
+      "desc": "Настройки на поялника"
-		"SettingLockDisableChar": "D",
+    },
-		"SettingLockBoostChar": "B",
+    "PowerSavingMenu": {
-		"SettingLockFullChar": "F",
+      "text2": ["Режими", "Настройки"],
-		"SettingNAChar": "N/A"
+      "desc": "Настройки енергоспестяване"
-	},
+    },
-	"menuGroups": {
+    "UIMenu": {
-		"PowerMenu": {
+      "text2": ["Интерфейс", "Настройки"],
-			"text2": [
+      "desc": "Настройки на интерфейса"
-				"Power",
+    },
-				"settings"
+    "AdvancedMenu": {
-			],
+      "text2": ["Разширени", "Настройки"],
-			"desc": "Power settings"
+      "desc": "Допълнителни настройки"
-		},
+    }
-		"SolderingMenu": {
+  },
-			"text2": [
+  "menuOptions": {
-				"Поялник",
+    "DCInCutoff": {
-				"Настройки"
+      "text2": ["Източник", "захранване"],
-			],
+      "desc": "Източник на захранване. Минимално напрежение. (DC 10V) (S 3,3V за клетка)"
-			"desc": "Настройки на поялника"
+    },
-		},
+    "SleepTemperature": {
-		"PowerSavingMenu": {
+      "text2": ["Темп.", "сън"],
-			"text2": [
+      "desc": "Температура при режим \"сън\" (C)"
-				"Режими",
+    },
-				"Настройки"
+    "SleepTimeout": {
-			],
+      "text2": ["Време", "сън"],
-			"desc": "Настройки енергоспестяване"
+      "desc": "Включване в режим \"сън\" след: (Минути | Секунди)"
-		},
+    },
-		"UIMenu": {
+    "ShutdownTimeout": {
-			"text2": [
+      "text2": ["Време", "изкл."],
-				"Интерфейс",
+      "desc": "Изключване след (Минути)"
-				"Настройки"
+    },
-			],
+    "MotionSensitivity": {
-			"desc": "Настройки на интерфейса"
+      "text2": ["Усещане", "за движение"],
-		},
+      "desc": "Усещане за движение (0=Изключено | 1=Слабо | ... | 9=Силно)"
-		"AdvancedMenu": {
+    },
-			"text2": [
+    "TemperatureUnit": {
-				"Разширени",
+      "text2": ["Единици за", "температура"],
-				"Настройки"
+      "desc": "Единици за температура (C=Целзии | F=Фаренхайт)"
-			],
+    },
-			"desc": "Допълнителни настройки"
+    "AdvancedIdle": {
-		}
+      "text2": ["Детайлен", "екран в покой"],
-	},
+      "desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой."
-	"menuOptions": {
+    },
-		"DCInCutoff": {
+    "DisplayRotation": {
-			"text2": [
+      "text2": ["Ориентация", "на дисплея"],
-				"Източник",
+      "desc": "Ориентация на дисплея (R=Дясна Ръка | L=Лява Ръка | A=Автоматично)"
-				"захранване"
+    },
-			],
+    "BoostTemperature": {
-			"desc": "Източник на захранване. Минимално напрежение. <DC 10V> <S 3.3V за клетка>"
+      "text2": ["Турбо", "темп."],
-		},
+      "desc": "Температура за \"турбо\" режим"
-		"SleepTemperature": {
+    },
-			"text2": [
+    "AutoStart": {
-				"Темп.",
+      "text2": ["Автоматичен", "работен режим"],
-				"сън"
+      "desc": "Режим на поялника при включване на захранването. (И=Изключен | Р=Работен | С=Сън | П=Сън температура помещение)"
-			],
+    },
-			"desc": "Температура при режим \"сън\" <C>"
+    "CooldownBlink": {
-		},
+      "text2": ["Мигай при", "топъл поялник"],
-		"SleepTimeout": {
+      "desc": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла"
-			"text2": [
+    },
-				"Време",
+    "TemperatureCalibration": {
-				"сън"
+      "text2": ["Калибриране", "температура?"],
-			],
+      "desc": "Калибриране на температурата"
-			"desc": "Включване в режим \"сън\" след: <Минути/Секунди>"
+    },
-		},
+    "SettingsReset": {
-		"ShutdownTimeout": {
+      "text2": ["Фабрични", "настройки?"],
-			"text2": [
+      "desc": "Връщане на фабрични настройки"
-				"Време",
+    },
-				"изкл."
+    "VoltageCalibration": {
-			],
+      "text2": ["Калибриране", "напрежение?"],
-			"desc": "Изключване след <Минути>"
+      "desc": "Калибриране на входното напрежение. Задръжте бутонa за изход"
-		},
+    },
-		"MotionSensitivity": {
+    "AdvancedSoldering": {
-			"text2": [
+      "text2": ["Детайлен", "работен екран"],
-				"Усещане",
+      "desc": "Детайлна информация в работен режим при запояване"
-				"за движение"
+    },
-			],
+    "ScrollingSpeed": {
-			"desc": "Усещане за движение <0.Изключено 1.Слабо 9.Силно>"
+      "text2": ["Скорост", "на текста"],
-		},
+      "desc": "Скорост на движение на този текст"
-		"TemperatureUnit": {
+    },
-			"text2": [
+    "QCMaxVoltage": {
-				"Единици за",
+      "text2": ["Мощност на", "захранване"],
-				"температура"
+      "desc": "Мощност на избраното захранване"
-			],
+    },
-			"desc": "Единици за температура <C=Целзии F=Фаренхайт>"
+    "PDNegTimeout": {
-		},
+      "text2": ["PD", "timeout"],
-		"AdvancedIdle": {
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-			"text2": [
+    },
-				"Детайлен",
+    "PowerLimit": {
-				"екран в покой"
+      "text2": ["Лимит на", "мощност"],
-			],
+      "desc": "Максимална мощност на поялника (Watt)"
-			"desc": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой."
+    },
-		},
+    "ReverseButtonTempChange": {
-		"DisplayRotation": {
+      "text2": ["Размяна", "бутони +-?"],
-			"text2": [
+      "desc": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника"
-				"Ориентация",
+    },
-				"на дисплея"
+    "TempChangeShortStep": {
-			],
+      "text2": ["Промяна T", "бързо?"],
-			"desc": "Ориентация на дисплея <A. Автоматично L. Лява Ръка R. Дясна Ръка>"
+      "desc": "Промяна на температура при бързо натискане на бутон!"
-		},
+    },
-		"BoostTemperature": {
+    "TempChangeLongStep": {
-			"text2": [
+      "text2": ["Промяна Т", "задържане?"],
-				"Турбо",
+      "desc": "Промяна на температура при задържане на бутон!"
-				"темп."
+    },
-			],
+    "PowerPulsePower": {
-			"desc": "Температура за \"турбо\" режим"
+      "text2": ["Захранващ", "импулс"],
-		},
+      "desc": "Поддържане на интензивност на захранващия импулс"
-		"AutoStart": {
+    },
-			"text2": [
+    "HallEffSensitivity": {
-				"Автоматичен",
+      "text2": ["Hall Eff", "Sensitivity"],
-				"работен режим"
+      "desc": "Sensitivity of the Hall effect sensor in detecting sleep (O=Off | L=Low | M=Medium | H=High)"
-			],
+    },
-			"desc": "Режим на поялника при включване на захранването. T=Работен, S=Сън, F=Изключен"
+    "LockingMode": {
-		},
+      "text2": ["Allow buttons", "locking"],
-		"CooldownBlink": {
+      "desc": "When soldering, long press on both buttons lock them (D=Disable | B=Boost only | F=Full locking)"
-			"text2": [
+    },
-				"Мигай при",
+    "MinVolCell": {
-				"топъл поялник"
+      "text2": ["Minimum", "voltage"],
-			],
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
-			"desc": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла"
+    },
-		},
+    "AnimLoop": {
-		"TemperatureCalibration": {
+      "text2": ["Anim.", "loop"],
-			"text2": [
+      "desc": "Loop icon animations in root menu"
-				"Калибриране",
+    },
-				"температура?"
+    "AnimSpeed": {
-			],
+      "text2": ["Anim.", "speed"],
-			"desc": "Калибриране на температурата"
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-		},
+    },
-		"SettingsReset": {
+    "PowerPulseWait": {
-			"text2": [
+      "text2": ["Power pulse", "wait time"],
-				"Фабрични",
+      "desc": "Time to wait before triggering every keep-awake pulse (x 2,5с)"
-				"настройки?"
+    },
-			],
+    "PowerPulseDuration": {
-			"desc": "Връщане на фабрични настройки"
+      "text2": ["Power pulse", "duration"],
-		},
+      "desc": "Keep-awake-pulse duration (x 250мс)"
-		"VoltageCalibration": {
+    },
-			"text2": [
+    "LanguageSwitch": {
-				"Калибриране",
+      "text2": ["Език:", " BG   Български"],
-				"напрежение?"
+      "desc": ""
-			],
+    },
-			"desc": "Калибриране на входното напрежение. Задръжте бутонa за изход"
+    "Brightness": {
-		},
+      "text2": ["Screen", "Brightness"],
-		"AdvancedSoldering": {
+      "desc": "Adjust the contrast/brightness of the OLED screen"
-			"text2": [
+    },
-				"Детайлен",
+    "ColourInversion": {
-				"работен екран"
+      "text2": ["Screen", "Invert"],
-			],
+      "desc": "Invert the colours of the OLED screen"
-			"desc": "Детайлна информация в работен режим при запояване"
+    }
-		},
+  }
-		"ScrollingSpeed": {
-			"text2": [
-				"Скорост",
-				"на текста"
-			],
-			"desc": "Скорост на движение на този текст"
-		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Мощност на",
-				"захранване"
-			],
-			"desc": "Мощност на избраното захранване"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Лимит на",
-				"мощност"
-			],
-			"desc": "Максимална мощност на поялника <W>"
-		},
-		"ReverseButtonTempChange": {
-			"text2": [
-				"Размяна",
-				"бутони +-?"
-			],
-			"desc": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника"
-		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Промяна T",
-				"бързо?"
-			],
-			"desc": "Промяна на температура при бързо натискане на бутон!"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Промяна Т",
-				"задържане?"
-			],
-			"desc": "Промяна на температура при задържане на бутон!"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Захранващ",
-				"импулс"
-			],
-			"desc": "Поддържане на интензивност на захранващия импулс"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Hall Eff",
-				"Sensitivity"
-			],
-			"desc": "Sensitivity of the Hall effect sensor in detecting sleep <O=Off,L=Low,M=Medium,H=High>"
-		},
-		"LockingMode": {
-			"text2": [
-				"Allow buttons",
-				"locking"
-			],
-			"desc": "When soldering, long press on both buttons lock them <D=Disable, B=Boost only, F=Full locking>"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimum",
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Anim.",
-				"loop"
-			],
-			"desc": "Loop icon animations in root menu"
-		},
-		"AnimSpeed": {
-			"text2": [
-				"Anim.",
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
-		},
-		"PowerPulseWait": {
-			"text2": [
-				"Power pulse",
-				"wait time"
-			],
-			"desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Power pulse",
-				"duration"
-			],
-			"desc": "Keep-awake-pulse duration (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Language:",
-				" BG   Български"
-			],
-			"desc": ""
-		}
-	}
 }

Translations/translation_CS.json

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

Translations/translation_DA.json

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

Translations/translation_DE.json

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

Translations/translation_EN.json

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

Translations/translation_ES.json

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

Translations/translation_FI.json

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

Translations/translation_FR.json

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

Translations/translation_HR.json

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

Translations/translation_HU.json

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

Translations/translation_IT.json

@@ -1,317 +1,213 @@
 {
-	"languageCode": "IT",
+  "languageCode": "IT",
-	"languageLocalName": "Italiano",
+  "languageLocalName": "Italiano",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
+  "messages": {
-		"latin_extended"
+    "SettingsCalibrationDone": "Calibrazione effettuata",
-	],
+    "SettingsCalibrationWarning": "Assicurati che la punta si trovi a temperatura ambiente prima di continuare!",
-	"messages": {
+    "SettingsResetWarning": "Ripristinare le impostazioni iniziali?",
-		"SettingsCalibrationDone": "Calibrazione effettuata",
+    "UVLOWarningString": "DC BASSA",
-		"SettingsCalibrationWarning": "Assicurati che la punta si trovi a temperatura ambiente prima di continuare!",
+    "UndervoltageString": "DC INSUFFICIENTE",
-		"SettingsResetWarning": "Ripristinare le impostazioni iniziali?",
+    "InputVoltageString": "V ingresso:",
-		"UVLOWarningString": "DC BASSA",
+    "WarningTipTempString": "Temp punta:",
-		"UndervoltageString": "DC INSUFFICIENTE",
+    "BadTipString": "PUNTA KO",
-		"InputVoltageString": "V ingresso:",
+    "SleepingSimpleString": "Zzz ",
-		"WarningTipTempString": "Temp punta:",
+    "SleepingAdvancedString": "Riposo",
-		"BadTipString": "PUNTA KO",
+    "WarningSimpleString": "HOT!",
-		"SleepingSimpleString": "Zzz ",
+    "WarningAdvancedString": "PUNTA CALDA!",
-		"SleepingAdvancedString": "Riposo",
+    "SleepingTipAdvancedString": "Punta:",
-		"WarningSimpleString": "HOT!",
+    "IdleTipString": "T punta:",
-		"WarningAdvancedString": "PUNTA CALDA!",
+    "IdleSetString": "/",
-		"SleepingTipAdvancedString": "Punta:",
+    "TipDisconnectedString": "PUNTA ASSENTE",
-		"IdleTipString": "T punta:",
+    "SolderingAdvancedPowerPrompt": "Potenz:",
-		"IdleSetString": "/",
+    "OffString": "OFF",
-		"TipDisconnectedString": "PUNTA ASSENTE",
+    "YourGainMessage": "Guad.: "
-		"SolderingAdvancedPowerPrompt": "Potenz:",
+  },
-		"OffString": "OFF",
+  "messagesWarn": {
-		"YourGainMessage": "Guad.: "
+    "ResetOKMessage": "Reset OK",
-	},
+    "SettingsResetMessage": ["Impostazioni", "ripristinate"],
-	"messagesWarn": {
+    "NoAccelerometerMessage": ["Accelerometro", "non rilevato"],
-		"ResetOKMessage": "Reset OK",
+    "NoPowerDeliveryMessage": ["USB-PD non", "disponibile"],
-		"SettingsResetMessage": [
+    "LockingKeysString": "Blocc.",
-			"Impostazioni",
+    "UnlockingKeysString": "Sblocc.",
-			"ripristinate"
+    "WarningKeysLockedString": "BLOCCATO",
-		],
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
-		"NoAccelerometerMessage": [
+  },
-			"Accelerometro",
+  "characters": {
-			"non rilevato"
+    "SettingRightChar": "D",
-		],
+    "SettingLeftChar": "S",
-		"NoPowerDeliveryMessage": [
+    "SettingAutoChar": "A",
-			"USB-PD non",
+    "SettingOffChar": "O",
-			"disponibile"
+    "SettingSlowChar": "L",
-		],
+    "SettingMediumChar": "M",
-		"LockingKeysString": "Blocc.",
+    "SettingFastChar": "V",
-		"UnlockingKeysString": "Sblocc.",
+    "SettingStartNoneChar": "D",
-		"WarningKeysLockedString": "BLOCCATO"
+    "SettingStartSolderingChar": "S",
-	},
+    "SettingStartSleepChar": "R",
-	"characters": {
+    "SettingStartSleepOffChar": "A",
-		"SettingRightChar": "D",
+    "SettingSensitivityOff": "O",
-		"SettingLeftChar": "S",
+    "SettingSensitivityLow": "B",
-		"SettingAutoChar": "A",
+    "SettingSensitivityMedium": "M",
-		"SettingFastChar": "V",
+    "SettingSensitivityHigh": "A",
-		"SettingSlowChar": "L",
+    "SettingLockDisableChar": "D",
-		"SettingMediumChar": "M",
+    "SettingLockBoostChar": "T",
-		"SettingOffChar": "O",
+    "SettingLockFullChar": "C",
-		"SettingStartSolderingChar": "S",
+    "SettingNAChar": "NA"
-		"SettingStartSleepChar": "R",
+  },
-		"SettingStartSleepOffChar": "A",
+  "menuGroups": {
-		"SettingStartNoneChar": "D",
+    "PowerMenu": {
-		"SettingSensitivityOff": "O",
+      "text2": ["Opzioni", "alimentaz"],
-		"SettingSensitivityLow": "B",
+      "desc": "Menù d'impostazioni per l'alimentazione"
-		"SettingSensitivityMedium": "M",
+    },
-		"SettingSensitivityHigh": "A",
+    "SolderingMenu": {
-		"SettingLockDisableChar": "D",
+      "text2": ["Opzioni", "saldatura"],
-		"SettingLockBoostChar": "T",
+      "desc": "Menù d'impostazioni della modalità Saldatura"
-		"SettingLockFullChar": "C",
+    },
-		"SettingNAChar": "NA"
+    "PowerSavingMenu": {
-	},
+      "text2": ["Risparmio", "energetico"],
-	"menuGroups": {
+      "desc": "Menù d'impostazioni per il risparmio energetico"
-		"PowerMenu": {
+    },
-			"text2": [
+    "UIMenu": {
-				"Opzioni",
+      "text2": ["Interfaccia", "utente"],
-				"alimentaz"
+      "desc": "Menù d'impostazioni dell'interfaccia utente"
-			],
+    },
-			"desc": "Menù d'impostazioni per l'alimentazione"
+    "AdvancedMenu": {
-		},
+      "text2": ["Opzioni", "avanzate"],
-		"SolderingMenu": {
+      "desc": "Menù d'impostazioni avanzate"
-			"text2": [
+    }
-				"Opzioni",
+  },
-				"saldatura"
+  "menuOptions": {
-			],
+    "DCInCutoff": {
-			"desc": "Menù d'impostazioni della modalità Saldatura"
+      "text2": ["Sorgente", "alimentaz"],
-		},
+      "desc": "Imposta una tensione minima di alimentazione attraverso la selezione di una sorgente [DC: 10 V; 3S/4S/5S/6S: 3,3 V per cella]"
-		"PowerSavingMenu": {
+    },
-			"text2": [
+    "SleepTemperature": {
-				"Risparmio",
+      "text2": ["Temp", "riposo"],
-				"energetico"
+      "desc": "Imposta la temperatura da mantenere in modalità Riposo [°C/°F]"
-			],
+    },
-			"desc": "Menù d'impostazioni per il risparmio energetico"
+    "SleepTimeout": {
-		},
+      "text2": ["Timer", "riposo"],
-		"UIMenu": {
+      "desc": "Imposta il timer per entrare in modalità Riposo [minuti/secondi]"
-			"text2": [
+    },
-				"Interfaccia",
+    "ShutdownTimeout": {
-				"utente"
+      "text2": ["Timer", "spegnimento"],
-			],
+      "desc": "Imposta il timer per lo spegnimento [minuti]"
-			"desc": "Menù d'impostazioni dell'interfaccia utente"
+    },
-		},
+    "MotionSensitivity": {
-		"AdvancedMenu": {
+      "text2": ["Sensibilità", "al movimento"],
-			"text2": [
+      "desc": "Imposta la sensibilità al movimento per uscire dalla modalità Riposo [0: nessuna; 1: minima; 9: massima]"
-				"Opzioni",
+    },
-				"avanzate"
+    "TemperatureUnit": {
-			],
+      "text2": ["Unità di", "temperatura"],
-			"desc": "Menù d'impostazioni avanzate"
+      "desc": "Scegli l'unità di misura per la temperatura [C: grado Celsius; F: grado Farenheit]"
-		}
+    },
-	},
+    "AdvancedIdle": {
-	"menuOptions": {
+      "text2": ["Interfaccia", "testuale"],
-		"DCInCutoff": {
+      "desc": "Mostra informazioni dettagliate all'interno della schermata principale"
-			"text2": [
+    },
-				"Sorgente",
+    "DisplayRotation": {
-				"alimentaz"
+      "text2": ["Orientamento", "display"],
-			],
+      "desc": "Imposta l'orientamento del display [D: mano destra; S: mano sinistra; A: automatico]"
-			"desc": "Imposta una tensione minima di alimentazione attraverso la selezione di una sorgente [DC: 10 V; 3S/4S/5S/6S: 3,3 V per cella]"
+    },
-		},
+    "BoostTemperature": {
-		"SleepTemperature": {
+      "text2": ["Temp", "Turbo"],
-			"text2": [
+      "desc": "Imposta la temperatura della funzione Turbo [°C/°F]"
-				"Temp",
+    },
-				"riposo"
+    "AutoStart": {
-			],
+      "text2": ["Avvio", "automatico"],
-			"desc": "Imposta la temperatura da mantenere in modalità Riposo [°C/°F]"
+      "desc": "Attiva automaticamente il saldatore quando viene alimentato [D: disattiva; S: saldatura; R: riposo; A: temperatura ambiente]"
-		},
+    },
-		"SleepTimeout": {
+    "CooldownBlink": {
-			"text2": [
+      "text2": ["Avviso", "punta calda"],
-				"Timer",
+      "desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda"
-				"riposo"
+    },
-			],
+    "TemperatureCalibration": {
-			"desc": "Imposta il timer per entrare in modalità Riposo [minuti/secondi]"
+      "text2": ["Calibrazione", "temperatura"],
-		},
+      "desc": "Calibra le rilevazioni di temperatura"
-		"ShutdownTimeout": {
+    },
-			"text2": [
+    "SettingsReset": {
-				"Timer",
+      "text2": ["Ripristino", "impostazioni"],
-				"spegnimento"
+      "desc": "Ripristina tutte le impostazioni"
-			],
+    },
-			"desc": "Imposta il timer per lo spegnimento [minuti]"
+    "VoltageCalibration": {
-		},
+      "text2": ["Calibrazione", "tensione"],
-		"MotionSensitivity": {
+      "desc": "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire"
-			"text2": [
+    },
-				"Sensibilità",
+    "AdvancedSoldering": {
-				"al movimento"
+      "text2": ["Dettagli", "saldatura"],
-			],
+      "desc": "Mostra informazioni dettagliate durante la modalità Saldatura"
-			"desc": "Imposta la sensibilità al movimento per uscire dalla modalità Riposo [0: nessuna; 1: minima; 9: massima]"
+    },
-		},
+    "ScrollingSpeed": {
-		"TemperatureUnit": {
+      "text2": ["Velocità", "testo"],
-			"text2": [
+      "desc": "Imposta la velocità di scorrimento del testo [L: lenta; V: veloce]"
-				"Unità di",
+    },
-				"temperatura"
+    "QCMaxVoltage": {
-			],
+      "text2": ["Voltaggio", "QC"],
-			"desc": "Scegli l'unità di misura per la temperatura [C: grado Celsius; F: grado Farenheit]"
+      "desc": "Imposta il massimo voltaggio negoziabile con un alimentatore Quick Charge"
-		},
+    },
-		"AdvancedIdle": {
+    "PDNegTimeout": {
-			"text2": [
+      "text2": ["PD", "timeout"],
-				"Interfaccia",
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-				"testuale"
+    },
-			],
+    "PowerLimit": {
-			"desc": "Mostra informazioni dettagliate all'interno della schermata principale"
+      "text2": ["Limite", "potenza"],
-		},
+      "desc": "Imposta il valore di potenza massima erogabile al saldatore [watt]"
-		"DisplayRotation": {
+    },
-			"text2": [
+    "ReverseButtonTempChange": {
-				"Orientamento",
+      "text2": ["Inversione", "tasti"],
-				"display"
+      "desc": "Inverti i tasti per aumentare o diminuire la temperatura della punta"
-			],
+    },
-			"desc": "Imposta l'orientamento del display [A: automatico; S: mano sinistra; D: mano destra]"
+    "TempChangeShortStep": {
-		},
+      "text2": ["Temp passo", "breve"],
-		"BoostTemperature": {
+      "desc": "Imposta il \"passo\" dei valori di temperatura per una breve pressione dei tasti"
-			"text2": [
+    },
-				"Temp",
+    "TempChangeLongStep": {
-				"Turbo"
+      "text2": ["Temp passo", "lungo"],
-			],
+      "desc": "Imposta il \"passo\" dei valori di temperatura per una lunga pressione dei tasti"
-			"desc": "Imposta la temperatura della funzione Turbo [°C/°F]"
+    },
-		},
+    "PowerPulsePower": {
-		"AutoStart": {
+      "text2": ["Potenza", "impulso"],
-			"text2": [
+      "desc": "Regola la potenza di un \"impulso sveglia\" atto a prevenire lo standby eventuale dell'alimentatore [watt]"
-				"Avvio",
+    },
-				"automatico"
+    "HallEffSensitivity": {
-			],
+      "text2": ["Effetto", "Hall"],
-			"desc": "Attiva automaticamente il saldatore quando viene alimentato [D: disattiva; S: saldatura; R: riposo; A: temperatura ambiente]"
+      "desc": "Regola la sensibilità alla rilevazione di supporti metallici per entrare in modalità Riposo [O: OFF; B: bassa; M: media; A: alta]"
-		},
+    },
-		"CooldownBlink": {
+    "LockingMode": {
-			"text2": [
+      "text2": ["Blocco", "tasti"],
-				"Avviso",
+      "desc": "Blocca i tasti durante la modalità Saldatura; tieni premuto entrambi per bloccare o sbloccare [D: disattiva; T: consenti Turbo; C: blocco completo]"
-				"punta calda"
+    },
-			],
+    "MinVolCell": {
-			"desc": "Evidenzia il valore di temperatura durante il raffreddamento se la punta è ancora calda"
+      "text2": ["Tensione", "min celle"],
-		},
+      "desc": "Modifica la tensione di minima carica delle celle di una batteria Li-Po [3S: 3,0-3,7 V; 4S/5S/6S: 2,4-3,7 V]"
-		"TemperatureCalibration": {
+    },
-			"text2": [
+    "AnimLoop": {
-				"Calibrazione",
+      "text2": ["Ciclo", "animazioni"],
-				"temperatura"
+      "desc": "Abilita la riproduzione ciclica delle animazioni del menù principale"
-			],
+    },
-			"desc": "Calibra le rilevazioni di temperatura"
+    "AnimSpeed": {
-		},
+      "text2": ["Velocità", "animazioni"],
-		"SettingsReset": {
+      "desc": "Imposta la velocità di riproduzione delle animazioni del menù principale [O: OFF; L: lenta; M: media; V: veloce]"
-			"text2": [
+    },
-				"Ripristino",
+    "PowerPulseWait": {
-				"impostazioni"
+      "text2": ["Distanza", "impulsi"],
-			],
+      "desc": "Imposta il tempo che deve intercorrere tra due \"impulsi sveglia\" [multipli di 2,5 s]"
-			"desc": "Ripristina tutte le impostazioni"
+    },
-		},
+    "PowerPulseDuration": {
-		"VoltageCalibration": {
+      "text2": ["Durata", "impulso"],
-			"text2": [
+      "desc": "Regola la durata dell'«impulso sveglia» [multipli di 250 ms]"
-				"Calibrazione",
+    },
-				"tensione"
+    "LanguageSwitch": {
-			],
+      "text2": ["Lingua:", " IT    Italiano"],
-			"desc": "Calibra la tensione in ingresso; regola con entrambi i tasti, tieni premuto il tasto superiore per uscire"
+      "desc": ""
-		},
+    },
-		"AdvancedSoldering": {
+    "Brightness": {
-			"text2": [
+      "text2": ["Screen", "Brightness"],
-				"Dettagli",
+      "desc": "Adjust the contrast/brightness of the OLED screen"
-				"saldatura"
+    },
-			],
+    "ColourInversion": {
-			"desc": "Mostra informazioni dettagliate durante la modalità Saldatura"
+      "text2": ["Screen", "Invert"],
-		},
+      "desc": "Invert the colours of the OLED screen"
-		"ScrollingSpeed": {
+    }
-			"text2": [
+  }
-				"Velocità",
-				"testo"
-			],
-			"desc": "Imposta la velocità di scorrimento del testo [L: lenta; V: veloce]"
-		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Voltaggio",
-				"QC"
-			],
-			"desc": "Imposta il massimo voltaggio negoziabile con un alimentatore Quick Charge"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Limite",
-				"potenza"
-			],
-			"desc": "Imposta il valore di potenza massima erogabile al saldatore [watt]"
-		},
-		"ReverseButtonTempChange": {
-			"text2": [
-				"Inversione",
-				"tasti"
-			],
-			"desc": "Inverti i tasti per aumentare o diminuire la temperatura della punta"
-		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Temp passo",
-				"breve"
-			],
-			"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"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Potenza",
-				"impulso"
-			],
-			"desc": "Regola la potenza di un \"impulso sveglia\" atto a prevenire lo standby eventuale dell'alimentatore [watt]"
-		},
-		"HallEffSensitivity": {
-			"text2": [
-				"Effetto",
-				"Hall"
-			],
-			"desc": "Regola la sensibilità alla rilevazione di supporti metallici per entrare in modalità Riposo [O: OFF; B: bassa; M: media; A: alta]"
-		},
-		"LockingMode": {
-			"text2": [
-				"Blocco",
-				"tasti"
-			],
-			"desc": "Blocca i tasti durante la modalità Saldatura; tieni premuto entrambi per bloccare o sbloccare [D: disattiva; T: consenti Turbo; C: blocco completo]"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Tensione",
-				"min celle"
-			],
-			"desc": "Modifica la tensione di minima carica delle celle di una batteria Li-Po [3S: 3,0-3,7 V; 4S/5S/6S: 2,4-3,7 V]"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Ciclo",
-				"animazioni"
-			],
-			"desc": "Abilita la riproduzione ciclica delle animazioni del menù principale"
-		},
-		"AnimSpeed": {
-			"text2": [
-				"Velocità",
-				"animazioni"
-			],
-			"desc": "Imposta la velocità di riproduzione delle animazioni del menù principale [O: OFF; L: lenta; M: media; V: veloce]"
-		},
-		"PowerPulseWait": {
-			"text2": [
-				"Distanza",
-				"impulsi"
-			],
-			"desc": "Imposta il tempo che deve intercorrere tra due \"impulsi sveglia\" [multipli di 2,5 s]"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Durata",
-				"impulso"
-			],
-			"desc": "Regola la durata dell'«impulso sveglia» [multipli di 250 ms]"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Lingua:",
-				" IT    Italiano"
-			],
-			"desc": ""
-		}
-	}
 }

Translations/translation_JA_JP.json

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

Translations/translation_LT.json

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

Translations/translation_NL.json

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

Translations/translation_NL_BE.json

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

Translations/translation_NO.json

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

Translations/translation_PL.json

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

Translations/translation_PT.json

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

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

Translations/translation_SK.json

@@ -1,317 +1,213 @@
 {
-	"languageCode": "SK",
+  "languageCode": "SK",
-	"languageLocalName": "Slovenčina",
+  "languageLocalName": "Slovenčina",
-	"fonts": [
+  "fonts": ["ascii_basic", "latin_extended"],
-		"ascii_basic",
+  "messages": {
-		"latin_extended"
+    "SettingsCalibrationDone": "Kalibrácia hotová!",
-	],
+    "SettingsCalibrationWarning": "Najprv sa prosím uistite, že hrot má izbovú teplotu!",
-	"messages": {
+    "SettingsResetWarning": "Naozaj chcete obnovit továrenské nastavenia?",
-		"SettingsCalibrationDone": "Kalibrácia hotová!",
+    "UVLOWarningString": "Nízke U!",
-		"SettingsCalibrationWarning": "Najprv sa prosím uistite, že hrot má izbovú teplotu!",
+    "UndervoltageString": "Nízke napätie",
-		"SettingsResetWarning": "Naozaj chcete obnovit továrenské nastavenia?",
+    "InputVoltageString": "Vstupné U: ",
-		"UVLOWarningString": "Nízke U!",
+    "WarningTipTempString": "Tep. hrotu: ",
-		"UndervoltageString": "Nízke napätie",
+    "BadTipString": "ZLÝ HROT",
-		"InputVoltageString": "Vstupné U: ",
+    "SleepingSimpleString": "Chrr",
-		"WarningTipTempString": "Tep. hrotu: ",
+    "SleepingAdvancedString": "Pokojový režim..",
-		"BadTipString": "ZLÝ HROT",
+    "WarningSimpleString": "PÁLI",
-		"SleepingSimpleString": "Chrr",
+    "WarningAdvancedString": "HROT JE HORÚCI !",
-		"SleepingAdvancedString": "Pokojový režim..",
+    "SleepingTipAdvancedString": "Hrot:",
-		"WarningSimpleString": "PÁLI",
+    "IdleTipString": "Hrot:",
-		"WarningAdvancedString": "HROT JE HORÚCI !",
+    "IdleSetString": "Cieľ:",
-		"SleepingTipAdvancedString": "Hrot:",
+    "TipDisconnectedString": "HROT ODPOJENÝ",
-		"IdleTipString": "Hrot:",
+    "SolderingAdvancedPowerPrompt": "Výkon: ",
-		"IdleSetString": "Cieľ:",
+    "OffString": "Vyp",
-		"TipDisconnectedString": "HROT ODPOJENÝ",
+    "YourGainMessage": "Zisk:"
-		"SolderingAdvancedPowerPrompt": "Výkon: ",
+  },
-		"OffString": "Vyp",
+  "messagesWarn": {
-		"YourGainMessage": "Zisk:"
+    "ResetOKMessage": "Reset OK",
-	},
+    "SettingsResetMessage": ["Tov. nas. obnov.", ""],
-	"messagesWarn": {
+    "NoAccelerometerMessage": ["Bez pohyb. senz.", ""],
-		"ResetOKMessage": "Reset OK",
+    "NoPowerDeliveryMessage": ["Chýba čip USB-PD", ""],
-		"SettingsResetMessage": [
+    "LockingKeysString": "ZABLOK.",
-			"Tov. nas. obnov.",
+    "UnlockingKeysString": "ODBLOK.",
-			""
+    "WarningKeysLockedString": "!ZABLOK!",
-		],
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
-		"NoAccelerometerMessage": [
+  },
-			"Bez pohyb. senz.",
+  "characters": {
-			""
+    "SettingRightChar": "P",
-		],
+    "SettingLeftChar": "L",
-		"NoPowerDeliveryMessage": [
+    "SettingAutoChar": "A",
-			"Chýba čip USB-PD",
+    "SettingOffChar": "Z",
-			""
+    "SettingSlowChar": "P",
-		],
+    "SettingMediumChar": "M",
-		"LockingKeysString": " ZABLOK.",
+    "SettingFastChar": "R",
-		"UnlockingKeysString": "ODBLOK.",
+    "SettingStartNoneChar": "V",
-		"WarningKeysLockedString": "!ZABLOK!"
+    "SettingStartSolderingChar": "Z",
-	},
+    "SettingStartSleepChar": "S",
-	"characters": {
+    "SettingStartSleepOffChar": "I",
-		"SettingRightChar": "P",
+    "SettingSensitivityOff": "Z",
-		"SettingLeftChar": "L",
+    "SettingSensitivityLow": "N",
-		"SettingAutoChar": "A",
+    "SettingSensitivityMedium": "S",
-		"SettingFastChar": "R",
+    "SettingSensitivityHigh": "V",
-		"SettingSlowChar": "P",
+    "SettingLockDisableChar": "Z",
-		"SettingMediumChar": "M",
+    "SettingLockBoostChar": "B",
-		"SettingOffChar": "Z",
+    "SettingLockFullChar": "P",
-		"SettingStartSolderingChar": "S",
+    "SettingNAChar": "N/A"
-		"SettingStartSleepChar": "K",
+  },
-		"SettingStartSleepOffChar": "O",
+  "menuGroups": {
-		"SettingStartNoneChar": "N",
+    "PowerMenu": {
-		"SettingSensitivityOff": "Z",
+      "text2": ["Power", "settings"],
-		"SettingSensitivityLow": "N",
+      "desc": "Power settings"
-		"SettingSensitivityMedium": "S",
+    },
-		"SettingSensitivityHigh": "V",
+    "SolderingMenu": {
-		"SettingLockDisableChar": "Z",
+      "text2": ["Nastavenie", "spájkovania"],
-		"SettingLockBoostChar": "B",
+      "desc": "Nastavenie spájkovania"
-		"SettingLockFullChar": "P",
+    },
-		"SettingNAChar": "N/A"
+    "PowerSavingMenu": {
-	},
+      "text2": ["Úsporný", "režim"],
-	"menuGroups": {
+      "desc": "Nastavenia režimov úspory energie"
-		"PowerMenu": {
+    },
-			"text2": [
+    "UIMenu": {
-				"Power",
+      "text2": ["Nastavenie", "zobrazenia"],
-				"settings"
+      "desc": "Nastavenie zobrazenia"
-			],
+    },
-			"desc": "Power settings"
+    "AdvancedMenu": {
-		},
+      "text2": ["Pokročilé", "nastavenia"],
-		"SolderingMenu": {
+      "desc": "Pokročilé nastavenia"
-			"text2": [
+    }
-				"Nastavenie",
+  },
-				"spájkovania"
+  "menuOptions": {
-			],
+    "DCInCutoff": {
-			"desc": "Nastavenie spájkovania"
+      "text2": ["Zdroj", "napätia"],
-		},
+      "desc": "Zdroj napätia. Nastavenie napätia pre vypnutie (cutoff)  (DC=10V | nS=n*3.3V pre LiIon články)"
-		"PowerSavingMenu": {
+    },
-			"text2": [
+    "SleepTemperature": {
-				"Úsporný",
+      "text2": ["Pokojová", "teplota"],
-				"režim"
+      "desc": "Pokojová teplota (v nastavených jednotkách)"
-			],
+    },
-			"desc": "Nastavenia režimov úspory energie"
+    "SleepTimeout": {
-		},
+      "text2": ["Pokojový", "režim po"],
-		"UIMenu": {
+      "desc": "Pokojový režim po (S=sekundách | M=minútach)"
-			"text2": [
+    },
-				"Nastavenie",
+    "ShutdownTimeout": {
-				"zobrazenia"
+      "text2": ["Vypnutie", "po"],
-			],
+      "desc": "Čas na vypnutie (minúty)"
-			"desc": "Nastavenie zobrazenia"
+    },
-		},
+    "MotionSensitivity": {
-		"AdvancedMenu": {
+      "text2": ["Citlivosť", "pohybu"],
-			"text2": [
+      "desc": "Citlivosť detekcie pohybu (0=Vyp | 1=Min | ... | 9=Max)"
-				"Pokročilé",
+    },
-				"nastavenia"
+    "TemperatureUnit": {
-			],
+      "text2": ["Jednotka", "teploty"],
-			"desc": "Pokročilé nastavenia"
+      "desc": "Jednotky merania teploty (C=stupne Celzia | F=stupne Fahrenheita)"
-		}
+    },
-	},
+    "AdvancedIdle": {
-	"menuOptions": {
+      "text2": ["Detaily v", "pokoj. režime"],
-		"DCInCutoff": {
+      "desc": "Zobraziť detailné informácie v pokojovom režime (T=Zap | F=Vyp)"
-			"text2": [
+    },
-				"Zdroj",
+    "DisplayRotation": {
-				"napätia"
+      "text2": ["Orientácia", "displeja"],
-			],
+      "desc": "Orientácia displeja (P=Pravák | L=Ľavák | A=Auto)"
-			"desc": "Zdroj napätia. Nastavenie napätia pre vypnutie (cutoff)  <DC=10V, nS=n*3.3V pre LiIon články>"
+    },
-		},
+    "BoostTemperature": {
-		"SleepTemperature": {
+      "text2": ["Boost", "teplota"],
-			"text2": [
+      "desc": "Cieľová teplota pre prudký náhrev (v nastavených jednotkách)"
-				"Pokojová",
+    },
-				"teplota"
+    "AutoStart": {
-			],
+      "text2": ["Automatické", "spustenie"],
-			"desc": "Pokojová teplota (v nastavených jednotkách)"
+      "desc": "Pri štarte spustiť režim spájkovania (V=Vyp | Z=Spájkovanie | S=Spanok | I=Spanok izbová teplota)"
-		},
+    },
-		"SleepTimeout": {
+    "CooldownBlink": {
-			"text2": [
+      "text2": ["Blikanie pri", "chladnutí"],
-				"Pokojový",
+      "desc": "Blikanie ukazovateľa teploty počas chladnutia hrotu"
-				"režim po"
+    },
-			],
+    "TemperatureCalibration": {
-			"desc": "Pokojový režim po <S=sekundách/M=minútach>"
+      "text2": ["Kalibrácia", "teploty"],
-		},
+      "desc": "Kalibrácia posunu teploty hrotu"
-		"ShutdownTimeout": {
+    },
-			"text2": [
+    "SettingsReset": {
-				"Vypnutie",
+      "text2": ["Obnovenie", "nastavení"],
-				"po"
+      "desc": "Obnovenie nastavení na pôvodné hodnoty"
-			],
+    },
-			"desc": "Čas na vypnutie <minúty>"
+    "VoltageCalibration": {
-		},
+      "text2": ["Kalibrácia", "nap. napätia"],
-		"MotionSensitivity": {
+      "desc": "Kalibrácia napájacieho napätia. Krátke stlačenie mení nastavenie, dlhé stlačenie pre návrat"
-			"text2": [
+    },
-				"Citlivosť",
+    "AdvancedSoldering": {
-				"pohybu"
+      "text2": ["Detaily počas", "spájkovania"],
-			],
+      "desc": "Zobrazenie detailov počas spájkovania"
-			"desc": "Citlivosť detekcie pohybu <0=Vyp, 1=Min ... 9=Max>"
+    },
-		},
+    "ScrollingSpeed": {
-		"TemperatureUnit": {
+      "text2": ["Rýchlosť", "skrolovania"],
-			"text2": [
+      "desc": "Rýchlosť pohybu tohto textu"
-				"Jednotka",
+    },
-				"teploty"
+    "QCMaxVoltage": {
-			],
+      "text2": ["Obmedzenie", "výkonu"],
-			"desc": "Jednotky merania teploty <C=stupne Celzia, F=stupne Fahrenheita>"
+      "desc": "Obmedzenie výkonu podľa použitého zdroja"
-		},
+    },
-		"AdvancedIdle": {
+    "PDNegTimeout": {
-			"text2": [
+      "text2": ["PD", "timeout"],
-				"Detaily v",
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-				"pokoj. režime"
+    },
-			],
+    "PowerLimit": {
-			"desc": "Zobraziť detailné informácie v pokojovom režime <T=Zap, F=Vyp>"
+      "text2": ["Obmedzenie", "výkonu"],
-		},
+      "desc": "Obmedzenie výkonu podľa použitého zdroja (watt)"
-		"DisplayRotation": {
+    },
-			"text2": [
+    "ReverseButtonTempChange": {
-				"Orientácia",
+      "text2": ["Otočenie", "tlačidiel +/-"],
-				"displeja"
+      "desc": "Prehodenie tlačidiel na nastavovanie teploty"
-			],
+    },
-			"desc": "Orientácia displeja <A=Auto, L=Ľavák, P=Pravák>"
+    "TempChangeShortStep": {
-		},
+      "text2": ["Malý krok", "teploty"],
-		"BoostTemperature": {
+      "desc": "Zmena teploty pri krátkom stlačení tlačidla"
-			"text2": [
+    },
-				"Boost",
+    "TempChangeLongStep": {
-				"teplota"
+      "text2": ["Veľký krok", "teploty"],
-			],
+      "desc": "Zmena teploty pri držaní tlačidla"
-			"desc": "Cieľová teplota pre prudký náhrev (v nastavených jednotkách)"
+    },
-		},
+    "PowerPulsePower": {
-		"AutoStart": {
+      "text2": ["Intenzita", "impulzu"],
-			"text2": [
+      "desc": "Impulz udržujúci napájací zdroj zapnutý (power banky) (watt)"
-				"Automatické",
+    },
-				"spustenie"
+    "HallEffSensitivity": {
-			],
+      "text2": ["Citliv.", "Hall"],
-			"desc": "Pri štarte spustiť režim spájkovania <S=Zap, N=Vyp, K=Spanok>"
+      "desc": "Citlivosť Halloveho senzora pre detekciu spánku (Z=Zakázať | N=Nízka | S=Stredná | V=Vysoká)"
-		},
+    },
-		"CooldownBlink": {
+    "LockingMode": {
-			"text2": [
+      "text2": ["Povoliť zámok", "tlačidiel"],
-				"Blikanie pri",
+      "desc": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania (Z=Zakázať | B=Okrem boost | P=Plné zamknutie)"
-				"chladnutí"
+    },
-			],
+    "MinVolCell": {
-			"desc": "Blikanie ukazovateľa teploty počas chladnutia hrotu"
+      "text2": ["Minimum", "voltage"],
-		},
+      "desc": "Minimum allowed voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
-		"TemperatureCalibration": {
+    },
-			"text2": [
+    "AnimLoop": {
-				"Kalibrácia",
+      "text2": ["Anim.", "loop"],
-				"teploty"
+      "desc": "Loop icon animations in root menu"
-			],
+    },
-			"desc": "Kalibrácia posunu teploty hrotu"
+    "AnimSpeed": {
-		},
+      "text2": ["Anim.", "speed"],
-		"SettingsReset": {
+      "desc": "Speed of icon animations in menu (O=off | L=low | M=medium | H=high)"
-			"text2": [
+    },
-				"Obnovenie",
+    "PowerPulseWait": {
-				"nastavení"
+      "text2": ["Power pulse", "wait time"],
-			],
+      "desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
-			"desc": "Obnovenie nastavení na pôvodné hodnoty"
+    },
-		},
+    "PowerPulseDuration": {
-		"VoltageCalibration": {
+      "text2": ["Power pulse", "duration"],
-			"text2": [
+      "desc": "Keep-awake-pulse duration (x 250ms)"
-				"Kalibrácia",
+    },
-				"nap. napätia"
+    "LanguageSwitch": {
-			],
+      "text2": ["Jazyk:", " SK  Slovenčina"],
-			"desc": "Kalibrácia napájacieho napätia. Krátke stlačenie mení nastavenie, dlhé stlačenie pre návrat"
+      "desc": ""
-		},
+    },
-		"AdvancedSoldering": {
+    "Brightness": {
-			"text2": [
+      "text2": ["Screen", "Brightness"],
-				"Detaily počas",
+      "desc": "Adjust the contrast/brightness of the OLED screen"
-				"spájkovania"
+    },
-			],
+    "ColourInversion": {
-			"desc": "Zobrazenie detailov počas spájkovania"
+      "text2": ["Screen", "Invert"],
-		},
+      "desc": "Invert the colours of the OLED screen"
-		"ScrollingSpeed": {
+    }
-			"text2": [
+  }
-				"Rýchlosť",
-				"skrolovania"
-			],
-			"desc": "Rýchlosť pohybu tohto textu"
-		},
-		"QCMaxVoltage": {
-			"text2": [
-				"Obmedzenie",
-				"výkonu"
-			],
-			"desc": "Obmedzenie výkonu podľa použitého zdroja"
-		},
-		"PowerLimit": {
-			"text2": [
-				"Obmedzenie",
-				"výkonu"
-			],
-			"desc": "Obmedzenie výkonu podľa použitého zdroja <watt>"
-		},
-		"ReverseButtonTempChange": {
-			"text2": [
-				"Otočenie",
-				"tlačidiel +/-"
-			],
-			"desc": "Prehodenie tlačidiel na nastavovanie teploty"
-		},
-		"TempChangeShortStep": {
-			"text2": [
-				"Malý krok",
-				"teploty"
-			],
-			"desc": "Zmena teploty pri krátkom stlačení tlačidla"
-		},
-		"TempChangeLongStep": {
-			"text2": [
-				"Veľký krok",
-				"teploty"
-			],
-			"desc": "Zmena teploty pri držaní tlačidla"
-		},
-		"PowerPulsePower": {
-			"text2": [
-				"Intenzita",
-				"impulzu"
-			],
-			"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á>"
-		},
-		"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>"
-		},
-		"MinVolCell": {
-			"text2": [
-				"Minimum",
-				"voltage"
-			],
-			"desc": "Minimum allowed voltage per cell <Volts> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
-		},
-		"AnimLoop": {
-			"text2": [
-				"Anim.",
-				"loop"
-			],
-			"desc": "Loop icon animations in root menu"
-		},
-		"AnimSpeed": {
-			"text2": [
-				"Anim.",
-				"speed"
-			],
-			"desc": "Speed of icon animations in menu <O=off | L=low | M=medium | H=high>"
-		},
-		"PowerPulseWait": {
-			"text2": [
-				"Power pulse",
-				"wait time"
-			],
-			"desc": "Time to wait before triggering every keep-awake pulse (x 2.5s)"
-		},
-		"PowerPulseDuration": {
-			"text2": [
-				"Power pulse",
-				"duration"
-			],
-			"desc": "Keep-awake-pulse duration (x 250ms)"
-		},
-		"LanguageSwitch": {
-			"text2": [
-				"Language:",
-				" SK  Slovenčina"
-			],
-			"desc": ""
-		}
-	}
 }

Translations/translation_SL.json

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

Translations/translation_SR_CYRL.json

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

Translations/translation_SR_LATN.json

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

Translations/translation_SV.json

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

Translations/translation_TR.json

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

Translations/translation_UK.json

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

Translations/translation_YUE_HK.json

@@ -1,210 +1,214 @@
 {
-	"languageCode": "YUE_HK",
+  "languageCode": "YUE_HK",
-	"languageLocalName": "廣東話 (香港)",
+  "languageLocalName": "廣東話 (香港)",
-	"fonts": [
+  "fonts": ["ascii_basic", "cjk"],
-		"ascii_basic",
+  "tempUnitFahrenheit": true,
-		"cjk"
+  "messages": {
-	],
+    "SettingsCalibrationDone": "校正完成！",
-	"tempUnitFahrenheit": true,
+    "SettingsCalibrationWarning": "開始温度校正之前，請先確定辣雞咀係處於室温！",
-	"messages": {
+    "SettingsResetWarning": "你係咪確定要將全部設定重設到預設值？",
-		"SettingsCalibrationDone": "校正完成！",
+    "UVLOWarningString": "電壓過低",
-		"SettingsCalibrationWarning": "開始温度校正之前，請先確定辣雞咀係處於室温！",
+    "UndervoltageString": "Undervoltage",
-		"SettingsResetWarning": "你係咪確定要將全部設定重設到預設值？",
+    "InputVoltageString": "Input V: ",
-		"UVLOWarningString": "電壓過低",
+    "WarningTipTempString": "Tip temp: ",
-		"UndervoltageString": "Undervoltage",
+    "BadTipString": "BAD TIP",
-		"InputVoltageString": "Input V: ",
+    "SleepingSimpleString": "Zzzz",
-		"WarningTipTempString": "Tip temp: ",
+    "SleepingAdvancedString": "Sleeping...",
-		"BadTipString": "BAD TIP",
+    "WarningSimpleString": "HOT!",
-		"SleepingSimpleString": "Zzzz",
+    "WarningAdvancedString": "!!! HOT TIP !!!",
-		"SleepingAdvancedString": "Sleeping...",
+    "SleepingTipAdvancedString": "Tip:",
-		"WarningSimpleString": "HOT!",
+    "IdleTipString": "Tip:",
-		"WarningAdvancedString": "!!! HOT TIP !!!",
+    "IdleSetString": " Set:",
-		"SleepingTipAdvancedString": "Tip:",
+    "TipDisconnectedString": "NO TIP",
-		"IdleTipString": "Tip:",
+    "SolderingAdvancedPowerPrompt": "Power: ",
-		"IdleSetString": " Set:",
+    "OffString": "關",
-		"TipDisconnectedString": "NO TIP",
+    "YourGainMessage": "Your gain:"
-		"SolderingAdvancedPowerPrompt": "Power: ",
+  },
-		"OffString": "關",
+  "messagesWarn": {
-		"YourGainMessage": "Your gain:"
+    "ResetOKMessage": "已重設！",
-	},
+    "SettingsResetMessage": "設定已被重設！",
-	"messagesWarn": {
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-		"ResetOKMessage": "已重設！",
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		"SettingsResetMessage": "設定已被重設！",
+    "LockingKeysString": "已鎖定",
-		"NoAccelerometerMessage": [
+    "UnlockingKeysString": "已解除鎖定",
-			"No accelerometer",
+    "WarningKeysLockedString": "!撳掣鎖定!",
-			"detected!"
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
-		],
+  },
-		"NoPowerDeliveryMessage": [
+  "characters": {
-			"No USB-PD IC",
+    "SettingRightChar": "右",
-			"detected!"
+    "SettingLeftChar": "左",
-		],
+    "SettingAutoChar": "自",
-		"LockingKeysString": "已鎖定",
+    "SettingOffChar": "關",
-		"UnlockingKeysString": "已解除鎖定",
+    "SettingSlowChar": "慢",
-		"WarningKeysLockedString": "!撳掣鎖定!"
+    "SettingMediumChar": "中",
-	},
+    "SettingFastChar": "快",
-	"characters": {
+    "SettingStartNoneChar": "無",
-		"SettingRightChar": "右",
+    "SettingStartSolderingChar": "焊",
-		"SettingLeftChar": "左",
+    "SettingStartSleepChar": "待",
-		"SettingAutoChar": "自",
+    "SettingStartSleepOffChar": "室",
-		"SettingFastChar": "快",
+    "SettingSensitivityOff": "關",
-		"SettingSlowChar": "慢",
+    "SettingSensitivityLow": "低",
-		"SettingMediumChar": "中",
+    "SettingSensitivityMedium": "中",
-		"SettingOffChar": "關",
+    "SettingSensitivityHigh": "高",
-		"SettingStartSolderingChar": "焊",
+    "SettingLockDisableChar": "無",
-		"SettingStartSleepChar": "待",
+    "SettingLockBoostChar": "增",
-		"SettingStartSleepOffChar": "室",
+    "SettingLockFullChar": "全",
-		"SettingStartNoneChar": "無",
+    "SettingNAChar": "不適用"
-		"SettingSensitivityOff": "關",
+  },
-		"SettingSensitivityLow": "低",
+  "menuGroups": {
-		"SettingSensitivityMedium": "中",
+    "PowerMenu": {
-		"SettingSensitivityHigh": "高",
+      "text2": "電源設定",
-		"SettingLockDisableChar": "無",
+      "desc": "電源設定"
-		"SettingLockBoostChar": "增",
+    },
-		"SettingLockFullChar": "全",
+    "SolderingMenu": {
-		"SettingNAChar": "不適用"
+      "text2": "焊接設定",
-	},
+      "desc": "焊接設定"
-	"menuGroups": {
+    },
-		"PowerMenu": {
+    "PowerSavingMenu": {
-			"text2": "電源設定",
+      "text2": "待機設定",
-			"desc": "電源設定"
+      "desc": "自動待機慳電設定"
-		},
+    },
-		"SolderingMenu": {
+    "UIMenu": {
-			"text2": "焊接設定",
+      "text2": "使用者介面",
-			"desc": "焊接設定"
+      "desc": "使用者介面設定"
-		},
+    },
-		"PowerSavingMenu": {
+    "AdvancedMenu": {
-			"text2": "待機設定",
+      "text2": "進階設定",
-			"desc": "自動待機慳電設定"
+      "desc": "進階設定"
-		},
+    }
-		"UIMenu": {
+  },
-			"text2": "使用者介面",
+  "menuOptions": {
-			"desc": "使用者介面設定"
+    "DCInCutoff": {
-		},
+      "text2": "電源",
-		"AdvancedMenu": {
+      "desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每粒3.3V計算；依個設定會停用功率限制>"
-			"text2": "進階設定",
+    },
-			"desc": "進階設定"
+    "SleepTemperature": {
-		}
+      "text2": "待機温度",
-	},
+      "desc": "喺待機模式時嘅辣雞咀温度"
-	"menuOptions": {
+    },
-		"DCInCutoff": {
+    "SleepTimeout": {
-			"text2": "電源",
+      "text2": "待機延時",
-			"desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每粒3.3V計算；依個設定會停用功率限制>"
+      "desc": "自動進入待機模式前嘅閒置等候時間 <S=秒 | M=分鐘>"
-		},
+    },
-		"SleepTemperature": {
+    "ShutdownTimeout": {
-			"text2": "待機温度",
+      "text2": "自動熄機",
-			"desc": "喺待機模式時嘅辣雞咀温度"
+      "desc": "自動熄機前嘅閒置等候時間 <M=分鐘>"
-		},
+    },
-		"SleepTimeout": {
+    "MotionSensitivity": {
-			"text2": "待機延時",
+      "text2": "動作敏感度",
-			"desc": "自動進入待機模式前嘅閒置等候時間 <S=秒 | M=分鐘>"
+      "desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
-		},
+    },
-		"ShutdownTimeout": {
+    "TemperatureUnit": {
-			"text2": "自動熄機",
+      "text2": "温度單位",
-			"desc": "自動熄機前嘅閒置等候時間 <M=分鐘>"
+      "desc": "C=攝氏 | F=華氏"
-		},
+    },
-		"MotionSensitivity": {
+    "AdvancedIdle": {
-			"text2": "動作敏感度",
+      "text2": "詳細閒置畫面",
-			"desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
+      "desc": "喺閒置畫面以英文細字顯示詳細嘅資料"
-		},
+    },
-		"TemperatureUnit": {
+    "DisplayRotation": {
-			"text2": "温度單位",
+      "text2": "畫面方向",
-			"desc": "C=攝氏 | F=華氏"
+      "desc": "右=使用右手 | 左=使用左手 | 自=自動"
-		},
+    },
-		"AdvancedIdle": {
+    "BoostTemperature": {
-			"text2": "詳細閒置畫面",
+      "text2": "增熱温度",
-			"desc": "喺閒置畫面以英文細字顯示詳細嘅資料"
+      "desc": "喺增熱模式時使用嘅温度"
-		},
+    },
-		"DisplayRotation": {
+    "AutoStart": {
-			"text2": "畫面方向",
+      "text2": "自動啓用",
-			"desc": "自=自動 | 左=使用左手 | 右=使用右手"
+      "desc": "開機時自動啓用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室温待機>"
-		},
+    },
-		"BoostTemperature": {
+    "CooldownBlink": {
-			"text2": "增熱温度",
+      "text2": "降温時閃爍",
-			"desc": "喺增熱模式時使用嘅温度"
+      "desc": "停止加熱之後，當辣雞咀仲係熱嗰陣閃爍畫面"
-		},
+    },
-		"AutoStart": {
+    "TemperatureCalibration": {
-			"text2": "自動啓用",
+      "text2": "温度校正？",
-			"desc": "開機時自動啓用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室温待機>"
+      "desc": "開始校正辣雞咀温度位移"
-		},
+    },
-		"CooldownBlink": {
+    "SettingsReset": {
-			"text2": "降温時閃爍",
+      "text2": "全部重設？",
-			"desc": "停止加熱之後，當辣雞咀仲係熱嗰陣閃爍畫面"
+      "desc": "將所有設定重設到預設值"
-		},
+    },
-		"TemperatureCalibration": {
+    "VoltageCalibration": {
-			"text2": "温度校正？",
+      "text2": "輸入電壓校正？",
-			"desc": "開始校正辣雞咀温度位移"
+      "desc": "開始校正VIN輸入電壓 <長撳以退出>"
-		},
+    },
-		"SettingsReset": {
+    "AdvancedSoldering": {
-			"text2": "全部重設？",
+      "text2": "詳細焊接畫面",
-			"desc": "將所有設定重設到預設值"
+      "desc": "喺焊接模式畫面以英文細字顯示詳細嘅資料"
-		},
+    },
-		"VoltageCalibration": {
+    "ScrollingSpeed": {
-			"text2": "輸入電壓校正？",
+      "text2": "捲動速度",
-			"desc": "開始校正VIN輸入電壓 <長撳以退出>"
+      "desc": "解說文字嘅捲動速度"
-		},
+    },
-		"AdvancedSoldering": {
+    "QCMaxVoltage": {
-			"text2": "詳細焊接畫面",
+      "text2": "QC電壓",
-			"desc": "喺焊接模式畫面以英文細字顯示詳細嘅資料"
+      "desc": "使用QC電源時請求嘅最高目標電壓"
-		},
+    },
-		"ScrollingSpeed": {
+    "PDNegTimeout": {
-			"text2": "捲動速度",
+      "text2": ["PD", "timeout"],
-			"desc": "解說文字嘅捲動速度"
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-		},
+    },
-		"QCMaxVoltage": {
+    "PowerLimit": {
-			"text2": "QC電壓",
+      "text2": "功率限制",
-			"desc": "使用QC電源時請求嘅最高目標電壓"
+      "desc": "限制辣雞可用嘅最大功率 <W=watt（火）>"
-		},
+    },
-		"PowerLimit": {
+    "ReverseButtonTempChange": {
-			"text2": "功率限制",
+      "text2": "反轉加減掣",
-			"desc": "限制辣雞可用嘅最大功率 <W=watt（火）>"
+      "desc": "反轉調校温度時加減掣嘅方向"
-		},
+    },
-		"ReverseButtonTempChange": {
+    "TempChangeShortStep": {
-			"text2": "反轉加減掣",
+      "text2": "温度調整 短",
-			"desc": "反轉調校温度時加減掣嘅方向"
+      "desc": "調校温度時短撳一下嘅温度變幅"
-		},
+    },
-		"TempChangeShortStep": {
+    "TempChangeLongStep": {
-			"text2": "温度調整 短",
+      "text2": "温度調整 長",
-			"desc": "調校温度時短撳一下嘅温度變幅"
+      "desc": "調校温度時長撳嘅温度變幅"
-		},
+    },
-		"TempChangeLongStep": {
+    "PowerPulsePower": {
-			"text2": "温度調整 長",
+      "text2": "電源脈衝",
-			"desc": "調校温度時長撳嘅温度變幅"
+      "desc": "為保持電源喚醒而通電所用嘅功率 <watt（火）>"
-		},
+    },
-		"PowerPulsePower": {
+    "HallEffSensitivity": {
-			"text2": "電源脈衝",
+      "text2": "磁場敏感度",
-			"desc": "為保持電源喚醒而通電所用嘅功率 <watt（火）>"
+      "desc": "磁場感應器用嚟啓動待機模式嘅敏感度 <關=停用 | 低=最低敏感度 | 中=中等敏感度 | 高=最高敏感度>"
-		},
+    },
-		"HallEffSensitivity": {
+    "LockingMode": {
-			"text2": "磁場敏感度",
+      "text2": "撳掣鎖定",
-			"desc": "磁場感應器用嚟啓動待機模式嘅敏感度 <關=停用 | 低=最低敏感度 | 中=中等敏感度 | 高=最高敏感度>"
+      "desc": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=淨係容許增熱模式 | 全=鎖定全部>"
-		},
+    },
-		"LockingMode": {
+    "MinVolCell": {
-			"text2": "撳掣鎖定",
+      "text2": "最低電壓",
-			"desc": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=淨係容許增熱模式 | 全=鎖定全部>"
+      "desc": "每粒電池嘅最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
-		},
+    },
-		"MinVolCell": {
+    "AnimLoop": {
-			"text2": "最低電壓",
+      "text2": "動畫循環",
-			"desc": "每粒電池嘅最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
+      "desc": "循環顯示功能表圖示動畫"
-		},
+    },
-		"AnimLoop": {
+    "AnimSpeed": {
-			"text2": "動畫循環",
+      "text2": "動畫速度",
-			"desc": "循環顯示功能表圖示動畫"
+      "desc": "功能表圖示動畫嘅速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
-		},
+    },
-		"AnimSpeed": {
+    "PowerPulseWait": {
-			"text2": "動畫速度",
+      "text2": "電源脈衝間隔",
-			"desc": "功能表圖示動畫嘅速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
+      "desc": "為保持電源喚醒，每次通電之間嘅間隔時間 <x2.5s（秒）>"
-		},
+    },
-		"PowerPulseWait": {
+    "PowerPulseDuration": {
-			"text2": "電源脈衝間隔",
+      "text2": "電源脈衝時長",
-			"desc": "為保持電源喚醒，每次通電之間嘅間隔時間 <x2.5s（秒）>"
+      "desc": "為保持電源喚醒，每次通電脈衝嘅時間長度 <x250ms（亳秒）>"
-		},
+    },
-		"PowerPulseDuration": {
+    "LanguageSwitch": {
-			"text2": "電源脈衝時長",
+      "text2": "語言： 廣東話",
-			"desc": "為保持電源喚醒，每次通電脈衝嘅時間長度 <x250ms（亳秒）>"
+      "desc": ""
-		},
+    },
-		"LanguageSwitch": {
+    "Brightness": {
-			"text2": "語言： 廣東話",
+      "text2": ["Screen", "Brightness"],
-			"desc": ""
+      "desc": "Adjust the contrast/brightness of the OLED screen"
-		}
+    },
-	}
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
+    }
+  }
 }

Translations/translation_ZH_CN.json

@@ -1,210 +1,214 @@
 {
-	"languageCode": "ZH_CN",
+  "languageCode": "ZH_CN",
-	"languageLocalName": "简体中文",
+  "languageLocalName": "简体中文",
-	"fonts": [
+  "fonts": ["ascii_basic", "cjk"],
-		"ascii_basic",
+  "tempUnitFahrenheit": true,
-		"cjk"
+  "messages": {
-	],
+    "SettingsCalibrationDone": "校正完成！",
-	"tempUnitFahrenheit": true,
+    "SettingsCalibrationWarning": "开始温度校正前，请先确定铬铁头正处于室温！",
-	"messages": {
+    "SettingsResetWarning": "你是否确定要将全部设置重置为默认值？",
-		"SettingsCalibrationDone": "校正完成！",
+    "UVLOWarningString": "电压过低",
-		"SettingsCalibrationWarning": "开始温度校正前，请先确定铬铁头正处于室温！",
+    "UndervoltageString": "Undervoltage",
-		"SettingsResetWarning": "你是否确定要将全部设置重置为默认值？",
+    "InputVoltageString": "Input V: ",
-		"UVLOWarningString": "电压过低",
+    "WarningTipTempString": "Tip temp: ",
-		"UndervoltageString": "Undervoltage",
+    "BadTipString": "BAD TIP",
-		"InputVoltageString": "Input V: ",
+    "SleepingSimpleString": "Zzzz",
-		"WarningTipTempString": "Tip temp: ",
+    "SleepingAdvancedString": "Sleeping...",
-		"BadTipString": "BAD TIP",
+    "WarningSimpleString": "HOT!",
-		"SleepingSimpleString": "Zzzz",
+    "WarningAdvancedString": "!!! HOT TIP !!!",
-		"SleepingAdvancedString": "Sleeping...",
+    "SleepingTipAdvancedString": "Tip:",
-		"WarningSimpleString": "HOT!",
+    "IdleTipString": "Tip:",
-		"WarningAdvancedString": "!!! HOT TIP !!!",
+    "IdleSetString": " Set:",
-		"SleepingTipAdvancedString": "Tip:",
+    "TipDisconnectedString": "NO TIP",
-		"IdleTipString": "Tip:",
+    "SolderingAdvancedPowerPrompt": "Power: ",
-		"IdleSetString": " Set:",
+    "OffString": "关",
-		"TipDisconnectedString": "NO TIP",
+    "YourGainMessage": "Your gain:"
-		"SolderingAdvancedPowerPrompt": "Power: ",
+  },
-		"OffString": "关",
+  "messagesWarn": {
-		"YourGainMessage": "Your gain:"
+    "ResetOKMessage": "已重置！",
-	},
+    "SettingsResetMessage": "设置已被重置！",
-	"messagesWarn": {
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-		"ResetOKMessage": "已重置！",
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		"SettingsResetMessage": "设置已被重置！",
+    "LockingKeysString": "已锁定",
-		"NoAccelerometerMessage": [
+    "UnlockingKeysString": "已解除锁定",
-			"No accelerometer",
+    "WarningKeysLockedString": "!按键锁定!",
-			"detected!"
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
-		],
+  },
-		"NoPowerDeliveryMessage": [
+  "characters": {
-			"No USB-PD IC",
+    "SettingRightChar": "右",
-			"detected!"
+    "SettingLeftChar": "左",
-		],
+    "SettingAutoChar": "自",
-		"LockingKeysString": "已锁定",
+    "SettingOffChar": "关",
-		"UnlockingKeysString": "已解除锁定",
+    "SettingSlowChar": "慢",
-		"WarningKeysLockedString": "!按键锁定!"
+    "SettingMediumChar": "中",
-	},
+    "SettingFastChar": "快",
-	"characters": {
+    "SettingStartNoneChar": "无",
-		"SettingRightChar": "右",
+    "SettingStartSolderingChar": "焊",
-		"SettingLeftChar": "左",
+    "SettingStartSleepChar": "待",
-		"SettingAutoChar": "自",
+    "SettingStartSleepOffChar": "室",
-		"SettingFastChar": "快",
+    "SettingSensitivityOff": "关",
-		"SettingSlowChar": "慢",
+    "SettingSensitivityLow": "低",
-		"SettingMediumChar": "中",
+    "SettingSensitivityMedium": "中",
-		"SettingOffChar": "关",
+    "SettingSensitivityHigh": "高",
-		"SettingStartSolderingChar": "焊",
+    "SettingLockDisableChar": "无",
-		"SettingStartSleepChar": "待",
+    "SettingLockBoostChar": "增",
-		"SettingStartSleepOffChar": "室",
+    "SettingLockFullChar": "全",
-		"SettingStartNoneChar": "无",
+    "SettingNAChar": "不适用"
-		"SettingSensitivityOff": "关",
+  },
-		"SettingSensitivityLow": "低",
+  "menuGroups": {
-		"SettingSensitivityMedium": "中",
+    "PowerMenu": {
-		"SettingSensitivityHigh": "高",
+      "text2": "电源设置",
-		"SettingLockDisableChar": "无",
+      "desc": "电源设置"
-		"SettingLockBoostChar": "增",
+    },
-		"SettingLockFullChar": "全",
+    "SolderingMenu": {
-		"SettingNAChar": "不适用"
+      "text2": "焊接设置",
-	},
+      "desc": "焊接设置"
-	"menuGroups": {
+    },
-		"PowerMenu": {
+    "PowerSavingMenu": {
-			"text2": "电源设置",
+      "text2": "待机设置",
-			"desc": "电源设置"
+      "desc": "自动待机省电设置"
-		},
+    },
-		"SolderingMenu": {
+    "UIMenu": {
-			"text2": "焊接设置",
+      "text2": "使用者介面",
-			"desc": "焊接设置"
+      "desc": "使用者介面设置"
-		},
+    },
-		"PowerSavingMenu": {
+    "AdvancedMenu": {
-			"text2": "待机设置",
+      "text2": "进阶设置",
-			"desc": "自动待机省电设置"
+      "desc": "进阶设置"
-		},
+    }
-		"UIMenu": {
+  },
-			"text2": "使用者介面",
+  "menuOptions": {
-			"desc": "使用者介面设置"
+    "DCInCutoff": {
-		},
+      "text2": "电源",
-		"AdvancedMenu": {
+      "desc": "输入电源；设置自动停机电压 <DC 10V> <S 锂电池，以每颗3.3V计算；此设置会禁用功率限制>"
-			"text2": "进阶设置",
+    },
-			"desc": "进阶设置"
+    "SleepTemperature": {
-		}
+      "text2": "待机温度",
-	},
+      "desc": "于待机模式时的铬铁头温度"
-	"menuOptions": {
+    },
-		"DCInCutoff": {
+    "SleepTimeout": {
-			"text2": "电源",
+      "text2": "待机延时",
-			"desc": "输入电源；设置自动停机电压 <DC 10V> <S 锂电池，以每颗3.3V计算；此设置会禁用功率限制>"
+      "desc": "自动进入待机模式前的闲置等候时间 <S=秒 | M=分钟>"
-		},
+    },
-		"SleepTemperature": {
+    "ShutdownTimeout": {
-			"text2": "待机温度",
+      "text2": "自动关机",
-			"desc": "于待机模式时的铬铁头温度"
+      "desc": "自动关机前的闲置等候时间 <M=分钟>"
-		},
+    },
-		"SleepTimeout": {
+    "MotionSensitivity": {
-			"text2": "待机延时",
+      "text2": "动作灵敏度",
-			"desc": "自动进入待机模式前的闲置等候时间 <S=秒 | M=分钟>"
+      "desc": "0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度"
-		},
+    },
-		"ShutdownTimeout": {
+    "TemperatureUnit": {
-			"text2": "自动关机",
+      "text2": "温标",
-			"desc": "自动关机前的闲置等候时间 <M=分钟>"
+      "desc": "C=摄氏 | F=华氏"
-		},
+    },
-		"MotionSensitivity": {
+    "AdvancedIdle": {
-			"text2": "动作灵敏度",
+      "text2": "详细闲置画面",
-			"desc": "0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度"
+      "desc": "于闲置画面以英语小字显示详细信息"
-		},
+    },
-		"TemperatureUnit": {
+    "DisplayRotation": {
-			"text2": "温标",
+      "text2": "画面方向",
-			"desc": "C=摄氏 | F=华氏"
+      "desc": "右=使用右手 | 左=使用左手 | 自=自动"
-		},
+    },
-		"AdvancedIdle": {
+    "BoostTemperature": {
-			"text2": "详细闲置画面",
+      "text2": "增热温度",
-			"desc": "于闲置画面以英语小字显示详细信息"
+      "desc": "于增热模式时使用的温度"
-		},
+    },
-		"DisplayRotation": {
+    "AutoStart": {
-			"text2": "画面方向",
+      "text2": "自动启用",
-			"desc": "自=自动 | 左=使用左手 | 右=使用右手"
+      "desc": "开机时自动启用 <无=禁用 | 焊=焊接模式 | 待=待机模式 | 室=室温待机>"
-		},
+    },
-		"BoostTemperature": {
+    "CooldownBlink": {
-			"text2": "增热温度",
+      "text2": "降温时闪烁",
-			"desc": "于增热模式时使用的温度"
+      "desc": "停止加热之后，当铬铁头仍处于高温时闪烁画面"
-		},
+    },
-		"AutoStart": {
+    "TemperatureCalibration": {
-			"text2": "自动启用",
+      "text2": "温度校正？",
-			"desc": "开机时自动启用 <无=禁用 | 焊=焊接模式 | 待=待机模式 | 室=室温待机>"
+      "desc": "开始校正铬铁头温度位移"
-		},
+    },
-		"CooldownBlink": {
+    "SettingsReset": {
-			"text2": "降温时闪烁",
+      "text2": "全部重置？",
-			"desc": "停止加热之后，当铬铁头仍处于高温时闪烁画面"
+      "desc": "将所有设置重置为默认值"
-		},
+    },
-		"TemperatureCalibration": {
+    "VoltageCalibration": {
-			"text2": "温度校正？",
+      "text2": "输入电压校正？",
-			"desc": "开始校正铬铁头温度位移"
+      "desc": "开始校正VIN输入电压 <长按以退出>"
-		},
+    },
-		"SettingsReset": {
+    "AdvancedSoldering": {
-			"text2": "全部重置？",
+      "text2": "详细焊接画面",
-			"desc": "将所有设置重置为默认值"
+      "desc": "于焊接模式画面以英语小字显示详细信息"
-		},
+    },
-		"VoltageCalibration": {
+    "ScrollingSpeed": {
-			"text2": "输入电压校正？",
+      "text2": "卷动速度",
-			"desc": "开始校正VIN输入电压 <长按以退出>"
+      "desc": "解说文字的卷动速度"
-		},
+    },
-		"AdvancedSoldering": {
+    "QCMaxVoltage": {
-			"text2": "详细焊接画面",
+      "text2": "QC电压",
-			"desc": "于焊接模式画面以英语小字显示详细信息"
+      "desc": "使用QC电源时请求的最高目标电压"
-		},
+    },
-		"ScrollingSpeed": {
+    "PDNegTimeout": {
-			"text2": "卷动速度",
+      "text2": ["PD", "timeout"],
-			"desc": "解说文字的卷动速度"
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-		},
+    },
-		"QCMaxVoltage": {
+    "PowerLimit": {
-			"text2": "QC电压",
+      "text2": "功率限制",
-			"desc": "使用QC电源时请求的最高目标电压"
+      "desc": "限制铬铁可用的最大功率 <W=watt（瓦特）>"
-		},
+    },
-		"PowerLimit": {
+    "ReverseButtonTempChange": {
-			"text2": "功率限制",
+      "text2": "调换加减键",
-			"desc": "限制铬铁可用的最大功率 <W=watt（瓦特）>"
+      "desc": "调校温度时调换加减键的方向"
-		},
+    },
-		"ReverseButtonTempChange": {
+    "TempChangeShortStep": {
-			"text2": "调换加减键",
+      "text2": "温度调整 短",
-			"desc": "调校温度时调换加减键的方向"
+      "desc": "调校温度时短按一下的温度变幅"
-		},
+    },
-		"TempChangeShortStep": {
+    "TempChangeLongStep": {
-			"text2": "温度调整 短",
+      "text2": "温度调整 长",
-			"desc": "调校温度时短按一下的温度变幅"
+      "desc": "调校温度时长按按键的温度变幅"
-		},
+    },
-		"TempChangeLongStep": {
+    "PowerPulsePower": {
-			"text2": "温度调整 长",
+      "text2": "电源脉冲",
-			"desc": "调校温度时长按按键的温度变幅"
+      "desc": "为保持电源唤醒而通电所用的功率 <watt（瓦特）>"
-		},
+    },
-		"PowerPulsePower": {
+    "HallEffSensitivity": {
-			"text2": "电源脉冲",
+      "text2": "磁场灵敏度",
-			"desc": "为保持电源唤醒而通电所用的功率 <watt（瓦特）>"
+      "desc": "磁场感应器用作启动待机模式的灵敏度 <关=禁用 | 低=最低灵敏度 | 中=中等灵敏度 | 高=最高灵敏度>"
-		},
+    },
-		"HallEffSensitivity": {
+    "LockingMode": {
-			"text2": "磁场灵敏度",
+      "text2": "按键锁定",
-			"desc": "磁场感应器用作启动待机模式的灵敏度 <关=禁用 | 低=最低灵敏度 | 中=中等灵敏度 | 高=最高灵敏度>"
+      "desc": "于焊接模式时，同时长按两个按键启用按键锁定 <无=禁用 | 增=只容许增热模式 | 全=锁定全部>"
-		},
+    },
-		"LockingMode": {
+    "MinVolCell": {
-			"text2": "按键锁定",
+      "text2": "最低电压",
-			"desc": "于焊接模式时，同时长按两个按键启用按键锁定 <无=禁用 | 增=只容许增热模式 | 全=锁定全部>"
+      "desc": "每颗电池的最低可用电压 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
-		},
+    },
-		"MinVolCell": {
+    "AnimLoop": {
-			"text2": "最低电压",
+      "text2": "动画循环",
-			"desc": "每颗电池的最低可用电压 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
+      "desc": "循环显示功能表图示动画"
-		},
+    },
-		"AnimLoop": {
+    "AnimSpeed": {
-			"text2": "动画循环",
+      "text2": "动画速度",
-			"desc": "循环显示功能表图示动画"
+      "desc": "功能表图示动画的速度 <关=不显示动画 | 慢=慢速 | 中=中速 | 快=快速>"
-		},
+    },
-		"AnimSpeed": {
+    "PowerPulseWait": {
-			"text2": "动画速度",
+      "text2": "电源脉冲间隔",
-			"desc": "功能表图示动画的速度 <关=不显示动画 | 慢=慢速 | 中=中速 | 快=快速>"
+      "desc": "为保持电源唤醒，每次通电之间的间隔时间 <x2.5s（秒）>"
-		},
+    },
-		"PowerPulseWait": {
+    "PowerPulseDuration": {
-			"text2": "电源脉冲间隔",
+      "text2": "电源脉冲时长",
-			"desc": "为保持电源唤醒，每次通电之间的间隔时间 <x2.5s（秒）>"
+      "desc": "为保持电源唤醒，每次通电脉冲的时间长度 <x250ms（亳秒）>"
-		},
+    },
-		"PowerPulseDuration": {
+    "LanguageSwitch": {
-			"text2": "电源脉冲时长",
+      "text2": "语言：简体中文",
-			"desc": "为保持电源唤醒，每次通电脉冲的时间长度 <x250ms（亳秒）>"
+      "desc": ""
-		},
+    },
-		"LanguageSwitch": {
+    "Brightness": {
-			"text2": "语言：简体中文",
+      "text2": ["Screen", "Brightness"],
-			"desc": ""
+      "desc": "Adjust the contrast/brightness of the OLED screen"
-		}
+    },
-	}
+    "ColourInversion": {
+      "text2": ["Screen", "Invert"],
+      "desc": "Invert the colours of the OLED screen"
+    }
+  }
 }

Translations/translation_ZH_TW.json

@@ -1,210 +1,215 @@
 {
-	"languageCode": "ZH_TW",
+  "languageCode": "ZH_TW",
-	"languageLocalName": "正體中文",
+  "languageLocalName": "正體中文",
-	"fonts": [
+  "fonts": ["ascii_basic", "cjk"],
-		"ascii_basic",
+  "tempUnitFahrenheit": true,
-		"cjk"
+  "messages": {
-	],
+    "SettingsCalibrationDone": "校正完成！",
-	"tempUnitFahrenheit": true,
+    "SettingsCalibrationWarning": "開始溫度校正前，請先確定鉻鐵頭正處於室溫！",
-	"messages": {
+    "SettingsResetWarning": "你是否確定要將全部設定重設到預設值？",
-		"SettingsCalibrationDone": "校正完成！",
+    "UVLOWarningString": "電壓過低",
-		"SettingsCalibrationWarning": "開始溫度校正前，請先確定鉻鐵頭正處於室溫！",
+    "UndervoltageString": "Undervoltage",
-		"SettingsResetWarning": "你是否確定要將全部設定重設到預設值？",
+    "InputVoltageString": "Input V: ",
-		"UVLOWarningString": "電壓過低",
+    "WarningTipTempString": "Tip temp: ",
-		"UndervoltageString": "Undervoltage",
+    "BadTipString": "BAD TIP",
-		"InputVoltageString": "Input V: ",
+    "SleepingSimpleString": "Zzzz",
-		"WarningTipTempString": "Tip temp: ",
+    "SleepingAdvancedString": "Sleeping...",
-		"BadTipString": "BAD TIP",
+    "WarningSimpleString": "HOT!",
-		"SleepingSimpleString": "Zzzz",
+    "WarningAdvancedString": "!!! HOT TIP !!!",
-		"SleepingAdvancedString": "Sleeping...",
+    "SleepingTipAdvancedString": "Tip:",
-		"WarningSimpleString": "HOT!",
+    "IdleTipString": "Tip:",
-		"WarningAdvancedString": "!!! HOT TIP !!!",
+    "IdleSetString": " Set:",
-		"SleepingTipAdvancedString": "Tip:",
+    "TipDisconnectedString": "NO TIP",
-		"IdleTipString": "Tip:",
+    "SolderingAdvancedPowerPrompt": "Power: ",
-		"IdleSetString": " Set:",
+    "OffString": "關",
-		"TipDisconnectedString": "NO TIP",
+    "YourGainMessage": "Your gain:"
-		"SolderingAdvancedPowerPrompt": "Power: ",
+  },
-		"OffString": "關",
+  "messagesWarn": {
-		"YourGainMessage": "Your gain:"
+    "ResetOKMessage": "已重設！",
-	},
+    "SettingsResetMessage": "設定已被重設！",
-	"messagesWarn": {
+    "NoAccelerometerMessage": ["No accelerometer", "detected!"],
-		"ResetOKMessage": "已重設！",
+    "NoPowerDeliveryMessage": ["No USB-PD IC", "detected!"],
-		"SettingsResetMessage": "設定已被重設！",
+    "LockingKeysString": "已鎖定",
-		"NoAccelerometerMessage": [
+    "UnlockingKeysString": "已解除鎖定",
-			"No accelerometer",
+    "WarningKeysLockedString": "!按鍵鎖定!",
-			"detected!"
+    "WarningThermalRunaway": ["Thermal", "Runaway"],
-		],
+    "WarningThermalRunaway": ["Thermal", "Runaway"]
-		"NoPowerDeliveryMessage": [
+  },
-			"No USB-PD IC",
+  "characters": {
-			"detected!"
+    "SettingRightChar": "右",
-		],
+    "SettingLeftChar": "左",
-		"LockingKeysString": "已鎖定",
+    "SettingAutoChar": "自",
-		"UnlockingKeysString": "已解除鎖定",
+    "SettingOffChar": "關",
-		"WarningKeysLockedString": "!按鍵鎖定!"
+    "SettingSlowChar": "慢",
-	},
+    "SettingMediumChar": "中",
-	"characters": {
+    "SettingFastChar": "快",
-		"SettingRightChar": "右",
+    "SettingStartNoneChar": "無",
-		"SettingLeftChar": "左",
+    "SettingStartSolderingChar": "焊",
-		"SettingAutoChar": "自",
+    "SettingStartSleepChar": "待",
-		"SettingFastChar": "快",
+    "SettingStartSleepOffChar": "室",
-		"SettingSlowChar": "慢",
+    "SettingSensitivityOff": "關",
-		"SettingMediumChar": "中",
+    "SettingSensitivityLow": "低",
-		"SettingOffChar": "關",
+    "SettingSensitivityMedium": "中",
-		"SettingStartSolderingChar": "焊",
+    "SettingSensitivityHigh": "高",
-		"SettingStartSleepChar": "待",
+    "SettingLockDisableChar": "無",
-		"SettingStartSleepOffChar": "室",
+    "SettingLockBoostChar": "增",
-		"SettingStartNoneChar": "無",
+    "SettingLockFullChar": "全",
-		"SettingSensitivityOff": "關",
+    "SettingNAChar": "不適用"
-		"SettingSensitivityLow": "低",
+  },
-		"SettingSensitivityMedium": "中",
+  "menuGroups": {
-		"SettingSensitivityHigh": "高",
+    "PowerMenu": {
-		"SettingLockDisableChar": "無",
+      "text2": "電源設定",
-		"SettingLockBoostChar": "增",
+      "desc": "電源設定"
-		"SettingLockFullChar": "全",
+    },
-		"SettingNAChar": "不適用"
+    "SolderingMenu": {
-	},
+      "text2": "焊接設定",
-	"menuGroups": {
+      "desc": "焊接設定"
-		"PowerMenu": {
+    },
-			"text2": "電源設定",
+    "PowerSavingMenu": {
-			"desc": "電源設定"
+      "text2": "待機設定",
-		},
+      "desc": "自動待機省電設定"
-		"SolderingMenu": {
+    },
-			"text2": "焊接設定",
+    "UIMenu": {
-			"desc": "焊接設定"
+      "text2": "使用者介面",
-		},
+      "desc": "使用者介面設定"
-		"PowerSavingMenu": {
+    },
-			"text2": "待機設定",
+    "AdvancedMenu": {
-			"desc": "自動待機省電設定"
+      "text2": "進階設定",
-		},
+      "desc": "進階設定"
-		"UIMenu": {
+    }
-			"text2": "使用者介面",
+  },
-			"desc": "使用者介面設定"
+  "menuOptions": {
-		},
+    "DCInCutoff": {
-		"AdvancedMenu": {
+      "text2": "電源",
-			"text2": "進階設定",
+      "desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每顆3.3V計算；此設定會停用功率限制>"
-			"desc": "進階設定"
+    },
-		}
+    "SleepTemperature": {
-	},
+      "text2": "待機溫度",
-	"menuOptions": {
+      "desc": "於待機模式時的鉻鐵頭溫度"
-		"DCInCutoff": {
+    },
-			"text2": "電源",
+    "SleepTimeout": {
-			"desc": "輸入電源；設定自動停機電壓 <DC 10V> <S 鋰電池，以每顆3.3V計算；此設定會停用功率限制>"
+      "text2": "待機延時",
-		},
+      "desc": "自動進入待機模式前的閒置等候時間 <S=秒 | M=分鐘>"
-		"SleepTemperature": {
+    },
-			"text2": "待機溫度",
+    "ShutdownTimeout": {
-			"desc": "於待機模式時的鉻鐵頭溫度"
+      "text2": "自動關機",
-		},
+      "desc": "自動關機前的閒置等候時間 <M=分鐘>"
-		"SleepTimeout": {
+    },
-			"text2": "待機延時",
+    "MotionSensitivity": {
-			"desc": "自動進入待機模式前的閒置等候時間 <S=秒 | M=分鐘>"
+      "text2": "動作敏感度",
-		},
+      "desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
-		"ShutdownTimeout": {
+    },
-			"text2": "自動關機",
+    "TemperatureUnit": {
-			"desc": "自動關機前的閒置等候時間 <M=分鐘>"
+      "text2": "溫標",
-		},
+      "desc": "C=攝氏 | F=華氏"
-		"MotionSensitivity": {
+    },
-			"text2": "動作敏感度",
+    "AdvancedIdle": {
-			"desc": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
+      "text2": "詳細閒置畫面",
-		},
+      "desc": "於閒置畫面以英文小字型顯示詳細資料"
-		"TemperatureUnit": {
+    },
-			"text2": "溫標",
+    "DisplayRotation": {
-			"desc": "C=攝氏 | F=華氏"
+      "text2": "畫面方向",
-		},
+      "desc": "右=使用右手 | 左=使用左手 | 自=自動"
-		"AdvancedIdle": {
+    },
-			"text2": "詳細閒置畫面",
+    "BoostTemperature": {
-			"desc": "於閒置畫面以英文小字型顯示詳細資料"
+      "text2": "增熱溫度",
-		},
+      "desc": "於增熱模式時使用的溫度"
-		"DisplayRotation": {
+    },
-			"text2": "畫面方向",
+    "AutoStart": {
-			"desc": "自=自動 | 左=使用左手 | 右=使用右手"
+      "text2": "自動啟用",
-		},
+      "desc": "開機時自動啟用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室溫待機>"
-		"BoostTemperature": {
+    },
-			"text2": "增熱溫度",
+    "CooldownBlink": {
-			"desc": "於增熱模式時使用的溫度"
+      "text2": "降溫時閃爍",
-		},
+      "desc": "停止加熱之後，當鉻鐵頭仍處於高溫時閃爍畫面"
-		"AutoStart": {
+    },
-			"text2": "自動啟用",
+    "TemperatureCalibration": {
-			"desc": "開機時自動啟用 <無=停用 | 焊=焊接模式 | 待=待機模式 | 室=室溫待機>"
+      "text2": "溫度校正？",
-		},
+      "desc": "開始校正鉻鐵頭溫度位移"
-		"CooldownBlink": {
+    },
-			"text2": "降溫時閃爍",
+    "SettingsReset": {
-			"desc": "停止加熱之後，當鉻鐵頭仍處於高溫時閃爍畫面"
+      "text2": "全部重設？",
-		},
+      "desc": "將所有設定重設到預設值"
-		"TemperatureCalibration": {
+    },
-			"text2": "溫度校正？",
+    "VoltageCalibration": {
-			"desc": "開始校正鉻鐵頭溫度位移"
+      "text2": "輸入電壓校正？",
-		},
+      "desc": "開始校正VIN輸入電壓 <長按以退出>"
-		"SettingsReset": {
+    },
-			"text2": "全部重設？",
+    "AdvancedSoldering": {
-			"desc": "將所有設定重設到預設值"
+      "text2": "詳細焊接畫面",
-		},
+      "desc": "於焊接模式畫面以英文小字型顯示詳細資料"
-		"VoltageCalibration": {
+    },
-			"text2": "輸入電壓校正？",
+    "ScrollingSpeed": {
-			"desc": "開始校正VIN輸入電壓 <長按以退出>"
+      "text2": "捲動速度",
-		},
+      "desc": "解說文字的捲動速度"
-		"AdvancedSoldering": {
+    },
-			"text2": "詳細焊接畫面",
+    "QCMaxVoltage": {
-			"desc": "於焊接模式畫面以英文小字型顯示詳細資料"
+      "text2": "QC電壓",
-		},
+      "desc": "使用QC電源時請求的最高目標電壓"
-		"ScrollingSpeed": {
+    },
-			"text2": "捲動速度",
+    "PDNegTimeout": {
-			"desc": "解說文字的捲動速度"
+      "text2": ["PD", "timeout"],
-		},
+      "desc": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-		"QCMaxVoltage": {
+    },
-			"text2": "QC電壓",
+    "PowerLimit": {
-			"desc": "使用QC電源時請求的最高目標電壓"
+      "text2": "功率限制",
-		},
+      "desc": "限制鉻鐵可用的最大功率 <W=watt（瓦特）>"
-		"PowerLimit": {
+    },
-			"text2": "功率限制",
+    "ReverseButtonTempChange": {
-			"desc": "限制鉻鐵可用的最大功率 <W=watt（瓦特）>"
+      "text2": "調換加減鍵",
-		},
+      "desc": "調校溫度時調換加減鍵的方向"
-		"ReverseButtonTempChange": {
+    },
-			"text2": "調換加減鍵",
+    "TempChangeShortStep": {
-			"desc": "調校溫度時調換加減鍵的方向"
+      "text2": "溫度調整 短",
-		},
+      "desc": "調校溫度時短按一下的溫度變幅"
-		"TempChangeShortStep": {
+    },
-			"text2": "溫度調整 短",
+    "TempChangeLongStep": {
-			"desc": "調校溫度時短按一下的溫度變幅"
+      "text2": "溫度調整 長",
-		},
+      "desc": "調校溫度時長按按鍵的溫度變幅"
-		"TempChangeLongStep": {
+    },
-			"text2": "溫度調整 長",
+    "PowerPulsePower": {
-			"desc": "調校溫度時長按按鍵的溫度變幅"
+      "text2": "電源脈衝",
-		},
+      "desc": "為保持電源喚醒而通電所用的功率 <watt（瓦特）>"
-		"PowerPulsePower": {
+    },
-			"text2": "電源脈衝",
+    "HallEffSensitivity": {
-			"desc": "為保持電源喚醒而通電所用的功率 <watt（瓦特）>"
+      "text2": "磁場敏感度",
-		},
+      "desc": "磁場感應器用作啟動待機模式的敏感度 <關=停用 | 低=最低敏感度 | 中=中等敏感度 | 高=最高敏感度>"
-		"HallEffSensitivity": {
+    },
-			"text2": "磁場敏感度",
+    "LockingMode": {
-			"desc": "磁場感應器用作啟動待機模式的敏感度 <關=停用 | 低=最低敏感度 | 中=中等敏感度 | 高=最高敏感度>"
+      "text2": "按鍵鎖定",
-		},
+      "desc": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=只容許增熱模式 | 全=鎖定全部>"
-		"LockingMode": {
+    },
-			"text2": "按鍵鎖定",
+    "MinVolCell": {
-			"desc": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=只容許增熱模式 | 全=鎖定全部>"
+      "text2": "最低電壓",
-		},
+      "desc": "每顆電池的最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
-		"MinVolCell": {
+    },
-			"text2": "最低電壓",
+    "AnimLoop": {
-			"desc": "每顆電池的最低可用電壓 <伏特> <3S: 3.0V - 3.7V, 4/5/6S: 2.4V - 3.7V>"
+      "text2": "動畫循環",
-		},
+      "desc": "循環顯示功能表圖示動畫"
-		"AnimLoop": {
+    },
-			"text2": "動畫循環",
+    "AnimSpeed": {
-			"desc": "循環顯示功能表圖示動畫"
+      "text2": "動畫速度",
-		},
+      "desc": "功能表圖示動畫的速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
-		"AnimSpeed": {
+    },
-			"text2": "動畫速度",
+    "PowerPulseWait": {
-			"desc": "功能表圖示動畫的速度 <關=不顯示動畫 | 慢=慢速 | 中=中速 | 快=快速>"
+      "text2": "電源脈衝間隔",
-		},
+      "desc": "為保持電源喚醒，每次通電之間的間隔時間 <x2.5s（秒）>"
-		"PowerPulseWait": {
+    },
-			"text2": "電源脈衝間隔",
+    "PowerPulseDuration": {
-			"desc": "為保持電源喚醒，每次通電之間的間隔時間 <x2.5s（秒）>"
+      "text2": "電源脈衝時長",
-		},
+      "desc": "為保持電源喚醒，每次通電脈衝的時間長度 <x250ms（亳秒）>"
-		"PowerPulseDuration": {
+    },
-			"text2": "電源脈衝時長",
+    "LanguageSwitch": {
-			"desc": "為保持電源喚醒，每次通電脈衝的時間長度 <x250ms（亳秒）>"
+      "text2": "語言：正體中文",
-		},
+      "desc": ""
-		"LanguageSwitch": {
+    },
-			"text2": "語言：正體中文",
+    "Brightness": {
-			"desc": ""
+      "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/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,12 +1,12 @@
 #!/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
 
-#Download source files to cache folder
+# Download source files to cache folder
 # Remember if these are updated, you need to update the md5 file respectively
 # Github checks out under $GITHUB_WORKSPACE
 MDPATH=${GITHUB_WORKSPACE:-/build/source/}
@@ -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

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

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/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,9 +1,9 @@
 #include "BSP.h"
 #include "BSP_Power.h"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "QC3.h"
 #include "Settings.h"
+#include "configuration.h"
 #include "fusb_user.h"
 #include "fusbpd.h"
 #include "int_n.h"
@@ -16,7 +16,7 @@ void power_check() {
   if (FUSB302_present) {
     PolicyEngine::PPSTimerCallback();
     // Cant start QC until either PD works or fails
-    if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+    if (PolicyEngine::setupCompleteOrTimedOut(getSettingValue(SettingsOptions::PDNegTimeout)) == false) {
       return;
     }
     if (PolicyEngine::pdHasNegotiated()) {

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

@@ -1897,18 +1897,22 @@ extern "C" {
 #define COMP_LOCK  __HAL_COMP_LOCK
 
 #if defined(STM32F301x8) || defined(STM32F302x8) || defined(STM32F318xx) || defined(STM32F303x8) || defined(STM32F334x8) || defined(STM32F328xx)
-#define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                   \
+#define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_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() \
-#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                   \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
+#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-#define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                   \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_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_ENABLE(__EXTILINE__)                                     \
-#define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                   \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_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())
 #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__) \
@@ -1919,134 +1923,112 @@ extern "C" {
   (((__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())
 #endif
 #if defined(STM32F302xE) || defined(STM32F302xC)
-#define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                         \
+#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) ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
-#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                         \
+#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) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
-#define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                         \
+#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) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
-#define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                         \
+#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) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
-#define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                       \
+#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) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
-#define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                       \
+#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) ? __HAL_COMP_COMP2_EXTI_DISABLE_IT() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() : __HAL_COMP_COMP6_EXTI_DISABLE_IT())
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_IT())
-#define __HAL_COMP_EXTI_GET_FLAG(__FLAG__) \
+#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() \
-#define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__) \
+                                          : __HAL_COMP_COMP6_EXTI_GET_FLAG())
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)      \
+#define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                   \
-       ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG()  \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_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_COMP2) ? __HAL_COMP_COMP2_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__)                                                                                                                                           \
+#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_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                          \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_RISING_EDGE() \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_RISING_EDGE()                                                                                                                                  \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE()                                                                                       \
+                                              : __HAL_COMP_COMP7_EXTI_ENABLE_RISING_EDGE())
-                                                              : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_RISING_EDGE()                                            \
+#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
-                                                                                                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE() \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE() \
-                                                                                                                                                    : __HAL_COMP_COMP7_EXTI_ENABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                                                                                                                           \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_RISING_EDGE() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                       \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_RISING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                 \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE()                                                                                                                                        \
+                                              : __HAL_COMP_COMP7_EXTI_DISABLE_RISING_EDGE())
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                           \
+#define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                     \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_RISING_EDGE()                                                                                                                                  \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE()                                                                                       \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-                                                              : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_RISING_EDGE()                                            \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_FALLING_EDGE() \
-                                                                                                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
-                                                                                                                                                    : __HAL_COMP_COMP7_EXTI_DISABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_FALLING_EDGE() \
-#define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                                                                                                                           \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                       \
+                                              : __HAL_COMP_COMP7_EXTI_ENABLE_FALLING_EDGE())
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                              \
+#define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                     \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                 \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                           \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_FALLING_EDGE() \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                  \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE()                                                                                       \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_FALLING_EDGE() \
-                                                              : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_FALLING_EDGE()                                            \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE() \
-                                                                                                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP7_EXTI_DISABLE_FALLING_EDGE())
-                                                                                                                                                    : __HAL_COMP_COMP7_EXTI_ENABLE_FALLING_EDGE())
+#define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                   \
-#define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                                                                                                                           \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_IT() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_IT() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                  \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_IT() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                            \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_IT() \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                  \
+                                              : __HAL_COMP_COMP7_EXTI_ENABLE_IT())
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE()                                                                                       \
+#define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                   \
-                                                              : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_FALLING_EDGE()                                            \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_IT() \
-                                                                                                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_IT() \
-                                                                                                                                                    : __HAL_COMP_COMP7_EXTI_DISABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_IT() \
-#define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                                         \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                             \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_IT()                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_IT() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                       \
+                                              : __HAL_COMP_COMP7_EXTI_DISABLE_IT())
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_IT()                                                        \
+#define __HAL_COMP_EXTI_GET_FLAG(__FLAG__)                                   \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                 \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_GET_FLAG() \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_IT()                                                  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_GET_FLAG() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4)                                           \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_GET_FLAG() \
-                         ? __HAL_COMP_COMP4_EXTI_ENABLE_IT()                                            \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_GET_FLAG() \
-                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_IT() \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_GET_FLAG() \
-                                                                    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_IT() : __HAL_COMP_COMP7_EXTI_ENABLE_IT())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_GET_FLAG() \
-#define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                                         \
+                                          : __HAL_COMP_COMP7_EXTI_GET_FLAG())
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                              \
+#define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                   \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_IT()                                                              \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                        \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_IT()                                                        \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_CLEAR_FLAG() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_IT()                                                  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_CLEAR_FLAG() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4)                                            \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_CLEAR_FLAG() \
-                         ? __HAL_COMP_COMP4_EXTI_DISABLE_IT()                                            \
+                                          : __HAL_COMP_COMP7_EXTI_CLEAR_FLAG())
-                         : ((__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())
-#define __HAL_COMP_EXTI_GET_FLAG(__FLAG__)                                                         \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)                                                            \
-       ? __HAL_COMP_COMP1_EXTI_GET_FLAG()                                                          \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2)                                                      \
-             ? __HAL_COMP_COMP2_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())
-#define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                                         \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)                                                              \
-       ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG()                                                          \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2)                                                        \
-             ? __HAL_COMP_COMP2_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())
 #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

@@ -53,112 +53,76 @@ extern "C" {
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer complete flag index.
  */
-#define __HAL_DMA_GET_TC_FLAG_INDEX(__HANDLE__)                                                                            \
+#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.
  * @param  __HANDLE__: DMA handle
  * @retval The specified half transfer complete flag index.
  */
-#define __HAL_DMA_GET_HT_FLAG_INDEX(__HANDLE__)                                                                            \
+#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.
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer error flag index.
  */
-#define __HAL_DMA_GET_TE_FLAG_INDEX(__HANDLE__)                                                                            \
+#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.
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer error flag index.
  */
-#define __HAL_DMA_GET_GI_FLAG_INDEX(__HANDLE__)                                                                            \
+#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.
@@ -200,68 +164,56 @@ extern "C" {
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer complete flag index.
  */
-#define __HAL_DMA_GET_TC_FLAG_INDEX(__HANDLE__)                                                             \
+#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))                      \
+                                                                       : DMA_FLAG_TC7)
-                         ? 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)
 
 /**
  * @brief  Return the current DMA Channel half transfer complete flag.
  * @param  __HANDLE__: DMA handle
  * @retval The specified half transfer complete flag index.
  */
-#define __HAL_DMA_GET_HT_FLAG_INDEX(__HANDLE__)                                                             \
+#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))                      \
+                                                                       : DMA_FLAG_HT7)
-                         ? 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)
 
 /**
  * @brief  Return the current DMA Channel transfer error flag.
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer error flag index.
  */
-#define __HAL_DMA_GET_TE_FLAG_INDEX(__HANDLE__)                                                             \
+#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))                      \
+                                                                       : DMA_FLAG_TE7)
-                         ? 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)
 
 /**
  * @brief  Return the current DMA Channel Global interrupt flag.
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer error flag index.
  */
-#define __HAL_DMA_GET_GI_FLAG_INDEX(__HANDLE__)                                                             \
+#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))                      \
+                                                                       : DMA_FLAG_GL7)
-                         ? 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)
 
 /**
  * @brief  Get the DMA Channel pending flags.

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

@@ -799,10 +799,14 @@ extern "C" {
 #elif defined(STM32F100xB) || defined(STM32F101xB) || defined(STM32F103xB) || defined(STM32F105xC) || defined(STM32F107xC)
 #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__) \
+#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

@@ -659,9 +659,10 @@ uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
 #define I2C_SPEED_STANDARD(__PCLK__, __SPEED__)             ((I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U) < 4U) ? 4U : I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U))
 #define I2C_SPEED_FAST(__PCLK__, __SPEED__, __DUTYCYCLE__) \
   (((__DUTYCYCLE__) == I2C_DUTYCYCLE_2) ? I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 3U) : (I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 25U) | I2C_DUTYCYCLE_16_9))
-#define I2C_SPEED(__PCLK__, __SPEED__, __DUTYCYCLE__)                       \
+#define I2C_SPEED(__PCLK__, __SPEED__, __DUTYCYCLE__)                                                                                 \
-  (((__SPEED__) <= 100000U) ? (I2C_SPEED_STANDARD((__PCLK__), (__SPEED__))) \
+  (((__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

@@ -1374,11 +1374,11 @@ mode.
  *            @arg TIM_ICPSC_DIV4: capture is done once every 4 events
  *            @arg TIM_ICPSC_DIV8: capture is done once every 8 events
  */
-#define __HAL_TIM_GET_ICPRESCALER(__HANDLE__, __CHANNEL__)                                             \
+#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_2) ? (((__HANDLE__)->Instance->CCMR1 & TIM_CCMR1_IC2PSC) >> 8U) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 & TIM_CCMR2_IC3PSC)         \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 & TIM_CCMR2_IC3PSC) : (((__HANDLE__)->Instance->CCMR2 & TIM_CCMR2_IC4PSC)) >> 8U)
+                                      : (((__HANDLE__)->Instance->CCMR2 & TIM_CCMR2_IC4PSC)) >> 8U)
 
 /**
  * @brief  Set the TIM Capture Compare Register value on runtime without calling another time ConfigChannel function.
@@ -1392,11 +1392,11 @@ mode.
  * @param  __COMPARE__ specifies the Capture Compare register new value.
  * @retval None
  */
-#define __HAL_TIM_SET_COMPARE(__HANDLE__, __CHANNEL__, __COMPARE__)                        \
+#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_2) ? ((__HANDLE__)->Instance->CCR2 = (__COMPARE__)) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCR3 = (__COMPARE__)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCR3 = (__COMPARE__)) : ((__HANDLE__)->Instance->CCR4 = (__COMPARE__)))
+                                      : ((__HANDLE__)->Instance->CCR4 = (__COMPARE__)))
 
 /**
  * @brief  Get the TIM Capture Compare Register value on runtime.
@@ -1409,10 +1409,11 @@ mode.
  *            @arg TIM_CHANNEL_4: get capture/compare 4 register value
  * @retval 16-bit or 32-bit value of the capture/compare register (TIMx_CCRy)
  */
-#define __HAL_TIM_GET_COMPARE(__HANDLE__, __CHANNEL__) \
+#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.
@@ -1425,11 +1426,11 @@ mode.
  *            @arg TIM_CHANNEL_4: TIM Channel 4 selected
  * @retval None
  */
-#define __HAL_TIM_ENABLE_OCxPRELOAD(__HANDLE__, __CHANNEL__)                                   \
+#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_2) ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC2PE) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC3PE) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC3PE) : ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC4PE))
+                                      : ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC4PE))
 
 /**
  * @brief  Reset the TIM Output compare preload.
@@ -1442,11 +1443,11 @@ mode.
  *            @arg TIM_CHANNEL_4: TIM Channel 4 selected
  * @retval None
  */
-#define __HAL_TIM_DISABLE_OCxPRELOAD(__HANDLE__, __CHANNEL__)                                   \
+#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_2) ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_OC2PE) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC3PE) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC3PE) : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC4PE))
+                                      : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC4PE))
 
 /**
  * @brief  Enable fast mode for a given channel.
@@ -1463,11 +1464,11 @@ mode.
  * @note  Fast mode acts only if the channel is configured in PWM1 or PWM2 mode.
  * @retval None
  */
-#define __HAL_TIM_ENABLE_OCxFAST(__HANDLE__, __CHANNEL__)                                      \
+#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_2) ? ((__HANDLE__)->Instance->CCMR1 |= TIM_CCMR1_OC2FE) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC3FE) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC3FE) : ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC4FE))
+                                      : ((__HANDLE__)->Instance->CCMR2 |= TIM_CCMR2_OC4FE))
 
 /**
  * @brief  Disable fast mode for a given channel.
@@ -1484,11 +1485,11 @@ mode.
  *        trigger input is 5 clock cycles.
  * @retval None
  */
-#define __HAL_TIM_DISABLE_OCxFAST(__HANDLE__, __CHANNEL__)                                      \
+#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_2) ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_OC2FE) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC3FE) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC3FE) : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC4FE))
+                                      : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_OC4FE))
 
 /**
  * @brief  Set the Update Request Source (URS) bit of the TIMx_CR1 register.
@@ -1691,40 +1692,41 @@ mode.
 
 #define IS_TIM_SLAVEMODE_TRIGGER_ENABLED(__TRIGGER__) ((__TRIGGER__) == TIM_SLAVEMODE_TRIGGER)
 
-#define TIM_SET_ICPRESCALERVALUE(__HANDLE__, __CHANNEL__, __ICPSC__)                               \
+#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_2) ? ((__HANDLE__)->Instance->CCMR1 |= ((__ICPSC__) << 8U)) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= (__ICPSC__))         \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 |= (__ICPSC__)) : ((__HANDLE__)->Instance->CCMR2 |= ((__ICPSC__) << 8U)))
+                                      : ((__HANDLE__)->Instance->CCMR2 |= ((__ICPSC__) << 8U)))
 
-#define TIM_RESET_ICPRESCALERVALUE(__HANDLE__, __CHANNEL__)                                      \
+#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_2) ? ((__HANDLE__)->Instance->CCMR1 &= ~TIM_CCMR1_IC2PSC) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_IC3PSC) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_IC3PSC) : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_IC4PSC))
+                                      : ((__HANDLE__)->Instance->CCMR2 &= ~TIM_CCMR2_IC4PSC))
 
-#define TIM_SET_CAPTUREPOLARITY(__HANDLE__, __CHANNEL__, __POLARITY__)                               \
+#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_2) ? ((__HANDLE__)->Instance->CCER |= ((__POLARITY__) << 4U)) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCER |= ((__POLARITY__) << 8U)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCER |= ((__POLARITY__) << 8U)) : ((__HANDLE__)->Instance->CCER |= (((__POLARITY__) << 12U))))
+                                      : ((__HANDLE__)->Instance->CCER |= (((__POLARITY__) << 12U))))
 
-#define TIM_RESET_CAPTUREPOLARITY(__HANDLE__, __CHANNEL__)                                                      \
+#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_2) ? ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC2P | TIM_CCER_CC2NP)) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC3P))                  \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC3P)) : ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC4P)))
+                                      : ((__HANDLE__)->Instance->CCER &= ~(TIM_CCER_CC4P)))
 
-#define TIM_CHANNEL_STATE_GET(__HANDLE__, __CHANNEL__) \
+#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__)                         \
+#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_2) ? ((__HANDLE__)->ChannelState[1] = (__CHANNEL_STATE__)) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->ChannelState[2] = (__CHANNEL_STATE__)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->ChannelState[2] = (__CHANNEL_STATE__)) : ((__HANDLE__)->ChannelState[3] = (__CHANNEL_STATE__)))
+                                      : ((__HANDLE__)->ChannelState[3] = (__CHANNEL_STATE__)))
 
 #define TIM_CHANNEL_STATE_SET_ALL(__HANDLE__, __CHANNEL_STATE__) \
   do {                                                           \
@@ -1734,16 +1736,17 @@ mode.
     (__HANDLE__)->ChannelState[3] = (__CHANNEL_STATE__);         \
   } while (0)
 
-#define TIM_CHANNEL_N_STATE_GET(__HANDLE__, __CHANNEL__) \
+#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__)                        \
+#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_2) ? ((__HANDLE__)->ChannelNState[1] = (__CHANNEL_STATE__)) \
+   : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->ChannelNState[2] = (__CHANNEL_STATE__)) \
-                                          : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->ChannelNState[2] = (__CHANNEL_STATE__)) : ((__HANDLE__)->ChannelNState[3] = (__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
+#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 tipResistance            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,4 +1,4 @@
-#include "Model_Config.h"
+#include "configuration.h"
 #ifdef POW_PD
 #include "BSP.h"
 #include "I2C_Wrapper.hpp"

source/Core/BSP/MHP30/preRTOS.cpp

@@ -7,11 +7,12 @@
 
 #include "BSP.h"
 #include "I2CBB.hpp"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "Setup.h"
+#include "configuration.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,9 +21,7 @@ uint16_t totalPWM; // htim2.Init.Period, the full PWM cycle
 
 static bool fastPWM;
 
-// 2 second filter (ADC is PID_TIM_HZ Hz)
+void resetWatchdog() { HAL_IWDG_Refresh(&hiwdg); }
-history<uint16_t, PID_TIM_HZ> rawTempFilter = {{0}, 0, 0};
-void                          resetWatchdog() { HAL_IWDG_Refresh(&hiwdg); }
 #ifdef TEMP_NTC
 // Lookup table for the NTC
 // Stored as ADCReading,Temp in degC
@@ -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,116 +119,50 @@ 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) {
-// ADC maximum is 32767 == 3.3V at input == 28.05V at VIN
+  // ADC maximum is 32767 == 3.3V at input == 28.05V at VIN
-// Therefore we can divide down from there
+  // Therefore we can divide down from there
-// Multiplying ADC max by 4 for additional calibration options,
+  // Multiplying ADC max by 4 for additional calibration options,
-// ideal term is 467
+  // 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) {
-  fastPWM             = true;
+  // 10Hz
-  totalPWM            = powerPWM + tempMeasureTicks * 2 + holdoffTicks;
+  fastPWM              = true;
-  htim2.Instance->ARR = totalPWM;
+  totalPWM             = powerPWM + tempMeasureTicks + holdoffTicks;
-  // ~3.5 Hz rate
+  htim2.Instance->ARR  = totalPWM;
-  htim2.Instance->CCR1 = powerPWM + holdoffTicks * 2;
+  htim2.Instance->CCR1 = powerPWM + holdoffTicks;
-  // 2 MHz timer clock/2000 = 1 kHz tick rate
+  htim2.Instance->PSC  = 2690;
-  htim2.Instance->PSC = 2000;
 }
 
 static void switchToSlowPWM(void) {
-  fastPWM             = false;
+  // 5Hz
-  totalPWM            = powerPWM + tempMeasureTicks + holdoffTicks;
+  fastPWM              = false;
-  htim2.Instance->ARR = totalPWM;
+  totalPWM             = powerPWM + tempMeasureTicks / 2 + holdoffTicks / 2;
-  // ~1.84 Hz rate
+  htim2.Instance->ARR  = totalPWM;
-  htim2.Instance->CCR1 = powerPWM + holdoffTicks;
+  htim2.Instance->CCR1 = powerPWM + holdoffTicks / 2;
-  // 2 MHz timer clock/4000 = 500 Hz tick rate
+  htim2.Instance->PSC  = 2690 * 2;
-  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
+      switchToFastPWM();
-    // allow for some reasonable hysteresis by switching only when it goes
+    } else {
-    // below 230 (equivalent to 245 in fast mode)
+      switchToSlowPWM();
-    switchToFastPWM();
+    }
-    return true;
   }
-  return false;
 }
-
 // These are called by the HAL after the corresponding events from the system
 // timers.
 

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
 

source/Core/BSP/Miniware/Power.cpp

@@ -1,9 +1,9 @@
 #include "BSP.h"
 #include "BSP_Power.h"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "QC3.h"
 #include "Settings.h"
+#include "configuration.h"
 #include "fusb_user.h"
 #include "fusbpd.h"
 #include "int_n.h"
@@ -16,7 +16,7 @@ void power_check() {
   if (FUSB302_present) {
     PolicyEngine::PPSTimerCallback();
     // Cant start QC until either PD works or fails
-    if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+    if (PolicyEngine::setupCompleteOrTimedOut(getSettingValue(SettingsOptions::PDNegTimeout)) == false) {
       return;
     }
     if (PolicyEngine::pdHasNegotiated()) {

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
+#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(&hadc1);                                                 // enable injected readings
+  HAL_ADCEx_InjectedStart(&hadc2);                                   // 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};
-  uint32_t sum = 0;
+  if (sample) {
-  for (uint8_t i = 0; i < ADC_SAMPLES; i++) {
+    uint32_t sum = 0;
-    uint16_t adc1Sample = ADCReadings[channel + (i * ADC_CHANNELS)];
+    for (uint8_t i = 0; i < ADC_SAMPLES; i++) {
-    uint16_t adc2Sample = ADCReadings[channel + (i * ADC_CHANNELS)] >> 16;
+      sum += ADCReadings[i];
-
+    }
-    sum += (adc1Sample + adc2Sample);
+    filter.update(sum);
   }
-  return sum >> 2;
+  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,9 +27,9 @@ 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
+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
 

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

@@ -1422,18 +1422,22 @@ extern "C" {
 #define COMP_LOCK  __HAL_COMP_LOCK
 
 #if defined(STM32F301x8) || defined(STM32F302x8) || defined(STM32F318xx) || defined(STM32F303x8) || defined(STM32F334x8) || defined(STM32F328xx)
-#define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                   \
+#define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                     \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_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() \
-#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                   \
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
+#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-#define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                   \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_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_ENABLE(__EXTILINE__)                                     \
-#define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                   \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2)   ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
-                                            : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_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())
 #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__) \
@@ -1444,134 +1448,112 @@ extern "C" {
   (((__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())
 #endif
 #if defined(STM32F302xE) || defined(STM32F302xC)
-#define __HAL_COMP_EXTI_RISING_IT_ENABLE(__EXTILINE__)                                         \
+#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) ? __HAL_COMP_COMP2_EXTI_ENABLE_RISING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE())
-#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                         \
+#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) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE())
-#define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                         \
+#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) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE())
-#define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                         \
+#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) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE())
-#define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                       \
+#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) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
+                                              : __HAL_COMP_COMP6_EXTI_ENABLE_IT())
-#define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                       \
+#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) ? __HAL_COMP_COMP2_EXTI_DISABLE_IT() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() \
-                                                  : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() : __HAL_COMP_COMP6_EXTI_DISABLE_IT())
+                                              : __HAL_COMP_COMP6_EXTI_DISABLE_IT())
-#define __HAL_COMP_EXTI_GET_FLAG(__FLAG__) \
+#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() \
-#define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__) \
+                                          : __HAL_COMP_COMP6_EXTI_GET_FLAG())
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)      \
+#define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                   \
-       ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG()  \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_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_COMP2) ? __HAL_COMP_COMP2_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__)                                                                                                                                           \
+#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_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                          \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_RISING_EDGE() \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_RISING_EDGE()                                                                                                                                  \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_RISING_EDGE()                                                                                       \
+                                              : __HAL_COMP_COMP7_EXTI_ENABLE_RISING_EDGE())
-                                                              : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_RISING_EDGE()                                            \
+#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                     \
-                                                                                                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_RISING_EDGE() \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE() \
-                                                                                                                                                    : __HAL_COMP_COMP7_EXTI_ENABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE() \
-#define __HAL_COMP_EXTI_RISING_IT_DISABLE(__EXTILINE__)                                                                                                                                           \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_RISING_EDGE() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                       \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_RISING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_RISING_EDGE() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                 \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_RISING_EDGE()                                                                                                                                        \
+                                              : __HAL_COMP_COMP7_EXTI_DISABLE_RISING_EDGE())
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                           \
+#define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                     \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_RISING_EDGE()                                                                                                                                  \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_RISING_EDGE()                                                                                       \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE() \
-                                                              : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_RISING_EDGE()                                            \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_FALLING_EDGE() \
-                                                                                                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_RISING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE() \
-                                                                                                                                                    : __HAL_COMP_COMP7_EXTI_DISABLE_RISING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_FALLING_EDGE() \
-#define __HAL_COMP_EXTI_FALLING_IT_ENABLE(__EXTILINE__)                                                                                                                                           \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                       \
+                                              : __HAL_COMP_COMP7_EXTI_ENABLE_FALLING_EDGE())
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                              \
+#define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                     \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                 \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE() \
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                           \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_FALLING_EDGE() \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_FALLING_EDGE()                                                                                                                                  \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_FALLING_EDGE()                                                                                       \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_FALLING_EDGE() \
-                                                              : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_FALLING_EDGE()                                            \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE() \
-                                                                                                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_FALLING_EDGE() \
+                                              : __HAL_COMP_COMP7_EXTI_DISABLE_FALLING_EDGE())
-                                                                                                                                                    : __HAL_COMP_COMP7_EXTI_ENABLE_FALLING_EDGE())
+#define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                   \
-#define __HAL_COMP_EXTI_FALLING_IT_DISABLE(__EXTILINE__)                                                                                                                                           \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_ENABLE_IT() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                                                                                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_ENABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_ENABLE_IT() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                                                                                                                  \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_ENABLE_IT() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                        \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_IT() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                                                                                                            \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_IT() \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_FALLING_EDGE()                                                                                                                                  \
+                                              : __HAL_COMP_COMP7_EXTI_ENABLE_IT())
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_FALLING_EDGE()                                                                                       \
+#define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                   \
-                                                              : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_FALLING_EDGE()                                            \
+  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_DISABLE_IT() \
-                                                                                                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_FALLING_EDGE() \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_DISABLE_IT() \
-                                                                                                                                                    : __HAL_COMP_COMP7_EXTI_DISABLE_FALLING_EDGE())
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_DISABLE_IT() \
-#define __HAL_COMP_EXTI_ENABLE_IT(__EXTILINE__)                                                         \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_DISABLE_IT() \
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                             \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_DISABLE_IT() \
-       ? __HAL_COMP_COMP1_EXTI_ENABLE_IT()                                                              \
+   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_DISABLE_IT() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                       \
+                                              : __HAL_COMP_COMP7_EXTI_DISABLE_IT())
-             ? __HAL_COMP_COMP2_EXTI_ENABLE_IT()                                                        \
+#define __HAL_COMP_EXTI_GET_FLAG(__FLAG__)                                   \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                 \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_GET_FLAG() \
-                   ? __HAL_COMP_COMP3_EXTI_ENABLE_IT()                                                  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_GET_FLAG() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4)                                           \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_GET_FLAG() \
-                         ? __HAL_COMP_COMP4_EXTI_ENABLE_IT()                                            \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_GET_FLAG() \
-                         : ((__EXTILINE__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_ENABLE_IT() \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_GET_FLAG() \
-                                                                    : ((__EXTILINE__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_ENABLE_IT() : __HAL_COMP_COMP7_EXTI_ENABLE_IT())
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_GET_FLAG() \
-#define __HAL_COMP_EXTI_DISABLE_IT(__EXTILINE__)                                                         \
+                                          : __HAL_COMP_COMP7_EXTI_GET_FLAG())
-  (((__EXTILINE__) == COMP_EXTI_LINE_COMP1)                                                              \
+#define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                   \
-       ? __HAL_COMP_COMP1_EXTI_DISABLE_IT()                                                              \
+  (((__FLAG__) == COMP_EXTI_LINE_COMP1)   ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG() \
-       : ((__EXTILINE__) == COMP_EXTI_LINE_COMP2)                                                        \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP2) ? __HAL_COMP_COMP2_EXTI_CLEAR_FLAG() \
-             ? __HAL_COMP_COMP2_EXTI_DISABLE_IT()                                                        \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP3) ? __HAL_COMP_COMP3_EXTI_CLEAR_FLAG() \
-             : ((__EXTILINE__) == COMP_EXTI_LINE_COMP3)                                                  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP4) ? __HAL_COMP_COMP4_EXTI_CLEAR_FLAG() \
-                   ? __HAL_COMP_COMP3_EXTI_DISABLE_IT()                                                  \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP5) ? __HAL_COMP_COMP5_EXTI_CLEAR_FLAG() \
-                   : ((__EXTILINE__) == COMP_EXTI_LINE_COMP4)                                            \
+   : ((__FLAG__) == COMP_EXTI_LINE_COMP6) ? __HAL_COMP_COMP6_EXTI_CLEAR_FLAG() \
-                         ? __HAL_COMP_COMP4_EXTI_DISABLE_IT()                                            \
+                                          : __HAL_COMP_COMP7_EXTI_CLEAR_FLAG())
-                         : ((__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())
-#define __HAL_COMP_EXTI_GET_FLAG(__FLAG__)                                                         \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)                                                            \
-       ? __HAL_COMP_COMP1_EXTI_GET_FLAG()                                                          \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2)                                                      \
-             ? __HAL_COMP_COMP2_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())
-#define __HAL_COMP_EXTI_CLEAR_FLAG(__FLAG__)                                                         \
-  (((__FLAG__) == COMP_EXTI_LINE_COMP1)                                                              \
-       ? __HAL_COMP_COMP1_EXTI_CLEAR_FLAG()                                                          \
-       : ((__FLAG__) == COMP_EXTI_LINE_COMP2)                                                        \
-             ? __HAL_COMP_COMP2_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())
 #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

@@ -69,112 +69,76 @@ extern "C" {
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer complete flag index.
  */
-#define __HAL_DMA_GET_TC_FLAG_INDEX(__HANDLE__)                                                                            \
+#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.
  * @param  __HANDLE__: DMA handle
  * @retval The specified half transfer complete flag index.
  */
-#define __HAL_DMA_GET_HT_FLAG_INDEX(__HANDLE__)                                                                            \
+#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.
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer error flag index.
  */
-#define __HAL_DMA_GET_TE_FLAG_INDEX(__HANDLE__)                                                                            \
+#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.
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer error flag index.
  */
-#define __HAL_DMA_GET_GI_FLAG_INDEX(__HANDLE__)                                                                            \
+#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.
@@ -216,68 +180,56 @@ extern "C" {
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer complete flag index.
  */
-#define __HAL_DMA_GET_TC_FLAG_INDEX(__HANDLE__)                                                             \
+#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))                      \
+                                                                       : DMA_FLAG_TC7)
-                         ? 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)
 
 /**
  * @brief  Return the current DMA Channel half transfer complete flag.
  * @param  __HANDLE__: DMA handle
  * @retval The specified half transfer complete flag index.
  */
-#define __HAL_DMA_GET_HT_FLAG_INDEX(__HANDLE__)                                                             \
+#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))                      \
+                                                                       : DMA_FLAG_HT7)
-                         ? 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)
 
 /**
  * @brief  Return the current DMA Channel transfer error flag.
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer error flag index.
  */
-#define __HAL_DMA_GET_TE_FLAG_INDEX(__HANDLE__)                                                             \
+#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))                      \
+                                                                       : DMA_FLAG_TE7)
-                         ? 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)
 
 /**
  * @brief  Return the current DMA Channel Global interrupt flag.
  * @param  __HANDLE__: DMA handle
  * @retval The specified transfer error flag index.
  */
-#define __HAL_DMA_GET_GI_FLAG_INDEX(__HANDLE__)                                                             \
+#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))                      \
+                                                                       : DMA_FLAG_GL7)
-                         ? 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)
 
 /**
  * @brief  Get the DMA Channel pending flags.

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

@@ -577,9 +577,10 @@ uint32_t             HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
 #define I2C_SPEED_STANDARD(__PCLK__, __SPEED__)             ((I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U) < 4U) ? 4U : I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 2U))
 #define I2C_SPEED_FAST(__PCLK__, __SPEED__, __DUTYCYCLE__) \
   (((__DUTYCYCLE__) == I2C_DUTYCYCLE_2) ? I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 3U) : (I2C_CCR_CALCULATION((__PCLK__), (__SPEED__), 25U) | I2C_DUTYCYCLE_16_9))
-#define I2C_SPEED(__PCLK__, __SPEED__, __DUTYCYCLE__)                       \
+#define I2C_SPEED(__PCLK__, __SPEED__, __DUTYCYCLE__)                                                                                 \
-  (((__SPEED__) <= 100000U) ? (I2C_SPEED_STANDARD((__PCLK__), (__SPEED__))) \
+  (((__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,69 +46,31 @@ 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 */
 
   uint32_t IC1Prescaler; /*!< Specifies the Input Capture Prescaler.
                               This parameter can be a value of @ref TIM_Input_Capture_Prescaler */
 
-  uint32_t IC1Filter;         /*!< Specifies the input capture filter.
+  uint32_t IC1Filter; /*!< Specifies the input capture filter.
-                                   This parameter can be a number between Min_Data = 0x0 and Max_Data = 0xF */
+                           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,54 +78,38 @@ 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__)                                                                                                             \
+/* End of exported macro -----------------------------------------------------*/
-  (((__CHANNEL__) == TIM_CHANNEL_1) ? ((__HANDLE__)->Instance->CCMR1 &= (uint16_t)~TIM_CCMR1_OC1PE)                                                                       \
+
-                                    : ((__CHANNEL__) == TIM_CHANNEL_2) ? ((__HANDLE__)->Instance->CCMR1 &= (uint16_t)~TIM_CCMR1_OC2PE)                                    \
+/* Private macro -------------------------------------------------------------*/
-                                                                       : ((__CHANNEL__) == TIM_CHANNEL_3) ? ((__HANDLE__)->Instance->CCMR2 &= (uint16_t)~TIM_CCMR2_OC3PE) \
+/** @defgroup TIMEx_Private_Macros TIM Extended Private Macros
-                                                                                                          : ((__HANDLE__)->Instance->CCMR2 &= (uint16_t)~TIM_CCMR2_OC4PE))
+ * @{
+ */
+
+/**
+ * @}
+ */
+/* End of private macro ------------------------------------------------------*/
 
 /* Exported functions --------------------------------------------------------*/
-/** @addtogroup TIMEx_Exported_Functions
+/** @addtogroup TIMEx_Exported_Functions TIM Extended Exported Functions
  * @{
  */
 
-/** @addtogroup TIMEx_Exported_Functions_Group1
+/** @addtogroup TIMEx_Exported_Functions_Group1 Extended Timer Hall Sensor functions
+ *  @brief    Timer Hall Sensor functions
  * @{
  */
-/* Timer Hall Sensor functions  **********************************************/
+/*  Timer Hall Sensor functions  **********************************************/
 HAL_StatusTypeDef HAL_TIMEx_HallSensor_Init(TIM_HandleTypeDef *htim, TIM_HallSensor_InitTypeDef *sConfig);
 HAL_StatusTypeDef HAL_TIMEx_HallSensor_DeInit(TIM_HandleTypeDef *htim);
 
@@ -199,12 +129,11 @@ 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  *****************************/
+/*  Timer Complementary Output Compare functions  *****************************/
 /* Blocking mode: Polling */
 HAL_StatusTypeDef HAL_TIMEx_OCN_Start(TIM_HandleTypeDef *htim, uint32_t Channel);
 HAL_StatusTypeDef HAL_TIMEx_OCN_Stop(TIM_HandleTypeDef *htim, uint32_t Channel);
@@ -220,10 +149,11 @@ 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  ****************************************/
+/*  Timer Complementary PWM functions  ****************************************/
 /* Blocking mode: Polling */
 HAL_StatusTypeDef HAL_TIMEx_PWMN_Start(TIM_HandleTypeDef *htim, uint32_t Channel);
 HAL_StatusTypeDef HAL_TIMEx_PWMN_Stop(TIM_HandleTypeDef *htim, uint32_t Channel);
@@ -238,10 +168,11 @@ 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  **********************************/
+/*  Timer Complementary One Pulse functions  **********************************/
 /* Blocking mode: Polling */
 HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Start(TIM_HandleTypeDef *htim, uint32_t OutputChannel);
 HAL_StatusTypeDef HAL_TIMEx_OnePulseN_Stop(TIM_HandleTypeDef *htim, uint32_t OutputChannel);
@@ -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_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,10 @@
 #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 ACCEL_LIS
-#define SOLDERING_TEMP       320                     // Default soldering temp is 320.0 °C
+#define TEMP_TMP36
-#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 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 +154,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 +166,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
+#define ACCEL_LIS
+#define POW_QC
+#define TEMP_TMP36
+#define LIS_ORI_FLIP
+#define OLED_FLIP
 #endif
 
 #ifdef MODEL_TS80P
@@ -185,7 +179,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 +191,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
-#ifdef MODEL_MHP30
+#define POW_QC
-#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 tipResistance            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 tipResistance            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 tipResistance            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

source/Core/BSP/Miniware/fusb_user.cpp

@@ -1,4 +1,4 @@
-#include "Model_Config.h"
+#include "configuration.h"
 #ifdef POW_PD
 #include "BSP.h"
 #include "I2CBB.hpp"

source/Core/BSP/Miniware/preRTOS.cpp

@@ -7,11 +7,12 @@
 
 #include "BSP.h"
 #include "I2CBB.hpp"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "Setup.h"
+#include "configuration.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/stm32f1xx_hal_msp.c

@@ -38,8 +38,8 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc) {
     hdma_adc1.Init.Direction           = DMA_PERIPH_TO_MEMORY;
     hdma_adc1.Init.PeriphInc           = DMA_PINC_DISABLE;
     hdma_adc1.Init.MemInc              = DMA_MINC_ENABLE;
-    hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD;
+    hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
-    hdma_adc1.Init.MemDataAlignment    = DMA_MDATAALIGN_WORD;
+    hdma_adc1.Init.MemDataAlignment    = DMA_MDATAALIGN_HALFWORD;
     hdma_adc1.Init.Mode                = DMA_CIRCULAR;
     hdma_adc1.Init.Priority            = DMA_PRIORITY_MEDIUM;
     HAL_DMA_Init(&hdma_adc1);

source/Core/BSP/Pine64/BSP.cpp

@@ -12,36 +12,14 @@
 #include "main.hpp"
 
 const uint16_t powerPWM         = 255;
-const uint8_t  holdoffTicks     = 25; // delay of 7 ms
+const uint8_t  holdoffTicks     = 10;
-const uint8_t  tempMeasureTicks = 25;
+const uint8_t  tempMeasureTicks = 14;
 
-uint16_t totalPWM; // htim2.Init.Period, the full PWM cycle
+uint16_t totalPWM; // Total length of the cycle's ticks
 
-// 2 second filter (ADC is PID_TIM_HZ Hz)
+void resetWatchdog() { fwdgt_counter_reload(); }
-history<uint16_t, PID_TIM_HZ> rawTempFilter = {{0}, 0, 0};
-void                          resetWatchdog() { fwdgt_counter_reload(); }
 
-uint16_t getTipInstantTemperature() {
+uint16_t getHandleTemperature(uint8_t sample) {
-  volatile uint16_t sum = 0; // 12 bit readings * 8*2 -> 16 bits
-
-  for (int i = 0; i < 4; i++) {
-    sum += adc_inserted_data_read(ADC0, i);
-    sum += adc_inserted_data_read(ADC1, i);
-  }
-  return sum; // 8x over sample
-}
-
-uint16_t getTipRawTemp(uint8_t refresh) {
-  if (refresh) {
-    uint16_t lastSample = getTipInstantTemperature();
-    rawTempFilter.update(lastSample);
-    return lastSample;
-  } else {
-    return rawTempFilter.average();
-  }
-}
-
-uint16_t getHandleTemperature() {
 #ifdef TEMP_TMP36
   // We return the current handle temperature in X10 C
   // TMP36 in handle, 0.5V offset and then 10mV per deg C (0.75V @ 25C for
@@ -50,7 +28,7 @@ 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);
+  int32_t result = getADCHandleTemp(sample);
   result -= 4965; // remove 0.5V offset
   // 10mV per C
   // 99.29 counts per Deg C above 0C
@@ -58,33 +36,14 @@ uint16_t getHandleTemperature() {
   result /= 993;
   return result;
 #else
-#error
+#error Pinecil only uses TMP36
 #endif
 }
 uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
-
+  uint32_t res = getADCVin(sample);
-  static uint8_t  preFillneeded = 10;
+  res *= 4;
-  static uint32_t samples[BATTFILTERDEPTH];
+  res /= divisor;
-  static uint8_t  index = 0;
+  return res;
-  if (preFillneeded) {
-    for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
-      samples[i] = getADC(1);
-    preFillneeded--;
-  }
-  if (sample) {
-    samples[index] = getADC(1);
-    index          = (index + 1) % BATTFILTERDEPTH;
-  }
-  uint32_t sum = 0;
-
-  for (uint8_t i = 0; i < BATTFILTERDEPTH; i++)
-    sum += samples[i];
-
-  sum /= BATTFILTERDEPTH;
-  if (divisor == 0) {
-    divisor = 1;
-  }
-  return sum * 4 / divisor;
 }
 
 void unstick_I2C() {

source/Core/BSP/Pine64/Debug.cpp

@@ -22,7 +22,7 @@ void                    log_system_state(int32_t PWMWattsx10) {
 
     outputLength = snprintf(uartOutputBuffer, uartOutputBufferLength, "%lu,%u,%li,%u,%lu\r\n", //
                             TipThermoModel::getTipInC(false),                                  // Tip temp in C
-                            getHandleTemperature(),                                            // Handle temp in C X10
+                            getHandleTemperature(0),                                           // Handle temp in C X10
                             PWMWattsx10,                                                       // Output Wattage
                             pendingPWM,                                                        // PWM
                             TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0), true)       // Tip temp in uV

source/Core/BSP/Pine64/IRQ.cpp

@@ -18,6 +18,9 @@ volatile uint16_t i2c_nbytes;
 volatile uint16_t i2c_write_dress;
 volatile uint16_t i2c_read_dress;
 volatile uint8_t  i2c_process_flag = 0;
+static bool       fastPWM;
+static void       switchToSlowPWM(void);
+static void       switchToFastPWM(void);
 void              ADC0_1_IRQHandler(void) {
 
   adc_interrupt_flag_clear(ADC0, ADC_INT_FLAG_EOIC);
@@ -34,74 +37,58 @@ void              ADC0_1_IRQHandler(void) {
 volatile uint16_t PWMSafetyTimer = 0;
 volatile uint8_t  pendingPWM     = 0;
 void              TIMER1_IRQHandler(void) {
+  static bool lastPeriodWasFast = false;
 
   if (timer_interrupt_flag_get(TIMER1, TIMER_INT_UP) == SET) {
     timer_interrupt_flag_clear(TIMER1, TIMER_INT_UP);
     // rollover turn on output if required
-    if (PWMSafetyTimer && pendingPWM) {
-      timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 50);
-    }
     if (PWMSafetyTimer) {
       PWMSafetyTimer--;
+      if (lastPeriodWasFast != fastPWM) {
+        if (fastPWM) {
+          switchToFastPWM();
+        } else {
+          switchToSlowPWM();
+        }
+      }
+      if (pendingPWM) {
+        timer_channel_output_pulse_value_config(TIMER1, TIMER_CH_1, pendingPWM);
+        timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 50);
+      } else {
+        timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 0);
+      }
     }
   }
   if (timer_interrupt_flag_get(TIMER1, TIMER_INT_CH1) == SET) {
     timer_interrupt_flag_clear(TIMER1, TIMER_INT_CH1);
-    // This is triggered on pwm setpoint trigger; we want to copy the pending
-    // PWM value into the output control reg
-
     timer_channel_output_pulse_value_config(TIMER2, TIMER_CH_0, 0);
-    if (pendingPWM) {
-      timer_channel_output_pulse_value_config(TIMER1, TIMER_CH_1, pendingPWM);
-    }
   }
 }
 
-void setTipPWM(uint8_t pulse) {
+void switchToFastPWM(void) {
+  fastPWM           = true;
+  totalPWM          = powerPWM + tempMeasureTicks + holdoffTicks;
+  TIMER_CAR(TIMER1) = (uint32_t)totalPWM;
+
+  // ~10Hz
+  TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks;
+  // 1 kHz tick rate
+  TIMER_PSC(TIMER1) = 18000;
+}
+
+void switchToSlowPWM(void) {
+  // 5Hz
+  fastPWM             = false;
+  totalPWM            = powerPWM + tempMeasureTicks / 2 + holdoffTicks / 2;
+  TIMER_CAR(TIMER1)   = (uint32_t)totalPWM;
+  TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks / 2;
+  TIMER_PSC(TIMER1)   = 36000;
+}
+void setTipPWM(const uint8_t pulse, const bool shouldUseFastModePWM) {
   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;
-}
+  fastPWM    = shouldUseFastModePWM;
-
-static bool fastPWM;
-static void switchToFastPWM(void) {
-  fastPWM           = true;
-  totalPWM          = powerPWM + tempMeasureTicks * 2;
-  TIMER_CAR(TIMER1) = (uint32_t)totalPWM;
-
-  // ~3.5 Hz rate
-  TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks * 2;
-  // 1 kHz tick rate
-  TIMER_PSC(TIMER1) = 12000;
-  /* generate an update event */
-  TIMER_SWEVG(TIMER1) |= (uint32_t)TIMER_SWEVG_UPG;
-}
-
-static void switchToSlowPWM(void) {
-  fastPWM           = false;
-  totalPWM          = powerPWM + tempMeasureTicks;
-  TIMER_CAR(TIMER1) = (uint32_t)totalPWM;
-  // ~1.84 Hz rate
-  TIMER_CH0CV(TIMER1) = powerPWM + holdoffTicks;
-  // 500 Hz tick rate
-  TIMER_PSC(TIMER1) = 24000;
-  /* generate an update event */
-  TIMER_SWEVG(TIMER1) |= (uint32_t)TIMER_SWEVG_UPG;
-}
-
-bool tryBetterPWM(uint8_t pwm) {
-  if (fastPWM && pwm == powerPWM) {
-    // maximum power for fast PWM reached, need to go slower to get more
-    switchToSlowPWM();
-    return true;
-  } else if (!fastPWM && pwm < 230) {
-    // 254 in fast PWM mode gives the same power as 239 in slow
-    // allow for some reasonable hysteresis by switching only when it goes
-    // below 230 (equivalent to 245 in fast mode)
-    switchToFastPWM();
-    return true;
-  }
-  return false;
 }
 
 void EXTI5_9_IRQHandler(void) {

source/Core/BSP/Pine64/Model_Config.h

@@ -1,33 +0,0 @@
-/*
- * Model_Config.h
- *
- *  Created on: 25 Jul 2020
- *      Author: Ralim
- */
-
-#ifndef BSP_PINE64_MODEL_CONFIG_H_
-#define BSP_PINE64_MODEL_CONFIG_H_
-/*
- * Lookup for mapping features <-> Models
- */
-
-#if defined(MODEL_Pinecil) == 0
-#error "No model defined!"
-#endif
-
-#ifdef MODEL_Pinecil
-#define POW_PD
-#define POW_QC
-#define POW_DC
-#define POW_QC_20V
-#define ENABLE_QC2
-#define TEMP_TMP36
-#define ACCEL_BMA
-#define ACCEL_SC7
-#define HALL_SENSOR
-#define HALL_SI7210
-#define BATTFILTERDEPTH 32
-#define DEBUG_UART_OUTPUT
-#endif
-
-#endif /* BSP_PINE64_MODEL_CONFIG_H_ */

source/Core/BSP/Pine64/Power.cpp

@@ -1,9 +1,9 @@
 #include "BSP.h"
 #include "BSP_Power.h"
-#include "Model_Config.h"
 #include "Pins.h"
 #include "QC3.h"
 #include "Settings.h"
+#include "configuration.h"
 #include "fusb_user.h"
 #include "fusbpd.h"
 #include "int_n.h"
@@ -16,7 +16,7 @@ void power_check() {
   if (FUSB302_present) {
     PolicyEngine::PPSTimerCallback();
     // Cant start QC until either PD works or fails
-    if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+    if (PolicyEngine::setupCompleteOrTimedOut(getSettingValue(SettingsOptions::PDNegTimeout)) == false) {
       return;
     }
     if (PolicyEngine::pdHasNegotiated()) {
@@ -43,7 +43,7 @@ uint8_t usb_pd_detect() {
 
 bool getIsPoweredByDCIN() {
   // We return false until we are sure we are not using PD
-  if (PolicyEngine::setupCompleteOrTimedOut() == false) {
+  if (PolicyEngine::setupCompleteOrTimedOut(getSettingValue(SettingsOptions::PDNegTimeout)) == false) {
     return false;
   }
   if (PolicyEngine::pdHasNegotiated()) {

source/Core/BSP/Pine64/QC_GPIO.cpp

@@ -46,13 +46,6 @@ uint8_t QC_DM_PulledDown() { return gpio_input_bit_get(USB_DM_LOW_GPIO_Port, USB
 #endif
 void QC_resync() {
 #ifdef POW_QC
-  uint8_t targetvoltage = 90;
+  seekQC(getSettingValue(SettingsOptions::QCIdealVoltage), getSettingValue(SettingsOptions::VoltageDiv)); // Run the QC seek again if we have drifted too much
-  if (systemSettings.QCIdealVoltage == 1) {
-    targetvoltage = 120;
-  } else if (systemSettings.QCIdealVoltage == 2) {
-    targetvoltage = 200;
-  }
-
-  seekQC(targetvoltage, systemSettings.voltageDiv); // Run the QC seek again if we have drifted too much
 #endif
 }

source/Core/BSP/Pine64/Setup.cpp

@@ -9,10 +9,11 @@
 #include "Debug.h"
 #include "Pins.h"
 #include "gd32vf103.h"
+#include "history.hpp"
 #include <string.h>
-#define ADC_NORM_CHANNELS 2
+#define ADC_NORM_SAMPLES 16
-#define ADC_NORM_SAMPLES  32
+#define ADC_FILTER_LEN   4
-uint16_t ADCReadings[ADC_NORM_SAMPLES * ADC_NORM_CHANNELS]; // room for 32 lots of the pair of readings
+uint16_t ADCReadings[ADC_NORM_SAMPLES]; // room for 32 lots of the pair of readings
 
 // Functions
 void setup_gpio();
@@ -43,12 +44,48 @@ void hardware_init() {
   timer_enable(TIMER1);
   timer_enable(TIMER2);
 }
-// channel 0 -> temperature sensor, 1-> VIN
+
-uint16_t getADC(uint8_t channel) {
+uint16_t getADCHandleTemp(uint8_t sample) {
-  uint32_t sum = 0;
+  static history<uint16_t, ADC_FILTER_LEN> filter = {{0}, 0, 0};
-  for (uint8_t i = 0; i < ADC_NORM_SAMPLES; i++)
+  if (sample) {
-    sum += ADCReadings[channel + (i * ADC_NORM_CHANNELS)];
+    uint32_t sum = 0;
-  return sum >> 2;
+    for (uint8_t i = 0; i < ADC_NORM_SAMPLES; i++) {
+      sum += ADCReadings[i];
+    }
+    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 += adc_inserted_data_read(ADC1, 0);
+    latestADC += adc_inserted_data_read(ADC1, 1);
+    latestADC += adc_inserted_data_read(ADC1, 2);
+    latestADC += adc_inserted_data_read(ADC1, 3);
+    latestADC <<= 1;
+    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 += adc_inserted_data_read(ADC0, 0);
+    latestADC += adc_inserted_data_read(ADC0, 1);
+    latestADC += adc_inserted_data_read(ADC0, 2);
+    latestADC += adc_inserted_data_read(ADC0, 3);
+    latestADC <<= 1;
+    filter.update(latestADC);
+    return latestADC;
+  }
+  return filter.average();
 }
 
 void setup_uart() {
@@ -125,7 +162,7 @@ void setup_dma() {
     dma_data_parameter.periph_width = DMA_PERIPHERAL_WIDTH_16BIT;
     dma_data_parameter.memory_width = DMA_MEMORY_WIDTH_16BIT;
     dma_data_parameter.direction    = DMA_PERIPHERAL_TO_MEMORY;
-    dma_data_parameter.number       = ADC_NORM_SAMPLES * ADC_NORM_CHANNELS;
+    dma_data_parameter.number       = ADC_NORM_SAMPLES;
     dma_data_parameter.priority     = DMA_PRIORITY_HIGH;
     dma_init(DMA0, DMA_CH0, &dma_data_parameter);
 
@@ -160,7 +197,7 @@ void setup_adc() {
   /* config ADC clock */
   rcu_adc_clock_config(RCU_CKADC_CKAPB2_DIV16);
   // Run in normal parallel + inserted parallel
-  adc_mode_config(ADC0, ADC_DAUL_REGULAL_PARALLEL_INSERTED_PARALLEL);
+  adc_mode_config(ADC0, ADC_DAUL_INSERTED_PARALLEL);
   adc_special_function_config(ADC0, ADC_CONTINUOUS_MODE, ENABLE);
   adc_special_function_config(ADC0, ADC_SCAN_MODE, ENABLE);
   adc_special_function_config(ADC1, ADC_CONTINUOUS_MODE, ENABLE);
@@ -168,28 +205,22 @@ void setup_adc() {
   // Align right
   adc_data_alignment_config(ADC0, ADC_DATAALIGN_RIGHT);
   adc_data_alignment_config(ADC1, ADC_DATAALIGN_RIGHT);
-  // Setup reading 2 channels on regular mode (Handle Temp + dc in)
+  // Setup reading the handle temp
-  adc_channel_length_config(ADC0, ADC_REGULAR_CHANNEL, ADC_NORM_CHANNELS);
+  adc_channel_length_config(ADC0, ADC_REGULAR_CHANNEL, 1);
-  adc_channel_length_config(ADC1, ADC_REGULAR_CHANNEL, ADC_NORM_CHANNELS);
+  adc_channel_length_config(ADC1, ADC_REGULAR_CHANNEL, 0);
   // Setup the two channels
   adc_regular_channel_config(ADC0, 0, TMP36_ADC0_CHANNEL,
                              ADC_SAMPLETIME_71POINT5); // temp sensor
-  adc_regular_channel_config(ADC1, 0, TMP36_ADC1_CHANNEL,
-                             ADC_SAMPLETIME_71POINT5); // temp sensor
-  adc_regular_channel_config(ADC0, 1, VIN_ADC0_CHANNEL,
-                             ADC_SAMPLETIME_71POINT5); // DC Input voltage
-  adc_regular_channel_config(ADC1, 1, VIN_ADC1_CHANNEL,
-                             ADC_SAMPLETIME_71POINT5); // DC Input voltage
   // Setup that we want all 4 inserted readings to be the tip temp
   adc_channel_length_config(ADC0, ADC_INSERTED_CHANNEL, 4);
   adc_channel_length_config(ADC1, ADC_INSERTED_CHANNEL, 4);
   for (int rank = 0; rank < 4; rank++) {
-    adc_inserted_channel_config(ADC0, rank, TIP_TEMP_ADC0_CHANNEL, ADC_SAMPLETIME_1POINT5);
+    adc_inserted_channel_config(ADC0, rank, TIP_TEMP_ADC0_CHANNEL, ADC_SAMPLETIME_28POINT5);
-    adc_inserted_channel_config(ADC1, rank, TIP_TEMP_ADC1_CHANNEL, ADC_SAMPLETIME_1POINT5);
+    adc_inserted_channel_config(ADC1, rank, VIN_ADC1_CHANNEL, ADC_SAMPLETIME_28POINT5);
   }
   // Setup timer 1 channel 0 to trigger injected measurements
-  adc_external_trigger_source_config(ADC0, ADC_INSERTED_CHANNEL, ADC0_1_EXTTRIG_INSERTED_T1_CH0);
+  adc_external_trigger_source_config(ADC0, ADC_INSERTED_CHANNEL, ADC0_1_EXTTRIG_INSERTED_T1_TRGO);
-  adc_external_trigger_source_config(ADC1, ADC_INSERTED_CHANNEL, ADC0_1_EXTTRIG_INSERTED_T1_CH0);
+  adc_external_trigger_source_config(ADC1, ADC_INSERTED_CHANNEL, ADC0_1_EXTTRIG_INSERTED_T1_TRGO);
 
   adc_external_trigger_source_config(ADC0, ADC_REGULAR_CHANNEL, ADC0_1_EXTTRIG_REGULAR_NONE);
   adc_external_trigger_source_config(ADC1, ADC_REGULAR_CHANNEL, ADC0_1_EXTTRIG_REGULAR_NONE);
@@ -233,17 +264,17 @@ void setup_timers() {
     /* initialize TIMER init parameter struct */
     timer_struct_para_init(&timer_initpara);
     /* TIMER1 configuration */
-    timer_initpara.prescaler         = 5000;
+    timer_initpara.prescaler         = 30000;
     timer_initpara.alignedmode       = TIMER_COUNTER_EDGE;
     timer_initpara.counterdirection  = TIMER_COUNTER_UP;
-    timer_initpara.period            = powerPWM + tempMeasureTicks;
+    timer_initpara.period            = powerPWM + tempMeasureTicks + holdoffTicks;
     timer_initpara.clockdivision     = TIMER_CKDIV_DIV4;
     timer_initpara.repetitioncounter = 0;
     timer_init(TIMER1, &timer_initpara);
 
     /* CH0 configured to implement the PWM irq's for the output control*/
     timer_channel_output_struct_para_init(&timer_ocintpara);
-    timer_ocintpara.ocpolarity  = TIMER_OC_POLARITY_HIGH;
+    timer_ocintpara.ocpolarity  = TIMER_OC_POLARITY_LOW;
     timer_ocintpara.outputstate = TIMER_CCX_ENABLE;
     timer_channel_output_config(TIMER1, TIMER_CH_0, &timer_ocintpara);
 
@@ -255,7 +286,7 @@ void setup_timers() {
     timer_ocintpara.ocpolarity  = TIMER_OC_POLARITY_HIGH;
     timer_ocintpara.outputstate = TIMER_CCX_ENABLE;
     timer_channel_output_config(TIMER1, TIMER_CH_1, &timer_ocintpara);
-
+    timer_master_output_trigger_source_select(TIMER1, TIMER_TRI_OUT_SRC_CH0);
     timer_channel_output_pulse_value_config(TIMER1, TIMER_CH_1, 0);
     timer_channel_output_mode_config(TIMER1, TIMER_CH_1, TIMER_OC_MODE_PWM0);
     timer_channel_output_shadow_config(TIMER1, TIMER_CH_1, TIMER_OC_SHADOW_DISABLE);

source/Core/BSP/Pine64/Setup.h

@@ -16,6 +16,8 @@ extern "C" {
 uint16_t getADC(uint8_t channel);
 void     hardware_init();
 void     setupFUSBIRQ();
+uint16_t getADCHandleTemp(uint8_t sample);
+uint16_t getADCVin(uint8_t sample);
 #ifdef __cplusplus
 }
 #endif

source/Core/BSP/Pine64/Vendor/SoC/gd32vf103/Common/Source/system_gd32vf103.c

@@ -118,7 +118,7 @@ static void system_clock_108m_hxtal(void) {
   /* APB2 = AHB/1 */
   RCU_CFG0 |= RCU_APB2_CKAHB_DIV1;
   /* APB1 = AHB/2 */
-  RCU_CFG0 |= RCU_APB1_CKAHB_DIV2;
+  RCU_CFG0 |= RCU_APB1_CKAHB_DIV4;
 
   /* CK_PLL = (CK_PREDIV0) * 27 = 108 MHz */
   RCU_CFG0 &= ~(RCU_CFG0_PLLMF | RCU_CFG0_PLLMF_4);

source/Core/BSP/Pine64/configuration.h

@@ -0,0 +1,151 @@
+#ifndef CONFIGURATION_H_
+#define CONFIGURATION_H_
+#include "Settings.h"
+#include <stdint.h>
+/**
+ * Configuration.h
+ * Define here your default pre settings for Pinecil
+ *
+ */
+
+//===========================================================================
+//============================= 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_Pinecil
+#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_Pinecil  750 * 1000 // 750  Kilo-ohms -> From schematic, R1
+#define OP_AMP_Rin_Pinecil 2370       // 2.37 Kilo-ohms -> From schematic, R2
+
+#define OP_AMP_GAIN_STAGE_PINECIL (1 + (OP_AMP_Rf_Pinecil / OP_AMP_Rin_Pinecil))
+
+#if defined(MODEL_Pinecil) == 0
+#error "No model defined!"
+#endif
+
+#ifdef MODEL_Pinecil
+#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      70                        //
+#define POWER_LIMIT_STEPS    5                         //
+#define OP_AMP_GAIN_STAGE    OP_AMP_GAIN_STAGE_PINECIL // 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
+
+#define POW_PD
+#define POW_QC
+#define POW_DC
+#define POW_QC_20V
+#define ENABLE_QC2
+#define TEMP_TMP36
+#define ACCEL_BMA
+#define ACCEL_SC7
+#define HALL_SENSOR
+#define HALL_SI7210
+#define DEBUG_UART_OUTPUT
+
+#define HARDWARE_MAX_WATTAGE_X10 750
+#define TIP_THERMAL_MASS         65 // X10 watts to raise 1 deg C in 1 second
+#define tipResistance            75 // x10 ohms, 7.5 typical for Pinecil tips
+#endif
+#endif

source/Core/BSP/Pine64/fusb_user.cpp

@@ -1,4 +1,4 @@
-#include "Model_Config.h"
+#include "configuration.h"
 #ifdef POW_PD
 #include "BSP.h"
 #include "I2C_Wrapper.hpp"

source/Core/Drivers/FUSB302/fusbpd.cpp

@@ -4,7 +4,7 @@
  *  Created on: 13 Jun 2020
  *      Author: Ralim
  */
-#include "Model_Config.h"
+#include "configuration.h"
 #ifdef POW_PD
 #include "BSP.h"
 #include "I2CBB.hpp"

source/Core/Drivers/FUSB302/policy_engine.cpp

@@ -21,15 +21,14 @@
 #include "int_n.h"
 #include <pd.h>
 #include <stdbool.h>
+
 bool                              PolicyEngine::pdNegotiationComplete;
 int                               PolicyEngine::current_voltage_mv;
 int                               PolicyEngine::_requested_voltage;
 bool                              PolicyEngine::_unconstrained_power;
-union pd_msg                      PolicyEngine::currentMessage;
 uint16_t                          PolicyEngine::hdr_template;
 bool                              PolicyEngine::_explicit_contract;
 int8_t                            PolicyEngine::_hard_reset_counter;
-int8_t                            PolicyEngine::_old_tcc_match;
 uint8_t                           PolicyEngine::_pps_index;
 osThreadId                        PolicyEngine::TaskHandle = NULL;
 uint32_t                          PolicyEngine::TaskBuffer[PolicyEngine::TaskStackSize];
@@ -45,7 +44,8 @@ StaticEventGroup_t                PolicyEngine::xCreatedEventGroup;
 bool                              PolicyEngine::PPSTimerEnabled      = false;
 TickType_t                        PolicyEngine::PPSTimeLastEvent     = 0;
 uint8_t                           PolicyEngine::_tx_messageidcounter = 0;
-void                              PolicyEngine::init() {
+
+void PolicyEngine::init() {
   messagesWaiting = xQueueCreateStatic(PDB_MSG_POOL_SIZE, sizeof(union pd_msg), ucQueueStorageArea, &xStaticQueue);
   // Create static thread at PDB_PRIO_PE priority
   osThreadStaticDef(PolEng, pe_task, PDB_PRIO_PE, 0, TaskStackSize, TaskBuffer, &TaskControlBlock);
@@ -65,7 +65,6 @@ void PolicyEngine::pe_task(const void *arg) {
   // Internal thread loop
   hdr_template = PD_DATAROLE_UFP | PD_POWERROLE_SINK;
   /* Initialize the old_tcc_match */
-  _old_tcc_match = -1;
   /* Initialize the pps_index */
   _pps_index = 0xFF;
 
@@ -619,6 +618,19 @@ void PolicyEngine::PPSTimerCallback() {
   }
 }
 
+bool PolicyEngine::NegotiationTimeoutReached(uint8_t timeout) {
+  if (timeout == 0) {
+    return false;
+  }
+
+  if (xTaskGetTickCount() > (TICKS_100MS * timeout)) {
+    state = PESinkSourceUnresponsive;
+    return true;
+  }
+
+  return false;
+}
+
 EventBits_t PolicyEngine::pushMessage(union pd_msg *msg) {
   if (PD_MSGTYPE_GET(msg) == PD_MSGTYPE_SOFT_RESET && PD_NUMOBJ_GET(msg) == 0) {
     /* Clear MessageIDCounter */

source/Core/Drivers/FUSB302/policy_engine.h

@@ -33,9 +33,11 @@ public:
   static void handleMessage(union pd_msg *msg);
   // Returns true if headers indicate PD3.0 compliant
   static bool isPD3_0();
-  static bool setupCompleteOrTimedOut() {
+  static bool setupCompleteOrTimedOut(uint8_t timeout) {
     if (pdNegotiationComplete)
       return true;
+    if (PolicyEngine::NegotiationTimeoutReached(timeout))
+      return true;
     if (state == policy_engine_state::PESinkSourceUnresponsive)
       return true;
     if (state == policy_engine_state::PESinkReady)
@@ -51,6 +53,8 @@ public:
   // Call this periodically, at least once every second
   static void PPSTimerCallback();
 
+  static bool NegotiationTimeoutReached(uint8_t timeout);
+
   enum class Notifications {
     PDB_EVT_PE_RESET          = EVENT_MASK(0),
     PDB_EVT_PE_MSG_RX         = EVENT_MASK(1),
@@ -76,16 +80,12 @@ private:
   static int  current_voltage_mv;   // The current voltage PD is expecting
   static int  _requested_voltage;   // The voltage the unit wanted to requests
   static bool _unconstrained_power; // If the source is unconstrained
-  // Current message being handled
-  static union pd_msg currentMessage;
   /* PD message header template */
   static uint16_t hdr_template;
   /* Whether or not we have an explicit contract */
   static bool _explicit_contract;
   /* The number of hard resets we've sent */
   static int8_t _hard_reset_counter;
-  /* The result of the last Type-C Current match comparison */
-  static int8_t _old_tcc_match;
   /* The index of the first PPS APDO */
   static uint8_t _pps_index;
 

source/Core/Drivers/Font.h

@@ -145,6 +145,14 @@ const uint8_t disconnectedTipIcon[] = {
     //
 };
 
+// 16 x 16
+const uint8_t brightnessIcon[]
+    = {0x80, 0x86, 0x8E, 0x9C, 0x18, 0xC0, 0xE0, 0xEF, 0xEF, 0xE0, 0xC0, 0x18, 0x9C, 0x8E, 0x86, 0x80, 0x01, 0x61, 0x71, 0x39, 0x18, 0x03, 0x07, 0xF7, 0xF7, 0x07, 0x03, 0x18, 0x39, 0x71, 0x61, 0x01};
+
+// 24 x 16
+const uint8_t invertDisplayIcon[] = {0xFE, 0x01, 0x79, 0x25, 0x79, 0x01, 0xFE, 0x00, 0x20, 0x20, 0x20, 0x20, 0xDF, 0x07, 0x8F, 0xDF, 0xFF, 0x01, 0xFE, 0x86, 0xDA, 0x86, 0xFE, 0x01,
+                                     0x7F, 0x80, 0xA4, 0xBE, 0xA0, 0x80, 0x7F, 0x00, 0x04, 0x0E, 0x1F, 0x04, 0xFB, 0xFB, 0xFB, 0xFB, 0xFF, 0x80, 0x7F, 0x5B, 0x41, 0x5F, 0x7F, 0x80};
+
 /*
  * 16x16 icons
  * 32 * 3 = Frame size * Frame count
@@ -159,110 +167,110 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         // Power 1 frame
         // width = 16
         // height = 16
-        0xC0,
-        0xB0,
-        0x8C,
-        0x83,
-        0x01,
-        0x01,
-        0x21,
-        0x31,
-        0xB9,
-        0xFD,
-        0xFF,
-        0xFE,
-        0xFE,
-        0xDE,
-        0xCE,
-        0x06,
-        0x60,
-        0x58,
-        0x26,
-        0x11,
-        0x08,
-        0xC4,
-        0xF2,
-        0x7D,
-        0x3F,
-        0x1F,
-        0x0F,
-        0x07,
-        0x03,
-        0x01,
         0x00,
         0x00,
+        0x00,
+        0x04,
+        0x17,
+        0x0f,
+        0x05,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0xfe,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x1c,
+        0x55,
+        0x1c,
 
         // Power 2 frame
         // width = 16
         // height = 16
-        0xC0,
+        0x00,
-        0xF0,
+        0x00,
-        0xFC,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xFF,
-        0xEF,
-        0x67,
-        0x03,
-        0x42,
-        0x62,
-        0x52,
-        0xCA,
-        0x06,
-        0x60,
-        0x78,
-        0x3E,
-        0x1F,
-        0x0F,
-        0xC7,
-        0xB3,
-        0x4D,
-        0x23,
         0x10,
-        0x08,
+        0x1c,
-        0x04,
+        0xdf,
-        0x02,
+        0x77,
+        0x33,
+        0x11,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x7e,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
         0x01,
         0x00,
         0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x07,
+        0x75,
+        0x07,
 
         // Power final frame
         // width = 16
         // height = 16
-        0xC0,
+        0x20,
-        0xB0,
+        0x30,
-        0x8C,
+        0x3c,
-        0x83,
+        0xff,
-        0x01,
+        0xff,
-        0x01,
+        0xff,
-        0x21,
+        0x77,
-        0x31,
+        0x33,
-        0xA9,
+        0x13,
-        0x65,
-        0x03,
-        0x42,
-        0x62,
-        0x52,
-        0xCA,
-        0x06,
-        0x60,
-        0x58,
-        0x26,
-        0x11,
-        0x08,
-        0xC4,
-        0xB2,
-        0x4D,
-        0x23,
-        0x10,
-        0x08,
-        0x04,
-        0x02,
         0x01,
         0x00,
         0x00,
+        0x00,
+        0x38,
+        0xaa,
+        0x38,
+        0x00,
+        0x42,
+        0x33,
+        0x1f,
+        0x0f,
+        0x06,
+        0x02,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x7f,
+        0x00,
     },
 
     // Soldering
@@ -493,12 +501,12 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x00,
     },
 
-    // Menu
+    // UI
     // 3 frames
     // width = 16
     // height = 16
     {
-        // Menu 1 frame
+        // UI 1 frame
         // width = 16
         // height = 16
         0x00,
@@ -534,7 +542,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x61,
         0x00,
 
-        // Menu 2 frame
+        // UI 2 frame
         // width = 16
         // height = 16
         0x00,
@@ -570,7 +578,7 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x61,
         0x00,
 
-        // Menu final frame
+        // UI final frame
         // width = 16
         // height = 16
         0x00,
@@ -607,118 +615,118 @@ const uint8_t SettingsMenuIcons[][32 * 3] = {
         0x00,
     },
 
-    // Wrench
+    // Advanced
     // 3 frames
     /// width = 16
     // height = 16
     {
-        // Wrench 1 frame
+        // Advanced 1 frame
         /// width = 16
         // height = 16
         0x00,
+        0xfe,
         0x00,
         0x00,
         0x00,
+        0xfe,
         0x00,
         0x00,
+        0x0c,
         0x00,
-        0x00,
+        0x14,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
         0x00,
         0x18,
-        0x30,
+        0x00,
-        0x32,
+        0x14,
-        0x7E,
+        0x00,
-        0x7C,
+        0x1c,
-        0xF0,
+        0x55,
-        0xC0,
+        0x1c,
+        0x00,
+        0x1c,
+        0x55,
+        0x1c,
+        0x00,
+        0x00,
+        0x1c,
+        0x22,
+        0x41,
+        0x49,
+        0x11,
+        0x22,
+        0x0c,
 
-        // Wrench 2 frame
+        // Advanced 2 frame
+        /// width = 16
+        // height = 16
+        0xe0,
+        0xae,
+        0xe0,
+        0x00,
+        0x80,
+        0xbe,
+        0x80,
+        0x00,
+        0x08,
+        0x00,
+        0x04,
+        0x00,
+        0x1c,
+        0x00,
+        0x08,
+        0x00,
+        0x00,
+        0x7e,
+        0x00,
+        0x00,
+        0x03,
+        0x7a,
+        0x03,
+        0x00,
+        0x00,
+        0x1c,
+        0x22,
+        0x01,
+        0x79,
+        0x01,
+        0x22,
+        0x1c,
+
+        // Advanced final frame
         /// width = 16
         // height = 16
         0x00,
+        0x7e,
         0x00,
         0x00,
+        0x38,
+        0xaa,
+        0x38,
         0x00,
-        0xC0,
+        0x04,
-        0x80,
-        0x90,
-        0xF0,
-        0xE0,
-        0x80,
         0x00,
+        0x0c,
         0x00,
+        0x10,
         0x00,
+        0x1c,
         0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x01,
-        0x01,
-        0x03,
-        0x03,
         0x07,
-        0x0E,
+        0x75,
-        0x1C,
+        0x07,
-        0x78,
-        0xF0,
-        0xF0,
-        0x60,
-
-        // Wrench final frame
-        /// width = 16
-        // height = 16
         0x00,
-        0x18,
+        0x00,
-        0x30,
+        0x7f,
-        0x32,
-        0x7E,
-        0x7C,
-        0xF0,
-        0xC0,
-        0x80,
         0x00,
         0x00,
         0x00,
-        0x00,
+        0x0c,
-        0x00,
+        0x22,
-        0x00,
+        0x11,
-        0x00,
+        0x49,
-        0x00,
+        0x41,
-        0x00,
+        0x22,
-        0x00,
+        0x1c,
-        0x00,
-        0x00,
-        0x00,
-        0x00,
-        0x01,
-        0x03,
-        0x0F,
-        0x3E,
-        0x7E,
-        0x4C,
-        0x0C,
-        0x18,
-        0x00,
     },
 #ifdef NOTUSED
 

source/Core/Drivers/I2CBB.cpp

@@ -4,7 +4,7 @@
  *  Created on: 12 Jun 2020
  *      Author: Ralim
  */
-#include "Model_Config.h"
+#include "configuration.h"
 #ifdef I2C_SOFT
 #include "FreeRTOS.h"
 #include <I2CBB.hpp>