Merge pull request #1777 from Ralim/dev

Release 2.22

.github/workflows/docs.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v4
@@ -37,4 +37,4 @@ jobs:
       - run: git config user.name 'github-actions[bot]' && git config user.email 'github-actions[bot]@users.noreply.github.com'
 
       - name: Publish docs
-        run: mkdocs gh-deploy
+        run: mkdocs gh-deploy -f scripts/IronOS-mkdocs.yml -d ../site

.github/workflows/push.yml

@@ -3,13 +3,15 @@ name: CI
 on: [push, pull_request]
 
 jobs:
+
+
   build:
     runs-on: ubuntu-20.04
     container:
       image: alpine:3.16
     strategy:
       matrix:
-        model: ["TS100", "TS80", "TS80P", "Pinecil", "MHP30", "Pinecilv2"]
+        model: ["TS100", "TS80", "TS80P", "Pinecil", "MHP30", "Pinecilv2", "S60", "TS101"]
       fail-fast: true
 
     steps:
@@ -19,20 +21,21 @@ jobs:
       - name: Install dependencies (python)
         run: python3 -m pip install bdflib
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Git ownership exception
         run: git config --global --add safe.directory /__w/IronOS/IronOS && git config --global safe.directory "$GITHUB_WORKSPACE"
 
-      - name: build ${{ matrix.model }}
+      - name: Git meta info
+        run: echo "GITHUB_CI_PR_SHA=${{github.event.pull_request.head.sha}}" >> "${GITHUB_ENV}"
+
+      - name: Build ${{ matrix.model }}
         run: cd source && ./build.sh -m ${{ matrix.model }}
 
-      - name: copy license text
-        run: |
-          cp LICENSE source/Hexfile/LICENSE
-          cp LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md
+      - name: Copy license files
+        run: cp LICENSE scripts/LICENSE_RELEASE.md  source/Hexfile/
 
       - name: Archive ${{ matrix.model }} artifacts
         uses: actions/upload-artifact@v3
@@ -47,7 +50,7 @@ jobs:
           if-no-files-found: error
 
       - name: Generate json index file
-        run: cd source && python3 metadata.py ${{ matrix.model }}.json
+        run: ./source/metadata.py ${{ matrix.model }}.json
 
       - name: Archive ${{ matrix.model }} index file
         uses: actions/upload-artifact@v3
@@ -55,6 +58,7 @@ jobs:
           name: metadata
           path: source/Hexfile/${{ matrix.model }}.json
 
+
   build_multi-lang:
     runs-on: ubuntu-20.04
     container:
@@ -70,20 +74,21 @@ jobs:
       - name: Install dependencies (python)
         run: python3 -m pip install bdflib
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Git ownership exception
         run: git config --global --add safe.directory /__w/IronOS/IronOS && git config --global safe.directory "$GITHUB_WORKSPACE"
 
-      - name: build ${{ matrix.model }}
-        run: cd source && make -j$(nproc) model="${{ matrix.model }}" firmware-multi_compressed_European firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian firmware-multi_Chinese+Japanese
+      - name: Git meta info
+        run: echo "GITHUB_CI_PR_SHA=${{github.event.pull_request.head.sha}}" >> "${GITHUB_ENV}"
 
-      - name: copy license text
-        run: |
-          cp LICENSE source/Hexfile/LICENSE
-          cp LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md
+      - name: Build ${{ matrix.model }}
+        run: make -C source/ -j$(nproc) model="${{ matrix.model }}" firmware-multi_compressed_European firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian firmware-multi_Chinese+Japanese
+
+      - name: Copy license files
+        run: cp LICENSE scripts/LICENSE_RELEASE.md  source/Hexfile/
 
       - name: Archive ${{ matrix.model }} artifacts
         uses: actions/upload-artifact@v3
@@ -98,7 +103,7 @@ jobs:
           if-no-files-found: error
 
       - name: Generate json index file
-        run: cd source && python3 metadata.py ${{ matrix.model }}_multi-lang.json
+        run: ./source/metadata.py ${{ matrix.model }}_multi-lang.json
 
       - name: Archive ${{ matrix.model }} index file
         uses: actions/upload-artifact@v3
@@ -106,51 +111,62 @@ jobs:
           name: metadata
           path: source/Hexfile/${{ matrix.model }}_multi-lang.json
 
+
   tests:
     runs-on: ubuntu-20.04
     container:
       image: alpine:3.16
 
     steps:
-      - name: deps
+      - name: Install dependencies (apk)
         run: apk add --no-cache python3 py3-pip make git bash findutils gcc musl-dev
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - name: install black
+      - name: Install dependencies (python)
         run: python3 -m pip install bdflib
 
       - name: Run python tests
-        run: cd Translations && chmod +x make_translation_test.py && ./make_translation_test.py
+        run: ./Translations/make_translation_test.py
 
       - name: Run BriefLZ tests
-        run: |
-          cd source
-          make Objects/host/brieflz/libbrieflz.so
-          cd ../Translations
-          chmod +x brieflz_test.py
-          ./brieflz_test.py
+        run: make  -C source/  Objects/host/brieflz/libbrieflz.so && ./Translations/brieflz_test.py
 
-  check_formatting:
+
+  check_c-cpp:
     runs-on: ubuntu-20.04
     container:
       image: alpine:3.16
 
     steps:
-      - name: deps
-        run: apk add --no-cache python3 py3-pip make git black
+      - name: Install dependencies (apk)
+        run: apk add --no-cache make git diffutils findutils clang-extra-tools bash
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
 
-      - name: install black
-        run: python3 -m pip install bdflib flake8
+      - name: Check format style with clang-format
+        run: make  clean  check-style
 
-      - name: Check formatting with clang-format
-        run: cd source && make clean && make check-style
+
+  check_python:
+    runs-on: ubuntu-20.04
+    container:
+      image: alpine:3.16
+
+    steps:
+      - name: Install dependencies (apk)
+        run: apk add --no-cache python3 py3-pip make git black
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install dependencies (python)
+        run: python3 -m pip install bdflib flake8
 
       - name: Check python formatting with black
         run: black --check Translations
@@ -158,11 +174,12 @@ jobs:
       - name: Check python with flake8
         run: flake8 Translations
 
-  shellcheck:
-    name: runner / shellcheck
+
+  check_shell:
+    name: check_shell
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: shellcheck
         uses: reviewdog/action-shellcheck@v1
         with:
@@ -170,3 +187,20 @@ jobs:
           reporter: github-pr-review # Change reporter.
           exclude: "./.git/*" # Optional.
           check_all_files_with_shebangs: "false" # Optional.
+
+
+  check_readme:
+    runs-on: ubuntu-20.04
+    container:
+      image: alpine:3.16
+
+    steps:
+      - name: Install dependencies (apk)
+        run: apk add --no-cache git
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Check autogenerated Documentation/README.md
+        run: /bin/sh ./scripts/deploy.sh docs_readme

.gitignore

@@ -1,3 +1,5 @@
+#### Generic ####
+
 # Object files
 *.o
 *.ko
@@ -5,6 +7,7 @@
 *.elf
 *.d
 *.DS_Store
+
 # Precompiled Headers
 *.gch
 *.pch
@@ -31,33 +34,22 @@
 # Debug files
 *.dSYM/
 *.su
-source/.metadata/*
 
-TS100/KiCad/TS100.bak
-Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/
-Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
-*.cache
-Translation Editor/.vscode/
-Translation Editor/__pycache__/
+# Custom scripts & misc. files
 *.pyc
 *.lst
 *.mk
 *.list
-source/Hexfile/
-source/Objects/
-
-ci/artefacts/
-ci/secrets/unencrypted/
-codeship.aes
-.vscode/settings.json
 
 # Auto generated files
-source/Core/Inc/unit.h
-source/Core/Gen/
+*.cache
+codeship.aes
+CoreCompileInputs.cache
+
 # IDE configs
 .vs/*
 .settings/*
-..cproject.swp
+.cproject.swp
 
 # Visual Studios
 .vscode/*
@@ -65,6 +57,7 @@ source/Core/Gen/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.vscode/settings.json
 
 # Eclipse
 .metadata
@@ -120,11 +113,24 @@ local.properties
 .scala_dependencies
 .worksheet
 
-# Jetbrains
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# source code tagging systems (GNU Global, ctags, cscope)
+GPATH
+GRTAGS
+GTAGS
+*tags
+*tags/
+.*tags
+.*tags/
+cscope.*
+cscope/
+.cscope/
+
+
+#### Jetbrains: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm ####
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
+.idea/
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
@@ -174,7 +180,38 @@ fabric.properties
 # Editor-based Rest Client
 .idea/httpRequests
 
-CoreCompileInputs.cache
-.vscode/settings.json
+
+#### IronOS project specific files ####
+
+# Binaries
+source/Hexfile/
+source/Objects/
+BUILDS/
+
+# Autogenerated
+source/Core/Gen/
+source/Core/Inc/unit.h
+
+# Deploy
+scripts/ci/artefacts/
+scripts/ci/secrets/unencrypted/
+
+# Generated static local docs
+site/
+
+# Translations
+Translations/__pycache__/
+Translation Editor/__pycache__/
+Translation Editor/.vscode/
+
+# misc.
 source/compile_commands.json
-.idea/
+source/.metadata/*
+
+# TS100 related
+TS100/KiCad/TS100.bak
+Logo GUI/TS100 Logo Editor/TS100 Logo Editor/obj/
+Logo GUI/TS100 Logo Editor/TS100 Logo Editor/bin/
+
+# Tests/linters/sanitizers
+source/check-style.log

Bootup Logo/README.md

@@ -1,7 +0,0 @@
-# Bootup logo's
-
-IronOS supports both a bootup logo _AND_ bootup animations.
-
-However, they are no longer included in this repo.
-
-[Please read the docs](https://ralim.github.io/IronOS/Logo/)

Dockerfile

@@ -1,29 +0,0 @@
-FROM alpine:3.16
-LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
-
-WORKDIR /build
-# Installing the two compilers, python3, python3 pip, clang format
-# Compilders ->gcc-* newlib-*
-# Python3 -> py*
-# Misc -> findutils make git
-# musl-dev is required for the multi lang firmwares
-# clang is required for clang-format (for dev)
-ARG APK_COMPS="gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf \
-               newlib-arm-none-eabi"
-ARG APK_PYTHON="python3 py3-pip black"
-ARG APK_MISC="findutils make git"
-ARG APK_DEV="musl-dev clang bash clang-extra-tools"
-
-# PIP packages
-ARG PIP_PKGS='bdflib'
-
-RUN apk add --no-cache ${APK_COMPS} ${APK_PYTHON} ${APK_MISC} ${APK_DEV}
-
-# Install Python3 packages
-
-RUN python3 -m pip install ${PIP_PKGS}
-# Git trust
-RUN git config --global --add safe.directory /build/source
-
-COPY . /build/source
-COPY ./ci /build/ci

Documentation/Bluetooth.md

@@ -0,0 +1,99 @@
+# Bluetooth Low Energy
+
+The Pinecilv2 has hardware support for Bluetooth Low Energy (BLE). This protocol allows reading and writing of parameters to the Pinecil during runtime.
+
+The BLE interface advertises three services, these provide access to live telemetry as well as the ability to read/write settings.
+These are outlined in more detail below.
+
+Pinecil devices advertise themselves on BLE as `Pinecil-XXXXXXX`.
+They also include the UUID `9eae1000-9d0d-48c5-AA55-33e27f9bc533` in the advertisement packet to allow for filtering.
+
+Unless otherwise noted, all data is sent and received as Little-Endian.
+
+As of the time of writing this, notifications are not fully implemented so data will need to be polled. Notification/Indication support will come when there is time to implement it.
+
+## Using the BLE Interface
+
+It is advised to follow the below points when first implementing a BLE integration. Of course once the integration is working feel free to deviate from these. These are just _suggested_ ideas to help kickstart.
+
+1. When filtering for devices, its preferable to filter by the UUID `9eae1000-9d0d-48c5-AA55-33e27f9bc533`, rather than by the device name if possible.
+2. Upon first collection check if the three expected services exist; if they don't the user may have selected an incorrect device.
+3. It's best to read the live bulk endpoint over the live service when its easy to do so (one read vs ~15).
+   1. However if you are just updating one or two line items it may be more efficient to just read these on the live service.
+   2. Feel free to test both and decide.
+4. When reading settings from the device; the association of number <-> setting is fixed, but you may see settings you don't yet know about, make sure you can handle these.
+5. You probably don't want to show unknown setting's to the user though.
+6. Read the device firmware revision and ensure you can decode it. If BLE is revised it may be essential for handling versions cleanly.
+7. It's advisable to keep an eye on the IronOS repository or at least setup the Github watch for release notifications.
+   1. Future releases may revise some BLE aspects or add new settings for example.
+
+## Services
+
+Below is a description of each service. Note that the exact settings are not listed for brevity; it's best to refer to [the uuid lists](https://github.com/Ralim/IronOS/blob/dev/source/Core/BSP/Pinecilv2/ble_characteristics.h) and the [handlers](https://github.com/Ralim/IronOS/blob/dev/source/Core/BSP/Pinecilv2/ble_handlers.cpp) alongside this.
+
+### Live
+
+`UUID: d85ef000-168e-4a71-AA55-33e27f9bc533`
+
+The live services has one characteristic per reading. The readings (in order) are:
+When implementing these; the ones that are not obvious are generally found in the debugging menu. Values are encoded as an unsigned 32 bit number for all results.
+
+1. Live temperature (In C)
+2. Live set point
+3. DC input voltage
+4. Handle temperature (In C)
+5. Power level
+6. Power source
+7. Tip resistance
+8. uptime
+9. Time of last movement
+10. Maximum temperature settable
+11. Raw tip reading
+12. Hall sensor
+13. Operating mode
+14. Estimated wattage
+
+### Settings
+
+`UUID: f6d80000-5a10-4eba-AA55-33e27f9bc533`
+
+The settings service has two special entries; for saving and resetting settings.
+Otherwise all settings are enumerated using UUID's of the format : `f6d7ZZZZ-5a10-4eba-AA55-33e27f9bc533))` where `ZZZZ` is the setting number as matched from [Settings.h](https://github.com/Ralim/IronOS/blob/dev/source/Core/Inc/Settings.h#L16).
+
+All data is read and written in fixed unsigned 16 bit numbers.
+
+#### Settings save
+
+To save the settings write a `0x0001` to `f6d7FFFF-5a10-4eba-AA55-33e27f9bc533`.
+Its advised to not save settings on each change but instead to give the user a save button _or_ save after a timeout. This is just to reduce write cycles on the internal flash.
+
+#### Settings reset
+
+To reset all settings to defaults; write a `0x0001` to  `f6d7FFFE-5a10-4eba-AA55-33e27f9bc533`.
+This will reset settings immediately.
+
+### Bulk
+
+`UUID: 9eae1000-9d0d-48c5-AA55-33e27f9bc533`
+
+The bulk endpoint is where extra data is located with varying read sizes.
+
+#### Live data
+
+The bulk live data endpoint provides all of the data provided in the live endpoint, as one large single-read binary blob. This is designed for applications that are showing large amounts of data as this is more efficient for reading.
+
+#### Accelerometer Name
+
+_Not yet implemented_
+
+#### Build ID
+
+This encodes the current build ID to allow viewing and handling when the BLE format changes.
+
+#### Device Serial Number
+
+This is generally the device CPU serial number. For most devices this can be used as an ID. On PinecilV2 its the MAC address.
+
+#### Device Unique ID
+
+This is only relevant on the PinecilV2. This is a random ID that is burned in at the factory. This is used by the online authenticity checker tool.

Documentation/DebugMenu.md

@@ -9,9 +9,43 @@ This menu is meant to be simple, so it has no fancy GUI animations.
 
 ## Menu items
 
-Items are shown in the menu on a single line, so they use short codes and appear in this order:
+Items are shown in the menu on a single line, so they use short codes.
+
+### Version
+
+There is a static line on top which is presented on every sub-screen and reflects exact version of firmware. Version line on top has the following format - `vX.YYN.[ZZZZZZZZ]`:
+
+- X: major version
+- Y: minor version
+- N: build type:
+  - R - git-related **r**elease tag vXX.YY
+  - T - git-related release **t**ag but version is not vXX.YY !
+  - D - git-related **d**ev branch
+  - B - git-related custom **b**ranch
+  - E - git-related from d**e**tached commit
+  - G - neither above but **g**it-related
+  - C - build from github **C**I during _pull request_
+  - H - build outside of a git tree (i.e. release tarball or **h**omebrew customization without git)
+  - S - something **s**pecial[^ERR]
+  - V - something **v**ery special[^ERR]
+[^ERR]: `S` and `V` are reserved letters for cases when source of firmware is having very unique origin & configuration
+- Z: short commit ID hash with 8 digits generated automatically from git (for git-related build types only)
+
+I.e.:
+- `v2.22H` means firmware built locally from tarball with release version of `2.22`
+- `v2.22D.1A2B3C4D` means firmware with development version of `2.22` from git `dev` branch & with commit ID `1A2B3C4D` (so it can be traced for debug purposes)
+- `v2.22R.5E6F7G8H` means firmware with official release version of `2.22` and it's properly tagged with `v2.22` git tag & with commit ID `5E6F7G8H`'
+
+---
+
+**Additional scroll-able items appear in this order**:
+
+### Date
+
+- This is a date of firmware compilation and it has the following format: `DD-MM-YY` (i.e., `01-07-23` means it has been built in July, 1st, 2023)
 
 ### ID
+
 - This is used by Irons that have an ID and serial number to help check if the iron is authentic. All Pinecil V1 show the same ID number as this is the number programmed into the MCU.
 - The new Pinecil V2 released Aug. 2, 2022 now uses MCU BL706, which enables generating a unique ID/Serial number to every iron. This can be used to verify your [Pinecil authenticity here](https://pinecil.pine64.org/).
 
@@ -52,7 +86,6 @@ This is the handle temperature or more accurately the reading of the Cold Juncti
 This is used for CJC of the tip temperature.
  > If CHan is extremely high, this indicates the temperature sensor isn't reading correctly ([see Troubleshooting](https://ralim.github.io/IronOS/Troubleshooting/))
 
-
 ### Max C
 
 This indicates the max temperature in °C that the system estimates it can measure the tip reliably to.
@@ -106,6 +139,7 @@ Pressing (`+`) cycles through elements, and (`-`) or unplugging will exit the me
 The first page shows the PD negotiation stage number; which can be used for diagnosing if PD is not working. Once negotiation is complete; use (`+`) button to advance to other screens which show the different proposals advertised for voltage and current (State 12 means all is good with the PD charger).
 
 #### Below is a method for user modification to convert some early models of Pinecil V1 to safely support 24V on the DC5525 barrel.
+
 ⚠️ Warning: do this at your own risk, read everything in this document, and go to the [Pine64 community chat](https://wiki.pine64.org/wiki/Pinecil#Community_links) if you desire advice. An incorrect cut of the trace could render the Pinecil non-working.
 
 Background: a simple user modification to the PCB on _some models_ of original V1 allows it to safely use DC barrel 24V by cutting a trace line to the Vbus which held it back to 21V. You can check whether your Pinecil V1 needs the update or can benefit from it by using a hidden trick in the PD debug menu.

Documentation/Development.md

@@ -125,7 +125,7 @@ On Windows follow the instructions on the official documentation to install 'Win
 
     ```sh
     cd IronOS
-    ./start_dev.sh
+    ./scripts/deploy.sh
     ```
 
     This script will build a Docker image and run a container with the necessary tools to build the firmware.
@@ -133,7 +133,7 @@ On Windows follow the instructions on the official documentation to install 'Win
 3. Build the firmware for Pinecil V2:
 
     ```sh
-    cd source/source
+    cd source/
     ./build.sh -l EN -m Pinecilv2
     ```
 

Documentation/Flashing/MHP30.md

@@ -55,7 +55,7 @@ sgr1ff1n (Shane) commented in [issue 11](https://github.com/Ralim/IronOS/issues/
 
 While in the past there were reports of unreliable upgrades, the consensus in [issue 11](https://github.com/Ralim/IronOS/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/IronOS/master/Flashing/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.
+@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/dev/scripts/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!

Documentation/Flashing/TS100.md

@@ -55,7 +55,7 @@ sgr1ff1n (Shane) commented in [issue 11](https://github.com/Ralim/IronOS/issues/
 
 While in the past there were reports of unreliable upgrades, the consensus in [issue 11](https://github.com/Ralim/IronOS/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/IronOS/master/Flashing/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.
+@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/dev/scripts/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!

Documentation/GettingStarted.md

@@ -42,7 +42,7 @@ This OLED screen features burn-in protection; if no buttons or movement have bee
 
 Additionally to the two icons shown, there are two "hidden" actions that can be performed on this menu.
 
-If you press and hold the button near the tip (`+/A`), this enters the temperature adjustment screen. Normally this is not required; but if you would like to adjust the set temperature _before_ the tip starts to heat, this can be useful.
+On devices that do not support profile mode, if you press and hold the button near the tip (`+/A`), this enters the temperature adjustment screen. Normally this is not required; but if you would like to adjust the set temperature _before_ the tip starts to heat, this can be useful.
 
 If you press and hold the button near the rear of the iron (`-/B`), it will take you into the [debug menu](https://ralim.github.io/IronOS/DebugMenu/).
 
@@ -74,6 +74,23 @@ Pinecil has an unpopulated footprint (U14) for a hall effect sensor (Si7210-B-00
 
 If, after entering sleep mode, the iron still does not see movement for a much longer time (default=10 minutes); it will shut down and return to the home screen.
 
+## Profile Mode (MHP30 only)
+
+On devices that support it, a long press on `(+/A)` takes you into profile mode, which initiates the profile selected in the relevant settings.
+
+Profile mode plays out as follows:
+
+1. Check if the temperature is below 55C. If not, you will get a warning and cannot enter profile mode.
+2. Preheat by raising the target temperature to the configured preheat temperature with the configured preheat speed.
+3. Wait for the device to reach the preheat temperature.
+4. Gradually move the target temperature to the configured end temperature of the first phase over the configured duration. 
+5. Wait for the device to reach the end temperature. 
+6. Repeat steps 4 and 5 for the next phases until there are no more phases configured.
+7. Cool down by lowering the target temperature to 0 with the configured cooldown speed. 
+8. Once the temperature is below 55C, sound the buzzer (if available) and exit profile mode. 
+
+You can manually exit profile mode manually in the same way as the soldering mode, by pressing and holding the rear button or pressing both buttons at once.
+
 ## Settings Menu
 
 The settings menu is the most evolving aspect of the firmware, so each option is not documented here. However, do not panic, as every menu option has an on-screen description so you don't _need_ to come back here to figure them all out.

Documentation/Hardware.md

@@ -1,8 +1,62 @@
 ## Notes on the various supported hardware
 
+
+### TS100
+
+TS100\* is a neat soldering iron:
+
+- can run from 9-25V DC;
+- provides a power range that is determined by the input voltage;
+- voltages below 12V don't overly work well for any substantial mass;
+- the default firmware can be found [here](https://www.minidso.com/forum.php?mod=viewthread&tid=892&extra=page%3D1).
+
+![](https://brushlesswhoop.com/images/ts100-og.jpg)
+
+
+### TS80
+
+TS80\* is a successor to TS100:
+
+- uses _Quick Charge 3.0_ / _QC3_ capable charger only (18W max);
+- doesn't support PD as it is not designed on the hardware level;
+- the default firmware can be found [here](https://www.minidso.com/forum.php?mod=viewthread&tid=3208&extra=page%3D1).
+
+![](https://core-electronics.com.au/media/catalog/product/4/2/4244-01.jpg)
+
+
+### TS80P
+
+TS80P\* is a successor to TS80:
+
+- supports _Quick Charge 3.0_ (_QC3_: 9V/3A, 18W max);
+- supports _Power Delivery_ (_PD_: 9V/3A & 12V/3A, 30W max)\*\*;
+- the default firmware can be found [here](https://www.minidso.com/forum.php?mod=viewthread&tid=4085&extra=page%3D1).
+
+\*\*: use valid PD device that supports 12V/3A as power source to get full 30W potential, otherwise the iron will fall back to 9V/18W power mode.
+
+![](https://static.eleshop.nl/mage/media/catalog/product/cache/10/image/800x/040ec09b1e35df139433887a97daa66f/s/-/s-l1600_5.jpg)
+
+
 ### MHP30
 
-- Accelerometer is the MSA301, this is mounted roughly in the middle of the unit
-- USB-PD is using the FUSB302
-- The hardware I2C bus on PB6/7 is used for the MSA301 and FUSB302
-- The OLED is the same SSD1306 as everything else, but it’s on a bit-banged bus
+MHP30 is a **M**ini **H**ot **P**late:
+
+- accelerometer is the MSA301, this is mounted roughly in the middle of the unit;
+- USB-PD is using the FUSB302;
+- the hardware I2C bus on PB6/7 is used for the MSA301 and FUSB302;
+- the OLED is the same SSD1306 as everything else, but it’s on a bit-banged bus.
+
+
+### Pinecil
+
+Pincecil\*:
+
+- first model of soldering iron from PINE64;
+- the default firmware can be found [here](https://files.pine64.org/os/Pinecil/Pinecil_firmware_20201115.zip).
+
+![](https://pine64.com/wp-content/uploads/2020/11/pinecil-bb2-04.jpg?v=0446c16e2e66)
+
+
+\*: Please note: these soldering irons do *NOT* contain DC/DC converters. This means that your power at the tip is a function of the supplied voltage. Just because the iron "supports" running at a wide range of voltages, you should always use a voltage near the upper limit where possible. It is highly recommended to use a PD adapter where possible as this allows the iron to _know_ the limitations of your supply. The marked irons can only turn the tip on and off in software, this means that they can't control the maximum power drawn from the supply. This is why when using PD the iron may select a lower voltage than your power supplies maximum. This is to prevent your power supply failing from over current. For more information about power management underhood, please, [see the related documentation section](https://ralim.github.io/IronOS/Power/).
+
+

Documentation/History.md

@@ -1,6 +1,36 @@
 # Version Changes
 
-## V2.19
+
+# V2.21
+
+### Features & changes
+
+- Bluetooth Low Energy support for PinecilV2
+- Large cleanup of translation files; and refactor of how we handle fonts for translations
+- Fixes for I2C corruption on PinecilV2
+- Option for using adjustable profiles on USB-PD or not
+- Cleanups and improvements to the generated [documents website](https://ralim.github.io/IronOS)
+
+### PinecilV2 notes
+
+For Pinecil V2 users blisp is currently my recommended CLI tool for updating the device. It is built for all main OS's automatically. This does not apply to V1 devices. If your iron came with a blue grip, its a V1 and update the same as always. If your device came with a green silicone grip its a V2 device.
+
+Alternatively you can use Spagett1's PineFlash tool that should provide a GUI interface for PinecilV1 & PinecilV2.
+
+For a small number of V2 Pinecil devices there appears to be an interference issue between the Bluetooth Low Energy and some devices; more information here. If this occurs to you, please let us know in the issue and rollback to 2.20 for now.
+
+
+# V2.20
+
+- First "full" release for PinecilV2
+- Loots of documentation updates
+- Documentation is [now nicely readable as a site](https://ralim.github.io/IronOS/GettingStarted)
+- A fair collection of bugfixes for PinecilV2
+- Cold Junction Calibration was reworked and now occurs _at next boot_ to make it easier to perform when the device is cold
+
+
+# V2.19
+
 - Bug-fix Infinite Boot Logo
 - Shutdown settings for MHP30
 - Accelerometer sensitivity for MHP30
@@ -9,7 +39,9 @@
 - Updated translations
 - Improved documents, added features table
 
-## V2.18
+
+# V2.18
+
 - Support for animated bootup logo's
 - Bootup logo's moved to their own IronOS-Meta repo
 - New Vietnamese translation (limited due to screen size)
@@ -17,8 +49,11 @@
 - Updated translations
 - Better Instructions/documents
 
-## V2.17
-### Big changes
+
+# V2.17
+
+### Features & changes
+
 - Indicate status of VBus for modding Pinecil (debug menu)
 - Better hall effect sensor sensitivity adjustment (larger range with more steps)
 - Temperature increment will "round" to nearest multiple of increase amount
@@ -32,7 +67,9 @@
 - Fixed automatic orientation for newer TS80P's with the SC7 accelerometer
 - User interface slight changes
 - New `metadata.zip` file to allow the Pine Updater to automatically fetch information on releases
+
 ### Notes
+
 - VBus mod detection may not play well with all PPS chargers. If your iron reboots when you view this in the debug menu its not a fault. ([#1226](https://github.com/Ralim/IronOS/issues/1226))
 - `metadata.zip` is only designed for use by automatic software, ignore it for normal use
 - More details on Pinecil VBus mod coming via other channels.
@@ -41,39 +78,38 @@
 - -> Release has been updated to build `e065be3` after one bug with the BMA223 was found.
 
 
-## V2.16
+# V2.16
 
-* Overhaul of the Timer+ADC setup with help from @sandmanRO
-* Overhaul of the PID with help from @sandmanRO
-* 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
+- 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
+# V2.15
 
+### Features & changes
 
-## 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 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
+### MHP30 support
 
 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.
@@ -84,7 +120,8 @@ Programs the same as any one Miniware unit using drag and drop.
 
 The flood doors are now open for feature requests for this unit :)
 
-## V2.14
+
+# V2.14
 
 - Fixing auto rotation bug in the LIS accelerometer in the TS80/TS80P
 - Adds support for two new accelerometers
@@ -101,7 +138,8 @@ The flood doors are now open for feature requests for this unit :)
 - Cleanup the folder name of the source code #800
 - clang-format spec setup #801
 
-## V2.13
+
+# V2.13
 
 - First _official_ Pinecil release
 - All of the wire for Pinecil releases added
@@ -118,7 +156,8 @@ The flood doors are now open for feature requests for this unit :)
 - Fixed bug with accelerometer model on Pinecil
 - Rework of all of the temperature curves for better accuracy
 
-## V2.12
+
+# V2.12
 
 - Only released as pre-release
 - [TS80P] Improvements to the PD negotiation to handle a few more adapters cleanly
@@ -126,36 +165,42 @@ The flood doors are now open for feature requests for this unit :)
 - Clean up the menu (removed both enables and settings, so that you can turn things off easier)
 - Removing the very old single line menu style.
 
-## V2.11
+
+# V2.11
 
 - First TS80P support
 - Added in a USB-PD driver stack for the FUSB302
 - Fixed some graphical glitches
 
-## V2.10
+
+# V2.10
 
 - GUI polish (animations and scroll bars)
 - Power pulse to keep power supplies alive
 - Adjustable tip response gain
 
-## V2.09
+
+# V2.09
 
 - Adjustable steps in temperature adjustment
 - Git hash now in build string
 - Adjustable language to set if US units are available or not
 - Some minor QC3 improvements
 
-## V2.08
+
+# V2.08
 
 - Fixes auto start in sleep mode
 - Power limiters
 
-## V2.07
+
+# V2.07
 
 - QC fixes
 - Cosmetic fixes for leading 0's
 
-## V2.06
+
+# V2.06
 
 - Warning on settings reset
 - Temp temp re-write
@@ -163,27 +208,33 @@ The flood doors are now open for feature requests for this unit :)
 - Hide some leading 0's
 - Menu timeouts
 
-## V2.05
+
+# V2.05
 
 - Language updates
 
-## V2.04
+
+# V2.04
 
 - GUI updates
 
-## V2.03
+
+# V2.03
 
 - Support for new accelerometers
 
-## V2.02
+
+# V2.02
 
 - Adds small font
 
-## V2.01
+
+# V2.01
 
 - Newer settings menu
 
-## V2.00
+
+# V2.00
 
 - Complete re-write of the low layer system to use the STM32 HAL for easier development
 - This allowed easier setup for the new ADC auto measuring system
@@ -193,80 +244,96 @@ The flood doors are now open for feature requests for this unit :)
 - Added detailed screen views
 - Added smaller font for said screen views
 
-## V1.17
+
+# V1.17
 
 - Added blinking cooldown display
 - Allowed smaller sleep timeout values
 - New font!
 - Automatic startup option
 
-## V1.16
+
+# V1.16
 
 - Added automatic rotation support
 - Added power display graph
 
-## V1.15
+
+# V1.15
 
 - Added support for a custom bootup logo to be programmed via the DFU bootloader
 
-## V1.14
+
+# V1.14
 
 - Changed input voltage cutoff to be based on cell count rather than voltage
 
-## V1.13
+
+# V1.13
 
 - Swapped buttons for menu to prevent accidentally changing first menu item
 - Added auto key repeat
 
-## V1.12
+
+# V1.12
 
 - Increases sensitivity options to be 1\*9 with 0 off state
 - Fixes issue where going from COOL \*> soldering can leave screen off
 
-## V1.11
+
+# V1.11
 
 - Boost mode
 - Change sensitivity options to be 1\*8
 
-## V1.10
+
+# V1.10
 
 - Adds help text to settings
 - Improves settings for the display update rate
 
-## V1.09
+
+# V1.09
 
 - Adds display modes, for slowing down or simplifying the display
 
-## V1.08
+
+# V1.08
 
 - Fix settings menu not showing flip display
 
-## V1.07
+
+# V1.07
 
 - Adds shutdown time to automatically shutdown the iron after inactivity
 
-## V1.06
+
+# V1.06
 
 - Changes H and C when the iron is heating to the minidso chevron like images
 
-## V1.05
+
+# V1.05
 
 - Adds ability to calibrate the input voltage measurement
 
-## V1.04
+
+# V1.04
 
 - Increased accuracy of the temperature control
 - Improved PID response slightly
 - Allows temperature offset calibration
 - Nicer idle screen
 
-## V1.03
+
+# V1.03
 
 - Improved Button handling
 - Ability to set motion sensitivity
 - DC voltmeter page shows input voltage
 
-## V1.02
+
+# V1.02
 
 - Adds hold both buttons on IDLE to access the therometer mode
 - Changes the exit soldering mode to be holding both buttons (Like original firmware)

Documentation/Logo.md

@@ -1,56 +1,79 @@
-# Startup Logos
+# Startup Logo / Animation
 
-This firmware supports a user created bootup logo.
-By default, there is _not_ one included in the firmware. This means that once flashed they generally stay. If you want no logo again, you would have to flash a blank image to the bootup logo. 
+When the device starts, you can have it optionally show either a static image or an animation. You can also set if these should stay on the screen or dismiss after some amount of time.
+These can be an elegant way to personalise your device or just mark it as your one at a meetup where there may be multiple.
+
+All devices supported by IronOS support this logo, and follow a similar process for setting one up. Please read the below general information as well as any model specific notes.
+
+Bootup logos are stored at the end of the flash storage in the Iron; next to the user settings. By locating them at the end of storage they are not erased during the normal firmware upgrade process. Once a logo is set it should stay (unless we need to change things in the main firmware); so to erase your logo you will also find that we generate an erase file. Alternatively your method of flashing _may_ support doing a full erase flash which will also work for this.
 
 ## Generating the Logo files
 
-There are community logo's already converted and ready to use in [IronOS-Meta/releases](https://github.com/Ralim/IronOS-Meta/releases).
+Because logos are stored at a fixed location in the device's internal flash; we can use the same method to flash these as you would normal firmware.
+This does also mean that we need to convert the image/animation file into the format that IronOS understands.
+
+IronOS uses a pre-processed file format to dramatically reduce the amount of space required to store the image; allowing for animations and saving space.
+
+In the [IronOS-Meta](https://github.com/Ralim/IronOS-Meta) repository is a `python` script to convert images into this pre-processed file format.
+Additionally, memebers of the community have contributed back their logo images as well. We provide these pre-converted for all models and ready to use in [IronOS-Meta/releases](https://github.com/Ralim/IronOS-Meta/releases).
 Download the zip for Pinecil or Miniware and then install using the instructions in the Flashing section below.
 
-If you want to make custom art then it needs to be converted with a Python script. The script and other needed files are in [IronOS-Meta](https://github.com/Ralim/IronOS-Meta/). Go to that folder, then it is easiest to select the green Code button (upper right), then Download Zip. This way you get all the files you need and some extras. You only need what is inside Boot Logos. Put your custom image inside the Boot Logos folder with all python script files already there.
+If you want to make custom art then it needs to be converted with the Python script.
+You can checkout the repository or use the download-as-zip button in the Github web interface to download the code.
 
-The Python script converts an image passed into it on the command line into both a `.hex` file and a `.dfu` to be uploaded to the iron in DFU mode. The image can be in color and any size, but it will be resized and converted to 1-bit color. However, it looks best if you create a 96x16 image (Png or Bmp) in any image editor and color the pixels black & white manually.
+Inside the download code is a `Boot Logos` folder, inside here is the python script required for logo conversion.
+It is easiest if you copy your logo file to be converted into this folder too, in order to keep commands shorter.
 
-The converter requires at least Python3 and Pillow apps. Follow online instructions for installing Python and Pillow.
+The image can be in color and any size, but it will be resized and converted to 1-bit color. However, it looks best if you create a 96x16 image (`png` or `bmp`) in any image editor and color the pixels black & white manually. The thresholding used for converting colour to B&W may not always work as well as one would hope.
 
-For Windows, it is recommended to use Windows PowerShell instead of Command.
-Open Powershell (run as administrator), type python to install it, it will open microsoft store where you can install it free.
-Go back to Powershell and install Pillow. What works can vary, but this command may work:
+The converter requires at least Python3 and Pillow apps. Follow online instructions for installing Python and Pillow on your machine. Any reasonably recent version should work well.
 
-    python -m pip install Pillow
-or 
-    python3 -m pip install pillow
+When running the script on the Windows operating system; it is recommended to use `Powershell` rather than the old `Command Prompt`.
 
-If the above does not work, see [this page](https://stackoverflow.com/a/20061019/6705343) on StackOverflow about installing Pillow.
-Now that Python and Pillow are successfuly installed, you can convert an image.
+For installing pillow; you can install it via your package manager (Debian and similar distros) or via pip. To install via pip the command should be `python -m pip install pillow`.
 
-Go back to Powershell and type this command (change infile.png to the name of your image):
+In your shell you can now execute `python img2logo.py input.png out -m ${model}` to convert the file `input.png` and create output files in the folder `out`.
+The model should be replaced by one of the following options:
 
-- `python img2logo.py infile.png out -m`  for Miniware
-- `python img2logo.py infile.png out -p`  for Pinecil
+- `miniware` for older Miniware Irons -> TS100, TS80, TS80P
+- `pinecilv1` for the Pinecil V1
+- `pinecilv2` for the Pinecil V2
+- `ts101` for the Miniware TS101 [^1]
+- `s60` for the Squire S60 [^1]
+- `mhp30` for the Miniware MHP30
 
-Run `python img2logo.py --help` to see available options. Replace the word python with python3 if you have multiple versions of python installed. 
+Different models are used for different flash locations for the image storage.
+This means that files are **not** interchangeable between devices. If you are flashing multiple devices you will need to create a different file for different models.
+
+After processing its expected to have a `.hex` and `.dfu` file created to be used. Which one to use will depend on your device.
 
 Note: make sure your image file is in the same folder as script files (img2logo.py, output_dfu.py, output_hex.py).
 
+[^1] Note that these devices have larger resolution screens that the logo system supports right now. Fixes are coming for this soon, roughly scheduled for 2.23.
+
 ## Flashing the Logo
 
-### Miniware (TS100/TS80/TS80P)
+### Upload via virtual disk (TS100,TS101,TS80,TS80P,S60,MHP30)
 
-Upload the HEX file to the iron in DFU mode and, if the file's extension changes to .RDY, your custom splash screen should show up on startup.
-You perform this the same way as if you were flashing a new firmware, and all the existing notes around this apply.
+If you normally update your firmware by having your device show up as a flash drive this is the method for you.
+This applies to all Miniware + S60 devices running the stock DFU bootloader.
 
-If you have flashed the `IronOS-dfu` alternative bootloader, you should use the `.dfu` files instead
+Place your device into update mode (usually by holding the B button when connecting your device to your pc via USB).
+Upload the `.hex` file you created earlier as if it was a firmware update. Do any normal tricks required for firmware flashing if any are required.
+Afterwards the firmware should indicate that it has worked (often by creating a `.rdy` file).
 
-### Pinecil V1
+At this point unplug your iron and re-connect it to power to start normally and the logo should welcome you.
 
-For Pinecil V1, we require using dfu-util to flash the logo art (Pinecil does not use hex).
-[Pine64 Updater](https://github.com/pine64/pine64_updater/releases) is the easiest way to load the Bootup logo onto Pinecil as it already includes the necessary DFU library. Connect Pinecil to a PC, and open the Updater the same as updating firmware.
-  Select Custom > Browse to the DFU image file you just made > Update to install.
+### Upload via GUI flash tool (PinecilV1/V2)
 
-The bootup logo is stored in a separate location than the IronOS firmware and you do not have to worry about it changing or breaking the IronOS.
+If you normally upload your firmware using a helper application, they should accept the files from the bootlogo the same as the normal firmware.
+Try the `.dfu` file first and then the `.hex`. If neither work then the application may not be updated to be able to handle boot logos. And you may need to use a different/newer tool.
 
-You could also use dfu-util and use Command line to install it.
+### Upload via dfu-util (PinecilV1/IronOS-DFU)
 
-- `dfu-util -D logo_file.dfu`
+For the PinecilV1 and for any devices that have been converted to use `IronOS-DFU` as the bootloader you can flash these via the `dfu-util` command line tool.
+For these flash as per usual using the `.dfu` file. Afterwards power cycle and the logo should show up.
+
+### Upload via blisp (PinecilV2)
+
+For the PinecilV2 we suggest `blisp` as the command line tool to use if you are not using a GUI tool. `blsip` has been updated to accept `.dfu` files as well as the `.bin` files it historically used. As such you use the `.dfu` file for the logo and flash as per normal otherwise and it will work and reboot at the end. It should show you your new logo after flashing.

Documentation/Menu.md

@@ -9,6 +9,12 @@ In this mode the iron works as you would expect, pressing either button will tak
 - Pressing both buttons or holding the rear button (`-/B`) will exit Soldering Mode.
 - Holding the front button (`+/A`) will enter [Boost mode](https://ralim.github.io/IronOS/Menu/#boost-mode) (if enabled).
 
+## Profile mode (MHP30 only)
+
+In this mode, accessible by long pressing `(+/A)`, the configured profile will be initiated.
+- You cannot adjust the temperature or enter boost mode.
+- Pressing both buttons or holding the rear button (`-/B`) will exit Profile Mode as well.
+
 ## Settings mode
 
 This mode allows you to cycle through all the options and set custom values.

Documentation/Power.md

@@ -20,6 +20,8 @@ The resistance of the tip is a fixed constant in ohms (Ω):
 This means the power delivered to the soldering tip is proportional to the voltage squared.
 Therefore the Pinecil and TS100 perform poorly when run off 12V power supplies and may issue a `Thermal Runaway` message (weak power supply).
 
+
+
 #### Use an [Ohm calculator](https://www.rapidtables.com/calc/electric/power-calculator.html#dc) to quickly derive watts.
 
 | Type       | Volts| / | Tip Ω | = |  Amps | * | Volts | = | Watts |
@@ -44,3 +46,8 @@ To measure the tip temperature in the iron, the iron has a small op-amp connecte
 Once the output is turned off (via the FET), the system has a recovery time as the tip capacitance discharges and the op-amp exits saturation. After this delay period, the MCU's ADC (analog-to-digital converter) samples the output of the op-amp 8 times quickly and then sets a flag to turn the PWM output back on.
 This enforces a small dead time in the output signal while this occurs, so there is a balance between sampling the temperature often to maintain a stable tip temperature control and sampling less often to increase the maximum power deliverable to the tip ([see Complexity of measurement](https://ralim.github.io/IronOS/Temperature/#complexity-of-measurement)).
 
+
+
+## Power sources
+
+Supported by IronOS hardware may use different power sources (chargers/powerbanks/battery packs) with different standards & protocols (QC/PD/etc). For more information collected by the community on that, please, [see the related documentation section](https://ralim.github.io/IronOS/PowerSources/).

Documentation/PowerSources.md

@@ -0,0 +1,80 @@
+# Power sources
+
+Supported by IronOS hardware may use different power sources (chargers/powerbanks/battery packs) with different standards & protocols (QC/PD/etc). This document contains information collected by the community with tested power sources.
+
+This is not ads but first hands-on experience results from real users since some chargers/powerbanks regardless labels on the box may not fully support what's declared!
+
+
+## QC(3)
+
+
+### Compatible Devices (QuickCharge for TS80/P)
+
+The following table is the list of compatible device and remarks when powering up the TS80 through it for both stock firmware from MiniDso and IronOS. The list of devices below are primarily taken from [#349](https://github.com/Ralim/ts100/issues/349#issuecomment-449559806)
+
+| Device Name | Stock FW | IronOS FW |
+|-------------|:--------:|:---------:|
+| Anker PowerCore II Slim 10000 Powerbank | Not Working | Good |
+| [Aukey 26.5/30 Ah Powerbank (PB-Y3)](https://www.aukey.com/products/30000mah-power-bank-with-quick-charge-3-0/) | OK\*\* (15sec t/o) | OK\*\* (15sec t/o) |
+| Aukey QC3 Charger | Good | Only 5V |
+| [Aukey QC3 Charging Station (PA-T11)](https://www.aukey.com/products/6-port-charging-station-with-quick-charge-3-0-pa-t11/) | Good | Good |
+| Besiter 20000mah QC3 | Not Working | Only 5V |
+| BlitzWolf BW-P5 | Not Working\* | Unknown |
+| BlitzWolf BW-PF2 | OK\*\* (10sec t/o) | OK\*\* (10sec t/o) |
+| BlitzWolf BW-PL3 | Low Voltage | OK |
+| BlitzWolf BW-PL4 | Unknown | Not Working |
+| BlitzWolf BW-S6 | Unknown | OK |
+| Charmast 20800 mAh QC 3.0 | Low Voltage\* | Good |
+| Clas Ohlson Powerbank USB-C 10050 mAh, Clas Ohlson | Unknown | OK\*\* |
+| [Cygnett 20,000mAh USB-C](https://www.cygnett.com/products/20-000mah-usb-c-power-bank-in-black)| Not Working | Good |
+| [HAME H13D](https://www.amazon.com/dp/B07GWMFW82) 10000mAh PD/QC3.0 Power Bank | OK\*\* (30sec t/o) | OK\*\* (30sec t/o?) |
+| HIPER 10000 mAh 18W PD+QC3.0 (MPX10000) | Low Voltage | OK\*\* (30sec t/o) |
+| [iMuto Portable Charger 30000mAh](https://www.amazon.com/gp/product/B01MXCMGB8/ref=ppx_yo_dt_b_asin_title_o05_s00) | Low Voltage | Good |
+| ISDT BG-8S | Good | Good |
+| [iVoler Quick Charge 3.0 USB C 30W 2-Port USB](https://www.amazon.de/dp/B077P8ZZB8/) | Good | Good |
+| [imuto X6L Pro 30000 mah](https://www.amazon.com/dp/B01MXCMGB8) | Not Working | Bad |
+| Interstep 10000 mAh 18W PD+QC3.0+FCP+AFC (MPX10000) | Good | OK\*\* (30sec t/o) |
+| Jackery Black 420 | Low Voltage | Good |
+| Kogan Premium 80W 5 Port USB Charger| Low Voltage | Good |
+| Nokia AD-18WE | Unknown | OK |
+| [Omars 2000mAh USB-C PD+QC3.0 (OMPB20KBUPLT / OMPB20KPLT)](https://www.amazon.com/dp/B07CMLVR6C) | OK\*\* (20sec t/o) | Unknown |
+| Polaroid PS100 Powerbank (https://polaroid.com/products/ps100) | Good | Good |
+| Xiaomi 10000mAh Mi Power Bank Pro (PLM03ZM) | Good | Unknown |
+| Xiaomi 10000mAh Mi Power Bank 2i (PLM09ZM) | Good | Good |
+| Xiaomi 20000mAh Mi Power Bank 3 (PLM07ZM) | Unknown | Good Type A, Bad Type C |
+| [ZeroLemon ToughJuice](https://www.amazon.com/dp/B01CZR3LT2/) 30000mAh PD/QC2.0 Power Bank | OK\*\* (20sec t/o) | OK\*\* (20sec t/o?) |
+| [URUAV XT-60 to USB module](https://www.banggood.com/URUAV-XT-60-to-USB-Charger-Converter-Support-3S-6S-LiPo-Battery-10_5V-32V-Input-3V-20V-Output-45W-Max-Fast-Charging-Adapter-For-RC-Racing-Drone-p-1475876.html) | Unknown | Good |
+
+
+\* Need further tests on newer firmware
+
+\*\* Most Power Banks shut down if current draw drops below 50mA, assuming that charging is complete and avoiding overcharging. Custom firmware is designed to avoid this until it enters Zzzz mode.
+
+
+### DIY QC3.0
+
+You may also build your own QC3.0 power source that requires this little [thing](https://www.tindie.com/products/soubitos/qualcomm-qc2-3-diy-8-32vin-36-12vout-3a-max/) and have at least 3S lithium packs or any input voltage from 8 to 32V.
+
+You can also go for an [alternate module](https://www.banggood.com/DC-Buck-Module-12V24V-to-QC3_0-Single-USB-Mobile-Charging-Board-p-1310585.html) which has at least one good review of it.
+
+**DISCLAIMER:** _**We do not hold any responsibility for accidents that happen when building your own QC3.0 power source!!!**_
+
+
+## PD
+
+The following additional table is the list of devices compatible with hardware which requires Power Delivery support (>= 30W). Devices from the list have been successfully tested & used with TS80P in PD mode. Please, keep in mind that:
+
+- PD can be provided only through usb-c <-> usb-c cable;
+- not only a charger but a cable itself should be capable to carry higher wattages.
+
+
+### Compatible Devices (PowerDelivery for TS80P)
+
+| Device Name | IronOS FW |
+|-------------|:---------:|
+| Traver Charger QC09 (45W max)\* | OK |
+| Xiaomi AD65GEU Mi 65W Fast Charger with GaN Tech (AD65GEU, 65W max) | OK |
+
+\* Comes as an _option_ for extra price in the package with TS80P from [official store](https://aliexpress.com/item/4000764937427.html) or from [NovelLife store separately](https://aliexpress.com/item/4001316262433.html) on AliExpress.
+
+Please, DO NOT BUY cheap "fast chargers with QC/PD support" for a few dollars online (i.e., less than ~10$): if you check reviews, then you see that they are phonies - even if you get lucky, you probably get 5V/1A max from them.

Documentation/README.md

@@ -0,0 +1,32 @@
+
+<!-- THIS FILE IS AUTOGENERATED by "scripts/deploy.sh docs_readme" based on nav section in scripts/IronOS-mkdocs.yml config -->
+<!-- THIS FILE IS NOT SUPPOSED TO BE EDITED MANUALLY -->
+
+#### This is autogenerated README for brief navigation through github over official documentation for IronOS project
+#### This documentation is also available [here online](https://ralim.github.io/IronOS)
+
+  - [Home](../Documentation/index.md)
+  - [Getting Started](../Documentation/GettingStarted.md)
+  - Flashing the firmware
+      - [MHP30](../Documentation/Flashing/MHP30.md)
+      - [Pinecil V1](../Documentation/Flashing/Pinecil%20V1.md)
+      - [Pinecil V2](../Documentation/Flashing/Pinecil%20V2.md)
+      - [TS80(P)](../Documentation/Flashing/TS80(P).md)
+      - [TS100](../Documentation/Flashing/TS100.md)
+  - Operation
+      - [Main Menu](../Documentation/Menu.md)
+      - [Settings](../Documentation/Settings.md)
+      - [Debug Menu](../Documentation/DebugMenu.md)
+      - [Power](../Documentation/Power.md)
+      - [Temperature](../Documentation/Temperature.md)
+  - [Startup Logo](../Documentation/Logo.md)
+  - Hardware
+      - [Hall Sensor (Pinecil)](../Documentation/HallSensor.md)
+      - [Bluetooth (Pinecil V2)](../Documentation/Bluetooth.md)
+      - [Hardware Notes](../Documentation/Hardware.md)
+      - [Troubleshooting](../Documentation/Troubleshooting.md)
+      - [Known Hardware Issues](../Documentation/HardwareIssues.md)
+      - [Power sources](../Documentation/PowerSources.md)
+  - [Translations](../Documentation/Translation.md)
+  - [Development](../Documentation/Development.md)
+  - [Changelog](../Documentation/History.md)

Documentation/Troubleshooting.md

@@ -14,6 +14,18 @@ But it is helpful to do some basic diagnostics first just in case the issue is e
 The **VAST** majority of issues are poor soldering or cold solder joints.
 If you can open up your iron, give it a good look at all the connection points, and use another iron to reflow any suspicious ones, this can fix most issues.
 
+## Tip Shorted warning
+
+If you are powering up a device that supports tip resistance detection (TS101 and Pinecilv2 as of present), the firmware checks the readings of the raw tip resistance and sorts these into three "bins". `8 ohm tips`, `6.2 ohm tips` and `tip-shorted`. The tip resistance is used when negotiating USB-PD and in thermal calculations.
+The `tip-shorted` option is selected if your tip is measured to be abnormally small. This could indicate a failed driver mosfet or a failed tip.
+
+When this warning is shown; heating will be disabled to protect from damage. As trying to heat a shorted tip can damage the iron itself.
+
+It is best to take out your tip and manually measure and verify the tip's resistance. It should be 6-8 ohms (depending on tip type). When measuring resistances this small some multimeters can struggle. If you have access to a current limited bench power supply, you can try doing a 4 wire measurement by measuring the voltage drop on the tip while applying a known current. `(R=V/I)`.
+
+If the tip measures correctly you may have a damaged driver mosfet; it would be ideal to open your iron and test the mosfet is operating correctly.
+If after both of these checks everything looks as expected, feel free to open a discussion on IronOS to talk about the issue (Or for Pinecil the community chat can be a much faster response).
+
 ## High tip temp reading when the tip is cool
 
 If you are finding the tip is reading high; the first fields to check in the Debug menu are `RTip` and `CHan`.
@@ -63,10 +75,23 @@ If the tip does not heat up, it is worth trying to reflash the firmware first in
 The main failure mode of the OLED display module is usually poor soldering on the OLED display cable to the main PCB.
 As this is soldered by hand generally, it's the most prone to failures.
 
-If you have a poor connection or a floating pin, you can end up with a state where the screen works _sometimes_ and then freezes or only works on some power cycles. It might work on very old versions of IronOS but not the newest ones. You could try to reflow the pins for the OLED. On 96x16 screens, carefully peel it back from the adhesive and reflow the solder on the pins. If needed, replacement Oled screens are common and low cost.
+If you have a poor connection or a floating pin, you can end up with a state where the screen works _sometimes_ and then freezes or only works on some power cycles. It might work on very old versions of IronOS but not the newest ones. You could try to reflow the pins for the OLED. On 96x16 screens, carefully peel it back from the adhesive and reflow the solder on the pins.
 
 As the OLED runs on an I2C bus, there are pull up resistors on the SDA and SCL pins. It is worth checking these as well, while they don't often fail, issues with these can cause _weird_ display issues.
 
+If after all of the checks OLED is still blank, or screen works but pixels are barely visible, although soldering iron itself is working (i.e., you can safely check that it's turning on, heating up & melting solder successfully), then it means that _most likely_ OLED is dead. But it can be relatively easily replaced. Models like `TS100`, `TS80`, and `TS80P` share the same OLED screen which can be bought online and used for replacement. To do so:
+
+- find & buy at electronics shop [of your choice] display with the following spec line:  
+```OLED 0.69 inch / 14 pins / 96 x 16 pixels / **9616TSWC** / I2C IIC```
+
+- disassemble your soldering iron;
+- desolder old OLED and solder back new one;
+- assemble your soldering iron back.
+
+There are a few youtube videos how to do it like [this one for `TS100`](https://www.youtube.com/watch?v=HlWAY0oYPFI).
+
+Unfortunately, this is a well-known issue of screens with OLED technology: sooner or later the brightness is starting to _"fade out"_ until complete off. Usually common recommendations to prolong its lifetime are: reduce brightness & reduce too often updates (i.e., disable animations). But your results may vary since there were reports when users couldn't see anything after turning on soldering irons which were just laying in a box for a few months after buying. And there are users with first `TS100` models not having any issues with display at all.
+
 ## Tip heats when not in heating mode
 
 ⚠️ DISCONNECT YOUR TIP ⚠️

Documentation/index.md

@@ -8,7 +8,7 @@ For soldering irons that are designed to be powered by batteries (TS100 & Pineci
 
 Currently **31** languages are supported. When downloading the firmware for your soldering iron, take note of the language code in the file name.
 
-This project is considered feature complete for use as a soldering iron, _so please suggest any feature improvements you would like!_
+This project is considered stable & feature complete for everyday use with a supported device, _so please suggest any feature improvements you would like!_
 
 _This firmware does **NOT** support the USB port while running for changing settings. This is done through the onscreen menu only. Logos are edited on a computer and flashed like firmware._
 
@@ -39,6 +39,12 @@ For notes on installation for your device, please refer to the flashing guide fo
 - [TS80 / TS80P](https://ralim.github.io/IronOS/Flashing/TS80%28P%29/)
 - [TS100](https://ralim.github.io/IronOS/Flashing/TS100)
 
+But the _generic_ [TL;DR](https://www.merriam-webster.com/dictionary/TL%3BDR) is to:
+
+- [download firmware from here](https://github.com/Ralim/IronOS/releases) for the correct model with suitable language support;
+- put a device into DFU/bootloader mode (usually by keep holding A/+/front button while connecting a device to power source to power device on);
+- flash the firmware by drag-n-drop the firmware file using a file manager of your OS **or** using a separate flashing tool.
+
 ## Key Features
 
 - PID style iron temperature control
@@ -70,3 +76,25 @@ When on the main screen and having the tip plugged in, the unit shows a pair of
 - Holding down the button near the USB end will show the _[debug menu](https://ralim.github.io/IronOS/DebugMenu/)._ In _soldering mode_ this ends the heating.
 
 Operation details are over in the [Menu information.](https://ralim.github.io/IronOS/Menu/)
+
+## Feedback
+
+If you would like to:
+
+- report any issue related to IronOS
+- request a feature
+- provide some suggestion
+
+then you can [fill this form](https://github.com/Ralim/IronOS/issues/new/choose) using github account\*.
+
+And if you would like to:
+
+- ask more generic question about IronOS/supported hardware/something you're curious about/etc.
+- reach out community to chat with
+- share your soldering & DIY skills
+- share some interesting finding
+- share useful related hardware/software with others
+
+or _anything_ like that, then you can use forum-like [Discussions here](https://github.com/Ralim/IronOS/discussions).
+
+\*: You may need to create it first if you don't have one - it's free of charge.

Env.yml

@@ -6,7 +6,7 @@ services:
     tty: true
     build:
       context: .
+      dockerfile: scripts/IronOS.Dockerfile
     command: /bin/sh
     volumes:
-      - ./ci:/build/ci:Z
-      - ./:/build/source:Z
+      - ./:/build/ironos:Z

Makefile

@@ -0,0 +1,245 @@
+#!/usr/bin/env make
+INFO:=top-level Makefile for IronOS - Soldering Iron Open Source Firmware Project.
+
+
+### global adjustable variables
+
+# command for "docker compose" from DOCKER env. var.
+ifdef DOCKER
+DOCKER_BIN:=$(DOCKER)
+else
+DOCKER_BIN:=
+endif
+
+# detect availability of docker
+ifndef DOCKER_BIN
+DOCKER_COMPOSE:=$(shell command -v docker-compose 2>/dev/null)
+DOCKER_TOOL:=$(shell command -v docker 2>/dev/null)
+ifdef DOCKER_COMPOSE
+DOCKER_BIN:=$(DOCKER_COMPOSE)
+else ifdef DOCKER_TOOL
+DOCKER_BIN:=$(DOCKER_TOOL) compose
+endif # DOCKER_* checks
+endif # DOCKER_BIN
+
+# command for python-based mkdocs tool
+ifndef MKDOCS
+MKDOCS:=mkdocs
+endif
+
+# build output related directories
+ifdef OUT
+OUT_DIR=$(OUT)
+else
+OUT_DIR=$(CURDIR)/BUILDS
+endif
+OUT_HEX=$(CURDIR)/source/Hexfile
+
+
+### global static variables
+
+# docker-related files
+DOCKER_YML=$(CURDIR)/Env.yml
+DOCKER_FILE=$(CURDIR)/scripts/IronOS.Dockerfile
+
+# docker dependencies
+DOCKER_DEPS=$(DOCKER_YML) $(DOCKER_FILE)
+
+# compose docker-compose command
+DOCKER_CMD=$(DOCKER_BIN)  -f $(DOCKER_YML)  run  --rm  builder
+
+# MkDocs config
+MKDOCS_YML=$(CURDIR)/scripts/IronOS-mkdocs.yml
+
+# supported models
+MODELS=TS100 TS80 TS80P Pinecil MHP30 Pinecilv2 S60 TS101 # target names & dir names
+MODELS_ML=Pinecil  Pinecilv2 # target names
+MODELS_MULTILANG=Pinecil_multi-lang  Pinecilv2_multi-lang # dir names
+
+# zip command (to pack artifacts)
+ZIP=zip -q -j -r
+
+
+### targets
+
+# default target to show help
+help:
+	@echo
+	@echo "Welcome!"
+	@echo "This is $(INFO)"
+	@echo "To read more about supported commands (aka \"targets\"), type \"make list\"."
+	@echo "But if you're impatient then just type \"make docker-build\" - it will:"
+	@echo "  * download, configure & start docker container"
+	@echo "  * compile builds of IronOS firmware for all supported models inside that container"
+	@echo "  * export generated binaries to \"scripts/ci/artefacts/\" local directory"
+	@echo "Patches are welcome. Happy Hacking!"
+	@echo
+
+# target to list supported targets with additional info
+list:
+	@echo
+	@echo "Supported top-level targets:"
+	@echo "  * help               - shows short basic help"
+	@echo "  * list               - this output"
+	@echo "  * docker-shell       - start docker container with shell inside to work on IronOS with all tools needed"
+	@echo "  * docker-build       - compile builds of IronOS for supported models inside docker container and place them to $(OUT_DIR) (set OUT env var to override: OUT=/path/to/dir make ...)"
+	@echo "  * docker-clean       - delete created docker image for IronOS & its build cache objects (to free a lot of space)"
+	@echo "  * docker-clean-cache - delete build cache objects of IronOS docker image EXCEPT the image itself"
+	@echo "  * docker-clean-image - delete docker image for IronOS EXCEPT its build cache objects"
+	@echo "  * docs               - generate \"site\"/ directory with documentation in a form of static html files using ReadTheDocs framework and $(MKDOCS_YML) local config file"
+	@echo "  * docs-deploy        - generate & deploy docs online to gh-pages branch of current github repo"
+	@echo "  * tests              - run set of checks, linters & tests (equivalent of github CI IronOS project settings for push trigger)"
+	@echo "  * clean-build        - delete generated files & dirs produced during builds EXCEPT docker image & its build cache"
+	@echo "  * clean-full         - delete generated files & dirs produced during builds INCLUDING docker image & its build cache"
+	@echo ""
+	@echo "NOTES on supported pass-trough targets:"
+	@echo "  * main Makefile is located in source/ directory and used to build the firmware itself;"
+	@echo "  * this top-level Makefile supports to call targets from source/Makefile;"
+	@echo "  * if you set up development environment right on your host, then to build firmware locally, you can just type right from here:"
+	@echo
+	@echo " $$ make firmware-LANG_ID model=MODEL_ID"
+	@echo
+	@echo "Full list of current supported IDs:"
+	@echo "  * LANG_ID: $(shell echo "`ls Translations/ | grep -e "^translation_.*.json$$" | sed -e 's,^translation_,,g; s,\.json$$,,g; ' | tr '\n' ' '`")"
+	@echo "  * MODEL_ID: $(MODELS)"
+	@echo
+	@echo "For example, to make a local build of IronOS firmware for TS100 with English language, just type:"
+	@echo
+	@echo " $$ make firmware-EN model=TS100"
+	@echo
+
+# detect availability of docker
+docker-check:
+ifeq ($(DOCKER_BIN),)
+	@echo "ERROR: Can't find docker-compose nor docker tool. Please, install docker and try again"
+	@exit 1
+else
+	@true
+endif
+
+# former start_dev.sh
+docker-shell: docker-check  $(DOCKER_DEPS)
+	$(DOCKER_CMD)
+
+# former build.sh
+docker-build: docker-check  $(DOCKER_DEPS)
+	$(DOCKER_CMD)  make  build-all
+
+# delete docker image
+docker-clean-image:
+	-docker  rmi  ironos-builder:latest
+
+# delete docker build cache objects
+docker-clean-cache:
+	-docker  system  prune  --filter label=ironos-builder:latest  --force
+
+# delete docker image & cache related to IronOS container
+docker-clean: docker-clean-image  docker-clean-cache
+
+# generate docs in site/ directory (DIR for -d is relative to mkdocs.yml file location, hence use default name/location site by setting up ../site)
+docs: $(MKDOCS_YML)  Documentation/*  Documentation/Flashing/*  Documentation/images/*
+	$(MKDOCS)  build  -f $(MKDOCS_YML)  -d ../site
+
+# deploy docs to gh-pages branch of current repo automagically using ReadTheDocs framework
+docs-deploy: $(MKDOCS_YML)  Documentation/*  Documentation/Flashing/*  Documentation/images/*
+	$(MKDOCS)  gh-deploy  -f $(MKDOCS_YML)  -d ../site
+
+# routine check for autogenerated Documentation/README.md
+test-md:
+	@echo ""
+	@echo "---- Checking REAMDE.md... ----"
+	@echo ""
+	@/bin/sh  ./scripts/deploy.sh  docs_readme
+
+# shell style & linter check (github CI version of shellcheck is more recent than alpine one so the latter may not catch some policies)
+test-sh:
+	@echo ""
+	@echo "---- Checking shell scripts... ----"
+	@echo ""
+	@for f in `find  ./scripts  -type f  -iname "*.sh"  ! -name "flash_ts100_linux.sh"` ; do shellcheck "$${f}"; done;
+
+# python-related tests & checks
+test-py:
+	@echo ""
+	@echo "---- Checking python code... ----"
+	@echo ""
+	flake8  Translations
+	black  --check  Translations
+	@$(MAKE)  -C source/  Objects/host/brieflz/libbrieflz.so
+	./Translations/brieflz_test.py
+	./Translations/make_translation_test.py
+
+# clang-format check for C/C++ code style
+test-ccpp:
+	@echo ""
+	@echo "---- Checking C/C++ code... ----"
+	@echo ""
+	$(MAKE)  -C source/  clean  check-style
+
+# meta target for tests & checks based on .github/workflows/push
+tests: test-md  test-sh  test-py  test-ccpp
+	@echo ""
+	@echo "All tests & checks have been completed successfully."
+	@echo ""
+
+# former scripts/ci/buildAll.sh - all in one to build all firmware & place the produced binaries into one output directory
+build-all:
+	@mkdir  -p  $(OUT_DIR)
+	@chmod  0777  $(OUT_DIR)
+	cd  source  &&  bash  ./build.sh
+	@echo "All Firmware built"
+	@for model in $(MODELS); do \
+		mkdir  -p  $(OUT_DIR)/$${model} ; \
+		cp  -r  $(OUT_HEX)/$${model}_*.bin  $(OUT_DIR)/$${model}/ ; \
+		cp  -r  $(OUT_HEX)/$${model}_*.hex  $(OUT_DIR)/$${model}/ ; \
+		cp  -r  $(OUT_HEX)/$${model}_*.dfu  $(OUT_DIR)/$${model}/ ; \
+	done;
+	@echo "Resulting output directory: $(OUT_DIR)"
+
+# target to build multilang supported builds for Pinecil & PinecilV2
+build-multilang:
+	@for modelml in $(MODELS_ML); do \
+		$(MAKE)  -C source/  -j2  model=$${modelml}  firmware-multi_compressed_European  firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian  firmware-multi_Chinese+Japanese ; \
+		mkdir  -p  $(OUT_DIR)/$${modelml}_multi-lang ; \
+		cp  $(OUT_HEX)/$${modelml}_multi_*.bin   $(OUT_DIR)/$${modelml}_multi-lang ; \
+		cp  $(OUT_HEX)/$${modelml}_multi_*.hex   $(OUT_DIR)/$${modelml}_multi-lang ; \
+		cp  $(OUT_HEX)/$${modelml}_multi_*.dfu   $(OUT_DIR)/$${modelml}_multi-lang ; \
+	done;
+	@echo "Resulting output directory: $(OUT_DIR)"
+
+# target to reproduce zips according to github CI settings; artifacts will be in $(OUT_DIR)/CI/*.zip
+ci: tests  build-all  build-multilang
+	@mkdir  -p  $(OUT_DIR)/metadata;
+	@for m in $(MODELS) $(MODELS_MULTILANG); do \
+		cp LICENSE scripts/LICENSE_RELEASE.md  $(OUT_DIR)/$${m}/ ; \
+		$(ZIP)  $(OUT_DIR)/$${m}.zip  $(OUT_DIR)/$${m} ;           \
+		./source/metadata.py  $${m}.json  $${m};                   \
+		cp  $(OUT_HEX)/$${m}.json  $(OUT_DIR)/metadata;            \
+	done;
+	@$(ZIP)  $(OUT_DIR)/metadata.zip  $(OUT_DIR)/metadata
+	@mkdir -p  $(OUT_DIR)/CI
+	@mv        $(OUT_DIR)/*.zip       $(OUT_DIR)/CI
+	@chmod  0777  $(OUT_DIR)/CI
+	@chmod  0666  $(OUT_DIR)/CI/*.zip
+	@echo "Resulting artifacts directory: $(OUT_DIR)/CI"
+
+# pass-through target for Makefile inside source/ dir
+%:
+	$(MAKE)  -C source/  $@
+
+# global clean-up target for produced/generated files inside tree
+clean-build:
+	$(MAKE)  -C source/  clean-all
+	rm  -Rf  site
+	rm  -Rf  $(OUT_DIR)
+
+# global clean-up target
+clean-full: clean-build  docker-clean
+
+# phony targets
+.PHONY:  help  list
+.PHONY:  docker-check  docker-shell  docker-build  docker-clean-image  docker-clean-cache  docker-clean
+.PHONY:  docs  docs-deploy
+.PHONY:  test-md  test-sh  test-py  test-ccpp  tests
+.PHONY:  build-all  build-multilang  ci
+.PHONY:  clean-build  clean-full

README.md

@@ -21,18 +21,28 @@ This project is considered feature complete for use as a soldering iron, _so ple
 
 _This firmware does **NOT** support the USB port while running for changing settings. This is done through the onscreen menu only. Logos are edited on a computer and flashed like firmware._
 
-|   Device   | DC  | QC  | PD  | EPR | BLE | Battery | Recommended |
-| :--------: | :-: | :-: | :-: | :-: | :-: | :-----: | :---------: |
-|   MHP30    | ❌  | ❌  | ✔️  | ❌  | ❌  |   ❌    |      ✔️       |
-| Pinecil V1 | ✔️  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |      ✔️       |
-| Pinecil V2 | ✔️  | ✔️  | ✔️  | ✔️  | ✔️  |   ✔️    |      ✔️       |
-|   TS80P    | ❌  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |      ✔️       |
-|   TS100    | ✔️  | ❌  | ❌  | ❌  | ❌  |   ✔️    |      ❌*      |
-|    TS80    | ❌  | ✔️  | ❌  | ❌  | ❌  |   ✔️    |     ❌**      |
+|   Device       | DC  | QC  | PD  | EPR | BLE | Tip Sense | Recommended Purchase | Notes                                         |
+| :------------: | :-: | :-: | :-: | :-: | :-: | :-----:   | :------------------: | :-------------------------------------------:|
+| Miniware MHP30 | ❌  | ❌  | ✔️  | ❌  | ❌  |   ✔️      |      ✔️              |                                              |
+| Pinecil V1     | ✔️  | ✔️  | ✔️  | ❌  | ❌  |   ❌      |      ❌ *            |                                              |
+| Pinecil V2     | ✔️  | ✔️  | ✔️  | ✔️  | ✔️  |   ✔️      |      ✔️              |                                              |
+| Miniware TS101 | ✔️  | ❌  | ✔️  | ✔️  | ❌  |   ✔️      |      ✔️              |  Full OLED resolution not yet supported.     |
+| Sequre  S60    | ❌  | ❌  | ✔️  | ❌  | ❌  |   ❌      |      ✔️              |  Full OLED resolution not yet supported.     |
+| Miniware TS80P | ❌  | ✔️  | ✔️  | ❌  | ❌  |   N/A     |      ✔️              |                                              |
+| Miniware TS100 | ✔️  | ❌  | ❌  | ❌  | ❌  |   ❌      |      ❌**            |                                              |
+| Miniware TS80  | ❌  | ✔️  | ❌  | ❌  | ❌  |   N/A     |     ❌***            |                                              |
 
-\*Please note that Miniware started shipping TS100's using cloned STM32 Chips. While these do work with IronOS, their DFU bootloader works terribly, and it is hard to get it to successfully flash larger firmware images like IronOS without timing out. This is the main reason why the TS100 is **_no longer recommended_**.
+_Tip Sense_ refers to the device being able to choose between the 'usual' TS100 or Hakko T12 style tips and Pine64's custom shorter tips which have lower resistance and allow for more power. This is N/A for TS80/TS80P as there is only one model of tip for them.
 
-\**TS80 is replaced by TS80P. Production ramped down a long time ago and it's just existing stock clearing the system. It's marked not recommended being optimistic that people might pause and buy the far superior TS80P instead. This is the main reason why the TS80 is **_no longer recommended_**.
+_Recommended Purchase_ is only referring to if you are buying a **new** device. Of course all the devices listed are supported and will work excellently for years to come.
+
+The TS101 and S60 feature a higher resolution OLED than other devices. Work is ongoing to support this fully, for now a cropped view is usable.
+
+\*PinecilV1 stopped being manufactured a long time ago now, all models for sale online are generally clones (or old stock). Vendors are trying to sell these for more than Pine64 sells the V2 for now. Thus the V1 is **_no longer recommended_**.
+
+\**Please note that Miniware started shipping TS100's using cloned STM32 Chips. While these do work with IronOS, their DFU bootloader works terribly, and it is hard to get it to successfully flash larger firmware images like IronOS without timing out. This is the main reason why the TS100 is **_no longer recommended_**.
+
+\**\*TS80 is replaced by TS80P. Production ramped down a long time ago and it's just existing stock clearing the system. It's marked not recommended being optimistic that people might pause and buy the far superior TS80P instead. This is the main reason why the TS80 is **_no longer recommended_**.
 
 ## Getting Started
 
@@ -67,9 +77,15 @@ For notes on installation for your device, please refer to the flashing guide fo
 - Boost mode lets you temporarily change the temperature when soldering (i.e. raise the temperature for short periods)
 - (TS100/Pinecil) Battery charge level indicator if power source set to a lipo cell count
 - (TS80/TS80P/Pinecil) Power bank operating voltage is displayed
-- [Custom boot up logo support](https://ralim.github.io/IronOS/Logo/)
+- [Custom boot up logo support](https://ralim.github.io/IronOS/Logo/)[^bootlogo]
 - Automatic LCD rotation based on the orientation
 
+
+[^bootlogo]: **BOOTUP LOGO NOTICE**:
+  IronOS supports both a bootup logo _AND_ bootup animations.
+  However, _**they are no longer included in this repo**_.
+  **Please, [read the docs](https://ralim.github.io/IronOS/Logo/) for more information**.
+
 ## Menu System
 
 This new firmware uses a new menu system to allow access to the settings on the device.

Translations/make_translation.py

@@ -66,6 +66,29 @@ def read_translation(json_root: Union[str, Path], lang_code: str) -> dict:
     return lang
 
 
+def filter_translation(lang: dict, defs: dict, macros: frozenset):
+    def check_excluded(record):
+        if "include" in record and not any(m in macros for m in record["include"]):
+            return True
+
+        if "exclude" in record and any(m in macros for m in record["exclude"]):
+            return True
+
+        return False
+
+    for category in ("menuOptions", "menuGroups"):
+        for index, record in enumerate(defs[category]):
+            if check_excluded(record):
+                lang[category][record["id"]]["displayText"] = ""
+                lang[category][record["id"]]["description"] = ""
+
+    for index, record in enumerate(defs["messagesWarn"]):
+        if check_excluded(record):
+            lang["messagesWarn"][record["id"]]["message"] = ""
+
+    return lang
+
+
 def validate_langcode_matches_content(filename: str, content: dict) -> None:
     # Extract lang code from file name
     lang_code = filename[12:-5].upper()
@@ -101,6 +124,8 @@ def get_constants() -> List[Tuple[str, str]]:
         ("SmallSymbolSpace", " "),
         ("LargeSymbolDot", "."),
         ("SmallSymbolDot", "."),
+        ("SmallSymbolSlash", "/"),
+        ("SmallSymbolColon", ":"),
         ("LargeSymbolDegC", "C"),
         ("SmallSymbolDegC", "C"),
         ("LargeSymbolDegF", "F"),
@@ -155,6 +180,8 @@ def get_accel_names_list() -> List[str]:
         "BMA223",
         "MSA301",
         "SC7A20",
+        "GPIO",
+        "LIS2 CLONE",
     ]
 
 
@@ -162,8 +189,8 @@ def get_power_source_list() -> List[str]:
     return [
         "DC",
         "QC",
-        "PD W. VBus",
-        "PD No VBus",
+        "PV:PDwVBus",
+        "PD:No VBus",
     ]
 
 
@@ -250,7 +277,6 @@ def get_letter_counts(defs: dict, lang: dict, build_version: str) -> Dict:
     # collapse all strings down into the composite letters and store totals for these
     # Doing this seperately for small and big font
     def sort_and_count(list_in: List[str]):
-
         symbol_counts: dict[str, int] = {}
         for line in list_in:
             line = line.replace("\n", "").replace("\r", "")
@@ -439,7 +465,6 @@ class FontMapsPerFont:
 def get_font_map_per_font(
     text_list_small_font: List[str], text_list_large_font: List[str]
 ) -> FontMapsPerFont:
-
     pending_small_symbols = set(text_list_small_font)
     pending_large_symbols = set(text_list_large_font)
 
@@ -1029,7 +1054,6 @@ def get_translation_strings_and_indices_text(
     large_font_symbol_conversion_table: Dict[str, bytes],
     suffix: str = "",
 ) -> str:
-
     # For all strings; we want to convert them to their byte encoded form (using font index lookups)
     # Then we want to sort by their reversed format to see if we can remove any duplicates by combining the tails (last n bytes;n>0)
     # Finally we look for any that are contained inside one another, and if they are we update them to point to this
@@ -1118,7 +1142,6 @@ def get_translation_strings_and_indices_text(
     translation_strings_text = "  /* .strings = */ {\n"
 
     for i, encoded_bytes in enumerate(byte_encoded_strings):
-
         if i > 0:
             translation_strings_text += ' "\\0"\n'
 
@@ -1240,6 +1263,63 @@ def get_translation_sanity_checks_text(defs: dict) -> str:
     return sanity_checks_text
 
 
+def get_version_suffix(ver) -> str:
+    # Check env var from push.yml first:
+    # - if it's pull request then use vX.YY + C.ID for version line as in *C*I with proper tag instead of merge tag for detached tree
+    if os.environ.get("GITHUB_CI_PR_SHA", "") != "":
+        return "C" + "." + os.environ["GITHUB_CI_PR_SHA"][:8].upper()
+    # - no github PR SHA ID, hence keep checking
+
+    suffix = str("")
+
+    try:
+        # Use commands _hoping_ they won't be too new for one environments nor deprecated for another ones:
+        ## - get commit id; --short=8 - the shorted hash with 8 digits (increase/decrease if needed!)
+        sha_id = f"{subprocess.check_output(['git', 'rev-parse', '--short=8', 'HEAD']).strip().decode('ascii').upper()}"
+        ## - if the exact commit relates to tag, then this command should return one-line tag name:
+        tag = f"{subprocess.check_output(['git', 'tag', '--points-at', '%s' % sha_id]).strip().decode('ascii')}"
+        if (
+            f"{subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '--short', 'HEAD']).strip().decode('ascii')}"
+            == "HEAD"
+        ):
+            return "E" + "." + sha_id
+        else:
+            ## - get short "traditional" branch name (as in `git branch` for that one with asterisk):
+            branch = f"{subprocess.check_output(['git', 'symbolic-ref', '--short', 'HEAD']).strip().decode('ascii')}"
+        if tag and "" != tag:
+            # _Speculate_ on tag that it's Release...
+            if ver == tag:
+                # ... but only if double-check for tag is matched
+                suffix = "R"
+            else:
+                # ... otherwise it's tagged but not a release version!
+                suffix = "T"
+        elif branch and "" != branch:
+            # _Hardcoded_ current main development branch...
+            if "dev" == branch:
+                suffix = "D"
+            # ... or some other branch
+            else:
+                suffix = "B"
+        else:
+            # Something else but from Git
+            suffix = "G"
+        # Attach SHA commit to ID a build since it's from git anyway
+        suffix += "." + sha_id
+    except subprocess.CalledProcessError:
+        # No git tree so _probably_ Homebrew build from source
+        suffix = "H"
+    except OSError:
+        # Something _special_?
+        suffix = "S"
+
+    if "" == suffix:
+        # Something _very_ special!
+        suffix = "V"
+
+    return suffix
+
+
 def read_version() -> str:
     with open(HERE.parent / "source" / "version.h") as version_file:
         for line in version_file:
@@ -1247,11 +1327,7 @@ def read_version() -> str:
                 matches = re.findall(r"\"(.+?)\"", line)
                 if matches:
                     version = matches[0]
-                    try:
-                        version += f".{subprocess.check_output(['git', 'rev-parse', '--short=7', 'HEAD']).strip().decode('ascii').upper()}"
-                    # --short=7: the shorted hash with 7 digits. Increase/decrease if needed!
-                    except OSError:
-                        version += " git"
+                    version += get_version_suffix(version)
     return version
 
 
@@ -1285,6 +1361,13 @@ def parse_args() -> argparse.Namespace:
         required=False,
         dest="compress_font",
     )
+    parser.add_argument(
+        "--macros",
+        help="Extracted macros to filter translation strings by",
+        type=argparse.FileType("r"),
+        required=True,
+        dest="macros",
+    )
     parser.add_argument(
         "--output", "-o", help="Target file", type=argparse.FileType("w"), required=True
     )
@@ -1305,6 +1388,12 @@ def main() -> None:
         logging.error("error: Both --output-pickled and --input-pickled are specified")
         sys.exit(1)
 
+    macros = (
+        frozenset(re.findall(r"#define ([^ ]+)", args.macros.read()))
+        if args.macros
+        else frozenset()
+    )
+
     language_data: LanguageData
     if args.input_pickled:
         logging.info(f"Reading pickled language data from {args.input_pickled.name}...")
@@ -1329,11 +1418,13 @@ def main() -> None:
 
         defs_ = load_json(os.path.join(json_dir, "translations_definitions.json"))
         if len(args.languageCodes) == 1:
-            lang_ = read_translation(json_dir, args.languageCodes[0])
+            lang_ = filter_translation(
+                read_translation(json_dir, args.languageCodes[0]), defs_, macros
+            )
             language_data = prepare_language(lang_, defs_, build_version)
         else:
             langs_ = [
-                read_translation(json_dir, lang_code)
+                filter_translation(read_translation(json_dir, lang_code), defs_, macros)
                 for lang_code in args.languageCodes
             ]
             language_data = prepare_languages(langs_, defs_, build_version)

Translations/translation_BE.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Беларуская",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Каліброўка\nзроблена!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Некантралюемае\nразаграванне"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Пераканайцеся, што пры наступнай загрузцы наканечнік і ручка маюць пакаёвую тэмпературу!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Выкл."
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Ваша прылада, хутчэй за ўсё, падробка!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Дазволіць\nблок. кнопак",
             "description": "Пры рабоце падоўжаны націск дзьвух кнопак блакуе іх (А=Адключана | Т=Толькі турба | П=Поўная блакіроўка)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Адчувальнасць\nакселерометра",
             "description": "Адчувальнасць акселерометра (0=Выкл. | 1=Мін. | ... | 9=Макс.)"

Translations/translation_BG.json

@@ -3,8 +3,8 @@
     "languageLocalName": "Български",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
-            "message": "Calibration\ndone!"
+        "CalibrationDone": {
+            "message": "Калибрирането\nе завършено!"
         },
         "ResetOKMessage": {
             "message": "Нулиране"
@@ -13,199 +13,267 @@
             "message": "Настройките бяха\nнулирани!"
         },
         "NoAccelerometerMessage": {
-            "message": "No accelerometer\ndetected!"
+            "message": "Не е открит\nакселерометър!"
         },
         "NoPowerDeliveryMessage": {
-            "message": "No USB-PD IC\ndetected!"
+            "message": "Не е открито\nUSB-PD захранване!"
         },
         "LockingKeysString": {
-            "message": "LOCKED"
+            "message": "ЗАКЛЮЧ"
         },
         "UnlockingKeysString": {
-            "message": "UNLOCKED"
+            "message": "ОТКЛЮЧ"
         },
         "WarningKeysLockedString": {
-            "message": "!LOCKED!"
+            "message": "!ЗАКЛЮЧ!"
         },
         "WarningThermalRunaway": {
-            "message": "Thermal\nRunaway"
+            "message": "Неконтролируемо\nпрегряване"
+        },
+        "WarningTipShorted": {
+            "message": "!КС на човка!"
         },
         "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+            "message": "Преди рестартиране се уверете, че човка и дръжката са на стайна температурата!"
         },
         "CJCCalibrating": {
-            "message": "calibrating\n"
+            "message": "калибриране\n"
         },
         "SettingsResetWarning": {
             "message": "Сигурни ли сте, че искате да върнете фабричните настройки?"
         },
         "UVLOWarningString": {
-            "message": "Ниско DC Напрежение"
+            "message": "НИС.НАПР."
         },
         "UndervoltageString": {
-            "message": "Ниско Напрежение\n"
+            "message": "Ниско напрежение\n"
         },
         "InputVoltageString": {
             "message": "Входно V: \n"
         },
         "SleepingSimpleString": {
-            "message": "Сън"
+            "message": "Хъррр"
         },
         "SleepingAdvancedString": {
-            "message": "Хър Хър Хър...\n"
+            "message": "Сън...\n"
         },
         "SleepingTipAdvancedString": {
-            "message": "Връх: \n"
+            "message": "Човка:\n"
         },
         "OffString": {
             "message": "Изкл."
         },
+        "ProfilePreheatString": {
+            "message": "Загряване\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Охлаждане\n"
+        },
         "DeviceFailedValidationWarning": {
-            "message": "Your device is most likely a counterfeit!"
+            "message": "Вероятно, устройство е фалшификат!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Твърде горещо за\nстартиране на профила"
         }
     },
     "characters": {
-        "SettingRightChar": "R",
-        "SettingLeftChar": "L",
-        "SettingAutoChar": "A",
-        "SettingOffChar": "O",
-        "SettingSlowChar": "S",
-        "SettingMediumChar": "M",
-        "SettingFastChar": "F",
+        "SettingRightChar": "Д",
+        "SettingLeftChar": "Л",
+        "SettingAutoChar": "А",
+        "SettingOffChar": "И",
+        "SettingSlowChar": "Н",
+        "SettingMediumChar": "С",
+        "SettingFastChar": "В",
         "SettingStartNoneChar": "И",
-        "SettingStartSolderingChar": "Р",
+        "SettingStartSolderingChar": "З",
         "SettingStartSleepChar": "С",
         "SettingStartSleepOffChar": "П",
-        "SettingLockDisableChar": "D",
-        "SettingLockBoostChar": "B",
-        "SettingLockFullChar": "F"
+        "SettingLockDisableChar": "И",
+        "SettingLockBoostChar": "Т",
+        "SettingLockFullChar": "П"
     },
     "menuGroups": {
         "PowerMenu": {
-            "displayText": "Power\nsettings",
+            "displayText": "Настройки на\nзахранването",
             "description": ""
         },
         "SolderingMenu": {
-            "displayText": "Поялник\nНастройки",
+            "displayText": "Настройки на\nзапояване",
             "description": ""
         },
         "PowerSavingMenu": {
-            "displayText": "Режими\nНастройки",
+            "displayText": "Авто\nизключване",
             "description": ""
         },
         "UIMenu": {
-            "displayText": "Интерфейс\nНастройки",
+            "displayText": "Интерфейс\n",
             "description": ""
         },
         "AdvancedMenu": {
-            "displayText": "Разширени\nНастройки",
+            "displayText": "Допълнителни\nнастройки",
             "description": ""
         }
     },
     "menuOptions": {
         "DCInCutoff": {
-            "displayText": "Източник\nзахранване",
-            "description": "Източник на захранване. Минимално напрежение. (DC 10V) (S 3,3V за клетка)"
+            "displayText": "Гранично\nнапрежение",
+            "description": "Минимално напрежение, за да не се изтощи батерията (DC 10V) (S 3,3V за клетка)"
         },
         "MinVolCell": {
-            "displayText": "Minimum\nvoltage",
-            "description": "Minimum allowed voltage per battery cell (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+            "displayText": "Мин.\nнапрежение",
+            "description": "Минимално допустимо напрежение на акумулаторна клетка (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
         },
         "QCMaxVoltage": {
-            "displayText": "Мощност на\nзахранване",
-            "description": "Мощност на избраното захранване"
+            "displayText": "Напреж.\nна QC",
+            "description": "Максимална напрежение с QC захранвания"
         },
         "PDNegTimeout": {
-            "displayText": "PD\ntimeout",
-            "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+            "displayText": "PD\nинтервал",
+            "description": "PD интервал за договаряне на захранването на стъпки от 100 мс за съвместимост с някои QC захранвания (0=Изкл.)"
         },
         "PDVpdo": {
             "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+            "description": "Включи PPS & EPR"
         },
         "BoostTemperature": {
             "displayText": "Турбо\nтемп.",
-            "description": "Температура за \"турбо\" режим"
+            "description": "Температурата за \"турбо\" режим"
         },
         "AutoStart": {
             "displayText": "Автоматичен\nработен режим",
-            "description": "Режим на поялника при включване на захранването. (И=Изключен | Р=Работен | С=Сън | П=Сън температура помещение)"
+            "description": "Режим на поялника при включване на захранването (И=Изкл. | З=Запояване | С=Сън | П=Покой на стайна температурата)"
         },
         "TempChangeShortStep": {
-            "displayText": "Промяна T\nбързо?",
-            "description": "Промяна на температура при бързо натискане на бутон!"
+            "displayText": "Промяна T\nбързо",
+            "description": "Промяна на температурата при бързо натискане на бутон"
         },
         "TempChangeLongStep": {
-            "displayText": "Промяна Т\nзадържане?",
-            "description": "Промяна на температура при задържане на бутон!"
+            "displayText": "Промяна Т\nзадържане",
+            "description": "Промяна на температурата при задържане на бутон"
         },
         "LockingMode": {
-            "displayText": "Allow locking\nbuttons",
-            "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
+            "displayText": "Бутони за\nзаключване",
+            "description": "Докато запоявате, задръжте двата бутона, за да превключите заключването им (И=Изкл. | Т=Турбо режим | П=Пълно)"
+        },
+        "ProfilePhases": {
+            "displayText": "Брой\nетапи",
+            "description": "Броят на етапите в режим на термичен профил"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Температурата\nна загряване",
+            "description": "Температурата на загряване в началото на режим на термичен профил"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Скорост на\nзагряване",
+            "description": "Скорост на предварително загряване (градуси в секунда)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Етап 1\nТемпературата",
+            "description": "Температурата в края на този етап"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Етап 1\nПродължителност",
+            "description": "Продължителност на този етап (в секунди)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Етап 2\nТемпературата",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Етап 2\nПродължителност",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Етап 3\nТемпературата",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Етап 3\nПродължителност",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Етап 4\nТемпературата",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Етап 4\nПродължителност",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Етап 5\nТемпературата",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Етап 5\nПродължителност",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Скорост на\nохлаждане",
+            "description": "Скорост на охлаждане в края на режим на термичен профил (градуси в секунда)"
         },
         "MotionSensitivity": {
-            "displayText": "Усещане\nза движение",
-            "description": "Усещане за движение (0=Изключено | 1=Слабо | ... | 9=Силно)"
+            "displayText": "Чувствител.\nна движение",
+            "description": "Чувствителност на движение на акселерометър (0=Изкл. | 1=Слабо | ... | 9=Силно)"
         },
         "SleepTemperature": {
             "displayText": "Темп.\nсън",
-            "description": "Температура при режим \"сън\" (C)"
+            "description": "Температурата при режим \"сън\""
         },
         "SleepTimeout": {
             "displayText": "Време\nсън",
-            "description": "Включване в режим \"сън\" след: (Минути | Секунди)"
+            "description": "Включване в режим \"сън\" (секунди | минути)"
         },
         "ShutdownTimeout": {
             "displayText": "Време\nизкл.",
-            "description": "Изключване след (Минути)"
+            "description": "Изключване след (минути)"
         },
         "HallEffSensitivity": {
-            "displayText": "Hall sensor\nsensitivity",
-            "description": "Sensitivity to magnets (0=Изключено | 1=Слабо | ... | 9=Силно)"
+            "displayText": "Датчик\nна Хол",
+            "description": "Чувствителност на сензора към магнитно поле (0=Изкл. | 1=Слабо | ... | 9=Силно)"
         },
         "TemperatureUnit": {
-            "displayText": "Единици за\nтемпература",
-            "description": "Единици за температура (C=Целзии | F=Фаренхайт)"
+            "displayText": "Единици за\nтемпературата",
+            "description": "Единици за температурата (C=Целзии | F=Фаренхайт)"
         },
         "DisplayRotation": {
             "displayText": "Ориентация\nна дисплея",
-            "description": "Ориентация на дисплея (R=Дясна Ръка | L=Лява Ръка | A=Автоматично)"
+            "description": "Ориентация на дисплея (Д=Дясна ръка | Л=Лява ръка | А=Авто)"
         },
         "CooldownBlink": {
             "displayText": "Мигай при\nтопъл поялник",
-            "description": "След изключване от работен режим, индикатора за температура да мига докато човката на поялника все още е топла"
+            "description": "След изключване от работен режим, индикатора за температурата да мига докато човката на поялника все още е топла"
         },
         "ScrollingSpeed": {
             "displayText": "Скорост\nна текста",
-            "description": "Скорост на движение на този текст"
+            "description": "Скорост на движение на този текст (Н=Ниска | B=Висока)"
         },
         "ReverseButtonTempChange": {
-            "displayText": "Размяна\nбутони +-?",
-            "description": "Обръщане на бутоните \"+\" и \"-\" за промяна на температурата на върха на поялника"
+            "displayText": "Размяна\nбутони +/-",
+            "description": "Обръщане на бутоните + и - за промяна на температурата на човка на поялника"
         },
         "AnimSpeed": {
-            "displayText": "Anim.\nspeed",
-            "description": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
+            "displayText": "Скорост на\nанимацията",
+            "description": "Скорост на анимация на иконата в главното меню (И=Изкл. | Н=Ниска | C=Средна | B=Висока)"
         },
         "AnimLoop": {
-            "displayText": "Anim.\nloop",
-            "description": "Loop icon animations in main menu"
+            "displayText": "Анимац.\nцикъл",
+            "description": "Зациклена анимация на иконите в главното меню"
         },
         "Brightness": {
-            "displayText": "Screen\nbrightness",
-            "description": "Adjust the OLED screen brightness"
+            "displayText": "Яркост\nна екрана",
+            "description": "Регулирайте яркостта на екрана"
         },
         "ColourInversion": {
-            "displayText": "Invert\nscreen",
-            "description": "Invert the OLED screen colors"
+            "displayText": "Инвертиране\nна екрана",
+            "description": "Инверсия на пикселите на екрана"
         },
         "LOGOTime": {
-            "displayText": "Boot logo\nduration",
-            "description": "Set boot logo duration (s=seconds)"
+            "displayText": "Продължит.\nлогото",
+            "description": "Продължителност на логото за стартиране (в секунди)"
         },
         "AdvancedIdle": {
             "displayText": "Детайлен\nекран в покой",
-            "description": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой."
+            "description": "Покажи детайлна информация със ситен шрифт на екрана в режим на покой"
         },
         "AdvancedSoldering": {
             "displayText": "Детайлен\nработен екран",
@@ -213,34 +281,34 @@
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Включи BLE"
         },
         "PowerLimit": {
             "displayText": "Лимит на\nмощност",
-            "description": "Максимална мощност на поялника (Watt)"
+            "description": "Максимална мощност на поялника (вати)"
         },
         "CalibrateCJC": {
-            "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5 C)"
+            "displayText": "Калибриране\nна темп.",
+            "description": "Калибриране на температурата (CJC) при следващо включване (не се изисква, ако разликата е по-малка от 5 °С)"
         },
         "VoltageCalibration": {
-            "displayText": "Калибриране\nнапрежение?",
-            "description": "Калибриране на входното напрежение. Задръжте бутонa за изход"
+            "displayText": "Калибриране\nнапрежение",
+            "description": "Калибриране на входното напрежение (задръжте бутонa за изход)"
         },
         "PowerPulsePower": {
             "displayText": "Захранващ\nимпулс",
-            "description": "Поддържане на интензивност на захранващия импулс"
+            "description": "Поддържане на интензивност на захранващия импулс (вати)"
         },
         "PowerPulseWait": {
-            "displayText": "Power pulse\ndelay",
-            "description": "Delay before keep-awake-pulse is triggered (x 2,5с)"
+            "displayText": "Закъснение\nна импулса",
+            "description": "Пауза между импулсите, които предпазват захранването от автоматично изключване (x 2,5 с)"
         },
         "PowerPulseDuration": {
-            "displayText": "Power pulse\nduration",
-            "description": "Keep-awake-pulse duration (x 250мс)"
+            "displayText": "Продължит.\nна импулса",
+            "description": "Дължината на импулса, който предпазва захранването от автоматично изключване (x 250 мс)"
         },
         "SettingsReset": {
-            "displayText": "Фабрични\nнастройки?",
+            "displayText": "Фабрични\nнастройки",
             "description": "Връщане на фабрични настройки"
         },
         "LanguageSwitch": {

Translations/translation_CS.json

@@ -3,8 +3,8 @@
     "languageLocalName": "Český",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
-            "message": "Calibration\ndone!"
+        "CalibrationDone": {
+            "message": "Kalibrace\ndokončena!"
         },
         "ResetOKMessage": {
             "message": "Reset OK"
@@ -30,11 +30,14 @@
         "WarningThermalRunaway": {
             "message": "Teplotní\nOchrana"
         },
+        "WarningTipShorted": {
+            "message": "!Zkrat na hrotu!"
+        },
         "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+            "message": "Před restartem se ujistěte, že hrot a držák mají pokojovou teplotu!"
         },
         "CJCCalibrating": {
-            "message": "calibrating\n"
+            "message": "kalibrování\n"
         },
         "SettingsResetWarning": {
             "message": "Opravdu chcete resetovat zařízení do továrního nastavení?"
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Vyp"
         },
+        "ProfilePreheatString": {
+            "message": "Předehřívání\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Zchlazování\n"
+        },
         "DeviceFailedValidationWarning": {
-            "message": "Your device is most likely a counterfeit!"
+            "message": "Vaše zařízení je pravěpodobně padělek!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Teplota příliš vysoká pro start profilu"
         }
     },
     "characters": {
@@ -121,7 +133,7 @@
         },
         "PDVpdo": {
             "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+            "description": "Povoluje režimy PPS & EPR"
         },
         "BoostTemperature": {
             "displayText": "Teplota\nboostu",
@@ -143,6 +155,62 @@
             "displayText": "Povolit zamč.\ntlačítek",
             "description": "Při pájení podržte obě tlačítka pro jejich zamčení (Z=zakázáno | B=pouze v režimu boost | U=úplné zamčení)"
         },
+        "ProfilePhases": {
+            "displayText": "Profilové\nFáze",
+            "description": "Počet fází v profilovém režimu"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Teplota\nPředehřátí",
+            "description": "Teplota na kterou předehřát na začátku profilového režimu"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Rychlost\nPředehřívání",
+            "description": "Rychlost předehřívání (stupně za sekundu)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Teplota\nFáze 1",
+            "description": "Cílová teplota na konci této fáze"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Trvání\nFáze 1",
+            "description": "Doba trvání této fáze (sekundy)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Teplota\nFáze 2",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Trvání\nFáze 2",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Teplota\nFáze 3",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Trvání\nFáze 3",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Teplota\nFáze 4",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Trvání\nFáze 4",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Teplota\nFáze 5",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Trvání\nFáze 5",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Rychlost\nochlazování",
+            "description": "Rychlost ochlazování na konci profilového režimu (stupně za sekundu)"
+        },
         "MotionSensitivity": {
             "displayText": "Citlivost\nna pohyb",
             "description": "0=vyp | 1=nejméně citlivé | ... | 9=nejvíce citlivé"
@@ -213,15 +281,15 @@
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Povoluje BLE"
         },
         "PowerLimit": {
             "displayText": "Omezení\nVýkonu",
             "description": "Maximální příkon páječky (W=watt)"
         },
         "CalibrateCJC": {
-            "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+            "displayText": "Kalibrovat CJC\npři příštím startu",
+            "description": "Při příštím startu bude kalibrována kompenzace studeného spoje (není třeba pokud Delta T je < 5°C)"
         },
         "VoltageCalibration": {
             "displayText": "Kalibrovat\nvstupní napětí?",

Translations/translation_DA.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Dansk",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Din enhed er højst sandsyneligt en Kopivare!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Tillad låsning\naf knapperne",
             "description": "Hold begge knapper nede under lodning for at låse dem (D=deaktiver | B=kun boost-tilstand | F=fuld låsning)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Bevægelses\nfølsomhed",
             "description": "Bevægelsesfølsomhed (0=Slukket | 1=Mindst følsom | ... | 9=Mest følsom)"

Translations/translation_DE.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Deutsch",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Erfolgreich\nkalibriert!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Lötspitze\nkurzgeschlossen!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Vor dem Neustart bitte sicherstellen, dass Lötspitze & Gerät Raumtemperatur haben!"
         },
@@ -58,10 +61,19 @@
             "message": "Temp: \n"
         },
         "OffString": {
-            "message": "Aus"
+            "message": "aus"
+        },
+        "ProfilePreheatString": {
+            "message": "Vorwärmen\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Abkühlen\n"
         },
         "DeviceFailedValidationWarning": {
             "message": "Höchstwahrscheinlich ist das Gerät eine Fälschung!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Zu heiß für\nProfilstart!"
         }
     },
     "characters": {
@@ -133,15 +145,71 @@
         },
         "TempChangeShortStep": {
             "displayText": "Temp-Schritt\nDruck kurz",
-            "description": "Schrittweite für Temperaturwechsel bei kurzem Tastendruck"
+            "description": "Schrittweite für Temperaturänderung bei kurzem Tastendruck"
         },
         "TempChangeLongStep": {
             "displayText": "Temp-Schritt\nDruck lang",
-            "description": "Schrittweite für Temperaturwechsel bei langem Tastendruck"
+            "description": "Schrittweite für Temperaturänderung bei langem Tastendruck"
         },
         "LockingMode": {
             "displayText": "Tasten-\nsperre",
-            "description": "Langes drücken beider Tasten im Lötmodus sperrt diese (A=aus | B=nur Boost | V=vollständig)"
+            "description": "Langes Drücken beider Tasten im Lötmodus sperrt diese (A=aus | B=nur Boost | V=vollständig)"
+        },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhasen",
+            "description": "Anzahl an Phasen im Profilmodus"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Vorheiz-\ntemperatur",
+            "description": "Zu Beginn des Profilmodus auf diese Temperatur vorheizen"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Vorheiz-\nrate",
+            "description": "Mit dieser Geschwindigkeit vorheizen (Grad pro Sekunde)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemperatur",
+            "description": "Zieltemperatur zum Ende dieser Phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDauer",
+            "description": "Dauer dieser Phase (Sekunden)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemperatur",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDauer",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemperatur",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDauer",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemperatur",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDauer",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemperatur",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDauer",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Abkühl-\nrate",
+            "description": "Am Ende des Profilmodus mit dieser Geschwindigkeit abkühlen (Grad pro Sekunde)"
         },
         "MotionSensitivity": {
             "displayText": "Bewegungs-\nempfindlichk.",
@@ -149,7 +217,7 @@
         },
         "SleepTemperature": {
             "displayText": "Ruhe-\ntemperatur",
-            "description": "Ruhetemperatur der Spitze"
+            "description": "Ruhetemperatur der Lötspitze"
         },
         "SleepTimeout": {
             "displayText": "Ruhever-\nzögerung",
@@ -217,7 +285,7 @@
         },
         "PowerLimit": {
             "displayText": "Leistungs-\nmaximum",
-            "description": "Maximal zulässige Leistungsaufnahme des Lötkolbens (W=Watt)"
+            "description": "Durchschnittliche maximal zulässige Leistungsaufnahme des Lötkolbens (W=Watt)"
         },
         "CalibrateCJC": {
             "displayText": "Temperatur\nkalibrieren",

Translations/translation_EL.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Greek",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Βαθμονόμηση\nολοκληρώθηκε!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Θερμική\nΦυγή"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Πριν την επανεκκίνηση, βεβαιωθείτε ότι η μύτη και η συσκ. είναι σε θερμ. δωματίου!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Απ."
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Η συσκευή σας ίσως να μην είναι αυθεντική!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Κλείδωμα\nπλήκτρων",
             "description": "Κατά την κόλληση, κρατήστε και τα δύο πλήκτρα για κλείδωμα (A=απενεργοποίηση | B=μόνο λειτ. boost | Π=πλήρες κλείδωμα)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Ευαισθησία\nκίνησης",
             "description": "0=off | 1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο"

Translations/translation_EN.json

@@ -3,7 +3,7 @@
     "languageLocalName": "English",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Allow locking\nbuttons",
             "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Motion\nsensitivity",
             "description": "0=off | 1=least sensitive | ... | 9=most sensitive"
@@ -217,7 +285,7 @@
         },
         "PowerLimit": {
             "displayText": "Power\nlimit",
-            "description": "Maximum power the iron can use (W=watt)"
+            "description": "Average maximum power the iron can use (W=watt)"
         },
         "CalibrateCJC": {
             "displayText": "Calibrate CJC\nat next boot",

Translations/translation_ES.json

@@ -1,22 +1,22 @@
 {
     "languageCode": "ES",
     "languageLocalName": "Castellano",
-    "tempUnitFahrenheit": true,
+    "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
-            "message": "Calibration\ndone!"
+        "CalibrationDone": {
+            "message": "¡Calibracion\nlista!"
         },
         "ResetOKMessage": {
-            "message": "Hecho"
+            "message": "Listo"
         },
         "SettingsResetMessage": {
-            "message": "Ajustes\n¡Reiniciados!"
+            "message": "¡Ajustes\nReiniciados!"
         },
         "NoAccelerometerMessage": {
-            "message": "Sin acelerómetro\n¡Detectado!"
+            "message": "¡Sin acelerómetro\nDetectado!"
         },
         "NoPowerDeliveryMessage": {
-            "message": "Sin USB-PD IC\n¡Detectado!"
+            "message": "¡Sin USB-PD IC\nDetectado!"
         },
         "LockingKeysString": {
             "message": "BLOQUEADO"
@@ -30,11 +30,14 @@
         "WarningThermalRunaway": {
             "message": "Térmico\nFuera de control"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "¡Antes de reiniciar, asegúrese de que la punta y el mango estén a temperatura ambiente!"
         },
         "CJCCalibrating": {
-            "message": "calibrando\n"
+            "message": "Calibrando\n"
         },
         "SettingsResetWarning": {
             "message": "¿Quieres restablecer los ajustes?"
@@ -58,10 +61,19 @@
             "message": "Punta: \n"
         },
         "OffString": {
-            "message": "No"
+            "message": "Apagado"
+        },
+        "ProfilePreheatString": {
+            "message": "Precalentado\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Enfriado\n"
         },
         "DeviceFailedValidationWarning": {
-            "message": "¡Lo más probable es que su dispositivo sea una falsificación!"
+            "message": "¡Es probable es que su dispositivo sea falso!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Muy caliente para \nempezar perfil"
         }
     },
     "characters": {
@@ -109,27 +121,28 @@
         },
         "MinVolCell": {
             "displayText": "Mínimo\nvoltaje",
-            "description": "voltaje mínimo permitido por célula (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
+            "description": "Voltaje mínimo permitido por célula (3S: 3 - 3,7V | 4-6S: 2,4 - 3,7V)"
         },
         "QCMaxVoltage": {
             "displayText": "Potencia de\nentrada",
-            "description": "Potencia en vatios del adaptador de corriente utilizado"
+            "description": "Potencia en Watts del adaptador de corriente utilizado"
         },
         "PDNegTimeout": {
             "displayText": "PD\ntiempo de espera",
-            "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
+            "description": "Timeout de negociación de PD en pasos de 100ms para compatibilidad con algunos cargadores QC (0: apagado)"
+            
         },
         "PDVpdo": {
             "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+            "description": "Permite modos PPS & EPR"
         },
         "BoostTemperature": {
             "displayText": "Ajustar la\ntemp. extra",
-            "description": "Temperatura de la punta utilizada en el \"modo de impulso\""
+            "description": "Temperatura de la punta de \"modo boost\""
         },
         "AutoStart": {
             "displayText": "Calentar\nal enchufar",
-            "description": "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)"
+            "description": "Calentado automático al iniciar (N=no | S=entrar en modo soldar | R=solo entrar en reposo | F=en reposo pero mantiene la punta fría)"
         },
         "TempChangeShortStep": {
             "displayText": "Cambio temp.\npuls. cortas",
@@ -143,6 +156,62 @@
             "displayText": "Permitir botones\nbloqueo",
             "description": "Mientras suelda, mantenga pulsados ambos botones para alternar su bloqueo (D=desactivar | B=sólo modo boost | F=bloqueo total)"
         },
+        "ProfilePhases": {
+            "displayText": "Fases de\nPerfil",
+            "description": "Numero de fases en modo perfil"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Temp de \n precalentado",
+            "description": "Precalentar a esta temperatura al inicio del modo perfil"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Velocidad de \nPrecalentado",
+            "description": "Precalentar a esta velocidad (grados por segundo)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Fase 1\nTemp",
+            "description": "Temperatura objetivo al final de esta fase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Fase 1\nDuración",
+            "description": "Duración objetivo de esta fase (segundos)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Fase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Fase 2\nDuración",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Fase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Fase 3\nDuración",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Fase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Fase 4\nDuración",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Fase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Fase 5\nDuración",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Velocidad de\nEnfriamineto",
+            "description": "Enfriar a esta velocidad al final del modo perfil (grados por segundo)"
+        },
         "MotionSensitivity": {
             "displayText": "Detección de\nmovimiento",
             "description": "Tiempo de reacción al agarrar (0=no | 1=menos sensible | ... | 9=más sensible)"
@@ -165,7 +234,7 @@
         },
         "TemperatureUnit": {
             "displayText": "Unidad de\ntemperatura",
-            "description": "Unidad de temperatura (C=centígrados | F=Fahrenheit)"
+            "description": "Unidad de temperatura (C=entígrados | F=Fahrenheit)"
         },
         "DisplayRotation": {
             "displayText": "Orientación\nde pantalla",
@@ -173,7 +242,7 @@
         },
         "CooldownBlink": {
             "displayText": "Parpadear\nal enfriar",
-            "description": "Lectura de la temperatura al ralentí mientras la punta está caliente"
+            "description": "Parpadear texto en inactivo cuando la punta este caliente"  
         },
         "ScrollingSpeed": {
             "displayText": "Velocidad\ndel texto",
@@ -181,15 +250,15 @@
         },
         "ReverseButtonTempChange": {
             "displayText": "Invertir\nbotones +/-",
-            "description": "Intercambio inversa de los botones para ajustar la temperatura"
+            "description": "Invertir botones de ajuste de temperatura"
         },
         "AnimSpeed": {
             "displayText": "Anim.\nvelocidad",
-            "description": "Velocidad de las animaciones de los iconos en el menú (O=off | L=low | M=medium | R=high)"
+            "description": "Velocidad de animaciones de iconos en el menú (O=apagado | L=baja | M=media | R=alta)"
         },
         "AnimLoop": {
             "displayText": "Anim.\nbucle",
-            "description": "Animaciones de iconos en bucle en el menú raíz"
+            "description": "Bucle de animaciones del menú principal"
         },
         "Brightness": {
             "displayText": "Pantalla\nbrillo",
@@ -200,28 +269,28 @@
             "description": "Invertir la pantalla OLED"
         },
         "LOGOTime": {
-            "displayText": "logo inicial\nduración",
+            "displayText": "Logo inicial\nduración",
             "description": "Duración de la animación del logo inicial (s=segundos)"
         },
         "AdvancedIdle": {
             "displayText": "Info extra en\nmodo reposo",
-            "description": "Mostrar información detallada en una fuente más pequeña en la pantalla inactiva"
+            "description": "Mostrar información detallada en tamaño pequeño en la pantalla de reposo"
         },
         "AdvancedSoldering": {
             "displayText": "Info extra\nal soldar",
-            "description": "Mostrar información detallada en una fuente más pequeña en la pantalla de soldadura"
+            "description": "Mostrar información detallada en tamaño pequeño en la pantalla de soldadura"
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Habilita BLE"
+            "description": "Habilitar BLE"
         },
         "PowerLimit": {
             "displayText": "Potencia\nlímite",
-            "description": "Elige el límite de potencia máxima del soldador (en vatios)"
+            "description": "Elige el límite de potencia máxima del soldador (en Watts)"
         },
         "CalibrateCJC": {
             "displayText": "Calibrar CJC\nen el próximo inicio",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+            "description": "Al siguinte inicio el Cold Junction Compensation sera calibrado (no requerido si el Delta T es < 5°C)"
         },
         "VoltageCalibration": {
             "displayText": "Calibrar voltaje\nde entrada",
@@ -229,15 +298,15 @@
         },
         "PowerPulsePower": {
             "displayText": "Pulsos bat.\nconstantes",
-            "description": "Intensidad de la potencia del pulso de mantenimiento del estado de vigilia (W=vatio)"
+            "description": "Intensidad de la potencia del pulso para mantener encendido (W=Watt)"
         },
         "PowerPulseWait": {
-            "displayText": "Impulso de potencia\ntiempo de espera",
-            "description": "Tiempo de espera antes de disparar cada pulso de mantenimiento de la vigilia (x 2,5s)"
+            "displayText": "Tiempor entre\n pulso de energia",
+            "description": "Tiempo de espera del pulso para mantener encendido (x 2,5s)"
         },
         "PowerPulseDuration": {
-            "displayText": "Impulso de potencia\nduración",
-            "description": "Duración del impulso de mantenimiento de la vigilia (x 250ms)"
+            "displayText": "Duración de\n pulso de energia",
+            "description": "Duración del pulso para mantener encendido (x 250ms)"
         },
         "SettingsReset": {
             "displayText": "Volver a ajustes\nde fábrica",

Translations/translation_FI.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Suomi",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Salli nappien\nlukitus",
             "description": "Kolvatessa paina molempia näppäimiä lukitaksesi ne (P=pois | V=vain tehostus | K=kaikki)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Liikkeen\nherkkyys",
             "description": "0=pois päältä | 1=vähäinen herkkyys | ... | 9=suurin herkkyys"

Translations/translation_FR.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Français",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Étalonnage\nterminé!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Emballement\nthermique"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Avant de redémarrer, assurez-vous que la panne et la poignée sont à température ambiante !"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Votre appareil semble être une contrefaçon !"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Verrouiller\nles boutons",
             "description": "Pendant la soudure, appuyer sur les deux boutons pour les verrouiller (D=désactivé | B=boost seulement | V=verr. total)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Sensibilité\nau mouvement",
             "description": "0=désactivé | 1=peu sensible | ... | 9=très sensible"
@@ -200,7 +268,7 @@
             "description": "Inverser les couleurs de l'écran OLED"
         },
         "LOGOTime": {
-            "displayText": "Durée logo\nau démarrage",
+            "displayText": "Durée logo\ndémarrage",
             "description": "Définit la durée d'affichage du logo au démarrage (s=secondes)"
         },
         "AdvancedIdle": {
@@ -213,14 +281,14 @@
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Activer le bluetooth basse consommation"
         },
         "PowerLimit": {
             "displayText": "Limite de\npuissance",
             "description": "Puissance maximale utilisable (W=watts)"
         },
         "CalibrateCJC": {
-            "displayText": "Étalonner CJC\nau prochain démarage",
+            "displayText": "Étalonner CJC\nau prochain démarrage",
             "description": "Au prochain démarrage, la compensation de soudure froide sera calibrée (non nécessaire si Delta T est < 5°C)."
         },
         "VoltageCalibration": {

Translations/translation_HR.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Hrvatski",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Kalibracija\ndovršena!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Neispravan\ngrijač"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Prije restarta provjerite da su vrh i ručka na sobnoj temperaturi!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Vaš uređaj je najvjerojatnije krivotvoren!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Zaključavanje\ntipki",
             "description": "Tokom lemljenja, držite obje tipke kako biste ih zaključali ili otključali (O=otključano | B=zaključan boost | Z=zaključano sve)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Osjetljivost\npokreta",
             "description": "Osjetljivost prepoznavanja pokreta. (0=ugašeno | 1=najmanje osjetljivo | ... | 9=najosjetljivije)"

Translations/translation_HU.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Magyar",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Kalibráció\nkész!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Kontrollálatlan\nhőmérséklet!"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Újraindítás előtt a hegy és az eszköz legyen szobahőmérsékletű!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Ki"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Az eszköz valószínűleg nem eredeti!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Lezárás\nengedélyezés",
             "description": "Forrasztás közben mindkét gombot hosszan lenyomva lezárja a kezelést (K=ki | B=csak \"boost\" módban | T=teljes lezárás)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Mozgás\nérzékenység",
             "description": "Mozgás érzékenység beállítása (0=kikapcsolva | 1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"

Translations/translation_IT.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Italiano",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibrazione\ncompletata!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Temperatura\nfuori controllo"
         },
+        "WarningTipShorted": {
+            "message": "Punta in cortocircuito!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Prima di riavviare assicurati che la punta e l'impugnatura siano a temperatura ambiente!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "OFF"
         },
+        "ProfilePreheatString": {
+            "message": "Preriscaldamento\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Raffreddamento\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "È probabile che questo dispositivo sia contraffatto!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Troppo caldo\nper il profilo"
         }
     },
     "characters": {
@@ -125,7 +137,7 @@
         },
         "BoostTemperature": {
             "displayText": "Temp\nTurbo",
-            "description": "Imposta la temperatura della funzione Turbo [°C/°F]"
+            "description": "Imposta la temperatura della funzione turbo [°C/°F]"
         },
         "AutoStart": {
             "displayText": "Avvio\nautomatico",
@@ -141,19 +153,75 @@
         },
         "LockingMode": {
             "displayText": "Blocco\ntasti",
-            "description": "Blocca i tasti durante la modalità Saldatura; tieni premuto entrambi per bloccare o sbloccare [D: disattiva; T: consenti Turbo; C: blocco completo]"
+            "description": "Blocca i tasti durante la modalità saldatura; tieni premuto entrambi per bloccare o sbloccare [D: disattiva; T: consenti Turbo; C: blocco completo]"
+        },
+        "ProfilePhases": {
+            "displayText": "Fasi modalità\nprofilo",
+            "description": "Imposta il numero di fasi da attuare per un profilo di riscaldamento personalizzato"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Temperatura\npreriscaldamento",
+            "description": "Imposta la temperatura di preriscaldamento da raggiungere all'inizio del profilo di riscaldamento"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Velocità\npreriscaldamento",
+            "description": "Imposta la velocità di preriscaldamento [°C/s]"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Temperatura\nfase 1",
+            "description": "Imposta la temperatura da raggiungere alla fine di questa fase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Durata\nfase 1",
+            "description": "Imposta la durata di questa fase [secondi]"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Temperatura\nfase 2",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Durata\nfase 2",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Temperatura\nfase 3",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Durata\nfase 3",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Temperatura\nfase 4",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Durata\nfase 4",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Temperatura\nfase 5",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Durata\nfase 5",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Velocità\nraffreddamento",
+            "description": "Imposta la velocità di raffreddamento al termine del profilo di riscaldamento [°C/s]"
         },
         "MotionSensitivity": {
             "displayText": "Sensibilità\nal movimento",
-            "description": "Imposta la sensibilità al movimento per uscire dalla modalità Riposo [0: nessuna; 1: minima; 9: massima]"
+            "description": "Imposta la sensibilità al movimento per uscire dalla modalità riposo [0: nessuna; 1: minima; 9: massima]"
         },
         "SleepTemperature": {
-            "displayText": "Temp\nriposo",
-            "description": "Imposta la temperatura da mantenere in modalità Riposo [°C/°F]"
+            "displayText": "Temperatura\nriposo",
+            "description": "Imposta la temperatura da mantenere in modalità riposo [°C/°F]"
         },
         "SleepTimeout": {
             "displayText": "Timer\nriposo",
-            "description": "Imposta il timer per entrare in modalità Riposo [secondi/minuti]"
+            "description": "Imposta il timer per entrare in modalità riposo [secondi/minuti]"
         },
         "ShutdownTimeout": {
             "displayText": "Timer\nspegnimento",
@@ -161,7 +229,7 @@
         },
         "HallEffSensitivity": {
             "displayText": "Sensore\nHall",
-            "description": "Regola la sensibilità del sensore ad effetto Hall per entrare in modalità Riposo [0: nessuna; 1: minima; 9: massima]"
+            "description": "Regola la sensibilità del sensore ad effetto Hall per entrare in modalità riposo [0: nessuna; 1: minima; 9: massima]"
         },
         "TemperatureUnit": {
             "displayText": "Unità di\ntemperatura",
@@ -209,7 +277,7 @@
         },
         "AdvancedSoldering": {
             "displayText": "Dettagli\nsaldatura",
-            "description": "Mostra informazioni dettagliate durante la modalità Saldatura"
+            "description": "Mostra informazioni dettagliate durante la modalità saldatura"
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
@@ -221,7 +289,7 @@
         },
         "CalibrateCJC": {
             "displayText": "Calibra T\nall'avvio",
-            "description": "Calibra le rilevazioni di temperatura al prossimo riavvio (non necessario se il Delta T<5 °C)"
+            "description": "Calibra le rilevazioni di temperatura al prossimo riavvio (non necessario se lo scarto di temperatura è minore di 5 °C)"
         },
         "VoltageCalibration": {
             "displayText": "Calibrazione\ntensione",

Translations/translation_JA_JP.json

@@ -3,7 +3,7 @@
     "languageLocalName": "日本語",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration done!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "過熱"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "オフ"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown"
+        },
         "DeviceFailedValidationWarning": {
             "message": "このデバイスはおそらく偽造品です"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to start profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "ボタンロック",
             "description": "半田付けモード時に両方のボタンを長押しし、ボタンロックする <×=オフ | ブ=ブーストのみ許可 | 全=すべてをロック>"
         },
+        "ProfilePhases": {
+            "displayText": "Profile Phases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat Temp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat Speed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1 Temp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1 Duration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2 Temp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2 Duration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3 Temp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3 Duration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4 Temp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4 Duration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5 Temp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5 Duration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown Speed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "動きの感度",
             "description": "0=オフ | 1=最低感度 | ... | 9=最高感度"

Translations/translation_LT.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Lietuvių",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Perkaitimo\npavojus"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Išj"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Mygtukų\nužraktas",
             "description": "Lituodami, ilgai paspauskite abu mygtukus, kad juos užrakintumėte (I=Išjungta | T=leidžiamas tik Turbo režimas | V=Visiškas užrakinimas)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Judesio\njautrumas",
             "description": "Judesio jautrumas (0=Išjungta | 1=Mažiausias | ... | 9=Didžiausias)"

Translations/translation_NB.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Norsk bokmål",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Termisk\nrømling"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Av"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Enheten din er sannsynligvis en forfalskning!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Tillat å låse\nknapper",
             "description": "Mens du lodder, hold nede begge knapper for å bytte mellom låsemodus (D=deaktiver | B=kun boost | F=full lås)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "BSensr\n",
             "description": "Bevegelsesfølsomhet (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)"

Translations/translation_NL.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Nederlands",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Verwarming\nOncontroleerbaar"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Uit"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Jouw toestel is wellicht een namaak-versie!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Knopblokkering\ninschakelen",
             "description": "Tijdens solderen lang op beide knoppen drukken blokkeert de knoppen (U=Uit | B=Alleen boost mode | V=Volledig blokkeren)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Bewegings-\ngevoeligheid",
             "description": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"

Translations/translation_NL_BE.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Vlaams",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Uit"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Allow locking\nbuttons",
             "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Bewegings-\ngevoeligheid",
             "description": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"
@@ -217,7 +285,7 @@
         },
         "PowerLimit": {
             "displayText": "Power\nlimit",
-            "description": "Maximum power the iron can use (W=watt)"
+            "description": "Average maximum power the iron can use (W=watt)"
         },
         "CalibrateCJC": {
             "displayText": "Calibrate CJC\nat next boot",

Translations/translation_PL.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Polski",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Kalibracja\nwykonana!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Ucieczka\ntermiczna"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Upewnij się, że końcówka i uchwyt mają temperaturę pokojową podczas następnego rozruchu!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Wył"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Twoje urządzenie jest najprawdopodobniej podróbką!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Blokada\nprzycisków",
             "description": "W trybie lutowania, wciśnij oba przyciski aby je zablokować (O=Wyłączona | B=tylko Boost | P=pełna blokada)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Czułość\nwykr. ruchu",
             "description": "Czułość wykrywania ruchu (0: Wyłączona | 1: Minimalna | ... | 9: Maksymalna)"

Translations/translation_PT.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Português",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibração\nefetuada!"
         },
         "ResetOKMessage": {
@@ -13,10 +13,10 @@
             "message": "Algumas configurações\nforam alteradas!"
         },
         "NoAccelerometerMessage": {
-            "message": "Acelerómetro não\ndetectado!"
+            "message": "Acelerómetro não\ndetetado!"
         },
         "NoPowerDeliveryMessage": {
-            "message": "USB-PD IC não\ndetectado!"
+            "message": "USB-PD IC não\ndetetado!"
         },
         "LockingKeysString": {
             "message": "Bloqueado"
@@ -30,8 +30,11 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
-            "message": "Antes de reninciar certifique-se que o ferro est à temperatura ambiente!"
+            "message": "Antes de reiniciar certifique-se que o ferro está à temperatura ambiente!"
         },
         "CJCCalibrating": {
             "message": "calibrar\n"
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
-            "message": "Seu dispositivo provavelmente é falsificado!"
+            "message": "O seu dispositivo provavelmente é falsificado!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -124,7 +136,7 @@
             "description": "Activa o modo PPS & EPR"
         },
         "BoostTemperature": {
-            "displayText": "Modo turbo\ntemperat.",
+            "displayText": "Temp.\nModo turbo",
             "description": "Ajuste de temperatura do \"modo turbo\""
         },
         "AutoStart": {
@@ -132,16 +144,72 @@
             "description": "Aquece a ponta automaticamente ao ligar (D=desligar | S=soldagem | H=hibernar | A=hibernar temp. ambiente)"
         },
         "TempChangeShortStep": {
-            "displayText": "Temp mudança\ncurta",
+            "displayText": "Mudança temp.\ncurta",
             "description": "A temperatura será aumentada com um click curto"
         },
         "TempChangeLongStep": {
-            "displayText": "Temp mudança\nlonga",
+            "displayText": "Mudança temp.\nlonga",
             "description": "A temperatura será aumentada com um click longo"
         },
         "LockingMode": {
-            "displayText": "Permitir bloquear\nbutões",
-            "description": "Durante a solda primir os dois butões para alternar entre (D=disativas | B=boost mode | F=bloqueio total)"
+            "displayText": "Permitir bloquear\nbotões",
+            "description": "Durante a solda premir os dois botões para alternar entre (D=desativados | B=modo turbo | F=bloqueio total)"
+        },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
         },
         "MotionSensitivity": {
             "displayText": "Sensibilidade\nmovimento",
@@ -160,7 +228,7 @@
             "description": "Tempo para desligar (Minutos)"
         },
         "HallEffSensitivity": {
-            "displayText": "Sensibilidade de\nmagentismo",
+            "displayText": "Sensibilidade de\nmagnetismo",
             "description": "Sensibilidade de magnetismo (0=Desligado | 1=Menor | ... | 9=Maior)"
         },
         "TemperatureUnit": {
@@ -177,50 +245,50 @@
         },
         "ScrollingSpeed": {
             "displayText": "Velocidade\ntexto ajuda",
-            "description": "Velocidade a que o texto é mostrado"
+            "description": "Velocidade a que o texto de ajuda é apresentado"
         },
         "ReverseButtonTempChange": {
-            "displayText": "Mudar\n+ - teclas",
-            "description": "Inverter o alinhamento dos butões para ajudar a temperatura"
+            "displayText": "Trocar\nbotões + -",
+            "description": "Inverte o funcionamento dos botões de ajuste da temperatura"
         },
         "AnimSpeed": {
             "displayText": "Velocidade de\nanimação",
-            "description": "Sitio das animações no menu (O=off | S=lentas | M=medias | F=rapidas)"
+            "description": "Velocidade das animações no menu (O=off | S=lenta | M=média | F=rápida)"
         },
         "AnimLoop": {
             "displayText": "Repetir\nanimações",
-            "description": "Repetir icon de animações no ecrã principal"
+            "description": "Repete animações de ícones no menu principal"
         },
         "Brightness": {
-            "displayText": "Screen\nbrightness",
-            "description": "Ajustar o brilho do ecrã OLED"
+            "displayText": "Brilho\ndo ecrã",
+            "description": "Ajusta o brilho do ecrã OLED"
         },
         "ColourInversion": {
             "displayText": "Inverter\necrã",
-            "description": "Inverter as cores do ecrã OLED"
+            "description": "Inverte as cores do ecrã OLED"
         },
         "LOGOTime": {
             "displayText": "Duração do\nlogo no arranque",
-            "description": "Definir a duração do logotipo no arranque em (s=segundos)"
+            "description": "Define a duração do logotipo no arranque em (s=segundos)"
         },
         "AdvancedIdle": {
-            "displayText": "Ecrã repouso\navançada",
-            "description": "Mostra informações avançadas quando em espera"
+            "displayText": "Ecrã repouso\navançado",
+            "description": "Mostra informações avançadas quando em repouso"
         },
         "AdvancedSoldering": {
-            "displayText": "Ecrã trabalho\navançado",
-            "description": "Mostra informações avançadas durante o uso"
+            "displayText": "Ecrã solda\navançado",
+            "description": "Mostra informações avançadas durante a solda"
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Ativa o Bluetooth Low Energy (BLE)"
         },
         "PowerLimit": {
             "displayText": "Limite de\npotência",
             "description": "Potência máxima a usar (W=watt)"
         },
         "CalibrateCJC": {
-            "displayText": "Calibrar CJC\nno prozimo arranque",
+            "displayText": "Calibrar CJC\nno próximo arranque",
             "description": "No próximo arranque CJC será calibrada  (não será necessário caso o Delta T seja < 5°C)"
         },
         "VoltageCalibration": {

Translations/translation_RO.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Română",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Încălzire\nEşuată"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Înainte de repornire, asiguraţi-vă că vârful şi mânerul sunt la temperatura camerei!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Nu"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Dispozitivul dvs. este cel mai probabil un fals!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Blocare\nbutoane",
             "description": "Când lipiţi, apăsaţi lung ambele butoane, pentru a le bloca (D=dezactivare | B=numai \"modul boost\" | F=blocare completă)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Sensibilitate\nla miscare",
             "description": "Sensibilitate senzor miscare (0=oprit | 1=puţin sensibil | ... | 9=cel mai sensibil)"

Translations/translation_RU.json

@@ -3,20 +3,20 @@
     "languageLocalName": "Русский",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Калибровка\nзавершена!"
         },
         "ResetOKMessage": {
-            "message": "Сброс OK"
+            "message": "Готово!"
         },
         "SettingsResetMessage": {
             "message": "Настройки\nсброшены!"
         },
         "NoAccelerometerMessage": {
-            "message": "Не определен\nакселерометр!"
+            "message": "Акселерометр\nне обнаружен!"
         },
         "NoPowerDeliveryMessage": {
-            "message": "USB-PD питание\nне обнаружено"
+            "message": "Питание по USB-PD\nне обнаружено"
         },
         "LockingKeysString": {
             "message": "ЗАБЛОК"
@@ -28,7 +28,10 @@
             "message": "!ЗАБЛОК!"
         },
         "WarningThermalRunaway": {
-            "message": "Неуправляемый\nРазогрев"
+            "message": "Неуправляемый\nразогрев"
+        },
+        "WarningTipShorted": {
+            "message": "!КЗ на жале!"
         },
         "SettingsCalibrationWarning": {
             "message": "Пожалуйста, убедитесь, что жало и корпус имеют комнатную температуру при следующей загрузке!"
@@ -40,28 +43,37 @@
             "message": "Вы уверены, что хотите сбросить настройки к значениям по умолчанию?"
         },
         "UVLOWarningString": {
-            "message": "НАПРЯЖ--"
+            "message": "НИЗ.НАПР"
         },
         "UndervoltageString": {
             "message": "Низ. напряжение\n"
         },
         "InputVoltageString": {
-            "message": "Питание В: \n"
+            "message": "Питание(В):\n"
         },
         "SleepingSimpleString": {
-            "message": "Zzzz"
+            "message": "Хххррп"
         },
         "SleepingAdvancedString": {
-            "message": "Ожидание...\n"
+            "message": "Сон...\n"
         },
         "SleepingTipAdvancedString": {
             "message": "Жало: \n"
         },
         "OffString": {
-            "message": "Вык"
+            "message": "Выкл"
+        },
+        "ProfilePreheatString": {
+            "message": "Преднагрев\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Остывание\n"
         },
         "DeviceFailedValidationWarning": {
-            "message": "Скорее всего, это устройство подделка!"
+            "message": "Вероятно, это поддельное устройство!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Слишком горячо для\nстарта профиля"
         }
     },
     "characters": {
@@ -72,9 +84,9 @@
         "SettingSlowChar": "М",
         "SettingMediumChar": "С",
         "SettingFastChar": "Б",
-        "SettingStartNoneChar": "В",
+        "SettingStartNoneChar": "О",
         "SettingStartSolderingChar": "П",
-        "SettingStartSleepChar": "О",
+        "SettingStartSleepChar": "С",
         "SettingStartSleepOffChar": "К",
         "SettingLockDisableChar": "О",
         "SettingLockBoostChar": "Т",
@@ -82,110 +94,166 @@
     },
     "menuGroups": {
         "PowerMenu": {
-            "displayText": "Параметры\nпитания",
+            "displayText": "Настройки\nпитания",
             "description": ""
         },
         "SolderingMenu": {
-            "displayText": "Параметры\nпайки",
+            "displayText": "Настройки\nпайки",
             "description": ""
         },
         "PowerSavingMenu": {
-            "displayText": "Режимы\nсна",
+            "displayText": "Авто\nвыключение",
             "description": ""
         },
         "UIMenu": {
-            "displayText": "Параметры\nинтерфейса",
+            "displayText": "Интерфейс\n",
             "description": ""
         },
         "AdvancedMenu": {
-            "displayText": "Дополнител.\nнастройки",
+            "displayText": "Доп.\nнастройки",
             "description": ""
         }
     },
     "menuOptions": {
         "DCInCutoff": {
-            "displayText": "Источник\nпитания",
-            "description": "Источник питания. Устанавливает напряжение отсечки. (DC 10В) (S 3,3В на ячейку, без лимита мощности)"
+            "displayText": "Предельное\nнапряжение",
+            "description": "Установка минимально предельного напряжения от аккумулятора для предотвращения глубокого разряда (DC 10В | S 3,3В на ячейку, без ограничения мощности)"
         },
         "MinVolCell": {
-            "displayText": "Мин.\nнапр.",
-            "description": "Минимальное разрешенное напряжение на ячейку (3S: 3 - 3,7V | 4S-6S: 2,4 - 3,7V)"
+            "displayText": "Мин.\nнапряжение",
+            "description": "Минимально разрешённое напряжение на ячейку (3S: 3 - 3,7В | 4S-6S: 2,4 - 3,7В)"
         },
         "QCMaxVoltage": {
-            "displayText": "Ограничение\nнапряжения QC",
-            "description": "Максимальное напряжение для согласования с QC источником питания"
+            "displayText": "Напр-е\nдля QC",
+            "description": "Максимальное напряжение для согласования с источником питания по QC"
         },
         "PDNegTimeout": {
-            "displayText": "PD\nтайм-аут",
-            "description": "Power Delivery тайм-аут согласования с шагом 100 мс для совместимости с некоторыми быстрыми зарядными QC (0: отключено)"
+            "displayText": "PD\nинтервал",
+            "description": "Интервал согласования питания по Power Delivery с шагом 100 мс для совместимости с некоторыми источниками питания по QC (0=Откл.)"
         },
         "PDVpdo": {
             "displayText": "PD\nVPDO",
-            "description": "Включает режимы PPS & EPR."
+            "description": "Включить режимы PPS & EPR"
         },
         "BoostTemperature": {
             "displayText": "t° турбо\nрежима",
             "description": "Температура жала в турбо-режиме"
         },
         "AutoStart": {
-            "displayText": "Авто\nстарт",
-            "description": "Режим, в котором запускается паяльник при подаче питания (В=Выкл. | П=Пайка | О=Ожидание | К=Ожидание при комн. темп.)"
+            "displayText": "Режим при\nвключении",
+            "description": "Режим, в котором включается паяльник (О=Откл. | П=Пайка | С=Сон | К=Ожидание при комн. темп.)"
         },
         "TempChangeShortStep": {
-            "displayText": "Шаг темп.\nкор. наж.",
+            "displayText": "Шаг t° при\nкор.наж-ии",
             "description": "Шаг изменения температуры при коротком нажатии кнопок"
         },
         "TempChangeLongStep": {
-            "displayText": "Шаг темп.\nдлин. наж.",
-            "description": "Шаг изменения температуры при длинном нажатии кнопок"
+            "displayText": "Шаг t° при\nдол.наж-ии",
+            "description": "Шаг изменения температуры при долгом нажатии кнопок"
         },
         "LockingMode": {
             "displayText": "Разрешить\nблок. кнопок",
-            "description": "При работе длинное нажатие обеих кнопок блокирует их (О=Отключено | Т=Только турбо | П=Полная блокировка)"
+            "description": "Блокировать кнопки при их долгом нажатии в режиме пайки (О=Откл. | Т=Только турбо | П=Полная блокировка)"
+        },
+        "ProfilePhases": {
+            "displayText": "Этапы\nпрофиля",
+            "description": "Количество этапов в режиме профиля"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Температура\nпреднагрева",
+            "description": "Температура предварительного нагрева в начале режима термопрофиля"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Скорость\nпреднагрева",
+            "description": "Скорость предварительного нагрева в начале режима термопрофиля (в градусах в секунду)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Температура\n1-го этапа",
+            "description": "Необходимая температура в конце 1-го этапа"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Длительность\n1-го этапа",
+            "description": "Необходимая длительность 1-го этапа (в секундах)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Температура\n2-го этапа",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Длительность\n2-го этапа",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Температура\n3-го этапа",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Длительность\n3-го этапа",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Температура\n4-го этапа",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Длительность\n4-го этапа",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Температура\n5-го этапа",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Длительность\n5-го этапа",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Скорость\nостывания",
+            "description": "Скорость остывания в конце режима термопрофиля (в градусах в секунду)"
         },
         "MotionSensitivity": {
             "displayText": "Чувствительн.\nакселерометра",
-            "description": "Чувствительность акселерометра (0=Выкл. | 1=мин. | ... | 9=макс.)"
+            "description": "Чувствительность акселерометра (0=Откл. | 1=мин. | ... | 9=макс.)"
         },
         "SleepTemperature": {
-            "displayText": "Темп.\nожидания",
-            "description": "Температура жала в режиме ожидания"
+            "displayText": "t° при\nсне",
+            "description": "Температура жала в режиме сна"
         },
         "SleepTimeout": {
-            "displayText": "Таймаут\nожидания",
-            "description": "Время до перехода в режим ожидания (Минуты | Секунды)"
+            "displayText": "Интервал\nсна",
+            "description": "Время до перехода в режим сна (секунды | минуты)"
         },
         "ShutdownTimeout": {
-            "displayText": "Таймаут\nвыключения",
-            "description": "Время до выключения паяльника (минуты)"
+            "displayText": "Интервал\nотключ-я",
+            "description": "Время до выключения паяльника (в минутах)"
         },
         "HallEffSensitivity": {
             "displayText": "Датчик\nХолла",
-            "description": "Чувствительность датчика Холла к переходу в спящий режим (0=Выкл. | 1=мин. | ... | 9=макс.)"
+            "description": "Чувствительность датчика Холла к магнитному полю (0=Откл. | 1=мин. | ... | 9=макс.)"
         },
         "TemperatureUnit": {
-            "displayText": "Единицы\nтемпературы",
+            "displayText": "Единицы\nизмерения",
             "description": "Единицы измерения температуры (C=°Цельcия | F=°Фаренгейта)"
         },
         "DisplayRotation": {
-            "displayText": "Ориентация\nэкрана",
-            "description": "Ориентация экрана (П=Правая рука | Л=Левая рука | А=Авто)"
+            "displayText": "Поворот\nэкрана",
+            "description": "Поворот экрана (П=Правша | Л=Левша | А=Авто)"
         },
         "CooldownBlink": {
             "displayText": "Мигание t°\nпри остывании",
-            "description": "Мигать температурой на экране охлаждения, пока жало еще горячее"
+            "description": "Мигать температурой на экране при остывании, пока жало ещё горячее"
         },
         "ScrollingSpeed": {
             "displayText": "Скорость\nтекста",
-            "description": "Скорость прокрутки текста (М=медленно | Б=быстро)"
+            "description": "Скорость прокрутки текста (М=Медленная | Б=Быстрая)"
         },
         "ReverseButtonTempChange": {
-            "displayText": "Поменять\nкнопки+-",
+            "displayText": "Поменять\nкнопки +/-",
             "description": "Поменять кнопки изменения температуры"
         },
         "AnimSpeed": {
             "displayText": "Скорость\nанимации",
-            "description": "Скорость анимации иконок в главном меню (Милисекунды) (О=Отключено | Н=Низкий | С=Средний | В=Высокий)"
+            "description": "Скорость анимации иконок в главном меню (О=Откл. | М=Медленная| С=Средняя | Б=Быстрая)"
         },
         "AnimLoop": {
             "displayText": "Зацикленная\nанимация",
@@ -193,31 +261,31 @@
         },
         "Brightness": {
             "displayText": "Яркость\nэкрана",
-            "description": "Настройки контраста/яркости OLED экрана"
+            "description": "Уровень яркости пикселей на экране"
         },
         "ColourInversion": {
             "displayText": "Инверсия\nэкрана",
-            "description": "Инвертировать цвета на OLED экране"
+            "description": "Инвертировать пиксели на экране"
         },
         "LOGOTime": {
-            "displayText": "Длительность\nпоказа логотипа",
+            "displayText": "Длит-ть\nлоготипа",
             "description": "Длительность отображения логотипа (в секундах)"
         },
         "AdvancedIdle": {
-            "displayText": "Подробный\nреж. ожидания",
-            "description": "Отображать детальную информацию уменьшенным шрифтом на экране ожидания"
+            "displayText": "Подробный\nэкран ожидания",
+            "description": "Показывать дополнительную информацию на экране ожидания уменьшенным шрифтом"
         },
         "AdvancedSoldering": {
             "displayText": "Подробный\nэкран пайки",
-            "description": "Показывать детальную информацию на экране пайки"
+            "description": "Показывать дополнительную информацию на экране пайки уменьшенным шрифтом"
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Включить BLE"
         },
         "PowerLimit": {
-            "displayText": "Предел\nмощности",
-            "description": "Максимальная мощность, которую может использовать паяльник (Ватт)"
+            "displayText": "Предел\nмощ-ти",
+            "description": "Максимальная мощность, которую может использовать паяльник (в ваттах)"
         },
         "CalibrateCJC": {
             "displayText": "Калибровка\nтемпературы",
@@ -228,20 +296,20 @@
             "description": "Калибровка входного напряжения (долгое нажатие для выхода)"
         },
         "PowerPulsePower": {
-            "displayText": "Сила имп.\nпитания Вт",
-            "description": "Сила импульса удерживающего от сна повербанк или другой источник питания"
+            "displayText": "Сила имп.\nпитания",
+            "description": "Сила импульса, удерживающего от автовыключения источник питания (в ваттах)"
         },
         "PowerPulseWait": {
-            "displayText": "Пауза имп.\nпитания с",
-            "description": "Пауза между импульсами удерживающими источник питания от сна (x 2,5с)"
+            "displayText": "Пауза имп.\nпитания (К)",
+            "description": "Коэффициент паузы между импульсами, удерживающими от автовыключения источник питания (К x 2,5 с)"
         },
         "PowerPulseDuration": {
-            "displayText": "Длина имп.\nпитания мс",
-            "description": "Длина импульса удерживающего от сна источник питания (x 250мс)"
+            "displayText": "Длина имп.\nпитания (К)",
+            "description": "Коэффициент длины импульса, удерживающего от автовыключения источник питания (К x 250 мс)"
         },
         "SettingsReset": {
-            "displayText": "Сброс\nНастроек",
-            "description": "Сброс настроек к значеням по умолчанию"
+            "displayText": "Сброс\nнастроек",
+            "description": "Сброс настроек к значениям по умолчанию"
         },
         "LanguageSwitch": {
             "displayText": "Язык:\n RU     Русский",

Translations/translation_SK.json

@@ -3,8 +3,8 @@
     "languageLocalName": "Slovenčina",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
-            "message": "Calibration\ndone!"
+        "CalibrationDone": {
+            "message": "Kalibrácia\ndokončená!"
         },
         "ResetOKMessage": {
             "message": "Reset OK"
@@ -30,11 +30,14 @@
         "WarningThermalRunaway": {
             "message": "Únik\nTepla"
         },
+        "WarningTipShorted": {
+            "message": "!Skrat hrotu!"
+        },
         "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+            "message": "Pred reštartovaním sa uistite, že hrot a rúčka sú v izbovej teplote!"
         },
         "CJCCalibrating": {
-            "message": "calibrating\n"
+            "message": "kalibrovanie\n"
         },
         "SettingsResetWarning": {
             "message": "Naozaj chcete obnoviť továrenské nastavenia?"
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Vyp"
         },
+        "ProfilePreheatString": {
+            "message": "Predhrievanie\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Schladzovanie\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Vaše zariadenie je pravdepodobne falzifikát!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Teplota príliš vysoká pre štart profilu"
         }
     },
     "characters": {
@@ -121,7 +133,7 @@
         },
         "PDVpdo": {
             "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+            "description": "Zapína PPS & EPR režimy"
         },
         "BoostTemperature": {
             "displayText": "Boost\nteplota",
@@ -143,6 +155,62 @@
             "displayText": "Povoliť zámok\ntlačidiel",
             "description": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania (Z=Zakázať | B=Okrem boost | P=Plné zamknutie)"
         },
+        "ProfilePhases": {
+            "displayText": "Profilové\nFázy",
+            "description": "Počet fáz v profilovóm režime"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Teplota\nPredhriatia",
+            "description": "Teplota na ktorú sa má predohriať na začiatku profilového režimu"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Rýchlosť\nPredhriatia",
+            "description": "Rýchlosť predhrievania (stupňe za sekundu)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Teplota\nFáza 1",
+            "description": "Cieľová teplota na konci tejto fázy"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Trvanie\nFáza 1",
+            "description": "Doba trvania tejto fázy (sekundy)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Teplota\nFáza 2",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Trvanie\nFáza 2",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Teplota\nFáza 3",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Trvanie\nFáza 3",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Teplota\nFáza 4",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Trvanie\nFáza 4",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Teplota\nFáza 5",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Trvanie\nFáza 4",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Rýchlosť\nochladzovania",
+            "description": "Rýchlosť ochladzovania na konci profilového režimu (stupne za sekundu)"
+        },
         "MotionSensitivity": {
             "displayText": "Citlivosť\npohybu",
             "description": "Citlivosť detekcie pohybu (0=Vyp | 1=Min | ... | 9=Max)"
@@ -213,15 +281,15 @@
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Zapne BLE"
         },
         "PowerLimit": {
             "displayText": "Obmedzenie\nvýkonu",
             "description": "Obmedzenie výkonu podľa použitého zdroja (watt)"
         },
         "CalibrateCJC": {
-            "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+            "displayText": "Kalibrácia CJC\npri nasledujúcom štarte",
+            "description": "Pri nasledujúcom štarte bude kalibrovaná kompenzácia studeného spoja (nie je potrebné ak Delta T je < 5°C)"
         },
         "VoltageCalibration": {
             "displayText": "Kalibrácia\nnap. napätia",

Translations/translation_SL.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Slovenščina",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Omogoči\nzaklep gumbov",
             "description": "Za zaklep med spajkanjem drži oba gumba (O=onemogoči | L=le pospešeno | P=polno)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Občutljivost\npremikanja",
             "description": "0=izklopljeno | 1=najmanjša | ... | 9=največja"

Translations/translation_SR_CYRL.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Српски",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Иск"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Allow locking\nbuttons",
             "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Осетљивост\nна покрет",
             "description": "Осетљивост сензора покрета. (0=искључено | 1=најмање осетљиво | ... | 9=најосетљивије)"
@@ -217,7 +285,7 @@
         },
         "PowerLimit": {
             "displayText": "Power\nlimit",
-            "description": "Maximum power the iron can use (W=watt)"
+            "description": "Average maximum power the iron can use (W=watt)"
         },
         "CalibrateCJC": {
             "displayText": "Calibrate CJC\nat next boot",

Translations/translation_SR_LATN.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Srpski",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Isk"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Allow locking\nbuttons",
             "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Osetljivost\nna pokret",
             "description": "Osetljivost senzora pokreta. (0=isključeno | 1=najmanje osetljivo | ... | 9=najosetljivije)"
@@ -217,7 +285,7 @@
         },
         "PowerLimit": {
             "displayText": "Power\nlimit",
-            "description": "Maximum power the iron can use (W=watt)"
+            "description": "Average maximum power the iron can use (W=watt)"
         },
         "CalibrateCJC": {
             "displayText": "Calibrate CJC\nat next boot",

Translations/translation_SV.json

@@ -3,11 +3,11 @@
     "languageLocalName": "Svenska",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
-            "message": "Calibration\ndone!"
+        "CalibrationDone": {
+            "message": "Kalibrering\nfärdig!"
         },
         "ResetOKMessage": {
-            "message": "Reset OK"
+            "message": "Återställning\nOK"
         },
         "SettingsResetMessage": {
             "message": "Inställningar\nåterställda"
@@ -28,13 +28,16 @@
             "message": "!LÅST!"
         },
         "WarningThermalRunaway": {
-            "message": "Thermal\nRunaway"
+            "message": "Termisk\nFlykt"
+        },
+        "WarningTipShorted": {
+            "message": "!Spets Kortsluten!"
         },
         "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+            "message": "Före omstart, säkerställ att spetsen och handtaget är i rumstemperatur!"
         },
         "CJCCalibrating": {
-            "message": "calibrating\n"
+            "message": "kalibrerar\n"
         },
         "SettingsResetWarning": {
             "message": "Är du säker på att du vill återställa inställningarna?"
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Av"
         },
+        "ProfilePreheatString": {
+            "message": "Förvärmning\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Nedkyldning\n"
+        },
         "DeviceFailedValidationWarning": {
-            "message": "Your device is most likely a counterfeit!"
+            "message": "Din enhet är sannerligen oäkta!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "För varm för att\nstarta profilen!"
         }
     },
     "characters": {
@@ -116,12 +128,12 @@
             "description": "Maximal QC-spänning enheten skall efterfråga"
         },
         "PDNegTimeout": {
-            "displayText": "PD\ntimeout",
-            "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
+            "displayText": "PD\npauser",
+            "description": "PD förhandlings pauser i 100ms steg för kompatibilitet med vissa PD laddare"
         },
         "PDVpdo": {
             "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+            "description": "Slår på PPS & EPR lägen"
         },
         "BoostTemperature": {
             "displayText": "Turbo-\ntemp",
@@ -143,6 +155,62 @@
             "displayText": "Tillåt lås\nvia knappar",
             "description": "Vid lödning, håll nere bägge knappar för att slå på lås (A=Av | T=Bara turbo | F=Fullt lås)"
         },
+        "ProfilePhases": {
+            "displayText": "Profil-\nfaser",
+            "description": "Antal faser i profil läge"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Förvärmnings-\ntemp",
+            "description": "Förvärm till denna temperatur i början av provil läget"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Förvärmnings-\nhastighet",
+            "description": "Förvärm enligt denna hastighet (grader per sekund)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Fas 1\nTemp",
+            "description": "Måltemperatur i slutet av denna fas"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Fas 1\nTidslängd",
+            "description": "Mållängd av denna fasen (sekunder)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Fas 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Fas 2\nTidslängd",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Fas 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Fas 3\nTidslängd",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Fas 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Fas 4\nTidslängd",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Fas 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Fas 5\nTidslängd",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Nedkylnings-\nhastighet",
+            "description": "Kyl ned i denna hastighet i slutet av profilen (grader per sekund)"
+        },
         "MotionSensitivity": {
             "displayText": "Rörelse-\nkänslighet",
             "description": "Rörelsekänslighet (0=Av | 1=minst känslig | ... | 9=mest känslig)"
@@ -192,16 +260,16 @@
             "description": "Loopa animationer i huvudmeny"
         },
         "Brightness": {
-            "displayText": "Screen\nbrightness",
-            "description": "Adjust the OLED screen brightness"
+            "displayText": "Skärmens\nLjusstyrka",
+            "description": "Justera OLED skärmens ljusstyrka"
         },
         "ColourInversion": {
-            "displayText": "Invert\nscreen",
-            "description": "Invert the OLED screen colors"
+            "displayText": "Invertera\nskärm",
+            "description": "Invertera OLED skärmens färger"
         },
         "LOGOTime": {
-            "displayText": "Boot logo\nduration",
-            "description": "Set boot logo duration (s=seconds)"
+            "displayText": "Start logo\nTidslängd",
+            "description": "Sätt uppstartslogotypens tidslängd (s=sekunder)"
         },
         "AdvancedIdle": {
             "displayText": "Detaljerad\nvid inaktiv",
@@ -213,31 +281,31 @@
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Tillåter BLE" 
         },
         "PowerLimit": {
             "displayText": "Max-\neffekt",
             "description": "Maximal effekt som enheten kan använda (Watt)"
         },
         "CalibrateCJC": {
-            "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+            "displayText": "Kalibrera CJC\nnästa uppstart",
+            "description": "Vid nästa uppstart kommer spets Cold Junction Compensation kalibreras (ej nödvändigt om Delta T är < 5°C)"
         },
         "VoltageCalibration": {
             "displayText": "Kalibrera\ninspänning?",
             "description": "Inspänningskalibrering. Knapparna justerar, håll inne för avslut"
         },
         "PowerPulsePower": {
-            "displayText": "Power\npulse",
-            "description": "Intensity of power of keep-awake-pulse (W=watt)"
+            "displayText": "Effekt\npuls",
+            "description": "Intensiteten av effekt för håll-vaken-puls (W=watt)"
         },
         "PowerPulseWait": {
-            "displayText": "Power pulse\ndelay",
-            "description": "Delay before keep-awake-pulse is triggered (x 2.5s)"
+            "displayText": "Effekt puls\nfördröjning",
+            "description": "Fördröjning innan håll-vaken-pulsen skickas (x 2.5s)"
         },
         "PowerPulseDuration": {
-            "displayText": "Power pulse\nduration",
-            "description": "Keep-awake-pulse duration (x 250ms)"
+            "displayText": "Effekt puls\ntidsmängd",
+            "description": "Håll-vaken-puls varaktighet (x 250ms)"
         },
         "SettingsReset": {
             "displayText": "Fabriks-\ninställ?",

Translations/translation_TR.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Türkçe",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Kapalı"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Allow locking\nbuttons",
             "description": "While soldering, hold down both buttons to toggle locking them (K=Kapalı | B=boost mode only | F=full locking)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "HARHAS\n",
             "description": "Hareket Hassasiyeti (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"

Translations/translation_UK.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Українська",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "КХС\nвідкалібровано!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Некерований\nрозігрів"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну температуру!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Вимк"
         },
+        "ProfilePreheatString": {
+            "message": "Попередній\nрозігрів"
+        },
+        "ProfileCooldownString": {
+            "message": "Охолодження\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Вірогідно ваш пристрій підробний!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Занадто гараче для\nзміни профілів"
         }
     },
     "characters": {
@@ -70,7 +82,7 @@
         "SettingAutoChar": "A",
         "SettingOffChar": "B",
         "SettingSlowChar": "Н",
-        "SettingMediumChar": "M",
+        "SettingMediumChar": "С",
         "SettingFastChar": "М",
         "SettingStartNoneChar": "В",
         "SettingStartSolderingChar": "П",
@@ -143,6 +155,62 @@
             "displayText": "Дозволити\nблок. кнопок",
             "description": "Під час пайки тривале натискання обох кнопок заблокує їх (В=Вимк | Т=Тільки турбо | П=Повне)"
         },
+        "ProfilePhases": {
+            "displayText": "Етапи\nпрофілів",
+            "description": "Кількість етапів в режимі профілів"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Температура\nПоп.Розігріву",
+            "description": "Попередньо розігріти до цієї температури на початку режимку профілів"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Швидкість\nПоп.Розігріву",
+            "description": "Розігрівати з такою швидкістю (градусів в секунду)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Етап 1\nТемпература",
+            "description": "Температура в кінці цього етапу"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Етап 1\nТривалість",
+            "description": "Тривалість цього етапу (секунд)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Етап 2\nТемпература",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Етап 2\nТривалість",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Етап 3\nТемпература",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Етап 3\nТривалість",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Етап 4\nТемпература",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Етап 4\nТривалість",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Етап 5\nТемпература",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Етап 5\nТривалість",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Швидкість\nОхолодження",
+            "description": "Швидкість охолодження в кінці режиму профілів (градусів в секунду)"
+        },
         "MotionSensitivity": {
             "displayText": "Чутливість\nсенсору руху",
             "description": "Акселерометр (0=Вимк. | 1=мін. чутливості | ... | 9=макс. чутливості)"
@@ -177,7 +245,7 @@
         },
         "ScrollingSpeed": {
             "displayText": "Швидкість\nтексту",
-            "description": "Швидкість прокрутки тексту (П=повільно | Ш=швидко)"
+            "description": "Швидкість прокрутки тексту (Н=Низькa | М=Максимальна)"
         },
         "ReverseButtonTempChange": {
             "displayText": "Інвертувати\nкнопки +-?",
@@ -185,7 +253,7 @@
         },
         "AnimSpeed": {
             "displayText": "Швидкість\nанімації",
-            "description": "Швидкість анімації іконок у головному меню (Мілісекунди) (В=Вимк | Н=Низькa | С=Середня | М=Макс)"
+            "description": "Швидкість анімації іконок у головному меню (В=Вимк | Н=Низькa | С=Середня | М=Максимальна)"
         },
         "AnimLoop": {
             "displayText": "Циклічна\nанімація",
@@ -213,7 +281,7 @@
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Увімкнути BLE"
         },
         "PowerLimit": {
             "displayText": "Макс.\nпотуж.",

Translations/translation_VI.json

@@ -3,7 +3,7 @@
     "languageLocalName": "Tieng Viet",
     "tempUnitFahrenheit": false,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Nhiet\nTat gia nhiet"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "Tat"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "Cho phép khóa\ncác nút",
             "description": "Trong khi hàn, giu ca 2 nút đe khóa(D=tat | B=chi che đo tăng cuong | F=khóa hoàn toàn)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Cam bien\ncu đong",
             "description": "- 0=tat | 1=đo nhay thap nhat| ... | 9=đo nhay cao nhat"

Translations/translation_YUE_HK.json

@@ -3,7 +3,7 @@
     "languageLocalName": "廣東話 (香港)",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
+        "CalibrationDone": {
             "message": "Calibration done!"
         },
         "ResetOKMessage": {
@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "加熱失控"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "關"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown"
+        },
         "DeviceFailedValidationWarning": {
             "message": "依支焫雞好有可能係冒牌貨！"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to start profile"
         }
     },
     "characters": {
@@ -143,6 +155,62 @@
             "displayText": "撳掣鎖定",
             "description": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=淨係容許增熱模式 | 全=鎖定全部>"
         },
+        "ProfilePhases": {
+            "displayText": "Profile Phases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat Temp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat Speed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1 Temp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1 Duration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2 Temp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2 Duration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3 Temp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3 Duration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4 Temp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4 Duration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5 Temp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5 Duration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown Speed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "動作敏感度",
             "description": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"

Translations/translation_ZH_CN.json

@@ -3,8 +3,8 @@
     "languageLocalName": "简体中文",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
-            "message": "Calibration done!"
+        "CalibrationDone": {
+            "message": "校正完成！"
         },
         "ResetOKMessage": {
             "message": "已重置！"
@@ -30,11 +30,14 @@
         "WarningThermalRunaway": {
             "message": "加热失控"
         },
+        "WarningTipShorted": {
+            "message": "!烙铁头短路!"
+        },
         "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+            "message": "在重启前请确认烙铁头及本体已完全冷却！"
         },
         "CJCCalibrating": {
-            "message": "calibrating"
+            "message": "校正中"
         },
         "SettingsResetWarning": {
             "message": "你是否确定要将全部设定重置为默认值？"
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "关"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown"
+        },
         "DeviceFailedValidationWarning": {
             "message": "这支电烙铁很有可能是冒牌货！"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to start profile"
         }
     },
     "characters": {
@@ -121,7 +133,7 @@
         },
         "PDVpdo": {
             "displayText": "PD VPDO",
-            "description": "Enables PPS & EPR modes"
+            "description": "启用PPS和EPR快充支持"
         },
         "BoostTemperature": {
             "displayText": "增热温度",
@@ -143,6 +155,62 @@
             "displayText": "按键锁定",
             "description": "焊接模式时，同时长按两个按键启用按键锁定 <无=禁用 | 增=只容许增热模式 | 全=完全锁定>"
         },
+        "ProfilePhases": {
+            "displayText": "Profile Phases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat Temp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat Speed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1 Temp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1 Duration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2 Temp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2 Duration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3 Temp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3 Duration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4 Temp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4 Duration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5 Temp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5 Duration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown Speed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "动作灵敏度",
             "description": "0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度"
@@ -212,8 +280,8 @@
             "description": "焊接模式画面以英语小字体显示详请"
         },
         "BluetoothLE": {
-            "displayText": "Bluetooth",
-            "description": "Enables BLE"
+            "displayText": "蓝牙",
+            "description": "启用蓝牙支持"
         },
         "PowerLimit": {
             "displayText": "功率限制",
@@ -221,7 +289,7 @@
         },
         "CalibrateCJC": {
             "displayText": "校正CJC",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5 C)"
+            "description": "在下次重启时校正烙铁头热电偶冷接点补偿值（CJC）（温差小于5摄氏度时无需校正）"
         },
         "VoltageCalibration": {
             "displayText": "输入电压校正？",

Translations/translation_ZH_TW.json

@@ -3,8 +3,8 @@
     "languageLocalName": "正體中文",
     "tempUnitFahrenheit": true,
     "messagesWarn": {
-        "CJCCalibrationDone": {
-            "message": "Calibration done!"
+        "CalibrationDone": {
+            "message": "校正完成！"
         },
         "ResetOKMessage": {
             "message": "已重設！"
@@ -30,11 +30,14 @@
         "WarningThermalRunaway": {
             "message": "加熱失控"
         },
+        "WarningTipShorted": {
+            "message": "!烙鐵頭短路!"
+        },
         "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+            "message": "在重啟前請確認烙鐵頭及本體已完全冷卻！"
         },
         "CJCCalibrating": {
-            "message": "calibrating"
+            "message": "校正中"
         },
         "SettingsResetWarning": {
             "message": "你是否確定要將全部設定重設到預設值？"
@@ -60,8 +63,17 @@
         "OffString": {
             "message": "關"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown"
+        },
         "DeviceFailedValidationWarning": {
             "message": "這支電烙鐵很有可能是冒牌貨！"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to start profile"
         }
     },
     "characters": {
@@ -121,7 +133,7 @@
         },
         "PDVpdo": {
             "displayText": "PD VPDO",
-            "description": "Enables PPS & EPR modes"
+            "description": "開啟PPS及EPR支援"
         },
         "BoostTemperature": {
             "displayText": "增熱溫度",
@@ -143,6 +155,62 @@
             "displayText": "按鍵鎖定",
             "description": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=只容許增熱模式 | 全=鎖定全部>"
         },
+        "ProfilePhases": {
+            "displayText": "Profile Phases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat Temp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat Speed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1 Temp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1 Duration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2 Temp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2 Duration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3 Temp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3 Duration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4 Temp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4 Duration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5 Temp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5 Duration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown Speed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "動作敏感度",
             "description": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"
@@ -212,8 +280,8 @@
             "description": "於焊接模式畫面以英文小字型顯示詳細資料"
         },
         "BluetoothLE": {
-            "displayText": "Bluetooth",
-            "description": "Enables BLE"
+            "displayText": "藍牙",
+            "description": "開啟藍牙支援"
         },
         "PowerLimit": {
             "displayText": "功率限制",
@@ -221,7 +289,7 @@
         },
         "CalibrateCJC": {
             "displayText": "校正CJC",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5 C)"
+            "description": "在下次重啟時校正烙鐵頭熱電偶冷接點補償值（CJC）（溫差小於5攝氏度時無需校正）"
         },
         "VoltageCalibration": {
             "displayText": "輸入電壓校正？",

Translations/translations_definitions.json

@@ -1,7 +1,7 @@
 {
     "messagesWarn": [{
-            "id": "CJCCalibrationDone",
-            "description": "Confirmation message indicating CJC calibration is complete."
+            "id": "CalibrationDone",
+            "description": "Confirmation message indicating calibration is complete."
         },
         {
             "id": "ResetOKMessage",
@@ -17,6 +17,9 @@
         },
         {
             "id": "NoPowerDeliveryMessage",
+            "include": [
+                "POW_PD"
+            ],
             "description": "The IC required for USB-PD could not be communicated with. This is an error warning that USB-PD WILL NOT FUNCTION. Generally indicative of either a hardware or software issues."
         },
         {
@@ -34,7 +37,12 @@
         {
             "id": "WarningThermalRunaway",
             "description": "Warning text shown when the software has disabled the heater as a safety precaution as the temperature reading didn't react as expected."
-        }, {
+        },
+        {
+            "id": "WarningTipShorted",
+            "description": "Warning text shown when the software has detected that the users tip is likely shorted."
+        },
+        {
             "id": "SettingsCalibrationWarning",
             "description": "Confirmation message shown before performing an offset calibration. Should warn the user to make sure tip and handle are at the same temperature."
         },
@@ -49,32 +57,66 @@
         {
             "id": "UVLOWarningString",
             "maxLen": 8,
+            "include": [
+                "POW_DC"
+            ],
             "description": "Warning text shown when the unit turns off due to undervoltage in simple mode."
         },
         {
             "id": "UndervoltageString",
             "maxLen": 15,
+            "include": [
+                "POW_DC"
+            ],
             "description": "Warning text shown when the unit turns off due to undervoltage in advanced mode."
         },
         {
             "id": "InputVoltageString",
             "maxLen": 11,
             "note": "Preferably end with a space",
+            "include": [
+                "POW_DC"
+            ],
             "description": "Prefix text for 'Input Voltage' shown before showing the input voltage reading."
         },
+        {
+            "id": "ProfilePreheatString",
+            "maxLen": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Shown in profile mode while preheating"
+        },
+        {
+            "id": "ProfileCooldownString",
+            "maxLen": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Shown in profile mode while cooling down"
+        },
         {
             "id": "SleepingSimpleString",
             "maxLen": 4,
+            "exclude": [
+                "NO_SLEEP_MODE"
+            ],
             "description": "The text shown to indicate the unit is in sleep mode when the advanced view is NOT on."
         },
         {
             "id": "SleepingAdvancedString",
             "maxLen": 15,
+            "exclude": [
+                "NO_SLEEP_MODE"
+            ],
             "description": "The text shown to indicate the unit is in sleep mode when the advanced view is turned on."
         },
         {
             "id": "SleepingTipAdvancedString",
             "maxLen": 6,
+            "exclude": [
+                "NO_SLEEP_MODE"
+            ],
             "description": "The prefix text shown before tip temperature when the unit is sleeping with advanced view on."
         },
         {
@@ -86,9 +128,18 @@
             "id": "DeviceFailedValidationWarning",
             "default": "Device may be\ncounterfeit",
             "description": "Warning shown if the device may be a clone or counterfeit unit."
+        },
+        {
+            "id": "TooHotToStartProfileWarning",
+            "default": "Too hot to\nstart profile",
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Shown when profile mode is started while the device is too hot."
         }
     ],
-    "characters": [{
+    "characters": [
+        {
             "id": "SettingRightChar",
             "len": 1,
             "description": "Shown for fixed Right-handed display rotation."
@@ -162,10 +213,15 @@
             "description": "Shown when the locking mode is set to lock all buttons."
         }
     ],
-    "menuGroups": [{
+    "menuGroups": [
+        {
             "id": "PowerMenu",
             "maxLen": 5,
             "maxLen2": 11,
+            "include": [
+                "POW_DC",
+                "POW_QC"
+            ],
             "description": "Menu for settings related to power. Main settings to do with the input voltage."
         },
         {
@@ -193,34 +249,50 @@
             "description": "Advanced settings. Misc catchall for settings that don't fit anywhere else or settings that require some thought before use."
         }
     ],
-    "menuOptions": [{
+    "menuOptions": [
+        {
             "id": "DCInCutoff",
             "maxLen": 5,
             "maxLen2": 11,
+            "include": [
+                "POW_DC"
+            ],
             "description": "When the device is powered by a battery, this adjusts the low voltage threshold for when the unit should turn off the heater to protect the battery."
         },
         {
             "id": "MinVolCell",
             "maxLen": 4,
             "maxLen2": 9,
+            "include": [
+                "POW_DC"
+            ],
             "description": "When powered by a battery, this adjusts the minimum voltage per cell before shutdown. (This is multiplied by the cell count.)"
         },
         {
             "id": "QCMaxVoltage",
             "maxLen": 8,
             "maxLen2": 15,
+            "include": [
+                "POW_QC"
+            ],
             "description": "This adjusts the maximum voltage the QC negotiation will adjust to. Does NOT affect USB-PD. Should be set safely based on the current rating of your power supply."
         },
         {
             "id": "PDNegTimeout",
             "maxLen": 8,
             "maxLen2": 15,
+            "include": [
+                "POW_PD"
+            ],
             "description": "How long until firmware stops trying to negotiate for USB-PD and tries QC instead. Longer times may help dodgy / old PD adapters, faster times move onto PD quickly. Units of 100ms. Recommended to keep small values."
         },
         {
             "id": "PDVpdo",
             "maxLen": 7,
             "maxLen2": 15,
+            "include": [
+                "POW_PD"
+            ],
             "description": "Enabled PPS & EPR modes."
         },
         {
@@ -253,6 +325,132 @@
             "maxLen2": 13,
             "description": "If locking the buttons against accidental presses is enabled."
         },
+        {
+            "id": "ProfilePhases",
+            "maxLen": 6,
+            "maxLen2": 13,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "set the number of phases for profile mode."
+        },
+        {
+            "id": "ProfilePreheatTemp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Preheat to this temperature at the start of profile mode."
+        },
+        {
+            "id": "ProfilePreheatSpeed",
+            "maxLen": 5,
+            "maxLen2": 11,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "How fast the temperature is allowed to rise during the preheat phase at the start of profile mode."
+        },
+        {
+            "id": "ProfilePhase1Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Target temperature for the end of phase 1 of profile mode."
+        },
+        {
+            "id": "ProfilePhase1Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Duration of phase 1 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfilePhase2Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Target temperature for the end of phase 2 of profile mode."
+        },
+        {
+            "id": "ProfilePhase2Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Duration of phase 2 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfilePhase3Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Target temperature for the end of phase 3 of profile mode."
+        },
+        {
+            "id": "ProfilePhase3Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Duration of phase 3 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfilePhase4Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Target temperature for the end of phase 5 of profile mode."
+        },
+        {
+            "id": "ProfilePhase4Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfilePhase5Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Target temperature for the end of phase 5 of profile mode."
+        },
+        {
+            "id": "ProfilePhase5Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfileCooldownSpeed",
+            "maxLen": 5,
+            "maxLen2": 11,
+            "include": [
+                "PROFILE_SUPPORT"
+            ],
+            "description": "How fast the temperature is allowed to drop during the cooldown phase at the end of profile mode."
+        },
         {
             "id": "MotionSensitivity",
             "maxLen": 6,
@@ -263,12 +461,18 @@
             "id": "SleepTemperature",
             "maxLen": 4,
             "maxLen2": 9,
+            "exclude": [
+                "NO_SLEEP_MODE"
+            ],
             "description": "Temperature the device will drop down to while asleep. Typically around halfway between off and soldering temperature."
         },
         {
             "id": "SleepTimeout",
             "maxLen": 4,
             "maxLen2": 9,
+            "exclude": [
+                "NO_SLEEP_MODE"
+            ],
             "description": "How long of a period without movement / button-pressing is required before the device drops down to the sleep temperature."
         },
         {
@@ -281,6 +485,9 @@
             "id": "HallEffSensitivity",
             "maxLen": 6,
             "maxLen2": 13,
+            "include": [
+                "HALL_SENSOR"
+            ],
             "description": "If the unit has a hall effect sensor (Pinecil), this adjusts how sensitive it is at detecting a magnet to put the device into sleep mode."
         },
         {
@@ -293,6 +500,9 @@
             "id": "DisplayRotation",
             "maxLen": 6,
             "maxLen2": 13,
+            "exclude": [
+                "NO_DISPLAY_ROTATE"
+            ],
             "description": "If the display should rotate automatically or if it should be fixed for left- or right-handed mode."
         },
         {
@@ -359,6 +569,9 @@
             "id": "BluetoothLE",
             "maxLen": 7,
             "maxLen2": 15,
+            "include": [
+                "BLE_ENABLED"
+            ],
             "description": "Should BLE be enabled at boot time."
         },
         {

build.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-docker-compose run --rm builder /bin/bash /build/ci/buildAll.sh

ci/buildAll.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-mkdir -p /build/ci/artefacts
-
-# Build STM code
-cd /build/source/source/
-bash ./build.sh || exit 1
-echo "All Firmware built"
-# Copy out all the final resulting files we would like to store for the next op
-cp -r /build/source/source/Hexfile/*.hex  /build/ci/artefacts/
-cp -r /build/source/source/Hexfile/*.bin  /build/ci/artefacts/

ci/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2.md5

@@ -1 +0,0 @@
-8312c4c91799885f222f663fc81f9a31  gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2

ci/nuclei_riscv_newlibc_prebuilt_linux64_2020.08.tar.bz2.md5

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

scripts/IronOS-mkdocs.yml

@@ -3,10 +3,11 @@ site_name: IronOS
 site_url: https://ralim.github.io/IronOS/
 site_description: "IronOS Open Source Soldering Iron firmware for Miniware and Pinecil"
 
-# repo config
+# Repo config
 repo_url: https://github.com/ralim/IronOS/
 
-docs_dir: Documentation
+# Dir & location config
+docs_dir: ../Documentation
 edit_uri: edit/dev/Documentation/
 
 # Theme and config
@@ -16,6 +17,7 @@ theme:
     hljs_languages:
         - yaml
 
+# Navigation structure
 nav:
   - Home: index.md
   - Getting Started: GettingStarted.md
@@ -34,11 +36,14 @@ nav:
   - Startup Logo: Logo.md
   - Hardware:
       - Hall Sensor (Pinecil): HallSensor.md
+      - Bluetooth (Pinecil V2): Bluetooth.md
       - Hardware Notes: Hardware.md
       - Troubleshooting: Troubleshooting.md
       - Known Hardware Issues: HardwareIssues.md
+      - Power sources: PowerSources.md
   - Translations: Translation.md
   - Development: Development.md
+  - Changelog: History.md
 
 # Plugins
 plugins:
@@ -47,7 +52,6 @@ plugins:
   - awesome-pages
   - git-revision-date
 
-  
 # Markdown Extensions
 markdown_extensions:
   - attr_list

scripts/IronOS.Dockerfile

@@ -0,0 +1,35 @@
+# Default Reference Distro for development env & deploy:
+# * Alpine Linux, version 3.16 *
+FROM alpine:3.16
+LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
+
+# Default current dir when container starts
+WORKDIR /build/ironos
+
+# Installing the two compilers (ARM & RISCV), python3 & pip, clang tools, etc.:
+## - compilers: gcc-*, newlib-*
+## - python3: py*, black (required to check Python code formatting)
+## - misc: findutils, make, git, diffutils, zip
+## - musl-dev (required for the multi lang firmwares)
+## - clang (required for clang-format to check C++ code formatting)
+## - shellcheck (to check sh scripts)
+
+ARG APK_COMPS="gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi"
+ARG APK_PYTHON="python3 py3-pip black"
+ARG APK_MISC="findutils make git diffutils zip"
+ARG APK_DEV="musl-dev clang bash clang-extra-tools shellcheck"
+
+# PIP packages to check & test Python code, and generate docs
+ARG PIP_PKGS='bdflib flake8 pymdown-extensions mkdocs mkdocs-autolinks-plugin mkdocs-awesome-pages-plugin mkdocs-git-revision-date-plugin'
+
+# Install system packages using alpine package manager
+RUN apk add --no-cache ${APK_COMPS} ${APK_PYTHON} ${APK_MISC} ${APK_DEV}
+
+# Install Python3 packages as modules using pip
+RUN python3 -m pip install ${PIP_PKGS}
+
+# Git trust to avoid related warning
+RUN git config --global --add safe.directory /build/ironos
+
+# Copy the whole source tree working dir into container
+COPY  .  /build/ironos

scripts/deploy.sh

@@ -0,0 +1,214 @@
+#!/usr/bin/env bash
+
+# little helper for docker deployment to:
+# - start development environment for IronOS ("shell" sub-command)
+# - generate full set of builds ("build" sub-command)
+# - probably doing some other routines (check source briefly before running undocumented commands!)
+
+#set -x
+#set -e
+
+### helper functions
+
+# brief help (some supported commands may be missing!)
+usage()
+{
+	echo -e "\nUsage: ${0} [CMD]\n"
+	echo "CMD (docker related):"
+	echo -e "\tshell - start docker container with shell inside to work on IronOS with all tools needed"
+	echo -e "\tbuild - compile builds of IronOS inside docker container for supported hardware"
+	echo -e "\tclean - delete created docker image for IronOS & its build cache objects\n"
+	echo "CMD (helper routines):"
+	echo -e "\tdocs_readme - generate & OVERWRITE(!) README.md inside Documentation/ based on nav section from mkdocs.yml if it changed\n"
+	echo -e "\tcheck_style_file SRC - run code style checks based on clang-format & custom parsers for source code file SRC\n"
+	echo -e "\tcheck_style_log - run clang-format using source/Makefile and generate gcc-compatible error log in source/check-style.log\n"
+	echo -e "STORAGE NOTICE: for \"shell\" and \"build\" commands extra files will be downloaded so make sure that you have ~5GB of free space.\n"
+}
+
+# Documentation/README.md automagical generation routine
+docs_readme()
+{
+	# WARNING: ON RUN Documentaion/README.md MAY BE OVERWRITTEN WITHOUT ANY WARNINGS / CONFIRMATIONS !!!
+	# Returns:
+	## 0 to the environment & silence - if there are no any changes in README.md nor updates in mkdocs.yml
+	## 1 to the environment (as error) & note message - if the update of README.md in repo is required
+	yml="scripts/IronOS-mkdocs.yml"
+	md_old="Documentation/README.md"
+	md_new="Documentation/README"
+	# ^^^^ hardcoded paths relative to IronOS/ to make this func very trivial
+# file overwritten section looks out of style but hoping to make shellcheck happy
+cat << EOF > "${md_new}"
+
+<!-- THIS FILE IS AUTOGENERATED by "scripts/deploy.sh docs_readme" based on nav section in ${yml} config -->
+<!-- THIS FILE IS NOT SUPPOSED TO BE EDITED MANUALLY -->
+
+#### This is autogenerated README for brief navigation through github over official documentation for IronOS project
+#### This documentation is also available [here online](https://ralim.github.io/IronOS)
+
+EOF
+	# it probably will become unexplainable in a few months but so far it works:
+	sed '1,/^nav/d; /^ *$/,$d; s,- ,- [,; s,: ,](../Documentation/,; s,.md,.md),; s,:$,],; s,/Pinecil ,/Pinecil%20,; /^  - \[.*\]$/ s,\[,,; s,]$,,' "${yml}" >> "${md_new}"
+	ret=0
+	if [ -z "$(diff -q "${md_old}" "${md_new}")" ]; then
+		rm "${md_new}"
+		ret=0
+	else
+		mv "${md_new}" "${md_old}"
+		echo ""
+		echo "${yml} seems to be updated..."
+		echo "... while ${md_old} is out-of-date!"
+		echo ""
+		echo "Please, update ${md_old} in your local working copy by command:"
+		echo ""
+		echo " $ ./scripts/deploy.sh docs_readme"
+		echo ""
+		echo "And then commit & push changes to update ${md_old} in the repo:"
+		echo ""
+		echo " $ git commit ${md_old} -m \"${md_old}: update autogenerated file\" && git push"
+		echo ""
+		ret=1
+	fi;
+	return "${ret}"
+}
+
+# Helper function to check code style using clang-format & grep/sed custom parsers:
+# - basic logic moved from source/Makefile : `check-style` target for better maintainance since a lot of sh script involved;
+# - output goes in gcc-like error compatible format for IDEs/editors.
+check_style_file()
+{
+	ret=0
+	src="${1}"
+	test ! -f "${src}" && echo "ERROR!!! Provided file ${src} is not available to check/read!!!" && exit 1
+	# count lines using diff between beauty-fied file & original file to detect format issue
+	var="$(clang-format "$src" | diff "$src" - | wc -l)"
+	if [ "${var}" -ne 0 ]; then
+		# show full log error or, if LIST=anything provided, then show only filename of interest (implemented for debug purposes mainly)
+		if [ -z "${LIST}" ]; then
+			# sed is here only for pretty logging
+			clang-format "${src}" | diff "${src}" - | sed 's/^---/-------------------------------------------------------------------------------/; s/^< /--- /; s/^> /+++ /; /^[0-9].*/ s/[acd,].*$/ERROR1/; /^[0-9].*/ s,^,\n\n\n\n'"${src}"':,; /ERROR1$/ s,ERROR1$,:1: error: clang-format code style mismatch:,; '
+		else
+			echo "${src}"
+		fi;
+		ret=1
+	fi;
+	# - clang-format has neat option for { } in condition blocks but it's available only since version 15:
+	#   * https://clang.llvm.org/docs/ClangFormatStyleOptions.html#insertbraces
+	# - since reference env is alpine 3.16 with clang-format 13, implement custom parser to do the similar thing here with grep:
+	#   it used to trace missing { and } for if/else/do/while/for BUT IT'S VERY SPECULATIVE, very-very hacky & dirty.
+	# - if file is problematic but filename only requested make final grep in pipe silent ... UPD: make code messy but shellcheck happy
+	if [ -z "${LIST}" ]; then
+		grep -H -n  -e "^ .*if .*)$"  -e "^ .*else$"  -e "^ .* do$"  -e "^ .*while .*)$"  -e "^ .*for .*)$"  "${src}" | grep -v  -e "^.*//"  -e "^.*:.*: .*if ((.*[^)])$" | sed 's,^,\n\n,; s,: ,:1: error: probably missing { or } for conditional or loop block:\n>>>,;' | grep -e "^.*$"
+	else
+		grep -H -n  -e "^ .*if .*)$"  -e "^ .*else$"  -e "^ .* do$"  -e "^ .*while .*)$"  -e "^ .*for .*)$"  "${src}" | grep -v  -e "^.*//"  -e "^.*:.*: .*if ((.*[^)])$" | sed 's,^,\n\n,; s,: ,:1: error: probably missing { or } for conditional or loop block:\n>>>,;' | grep -q -e "^.*$"
+	fi;
+	if [ "${?}" -ne 1 ]; then
+		# ... and only print the filename
+		test -z "${LIST}" || echo "${src}"
+		ret=1;
+	fi;
+	return "${ret}"
+}
+
+# check_style routine for those who too lazy to do it everytime manually
+check_style_log()
+{
+	log="source/check-style.log"
+	make  -C source  check-style  2>&1  |  tee  "${log}"
+	chmod  0666  "${log}"
+	sed -i -e 's,\r,,g' "${log}"
+	return 0
+}
+
+### main
+
+docker_conf="Env.yml"
+
+# get absolute location of project root dir to make docker happy with config(s)
+# (successfully tested on relatively POSIX-compliant Dash shell)
+
+# this script
+script_file="/deploy.sh"
+# IronOS/scripts/deploy.sh
+script_path="${PWD}"/"${0}"
+# IronOS/scripts/
+script_dir=${script_path%"${script_file}"}
+# IronOS/
+root_dir="${script_dir}/.."
+# IronOS/Env.yml
+docker_file="-f ${root_dir}/${docker_conf}"
+
+# allow providing custom path to docker tool using DOCKER_BIN external env. var.
+# (compose sub-command must be included, i.e. DOCKER_BIN="/usr/local/bin/docker compose" ./deploy.sh)
+
+if [ -z "${DOCKER_BIN}" ]; then
+	docker_bin=""
+else
+	docker_bin="${DOCKER_BIN}"
+fi;
+
+# detect availability of docker
+
+docker_compose="$(command -v docker-compose)"
+if [ -n "${docker_compose}" ] && [ -z "${docker_bin}" ]; then
+	docker_bin="${docker_compose}"
+fi;
+
+docker_tool="$(command -v docker)"
+if [ -n "${docker_tool}" ] && [ -z "${docker_bin}" ]; then
+	docker_bin="${docker_tool}  compose"
+fi;
+
+# give function argument a name
+
+cmd="${1}"
+
+# if only README.md for Documentation update is required then run it & exit
+
+if [ "docs_readme" = "${cmd}" ]; then
+	docs_readme
+	exit "${?}"
+fi;
+
+if [ "check_style_file" = "${cmd}" ]; then
+	check_style_file "${2}"
+	exit "${?}"
+fi;
+
+if [ "check_style_log" = "${cmd}" ]; then
+	check_style_log
+	exit "${?}"
+fi;
+
+# if docker is not presented in any way show warning & exit
+
+if [ -z "${docker_bin}" ]; then
+	echo "ERROR: Can't find docker-compose nor docker tool. Please, install docker and try again."
+	exit 1
+fi;
+
+# construct command to run
+
+if [ -z "${cmd}" ] || [ "${cmd}" = "shell" ]; then
+	docker_cmd="run  --rm  builder"
+elif [ "${cmd}" = "build" ]; then
+	docker_cmd="run  --rm  builder  make  build-all  OUT=${OUT}"
+elif [ "${cmd}" = "clean" ]; then
+	docker  rmi  ironos-builder:latest
+	docker  system  prune  --filter label=ironos-builder:latest  --force
+	exit "${?}"
+else
+	usage
+	exit 1
+fi;
+
+# change dir to project root dir & run constructed command
+
+cd "${root_dir}" || exit 1
+echo -e "\n====>>>> Firing up & starting container..."
+if [ "${cmd}" = "shell" ]; then
+echo -e "\t* type \"exit\" to end the session when done;"
+fi;
+echo -e "\t* type \"${0} clean\" to delete created container (but not cached data)"
+echo -e "\n====>>>> ${docker_bin}  ${docker_file}  ${docker_cmd}\n"
+eval "${docker_bin}  ${docker_file}  ${docker_cmd}"
+exit "${?}"

source/.clang-format

@@ -19,6 +19,7 @@ AllowShortFunctionsOnASingleLine: All
 AllowShortLambdasOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false ### <<< Keeps enums as is
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false

source/Core/BSP/BSP.h

@@ -3,9 +3,11 @@
 #include "BSP_Power.h"
 #include "BSP_QC.h"
 #include "Defines.h"
+#include "Types.h"
 #include "configuration.h"
 #include <stdbool.h>
 #include <stdint.h>
+
 /*
  * BSP.h -- Board Support
  *
@@ -94,11 +96,18 @@ enum StatusLED {
 };
 void setStatusLED(const enum StatusLED state);
 
+void setBuzzer(bool on);
+
 // preStartChecks are run until they return 0
 // By the PID, after each ADC sample comes in
 // For example, on the MHP30 this is used to figure out the resistance of the hotplate
 uint8_t preStartChecks();
 uint8_t preStartChecksDone();
+
+// Check if the tip or output mosfet is shorted (if possible)
+bool isTipShorted();
+// Show the boot logo
+void showBootLogo(void);
 #ifdef __cplusplus
 }
 #endif

source/Core/BSP/BSP_Power.h

@@ -19,7 +19,8 @@ void power_check();
 // Returns the tip resistance in x10 ohms, so 7.5 = 75; 14=140 etc
 uint8_t getTipResistanceX10();
 
-uint8_t getTipThermalMass();
+uint16_t getTipThermalMass();
+uint16_t getTipInertia();
 
 #ifdef __cplusplus
 }

source/Core/BSP/MHP30/BSP.cpp

@@ -1,6 +1,7 @@
 // BSP mapping functions
 
 #include "BSP.h"
+#include "BootLogo.h"
 #include "I2C_Wrapper.hpp"
 #include "Pins.h"
 #include "Setup.h"
@@ -455,8 +456,6 @@ void setStatusLED(const enum StatusLED state) {
     } break;
     case LED_HOT:
       ws2812.led_set_color(0, 0xFF, 0, 0); // red
-      // We have hit the right temp, run buzzer for a short period
-      buzzerEnd = xTaskGetTickCount() + TICKS_SECOND / 3;
       break;
     case LED_COOLING_STILL_HOT:
       ws2812.led_set_color(0, 0xFF, 0x8C, 0x00); // Orange
@@ -465,11 +464,6 @@ void setStatusLED(const enum StatusLED state) {
     ws2812.led_update();
     lastState = state;
   }
-  if (state == LED_HOT && xTaskGetTickCount() < buzzerEnd) {
-    setBuzzer(true);
-  } else {
-    setBuzzer(false);
-  }
 }
 uint64_t getDeviceID() {
   //
@@ -478,4 +472,7 @@ uint64_t getDeviceID() {
 
 uint8_t preStartChecksDone() { return 1; }
 
-uint8_t getTipThermalMass() { return TIP_THERMAL_MASS; }
+uint16_t getTipThermalMass() { return TIP_THERMAL_MASS; }
+uint16_t getTipInertia() { return TIP_THERMAL_MASS; }
+
+void showBootLogo(void) { BootLogo::handleShowingLogo((uint8_t *)FLASH_LOGOADDR); }

source/Core/BSP/MHP30/FreeRTOSConfig.h

@@ -123,7 +123,7 @@ extern uint32_t SystemCoreClock;
 #define INCLUDE_vTaskDelete                 0
 #define INCLUDE_vTaskCleanUpResources       0
 #define INCLUDE_vTaskSuspend                0
-#define INCLUDE_vTaskDelayUntil             0
+#define INCLUDE_vTaskDelayUntil             1
 #define INCLUDE_vTaskDelay                  1
 #define INCLUDE_xTaskGetSchedulerState      1
 #define INCLUDE_uxTaskGetStackHighWaterMark 1

source/Core/BSP/MHP30/IRQ.cpp

@@ -49,7 +49,7 @@ void              HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
 }
 
 bool getFUS302IRQLow() {
-#if POW_PD
+#ifdef POW_PD
   // Return true if the IRQ line is still held low
   return HAL_GPIO_ReadPin(INT_PD_GPIO_Port, INT_PD_Pin) == GPIO_PIN_RESET;
 #else

source/Core/BSP/MHP30/Power.cpp

@@ -7,7 +7,7 @@
 #include "configuration.h"
 
 void power_check() {
-#if POW_PD
+#ifdef POW_PD
 
   // Cant start QC until either PD works or fails
   if (USBPowerDelivery::negotiationComplete()) {
@@ -19,3 +19,4 @@ void power_check() {
 bool getIsPoweredByDCIN() { return false; }
 
 uint8_t getTipResistanceX10() { return TIP_RESISTANCE; }
+bool    isTipShorted() { return false; }

source/Core/BSP/MHP30/Setup.c

@@ -154,8 +154,9 @@ static void MX_ADC1_Init(void) {
 
   SET_BIT(hadc1.Instance->CR1, (ADC_CR1_EOSIE)); // Enable end of Normal
   // Run ADC internal calibration
-  while (HAL_ADCEx_Calibration_Start(&hadc1) != HAL_OK)
+  while (HAL_ADCEx_Calibration_Start(&hadc1) != HAL_OK) {
     ;
+  }
 }
 
 /* ADC2 init function */
@@ -191,8 +192,9 @@ static void MX_ADC2_Init(void) {
   HAL_ADC_ConfigChannel(&hadc2, &sConfig);
 
   // Run ADC internal calibration
-  while (HAL_ADCEx_Calibration_Start(&hadc2) != HAL_OK)
+  while (HAL_ADCEx_Calibration_Start(&hadc2) != HAL_OK) {
     ;
+  }
 }
 /* I2C1 init function */
 static void MX_I2C1_Init(void) {

source/Core/BSP/MHP30/Software_I2C.h

@@ -10,14 +10,14 @@
 #include "BSP.h"
 #include "configuration.h"
 #include "stm32f1xx_hal.h"
-#ifdef I2C_SOFT
+#ifdef I2C_SOFT_BUS_2
 
-#define SOFT_SCL_HIGH() HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_SET)
-#define SOFT_SCL_LOW()  HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_RESET)
-#define SOFT_SDA_HIGH() HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_SET)
-#define SOFT_SDA_LOW()  HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_RESET)
-#define SOFT_SDA_READ() (HAL_GPIO_ReadPin(SDA2_GPIO_Port, SDA2_Pin) == GPIO_PIN_SET ? 1 : 0)
-#define SOFT_SCL_READ() (HAL_GPIO_ReadPin(SCL2_GPIO_Port, SCL2_Pin) == GPIO_PIN_SET ? 1 : 0)
+#define SOFT_SCL2_HIGH() HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_SET)
+#define SOFT_SCL2_LOW()  HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA2_HIGH() HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_SET)
+#define SOFT_SDA2_LOW()  HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA2_READ() (HAL_GPIO_ReadPin(SDA2_GPIO_Port, SDA2_Pin) == GPIO_PIN_SET ? 1 : 0)
+#define SOFT_SCL2_READ() (HAL_GPIO_ReadPin(SCL2_GPIO_Port, SCL2_Pin) == GPIO_PIN_SET ? 1 : 0)
 #define SOFT_I2C_DELAY()              \
   {                                   \
     for (int xx = 0; xx < 20; xx++) { \

source/Core/BSP/MHP30/ThermoModel.cpp

@@ -6,10 +6,12 @@
  */
 #include "Setup.h"
 #include "TipThermoModel.h"
+#include "Types.h"
 #include "Utils.h"
 #include "configuration.h"
+
 extern uint16_t   tipSenseResistancex10Ohms;
-uint32_t        TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) {
+TemperatureType_t TipThermoModel::convertuVToDegC(uint32_t tipuVDelta) {
   // For the MHP30, we are mimicing the original code and using the resistor fitted to the base of the heater head,
   // this is measured at boot in pid task and in the disconnected tip check if tip is removed
   if (tipSenseResistancex10Ohms > 900 && tipSenseResistancex10Ohms <= 1100) {

source/Core/BSP/MHP30/configuration.h

@@ -1,11 +1,10 @@
 #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
+ * Define here your default pre settings for MHP30
  *
  */
 
@@ -31,7 +30,7 @@
  * Values -> SLEEP_TIME * 10; i.e. 5*10 = 50 Seconds!
  */
 #define SLEEP_TIME    5 // x10 Seconds
-#define SHUTDOWN_TIME 10 // Minutes
+#define SHUTDOWN_TIME 0 // Minutes -- Default shutdown to being off
 
 /**
  * Auto start off for safety.
@@ -86,13 +85,9 @@
 #define ADC_MAX_READING (4096 * 8) // Maximum reading of the adc
 #define ADC_VDD_MV      3300       // ADC max reading millivolts
 
-#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
+#define POWER_PULSE_DEFAULT          5
 
 /**
  * OLED Orientation Sensitivity on Automatic mode!
@@ -155,22 +150,27 @@
 #define ACCEL_SC7
 #define ACCEL_MSA
 
+#define PROFILE_SUPPORT
+
 #define POW_PD     1
+#define POW_PD_EXT 0
 #define TEMP_NTC
-#define I2C_SOFT
+#define I2C_SOFT_BUS_2
 #define BATTFILTERDEPTH 8
-#define OLED_I2CBB
+#define OLED_I2CBB2
 #define ACCEL_EXITS_ON_MOVEMENT
 #define NEEDS_VBUS_PROBE 0
 
 #define HARDWARE_MAX_WATTAGE_X10 650
 #define TIP_THERMAL_MASS         65 // TODO, needs refinement
 #define TIP_RESISTANCE           60 // x10 ohms, ~6 typical
-#endif
+#endif                              /* MHP30 */
 
 #ifdef ACCEL_EXITS_ON_MOVEMENT
 #define NO_SLEEP_MODE
 #endif
-#endif
 
-#define FLASH_LOGOADDR (0x08000000 + (62 * 1024))
+#define FLASH_LOGOADDR      (0x08000000 + (126 * 1024))
+#define SETTINGS_START_PAGE (0x08000000 + (127 * 1024))
+
+#endif /* CONFIGURATION_H_ */

source/Core/BSP/MHP30/flash.c

@@ -10,9 +10,6 @@
 #include "stm32f1xx_hal.h"
 #include "string.h"
 
-#define SETTINGS_START_PAGE (0x08000000 + (127 * 1024))
-
-
 void flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
   FLASH_EraseInitTypeDef pEraseInit;
   pEraseInit.TypeErase    = FLASH_TYPEERASE_PAGES;
@@ -33,9 +30,9 @@ void flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
   HAL_FLASH_Unlock();
   for (uint16_t i = 0; i < (length / 2); i++) {
     resetWatchdog();
-    HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, SETTINGS_START_PAGE+ (i*sizeof(uint16_t)), data[i]);
+    HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, SETTINGS_START_PAGE + (i * sizeof(uint16_t)), data[i]);
   }
   HAL_FLASH_Lock();
 }
 
-void flash_read_buffer(uint8_t *buffer, const uint16_t length) { memcpy(buffer, (uint8_t*)SETTINGS_START_PAGE, length); }
+void flash_read_buffer(uint8_t *buffer, const uint16_t length) { memcpy(buffer, (uint8_t *)SETTINGS_START_PAGE, length); }

source/Core/BSP/MHP30/fusb_user.cpp

@@ -1,5 +1,5 @@
 #include "configuration.h"
-#if POW_PD
+#ifdef POW_PD
 #include "BSP.h"
 #include "I2C_Wrapper.hpp"
 #include "Pins.h"

source/Core/BSP/MHP30/preRTOS.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "BSP.h"
-#include "I2CBB.hpp"
+#include "I2CBB2.hpp"
 #include "Pins.h"
 #include "Setup.h"
 #include <I2C_Wrapper.hpp>
@@ -17,7 +17,7 @@ void preRToSInit() {
   HAL_Init();
   Setup_HAL(); // Setup all the HAL objects
   BSPInit();
-  I2CBB::init();
+  I2CBB2::init();
   /* Init the IPC objects */
   FRToSI2C::FRToSInit();
 }

source/Core/BSP/Miniware/BSP.cpp

@@ -1,10 +1,12 @@
 // BSP mapping functions
 
 #include "BSP.h"
+#include "BootLogo.h"
 #include "I2C_Wrapper.hpp"
 #include "Pins.h"
 #include "Setup.h"
 #include "TipThermoModel.h"
+#include "USBPD.h"
 #include "configuration.h"
 #include "history.hpp"
 #include "main.hpp"
@@ -17,7 +19,7 @@ const uint16_t       powerPWM         = 255;
 static const uint8_t holdoffTicks     = 14; // delay of 8 ms
 static const uint8_t tempMeasureTicks = 14;
 
-uint16_t totalPWM; // htim2.Init.Period, the full PWM cycle
+uint16_t totalPWM; // htimADC.Init.Period, the full PWM cycle
 
 static bool fastPWM;
 static bool infastPWM;
@@ -101,18 +103,18 @@ static void switchToFastPWM(void) {
   // 10Hz
   infastPWM              = true;
   totalPWM               = powerPWM + tempMeasureTicks + holdoffTicks;
-  htim2.Instance->ARR  = totalPWM;
-  htim2.Instance->CCR1 = powerPWM + holdoffTicks;
-  htim2.Instance->PSC  = 2690;
+  htimADC.Instance->ARR  = totalPWM;
+  htimADC.Instance->CCR1 = powerPWM + holdoffTicks;
+  htimADC.Instance->PSC  = 2690;
 }
 
 static void switchToSlowPWM(void) {
   // 5Hz
   infastPWM              = false;
   totalPWM               = powerPWM + tempMeasureTicks / 2 + holdoffTicks / 2;
-  htim2.Instance->ARR  = totalPWM;
-  htim2.Instance->CCR1 = powerPWM + holdoffTicks / 2;
-  htim2.Instance->PSC  = 2690 * 2;
+  htimADC.Instance->ARR  = totalPWM;
+  htimADC.Instance->CCR1 = powerPWM + holdoffTicks / 2;
+  htimADC.Instance->PSC  = 2690 * 2;
 }
 
 void setTipPWM(const uint8_t pulse, const bool shouldUseFastModePWM) {
@@ -126,20 +128,30 @@ void setTipPWM(const uint8_t pulse, const bool shouldUseFastModePWM) {
 
 void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
   // Period has elapsed
-  if (htim->Instance == TIM2) {
+  if (htim->Instance == ADC_CONTROL_TIMER) {
     // we want to turn on the output again
     PWMSafetyTimer--;
-    // We decrement this safety value so that lockups in the
-    // scheduler will not cause the PWM to become locked in an
-    // active driving state.
-    // While we could assume this could never happen, its a small price for
-    // increased safety
-    htim2.Instance->CCR4 = pendingPWM;
-    if (htim2.Instance->CCR4 && PWMSafetyTimer) {
-      HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_1);
+// We decrement this safety value so that lockups in the
+// scheduler will not cause the PWM to become locked in an
+// active driving state.
+// While we could assume this could never happen, its a small price for
+// increased safety
+#ifdef TIP_HAS_DIRECT_PWM
+    htimADC.Instance->CCR4 = powerPWM;
+    if (pendingPWM && PWMSafetyTimer) {
+      htimTip.Instance->CCR1 = pendingPWM;
+      HAL_TIM_PWM_Start(&htimTip, PWM_Out_CHANNEL);
     } else {
-      HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
+      HAL_TIM_PWM_Stop(&htimTip, PWM_Out_CHANNEL);
     }
+#else
+    htimADC.Instance->CCR4 = pendingPWM;
+    if (htimADC.Instance->CCR4 && PWMSafetyTimer) {
+      HAL_TIM_PWM_Start(&htimTip, PWM_Out_CHANNEL);
+    } else {
+      HAL_TIM_PWM_Stop(&htimTip, PWM_Out_CHANNEL);
+    }
+#endif
     if (fastPWM != infastPWM) {
       if (fastPWM) {
         switchToFastPWM();
@@ -157,10 +169,11 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim) {
 void HAL_TIM_PWM_PulseFinishedCallback(TIM_HandleTypeDef *htim) {
   // This was a when the PWM for the output has timed out
   if (htim->Channel == HAL_TIM_ACTIVE_CHANNEL_4) {
-    HAL_TIM_PWM_Stop(&htim3, TIM_CHANNEL_1);
+    HAL_TIM_PWM_Stop(&htimTip, PWM_Out_CHANNEL);
   }
 }
 void unstick_I2C() {
+#ifndef I2C_SOFT_BUS_1
   GPIO_InitTypeDef GPIO_InitStruct;
   int              timeout     = 100;
   int              timeout_cnt = 0;
@@ -227,6 +240,7 @@ void unstick_I2C() {
 
   // Call initialization function.
   HAL_I2C_Init(&hi2c1);
+#endif
 }
 
 uint8_t getButtonA() { return HAL_GPIO_ReadPin(KEY_A_GPIO_Port, KEY_A_Pin) == GPIO_PIN_RESET ? 1 : 0; }
@@ -238,6 +252,10 @@ void reboot() { NVIC_SystemReset(); }
 
 void delay_ms(uint16_t count) { HAL_Delay(count); }
 
+uint8_t       lastTipResistance        = 0; // default to unknown
+const uint8_t numTipResistanceReadings = 3;
+uint32_t      tipResistanceReadings[3] = {0, 0, 0};
+uint8_t       tipResistanceReadingSlot = 0;
 bool          isTipDisconnected() {
 
   uint16_t tipDisconnectedThres = TipThermoModel::getTipMaxInC() - 5;
@@ -246,14 +264,157 @@ bool isTipDisconnected() {
 }
 
 void setStatusLED(const enum StatusLED state) {}
-uint8_t  preStartChecks() { return 1; }
+void setBuzzer(bool on) {}
+#ifdef TIP_RESISTANCE_SENSE_Pin
+// We want to calculate lastTipResistance
+// If tip is connected, and the tip is cold and the tip is not being heated
+// We can use the GPIO to inject a small current into the tip and measure this
+// The gpio is 100k -> diode -> tip -> gnd
+// Source is 3.3V-0.5V
+// Which is around 0.028mA this will induce:
+// 6 ohm tip -> 3.24mV (Real world ~= 3320)
+// 8 ohm tip -> 4.32mV (Real world ~= 4500)
+// Which is definitely measureable
+// Taking shortcuts here as we know we only really have to pick apart 6 and 8 ohm tips
+// These are reported as 60 and 75 respectively
+void performTipResistanceSampleReading() {
+  // 0 = read then turn on pullup, 1 = read then turn off pullup, 2 = read again
+  tipResistanceReadings[tipResistanceReadingSlot] = TipThermoModel::convertTipRawADCTouV(getTipRawTemp(1));
+
+  HAL_GPIO_WritePin(TIP_RESISTANCE_SENSE_GPIO_Port, TIP_RESISTANCE_SENSE_Pin, (tipResistanceReadingSlot == 0) ? GPIO_PIN_SET : GPIO_PIN_RESET);
+
+  tipResistanceReadingSlot++;
+}
+bool tipShorted = false;
+void FinishMeasureTipResistance() {
+
+  // Otherwise we now have the 4 samples;
+  //  _^_ order, 2 delta's, combine these
+
+  int32_t calculatedSkew = tipResistanceReadings[0] - tipResistanceReadings[2]; // If positive tip is cooling
+  calculatedSkew /= 2;                                                          // divide by two to get offset per time constant
+
+  int32_t reading = (((tipResistanceReadings[1] - tipResistanceReadings[0]) + calculatedSkew) // jump 1 - skew
+                     +                                                                        // +
+                     ((tipResistanceReadings[1] - tipResistanceReadings[2]) + calculatedSkew) // jump 2 - skew
+                     )                                                                        //
+                    / 2;                                                                      // Take average
+  // // As we are only detecting two resistances; we can split the difference for now
+  uint8_t newRes = 0;
+  if (reading > 1200) {
+    // return; // Change nothing as probably disconnected tip
+    tipResistanceReadingSlot = lastTipResistance = 0;
+    return;
+  } else if (reading < 200) {
+    tipShorted = true;
+  } else if (reading < 800) {
+    newRes = 62;
+  } else {
+    newRes = 80;
+  }
+  lastTipResistance = newRes;
+}
+volatile bool       tipMeasurementOccuring = true;
+volatile TickType_t nextTipMeasurement     = 100;
+
+void performTipMeasurementStep() {
+
+  // Wait 200ms for settle time
+  if (xTaskGetTickCount() < (nextTipMeasurement)) {
+    return;
+  }
+  nextTipMeasurement = xTaskGetTickCount() + (TICKS_100MS * 5);
+  if (tipResistanceReadingSlot < numTipResistanceReadings) {
+    performTipResistanceSampleReading();
+    return;
+  }
+
+  // We are sensing the resistance
+  FinishMeasureTipResistance();
+
+  tipMeasurementOccuring = false;
+}
+#endif
+uint8_t preStartChecks() {
+#ifdef TIP_RESISTANCE_SENSE_Pin
+  performTipMeasurementStep();
+  if (preStartChecksDone() != 1) {
+    return 0;
+  }
+#endif
+#ifdef HAS_SPLIT_POWER_PATH
+
+  // We want to enable the power path that has the highest voltage
+  // Nominally one will be ~=0 and one will be high. Unless you jamb both in, then both _may_ be high, or device may be dead
+  {
+    uint16_t dc = getRawDCVin();
+    uint16_t pd = getRawPDVin();
+    if (dc > pd) {
+      HAL_GPIO_WritePin(DC_SELECT_GPIO_Port, DC_SELECT_Pin, GPIO_PIN_SET);
+      HAL_GPIO_WritePin(PD_SELECT_GPIO_Port, PD_SELECT_Pin, GPIO_PIN_RESET);
+    } else {
+      HAL_GPIO_WritePin(PD_SELECT_GPIO_Port, PD_SELECT_Pin, GPIO_PIN_SET);
+      HAL_GPIO_WritePin(DC_SELECT_GPIO_Port, DC_SELECT_Pin, GPIO_PIN_RESET);
+    }
+  }
+
+#endif
+#ifdef POW_PD
+  // If we are in the middle of negotiating PD, wait until timeout
+  // Before turning on the heater
+  if (!USBPowerDelivery::negotiationComplete()) {
+    return 0;
+  }
+
+#endif
+  return 1;
+}
 uint64_t getDeviceID() {
   //
   return HAL_GetUIDw0() | ((uint64_t)HAL_GetUIDw1() << 32);
 }
 
-uint8_t getTipResistanceX10() { return TIP_RESISTANCE; }
+uint8_t preStartChecksDone() {
+#ifdef TIP_RESISTANCE_SENSE_Pin
+  return (lastTipResistance == 0 || tipResistanceReadingSlot < numTipResistanceReadings || tipMeasurementOccuring || tipShorted) ? 0 : 1;
+#else
+  return 1;
+#endif
+}
 
-uint8_t preStartChecksDone() { return 1; }
+uint8_t getTipResistanceX10() {
+#ifdef TIP_RESISTANCE_SENSE_Pin
+  // Return tip resistance in x10 ohms
+  // We can measure this using the op-amp
+  return lastTipResistance;
+#else
+  return TIP_RESISTANCE;
+#endif
+}
+#ifdef TIP_RESISTANCE_SENSE_Pin
+bool isTipShorted() { return tipShorted; }
+#else
+bool isTipShorted() { return false; }
+#endif
+uint16_t getTipThermalMass() {
+#ifdef TIP_RESISTANCE_SENSE_Pin
+  if (lastTipResistance >= 80) {
+    return TIP_THERMAL_MASS;
+  }
+  return 45;
+#else
+  return TIP_THERMAL_MASS;
+#endif
+}
+uint16_t getTipInertia() {
+#ifdef TIP_RESISTANCE_SENSE_Pin
+  if (lastTipResistance >= 80) {
+    return TIP_THERMAL_MASS;
+  }
+  return 10;
+#else
+  return TIP_THERMAL_MASS;
+#endif
+}
 
-uint8_t getTipThermalMass() { return TIP_THERMAL_MASS; }
+void showBootLogo(void) { BootLogo::handleShowingLogo((uint8_t *)FLASH_LOGOADDR); }

source/Core/BSP/Miniware/FreeRTOSConfig.h

@@ -123,7 +123,7 @@ extern uint32_t SystemCoreClock;
 #define INCLUDE_vTaskDelete                 0
 #define INCLUDE_vTaskCleanUpResources       0
 #define INCLUDE_vTaskSuspend                0
-#define INCLUDE_vTaskDelayUntil             0
+#define INCLUDE_vTaskDelayUntil             1
 #define INCLUDE_vTaskDelay                  1
 #define INCLUDE_xTaskGetSchedulerState      1
 #define INCLUDE_uxTaskGetStackHighWaterMark 1

source/Core/BSP/Miniware/IRQ.cpp

@@ -46,7 +46,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) {
 }
 
 bool getFUS302IRQLow() {
-#if POW_PD
+#ifdef POW_PD
   // Return true if the IRQ line is still held low
   return HAL_GPIO_ReadPin(INT_PD_GPIO_Port, INT_PD_Pin) == GPIO_PIN_RESET;
 #else

source/Core/BSP/Miniware/Pins.h

@@ -6,87 +6,145 @@
  */
 
 #ifndef BSP_MINIWARE_PINS_H_
-  #define BSP_MINIWARE_PINS_H_
-  #include "configuration.h"
+#define BSP_MINIWARE_PINS_H_
+#include "configuration.h"
 
-  #ifdef MODEL_TS100
+#ifdef MODEL_TS100
 
-    #define KEY_B_Pin                 GPIO_PIN_6
-    #define KEY_B_GPIO_Port           GPIOA
-    #define TMP36_INPUT_Pin           GPIO_PIN_7
-    #define TMP36_INPUT_GPIO_Port     GPIOA
-    #define TMP36_ADC1_CHANNEL        ADC_CHANNEL_7
-    #define TMP36_ADC2_CHANNEL        ADC_CHANNEL_7
-    #define TIP_TEMP_Pin              GPIO_PIN_0
-    #define TIP_TEMP_GPIO_Port        GPIOB
-    #define TIP_TEMP_ADC1_CHANNEL     ADC_CHANNEL_8
-    #define TIP_TEMP_ADC2_CHANNEL     ADC_CHANNEL_8
-    #define VIN_Pin                   GPIO_PIN_1
-    #define VIN_GPIO_Port             GPIOB
-    #define VIN_ADC1_CHANNEL          ADC_CHANNEL_9
-    #define VIN_ADC2_CHANNEL          ADC_CHANNEL_9
-    #define OLED_RESET_Pin            GPIO_PIN_8
-    #define OLED_RESET_GPIO_Port      GPIOA
-    #define KEY_A_Pin                 GPIO_PIN_9
-    #define KEY_A_GPIO_Port           GPIOA
-    #define INT_Orientation_Pin       GPIO_PIN_3
-    #define INT_Orientation_GPIO_Port GPIOB
-    #define PWM_Out_Pin               GPIO_PIN_4
-    #define PWM_Out_GPIO_Port         GPIOB
-    #define PWM_Out_CHANNEL           TIM_CHANNEL_1
-    #define PWM_Out_CCR
-    #define INT_Movement_Pin          GPIO_PIN_5
-    #define INT_Movement_GPIO_Port    GPIOB
-    #define SCL_Pin                   GPIO_PIN_6
-    #define SCL_GPIO_Port             GPIOB
-    #define SDA_Pin                   GPIO_PIN_7
-    #define SDA_GPIO_Port             GPIOB
-  #endif
+#define KEY_B_Pin                 GPIO_PIN_6
+#define KEY_B_GPIO_Port           GPIOA
+#define TMP36_INPUT_Pin           GPIO_PIN_7
+#define TMP36_INPUT_GPIO_Port     GPIOA
+#define TMP36_ADC1_CHANNEL        ADC_CHANNEL_7
+#define TMP36_ADC2_CHANNEL        ADC_CHANNEL_7
+#define TIP_TEMP_Pin              GPIO_PIN_0
+#define TIP_TEMP_GPIO_Port        GPIOB
+#define TIP_TEMP_ADC1_CHANNEL     ADC_CHANNEL_8
+#define TIP_TEMP_ADC2_CHANNEL     ADC_CHANNEL_8
+#define VIN_Pin                   GPIO_PIN_1
+#define VIN_GPIO_Port             GPIOB
+#define VIN_ADC1_CHANNEL          ADC_CHANNEL_9
+#define VIN_ADC2_CHANNEL          ADC_CHANNEL_9
+#define OLED_RESET_Pin            GPIO_PIN_8
+#define OLED_RESET_GPIO_Port      GPIOA
+#define KEY_A_Pin                 GPIO_PIN_9
+#define KEY_A_GPIO_Port           GPIOA
+#define INT_Orientation_Pin       GPIO_PIN_3
+#define INT_Orientation_GPIO_Port GPIOB
+#define PWM_Out_Pin               GPIO_PIN_4
+#define PWM_Out_GPIO_Port         GPIOB
+#define PWM_Out_CHANNEL           TIM_CHANNEL_1
+#define TIP_CONTROL_TIMER         TIM3
+#define ADC_CONTROL_TIMER         TIM2
+#define ADC_CONTROL_TIMER_IRQ     TIM2_IRQn
+#define ADC_TRIGGER               ADC_EXTERNALTRIGINJECCONV_T2_TRGO
+#define INT_Movement_Pin          GPIO_PIN_5
+#define INT_Movement_GPIO_Port    GPIOB
+#define SCL_Pin                   GPIO_PIN_6
+#define SCL_GPIO_Port             GPIOB
+#define SDA_Pin                   GPIO_PIN_7
+#define SDA_GPIO_Port             GPIOB
+#endif
 
-  #if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0
-  // TS80 & TS80P pin map
-    #define KEY_B_Pin                 GPIO_PIN_0
-    #define KEY_B_GPIO_Port           GPIOB
-    #define TMP36_INPUT_Pin           GPIO_PIN_4
-    #define TMP36_INPUT_GPIO_Port     GPIOA
-    #define TMP36_ADC1_CHANNEL        ADC_CHANNEL_4
-    #define TMP36_ADC2_CHANNEL        ADC_CHANNEL_4
-    #define TIP_TEMP_Pin              GPIO_PIN_3
-    #define TIP_TEMP_GPIO_Port        GPIOA
-    #define TIP_TEMP_ADC1_CHANNEL     ADC_CHANNEL_3
-    #define TIP_TEMP_ADC2_CHANNEL     ADC_CHANNEL_3
+#ifdef MODEL_TS101
 
-    #define VIN_Pin                   GPIO_PIN_2
-    #define VIN_GPIO_Port             GPIOA
-    #define VIN_ADC1_CHANNEL          ADC_CHANNEL_2
-    #define VIN_ADC2_CHANNEL          ADC_CHANNEL_2
-    #define OLED_RESET_Pin            GPIO_PIN_15
-    #define OLED_RESET_GPIO_Port      GPIOA
-    #define KEY_A_Pin                 GPIO_PIN_1
-    #define KEY_A_GPIO_Port           GPIOB
-    #define INT_Orientation_Pin       GPIO_PIN_4
-    #define INT_Orientation_GPIO_Port GPIOB
-    #define PWM_Out_Pin               GPIO_PIN_6
-    #define PWM_Out_GPIO_Port         GPIOA
-    #define PWM_Out_CHANNEL           TIM_CHANNEL_1
-    #define INT_Movement_Pin          GPIO_PIN_5
-    #define INT_Movement_GPIO_Port    GPIOB
-    #define SCL_Pin                   GPIO_PIN_6
-    #define SCL_GPIO_Port             GPIOB
-    #define SDA_Pin                   GPIO_PIN_7
-    #define SDA_GPIO_Port             GPIOB
-    #define SCL2_Pin                  GPIO_PIN_5
-    #define SCL2_GPIO_Port            GPIOA
-    #define SDA2_Pin                  GPIO_PIN_1
-    #define SDA2_GPIO_Port            GPIOA
+#define KEY_B_Pin             GPIO_PIN_10
+#define KEY_B_GPIO_Port       GPIOA
+#define TMP36_INPUT_Pin       GPIO_PIN_4
+#define TMP36_INPUT_GPIO_Port GPIOA
+#define TMP36_ADC1_CHANNEL    ADC_CHANNEL_4
+#define TMP36_ADC2_CHANNEL    ADC_CHANNEL_4
+#define TIP_TEMP_Pin          GPIO_PIN_3
+#define TIP_TEMP_GPIO_Port    GPIOA
+#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3
+#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3
+#define VIN_Pin               GPIO_PIN_2
+#define VIN_GPIO_Port         GPIOA
+#define VIN_ADC1_CHANNEL      ADC_CHANNEL_2
+#define VIN_ADC2_CHANNEL      ADC_CHANNEL_2
+#define PD_VIN_Pin            GPIO_PIN_6
+#define PD_VIN_GPIO_Port      GPIOA
+#define PD_VIN_ADC1_CHANNEL   ADC_CHANNEL_6
+#define PD_VIN_ADC2_CHANNEL   ADC_CHANNEL_6
+#define OLED_RESET_Pin        GPIO_PIN_7
+#define OLED_RESET_GPIO_Port  GPIOA
+#define KEY_A_Pin             GPIO_PIN_8
+#define KEY_A_GPIO_Port       GPIOA
+#define PWM_Out_Pin           GPIO_PIN_0
+#define PWM_Out_GPIO_Port     GPIOA
+#define PWM_Out_CHANNEL       TIM_CHANNEL_1
+#define TIP_CONTROL_TIMER     TIM2
+#define ADC_CONTROL_TIMER     TIM4
+#define ADC_CONTROL_TIMER_IRQ TIM4_IRQn
+#define ADC_TRIGGER           ADC_EXTERNALTRIGINJECCONV_T4_TRGO
+#define SCL_Pin               GPIO_PIN_0
+#define SCL_GPIO_Port         GPIOB
+#define SDA_Pin               GPIO_PIN_1
+#define SDA_GPIO_Port         GPIOB
+// PD controller
+#define SCL2_Pin         GPIO_PIN_6
+#define SCL2_GPIO_Port   GPIOB
+#define SDA2_Pin         GPIO_PIN_5
+#define SDA2_GPIO_Port   GPIOB
+#define INT_PD_Pin       GPIO_PIN_7
+#define INT_PD_GPIO_Port GPIOB
+// Selecting the DC source to route to theg
+#define DC_SELECT_Pin       GPIO_PIN_4
+#define DC_SELECT_GPIO_Port GPIOB
+#define PD_SELECT_Pin       GPIO_PIN_15
+#define PD_SELECT_GPIO_Port GPIOA
 
-  #endif
+#define TIP_RESISTANCE_SENSE_Pin       GPIO_PIN_1
+#define TIP_RESISTANCE_SENSE_GPIO_Port GPIOA
 
-  #ifdef MODEL_TS80P
-  // TS80P pin map
-    #define INT_PD_Pin                GPIO_PIN_9
-    #define INT_PD_GPIO_Port          GPIOA
+#endif
+#if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0
+// TS80 & TS80P pin map
+#define KEY_B_Pin                 GPIO_PIN_0
+#define KEY_B_GPIO_Port           GPIOB
+#define TMP36_INPUT_Pin           GPIO_PIN_4
+#define TMP36_INPUT_GPIO_Port     GPIOA
+#define TMP36_ADC1_CHANNEL        ADC_CHANNEL_4
+#define TMP36_ADC2_CHANNEL        ADC_CHANNEL_4
+#define TIP_TEMP_Pin              GPIO_PIN_3
+#define TIP_TEMP_GPIO_Port        GPIOA
+#define TIP_TEMP_ADC1_CHANNEL     ADC_CHANNEL_3
+#define TIP_TEMP_ADC2_CHANNEL     ADC_CHANNEL_3
+#define VIN_Pin                   GPIO_PIN_2
+#define VIN_GPIO_Port             GPIOA
+#define VIN_ADC1_CHANNEL          ADC_CHANNEL_2
+#define VIN_ADC2_CHANNEL          ADC_CHANNEL_2
+#define OLED_RESET_Pin            GPIO_PIN_15
+#define OLED_RESET_GPIO_Port      GPIOA
+#define KEY_A_Pin                 GPIO_PIN_1
+#define KEY_A_GPIO_Port           GPIOB
+#define INT_Orientation_Pin       GPIO_PIN_4
+#define INT_Orientation_GPIO_Port GPIOB
+#define PWM_Out_Pin               GPIO_PIN_6
+#define PWM_Out_GPIO_Port         GPIOA
+#define PWM_Out_CHANNEL           TIM_CHANNEL_1
+#define TIP_CONTROL_TIMER         TIM3
+#define ADC_CONTROL_TIMER         TIM2
+#define ADC_CONTROL_TIMER_IRQ     TIM2_IRQn
+#define ADC_TRIGGER               ADC_EXTERNALTRIGINJECCONV_T2_TRGO
+#define INT_Movement_Pin          GPIO_PIN_5
+#define INT_Movement_GPIO_Port    GPIOB
+#define SCL_Pin                   GPIO_PIN_6
+#define SCL_GPIO_Port             GPIOB
+#define SDA_Pin                   GPIO_PIN_7
+#define SDA_GPIO_Port             GPIOB
+#define SCL2_Pin                  GPIO_PIN_5
+#define SCL2_GPIO_Port            GPIOA
+#define SDA2_Pin                  GPIO_PIN_1
+#define SDA2_GPIO_Port            GPIOA
 
-  #endif
+#endif
+
+#ifdef MODEL_TS80P
+// TS80P pin map
+#define INT_PD_Pin       GPIO_PIN_9
+#define INT_PD_GPIO_Port GPIOA
+
+#endif
 
 #endif /* BSP_MINIWARE_PINS_H_ */

source/Core/BSP/Miniware/Power.cpp

@@ -5,9 +5,9 @@
 #include "Settings.h"
 #include "USBPD.h"
 #include "configuration.h"
-
+#include "stm32f1xx_hal.h"
 void power_check() {
-#if POW_PD
+#ifdef POW_PD
   // Cant start QC until either PD works or fails
   if (!USBPowerDelivery::negotiationComplete()) {
     return;
@@ -25,7 +25,10 @@ bool getIsPoweredByDCIN() {
 #if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0
   return false;
 #endif
-
+#ifdef MODEL_TS101
+  // TODO have to check what we are using
+  return HAL_GPIO_ReadPin(DC_SELECT_GPIO_Port, DC_SELECT_Pin) == GPIO_PIN_SET;
+#endif
 #ifdef MODEL_TS100
   return true;
 #endif

source/Core/BSP/Miniware/Setup.cpp

@@ -18,8 +18,8 @@ DMA_HandleTypeDef hdma_i2c1_rx;
 DMA_HandleTypeDef hdma_i2c1_tx;
 
 IWDG_HandleTypeDef hiwdg;
-TIM_HandleTypeDef  htim2;
-TIM_HandleTypeDef  htim3;
+TIM_HandleTypeDef  htimADC;
+TIM_HandleTypeDef  htimTip;
 #define ADC_FILTER_LEN 4
 #define ADC_SAMPLES    16
 uint16_t ADCReadings[ADC_SAMPLES]; // Used to store the adc readings for the handle cold junction temp
@@ -29,8 +29,8 @@ static void SystemClock_Config(void);
 static void MX_ADC1_Init(void);
 static void MX_I2C1_Init(void);
 static void MX_IWDG_Init(void);
-static void MX_TIM3_Init(void);
-static void MX_TIM2_Init(void);
+static void MX_TIP_CONTROL_TIMER_Init(void);
+static void MX_ADC_CONTROL_TIMER_Init(void);
 static void MX_DMA_Init(void);
 static void MX_GPIO_Init(void);
 static void MX_ADC2_Init(void);
@@ -45,11 +45,13 @@ void        Setup_HAL() {
 
   MX_GPIO_Init();
   MX_DMA_Init();
+#ifndef I2C_SOFT_BUS_1
   MX_I2C1_Init();
+#endif
   MX_ADC1_Init();
   MX_ADC2_Init();
-  MX_TIM3_Init();
-  MX_TIM2_Init();
+  MX_TIP_CONTROL_TIMER_Init();
+  MX_ADC_CONTROL_TIMER_Init();
   MX_IWDG_Init();
   HAL_ADC_Start_DMA(&hadc1, (uint32_t *)ADCReadings, (ADC_SAMPLES)); // start DMA of normal readings
   HAL_ADCEx_InjectedStart(&hadc1);                                   // enable injected readings
@@ -68,7 +70,41 @@ uint16_t getADCHandleTemp(uint8_t sample) {
   return filter.average() >> 1;
 }
 
+#ifdef HAS_SPLIT_POWER_PATH
+static history<uint16_t, ADC_FILTER_LEN> filteredDC = {{0}, 0, 0};
+static history<uint16_t, ADC_FILTER_LEN> filteredPD = {{0}, 0, 0};
+
+uint16_t getRawDCVin() { return filteredDC.average(); }
+uint16_t getRawPDVin() { return filteredPD.average(); }
+#endif
+
 uint16_t getADCVin(uint8_t sample) {
+#ifdef HAS_SPLIT_POWER_PATH
+  // In split power path operation, we need to read both inputs, and return the larger
+
+  if (sample) {
+    {
+      uint16_t latestADC = 0;
+      latestADC += hadc2.Instance->JDR1;
+      latestADC += hadc2.Instance->JDR2;
+      latestADC <<= 3;
+      filteredDC.update(latestADC);
+    }
+    {
+      uint16_t latestADC = 0;
+      latestADC += hadc2.Instance->JDR3;
+      latestADC += hadc2.Instance->JDR4;
+      latestADC <<= 3;
+      filteredPD.update(latestADC);
+    }
+  }
+  uint16_t dc = filteredDC.average();
+  uint16_t pd = filteredPD.average();
+  if (dc > pd) {
+    return dc;
+  }
+  return pd;
+#else
   static history<uint16_t, ADC_FILTER_LEN> filter = {{0}, 0, 0};
   if (sample) {
     uint16_t latestADC = 0;
@@ -77,10 +113,11 @@ uint16_t getADCVin(uint8_t sample) {
     latestADC += hadc2.Instance->JDR2;
     latestADC += hadc2.Instance->JDR3;
     latestADC += hadc2.Instance->JDR4;
-    latestADC <<= 3;
+    latestADC <<= 1;
     filter.update(latestADC);
   }
   return filter.average();
+#endif
 }
 // 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) {
@@ -178,7 +215,7 @@ static void MX_ADC1_Init(void) {
   sConfigInjected.InjectedRank                  = 1;
   sConfigInjected.InjectedNbrOfConversion       = 4;
   sConfigInjected.InjectedSamplingTime          = ADC_SAMPLETIME_28CYCLES_5;
-  sConfigInjected.ExternalTrigInjecConv         = ADC_EXTERNALTRIGINJECCONV_T2_TRGO;
+  sConfigInjected.ExternalTrigInjecConv         = ADC_TRIGGER;
   sConfigInjected.AutoInjectedConv              = DISABLE;
   sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
   sConfigInjected.InjectedOffset                = 0;
@@ -192,8 +229,9 @@ static void MX_ADC1_Init(void) {
   HAL_ADCEx_InjectedConfigChannel(&hadc1, &sConfigInjected);
   SET_BIT(hadc1.Instance->CR1, (ADC_CR1_JEOCIE)); // Enable end of injected conv irq
   // Run ADC internal calibration
-  while (HAL_ADCEx_Calibration_Start(&hadc1) != HAL_OK)
+  while (HAL_ADCEx_Calibration_Start(&hadc1) != HAL_OK) {
     ;
+  }
 }
 
 /* ADC2 init function */
@@ -203,7 +241,7 @@ static void MX_ADC2_Init(void) {
   /**Common config
    */
   hadc2.Instance                   = ADC2;
-  hadc2.Init.ScanConvMode          = ADC_SCAN_DISABLE;
+  hadc2.Init.ScanConvMode          = ADC_SCAN_ENABLE;
   hadc2.Init.ContinuousConvMode    = ENABLE;
   hadc2.Init.DiscontinuousConvMode = DISABLE;
   hadc2.Init.ExternalTrigConv      = ADC_SOFTWARE_START;
@@ -217,21 +255,27 @@ static void MX_ADC2_Init(void) {
   sConfigInjected.InjectedRank                  = ADC_INJECTED_RANK_1;
   sConfigInjected.InjectedNbrOfConversion       = 4;
   sConfigInjected.InjectedSamplingTime          = ADC_SAMPLETIME_28CYCLES_5;
-  sConfigInjected.ExternalTrigInjecConv         = ADC_EXTERNALTRIGINJECCONV_T2_TRGO;
+  sConfigInjected.ExternalTrigInjecConv         = ADC_TRIGGER;
   sConfigInjected.AutoInjectedConv              = DISABLE;
   sConfigInjected.InjectedDiscontinuousConvMode = DISABLE;
   sConfigInjected.InjectedOffset                = 0;
   HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
   sConfigInjected.InjectedRank = ADC_INJECTED_RANK_2;
   HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
+
+#ifdef HAS_SPLIT_POWER_PATH
+  sConfigInjected.InjectedChannel = PD_VIN_ADC2_CHANNEL;
+#endif
+
   sConfigInjected.InjectedRank = ADC_INJECTED_RANK_3;
   HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
   sConfigInjected.InjectedRank = ADC_INJECTED_RANK_4;
   HAL_ADCEx_InjectedConfigChannel(&hadc2, &sConfigInjected);
 
   // Run ADC internal calibration
-  while (HAL_ADCEx_Calibration_Start(&hadc2) != HAL_OK)
+  while (HAL_ADCEx_Calibration_Start(&hadc2) != HAL_OK) {
     ;
+  }
 }
 /* I2C1 init function */
 static void MX_I2C1_Init(void) {
@@ -259,35 +303,43 @@ static void MX_IWDG_Init(void) {
 }
 
 /* TIM3 init function */
-static void MX_TIM3_Init(void) {
+static void MX_TIP_CONTROL_TIMER_Init(void) {
   TIM_ClockConfigTypeDef  sClockSourceConfig;
   TIM_MasterConfigTypeDef sMasterConfig;
   TIM_OC_InitTypeDef      sConfigOC;
 
-  htim3.Instance               = TIM3;
-  htim3.Init.Prescaler         = 8;
-  htim3.Init.CounterMode       = TIM_COUNTERMODE_UP;
-  htim3.Init.Period            = 100;                           // 5 Khz PWM freq
-  htim3.Init.ClockDivision     = TIM_CLOCKDIVISION_DIV4;        // 4mhz before div
-  htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE; // Preload the ARR register (though we dont use this)
-  HAL_TIM_Base_Init(&htim3);
+  htimTip.Instance = TIP_CONTROL_TIMER;
+#ifdef TIP_HAS_DIRECT_PWM
+  htimTip.Init.Prescaler = 100;
+#else
+  htimTip.Init.Prescaler = 3;
+#endif
+  htimTip.Init.CounterMode       = TIM_COUNTERMODE_UP;
+  htimTip.Init.Period            = 255;                           // 5 Khz PWM freq
+  htimTip.Init.ClockDivision     = TIM_CLOCKDIVISION_DIV4;        // 4mhz before div
+  htimTip.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE; // Preload the ARR register (though we dont use this)
+  HAL_TIM_Base_Init(&htimTip);
 
   sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-  HAL_TIM_ConfigClockSource(&htim3, &sClockSourceConfig);
+  HAL_TIM_ConfigClockSource(&htimTip, &sClockSourceConfig);
 
-  HAL_TIM_PWM_Init(&htim3);
+  HAL_TIM_PWM_Init(&htimTip);
 
-  HAL_TIM_OC_Init(&htim3);
+  HAL_TIM_OC_Init(&htimTip);
 
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
   sMasterConfig.MasterSlaveMode     = TIM_MASTERSLAVEMODE_DISABLE;
-  HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig);
+  HAL_TIMEx_MasterConfigSynchronization(&htimTip, &sMasterConfig);
 
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse      = 50; // 50% duty cycle, that is AC coupled through the cap
+#ifdef TIP_HAS_DIRECT_PWM
+  sConfigOC.Pulse = 0; // PWM is direct to tip
+#else
+  sConfigOC.Pulse        = 127; // 50% duty cycle, that is AC coupled through the cap to provide an on signal (This does not do tip at 50% duty cycle)
+#endif
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
-  HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, PWM_Out_CHANNEL);
+  HAL_TIM_PWM_ConfigChannel(&htimTip, &sConfigOC, PWM_Out_CHANNEL);
 
   GPIO_InitTypeDef GPIO_InitStruct;
 
@@ -304,10 +356,10 @@ static void MX_TIM3_Init(void) {
 #else
                                 // No re-map required
 #endif
-  HAL_TIM_PWM_Start(&htim3, PWM_Out_CHANNEL);
+  HAL_TIM_PWM_Start(&htimTip, PWM_Out_CHANNEL);
 }
 /* TIM3 init function */
-static void MX_TIM2_Init(void) {
+static void MX_ADC_CONTROL_TIMER_Init(void) {
   /*
    * We use the channel 1 to trigger the ADC at end of PWM period
    * And we use the channel 4 as the PWM modulation source using Interrupts
@@ -318,30 +370,30 @@ static void MX_TIM2_Init(void) {
 
   // Timer 2 is fairly slow as its being used to run the PWM and trigger the ADC
   // in the PWM off time.
-  htim2.Instance = TIM2;
+  htimADC.Instance = ADC_CONTROL_TIMER;
   // dummy value, will be reconfigured by BSPInit()
-  htim2.Init.Prescaler = 2000; // 2 MHz timer clock/2000 = 1 kHz tick rate
+  htimADC.Init.Prescaler = 2000; // 2 MHz timer clock/2000 = 1 kHz tick rate
 
   // pwm out is 10k from tim3, we want to run our PWM at around 10hz or slower on the output stage
   // These values give a rate of around 3.5 Hz for "fast" mode and 1.84 Hz for "slow"
-  htim2.Init.CounterMode = TIM_COUNTERMODE_UP;
+  htimADC.Init.CounterMode = TIM_COUNTERMODE_UP;
   // dummy value, will be reconfigured by BSPInit()
-  htim2.Init.Period = powerPWM + 14 * 2;
+  htimADC.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;
-  HAL_TIM_Base_Init(&htim2);
+  htimADC.Init.ClockDivision     = TIM_CLOCKDIVISION_DIV4; // 8 MHz (x2 APB1) before divide
+  htimADC.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
+  htimADC.Init.RepetitionCounter = 0;
+  HAL_TIM_Base_Init(&htimADC);
 
   sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL;
-  HAL_TIM_ConfigClockSource(&htim2, &sClockSourceConfig);
+  HAL_TIM_ConfigClockSource(&htimADC, &sClockSourceConfig);
 
-  HAL_TIM_PWM_Init(&htim2);
-  HAL_TIM_OC_Init(&htim2);
+  HAL_TIM_PWM_Init(&htimADC);
+  HAL_TIM_OC_Init(&htimADC);
 
   sMasterConfig.MasterOutputTrigger = TIM_TRGO_OC1;
   sMasterConfig.MasterSlaveMode     = TIM_MASTERSLAVEMODE_DISABLE;
-  HAL_TIMEx_MasterConfigSynchronization(&htim2, &sMasterConfig);
+  HAL_TIMEx_MasterConfigSynchronization(&htimADC, &sMasterConfig);
 
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
   // dummy value, will be reconfigured by BSPInit() in the BSP.cpp
@@ -354,15 +406,15 @@ static void MX_TIM2_Init(void) {
    * */
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
-  HAL_TIM_PWM_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_1);
+  HAL_TIM_PWM_ConfigChannel(&htimADC, &sConfigOC, TIM_CHANNEL_1);
   sConfigOC.Pulse = 0; // default to entirely off
-  HAL_TIM_OC_ConfigChannel(&htim2, &sConfigOC, TIM_CHANNEL_4);
+  HAL_TIM_OC_ConfigChannel(&htimADC, &sConfigOC, TIM_CHANNEL_4);
 
-  HAL_TIM_Base_Start_IT(&htim2);
-  HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_1);
-  HAL_TIM_PWM_Start_IT(&htim2, TIM_CHANNEL_4);
-  HAL_NVIC_SetPriority(TIM2_IRQn, 15, 0);
-  HAL_NVIC_EnableIRQ(TIM2_IRQn);
+  HAL_TIM_Base_Start_IT(&htimADC);
+  HAL_TIM_PWM_Start(&htimADC, TIM_CHANNEL_1);
+  HAL_TIM_PWM_Start_IT(&htimADC, TIM_CHANNEL_4);
+  HAL_NVIC_SetPriority(ADC_CONTROL_TIMER_IRQ, 15, 0);
+  HAL_NVIC_EnableIRQ(ADC_CONTROL_TIMER_IRQ);
 }
 
 /**
@@ -462,12 +514,45 @@ static void MX_GPIO_Init(void) {
   GPIO_InitStruct.Mode  = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
   HAL_GPIO_Init(OLED_RESET_GPIO_Port, &GPIO_InitStruct);
-  HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_RESET);
 
   // Pull down LCD reset
   HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_RESET);
   HAL_Delay(30);
   HAL_GPIO_WritePin(OLED_RESET_GPIO_Port, OLED_RESET_Pin, GPIO_PIN_SET);
+
+#ifdef DC_SELECT_Pin
+  GPIO_InitStruct.Pin  = DC_SELECT_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(DC_SELECT_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_WritePin(DC_SELECT_GPIO_Port, DC_SELECT_Pin, GPIO_PIN_RESET);
+#endif
+
+#ifdef PD_SELECT_Pin
+  GPIO_InitStruct.Pin  = PD_SELECT_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(PD_SELECT_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_WritePin(PD_SELECT_GPIO_Port, PD_SELECT_Pin, GPIO_PIN_RESET);
+
+#endif
+
+#ifdef TIP_RESISTANCE_SENSE_Pin
+  GPIO_InitStruct.Pin  = TIP_RESISTANCE_SENSE_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+  GPIO_InitStruct.Pull = GPIO_NOPULL;
+  HAL_GPIO_Init(TIP_RESISTANCE_SENSE_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_WritePin(TIP_RESISTANCE_SENSE_GPIO_Port, TIP_RESISTANCE_SENSE_Pin, GPIO_PIN_RESET);
+
+#endif
+
+#ifdef INT_PD_Pin
+  GPIO_InitStruct.Pin  = INT_PD_Pin;
+  GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
+  GPIO_InitStruct.Pull = GPIO_PULLUP;
+  HAL_GPIO_Init(INT_PD_GPIO_Port, &GPIO_InitStruct);
+
+#endif
 }
 #ifdef USE_FULL_ASSERT
 void assert_failed(uint8_t *file, uint32_t line) { asm("bkpt"); }

source/Core/BSP/Miniware/Setup.h

@@ -7,7 +7,7 @@
 
 #ifndef SETUP_H_
 #define SETUP_H_
-
+#include "configuration.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -24,13 +24,18 @@ extern I2C_HandleTypeDef hi2c1;
 
 extern IWDG_HandleTypeDef hiwdg;
 
-extern TIM_HandleTypeDef htim2;
-extern TIM_HandleTypeDef htim3;
+extern TIM_HandleTypeDef htimADC;
+extern TIM_HandleTypeDef htimTip;
 void                     Setup_HAL();
 uint16_t                 getADCHandleTemp(uint8_t sample);
 uint16_t                 getADCVin(uint8_t sample);
 void                     HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); // Since the hal header file does not define this one
 
+#ifdef HAS_SPLIT_POWER_PATH
+uint16_t getRawDCVin();
+uint16_t getRawPDVin();
+#endif
+
 #ifdef __cplusplus
 }
 #endif

source/Core/BSP/Miniware/Software_I2C.h

@@ -10,14 +10,27 @@
 #include "BSP.h"
 #include "configuration.h"
 #include "stm32f1xx_hal.h"
-#ifdef I2C_SOFT
+#ifdef I2C_SOFT_BUS_2
+
+#define SOFT_SCL2_HIGH() HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_SET)
+#define SOFT_SCL2_LOW()  HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA2_HIGH() HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_SET)
+#define SOFT_SDA2_LOW()  HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA2_READ() (HAL_GPIO_ReadPin(SDA2_GPIO_Port, SDA2_Pin) == GPIO_PIN_SET ? 1 : 0)
+#define SOFT_SCL2_READ() (HAL_GPIO_ReadPin(SCL2_GPIO_Port, SCL2_Pin) == GPIO_PIN_SET ? 1 : 0)
+
+#endif
+
+#ifdef I2C_SOFT_BUS_1
+#define SOFT_SCL1_HIGH() HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_SET)
+#define SOFT_SCL1_LOW()  HAL_GPIO_WritePin(SCL_GPIO_Port, SCL_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA1_HIGH() HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_SET)
+#define SOFT_SDA1_LOW()  HAL_GPIO_WritePin(SDA_GPIO_Port, SDA_Pin, GPIO_PIN_RESET)
+#define SOFT_SDA1_READ() (HAL_GPIO_ReadPin(SDA_GPIO_Port, SDA_Pin) == GPIO_PIN_SET ? 1 : 0)
+#define SOFT_SCL1_READ() (HAL_GPIO_ReadPin(SCL_GPIO_Port, SCL_Pin) == GPIO_PIN_SET ? 1 : 0)
+
+#endif
 
-#define SOFT_SCL_HIGH() HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_SET)
-#define SOFT_SCL_LOW()  HAL_GPIO_WritePin(SCL2_GPIO_Port, SCL2_Pin, GPIO_PIN_RESET)
-#define SOFT_SDA_HIGH() HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_SET)
-#define SOFT_SDA_LOW()  HAL_GPIO_WritePin(SDA2_GPIO_Port, SDA2_Pin, GPIO_PIN_RESET)
-#define SOFT_SDA_READ() (HAL_GPIO_ReadPin(SDA2_GPIO_Port, SDA2_Pin) == GPIO_PIN_SET ? 1 : 0)
-#define SOFT_SCL_READ() (HAL_GPIO_ReadPin(SCL2_GPIO_Port, SCL2_Pin) == GPIO_PIN_SET ? 1 : 0)
 #define SOFT_I2C_DELAY()              \
   {                                   \
     for (int xx = 0; xx < 15; xx++) { \
@@ -25,7 +38,6 @@
     }                                 \
   }
 
-#endif
 // 40 ~= 100kHz; 15 gives around 250kHz or so which is fast _and_ stable
 
 #endif /* BSP_MINIWARE_SOFTWARE_I2C_H_ */