Translated using Weblate (English)

Currently translated at 100.0% (117 of 117 strings)

Translation: IronOS/Main Firmware
Translate-URL: https://hosted.weblate.org/projects/ironos/main-firmware/en/

.github/workflows/docs.yml

@@ -28,13 +28,8 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v4
 
-
+      - run: pip install --upgrade pip && pip install mkdocs mkdocs-gen-files
-      - run: |
-          pip install --upgrade pip &&
-          pip install mkdocs mkdocs-gen-files pymdown-extensions \
-              mkdocs-git-revision-date-plugin mkdocs-autolinks-plugin \
-              mkdocs-awesome-pages-plugin 
       - run: git config user.name 'github-actions[bot]' && git config user.email 'github-actions[bot]@users.noreply.github.com'
       
       - name: Publish docs
-        run: mkdocs gh-deploy
+        run: mkdocs gh-deploy

.github/workflows/push.yml

@@ -140,14 +140,14 @@ jobs:
 
     steps:
       - name: deps
-        run: apk add --no-cache python3 py3-pip make git black
+        run: apk add --no-cache python3 py3-pip make git
 
       - uses: actions/checkout@v3
         with:
           submodules: true
 
       - name: install black
-        run: python3 -m pip install bdflib flake8
+        run: python3 -m pip install bdflib black flake8
 
       - name: Check formatting with clang-format
         run: cd source && make clean && make check-style

.github/workflows/weblate.yml

@@ -0,0 +1,25 @@
+name: Weblate PR
+on:
+  create:
+    branches: ["^translations$"]
+
+jobs:
+  pull-request:
+    name: Open PR to dev
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        name: checkout
+
+      - uses: repo-sync/pull-request@v2
+        name: pull-request
+        with:
+          destination_branch: "dev"
+          pr_title: "Merging newest translations into dev" # Title of pull request
+          pr_body: | # Full markdown support, requires pr_title to be set
+            Translations automatically submitted by Weblate
+
+            _Translations from [Weblate](https://hosted.weblate.org/projects/ironos/main-firmware/)_
+          pr_reviewer: "ralim"
+          pr_draft: true
+          github_token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -8,20 +8,12 @@ WORKDIR /build
 # 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
+RUN apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-elf newlib-arm-none-eabi findutils python3 py3-pip make git musl-dev clang bash clang-extra-tools
-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}
+RUN python3 -m pip install bdflib black
 # Git trust
 RUN git config --global --add safe.directory /build/source
 

Documentation/Development.md

@@ -104,40 +104,3 @@ If you _need_ an IDE I have used [Nuclei's IDE](https://nucleisys.com/download.p
 Follow the same idea as the STM Cube IDE notes above.
 
 ## Building Pinecil V2
-
-To build the Pinecil V2 firmware, you can use a Docker container that provides a consistent development environment across different operating systems, including Windows with WSL2. Here's how to do it:
-
-### Prerequisites
-
-Docker Desktop: Install the latest version of Docker Desktop for your operating system from the official website.
-
-On Windows follow the instructions on the official documentation to install 'Windows Subsystem for Linux' (WSL2).
-
-### Building Steps
-
-1. Clone the repository, initialize and update submodules:
-
-    ```sh
-    git clone --recurse-submodules https://github.com/Ralim/IronOS.git
-    ```
-
-2. Start the Docker container with the development environment:
-
-    ```sh
-    cd IronOS
-    ./start_dev.sh
-    ```
-
-    This script will build a Docker image and run a container with the necessary tools to build the firmware.
-
-3. Build the firmware for Pinecil V2:
-
-    ```sh
-    cd source/source
-    ./build.sh -l EN -m Pinecilv2
-    ```
-
-    This command will compile the firmware with English language support for Pinecil V2 board.
-
-4. Find the firmware artifacts:
-    After the build completes successfully, you can find the firmware artifacts in the `source/Hexfile` directory.

Documentation/Flashing/Pinecil V1.md

@@ -12,8 +12,8 @@ These are built on every change and can be found on the Actions tab (see below).
 
 Main releases are made to the [releases page](https://github.com/Ralim/IronOS/releases).
 Download the zip file that matches your model of soldering iron and extract it.
-Select the appropriate file type for your unit, in general Miniware devices need `.hex`, Pinecil V1 needs `.dfu`, and Pinecil V2 needs `.bin`.
+Select the appropriate file type for your unit, in general Miniware devices need `.hex` and Pinecil needs `.dfu`.
-Flash according to details below.
+Flash according to details below
 
 ### Bleeding edge / latest
 
@@ -26,16 +26,13 @@ Then this works the same as a production release (use the correct file).
 
 # Pinecil V1
 
-- The MCU used in Pinecil supports usb-dfu. Reference [Pinecil Wiki](https://wiki.pine64.org/wiki/Pinecil) for hardware and firmware instructions.
+- The MCU used in Pinecil supports usb-dfu. Reference [Pinecil Wiki](https://wiki.pine64.org/wiki/Pinecil).
-- Recommended Updater for Windows/MacOS: [Pine64 Updater](https://github.com/pine64/pine64_updater) is an easy-to-use GUI app. It is fast and automatically fetches the newest stable version of IronOS from GitHub. It can also be used to load custom boot logo art.
+- Recommended Updater: the [Pine64 Updater](https://github.com/pine64/pinecil-firmware-updater/releases), is an easy-to-use GUI app. It is fast and works in several types of OS, i.e. Windows/Mac. It will automatically fetch the newest stable version of IronOS from GitHub.
-- Recommended Updater for Linux/MacOS: [PineFlash](https://github.com/Spagett1/PineFlash) is an easy-to-use GUI app. It is fast and automatically fetches the newest stable version of IronOS from Github. It can also be used to load custom boot logo art.
-
 - Troubleshooting: if you have issues using the Pine64 Updater or your install fails, please go to troubleshooting tips below.
-- The [Pinecil Wiki](https://wiki.pine64.org/wiki/Pinecil) is a great resource for all things Pinecil.
+- Community chat: if troubleshooting doesn't work, then join the Pine64 > Pinecil channel. There are knowledgeable members in Discord/Telegram/Matrix. Discord has a bridge bot connection to Telegram and Matrix so that all pine volunteers/members can see advice for Pinecil and related items or just get tips on which Power supply to purchase.
-- Community chat: if troubleshooting doesn't work, then join the Pine64 > Pinecil channel [here](https://wiki.pine64.org/wiki/Pinecil#Live_Community_Chat). There are knowledgeable members in Discord/Telegram/Matrix. Discord has a bridge bot connection to Telegram and Matrix so that all pine64 volunteers/members can see advice for Pinecil and related items or just get tips on which power supply to purchase.
 - One advantage of Pinecil is that you cannot permanently damage it doing a firmware update (because DFU is in ROM); an update could render Pinecil temporarily inoperable if you flash an invalid firmware. But no worries, simply re-flashing with a working firmware copy will fix everything.
 - USB-C cable is required to do an update. Generally, all USB controllers work, but some hubs have issues, so it is preferred to avoid USB hubs for updates.
-- Alternate Update Methods: if your OS is not currently supported by the [Pine64 Updater](https://github.com/pine64/pine64_updater) or it does not meet your needs, i.e., you want to install a beta version, the below manual methods may be used.
+- Alternate Update Methods: if your OS is not currently supported by the [Updater](https://github.com/pine64/pinecil-firmware-updater/releases) or it does not meet your needs, i.e., you want to install a beta version, the below manual methods may be used.
 
 ## Linux and Mac
 

Documentation/Flashing/Pinecil V2.md

@@ -12,25 +12,21 @@ These are built on every change and can be found on the Actions tab (see below).
 
 Main releases are made to the [releases page](https://github.com/Ralim/IronOS/releases).
 Download the zip file that matches your model of soldering iron and extract it.
-Select the appropriate file type for your unit, in general Miniware devices need `.hex`, Pinecil V1 needs `.dfu`, and Pinecil V2 needs `.bin`.
+Select the appropriate file type for your unit, in general Miniware devices need `.hex` and Pinecil needs `.dfu`.
-Flash according to details below.
+Flash according to details below
 
 ### Bleeding edge / latest
 
-For the _latest_ code, you need to download the zip file from the artifacts page for the build that you want.
+For the _latest_ code, you will need to download the zip file from the artifacts page on the build for what you want.
-Head to the [Actions](https://github.com/Ralim/IronOS/actions) page and then select the run for the appropriate branch and beta you would like.
+Head to the [Actions](https://github.com/Ralim/IronOS/actions) page and then select the run for the appropriate branch you would like.
 In general you probably want `master`.
 
-Once you click on a run, scroll down to the "Artifacts" section and then click on your device model name to download a zip file.
+Once you click on a run, scroll down to the "Artifacts" section and then click on your model to download a zip file.
 Then this works the same as a production release (use the correct file).
 
 # Pinecil V2
 
-- The MCU in Pinecil V2 is Bouffalo BL706 and does _not_ use usb-dfu for flashing as the previous Pinecil V1 MCU did.
+- The MCU in V2 is Bouffalo BL706 and does _not_ use usb-dfu for flashing as the previous MCU did.
-- See the Pinecil Wiki page [here](https://wiki.pine64.org/wiki/Pinecil#Firmware_&_Updates) for instructions.
+- The current firmware (2.18) is very fresh and no upgrade is available/needed.
-- The V2 uses the [BLISP flasher](https://github.com/pine64/blisp) to upload the firmware to the MCU.
+- When an update is released for V2, then IronOS will also include an update method to follow.
-- The [Pinecil Wiki](https://wiki.pine64.org/wiki/Pinecil) is a great resource for all things Pinecil.
-- Community chat: if there are issues updating, then join the Pine64 > Pinecil channel [here](https://wiki.pine64.org/wiki/Pinecil#Live_Community_Chat). There are knowledgeable members in Discord/Telegram/Matrix. Discord has a bridge bot connection to Telegram and Matrix so that all pine64 volunteers/members can see advice for Pinecil and related items or just get tips on which power supply to purchase.
-- One advantage of Pinecil is that you cannot permanently damage it doing a firmware update (because BIN is in ROM); an update could render Pinecil temporarily inoperable if you flash an invalid firmware. But no worries, simply re-flashing with a working firmware copy will fix everything.
-- USB-C cable is required to do an update. Generally, all USB controllers work, but some hubs have issues, so it is preferred to avoid USB hubs for updates.
 - Background on the [BL706 chipset](https://lupyuen.github.io/articles/bl706)

Documentation/GettingStarted.md

@@ -28,7 +28,7 @@ Note that this may be drawn mirrored depending on the orientation of your screen
 
 The soldering iron symbol on the screen will appear near the tip. This is here to indicate that pressing the button closest to the front of the iron will enter soldering mode.
 
-And naturally, the slider controls icon (or spanner icon in older versions) represents that pressing the button near the rear of the soldering iron will enter the settings menu.
+And naturally, the spanner like icon represents that pressing the button near the rear of the soldering iron will enter the settings menu.
 
 In the settings, you can turn on a detailed idle screen instead. The buttons still function the same, however, the image will be swapped for a text telling you the current status of the iron with extra details.
 

Documentation/Translation.md

@@ -1,12 +1,6 @@
 # Translation
 
-At the present time the main way of performing translations is to open a PR to this repository.
+Moving forward (after 2022/12/07); IronOS is using Weblate to provide the visual interface to doing translations to make it easier for people to work with.
-All translations are stored as `json` files in the repository. Currently there is ongoing work to look into a more user friendly method of editing translations than these but for now these are reliable.
+Currently there is a translation going on, so not _everything_ is perfect but its leaps in the right direction to help make it friendlier for people to edit and also subscribe to be notified when things are updated.
 
-You can create a pull request with the new / updated json configuration file, and this will include this language into the new builds for the firmware.
+This can be accessed on the [weblate hosted instance](https://hosted.weblate.org/projects/ironos/main-firmware/).
-
-For testing you can build locally and test of course; but if you dont want to figure out the build environment; you can just open a PR and github will build the firmware for you using the _actions_ feature.
-
-This means that once you have a github account you can perform all of your edits inside Github should this be desired.
-
-Translations are _NOT_ accepted via issues/discussions or email.

README.md

@@ -1,7 +1,7 @@
-[![CI Build](https://github.com/Ralim/IronOS/actions/workflows/push.yml/badge.svg)](https://github.com/Ralim/IronOS/actions/workflows/push.yml)
+![CI](https://github.com/Ralim/ts100/workflows/CI%20Build%20all/badge.svg)
-[![Total Downloads](https://img.shields.io/github/downloads/ralim/IronOS/total)](https://github.com/Ralim/IronOS)
+![GitHub all](https://img.shields.io/github/downloads/ralim/IronOS/total)
-[![Contributors](https://img.shields.io/github/contributors-anon/ralim/ironos?color=blue&style=flat)](https://github.com/Ralim/IronOS/graphs/contributors)
+![Latest Release](https://img.shields.io/github/v/release/ralim/IronOS)
-[![Latest Release](https://img.shields.io/github/v/release/ralim/IronOS)](https://github.com/Ralim/IronOS/releases/latest)
+[![Translation status](https://hosted.weblate.org/widgets/ironos/-/glossary/svg-badge.svg)](https://hosted.weblate.org/engage/ironos/)
 
 # IronOS - Flexible Soldering iron control Firmware
 
@@ -23,17 +23,15 @@ _This firmware does **NOT** support the USB port while running for changing sett
 
 |   Device   | DC  | QC  | PD  | EPR | BLE | Battery | Recommended |
 | :--------: | :-: | :-: | :-: | :-: | :-: | :-----: | :---------: |
-|   MHP30    | ❌  | ❌  | ✔️  | ❌  | ❌  |   ❌    |      ✔️       |
+|   MHP30    | ❌  | ❌  | ✔️  | ❌  | ❌  |   ❌    |     ✔️      |
-| Pinecil V1 | ✔️  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |      ✔️       |
+| Pinecil V1 | ✔️  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |     ✔️      |
-| Pinecil V2 | ✔️  | ✔️  | ✔️  | ✔️  | ✔️  |   ✔️    |      ✔️       |
+| Pinecil V2 | ✔️  | ✔️  | ✔️  | ✔️  | ✔️  |   ✔️    |     ✔️      |
-|   TS80P    | ❌  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |      ✔️       |
+|   TS80P    | ❌  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |     ✔️      |
-|   TS100    | ✔️  | ❌  | ❌  | ❌  | ❌  |   ✔️    |      ❌*      |
+|   TS100    | ✔️  | ❌  | ❌  | ❌  | ❌  |   ✔️    |     ❌      |
-|    TS80    | ❌  | ✔️  | ❌  | ❌  | ❌  |   ✔️    |     ❌**      |
+|    TS80    | ❌  | ✔️  | ❌  | ❌  | ❌  |   ✔️    |     ❌      |
 
 \*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
 
 To get started with IronOS firmware, please jump to [Getting Started Guide](https://ralim.github.io/IronOS/GettingStarted/).
@@ -84,9 +82,8 @@ Operation details are over in the [Menu information.](https://ralim.github.io/Ir
 
 ## Translations
 
-Is your preferred language missing localisation of some of the text?
+Is your preferred language missing localisation of languages?
-Translations are stored as `json` files in the Translations folder.
+This project is using Weblate for managing translations in a user friendly way; [the user interface for this is on their hosted website.](https://hosted.weblate.org/engage/ironos/)
-PR's are loved and accepted to enhance the firmware.
 
 ## Thanks
 

Translations/translation_BE.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "BE",
     "languageLocalName": "Беларуская",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Каліброўка\nзроблена!"
@@ -28,7 +28,7 @@
             "message": "!ЗАМКНУТЫ!"
         },
         "WarningThermalRunaway": {
-            "message": "Некантралюемае\nразаграванне"
+            "message": "Цеплавы\nУцякач"
         },
         "SettingsCalibrationWarning": {
             "message": "Пераканайцеся, што пры наступнай загрузцы наканечнік і ручка маюць пакаёвую тэмпературу!"
@@ -43,19 +43,19 @@
             "message": "НАПРУГА--"
         },
         "UndervoltageString": {
-            "message": "Нізкая напруга\n"
+            "message": "Нізкая напруга"
         },
         "InputVoltageString": {
-            "message": "Сілкаванне В: \n"
+            "message": "Сілкаванне В: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Чаканне...\n"
+            "message": "Чаканне..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Джала: \n"
+            "message": "Джала:"
         },
         "OffString": {
             "message": "Выкл."
@@ -119,10 +119,6 @@
             "displayText": "PD\nпрыпынак",
             "description": "Час чакання ўзгаднення PD з крокам 100 мс для сумяшчальнасці з некаторымі зараднымі зараднымі прыладамі QC (0: адключана)"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Уключае рэжымы PPS & EPR."
-        },
         "BoostTemperature": {
             "displayText": "t° турба\nрэжыму",
             "description": "Тэмпература джала ў турба-рэжыме"
@@ -211,10 +207,6 @@
             "displayText": "Падрабязны\nэкран пайкі",
             "description": "Паказваць дэталёвую інформацыю на экране пайкі"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Межы\nмагутнасці",
             "description": "Максімальная магутнасць, якую можа выкарыстоўваць паяльнік (Ватт)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Мова:\n BY  Беларуская",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_BG.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "BG",
     "languageLocalName": "Български",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "Ниско DC Напрежение"
         },
         "UndervoltageString": {
-            "message": "Ниско Напрежение\n"
+            "message": "Ниско Напрежение"
         },
         "InputVoltageString": {
-            "message": "Входно V: \n"
+            "message": "Входно V: "
         },
         "SleepingSimpleString": {
             "message": "Сън"
         },
         "SleepingAdvancedString": {
-            "message": "Хър Хър Хър...\n"
+            "message": "Хър Хър Хър..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Връх: \n"
+            "message": "Връх:"
         },
         "OffString": {
             "message": "Изкл."
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Турбо\nтемп.",
             "description": "Температура за \"турбо\" режим"
@@ -211,10 +207,6 @@
             "displayText": "Детайлен\nработен екран",
             "description": "Детайлна информация в работен режим при запояване"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Лимит на\nмощност",
             "description": "Максимална мощност на поялника (Watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Език:\n BG   Български",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_CS.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "CS",
     "languageLocalName": "Český",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "Nízké DC"
         },
         "UndervoltageString": {
-            "message": "Nízké napětí\n"
+            "message": "Nízké napětí"
         },
         "InputVoltageString": {
-            "message": "Napětí: \n"
+            "message": "Napětí: "
         },
         "SleepingSimpleString": {
             "message": "Zzz "
         },
         "SleepingAdvancedString": {
-            "message": "Režim spánku...\n"
+            "message": "Režim spánku..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Hrot: \n"
+            "message": "Hrot:"
         },
         "OffString": {
             "message": "Vyp"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "Maximální prodleva při jednání PD ve 100ms krocích pro kompatibilitu s některými QC nabíječkami"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Teplota\nboostu",
             "description": "Teplota hrotu v \"režimu boost\""
@@ -211,10 +207,6 @@
             "displayText": "Podrobná obr.\npájení",
             "description": "Zobrazit detailní informace malým fontem na obrazovce pájení"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Omezení\nVýkonu",
             "description": "Maximální příkon páječky (W=watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Jazyk:\n CS       Český",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_DA.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "DA",
     "languageLocalName": "Dansk",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "Lav Volt"
         },
         "UndervoltageString": {
-            "message": "Undervolt\n"
+            "message": "Undervolt"
         },
         "InputVoltageString": {
-            "message": "Input V: \n"
+            "message": "Input V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Dvale...\n"
+            "message": "Dvale..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Tip: \n"
+            "message": "Tip:"
         },
         "OffString": {
             "message": "Off"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD-forhandlingstimeout i trin på 100 ms for kompatibilitet med nogle QC-opladere"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Boost\ntemp",
             "description": "Temperatur i \"boost mode\""
@@ -211,10 +207,6 @@
             "displayText": "Detaljeret\nloddeskærm",
             "description": "Vis detaljeret information mens der loddes"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Strøm\nbegrænsning",
             "description": "Maksimal effekt Loddekolben kan bruge (W=watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Sprog:\n DA       Dansk",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_DE.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "DE",
     "languageLocalName": "Deutsch",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Erfolgreich\nkalibriert!"
@@ -43,19 +43,19 @@
             "message": "V niedr."
         },
         "UndervoltageString": {
-            "message": "Unterspannung\n"
+            "message": "Unterspannung"
         },
         "InputVoltageString": {
-            "message": "V Eingang: \n"
+            "message": "V Eingang: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Ruhemodus...\n"
+            "message": "Ruhemodus..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Temp: \n"
+            "message": "Temp:"
         },
         "OffString": {
             "message": "Aus"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD Abfragedauer in 100ms Schritten (Kompatibilität mit best. QC-Ladegeräten)"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Aktiviert PPS & EPR"
-        },
         "BoostTemperature": {
             "displayText": "Boost-\ntemperatur",
             "description": "Temperatur der Lötspitze im Boostmodus"
@@ -180,7 +176,7 @@
             "description": "Scrollgeschwindigkeit der Erläuterungen (L=langsam | S=schnell)"
         },
         "ReverseButtonTempChange": {
-            "displayText": "+- Tasten\numkehren",
+            "displayText": "+- Tasten\numkehren?",
             "description": "Tastenbelegung zur Temperaturänderung umkehren"
         },
         "AnimSpeed": {
@@ -192,7 +188,7 @@
             "description": "Icon-Animationen im Hauptmenü wiederholen"
         },
         "Brightness": {
-            "displayText": "Bildschirm-\nhelligkeit",
+            "displayText": "Bildschirm-\nkontrast",
             "description": "Verändert die Helligkeit des OLED-Displays"
         },
         "ColourInversion": {
@@ -211,20 +207,16 @@
             "displayText": "Detaillierte\nLötansicht",
             "description": "Detaillierte Anzeige im Lötmodus"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Aktiviert Bluetooth LE"
-        },
         "PowerLimit": {
             "displayText": "Leistungs-\nmaximum",
             "description": "Maximal zulässige Leistungsaufnahme des Lötkolbens (W=Watt)"
         },
         "CalibrateCJC": {
-            "displayText": "Temperatur\nkalibrieren",
+            "displayText": "Temperatur\nkalibrieren?",
             "description": "Beim nächsten Start wird die Kaltstellenkompensation kalibriert (nicht nötig wenn Delta T < 5°C)"
         },
         "VoltageCalibration": {
-            "displayText": "Eingangsspannung\nkalibrieren",
+            "displayText": "Eingangsspannung\nkalibrieren?",
             "description": "Kalibrierung der Eingangsspannung (Langer Tastendruck zum Verlassen)"
         },
         "PowerPulsePower": {
@@ -240,12 +232,16 @@
             "description": "Dauer des Wachhalteimpulses (x 250ms)"
         },
         "SettingsReset": {
-            "displayText": "Einstellungen\nzurücksetzen",
+            "displayText": "Einstellungen\nzurücksetzen?",
             "description": "Werte auf Werkseinstellungen zurücksetzen"
         },
         "LanguageSwitch": {
             "displayText": "Sprache:\n DE     Deutsch",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": "Aktiviert BLE."
         }
     }
 }

Translations/translation_EL.json

@@ -4,7 +4,7 @@
     "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
-            "message": "Βαθμονόμηση\nολοκληρώθηκε!"
+            "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
             "message": "Επαν. OK"
@@ -31,10 +31,10 @@
             "message": "Θερμική\nΦυγή"
         },
         "SettingsCalibrationWarning": {
-            "message": "Πριν την επανεκκίνηση, βεβαιωθείτε ότι η μύτη και η συσκ. είναι σε θερμ. δωματίου!"
+            "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
         "CJCCalibrating": {
-            "message": "βαθμονόμηση\n"
+            "message": "calibrating\n"
         },
         "SettingsResetWarning": {
             "message": "Σίγουρα θέλετε επαναφορά αρχικών ρυθμίσεων;"
@@ -43,25 +43,25 @@
             "message": "Χαμηλ DC"
         },
         "UndervoltageString": {
-            "message": "Υπόταση\n"
+            "message": "Υπόταση"
         },
         "InputVoltageString": {
-            "message": "Είσοδος V: \n"
+            "message": "Είσοδος V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Υπνος...\n"
+            "message": "Υπνος..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Μύτη: \n"
+            "message": "Μύτη:"
         },
         "OffString": {
             "message": "Απ."
         },
         "DeviceFailedValidationWarning": {
-            "message": "Η συσκευή σας ίσως να μην είναι αυθεντική!"
+            "message": "Your device is most likely a counterfeit!"
         }
     },
     "characters": {
@@ -105,24 +105,20 @@
     "menuOptions": {
         "DCInCutoff": {
             "displayText": "Πηγή\nενέργειας",
-            "description": "Πηγή ενέργειας. Oρισμός τάσης απενεργοποίησης. (DC 10V) (S 3.3V ανα μπαταρία, απενεργοποίηση ενεργειακού ορίου)"
+            "description": "Πηγή ενέργειας. Oρισμός τάσης απενεργοποίησης. (DC 10V) (S 3.3V ανα κυψέλη, απενεργοποίηση ενεργειακού ορίου)"
         },
         "MinVolCell": {
             "displayText": "Ελάχιστη\nτάση",
-            "description": "Ελάχιστη επιτρεπτή τάση ανα μπαταρία (3 σε σειρά: 3 - 3.7V | 4-6 σε σειρά: 2.4 - 3.7V)"
+            "description": "Ελάχιστη επιτρεπτή τάση ανα κυψέλη (3 σε σειρά: 3 - 3.7V | 4-6 σε σειρά: 2.4 - 3.7V)"
         },
         "QCMaxVoltage": {
             "displayText": "Τάση\nQC",
-            "description": "Μέγιστη τάση QC που να ζητείται από το τροφοδοτικό"
+            "description": "Μέγιστη τάση QC που να ζητά το κολλητήρι από το τροφοδοτικό"
         },
         "PDNegTimeout": {
             "displayText": "χρονικό όριο\nPD",
             "description": "Χρονικό όριο διαπραγμάτευσης PD σε βήματα 100ms για συμβατότητα με κάποιους φορτιστές QC"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Ενεργοποιεί λειτουργίες PPS & EPR."
-        },
         "BoostTemperature": {
             "displayText": "Θερμοκ.\nboost",
             "description": "Θερμοκρασία στη \"λειτουργία boost\""
@@ -200,8 +196,8 @@
             "description": "Αντιστροφή χρωμάτων οθόνης OLED"
         },
         "LOGOTime": {
-            "displayText": "Διάρκεια\nlogo εκκίνησης",
+            "displayText": "Boot logo\nduration",
-            "description": "Διάρκεια εμφάνισης της εικόνας εκκίνησης (s=seconds)"
+            "description": "Sets the duration for the boot logo (s=seconds)"
         },
         "AdvancedIdle": {
             "displayText": "Λεπτομερής\nοθ. αδράνειας",
@@ -211,17 +207,13 @@
             "displayText": "Λεπτομερής\nοθ. κόλλησης",
             "description": "Προβολή λεπτομερών πληροφοριών σε μικρότερη γραμματοσειρά στην οθόνη κόλλησης"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Ενεργειακό\nόριο",
             "description": "Μέγιστη ενέργεια που μπορεί να χρησιμοποιεί το κολλητήρι (W=watt)"
         },
         "CalibrateCJC": {
-            "displayText": "Βαθμονόμηση CJC\nσε επόμενη έναρξη",
+            "displayText": "Calibrate CJC\nat next boot",
-            "description": "Στην επόμενη εκκίνηση θα γίνει βαθμονόμηση θερμοκρασίας (δεν απαιτείται αν Δθερμ < 5 C)"
+            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5 C)"
         },
         "VoltageCalibration": {
             "displayText": "Βαθμονόμηση\nτάσης εισόδου;",
@@ -244,7 +236,11 @@
             "description": "Επαναφορά στις προεπιλεγμένες ρυθμίσεις"
         },
         "LanguageSwitch": {
-            "displayText": "Γλώσσα:\n EL    Ελληνικά",
+            "displayText": "Γλώσσα:\n GR    Ελληνικά",
+            "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
             "description": ""
         }
     }

Translations/translation_EN.json

@@ -43,10 +43,10 @@
             "message": "DC LOW"
         },
         "UndervoltageString": {
-            "message": "Undervoltage\n"
+            "message": "Undervoltage"
         },
         "InputVoltageString": {
-            "message": "Input V: \n"
+            "message": "Input V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
@@ -55,7 +55,7 @@
             "message": "Sleeping...\n"
         },
         "SleepingTipAdvancedString": {
-            "message": "Tip: \n"
+            "message": "Tip:"
         },
         "OffString": {
             "message": "Off"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Boost\ntemp",
             "description": "Tip temperature used in \"boost mode\""
@@ -211,17 +207,13 @@
             "displayText": "Detailed\nsolder screen",
             "description": "Display detailed info in a smaller font on soldering screen"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Maximum power the iron can use (W=watt)"
         },
         "CalibrateCJC": {
             "displayText": "Calibrate CJC\nat next boot",
-            "description": "Calibrate Cold Junction Compensation at next boot (not required if Delta T is < 5°C)"
+            "description": "Calbrate Cold Junction Compensation at next boot (not required if Delta T is < 5°C)"
         },
         "VoltageCalibration": {
             "displayText": "Calibrate\ninput voltage",
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Language:\n EN     English",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": "Enables BLE."
         }
     }
 }

Translations/translation_ES.json

@@ -43,19 +43,19 @@
             "message": "CC BAJA"
         },
         "UndervoltageString": {
-            "message": "Voltaje bajo\n"
+            "message": "Voltaje bajo"
         },
         "InputVoltageString": {
-            "message": "Voltaje: \n"
+            "message": "Voltaje: "
         },
         "SleepingSimpleString": {
             "message": "Reposo"
         },
         "SleepingAdvancedString": {
-            "message": "En reposo...\n"
+            "message": "En reposo..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Punta: \n"
+            "message": "Punta:"
         },
         "OffString": {
             "message": "No"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntiempo de espera",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Ajustar la\ntemp. extra",
             "description": "Temperatura de la punta utilizada en el \"modo de impulso\""
@@ -211,10 +207,6 @@
             "displayText": "Info extra\nal soldar",
             "description": "Mostrar información detallada en una fuente más pequeña en la pantalla de soldadura"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Habilita BLE"
-        },
         "PowerLimit": {
             "displayText": "Potencia\nlímite",
             "description": "Elige el límite de potencia máxima del soldador (en vatios)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Idioma:\n ES  Castellano",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Activado",
+            "description": "Habilita BLE."
         }
     }
 }

Translations/translation_FI.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "FI",
     "languageLocalName": "Suomi",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "DC ALH."
         },
         "UndervoltageString": {
-            "message": "Alijännite\n"
+            "message": "Alijännite"
         },
         "InputVoltageString": {
-            "message": "Jännite: \n"
+            "message": "Jännite: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Lepotila...\n"
+            "message": "Lepotila..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Kärki: \n"
+            "message": "Kärki:"
         },
         "OffString": {
             "message": "Off"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Tehostus-\nlämpötila",
             "description": "Tehostustilan lämpötila"
@@ -211,10 +207,6 @@
             "displayText": "Tarkempi\njuotosnäyttö",
             "description": "Näyttää yksityiskohtaisemmat tiedot pienellä fontilla juotostilassa"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Tehon-\nrajoitus",
             "description": "Suurin sallittu teho (Watti)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Kieli:\n FI       Suomi",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_FR.json

@@ -1,10 +1,10 @@
 {
     "languageCode": "FR",
     "languageLocalName": "Français",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
-            "message": "Étalonnage\nterminé!"
+            "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
             "message": "Reset OK"
@@ -31,10 +31,10 @@
             "message": "Emballement\nthermique"
         },
         "SettingsCalibrationWarning": {
-            "message": "Avant de redémarrer, assurez-vous que la panne et la poignée sont à température ambiante !"
+            "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
         "CJCCalibrating": {
-            "message": "Etalonnage\n"
+            "message": "calibrating\n"
         },
         "SettingsResetWarning": {
             "message": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ?"
@@ -43,19 +43,19 @@
             "message": "DC FAIBL"
         },
         "UndervoltageString": {
-            "message": "Sous-tension\n"
+            "message": "Sous-tension"
         },
         "InputVoltageString": {
-            "message": "V d'entrée: \n"
+            "message": "V d'entrée: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "En veille...\n"
+            "message": "En veille..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Panne: \n"
+            "message": "Panne:"
         },
         "OffString": {
             "message": "Off"
@@ -119,10 +119,6 @@
             "displayText": "Délai\nexpir. PD",
             "description": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Temp.\nboost",
             "description": "Température utilisée en \"mode boost\""
@@ -211,17 +207,13 @@
             "displayText": "Écran soudure\ndétaillé",
             "description": "Afficher les informations détaillées sur l'écran de soudure"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Limite de\npuissance",
             "description": "Puissance maximale utilisable (W=watts)"
         },
         "CalibrateCJC": {
-            "displayText": "Étalonner CJC\nau prochain démarage",
+            "displayText": "Calibrate CJC\nat next boot",
-            "description": "Au prochain démarrage, la compensation de soudure froide sera calibrée (non nécessaire si Delta T est < 5°C)."
+            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
         },
         "VoltageCalibration": {
             "displayText": "Étalonner\ntension d'entrée",
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Langue:\n FR    Français",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_HR.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "HR",
     "languageLocalName": "Hrvatski",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Kalibracija\ndovršena!"
@@ -43,19 +43,19 @@
             "message": "BAT!!!"
         },
         "UndervoltageString": {
-            "message": "PRENIZAK NAPON\n"
+            "message": "PRENIZAK NAPON"
         },
         "InputVoltageString": {
-            "message": "Napon V: \n"
+            "message": "Napon V: "
         },
         "SleepingSimpleString": {
             "message": "Zzz "
         },
         "SleepingAdvancedString": {
-            "message": "SPAVAM...\n"
+            "message": "SPAVAM..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Vrh: \n"
+            "message": "Vrh: "
         },
         "OffString": {
             "message": "Off"
@@ -119,10 +119,6 @@
             "displayText": "USB-PD\ntimeout",
             "description": "Timeout za USB-Power Delivery u koracima od 100ms za kompatibilnost s nekim QC punjačima"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Boost\ntemp",
             "description": "Temperatura u pojačanom (Boost) načinu."
@@ -211,10 +207,6 @@
             "displayText": "Detalji\npri lemljenju",
             "description": "Prikazivanje detaljnih informacija tijekom lemljenja"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Ograničenje\nsnage",
             "description": "Najveća snaga koju lemilica smije vući iz napajanja (W=watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Jezik:\n HR    Hrvatski",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_HU.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "HU",
     "languageLocalName": "Magyar",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Kalibráció\nkész!"
@@ -43,19 +43,19 @@
             "message": "DC túl alacsony"
         },
         "UndervoltageString": {
-            "message": "Alulfeszültség\n"
+            "message": "Alulfeszültség"
         },
         "InputVoltageString": {
-            "message": "Bemenet V: \n"
+            "message": "Bemenet V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Alvás...\n"
+            "message": "Alvás..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Hegy: \n"
+            "message": "Hegy:"
         },
         "OffString": {
             "message": "Ki"
@@ -119,10 +119,6 @@
             "displayText": "PD\nidőtúllépés",
             "description": "PD egyeztetés időkerete (kompatibilitás QC töltőkkel) (x 100ms)"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Boost\nhőmérséklet",
             "description": "Hőmérséklet \"boost\" módban"
@@ -211,10 +207,6 @@
             "displayText": "Részletes\nforrasztás infó",
             "description": "Részletes információk megjelenítése forrasztás közben"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Teljesítmény\nmaximum",
             "description": "Maximális felvett teljesitmény beállitása"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Nyelv:\n HU      Magyar",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_IT.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "IT",
     "languageLocalName": "Italiano",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibrazione\ncompletata!"
@@ -43,19 +43,19 @@
             "message": "DC BASSA"
         },
         "UndervoltageString": {
-            "message": "DC INSUFFICIENTE\n"
+            "message": "DC INSUFFICIENTE"
         },
         "InputVoltageString": {
-            "message": "V in: \n"
+            "message": "V in:"
         },
         "SleepingSimpleString": {
             "message": "Zzz "
         },
         "SleepingAdvancedString": {
-            "message": "Riposo\n"
+            "message": "Riposo"
         },
         "SleepingTipAdvancedString": {
-            "message": "Punta: \n"
+            "message": "Punta:"
         },
         "OffString": {
             "message": "OFF"
@@ -119,10 +119,6 @@
             "displayText": "Abilitazione\nUSB PD",
             "description": "Regola il massimo tempo utile per la negoziazione del protocollo USB Power Delivery con alimentatori compatibili [0: disattiva; multipli di 100 ms]"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-	    "description": "Abilita le modalità Power Delivery PPS ed EPR"
-        },
         "BoostTemperature": {
             "displayText": "Temp\nTurbo",
             "description": "Imposta la temperatura della funzione Turbo [°C/°F]"
@@ -211,10 +207,6 @@
             "displayText": "Dettagli\nsaldatura",
             "description": "Mostra informazioni dettagliate durante la modalità Saldatura"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Abilita BLE"
-        },
         "PowerLimit": {
             "displayText": "Limite\npotenza",
             "description": "Imposta il valore di potenza massima erogabile al saldatore [watt]"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Lingua:\n IT    Italiano",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "Bluetooth LE\nabilitato",
+            "description": ""
         }
     }
 }

Translations/translation_JA_JP.json

@@ -55,7 +55,7 @@
             "message": "Sleeping..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Tip: "
+            "message": "Tip:"
         },
         "OffString": {
             "message": "オフ"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "一部のQC電源との互換性のため、PDネゴシエーションをタイムアウトする時間 <x100ms（ミリ秒）>"
         },
-        "PDVpdo": {
-            "displayText": "PD VPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "ブースト温度",
             "description": "ブーストモードで使用される温度"
@@ -211,10 +207,6 @@
             "displayText": "詳細な作業画面",
             "description": "半田付け画面に詳細情報を表示する"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "電力制限",
             "description": "最大電力を制限する <W=ワット>"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "言語： 日本語",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_LT.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "LT",
     "languageLocalName": "Lietuvių",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -10,7 +10,7 @@
             "message": "Atstatyta"
         },
         "SettingsResetMessage": {
-            "message": "Nust. \natstatyti!"
+            "message": "Nust. atstatyti!"
         },
         "NoAccelerometerMessage": {
             "message": "Nerastas\nakselerometras!"
@@ -43,19 +43,19 @@
             "message": "MAŽ VOLT"
         },
         "UndervoltageString": {
-            "message": "Žema įtampa\n"
+            "message": "Žema įtampa"
         },
         "InputVoltageString": {
-            "message": "Įvestis V: \n"
+            "message": "Įvestis V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Miegu...\n"
+            "message": "Miegu..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Antg: \n"
+            "message": "Antg:"
         },
         "OffString": {
             "message": "Išj"
@@ -119,10 +119,6 @@
             "displayText": "PD\nlaikas",
             "description": "PD suderinimo laikas žingsniais po 100ms suderinamumui su kai kuriais QC įkrovikliais"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Turbo\ntemperat.",
             "description": "Temperatūra turbo režimu"
@@ -211,10 +207,6 @@
             "displayText": "Detalus lita-\nvimo ekranas",
             "description": "Ar rodyti išsamią informaciją lituojant"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Galios\nriba",
             "description": "Didžiausia galia, kurią gali naudoti lituoklis (Vatai)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Kalba:\n LT    Lietuvių",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_NB.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "NB",
     "languageLocalName": "Norsk bokmål",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "Lavspenn"
         },
         "UndervoltageString": {
-            "message": "Underspenning\n"
+            "message": "Underspenning"
         },
         "InputVoltageString": {
-            "message": "Innspenn.: \n"
+            "message": "Innspenn.: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Dvale...\n"
+            "message": "Dvale..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Spiss: \n"
+            "message": "Spiss:"
         },
         "OffString": {
             "message": "Av"
@@ -119,10 +119,6 @@
             "displayText": "PD-\ntidsavb.",
             "description": "PD-forhandlingstidsavbrudd i steg på 100 ms for kompatibilitet med noen QC-ladere"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "KTmp\n",
             "description": "Temperatur i \"kraft-modus\""
@@ -211,10 +207,6 @@
             "displayText": "AvLdSk\n",
             "description": "Vis detaljert informasjon ved lodding"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Effekt-\ngrense",
             "description": "Maks effekt jernet kan bruke (W=watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Språk:\n NB    Norsk bm",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_NL.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "NL",
     "languageLocalName": "Nederlands",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "DC Laag"
         },
         "UndervoltageString": {
-            "message": "Onderspanning\n"
+            "message": "Onderspanning"
         },
         "InputVoltageString": {
-            "message": "Voeding V: \n"
+            "message": "Voeding V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Slaapstand...\n"
+            "message": "Slaapstand..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Punt: \n"
+            "message": "Punt:"
         },
         "OffString": {
             "message": "Uit"
@@ -112,17 +112,13 @@
             "description": "Minimum toegestaan voltage per cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
         },
         "QCMaxVoltage": {
-            "displayText": "QC\nvoltage",
+            "displayText": "QC\nVoltage",
             "description": "Maximaal QC voltage dat gevraagd mag worden"
         },
         "PDNegTimeout": {
             "displayText": "PD\ntimeout",
             "description": "PD afstemmingsduur in stappen van 100ms (voor compatibiliteit met sommige QC laders)"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Boost\ntemp",
             "description": "Punt temperatuur in boostmode"
@@ -211,10 +207,6 @@
             "displayText": "Gedetailleerd\nsoldeerscherm",
             "description": "Gedetailleerde informatie weergeven in een kleiner lettertype op het soldeerscherm"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Vermogen\nlimiet",
             "description": "Maximaal vermogen (W=Watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Taal:\n NL  Nederlands",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_NL_BE.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "NL_BE",
     "languageLocalName": "Vlaams",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "Voedingsspanning LAAG"
         },
         "UndervoltageString": {
-            "message": "Onderspanning\n"
+            "message": "Onderspanning"
         },
         "InputVoltageString": {
-            "message": "Voedingsspanning: \n"
+            "message": "Voedingsspanning: "
         },
         "SleepingSimpleString": {
             "message": "Zzz "
         },
         "SleepingAdvancedString": {
-            "message": "Slaapstand...\n"
+            "message": "Slaapstand..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Punt: \n"
+            "message": "Punt:"
         },
         "OffString": {
             "message": "Uit"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Verhogings\ntemp",
             "description": "Verhogingstemperatuur"
@@ -211,10 +207,6 @@
             "displayText": "Gedetailleerd\nsoldeerscherm",
             "description": "Gedetailleerde informatie in kleiner lettertype in soldeerscherm."
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Maximum power the iron can use (W=watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Spraak:\n NL_BE   Vlaams",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_PL.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "PL",
     "languageLocalName": "Polski",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Kalibracja\nwykonana!"
@@ -10,7 +10,7 @@
             "message": "Reset OK"
         },
         "SettingsResetMessage": {
-            "message": "Ust. \nzresetowane"
+            "message": "Ust. zresetowane"
         },
         "NoAccelerometerMessage": {
             "message": "Nie rozpoznano\nakcelerometru!"
@@ -43,19 +43,19 @@
             "message": "NIS. NAP"
         },
         "UndervoltageString": {
-            "message": "Zbyt niskie nap.\n"
+            "message": "Zbyt niskie nap."
         },
         "InputVoltageString": {
-            "message": "Nap. wej.: \n"
+            "message": "Nap. wej.:"
         },
         "SleepingSimpleString": {
             "message": "Zzz!"
         },
         "SleepingAdvancedString": {
-            "message": "Tr. uśpienia\n"
+            "message": "Tr. uśpienia"
         },
         "SleepingTipAdvancedString": {
-            "message": "Grot: \n"
+            "message": "Grot:"
         },
         "OffString": {
             "message": "Wył"
@@ -86,7 +86,7 @@
             "description": ""
         },
         "SolderingMenu": {
-            "displayText": "Lutowanie\n",
+            "displayText": "Lutowanie",
             "description": ""
         },
         "PowerSavingMenu": {
@@ -119,10 +119,6 @@
             "displayText": "Limit czasu\nPD",
             "description": "Limit czasu negocjacji PD w krokach co 100 ms dla zgodności z niektórymi ładowarkami QC (0: wyłączone)"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Włącza tryby PPS & EPR."
-        },
         "BoostTemperature": {
             "displayText": "Temp.\nboost",
             "description": "Temperatura w trybie \"boost\" "
@@ -211,10 +207,6 @@
             "displayText": "Sz. inf. w\ntr. lutowania",
             "description": "Wyświetl szczegółowe informacje w trybie lutowania"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Ogr.\nmocy",
             "description": "Maksymalna moc (W), jakiej może użyć lutownica"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Język:\n PL      Polski",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_PT.json

@@ -1,40 +1,40 @@
 {
     "languageCode": "PT",
     "languageLocalName": "Português",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
-            "message": "Calibração\nefetuada!"
+            "message": "Calibration\ndone!"
         },
         "ResetOKMessage": {
             "message": "Reset OK"
         },
         "SettingsResetMessage": {
-            "message": "Algumas configurações\nforam alteradas!"
+            "message": "Certain settings\nwere changed!"
         },
         "NoAccelerometerMessage": {
-            "message": "Acelerómetro não\ndetectado!"
+            "message": "No accelerometer\ndetected!"
         },
         "NoPowerDeliveryMessage": {
-            "message": "USB-PD IC não\ndetectado!"
+            "message": "No USB-PD IC\ndetected!"
         },
         "LockingKeysString": {
-            "message": "Bloqueado"
+            "message": "LOCKED"
         },
         "UnlockingKeysString": {
-            "message": "Desbloqueado"
+            "message": "UNLOCKED"
         },
         "WarningKeysLockedString": {
-            "message": "!Bloqueado!"
+            "message": "!LOCKED!"
         },
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
         "SettingsCalibrationWarning": {
-            "message": "Antes de reninciar certifique-se que o ferro est à temperatura ambiente!"
+            "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
         "CJCCalibrating": {
-            "message": "calibrar\n"
+            "message": "calibrating\n"
         },
         "SettingsResetWarning": {
             "message": "Definições de fábrica?"
@@ -43,25 +43,25 @@
             "message": "DC BAIXO"
         },
         "UndervoltageString": {
-            "message": "Subtensão\n"
+            "message": "Subtensão"
         },
         "InputVoltageString": {
-            "message": "Tensão: \n"
+            "message": "Tensão "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Repouso...\n"
+            "message": "Repouso..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Ponta: \n"
+            "message": "Ponta:"
         },
         "OffString": {
             "message": "Off"
         },
         "DeviceFailedValidationWarning": {
-            "message": "Seu dispositivo provavelmente é falsificado!"
+            "message": "Your device is most likely a counterfeit!"
         }
     },
     "characters": {
@@ -82,7 +82,7 @@
     },
     "menuGroups": {
         "PowerMenu": {
-            "displayText": "Configurações de\nenergia",
+            "displayText": "Power\nsettings",
             "description": ""
         },
         "SolderingMenu": {
@@ -108,47 +108,43 @@
             "description": "Fonte de alimentação. Define a tensão de corte. (DC=10V) (S=3.3V/célula)"
         },
         "MinVolCell": {
-            "displayText": "Tensão\nmínima",
+            "displayText": "Minimum\nvoltage",
-            "description": "Tensão mínima permitida por célula de bateria (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+            "description": "Minimum allowed voltage per battery cell (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
         },
         "QCMaxVoltage": {
             "displayText": "Potência\nFonte",
             "description": "Potência da fonte usada (Watt)"
         },
         "PDNegTimeout": {
-            "displayText": "PD tempo\nlimite",
+            "displayText": "PD\ntimeout",
-            "description": "Tempo limite de negoiciação de PD de 100ms para compatibilidade com alguns carregadores é (0: disabled)"
+            "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers (0: disabled)"
-        },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Activa o modo PPS & EPR"
         },
         "BoostTemperature": {
             "displayText": "Modo turbo\ntemperat.",
             "description": "Ajuste de temperatura do \"modo turbo\""
         },
         "AutoStart": {
-            "displayText": "Aquecimento\nautomático",
+            "displayText": "Partida\nautomática",
             "description": "Aquece a ponta automaticamente ao ligar (D=desligar | S=soldagem | H=hibernar | A=hibernar temp. ambiente)"
         },
         "TempChangeShortStep": {
-            "displayText": "Temp mudança\ncurta",
+            "displayText": "Temp change\nshort",
-            "description": "A temperatura será aumentada com um click curto"
+            "description": "Temperature-change-increment on short button press"
         },
         "TempChangeLongStep": {
-            "displayText": "Temp mudança\nlonga",
+            "displayText": "Temp change\nlong",
-            "description": "A temperatura será aumentada com um click longo"
+            "description": "Temperature-change-increment on long button press"
         },
         "LockingMode": {
-            "displayText": "Permitir bloquear\nbutões",
+            "displayText": "Allow locking\nbuttons",
-            "description": "Durante a solda primir os dois butões para alternar entre (D=disativas | B=boost mode | F=bloqueio total)"
+            "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
         },
         "MotionSensitivity": {
             "displayText": "Sensibilidade\nmovimento",
             "description": "Sensibilidade ao movimento (0=Desligado | 1=Menor | ... | 9=Maior)"
         },
         "SleepTemperature": {
-            "displayText": "Temperatura\nrepouso",
+            "displayText": "Temperat.\nrepouso",
             "description": "Temperatura de repouso (C)"
         },
         "SleepTimeout": {
@@ -156,20 +152,20 @@
             "description": "Tempo para repouso (Minutos | Segundos)"
         },
         "ShutdownTimeout": {
-            "displayText": "Tempo\ndesligar",
+            "displayText": "Tempo\ndesligam.",
-            "description": "Tempo para desligar (Minutos)"
+            "description": "Tempo para desligamento (Minutos)"
         },
         "HallEffSensitivity": {
-            "displayText": "Sensibilidade de\nmagentismo",
+            "displayText": "Hall sensor\nsensitivity",
-            "description": "Sensibilidade de magnetismo (0=Desligado | 1=Menor | ... | 9=Maior)"
+            "description": "Sensitivity to magnets (0=Desligado | 1=Menor | ... | 9=Maior)"
         },
         "TemperatureUnit": {
             "displayText": "Unidade\ntemperatura",
             "description": "Unidade de temperatura (C=Celsius | F=Fahrenheit)"
         },
         "DisplayRotation": {
-            "displayText": "Orientação\necrã",
+            "displayText": "Orientação\ntela",
-            "description": "Orientação do ecrã (D=estro | C=anhoto | A=utomática)"
+            "description": "Orientação da tela (D=estro | C=anhoto | A=utomática)"
         },
         "CooldownBlink": {
             "displayText": "Piscar ao\narrefecer",
@@ -177,75 +173,75 @@
         },
         "ScrollingSpeed": {
             "displayText": "Velocidade\ntexto ajuda",
-            "description": "Velocidade a que o texto é mostrado"
+            "description": "Velocidade a que o texto é exibido"
         },
         "ReverseButtonTempChange": {
-            "displayText": "Mudar\n+ - teclas",
+            "displayText": "Swap\n+ - keys",
-            "description": "Inverter o alinhamento dos butões para ajudar a temperatura"
+            "description": "Reverse assignment of buttons for temperature adjustment"
         },
         "AnimSpeed": {
-            "displayText": "Velocidade de\nanimação",
+            "displayText": "Anim.\nspeed",
-            "description": "Sitio das animações no menu (O=off | S=lentas | M=medias | F=rapidas)"
+            "description": "Pace of icon animations in menu (O=off | S=slow | M=medium | F=fast)"
         },
         "AnimLoop": {
-            "displayText": "Repetir\nanimações",
+            "displayText": "Anim.\nloop",
-            "description": "Repetir icon de animações no ecrã principal"
+            "description": "Loop icon animations in main menu"
         },
         "Brightness": {
             "displayText": "Screen\nbrightness",
-            "description": "Ajustar o brilho do ecrã OLED"
+            "description": "Adjust the OLED screen brightness"
         },
         "ColourInversion": {
-            "displayText": "Inverter\necrã",
+            "displayText": "Invert\nscreen",
-            "description": "Inverter as cores do ecrã OLED"
+            "description": "Invert the OLED screen colors"
         },
         "LOGOTime": {
-            "displayText": "Duração do\nlogo no arranque",
+            "displayText": "Boot logo\nduration",
-            "description": "Definir a duração do logotipo no arranque em (s=segundos)"
+            "description": "Set boot logo duration (s=seconds)"
         },
         "AdvancedIdle": {
-            "displayText": "Ecrã repouso\navançada",
+            "displayText": "Tela repouso\navançada",
-            "description": "Mostra informações avançadas quando em espera"
+            "description": "Exibe informações avançadas quando em espera"
         },
         "AdvancedSoldering": {
-            "displayText": "Ecrã trabalho\navançado",
+            "displayText": "Tela trabalho\navançada",
-            "description": "Mostra informações avançadas durante o uso"
+            "description": "Exibe informações avançadas durante o uso"
-        },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
         },
         "PowerLimit": {
-            "displayText": "Limite de\npotência",
+            "displayText": "Power\nlimit",
-            "description": "Potência máxima a usar (W=watt)"
+            "description": "Maximum power the iron can use (W=watt)"
         },
         "CalibrateCJC": {
-            "displayText": "Calibrar CJC\nno prozimo arranque",
+            "displayText": "Calibrate CJC\nat next boot",
-            "description": "No próximo arranque CJC será calibrada  (não será necessário caso o Delta T seja < 5°C)"
+            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
         },
         "VoltageCalibration": {
             "displayText": "Calibrar\ntensão",
             "description": "Calibra a tensão de alimentação. Use os botões para ajustar o valor. Mantenha pressionado para sair"
         },
         "PowerPulsePower": {
-            "displayText": "Potência\ndo pulso",
+            "displayText": "Power\npulse",
-            "description": "Intensidade de potência de arranque (W=watt)"
+            "description": "Intensity of power of keep-awake-pulse (W=watt)"
         },
         "PowerPulseWait": {
-            "displayText": "Espera do\npulso",
+            "displayText": "Power pulse\ndelay",
-            "description": "Espera entre o acordar e o envio da rectivação (x 2.5s)"
+            "description": "Delay before keep-awake-pulse is triggered (x 2.5s)"
         },
         "PowerPulseDuration": {
-            "displayText": "Duração\npulso",
+            "displayText": "Power pulse\nduration",
-            "description": "Manter os inplosus de rectivação em (x 250ms)"
+            "description": "Keep-awake-pulse duration (x 250ms)"
         },
         "SettingsReset": {
             "displayText": "Reset de\nfábrica?",
-            "description": "Repôe todos os ajustes"
+            "description": "Reverte todos ajustes"
         },
         "LanguageSwitch": {
             "displayText": "Idioma:\n PT   Português",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_RO.json

@@ -13,7 +13,7 @@
             "message": "Setările au fost\nresetate!"
         },
         "NoAccelerometerMessage": {
-            "message": "Fără accelerometru\ndetectat!"
+            "message": "Nu accelerometru\ndetectat!"
         },
         "NoPowerDeliveryMessage": {
             "message": "Fără USB-PD IC\ndetectat!"
@@ -28,40 +28,40 @@
             "message": "!BLOCAT!"
         },
         "WarningThermalRunaway": {
-            "message": "Încălzire\nEşuată"
+            "message": "Incalzire\nEsuata"
         },
         "SettingsCalibrationWarning": {
-            "message": "Înainte de repornire, asiguraţi-vă că vârful şi mânerul sunt la temperatura camerei!"
+            "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
         "CJCCalibrating": {
-            "message": "calibrare\n"
+            "message": "calibrating\n"
         },
         "SettingsResetWarning": {
-            "message": "Sigur doriţi să restauraţi la setările implicite?"
+            "message": "Sigur doriti să restaurati la setările implicite?"
         },
         "UVLOWarningString": {
-            "message": "DC SCĂZUT"
+            "message": "DC LOW"
         },
         "UndervoltageString": {
-            "message": "Voltaj scăzut\n"
+            "message": "Sub tensiune"
         },
         "InputVoltageString": {
-            "message": "Intrare V: \n"
+            "message": "Intrare V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Adormit...\n"
+            "message": "Adormit..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Tip: \n"
+            "message": "Tip:"
         },
         "OffString": {
             "message": "Nu"
         },
         "DeviceFailedValidationWarning": {
-            "message": "Dispozitivul dvs. este cel mai probabil un fals!"
+            "message": "Your device is most likely a counterfeit!"
         }
     },
     "characters": {
@@ -94,18 +94,18 @@
             "description": ""
         },
         "UIMenu": {
-            "displayText": "Interfaţă\nutilizator",
+            "displayText": "Interfată\nutilizator",
             "description": ""
         },
         "AdvancedMenu": {
-            "displayText": "Opţiuni\navansate",
+            "displayText": "Optiuni\navansate",
             "description": ""
         }
     },
     "menuOptions": {
         "DCInCutoff": {
             "displayText": "Sursa de\nalimentare",
-            "description": "Sursa de alimentare. Setează tensiunea de întrerupere. (DC 10V) (S 3.3V per celulă, dezactivaţi limita de alimentare)"
+            "description": "Sursa de alimentare. Setează tensiunea de întrerupere. (DC 10V) (S 3.3V per celulă, dezactivati limita de alimentare)"
         },
         "MinVolCell": {
             "displayText": "Voltaj\nminim",
@@ -117,15 +117,11 @@
         },
         "PDNegTimeout": {
             "displayText": "PD\ntimeout",
-            "description": "Timp limită de negociere pentru tranzacţia PD, în paşi de 100ms, pentru compatibilitate cu alimentatoarele QC"
+            "description": "Timp limita de negociere pentru tranzactia PD, in pasi de 100ms, pentru compatibilitate cu alimentatoarele QC"
-        },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
         },
         "BoostTemperature": {
-            "displayText": "Modifică\ntemp. impuls",
+            "displayText": "Boost\ntemp",
-            "description": "Temperatura utilizată în \"modul de impuls\""
+            "description": "Temperatura utilizată în \"modul boost\""
         },
         "AutoStart": {
             "displayText": "Auto\nstart",
@@ -141,11 +137,11 @@
         },
         "LockingMode": {
             "displayText": "Blocare\nbutoane",
-            "description": "Când lipiţi, apăsaţi lung ambele butoane, pentru a le bloca (D=dezactivare | B=numai \"modul boost\" | F=blocare completă)"
+            "description": "Când lipiti, apăsati lung ambele butoane, pentru a le bloca (D=dezactivare | B=numai \"modul boost\" | F=blocare completă)"
         },
         "MotionSensitivity": {
             "displayText": "Sensibilitate\nla miscare",
-            "description": "Sensibilitate senzor miscare (0=oprit | 1=puţin sensibil | ... | 9=cel mai sensibil)"
+            "description": "Sensibilitate senzor miscare (0=oprit | 1=putin sensibil | ... | 9=cel mai sensibil)"
         },
         "SleepTemperature": {
             "displayText": "Temp\nrepaus",
@@ -172,8 +168,8 @@
             "description": "R=dreptaci | L=stângaci | A=auto"
         },
         "CooldownBlink": {
-            "displayText": "Clipeşte\nla răcire",
+            "displayText": "Clipeste\nla răcire",
-            "description": "Clipeşte temperatura după oprirea încălzirii, în timp ce vârful este încă fierbinte"
+            "description": "Clipeste temperatura după oprirea încălzirii, în timp ce vârful este încă fierbinte"
         },
         "ScrollingSpeed": {
             "displayText": "Viteză\nderulare",
@@ -184,36 +180,32 @@
             "description": "Inversarea butoanelor de reglare a temperaturii"
         },
         "AnimSpeed": {
-            "displayText": "Animaţii\nviteză",
+            "displayText": "Animatii\nviteză",
-            "description": "Ritmul animaţiilor pictogramei din meniu (O=oprit | Î=încet | M=mediu | R=rapid)"
+            "description": "Ritmul animatiilor pictogramei din meniu (O=oprit | Î=încet | M=mediu | R=rapid)"
         },
         "AnimLoop": {
-            "displayText": "Animaţii\nbuclă",
+            "displayText": "Animatii\nbuclă",
-            "description": "Animaţii de pictograme în meniul principal"
+            "description": "Animatii de pictograme în meniul principal"
         },
         "Brightness": {
             "displayText": "Ecranului\nluminozitatea",
             "description": "Ajusteaza luminozitatea ecranului"
         },
         "ColourInversion": {
-            "displayText": "Inversează\nculoarea",
+            "displayText": "Inverseaza\nculoarea",
-            "description": "Inversează culoarea ecranului"
+            "description": "Inverseaza culoarea ecranului"
         },
         "LOGOTime": {
             "displayText": "Durată\nlogo încărcare",
-            "description": "Setaţi durată logo de pornire (s=secunde)"
+            "description": "Setati durata logo de pornire (s=secunde)"
         },
         "AdvancedIdle": {
             "displayText": "Detalii,\necran inactiv",
-            "description": "Afisaţi informaţii detaliate într-un font mai mic pe ecranul de repaus"
+            "description": "Afisati informatii detaliate într-un font mai mic pe ecranul de repaus"
         },
         "AdvancedSoldering": {
             "displayText": "Detalii\necran lipire",
-            "description": "Afisaţi informaţii detaliate într-un font mai mic pe ecranul de lipire"
+            "description": "Afisati informatii detaliate într-un font mai mic pe ecranul de lipire"
-        },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Activează BLE"
         },
         "PowerLimit": {
             "displayText": "Putere\nlimită",
@@ -221,15 +213,15 @@
         },
         "CalibrateCJC": {
             "displayText": "Calibrare CJC\nla următoarea pornire",
-            "description": "La următorul vârf de pornire, compensarea joncţiunii reci va fi calibrată (nu este necesară dacă Delta T este < 5°C)"
+            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
         },
         "VoltageCalibration": {
             "displayText": "Calibrare tens.\nde intrare?",
-            "description": "Porniţi calibrarea VIN (apăsaţi lung pentru a ieşi)"
+            "description": "Porniti calibrarea VIN (apăsati lung pentru a iesi)"
         },
         "PowerPulsePower": {
             "displayText": "Putere\npuls",
-            "description": "Puterea pulsului de menţinere activă a blocului de alimentare (watt)"
+            "description": "Puterea pulsului de mentinere activa a blocului de alimentare (watt)"
         },
         "PowerPulseWait": {
             "displayText": "Întârziere\npuls putere",
@@ -237,15 +229,19 @@
         },
         "PowerPulseDuration": {
             "displayText": "Durată\npuls putere",
-            "description": "Durata pulsului de menţinere (x 250ms)"
+            "description": "Durata pulsului de mentinere (x 250ms)"
         },
         "SettingsReset": {
             "displayText": "Setări\ndin fabrică",
-            "description": "Reveniţi la setările din fabrică"
+            "description": "Reveniti la setările din fabrică"
         },
         "LanguageSwitch": {
             "displayText": "Limbă:\n RO      Română",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_RU.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "RU",
     "languageLocalName": "Русский",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Калибровка\nзавершена!"
@@ -28,7 +28,7 @@
             "message": "!ЗАБЛОК!"
         },
         "WarningThermalRunaway": {
-            "message": "Неуправляемый\nРазогрев"
+            "message": "Thermal\nRunaway"
         },
         "SettingsCalibrationWarning": {
             "message": "Пожалуйста, убедитесь, что жало и корпус имеют комнатную температуру при следующей загрузке!"
@@ -43,19 +43,19 @@
             "message": "НАПРЯЖ--"
         },
         "UndervoltageString": {
-            "message": "Низ. напряжение\n"
+            "message": "Низ. напряжение"
         },
         "InputVoltageString": {
-            "message": "Питание В: \n"
+            "message": "Питание В: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Ожидание...\n"
+            "message": "Ожидание..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Жало: \n"
+            "message": "Жало:"
         },
         "OffString": {
             "message": "Вык"
@@ -119,10 +119,6 @@
             "displayText": "PD\nтайм-аут",
             "description": "Power Delivery тайм-аут согласования с шагом 100 мс для совместимости с некоторыми быстрыми зарядными QC (0: отключено)"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Включает режимы PPS & EPR."
-        },
         "BoostTemperature": {
             "displayText": "t° турбо\nрежима",
             "description": "Температура жала в турбо-режиме"
@@ -211,10 +207,6 @@
             "displayText": "Подробный\nэкран пайки",
             "description": "Показывать детальную информацию на экране пайки"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Предел\nмощности",
             "description": "Максимальная мощность, которую может использовать паяльник (Ватт)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Язык:\n RU     Русский",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_SK.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "SK",
     "languageLocalName": "Slovenčina",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "Nízke U!"
         },
         "UndervoltageString": {
-            "message": "Nízke napätie\n"
+            "message": "Nízke napätie"
         },
         "InputVoltageString": {
-            "message": "Vstupné U: \n"
+            "message": "Vstupné U: "
         },
         "SleepingSimpleString": {
             "message": "Chrr"
         },
         "SleepingAdvancedString": {
-            "message": "Pokojový režim.\n"
+            "message": "Pokojový režim."
         },
         "SleepingTipAdvancedString": {
-            "message": "Hrot: \n"
+            "message": "Hrot:"
         },
         "OffString": {
             "message": "Vyp"
@@ -119,10 +119,6 @@
             "displayText": "Čas vypršania\nPower Delivery",
             "description": "Čas vyjednávania Power Delivery v 100ms krokoch pre kompatibilitu s niektorými QC nabíjačkami (0: vypnuté)"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Boost\nteplota",
             "description": "Cieľová teplota pre prudký náhrev (v nastavených jednotkách)"
@@ -211,10 +207,6 @@
             "displayText": "Detaily počas\nspájkovania",
             "description": "Zobrazenie detailov počas spájkovania"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Obmedzenie\nvýkonu",
             "description": "Obmedzenie výkonu podľa použitého zdroja (watt)"
@@ -236,7 +228,7 @@
             "description": "Interval medzi impulzami udržujúcimi napájací zdroj zapnutý (x 2.5s)"
         },
         "PowerPulseDuration": {
-            "displayText": "Dĺžka\nimpulzu",
+            "displayText": "Dĺžka impulzu",
             "description": "Dĺžka impulzu udržujúci napájací zdroj zapnutý (x 250ms)"
         },
         "SettingsReset": {
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Jazyk:\n SK  Slovenčina",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_SL.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "SL",
     "languageLocalName": "Slovenščina",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "NIZKA U"
         },
         "UndervoltageString": {
-            "message": "Nizka napetost\n"
+            "message": "Nizka napetost"
         },
         "InputVoltageString": {
-            "message": "Vhodna U: \n"
+            "message": "Vhodna U: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Spim...\n"
+            "message": "Spim..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Konica \n"
+            "message": "Konica"
         },
         "OffString": {
             "message": "Off"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Pospešena\ntemp.",
             "description": "Temperatura v pospešenem načinu"
@@ -211,10 +207,6 @@
             "displayText": "Več info na\nzaslonu spaj.",
             "description": "Prikaže več informacij z manjšo pisavo na zaslonu med spajkanjem."
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Meja\nmoči",
             "description": "Največja dovoljena moč v vatih [W]"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Jezik:\n SL Slovenščina",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_SR_CYRL.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "SR_CYRL",
     "languageLocalName": "Српски",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "НИЗ.НАП."
         },
         "UndervoltageString": {
-            "message": "ПРЕНИЗАК НАПОН\n"
+            "message": "ПРЕНИЗАК НАПОН"
         },
         "InputVoltageString": {
-            "message": "Ул. напон: \n"
+            "message": "Ул. напон: "
         },
         "SleepingSimpleString": {
             "message": "Сан"
         },
         "SleepingAdvancedString": {
-            "message": "Спавање...\n"
+            "message": "Спавање..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Врх: \n"
+            "message": "Врх:"
         },
         "OffString": {
             "message": "Иск"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Темп.\nпојачања",
             "description": "Температура врха лемилице у току појачања."
@@ -211,10 +207,6 @@
             "displayText": "Детаљи током\nлемљења",
             "description": "Приказивање детаљних информација на екрану током лемљења."
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Maximum power the iron can use (W=watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Jезик:\n SR      Српски",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_SR_LATN.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "SR_LATN",
     "languageLocalName": "Srpski",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "NIZ.NAP."
         },
         "UndervoltageString": {
-            "message": "PRENIZAK NAPON\n"
+            "message": "PRENIZAK NAPON"
         },
         "InputVoltageString": {
-            "message": "Ul. napon: \n"
+            "message": "Ul. napon: "
         },
         "SleepingSimpleString": {
             "message": "Zzz"
         },
         "SleepingAdvancedString": {
-            "message": "Spavanje...\n"
+            "message": "Spavanje..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Vrh: \n"
+            "message": "Vrh:"
         },
         "OffString": {
             "message": "Isk"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Temp.\npojačanja",
             "description": "Temperatura vrha lemilice u toku pojačanja."
@@ -211,10 +207,6 @@
             "displayText": "Detalji tokom\nlemljenja",
             "description": "Prikazivanje detaljnih informacija na ekranu tokom lemljenja."
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Maximum power the iron can use (W=watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Jezik:\n SR      Srpski",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_SV.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "SV",
     "languageLocalName": "Svenska",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "DC LÅG"
         },
         "UndervoltageString": {
-            "message": "Underspänning\n"
+            "message": "Underspänning"
         },
         "InputVoltageString": {
-            "message": "Inspän. V: \n"
+            "message": "Inspän. V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Viloläge...\n"
+            "message": "Viloläge..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Spets: \n"
+            "message": "Spets:"
         },
         "OffString": {
             "message": "Av"
@@ -119,10 +119,6 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Turbo-\ntemp",
             "description": "Temperatur i \"turbo-läge\""
@@ -211,10 +207,6 @@
             "displayText": "Detaljerad\nlödng.skärm",
             "description": "Visa detaljerad information vid lödning"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Max-\neffekt",
             "description": "Maximal effekt som enheten kan använda (Watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Språk:\n SV     Svenska",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_TR.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "TR",
     "languageLocalName": "Türkçe",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "Güç Az"
         },
         "UndervoltageString": {
-            "message": "Düşük Voltaj\n"
+            "message": "Düşük Voltaj"
         },
         "InputVoltageString": {
-            "message": "Giriş V: \n"
+            "message": "Giriş V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Bekleme Modu...\n"
+            "message": "Bekleme Modu ..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Uç: \n"
+            "message": "Uç:"
         },
         "OffString": {
             "message": "Kapalı"
@@ -104,7 +104,7 @@
     },
     "menuOptions": {
         "DCInCutoff": {
-            "displayText": "GÇKYN\n",
+            "displayText": "GÇKYN",
             "description": "\"Güç Kaynağı\". En düşük çalışma voltajını ayarlar. (DC 10V) (S 3.3V hücre başına)"
         },
         "MinVolCell": {
@@ -119,16 +119,12 @@
             "displayText": "PD\ntimeout",
             "description": "PD negotiation timeout in 100ms steps for compatibility with some QC chargers"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
-            "displayText": "YKSC\n",
+            "displayText": "YKSC",
             "description": "Yüksek Performans Modu Sıcaklığı"
         },
         "AutoStart": {
-            "displayText": "OTOBAŞ\n",
+            "displayText": "OTOBAŞ",
             "description": "Güç verildiğinde otomatik olarak lehimleme modunda başlat. (K=Kapalı | L=Lehimleme Modu | U=Uyku Modu | S=Uyku Modu Oda Sıcaklığı)"
         },
         "TempChangeShortStep": {
@@ -144,19 +140,19 @@
             "description": "While soldering, hold down both buttons to toggle locking them (K=Kapalı | B=boost mode only | F=full locking)"
         },
         "MotionSensitivity": {
-            "displayText": "HARHAS\n",
+            "displayText": "HARHAS",
             "description": "Hareket Hassasiyeti (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"
         },
         "SleepTemperature": {
-            "displayText": "BKSC\n",
+            "displayText": "BKSC",
             "description": "Bekleme Modu Sıcaklığı (C)"
         },
         "SleepTimeout": {
-            "displayText": "BMZA\n",
+            "displayText": "BMZA",
             "description": "Bekleme Modu Zaman Aşımı (Dakika | Saniye)"
         },
         "ShutdownTimeout": {
-            "displayText": "KPTZA\n",
+            "displayText": "KPTZA",
             "description": "Kapatma Zaman Aşımı (Dakika)"
         },
         "HallEffSensitivity": {
@@ -164,19 +160,19 @@
             "description": "Sensitivity to magnets (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"
         },
         "TemperatureUnit": {
-            "displayText": "SCKBRM\n",
+            "displayText": "SCKBRM",
             "description": "Sıcaklık Birimi (C=Celsius | F=Fahrenheit)"
         },
         "DisplayRotation": {
-            "displayText": "GRNYÖN\n",
+            "displayText": "GRNYÖN",
             "description": "Görüntü Yönlendirme (R=Sağlak | L=Solak | O=Otomatik)"
         },
         "CooldownBlink": {
-            "displayText": "SĞGÖST\n",
+            "displayText": "SĞGÖST",
             "description": "Soğutma ekranında uç hala sıcakken derece gösterilsin."
         },
         "ScrollingSpeed": {
-            "displayText": "YZKYHZ\n",
+            "displayText": "YZKYHZ",
             "description": "Bu yazının kayma hızı (Y=Yavaş | H=Hızlı)"
         },
         "ReverseButtonTempChange": {
@@ -204,17 +200,13 @@
             "description": "Set boot logo duration (s=seconds)"
         },
         "AdvancedIdle": {
-            "displayText": "AYRBİL\n",
+            "displayText": "AYRBİL",
             "description": "Boş ekranda ayrıntılı bilgileri daha küçük bir yazı tipi ile göster."
         },
         "AdvancedSoldering": {
-            "displayText": "GELLHM\n",
+            "displayText": "GELLHM",
             "description": "\"Gelişmiş Lehimleme\" Lehimleme yaparken detaylı bilgi göster"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Power\nlimit",
             "description": "Havyanın kullanacağı en yüksek güç (W=Watts)"
@@ -224,7 +216,7 @@
             "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
         },
         "VoltageCalibration": {
-            "displayText": "VOL KAL?\n",
+            "displayText": "VOL KAL?",
             "description": "Voltaj Girişi Kalibrasyonu. Düğmeler ayarlar, çıkmak için uzun bas."
         },
         "PowerPulsePower": {
@@ -240,12 +232,16 @@
             "description": "Keep-awake-pulse duration (x 250ms)"
         },
         "SettingsReset": {
-            "displayText": "SIFIRLA?\n",
+            "displayText": "SIFIRLA?",
             "description": "Bütün ayarları sıfırlar"
         },
         "LanguageSwitch": {
             "displayText": "Dil:\n TR      Türkçe",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_UK.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "UK",
     "languageLocalName": "Українська",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "КХС\nвідкалібровано!"
@@ -43,19 +43,19 @@
             "message": "АККУМ--"
         },
         "UndervoltageString": {
-            "message": "Низька напруга\n"
+            "message": "Низька напруга"
         },
         "InputVoltageString": {
-            "message": "Жив.(B): \n"
+            "message": "Жив.(B): "
         },
         "SleepingSimpleString": {
             "message": "ZzZzz"
         },
         "SleepingAdvancedString": {
-            "message": "Очікування...\n"
+            "message": "Очікування..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Жало: \n"
+            "message": "Жало:"
         },
         "OffString": {
             "message": "Вимк"
@@ -119,10 +119,6 @@
             "displayText": "PD\nзатримка",
             "description": "Затримка у 100мс інкрементах для PD для сумісності з деякими QC зарядними пристроями (0: вимкнено)"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Вмикає режими PPS & EPR."
-        },
         "BoostTemperature": {
             "displayText": "Темпер.\nТурбо",
             "description": "Температура в \"Турбо\" режимі"
@@ -211,10 +207,6 @@
             "displayText": "Детальний\nрежим пайки",
             "description": "Показувати детальну інформацію при пайці."
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Макс.\nпотуж.",
             "description": "Макс. потужність, яку може використовувати паяльник (Ват)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Мова:\n UK  Українська",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_VI.json

@@ -1,7 +1,7 @@
 {
     "languageCode": "VI",
     "languageLocalName": "Tieng Viet",
-    "tempUnitFahrenheit": false,
+    "tempUnitFahrenheit": true,
     "messagesWarn": {
         "CJCCalibrationDone": {
             "message": "Calibration\ndone!"
@@ -43,19 +43,19 @@
             "message": "DC thap"
         },
         "UndervoltageString": {
-            "message": "Đien áp thap\n"
+            "message": "Đien áp thap"
         },
         "InputVoltageString": {
-            "message": "Đau vào V: \n"
+            "message": "Đau vào V: "
         },
         "SleepingSimpleString": {
             "message": "Zzzz"
         },
         "SleepingAdvancedString": {
-            "message": "Đang ngu...\n"
+            "message": "Đang ngu..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Meo: \n"
+            "message": "Meo:"
         },
         "OffString": {
             "message": "Tat"
@@ -119,10 +119,6 @@
             "displayText": "PD\nsau",
             "description": "Thoi gian cho đàm phán PD trong các buoc 100ms đe tuong thích voi mot so bo sac QC"
         },
-        "PDVpdo": {
-            "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "Tăng\nnhiet đo",
             "description": "Nhiet đo dùng trong che đo \"tăng cuong\""
@@ -211,10 +207,6 @@
             "displayText": "Chi tiet\nmàn hình hàn",
             "description": "-Hien thi thông tin bang phông chu nho hon trên màn hình hàn"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "Công suat\ngioi han",
             "description": "-Công suat toi đa mà tay hàn có the su dung (W=watt)"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "Ngôn ngu:\n VI  Tieng Viet",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_YUE_HK.json

@@ -34,7 +34,7 @@
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
         "CJCCalibrating": {
-            "message": "calibrating"
+            "message": "calibrating\n"
         },
         "SettingsResetWarning": {
             "message": "你係咪確定要將全部設定重設到預設值？"
@@ -55,7 +55,7 @@
             "message": "Sleeping..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Tip: "
+            "message": "Tip:"
         },
         "OffString": {
             "message": "關"
@@ -119,10 +119,6 @@
             "displayText": "PD逾時",
             "description": "設定USB PD協定交涉嘅逾時時限；為兼容某啲QC電源而設 <x100ms（亳秒）>"
         },
-        "PDVpdo": {
-            "displayText": "PD VPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "增熱温度",
             "description": "喺增熱模式時使用嘅温度"
@@ -211,10 +207,6 @@
             "displayText": "詳細焊接畫面",
             "description": "喺焊接模式畫面以英文細字顯示詳細嘅資料"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "功率限制",
             "description": "限制焫雞可用嘅最大功率 <W=watt（火）>"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "語言： 廣東話",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_ZH_CN.json

@@ -34,7 +34,7 @@
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
         "CJCCalibrating": {
-            "message": "calibrating"
+            "message": "calibrating\n"
         },
         "SettingsResetWarning": {
             "message": "你是否确定要将全部设定重置为默认值？"
@@ -55,7 +55,7 @@
             "message": "Zzzz..."
         },
         "SleepingTipAdvancedString": {
-            "message": "<--- "
+            "message": "--->"
         },
         "OffString": {
             "message": "关"
@@ -119,10 +119,6 @@
             "displayText": "PD超时",
             "description": "设定USB-PD协议交涉的超时时限；为兼容某些QC电源而设 <x100ms（亳秒）>"
         },
-        "PDVpdo": {
-            "displayText": "PD VPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "增热温度",
             "description": "增热模式时使用的温度"
@@ -211,10 +207,6 @@
             "displayText": "焊接画面详情",
             "description": "焊接模式画面以英语小字体显示详请"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "功率限制",
             "description": "限制烙铁可用的最大功率 <W=瓦特>"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "语言：简体中文",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translation_ZH_TW.json

@@ -34,7 +34,7 @@
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
         "CJCCalibrating": {
-            "message": "calibrating"
+            "message": "calibrating\n"
         },
         "SettingsResetWarning": {
             "message": "你是否確定要將全部設定重設到預設值？"
@@ -55,7 +55,7 @@
             "message": "Sleeping..."
         },
         "SleepingTipAdvancedString": {
-            "message": "Tip: "
+            "message": "Tip:"
         },
         "OffString": {
             "message": "關"
@@ -119,10 +119,6 @@
             "displayText": "PD逾時",
             "description": "設定USB PD協定交涉的逾時時限；為兼容某些QC電源而設 <x100ms（亳秒）>"
         },
-        "PDVpdo": {
-            "displayText": "PD VPDO",
-            "description": "Enables PPS & EPR modes"
-        },
         "BoostTemperature": {
             "displayText": "增熱溫度",
             "description": "於增熱模式時使用的溫度"
@@ -211,10 +207,6 @@
             "displayText": "詳細焊接畫面",
             "description": "於焊接模式畫面以英文小字型顯示詳細資料"
         },
-        "BluetoothLE": {
-            "displayText": "Bluetooth",
-            "description": "Enables BLE"
-        },
         "PowerLimit": {
             "displayText": "功率限制",
             "description": "限制烙鐵可用的最大功率 <W=watt（瓦特）>"
@@ -246,6 +238,10 @@
         "LanguageSwitch": {
             "displayText": "語言：正體中文",
             "description": ""
+        },
+        "BLEEnabled": {
+            "displayText": "BLE\n Enabled",
+            "description": ""
         }
     }
 }

Translations/translations_definitions.json

@@ -217,12 +217,6 @@
             "maxLen2": 15,
             "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,
-            "description": "Enabled PPS & EPR modes."
-        },
         {
             "id": "BoostTemperature",
             "maxLen": 4,
@@ -355,12 +349,6 @@
             "maxLen2": 13,
             "description": "Should the device show an 'advanced' soldering view. This is a text-based view that shows more information at the cost of no nice graphics."
         },
-        {
-            "id": "BluetoothLE",
-            "maxLen": 7,
-            "maxLen2": 15,
-            "description": "Should BLE be enabled at boot time."
-        },
         {
             "id": "PowerLimit",
             "maxLen": 5,
@@ -408,6 +396,12 @@
             "maxLen": 7,
             "maxLen2": 15,
             "description": "Changes the device language on multi-lingual builds."
+        },
+        {
+            "id": "BLEEnabled",
+            "maxLen": 7,
+            "maxLen2": 15,
+            "description": "Should BLE be enabled at boot time."
         }
     ]
-}
+}

docker-compose.yml

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

mkdocs.yml

@@ -1,21 +1,8 @@
-# Project info
 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_url: https://github.com/ralim/IronOS/
-
+site_description: "IronOS Open Source Soldering Iron firmware for Miniware and Pinecil"
 docs_dir: Documentation
-edit_uri: edit/dev/Documentation/
-
-# Theme and config
-theme: 
-    name: readthedocs
-    highlightsjs: true
-    hljs_languages:
-        - yaml
-
 nav:
   - Home: index.md
   - Getting Started: GettingStarted.md
@@ -39,18 +26,5 @@ nav:
       - Known Hardware Issues: HardwareIssues.md
   - Translations: Translation.md
   - Development: Development.md
-  
+
-# Plugins
+theme: readthedocs
-plugins:
-  - search
-  - autolinks
-  - awesome-pages
-  - git-revision-date
-  
-  
-# Markdown Extensions
-markdown_extensions:
-  - attr_list
-  - pymdownx.emoji:
-      emoji_index: !!python/name:pymdownx.emoji.twemoji
-      emoji_generator: !!python/name:pymdownx.emoji.to_svg

source/Core/BSP/MHP30/configuration.h

@@ -60,15 +60,6 @@
 #define ORIENTATION_MODE           0 // 0: Right 1:Left 2:Automatic - Default right
 #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
 
-/**
- * OLED Brightness
- *
- */
-#define MIN_BRIGHTNESS             0   // Min OLED brightness selectable
-#define MAX_BRIGHTNESS             100 // Max OLED brightness selectable
-#define BRIGHTNESS_STEP            25  // OLED brightness increment
-#define DEFAULT_BRIGHTNESS         25  // default OLED brightness
-
 /**
  * Temp change settings
  */
@@ -146,7 +137,7 @@
 #define MAX_TEMP_C             350                     // Max soldering temp selectable °C
 #define MAX_TEMP_F             660                     // Max soldering temp selectable °F
 #define MIN_TEMP_C             10                      // Min soldering temp selectable °C
-#define MIN_TEMP_F             50                      // Min soldering temp selectable °F
+#define MIN_TEMP_F             60                      // Min soldering temp selectable °F
 #define MIN_BOOST_TEMP_C       150                     // The min settable temp for boost mode °C
 #define MIN_BOOST_TEMP_F       300                     // The min settable temp for boost mode °F
 #define NO_DISPLAY_ROTATE                              // Disable OLED rotation by accel

source/Core/BSP/Miniware/configuration.h

@@ -59,15 +59,6 @@
 #define ORIENTATION_MODE           2 // 0: Right 1:Left 2:Automatic - Default Automatic
 #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
 
-/**
- * OLED Brightness
- *
- */
-#define MIN_BRIGHTNESS             0   // Min OLED brightness selectable
-#define MAX_BRIGHTNESS             100 // Max OLED brightness selectable
-#define BRIGHTNESS_STEP            25  // OLED brightness increment
-#define DEFAULT_BRIGHTNESS         25  // default OLED brightness
-
 /**
  * Temp change settings
  */
@@ -150,7 +141,7 @@
 #define MAX_TEMP_C             450 // Max soldering temp selectable °C
 #define MAX_TEMP_F             850 // Max soldering temp selectable °F
 #define MIN_TEMP_C             10  // Min soldering temp selectable °C
-#define MIN_TEMP_F             50  // Min soldering temp selectable °F
+#define MIN_TEMP_F             60  // Min soldering temp selectable °F
 #define MIN_BOOST_TEMP_C       250 // The min settable temp for boost mode °C
 #define MIN_BOOST_TEMP_F       480 // The min settable temp for boost mode °F
 

source/Core/BSP/Pinecil/configuration.h

@@ -59,15 +59,6 @@
 #define ORIENTATION_MODE           2 // 0: Right 1:Left 2:Automatic - Default Automatic
 #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
 
-/**
- * OLED Brightness
- *
- */
-#define MIN_BRIGHTNESS             0   // Min OLED brightness selectable
-#define MAX_BRIGHTNESS             100 // Max OLED brightness selectable
-#define BRIGHTNESS_STEP            25  // OLED brightness increment
-#define DEFAULT_BRIGHTNESS         25  // default OLED brightness
-
 /**
  * Temp change settings
  */
@@ -141,7 +132,7 @@
 #define MAX_TEMP_C             450                       // Max soldering temp selectable °C
 #define MAX_TEMP_F             850                       // Max soldering temp selectable °F
 #define MIN_TEMP_C             10                        // Min soldering temp selectable °C
-#define MIN_TEMP_F             50                        // Min soldering temp selectable °F
+#define MIN_TEMP_F             60                        // Min soldering temp selectable °F
 #define MIN_BOOST_TEMP_C       250                       // The min settable temp for boost mode °C
 #define MIN_BOOST_TEMP_F       480                       // The min settable temp for boost mode °F
 

source/Core/BSP/Pinecilv2/IRQ.cpp

@@ -17,18 +17,15 @@ extern "C" {
 #include "bl702_pwm.h"
 #include "bl702_timer.h"
 }
-void start_PWM_output(void);
 
 #define ADC_Filter_Smooth 4
 history<uint16_t, ADC_Filter_Smooth> ADC_Vin;
 history<uint16_t, ADC_Filter_Smooth> ADC_Temp;
 history<uint16_t, ADC_Filter_Smooth> ADC_Tip;
-volatile uint8_t                     ADCBurstCounter = 0;
 void                                 adc_fifo_irq(void) {
   if (ADC_GetIntStatus(ADC_INT_FIFO_READY) == SET) {
     // Read out all entries in the fifo
     while (ADC_Get_FIFO_Count()) {
-      ADCBurstCounter++;
       volatile uint32_t reading = ADC_Read_FIFO();
       // As per manual, 26 bit reading; lowest 16 are the ADC
       uint16_t sample = reading & 0xFFFF;
@@ -49,17 +46,12 @@ void                                 adc_fifo_irq(void) {
       }
     }
 
-    if (ADCBurstCounter >= 8) {
+    // unblock the PID controller thread
-      ADCBurstCounter = 0;
+    if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
-      start_PWM_output();
+      BaseType_t xHigherPriorityTaskWoken = pdFALSE;
-
+      if (pidTaskNotification) {
-      // unblock the PID controller thread
+        vTaskNotifyGiveFromISR(pidTaskNotification, &xHigherPriorityTaskWoken);
-      if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED) {
+        portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
-        BaseType_t xHigherPriorityTaskWoken = pdFALSE;
-        if (pidTaskNotification) {
-          vTaskNotifyGiveFromISR(pidTaskNotification, &xHigherPriorityTaskWoken);
-          portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
-        }
       }
     }
   }
@@ -74,8 +66,12 @@ volatile uint16_t PWMSafetyTimer    = 0;
 volatile uint8_t  pendingPWM        = 0;
 volatile bool     lastPeriodWasFast = false;
 
-void start_PWM_output(void) {
+// Timer 0 is used to co-ordinate the ADC and the output PWM
+void timer0_comp0_callback(void) { ADC_Start(); }
+void timer0_comp1_callback(void) { PWM_Channel_Disable(PWM_Channel); }
+void timer0_comp2_callback(void) {
 
+  // This occurs at timer rollover, so if we want to turn on the output PWM; we do so
   if (PWMSafetyTimer) {
     PWMSafetyTimer--;
     if (lastPeriodWasFast != fastPWM) {
@@ -97,16 +93,8 @@ void start_PWM_output(void) {
   } else {
     PWM_Channel_Disable(PWM_Channel);
   }
-  TIMER_Enable(TIMER_CH0);
 }
 
-// Timer 0 is used to co-ordinate the ADC and the output PWM
-void timer0_comp0_callback(void) {
-  TIMER_Disable(TIMER_CH0);
-  ADC_Start();
-}
-void timer0_comp1_callback(void) { PWM_Channel_Disable(PWM_Channel); } // Trigged at end of output cycle; turn off the tip PWM
-
 void switchToFastPWM(void) {
   fastPWM  = true;
   totalPWM = powerPWM + tempMeasureTicks + holdoffTicks;

source/Core/BSP/Pinecilv2/Setup.cpp

@@ -62,10 +62,10 @@ void hardware_init() {
   setup_timer_scheduler();
   setup_adc();
   setup_pwm();
-  I2C_SetSclSync(I2C0_ID, 1);
+  I2C_SetSclSync(I2C0_ID,1);
-  I2C_SetDeglitchCount(I2C0_ID, 1); // Turn on de-glitch
+  I2C_SetDeglitchCount(I2C0_ID,1); // Turn on de-glitch
-  // Note on I2C clock rate @ 100Khz the screen update == 20ms which is too long for USB-PD to work
+  //Note on I2C clock rate @ 100Khz the screen update == 20ms which is too long for USB-PD to work
-  // 200kHz and above works
+  //200kHz and above works
   I2C_ClockSet(I2C0_ID, 300000); // Sets clock to around 25 kHz less than set here
   TIMER_SetCompValue(TIMER_CH0, TIMER_COMP_ID_1, 0);
 }
@@ -139,28 +139,32 @@ void setup_timer_scheduler() {
   TIMER_Disable(TIMER_CH0);
 
   TIMER_CFG_Type cfg = {
-      TIMER_CH0,                           // Channel
+      TIMER_CH0,                                              // Channel
-      TIMER_CLKSRC_32K,                    // Clock source
+      TIMER_CLKSRC_32K,                                       // Clock source
-      TIMER_PRELOAD_TRIG_COMP0,            // Trigger; reset after trigger 0
+      TIMER_PRELOAD_TRIG_COMP2,                               // Trigger
-      TIMER_COUNT_PRELOAD,                 // Counter mode
+      TIMER_COUNT_PRELOAD,                                    // Counter mode
-      22,                                  // Clock div
+      22,                                                     // Clock div
-      (uint16_t)(powerPWM + holdoffTicks), // CH0 compare (adc)
+      (uint16_t)(powerPWM + holdoffTicks),                    // CH0 compare (adc)
-      0,                                   // CH1 compare (pwm out)
+      0,                                                      // CH1 compare (pwm out)
-      0,                                   // CH2 compare not used
+      (uint16_t)(powerPWM + tempMeasureTicks + holdoffTicks), // CH2 comapre (total period)
-      0,                                   // Preload
+      0,                                                      // Preload
   };
   TIMER_Init(&cfg);
 
   Timer_Int_Callback_Install(TIMER_CH0, TIMER_INT_COMP_0, timer0_comp0_callback);
   Timer_Int_Callback_Install(TIMER_CH0, TIMER_INT_COMP_1, timer0_comp1_callback);
+  Timer_Int_Callback_Install(TIMER_CH0, TIMER_INT_COMP_2, timer0_comp2_callback);
 
   TIMER_ClearIntStatus(TIMER_CH0, TIMER_COMP_ID_0);
   TIMER_ClearIntStatus(TIMER_CH0, TIMER_COMP_ID_1);
+  TIMER_ClearIntStatus(TIMER_CH0, TIMER_COMP_ID_2);
 
   TIMER_IntMask(TIMER_CH0, TIMER_INT_COMP_0, UNMASK);
   TIMER_IntMask(TIMER_CH0, TIMER_INT_COMP_1, UNMASK);
+  TIMER_IntMask(TIMER_CH0, TIMER_INT_COMP_2, UNMASK);
   CPU_Interrupt_Enable(TIMER_CH0_IRQn);
   TIMER_Enable(TIMER_CH0);
+  // switchToSlowPWM();
 }
 
 void setupFUSBIRQ() {

source/Core/BSP/Pinecilv2/bl_mcu_sdk/components/ble/ble_stack/host/conn_internal.h

@@ -1,71 +1,65 @@
 /** @file
  *  @brief Internal APIs for Bluetooth connection handling.
  */
-#include "addr.h"
+
-#include "atomic.h"
-#include "slist.h"
-#include "types.h"
-#include "work_q.h"
-#include <stddef.h>
-#include <stdint.h>
 /*
  * Copyright (c) 2015 Intel Corporation
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 typedef enum __packed {
-  BT_CONN_DISCONNECTED,
+    BT_CONN_DISCONNECTED,
-  BT_CONN_CONNECT_SCAN,
+    BT_CONN_CONNECT_SCAN,
-  BT_CONN_CONNECT_DIR_ADV,
+    BT_CONN_CONNECT_DIR_ADV,
-  BT_CONN_CONNECT,
+    BT_CONN_CONNECT,
-  BT_CONN_CONNECTED,
+    BT_CONN_CONNECTED,
-  BT_CONN_DISCONNECT,
+    BT_CONN_DISCONNECT,
 } bt_conn_state_t;
 
 /* bt_conn flags: the flags defined here represent connection parameters */
 enum {
-  BT_CONN_AUTO_CONNECT,
+    BT_CONN_AUTO_CONNECT,
-  BT_CONN_BR_LEGACY_SECURE,     /* 16 digits legacy PIN tracker */
+    BT_CONN_BR_LEGACY_SECURE,     /* 16 digits legacy PIN tracker */
-  BT_CONN_USER,                 /* user I/O when pairing */
+    BT_CONN_USER,                 /* user I/O when pairing */
-  BT_CONN_BR_PAIRING,           /* BR connection in pairing context */
+    BT_CONN_BR_PAIRING,           /* BR connection in pairing context */
-  BT_CONN_BR_NOBOND,            /* SSP no bond pairing tracker */
+    BT_CONN_BR_NOBOND,            /* SSP no bond pairing tracker */
-  BT_CONN_BR_PAIRING_INITIATOR, /* local host starts authentication */
+    BT_CONN_BR_PAIRING_INITIATOR, /* local host starts authentication */
-  BT_CONN_CLEANUP,              /* Disconnected, pending cleanup */
+    BT_CONN_CLEANUP,              /* Disconnected, pending cleanup */
-  BT_CONN_AUTO_PHY_UPDATE,      /* Auto-update PHY */
+    BT_CONN_AUTO_PHY_UPDATE,      /* Auto-update PHY */
-  BT_CONN_SLAVE_PARAM_UPDATE,   /* If slave param update timer fired */
+    BT_CONN_SLAVE_PARAM_UPDATE,   /* If slave param update timer fired */
-  BT_CONN_SLAVE_PARAM_SET,      /* If slave param were set from app */
+    BT_CONN_SLAVE_PARAM_SET,      /* If slave param were set from app */
-  BT_CONN_SLAVE_PARAM_L2CAP,    /* If should force L2CAP for CPUP */
+    BT_CONN_SLAVE_PARAM_L2CAP,    /* If should force L2CAP for CPUP */
-  BT_CONN_FORCE_PAIR,           /* Pairing even with existing keys. */
+    BT_CONN_FORCE_PAIR,           /* Pairing even with existing keys. */
 
-  BT_CONN_AUTO_PHY_COMPLETE, /* Auto-initiated PHY procedure done */
+    BT_CONN_AUTO_PHY_COMPLETE, /* Auto-initiated PHY procedure done */
-  BT_CONN_AUTO_FEATURE_EXCH, /* Auto-initiated LE Feat done */
+    BT_CONN_AUTO_FEATURE_EXCH, /* Auto-initiated LE Feat done */
-  BT_CONN_AUTO_VERSION_INFO, /* Auto-initiated LE version done */
+    BT_CONN_AUTO_VERSION_INFO, /* Auto-initiated LE version done */
 
-  /* Total number of flags - must be at the end of the enum */
+    /* Total number of flags - must be at the end of the enum */
-  BT_CONN_NUM_FLAGS,
+    BT_CONN_NUM_FLAGS,
 };
 
 struct bt_conn_le {
-  bt_addr_le_t dst;
+    bt_addr_le_t dst;
 
-  bt_addr_le_t init_addr;
+    bt_addr_le_t init_addr;
-  bt_addr_le_t resp_addr;
+    bt_addr_le_t resp_addr;
 
-  u16_t interval;
+    u16_t interval;
-  u16_t interval_min;
+    u16_t interval_min;
-  u16_t interval_max;
+    u16_t interval_max;
 
-  u16_t latency;
+    u16_t latency;
-  u16_t timeout;
+    u16_t timeout;
-  u16_t pending_latency;
+    u16_t pending_latency;
-  u16_t pending_timeout;
+    u16_t pending_timeout;
 
-  u8_t features[8];
+    u8_t features[8];
 
-  struct bt_keys *keys;
+    struct bt_keys *keys;
 
 #if defined(CONFIG_BT_STACK_PTS)
-  u8_t own_adder_type;
+    u8_t own_adder_type;
 #endif
 };
 
@@ -74,107 +68,107 @@ struct bt_conn_le {
 #define LMP_MAX_PAGES 2
 
 struct bt_conn_br {
-  bt_addr_t dst;
+    bt_addr_t dst;
-  u8_t      remote_io_capa;
+    u8_t remote_io_capa;
-  u8_t      remote_auth;
+    u8_t remote_auth;
-  u8_t      pairing_method;
+    u8_t pairing_method;
-  /* remote LMP features pages per 8 bytes each */
+    /* remote LMP features pages per 8 bytes each */
-  u8_t features[LMP_MAX_PAGES][8];
+    u8_t features[LMP_MAX_PAGES][8];
 
-  struct bt_keys_link_key *link_key;
+    struct bt_keys_link_key *link_key;
 };
 
 struct bt_conn_sco {
-  /* Reference to ACL Connection */
+    /* Reference to ACL Connection */
-  struct bt_conn *acl;
+    struct bt_conn *acl;
-  u16_t           pkt_type;
+    u16_t pkt_type;
 };
 #endif
 
 struct bt_conn_iso {
-  /* Reference to ACL Connection */
+    /* Reference to ACL Connection */
-  struct bt_conn *acl;
+    struct bt_conn *acl;
-  /* CIG ID */
+    /* CIG ID */
-  uint8_t cig_id;
+    uint8_t cig_id;
-  /* CIS ID */
+    /* CIS ID */
-  uint8_t cis_id;
+    uint8_t cis_id;
 };
 
 typedef void (*bt_conn_tx_cb_t)(struct bt_conn *conn, void *user_data);
 
 struct bt_conn_tx {
-  sys_snode_t node;
+    sys_snode_t node;
 
-  bt_conn_tx_cb_t cb;
+    bt_conn_tx_cb_t cb;
-  void           *user_data;
+    void *user_data;
 
-  /* Number of pending packets without a callback after this one */
+    /* Number of pending packets without a callback after this one */
-  u32_t pending_no_cb;
+    u32_t pending_no_cb;
 };
 
 struct bt_conn {
-  u16_t handle;
+    u16_t handle;
-  u8_t  type;
+    u8_t type;
-  u8_t  role;
+    u8_t role;
 
-  ATOMIC_DEFINE(flags, BT_CONN_NUM_FLAGS);
+    ATOMIC_DEFINE(flags, BT_CONN_NUM_FLAGS);
 
-  /* Which local identity address this connection uses */
+    /* Which local identity address this connection uses */
-  u8_t id;
+    u8_t id;
 
 #if defined(CONFIG_BT_SMP) || defined(CONFIG_BT_BREDR)
-  bt_security_t sec_level;
+    bt_security_t sec_level;
-  bt_security_t required_sec_level;
+    bt_security_t required_sec_level;
-  u8_t          encrypt;
+    u8_t encrypt;
 #endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR */
 
-  /* Connection error or reason for disconnect */
+    /* Connection error or reason for disconnect */
-  u8_t err;
+    u8_t err;
 
-  bt_conn_state_t state;
+    bt_conn_state_t state;
 
-  u16_t           rx_len;
+    u16_t rx_len;
-  struct net_buf *rx;
+    struct net_buf *rx;
 
-  /* Sent but not acknowledged TX packets with a callback */
+    /* Sent but not acknowledged TX packets with a callback */
-  sys_slist_t tx_pending;
+    sys_slist_t tx_pending;
-  /* Sent but not acknowledged TX packets without a callback before
+    /* Sent but not acknowledged TX packets without a callback before
-   * the next packet (if any) in tx_pending.
+	 * the next packet (if any) in tx_pending.
-   */
+	 */
-  u32_t pending_no_cb;
+    u32_t pending_no_cb;
 
-  /* Completed TX for which we need to call the callback */
+    /* Completed TX for which we need to call the callback */
-  sys_slist_t   tx_complete;
+    sys_slist_t tx_complete;
-  struct k_work tx_complete_work;
+    struct k_work tx_complete_work;
 
-  /* Queue for outgoing ACL data */
+    /* Queue for outgoing ACL data */
-  struct k_fifo tx_queue;
+    struct k_fifo tx_queue;
 
-  /* Active L2CAP channels */
+    /* Active L2CAP channels */
-  sys_slist_t channels;
+    sys_slist_t channels;
 
-  atomic_t ref;
+    atomic_t ref;
 
-  /* Delayed work for connection update and other deferred tasks */
+    /* Delayed work for connection update and other deferred tasks */
-  struct k_delayed_work update_work;
+    struct k_delayed_work update_work;
 
-  union {
+    union {
-    struct bt_conn_le le;
+        struct bt_conn_le le;
 #if defined(CONFIG_BT_BREDR)
-    struct bt_conn_br  br;
+        struct bt_conn_br br;
-    struct bt_conn_sco sco;
+        struct bt_conn_sco sco;
 #endif
 #if defined(CONFIG_BT_AUDIO)
-    struct bt_conn_iso iso;
+        struct bt_conn_iso iso;
 #endif
-  };
+    };
 
 #if defined(CONFIG_BT_REMOTE_VERSION)
-  struct bt_conn_rv {
+    struct bt_conn_rv {
-    u8_t  version;
+        u8_t version;
-    u16_t manufacturer;
+        u16_t manufacturer;
-    u16_t subversion;
+        u16_t subversion;
-  } rv;
+    } rv;
 #endif
 };
 
@@ -184,19 +178,23 @@ void bt_conn_reset_rx_state(struct bt_conn *conn);
 void bt_conn_recv(struct bt_conn *conn, struct net_buf *buf, u8_t flags);
 
 /* Send data over a connection */
-int bt_conn_send_cb(struct bt_conn *conn, struct net_buf *buf, bt_conn_tx_cb_t cb, void *user_data);
+int bt_conn_send_cb(struct bt_conn *conn, struct net_buf *buf,
+                    bt_conn_tx_cb_t cb, void *user_data);
 
-static inline int bt_conn_send(struct bt_conn *conn, struct net_buf *buf) { return bt_conn_send_cb(conn, buf, NULL, NULL); }
+static inline int bt_conn_send(struct bt_conn *conn, struct net_buf *buf)
+{
+    return bt_conn_send_cb(conn, buf, NULL, NULL);
+}
 
 /* Add a new LE connection */
 struct bt_conn *bt_conn_add_le(u8_t id, const bt_addr_le_t *peer);
 
 /** Connection parameters for ISO connections */
 struct bt_iso_create_param {
-  uint8_t              id;
+    uint8_t id;
-  uint8_t              num_conns;
+    uint8_t num_conns;
-  struct bt_conn     **conns;
+    struct bt_conn **conns;
-  struct bt_iso_chan **chans;
+    struct bt_iso_chan **chans;
 };
 
 /* Bind ISO connections parameters */
@@ -253,12 +251,14 @@ struct bt_conn *bt_conn_lookup_id(u8_t id);
 /* Look up a connection state. For BT_ADDR_LE_ANY, returns the first connection
  * with the specific state
  */
-struct bt_conn *bt_conn_lookup_state_le(const bt_addr_le_t *peer, const bt_conn_state_t state);
+struct bt_conn *bt_conn_lookup_state_le(const bt_addr_le_t *peer,
+                                        const bt_conn_state_t state);
 
 /* Set connection object in certain state and perform action related to state */
 void bt_conn_set_state(struct bt_conn *conn, bt_conn_state_t state);
 
-int bt_conn_le_conn_update(struct bt_conn *conn, const struct bt_le_conn_param *param);
+int bt_conn_le_conn_update(struct bt_conn *conn,
+                           const struct bt_le_conn_param *param);
 
 void notify_remote_info(struct bt_conn *conn);
 
@@ -268,7 +268,8 @@ bool le_param_req(struct bt_conn *conn, struct bt_le_conn_param *param);
 
 #if defined(CONFIG_BT_SMP)
 /* rand and ediv should be in BT order */
-int bt_conn_le_start_encryption(struct bt_conn *conn, u8_t rand[8], u8_t ediv[2], const u8_t *ltk, size_t len);
+int bt_conn_le_start_encryption(struct bt_conn *conn, u8_t rand[8],
+                                u8_t ediv[2], const u8_t *ltk, size_t len);
 
 /* Notify higher layers that RPA was resolved */
 void bt_conn_identity_resolved(struct bt_conn *conn);
@@ -281,27 +282,41 @@ void bt_conn_security_changed(struct bt_conn *conn, enum bt_security_err err);
 
 /* Prepare a PDU to be sent over a connection */
 #if defined(CONFIG_NET_BUF_LOG)
-struct net_buf *bt_conn_create_pdu_timeout_debug(struct net_buf_pool *pool, size_t reserve, s32_t timeout, const char *func, int line);
+struct net_buf *bt_conn_create_pdu_timeout_debug(struct net_buf_pool *pool,
-#define bt_conn_create_pdu_timeout(_pool, _reserve, _timeout) bt_conn_create_pdu_timeout_debug(_pool, _reserve, _timeout, __func__, __LINE__)
+                                                 size_t reserve, s32_t timeout,
+                                                 const char *func, int line);
+#define bt_conn_create_pdu_timeout(_pool, _reserve, _timeout)   \
+    bt_conn_create_pdu_timeout_debug(_pool, _reserve, _timeout, \
+                                     __func__, __LINE__)
 
-#define bt_conn_create_pdu(_pool, _reserve) bt_conn_create_pdu_timeout_debug(_pool, _reserve, K_FOREVER, __func__, __line__)
+#define bt_conn_create_pdu(_pool, _reserve)                      \
+    bt_conn_create_pdu_timeout_debug(_pool, _reserve, K_FOREVER, \
+                                     __func__, __line__)
 #else
-struct net_buf *bt_conn_create_pdu_timeout(struct net_buf_pool *pool, size_t reserve, s32_t timeout);
+struct net_buf *bt_conn_create_pdu_timeout(struct net_buf_pool *pool,
+                                           size_t reserve, s32_t timeout);
 
-#define bt_conn_create_pdu(_pool, _reserve) bt_conn_create_pdu_timeout(_pool, _reserve, K_FOREVER)
+#define bt_conn_create_pdu(_pool, _reserve) \
+    bt_conn_create_pdu_timeout(_pool, _reserve, K_FOREVER)
 #endif
 
 /* Prepare a PDU to be sent over a connection */
 #if defined(CONFIG_NET_BUF_LOG)
-struct net_buf *bt_conn_create_frag_timeout_debug(size_t reserve, s32_t timeout, const char *func, int line);
+struct net_buf *bt_conn_create_frag_timeout_debug(size_t reserve, s32_t timeout,
+                                                  const char *func, int line);
 
-#define bt_conn_create_frag_timeout(_reserve, _timeout) bt_conn_create_frag_timeout_debug(_reserve, _timeout, __func__, __LINE__)
+#define bt_conn_create_frag_timeout(_reserve, _timeout)   \
+    bt_conn_create_frag_timeout_debug(_reserve, _timeout, \
+                                      __func__, __LINE__)
 
-#define bt_conn_create_frag(_reserve) bt_conn_create_frag_timeout_debug(_reserve, K_FOREVER, __func__, __LINE__)
+#define bt_conn_create_frag(_reserve)                      \
+    bt_conn_create_frag_timeout_debug(_reserve, K_FOREVER, \
+                                      __func__, __LINE__)
 #else
 struct net_buf *bt_conn_create_frag_timeout(size_t reserve, s32_t timeout);
 
-#define bt_conn_create_frag(_reserve) bt_conn_create_frag_timeout(_reserve, K_FOREVER)
+#define bt_conn_create_frag(_reserve) \
+    bt_conn_create_frag_timeout(_reserve, K_FOREVER)
 #endif
 
 /* Initialize connection management */
@@ -311,7 +326,7 @@ int bt_conn_init(void);
 struct k_sem *bt_conn_get_pkts(struct bt_conn *conn);
 
 /* k_poll related helpers for the TX thread */
-int  bt_conn_prepare_events(struct k_poll_event events[]);
+int bt_conn_prepare_events(struct k_poll_event events[]);
 void bt_conn_process_tx(struct bt_conn *conn);
 
 #if defined(BFLB_BLE)

source/Core/BSP/Pinecilv2/bl_mcu_sdk/drivers/bl702_driver/bl702_flash.ld

@@ -17,16 +17,16 @@ OUTPUT_ARCH( "riscv" )
 /* configure the entry point */
 ENTRY(_enter)
 
-StackSize = 0x800; /*  2KB */
+StackSize = 0x1000; /*  4KB */
-HeapSize  = 0x800; /*  2KB */
+HeapSize  = 0x1000; /*  4KB */
 __EM_SIZE = DEFINED(ble_controller_init) ? 8K : 0K;
 
 MEMORY
 {
     xip_memory  (rx)  : ORIGIN = 0x23000000, LENGTH = 1022K
     itcm_memory (rx)  : ORIGIN = 0x22014000, LENGTH = 16K
-    dtcm_memory (rx)  : ORIGIN = 0x42017000, LENGTH = 4K
+    dtcm_memory (rx)  : ORIGIN = 0x42018000, LENGTH = 32K
-    ram_memory  (!rx) : ORIGIN = 0x42018000, LENGTH = 64K
+    ram_memory  (!rx) : ORIGIN = 0x42020000, LENGTH = 32K
     rsvd_memory (!rx) : ORIGIN = 0x42028000, LENGTH = 1K
     ram2_memory (!rx) : ORIGIN = 0x42028400, LENGTH = (31K - __EM_SIZE)
     hbn_memory (rx) : ORIGIN = 0x40010000, LENGTH = 0xE00 /* hbn ram 4K used 3.5K*/

source/Core/BSP/Pinecilv2/ble_characteristics.h

@@ -19,74 +19,72 @@
 */
 
 // d85efab4-168e-4a71-affd-33e27f9bc533
-#define BT_UUID_SVC_LIVE_DATA BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef000, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_SVC_LIVE_DATA BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85efab4, 0x168e, 0x4a71, 0xaffd, 0x33e27f9bc533))
 // f6d75f91-5a10-4eba-a233-47d3f26a907f
-#define BT_UUID_SVC_SETTINGS_DATA BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d80000, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_SVC_SETTINGS_DATA BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d75f91, 0x5a10, 0x4eba, 0xa233, 0x47d3f26a907f))
 // 9eae1adb-9d0d-48c5-a6e7-ae93f0ea37b0
-#define BT_UUID_SVC_BULK_DATA BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0x9eae1000, 0x9d0d, 0x48c5, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_SVC_BULK_DATA BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0x9eae1adb, 0x9d0d, 0x48c5, 0xa6e7, 0xae93f0ea37b0))
 
-#define BT_UUID_CHAR_BLE_LIVE_LIVE_TEMP     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef001, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_LIVE_TEMP     BT_UUID_DECLARE_16(0x0001)
-#define BT_UUID_CHAR_BLE_LIVE_SETPOINT_TEMP BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef002, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_SETPOINT_TEMP BT_UUID_DECLARE_16(0x0002)
-#define BT_UUID_CHAR_BLE_LIVE_DC_INPUT      BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef003, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_DC_INPUT      BT_UUID_DECLARE_16(0x0003)
-#define BT_UUID_CHAR_BLE_LIVE_HANDLE_TEMP   BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef004, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_HANDLE_TEMP   BT_UUID_DECLARE_16(0x0004)
-#define BT_UUID_CHAR_BLE_LIVE_POWER_LEVEL   BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef005, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_POWER_LEVEL   BT_UUID_DECLARE_16(0x0005)
-#define BT_UUID_CHAR_BLE_LIVE_POWER_SRC     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef006, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_POWER_SRC     BT_UUID_DECLARE_16(0x0006)
-#define BT_UUID_CHAR_BLE_LIVE_TIP_RES       BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef007, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_TIP_RES       BT_UUID_DECLARE_16(0x0007)
-#define BT_UUID_CHAR_BLE_LIVE_UPTIME        BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef008, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_UPTIME        BT_UUID_DECLARE_16(0x0008)
-#define BT_UUID_CHAR_BLE_LIVE_MOVEMENT      BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef009, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_MOVEMENT      BT_UUID_DECLARE_16(0x0009)
-#define BT_UUID_CHAR_BLE_LIVE_MAX_TEMP      BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef00A, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_MAX_TEMP      BT_UUID_DECLARE_16(0x000A)
-#define BT_UUID_CHAR_BLE_LIVE_RAW_TIP       BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef00B, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_RAW_TIP       BT_UUID_DECLARE_16(0x000B)
-#define BT_UUID_CHAR_BLE_LIVE_HALL_SENSOR   BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef00C, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_HALL_SENSOR   BT_UUID_DECLARE_16(0x000C)
-#define BT_UUID_CHAR_BLE_LIVE_OP_MODE       BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef00D, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_OP_MODE       BT_UUID_DECLARE_16(0x000D)
-#define BT_UUID_CHAR_BLE_LIVE_EST_WATTS     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xd85ef00E, 0x168e, 0x4a71, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_EST_WATTS     BT_UUID_DECLARE_16(0x000E)
 
 // Bulk data that returns non-fixed sized objects
-#define BT_UUID_CHAR_BLE_LIVE_BULK_LIVE_DATA BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0x9eae1001, 0x9d0d, 0x48c5, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_BULK_LIVE_DATA BT_UUID_DECLARE_16(0x0001)
-#define BT_UUID_CHAR_BLE_LIVE_ACCEL_NAME     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0x9eae1002, 0x9d0d, 0x48c5, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_ACCEL_NAME     BT_UUID_DECLARE_16(0x0002)
-#define BT_UUID_CHAR_BLE_LIVE_BUILD          BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0x9eae1003, 0x9d0d, 0x48c5, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_BUILD          BT_UUID_DECLARE_16(0x0003)
-#define BT_UUID_CHAR_BLE_LIVE_DEV_ID         BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0x9eae1004, 0x9d0d, 0x48c5, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_LIVE_DEV_ID         BT_UUID_DECLARE_16(0x0004)
 
 // Settings
 
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_SAVE  BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7FFFF, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_SAVE BT_UUID_DECLARE_16(0)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_RESET BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7FFFE, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_1    BT_UUID_DECLARE_16(1)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_0     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70000, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_2    BT_UUID_DECLARE_16(2)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_1     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70001, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_3    BT_UUID_DECLARE_16(3)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_2     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70002, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_4    BT_UUID_DECLARE_16(4)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_3     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70003, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_5    BT_UUID_DECLARE_16(5)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_4     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70004, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_6    BT_UUID_DECLARE_16(6)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_5     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70005, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_7    BT_UUID_DECLARE_16(7)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_6     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70006, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_8    BT_UUID_DECLARE_16(8)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_7     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70007, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_9    BT_UUID_DECLARE_16(9)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_8     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70008, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_10   BT_UUID_DECLARE_16(10)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_9     BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70009, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_11   BT_UUID_DECLARE_16(11)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_10    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7000a, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_12   BT_UUID_DECLARE_16(12)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_11    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7000b, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_13   BT_UUID_DECLARE_16(13)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_12    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7000c, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_14   BT_UUID_DECLARE_16(14)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_13    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7000d, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_15   BT_UUID_DECLARE_16(15)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_14    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7000e, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_16   BT_UUID_DECLARE_16(16)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_15    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7000f, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_17   BT_UUID_DECLARE_16(17)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_16    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70010, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_18   BT_UUID_DECLARE_16(18)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_17    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70011, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_19   BT_UUID_DECLARE_16(19)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_18    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70012, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_20   BT_UUID_DECLARE_16(20)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_19    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70013, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_21   BT_UUID_DECLARE_16(21)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_20    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70014, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_22   BT_UUID_DECLARE_16(22)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_21    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70015, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_23   BT_UUID_DECLARE_16(23)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_22    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70016, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_24   BT_UUID_DECLARE_16(24)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_23    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70017, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_25   BT_UUID_DECLARE_16(25)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_24    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70018, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_26   BT_UUID_DECLARE_16(26)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_25    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70019, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_27   BT_UUID_DECLARE_16(27)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_26    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7001a, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_28   BT_UUID_DECLARE_16(28)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_27    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7001b, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_29   BT_UUID_DECLARE_16(29)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_28    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7001c, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_30   BT_UUID_DECLARE_16(30)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_29    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7001d, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_31   BT_UUID_DECLARE_16(31)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_30    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7001e, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_32   BT_UUID_DECLARE_16(32)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_31    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d7001f, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_33   BT_UUID_DECLARE_16(33)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_32    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70020, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_34   BT_UUID_DECLARE_16(34)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_33    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70021, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_35   BT_UUID_DECLARE_16(35)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_34    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70022, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_36   BT_UUID_DECLARE_16(36)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_35    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70023, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_37   BT_UUID_DECLARE_16(37)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_36    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70024, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_37    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70025, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
+#endif
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_38    BT_UUID_DECLARE_128(BT_UUID_128_ENCODE(0xf6d70026, 0x5a10, 0x4eba, 0xAA55, 0x33e27f9bc533))
-#endif

source/Core/BSP/Pinecilv2/ble_handlers.cpp

@@ -20,9 +20,6 @@
 #include "log.h"
 #include "uuid.h"
 
-#include "../../version.h"
-#include "OLED.hpp"
-#include "OperatingModes.h"
 #include "USBPD.h"
 #include "ble_characteristics.h"
 #include "ble_handlers.h"
@@ -33,16 +30,13 @@
 #include "pd.h"
 #endif
 
-extern TickType_t    lastMovementTime;
+extern TickType_t lastMovementTime;
-extern OperatingMode currentMode;
 
 int ble_char_read_status_callback(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf, u16_t len, u16_t offset) {
   if (attr == NULL || attr->uuid == NULL) {
     return 0;
   }
-  // Decode the uuid
+  uint16_t uuid_value = ((struct bt_uuid_16 *)attr->uuid)->val;
-  // Byte 12 has the lowest part of the first UUID chunk
-  uint16_t uuid_value = ((struct bt_uuid_128 *)attr->uuid)->val[12];
   uint32_t temp       = 0;
   switch (uuid_value) {
   case 1: // Live temp
@@ -74,7 +68,13 @@ int ble_char_read_status_callback(struct bt_conn *conn, const struct bt_gatt_att
     break;
   case 6: // power src
     // Todo return enum for current power source
-    temp = getPowerSrc();
+    if (getIsPoweredByDCIN()) {
+      temp = 0;
+    } else if (USBPowerDelivery::negotiationComplete()) {
+      temp = 1;
+    } else {
+      temp = 2;
+    }
     memcpy(buf, &temp, sizeof(temp));
     return sizeof(temp);
     break;
@@ -122,9 +122,7 @@ int ble_char_read_status_callback(struct bt_conn *conn, const struct bt_gatt_att
     break;
   case 13:
     // Operating mode
-    temp = currentMode;
+    // TODO: Needs tracking
-    memcpy(buf, &temp, sizeof(temp));
-    return sizeof(temp);
     break;
   case 14:
     // Estimated watts
@@ -133,35 +131,27 @@ int ble_char_read_status_callback(struct bt_conn *conn, const struct bt_gatt_att
     return sizeof(temp);
     break;
   }
-  MSG((char *)"Unhandled attr read %d | %d\n", (uint32_t)attr->uuid, uuid_value);
+  MSG("Unhandled attr read %d | %d\n", (uint32_t)attr->uuid, uuid_value);
   return 0;
 }
 int ble_char_read_bulk_value_callback(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf, u16_t len, u16_t offset) {
   if (attr == NULL || attr->uuid == NULL) {
     return 0;
   }
-  // Byte 12 has the lowest part of the first UUID chunk
+  uint16_t uuid_value = ((struct bt_uuid_16 *)attr->uuid)->val;
-  uint16_t uuid_value = ((struct bt_uuid_128 *)attr->uuid)->val[12];
   // Bulk is the non-const size service
   switch (uuid_value) {
   case 1:
     // Bulk data
     {
       uint32_t bulkData[] = {
-          TipThermoModel::getTipInC(),                                         // 0  - Current temp
+          TipThermoModel::getTipInC(),                                         // Current temp
-          getSettingValue(SettingsOptions::SolderingTemp),                     // 1  - Setpoint
+          getSettingValue(SettingsOptions::SolderingTemp),                     // Setpoint
-          getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0), // 2  - Input voltage
+          getHandleTemperature(0),                                             // Handle X10 Temp in C
-          getHandleTemperature(0),                                             // 3  - Handle X10 Temp in C
+          getInputVoltageX10(getSettingValue(SettingsOptions::VoltageDiv), 0), // Input voltage
-          X10WattsToPWM(x10WattHistory.average()),                             // 4  - Power as PWM level
+          x10WattHistory.average(),                                            // Estimated Wattage
-          getPowerSrc(),                                                       // 5  - power src
+          X10WattsToPWM(x10WattHistory.average()),                             // Power as PWM level
-          getTipResistanceX10(),                                               // 6  - Tip resistance
+          TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0), true),        // Raw tip
-          xTaskGetTickCount() / TICKS_100MS,                                   // 7  - uptime in deciseconds
-          lastMovementTime / TICKS_100MS,                                      // 8  - last movement time (deciseconds)
-          TipThermoModel::getTipMaxInC(),                                      // 9  - max temp
-          TipThermoModel::convertTipRawADCTouV(getTipRawTemp(0), true),        // 10 - Raw tip in μV
-          abs(getRawHallEffect()),                                             // 11 - hall sensor
-          currentMode,                                                         // 12 - Operating mode
-          x10WattHistory.average(),                                            // 13 - Estimated Wattage *10
       };
       int lenToCopy = sizeof(bulkData) - offset;
       if (lenToCopy > len) {
@@ -180,9 +170,9 @@ int ble_char_read_bulk_value_callback(struct bt_conn *conn, const struct bt_gatt
     // TODO: Need to store non-encoded version
     break;
   case 3:
-    // FW Version
+    // Build
-    memcpy(buf, &BUILD_VERSION, sizeof(BUILD_VERSION) - 1);
+    // TODO: Need to store non-encoded version
-    return sizeof(BUILD_VERSION) - 1;
+    break;
   case 4:
     // Device unique id
     {
@@ -198,19 +188,18 @@ int ble_char_read_setting_value_callback(struct bt_conn *conn, const struct bt_g
   if (attr == NULL || attr->uuid == NULL) {
     return 0;
   }
-  // Byte 12 has the lowest part of the first UUID chunk
+  uint16_t uuid_value = ((struct bt_uuid_16 *)attr->uuid)->val;
-  uint16_t uuid_value = ((struct bt_uuid_128 *)attr->uuid)->val[12];
+  uint16_t temp       = 0;
-  uint16_t temp       = 0xFFFF;
+  if (uuid_value == 0) {
-  if (uuid_value <= SettingsOptions::SettingsOptionsLength) {
-    temp = getSettingValue((SettingsOptions)(uuid_value));
     memcpy(buf, &temp, sizeof(temp));
     return sizeof(temp);
-  } else {
+  } else if (uuid_value <= SettingsOptions::SettingsOptionsLength) {
+    temp = getSettingValue((SettingsOptions)(uuid_value - 1));
     memcpy(buf, &temp, sizeof(temp));
     return sizeof(temp);
   }
 
-  MSG((char *)"Unhandled attr read %d | %d\n", (uint32_t)attr->uuid, uuid_value);
+  MSG("Unhandled attr read %d | %d\n", (uint32_t)attr->uuid, uuid_value);
   return 0;
 }
 
@@ -218,7 +207,7 @@ int ble_char_write_setting_value_callback(struct bt_conn *conn, const struct bt_
 
   if (flags & BT_GATT_WRITE_FLAG_PREPARE) {
     // Don't use prepare write data, execute write will upload data again.
-    BT_WARN((char *)"recv prepare write request\n");
+    BT_WARN("recv prepare write request\n");
     return 0;
   }
   if (attr == NULL || attr->uuid == NULL) {
@@ -227,77 +216,25 @@ int ble_char_write_setting_value_callback(struct bt_conn *conn, const struct bt_
 
   if (flags & BT_GATT_WRITE_FLAG_CMD) {
     // Use write command data.
-    BT_WARN((char *)"recv write command\n");
+    BT_WARN("recv write command\n");
   } else {
     // Use write request / execute write data.
-    BT_WARN((char *)"recv write request / exce write\n");
+    BT_WARN("recv write request / exce write\n");
   }
-  uint8_t uuid_value = ((struct bt_uuid_128 *)attr->uuid)->val[12];
+  uint16_t uuid_value = ((struct bt_uuid_16 *)attr->uuid)->val;
   if (len == 2) {
     uint16_t new_value = 0;
     memcpy(&new_value, buf, sizeof(new_value));
-    if (uuid_value == 0xFF) {
+    if (uuid_value == 0) {
       if (new_value == 1) {
         saveSettings();
         return len;
       }
-    } else if (uuid_value == 0xFE) {
-      if (new_value == 1) {
-        resetSettings();
-        return len;
-      }
     } else if (uuid_value < SettingsOptions::SettingsOptionsLength) {
-      setSettingValue((SettingsOptions)(uuid_value), new_value);
+      setSettingValue((SettingsOptions)(uuid_value - 1), new_value);
-      switch (uuid_value) {
-      case SettingsOptions::OLEDInversion:
-        OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion));
-        break;
-      case SettingsOptions::OLEDBrightness:
-        OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness));
-        break;
-      case SettingsOptions::OrientationMode:
-        OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
-        break;
-      default:
-        break;
-      }
       return len;
     }
   }
-  MSG((char *)"Unhandled attr write %d | %d\n", (uint32_t)attr->uuid, uuid_value);
+  MSG("Unhandled attr write %d | %d\n", (uint32_t)attr->uuid, uuid_value);
   return 0;
-}
+}
-
-uint32_t getPowerSrc() {
-  int sourceNumber = 0;
-  if (getIsPoweredByDCIN()) {
-    sourceNumber = 0;
-  } else {
-    // We are not powered via DC, so want to display the appropriate state for PD or QC
-    bool poweredbyPD        = false;
-    bool pdHasVBUSConnected = false;
-#if POW_PD
-    if (USBPowerDelivery::fusbPresent()) {
-      // We are PD capable
-      if (USBPowerDelivery::negotiationComplete()) {
-        // We are powered via PD
-        poweredbyPD = true;
-#ifdef VBUS_MOD_TEST
-        pdHasVBUSConnected = USBPowerDelivery::isVBUSConnected();
-#endif
-      }
-    }
-#endif
-    if (poweredbyPD) {
-
-      if (pdHasVBUSConnected) {
-        sourceNumber = 2;
-      } else {
-        sourceNumber = 3;
-      }
-    } else {
-      sourceNumber = 1;
-    }
-  }
-  return sourceNumber;
-}

source/Core/BSP/Pinecilv2/ble_handlers.h

@@ -13,8 +13,6 @@ int ble_char_read_bulk_value_callback(struct bt_conn *conn, const struct bt_gatt
 
 int ble_char_write_setting_value_callback(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf, u16_t len, u16_t offset, u8_t flags);
 
-uint32_t getPowerSrc();
-
 #ifdef __cplusplus
 };
 #endif

source/Core/BSP/Pinecilv2/ble_peripheral.c

@@ -26,9 +26,9 @@ NOTES
 #include "log.h"
 #include "uuid.h"
 
-#include "BSP.h"
 #include "ble_characteristics.h"
 #include "ble_handlers.h"
+
 bool pds_start;
 
 static void          ble_device_connected(struct bt_conn *conn, u8_t err);
@@ -142,7 +142,7 @@ static void ble_tp_ind_ccc_changed(const struct bt_gatt_attr *attr, u16_t value)
 /*************************************************************************
  *  DEFINE : attrs
  */
-static struct bt_gatt_attr ble_attrs_declaration[] = {
+static struct bt_gatt_attr attrs[] = {
     BT_GATT_PRIMARY_SERVICE(BT_UUID_SVC_LIVE_DATA),
 
     BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_LIVE_LIVE_TEMP, BT_GATT_CHRC_READ, BT_GATT_PERM_READ, ble_char_read_status_callback, NULL, NULL),
@@ -167,7 +167,7 @@ static struct bt_gatt_attr ble_attrs_declaration[] = {
     BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_LIVE_DEV_ID, BT_GATT_CHRC_READ, BT_GATT_PERM_READ, ble_char_read_bulk_value_callback, NULL, NULL),
 
     BT_GATT_PRIMARY_SERVICE(BT_UUID_SVC_SETTINGS_DATA),
-    BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_SETTINGS_VALUE_0, BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_WRITE_WITHOUT_RESP, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE,
+    BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_SETTINGS_VALUE_SAVE, BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_WRITE_WITHOUT_RESP, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE,
                            ble_char_read_setting_value_callback, ble_char_write_setting_value_callback, NULL),
     BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_SETTINGS_VALUE_1, BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_WRITE_WITHOUT_RESP, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE,
                            ble_char_read_setting_value_callback, ble_char_write_setting_value_callback, NULL),
@@ -243,13 +243,6 @@ static struct bt_gatt_attr ble_attrs_declaration[] = {
                            ble_char_read_setting_value_callback, ble_char_write_setting_value_callback, NULL),
     BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_SETTINGS_VALUE_37, BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_WRITE_WITHOUT_RESP, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE,
                            ble_char_read_setting_value_callback, ble_char_write_setting_value_callback, NULL),
-    BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_SETTINGS_VALUE_38, BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_WRITE_WITHOUT_RESP, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE,
-                           ble_char_read_setting_value_callback, ble_char_write_setting_value_callback, NULL),
-    BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_SETTINGS_VALUE_SAVE, BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_WRITE_WITHOUT_RESP, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE,
-                           ble_char_read_setting_value_callback, ble_char_write_setting_value_callback, NULL),
-
-    BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_SETTINGS_VALUE_RESET, BT_GATT_CHRC_READ | BT_GATT_CHRC_WRITE | BT_GATT_CHRC_WRITE_WITHOUT_RESP, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE,
-                           ble_char_read_setting_value_callback, ble_char_write_setting_value_callback, NULL),
 
 };
 
@@ -257,9 +250,13 @@ static struct bt_gatt_attr ble_attrs_declaration[] = {
 NAME
     get_attr
 */
-struct bt_gatt_attr *get_attr(u8_t index) { return &ble_attrs_declaration[index]; }
+struct bt_gatt_attr *get_attr(u8_t index) {
+  return &attrs[index];
+}
 
-static struct bt_gatt_service ble_tp_server = BT_GATT_SERVICE(ble_attrs_declaration);
+static struct bt_gatt_service ble_tp_server = BT_GATT_SERVICE(attrs);
+
+const char *DEVICE_BLE_NAME = "Pinecil";
 
 // Start advertising with expected default values
 int ble_start_adv(void) {
@@ -270,17 +267,13 @@ int ble_start_adv(void) {
       .interval_min = BT_GAP_ADV_FAST_INT_MIN_3,
       .interval_max = BT_GAP_ADV_FAST_INT_MAX_3,
   };
-  char     nameBuffer[16];
-  uint32_t scratch = getDeviceID() & 0xFFFFFFFF;
-  scratch ^= (getDeviceID() >> 32) & 0xFFFFFFFF;
-  int nameLen = snprintf(nameBuffer, 16, "Pinecil-%08X", (int)scratch);
 
-  // scan and response data must each stay < 31 bytes
+  struct bt_data adv_data[2] = {
-  struct bt_data adv_data[2] = {BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_NO_BREDR | BT_LE_AD_GENERAL)), BT_DATA(BT_DATA_NAME_COMPLETE, nameBuffer, nameLen)};
+      BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_NO_BREDR | BT_LE_AD_GENERAL)),
+      BT_DATA(BT_DATA_NAME_COMPLETE, DEVICE_BLE_NAME, strlen(DEVICE_BLE_NAME)),
+  };
 
-  struct bt_data scan_response_data[1] = {BT_DATA(BT_DATA_UUID128_SOME, ((struct bt_uuid_128 *)BT_UUID_SVC_BULK_DATA)->val, 16)};
+  return bt_le_adv_start(&adv_param, adv_data, ARRAY_SIZE(adv_data), &adv_data[1], 1);
-
-  return bt_le_adv_start(&adv_param, adv_data, ARRAY_SIZE(adv_data), scan_response_data, ARRAY_SIZE(scan_response_data));
 }
 
 // Callback that the ble stack will call once it has been kicked off running
@@ -290,4 +283,4 @@ void bt_enable_cb(int err) {
   bt_gatt_service_register(&ble_tp_server);
 
   ble_start_adv();
-}
+}

source/Core/BSP/Pinecilv2/configuration.h

@@ -59,15 +59,6 @@
 #define ORIENTATION_MODE           2 // 0: Right 1:Left 2:Automatic - Default Automatic
 #define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
 
-/**
- * OLED Brightness
- *
- */
-#define MIN_BRIGHTNESS             1   // Min OLED brightness selectable
-#define MAX_BRIGHTNESS             101 // Max OLED brightness selectable
-#define BRIGHTNESS_STEP            25  // OLED brightness increment
-#define DEFAULT_BRIGHTNESS         26  // default OLED brightness
-
 /**
  * Temp change settings
  */
@@ -130,9 +121,9 @@
 #define VOLTAGE_DIV                600                       // 600 - Default divider from schematic
 #define CALIBRATION_OFFSET         900                       // 900 - Default adc offset in uV
 #define MIN_CALIBRATION_OFFSET     100                       // Min value for calibration
-#define PID_POWER_LIMIT            120                       // Sets the max pwm power limit
+#define PID_POWER_LIMIT            220                       // Sets the max pwm power limit
 #define POWER_LIMIT                0                         // 0 watts default limit
-#define MAX_POWER_LIMIT            120                       // Sets the max power limit
+#define MAX_POWER_LIMIT            220                       //
 #define POWER_LIMIT_STEPS          5                         //
 #define OP_AMP_GAIN_STAGE          OP_AMP_GAIN_STAGE_PINECIL // Uses TS100 resistors
 #define TEMP_uV_LOOKUP_HAKKO                                 // Use Hakko lookup table
@@ -141,7 +132,7 @@
 #define MAX_TEMP_C                 450                       // Max soldering temp selectable °C
 #define MAX_TEMP_F                 850                       // Max soldering temp selectable °F
 #define MIN_TEMP_C                 10                        // Min soldering temp selectable °C
-#define MIN_TEMP_F                 50                        // Min soldering temp selectable °F
+#define MIN_TEMP_F                 60                        // Min soldering temp selectable °F
 #define MIN_BOOST_TEMP_C           250                       // The min settable temp for boost mode °C
 #define MIN_BOOST_TEMP_F           480                       // The min settable temp for boost mode °F
 #define DEVICE_HAS_VALIDATION_CODE                           // We have 2 digit validations

source/Core/BSP/Pinecilv2/postRTOS.cpp

@@ -20,7 +20,7 @@ void postRToSInit() {
   }
 #endif
 
-  if (getSettingValue(SettingsOptions::BluetoothLE)) {
+  if (getSettingValue(SettingsOptions::BLEEnabled)) {
     ble_stack_start();
   }
 }

source/Core/Drivers/USBPD.cpp

@@ -152,7 +152,7 @@ bool parseCapabilitiesArray(const uint8_t numCaps, uint8_t *bestIndex, uint16_t
           }
         }
       }
-    } else if ((lastCapabilities[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED && (((lastCapabilities[i] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS)) && getSettingValue(SettingsOptions::PDVpdo)) {
+    } else if ((lastCapabilities[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED && (((lastCapabilities[i] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS))) {
       // If this is a PPS slot, calculate the max voltage in the PPS range that can we be used and maintain
       uint16_t max_voltage = PD_PAV2MV(PD_APDO_PPS_MAX_VOLTAGE_GET(lastCapabilities[i]));
       // uint16_t min_voltage = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCapabilities[i]));
@@ -179,7 +179,7 @@ bool parseCapabilitiesArray(const uint8_t numCaps, uint8_t *bestIndex, uint16_t
       }
     }
 #ifdef POW_EPR
-    else if ((lastCapabilities[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED && (((lastCapabilities[i] & PD_APDO_TYPE) == PD_APDO_TYPE_AVS)) && getSettingValue(SettingsOptions::PDVpdo)) {
+    else if ((lastCapabilities[i] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED && (((lastCapabilities[i] & PD_APDO_TYPE) == PD_APDO_TYPE_AVS))) {
       uint16_t max_voltage = PD_PAV2MV(PD_APDO_AVS_MAX_VOLTAGE_GET(lastCapabilities[i]));
       uint8_t  max_wattage = PD_APDO_AVS_MAX_POWER_GET(lastCapabilities[i]);
 
@@ -372,4 +372,4 @@ void pdbs_dpm_get_sink_capability(pd_msg *cap, const bool isPD3) {
   // cap->hdr = hdr_template | PD_MSGTYPE_SINK_CAPABILITIES | PD_NUMOBJ(numobj);
 }
 
-#endif
+#endif

source/Core/Inc/Settings.h

@@ -51,10 +51,10 @@ enum SettingsOptions {
   OLEDBrightness                 = 34, // Brightness for the OLED display
   LOGOTime                       = 35, // Duration the logo will be displayed for
   CalibrateCJC                   = 36, // Toggle calibrate CJC at next boot
-  BluetoothLE                    = 37, // Toggle BLE if present
+  BLEEnabled                     = 37, // Should BLE hardware be enabled if present
-  PDVpdo                         = 38, // Toggle PPS & EPR
+
   //
-  SettingsOptionsLength = 39, //
+  SettingsOptionsLength = 38, //
 };
 
 typedef enum {

source/Core/Inc/Translation.h

@@ -55,7 +55,6 @@ enum class SettingsItemIndex : uint8_t {
   MinVolCell,
   QCMaxVoltage,
   PDNegTimeout,
-  PDVpdo,
   BoostTemperature,
   AutoStart,
   TempChangeShortStep,
@@ -78,7 +77,6 @@ enum class SettingsItemIndex : uint8_t {
   LOGOTime,
   AdvancedIdle,
   AdvancedSoldering,
-  BluetoothLE,
   PowerLimit,
   CalibrateCJC,
   VoltageCalibration,
@@ -87,6 +85,7 @@ enum class SettingsItemIndex : uint8_t {
   PowerPulseDuration,
   SettingsReset,
   LanguageSwitch,
+  BLEEnabled,
   NUM_ITEMS,
 };
 

source/Core/Src/Settings.cpp

@@ -49,45 +49,45 @@ typedef struct {
 
 static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength] = {
     //{min,max,increment,default}
-    {MIN_TEMP_C, MAX_TEMP_F, 5, 320},                                      // SolderingTemp
+    {MIN_TEMP_C, MAX_TEMP_F, 5, 320},                               // SolderingTemp
-    {MIN_TEMP_C, MAX_TEMP_F, 5, 150},                                      // SleepTemp
+    {MIN_TEMP_C, MAX_TEMP_F, 5, 150},                               // SleepTemp
-    {0, 15, 1, SLEEP_TIME},                                                // SleepTime
+    {0, 15, 1, SLEEP_TIME},                                         // SleepTime
-    {0, 4, 1, CUT_OUT_SETTING},                                            // MinDCVoltageCells
+    {0, 4, 1, CUT_OUT_SETTING},                                     // MinDCVoltageCells
-    {24, 38, 1, RECOM_VOL_CELL},                                           // MinVoltageCells
+    {24, 38, 1, RECOM_VOL_CELL},                                    // MinVoltageCells
-    {90, QC_VOLTAGE_MAX, 2, 90},                                           // QCIdealVoltage
+    {90, QC_VOLTAGE_MAX, 2, 90},                                    // QCIdealVoltage
-    {0, 2, 1, ORIENTATION_MODE},                                           // OrientationMode
+    {0, 2, 1, ORIENTATION_MODE},                                    // OrientationMode
-    {0, 9, 1, SENSITIVITY},                                                // Sensitivity
+    {0, 9, 1, SENSITIVITY},                                         // Sensitivity
-    {0, 1, 1, ANIMATION_LOOP},                                             // AnimationLoop
+    {0, 1, 1, ANIMATION_LOOP},                                      // AnimationLoop
-    {0, settingOffSpeed_t::MAX_VALUE - 1, 1, ANIMATION_SPEED},             // AnimationSpeed
+    {0, settingOffSpeed_t::MAX_VALUE - 1, 1, ANIMATION_SPEED},      // AnimationSpeed
-    {0, 3, 1, AUTO_START_MODE},                                            // AutoStartMode
+    {0, 3, 1, AUTO_START_MODE},                                     // AutoStartMode
-    {0, 60, 1, SHUTDOWN_TIME},                                             // ShutdownTime
+    {0, 60, 1, SHUTDOWN_TIME},                                      // ShutdownTime
-    {0, 1, 1, COOLING_TEMP_BLINK},                                         // CoolingTempBlink
+    {0, 1, 1, COOLING_TEMP_BLINK},                                  // CoolingTempBlink
-    {0, 1, 1, DETAILED_IDLE},                                              // DetailedIDLE
+    {0, 1, 1, DETAILED_IDLE},                                       // DetailedIDLE
-    {0, 1, 1, DETAILED_SOLDERING},                                         // DetailedSoldering
+    {0, 1, 1, DETAILED_SOLDERING},                                  // DetailedSoldering
-    {0, 1, 1, TEMPERATURE_INF},                                            // TemperatureInF
+    {0, 1, 1, TEMPERATURE_INF},                                     // TemperatureInF
-    {0, 1, 1, DESCRIPTION_SCROLL_SPEED},                                   // DescriptionScrollSpeed
+    {0, 1, 1, DESCRIPTION_SCROLL_SPEED},                            // DescriptionScrollSpeed
-    {0, 2, 1, LOCKING_MODE},                                               // LockingMode
+    {0, 2, 1, LOCKING_MODE},                                        // LockingMode
-    {0, 99, 1, POWER_PULSE_DEFAULT},                                       // KeepAwakePulse
+    {0, 99, 1, POWER_PULSE_DEFAULT},                                // KeepAwakePulse
-    {1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT},                // KeepAwakePulseWait
+    {1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT},         // KeepAwakePulseWait
-    {1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT},        // KeepAwakePulseDuration
+    {1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration
-    {360, 900, 1, VOLTAGE_DIV},                                            // VoltageDiv
+    {360, 900, 1, VOLTAGE_DIV},                                     // VoltageDiv
-    {0, MAX_TEMP_F, 10, BOOST_TEMP},                                       // BoostTemp
+    {0, MAX_TEMP_F, 10, BOOST_TEMP},                                // BoostTemp
-    {MIN_CALIBRATION_OFFSET, 2500, 1, CALIBRATION_OFFSET},                 // CalibrationOffset
+    {MIN_CALIBRATION_OFFSET, 2500, 1, CALIBRATION_OFFSET},          // CalibrationOffset
-    {0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, POWER_LIMIT},                  // PowerLimit
+    {0, MAX_POWER_LIMIT, POWER_LIMIT_STEPS, POWER_LIMIT},           // PowerLimit
-    {0, 1, 1, REVERSE_BUTTON_TEMP_CHANGE},                                 // ReverseButtonTempChangeEnabled
+    {0, 1, 1, REVERSE_BUTTON_TEMP_CHANGE},                          // ReverseButtonTempChangeEnabled
-    {5, TEMP_CHANGE_LONG_STEP_MAX, 5, TEMP_CHANGE_LONG_STEP},              // TempChangeLongStep
+    {5, TEMP_CHANGE_LONG_STEP_MAX, 5, TEMP_CHANGE_LONG_STEP},       // TempChangeLongStep
-    {1, TEMP_CHANGE_SHORT_STEP_MAX, 1, TEMP_CHANGE_SHORT_STEP},            // TempChangeShortStep
+    {1, TEMP_CHANGE_SHORT_STEP_MAX, 1, TEMP_CHANGE_SHORT_STEP},     // TempChangeShortStep
-    {0, 9, 1, 7},                                                          // HallEffectSensitivity
+    {0, 9, 1, 7},                                                   // HallEffectSensitivity
-    {0, 9, 1, 0},                                                          // AccelMissingWarningCounter
+    {0, 9, 1, 0},                                                   // AccelMissingWarningCounter
-    {0, 9, 1, 0},                                                          // PDMissingWarningCounter
+    {0, 9, 1, 0},                                                   // PDMissingWarningCounter
-    {0, 0xFFFF, 0, 41431 /*EN*/},                                          // UILanguage
+    {0, 0xFFFF, 0, 41431 /*EN*/},                                   // UILanguage
-    {0, 50, 1, 20},                                                        // PDNegTimeout
+    {0, 50, 1, 20},                                                 // PDNegTimeout
-    {0, 1, 1, 0},                                                          // OLEDInversion
+    {0, 1, 1, 0},                                                   // OLEDInversion
-    {MIN_BRIGHTNESS, MAX_BRIGHTNESS, BRIGHTNESS_STEP, DEFAULT_BRIGHTNESS}, // OLEDBrightness
+    {0, 99, 11, 33},                                                // OLEDBrightness
-    {0, 5, 1, 1},                                                          // LOGOTime
+    {0, 5, 1, 1},                                                   // LOGOTime
-    {0, 1, 1, 0},                                                          // CalibrateCJC
+    {0, 1, 1, 0},                                                   // CalibrateCJC
-    {0, 1, 1, 1},                                                          // BluetoothLE
+    {0, 1, 1, 1},                                                   // BLEEnabled
-    {0, 1, 1, 1},                                                          // PDVpdo
+
 };
 static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength));
 
@@ -140,16 +140,15 @@ void resetSettings() {
 
 void setSettingValue(const enum SettingsOptions option, const uint16_t newValue) {
   const auto constants                       = settingsConstants[(int)option];
-  uint16_t constrainedValue = newValue;
+  systemSettings.settingsValues[(int)option] = newValue;
-  if (constrainedValue < constants.min) {
+  // If less than min, constrain
-    // If less than min, constrain
+  if (systemSettings.settingsValues[(int)option] < constants.min) {
-    constrainedValue = constants.min;
+    systemSettings.settingsValues[(int)option] = constants.min;
   }
-  else if (constrainedValue > constants.max) {
+  // If hit max, constrain
-    // If hit max, constrain
+  if (systemSettings.settingsValues[(int)option] > constants.max) {
-    constrainedValue = constants.max;
+    systemSettings.settingsValues[(int)option] = constants.max;
   }
-  systemSettings.settingsValues[(int)option] = constrainedValue;
 }
 // Lookup wrapper for ease of use (with typing)
 uint16_t getSettingValue(const enum SettingsOptions option) { return systemSettings.settingsValues[(int)option]; }

source/Core/Src/settingsGUI.cpp

@@ -26,7 +26,6 @@ static void displayQCInputV(void);
 #endif
 #if POW_PD
 static void displayPDNegTimeout(void);
-static void displayPDVpdo(void);
 #endif
 static void displaySensitivity(void);
 static void displayShutdownTime(void);
@@ -43,7 +42,7 @@ static void displayAdvancedIDLEScreens(void);
 static void displayScrollSpeed(void);
 static void displayPowerLimit(void);
 #ifdef BLE_ENABLED
-static void displayBluetoothLE(void);
+static void displayBLEEnabled(void);
 #endif
 #ifndef NO_DISPLAY_ROTATE
 static bool setDisplayRotation(void);
@@ -101,7 +100,6 @@ static bool enterAdvancedMenu(void);
  *  -Minimum Voltage
  *  QC Voltage
  *  PD Timeout
- *  PDVpdo
  *
  * Soldering
  *  Boost Mode Temp
@@ -132,7 +130,6 @@ static bool enterAdvancedMenu(void);
  *  Detailed Soldering
  *
  * Advanced
- *  BluetoothLE
  *  Power Limit
  *  Calibrate CJC At Next Boot
  *  Calibrate Input V
@@ -172,7 +169,6 @@ const menuitem powerMenu[] = {
  *  -Minimum Voltage
  *  QC Voltage
  *  PD Timeout
- *  PDVpdo
  */
 #ifdef POW_DC
     {SETTINGS_DESC(SettingsItemIndex::DCInCutoff), nullptr, displayInputVRange, nullptr, SettingsOptions::MinDCVoltageCells, SettingsItemIndex::DCInCutoff, 6},            /*Voltage input*/
@@ -183,7 +179,6 @@ const menuitem powerMenu[] = {
 #endif
 #if POW_PD
     {SETTINGS_DESC(SettingsItemIndex::PDNegTimeout), nullptr, displayPDNegTimeout, nullptr, SettingsOptions::PDNegTimeout, SettingsItemIndex::PDNegTimeout, 5}, /*PD timeout setup*/
-    {SETTINGS_DESC(SettingsItemIndex::PDVpdo), nullptr, displayPDVpdo, nullptr, SettingsOptions::PDVpdo, SettingsItemIndex::PDVpdo, 7 }, /*Toggle PPS & EPR*/
 #endif
     {0, nullptr, nullptr, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::NUM_ITEMS, 0} // end of menu marker. DO NOT REMOVE
 };
@@ -264,7 +259,7 @@ const menuitem UIMenu[] = {
 };
 const menuitem advancedMenu[] = {
 /*
- *  BluetoothLE
+ *  BLE Enabled or not
  *  Power Limit
  *  Calibrate CJC At Next Boot
  *  Calibrate Input V
@@ -274,9 +269,9 @@ const menuitem advancedMenu[] = {
  *  Factory Reset
  */
 #ifdef BLE_ENABLED
-    {SETTINGS_DESC(SettingsItemIndex::BluetoothLE), nullptr, displayBluetoothLE, nullptr, SettingsOptions::BluetoothLE, SettingsItemIndex::BluetoothLE, 7}, /*Toggle BLE*/
+    {SETTINGS_DESC(SettingsItemIndex::BLEEnabled), nullptr, displayBLEEnabled, nullptr, SettingsOptions::BLEEnabled, SettingsItemIndex::BLEEnabled, 7}, /*Advanced idle screen*/
 #endif
-    {SETTINGS_DESC(SettingsItemIndex::PowerLimit), nullptr, displayPowerLimit, nullptr, SettingsOptions::PowerLimit, SettingsItemIndex::PowerLimit, 4}, /*Power limit*/
+    {SETTINGS_DESC(SettingsItemIndex::PowerLimit), nullptr, displayPowerLimit, nullptr, SettingsOptions::PowerLimit, SettingsItemIndex::PowerLimit, 5}, /*Power limit*/
     {SETTINGS_DESC(SettingsItemIndex::CalibrateCJC), setCalibrate, displayCalibrate, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::CalibrateCJC,
      7}, /*Calibrate Cold Junktion Compensation at next boot*/
     {SETTINGS_DESC(SettingsItemIndex::VoltageCalibration), setCalibrateVIN, displayCalibrateVIN, nullptr, SettingsOptions::SettingsOptionsLength, SettingsItemIndex::VoltageCalibration,
@@ -381,7 +376,6 @@ static void displayPDNegTimeout(void) {
     OLED::printNumber(value, 3, FontStyle::LARGE);
   }
 }
-static void displayPDVpdo(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::PDVpdo)); }
 #endif
 
 static bool setBoostTemp(void) {
@@ -619,7 +613,7 @@ static void displayAnimationLoop(void) { OLED::drawCheckbox(getSettingValue(Sett
 
 static void displayBrightnessLevel(void) {
 
-  OLED::printNumber((getSettingValue(SettingsOptions::OLEDBrightness) / BRIGHTNESS_STEP + 1), 2, FontStyle::LARGE);
+  OLED::printNumber((getSettingValue(SettingsOptions::OLEDBrightness) / 11 + 1), 2, FontStyle::LARGE);
   // While not optimal to apply this here, it is _very_ convienient
   OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness));
 }
@@ -647,14 +641,14 @@ static void displayAdvancedIDLEScreens(void) { OLED::drawCheckbox(getSettingValu
 
 static void displayAdvancedSolderingScreens(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::DetailedSoldering)); }
 #ifdef BLE_ENABLED
-static void displayBluetoothLE(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::BluetoothLE)); }
+static void displayBLEEnabled(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::BLEEnabled)); }
 #endif
 static void displayPowerLimit(void) {
 
   if (getSettingValue(SettingsOptions::PowerLimit) == 0) {
     OLED::print(translatedString(Tr->OffString), FontStyle::LARGE);
   } else {
-    OLED::printNumber(getSettingValue(SettingsOptions::PowerLimit), 3, FontStyle::LARGE);
+    OLED::printNumber(getSettingValue(SettingsOptions::PowerLimit), 2, FontStyle::LARGE);
     OLED::print(LargeSymbolWatts, FontStyle::LARGE);
   }
 }

source/Core/Threads/OperatingModes/DebugMenu.cpp

@@ -1,11 +1,9 @@
 #include "OperatingModes.h"
-extern osThreadId    GUITaskHandle;
+extern osThreadId GUITaskHandle;
-extern osThreadId    MOVTaskHandle;
+extern osThreadId MOVTaskHandle;
-extern osThreadId    PIDTaskHandle;
+extern osThreadId PIDTaskHandle;
-extern OperatingMode currentMode;
 
 void showDebugMenu(void) {
-  currentMode        = OperatingMode::debug;
   uint8_t     screen = 0;
   ButtonState b;
   for (;;) {

source/Core/Threads/OperatingModes/HomeScreen.cpp

@@ -5,10 +5,9 @@
 #define MOVEMENT_INACTIVITY_TIME (60 * configTICK_RATE_HZ)
 #define BUTTON_INACTIVITY_TIME   (60 * configTICK_RATE_HZ)
 
-uint8_t              buttonAF[sizeof(buttonA)];
+uint8_t buttonAF[sizeof(buttonA)];
-uint8_t              buttonBF[sizeof(buttonB)];
+uint8_t buttonBF[sizeof(buttonB)];
-uint8_t              disconnectedTipF[sizeof(disconnectedTip)];
+uint8_t disconnectedTipF[sizeof(disconnectedTip)];
-extern OperatingMode currentMode;
 
 void renderHomeScreenAssets(void) {
 
@@ -30,7 +29,6 @@ void drawHomeScreen(bool buttonLockout) {
   renderHomeScreenAssets();
 
   for (;;) {
-    currentMode         = OperatingMode::idle;
     ButtonState buttons = getButtonState();
     if (buttons != BUTTON_NONE) {
       OLED::setDisplayState(OLED::DisplayState::ON);
@@ -65,7 +63,6 @@ void drawHomeScreen(bool buttonLockout) {
       }
       break;
     case BUTTON_B_SHORT:
-      currentMode = OperatingMode::settings;
       enterSettingsMenu(); // enter the settings menu
       {
         OLED::useSecondaryFramebuffer(true);

source/Core/Threads/OperatingModes/OperatingModes.cpp

@@ -1,8 +0,0 @@
-//
-// Created by Thomas White on 3/02/2023.
-//
-
-#include "OperatingModes.h"
-
-// Global variables
-OperatingMode currentMode = OperatingMode::idle;

source/Core/Threads/OperatingModes/OperatingModes.h

@@ -24,14 +24,6 @@ extern "C" {
 #endif
 
 // Exposed modes
-enum OperatingMode {
-    idle      = 0,
-    soldering = 1,
-    boost     = 2,
-    sleeping  = 3,
-    settings  = 4,
-    debug     = 5
-};
 
 void performCJCC(void);                                            // Used to calibrate the Cold Junction offset
 void gui_solderingTempAdjust(void);                                // For adjusting the setpoint temperature of the iron

source/Core/Threads/OperatingModes/Sleep.cpp

@@ -1,10 +1,7 @@
 #include "OperatingModes.h"
 
-extern OperatingMode currentMode;
-
 int gui_SolderingSleepingMode(bool stayOff, bool autoStarted) {
   // Drop to sleep temperature and display until movement or button press
-  currentMode = OperatingMode::sleeping;
 
   for (;;) {
     // user moved or pressed a button, go back to soldering

source/Core/Threads/OperatingModes/Soldering.cpp

@@ -1,8 +1,7 @@
 
 #include "OperatingModes.h"
 
-extern bool          heaterThermalRunaway;
+extern bool heaterThermalRunaway;
-extern OperatingMode currentMode;
 
 void gui_solderingMode(uint8_t jumpToSleep) {
   /*
@@ -21,7 +20,6 @@ void gui_solderingMode(uint8_t jumpToSleep) {
    */
   bool boostModeOn   = false;
   bool buttonsLocked = false;
-  currentMode        = OperatingMode::soldering;
 
   if (jumpToSleep) {
     if (gui_SolderingSleepingMode(jumpToSleep == 2, true) == 1) {
@@ -45,7 +43,6 @@ void gui_solderingMode(uint8_t jumpToSleep) {
         // if boost mode is enabled turn it on
         if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == 1)) {
           boostModeOn = true;
-          currentMode = OperatingMode::boost;
         }
         break;
         // fall through
@@ -64,17 +61,14 @@ void gui_solderingMode(uint8_t jumpToSleep) {
       case BUTTON_NONE:
         // stay
         boostModeOn = false;
-        currentMode = OperatingMode::soldering;
         break;
       case BUTTON_BOTH:
       case BUTTON_B_LONG:
         return; // exit on back long hold
       case BUTTON_F_LONG:
         // if boost mode is enabled turn it on
-        if (getSettingValue(SettingsOptions::BoostTemp)) {
+        if (getSettingValue(SettingsOptions::BoostTemp))
           boostModeOn = true;
-          currentMode = OperatingMode::boost;
-        }
         break;
       case BUTTON_F_SHORT:
       case BUTTON_B_SHORT: {

source/Core/Threads/OperatingModes/USBPDDebug.cpp

@@ -40,12 +40,12 @@ void showPDDebug(void) {
         if ((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_FIXED) {
           voltage_mv     = PD_PDV2MV(PD_PDO_SRC_FIXED_VOLTAGE_GET(lastCaps[screen - 1])); // voltage in mV units
           current_a_x100 = PD_PDO_SRC_FIXED_CURRENT_GET(lastCaps[screen - 1]);            // current in 10mA units
-        } else if (((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) && ((lastCaps[screen - 1] & PD_APDO_TYPE) == PD_APDO_TYPE_AVS)) {
+        } else if ((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) {
           voltage_mv  = PD_PAV2MV(PD_APDO_AVS_MAX_VOLTAGE_GET(lastCaps[screen - 1]));
           min_voltage = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCaps[screen - 1]));
           // Last value is wattage
           wattage = PD_APDO_AVS_MAX_POWER_GET(lastCaps[screen - 1]);
-        } else if (((lastCaps[screen - 1] & PD_PDO_TYPE) == PD_PDO_TYPE_AUGMENTED) && ((lastCaps[screen - 1] & PD_APDO_TYPE) == PD_APDO_TYPE_PPS)) {
+        } else {
           voltage_mv     = PD_PAV2MV(PD_APDO_PPS_MAX_VOLTAGE_GET(lastCaps[screen - 1]));
           min_voltage    = PD_PAV2MV(PD_APDO_PPS_MIN_VOLTAGE_GET(lastCaps[screen - 1]));
           current_a_x100 = PD_PAI2CA(PD_APDO_PPS_CURRENT_GET(lastCaps[screen - 1])); // max current in 10mA units
@@ -70,7 +70,7 @@ void showPDDebug(void) {
           } else {
             OLED::printNumber(current_a_x100 / 100, 2, FontStyle::SMALL, true); // print the current in 0.1A res
             OLED::print(SmallSymbolDot, FontStyle::SMALL);
-            OLED::printNumber(current_a_x100 % 100, 2, FontStyle::SMALL, false); // print the current in 0.1A res
+            OLED::printNumber(current_a_x100 % 100, 2, FontStyle::SMALL, true); // print the current in 0.1A res
             OLED::print(SmallSymbolAmps, FontStyle::SMALL);
           }
         }
@@ -90,4 +90,4 @@ void showPDDebug(void) {
   }
 }
 #endif
-#endif
+#endif

source/build.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -e
+
 TRANSLATION_DIR="../Translations"
-#TRANSLATION_SCRIPT="make_translation.py"
+TRANSLATION_SCRIPT="make_translation.py"
 
 # AVAILABLE_LANGUAGES will be calculating according to json files in $TRANSLATION_DIR
 AVAILABLE_LANGUAGES=()
@@ -9,64 +10,30 @@ BUILD_LANGUAGES=()
 AVAILABLE_MODELS=("TS100" "TS80" "TS80P" "Pinecil" "MHP30" "Pinecilv2")
 BUILD_MODELS=()
 
-builder_info() {
-    echo -e "
-********************************************
-               IronOS Firmware
-        builder for Miniware + Pine64
-
-                                    by Ralim
-********************************************"
-}
-
-# Calculate available languages
-for f in "$TRANSLATION_DIR"/translation_*.json; do
-    AVAILABLE_LANGUAGES+=("$(echo "$f" | tr "[:lower:]" "[:upper:]" | sed "s/[^_]*_//" | sed "s/\.JSON//g")")
-done
-
 usage() {
-    builder_info
+    echo "Usage : $(basename "$0") [-l <LANG_CODE>] [-m <TS100|TS80|TS80P|Pinecil|MHP30>] [-h]
-    echo -e "
-Usage : 
-    $(basename "$0") [-l <LANG_CODES>] [-m <MODELS>] [-h]
 
 Parameters :
-    -l LANG_CODE : Force a specific language (${AVAILABLE_LANGUAGES[*]})
+    -l LANG_CODE : Force a specific language (E.g. : EN, FR, NL_BE, ...)
-    -m MODEL     : Force a specific model (${AVAILABLE_MODELS[*]})
+    -m MODEL     : Force a specific model (E.g. : TS100 or TS80)
     -h           : Show this help message
 
-Example : 
+INFO : By default, without parameters, the build is for all platforms and all languages" 1>&2
-    $(basename "$0") -l EN -m TS100                     (Build one language and model)
-    $(basename "$0") -l EN -m \"TS100 MHP30\"             (Build one language and multi models)
-    $(basename "$0") -l \"DE EN\" -m \"TS100 MHP30\"        (Build multi languages and models)
-
-INFO : 
-    By default, without parameters, the build is for all platforms and all languages
-
-" 1>&2
     exit 1
 }
 
-StartBuild(){ 
-    read -n 1 -r -s -p $'Press Enter to start the building process...\n' 
-}
-
 checkLastCommand() {
     if [ $? -eq 0 ]; then
         echo "    [Success]"
-        echo "********************************************"
+        echo "*********************************************"
     else
-        forceExit "checkLastCommand"
+        forceExit
     fi
 }
 
 forceExit() {
-    if [ -n "$*" ]; then
+    echo "    [Error]"
-        echo -e "\n\n    [Error]: $*"
+    echo "*********************************************"
-    else
-        echo "    [Error]"
-    fi
-    echo "********************************************"
     echo " -- Stop on error --"
     exit 1
 }
@@ -82,86 +49,72 @@ isInArray() {
     return 1
 }
 
-declare -a margs=()
+while getopts h:l:m: option; do
-declare -a largs=()
-
-while getopts "h:l:m:" option; do
     case "${option}" in
-        h)
+    h)
-            usage
+        usage
-            ;;
+        ;;
-        l)  
+    l)
-            set -f 
+        LANGUAGEREQ=${OPTARG}
-            IFS=' '
+        ;;
-            largs=($OPTARG)
+    m)
-            ;;
+        MODEL=${OPTARG}
-        m)  
+        ;;
-            set -f 
+    *)
-            IFS=' '
+        usage
-            margs=($OPTARG)
-            ;;
-        *)
-            usage
         ;;
     esac
 done
 shift $((OPTIND - 1))
-builder_info
+
+echo "*********************************************"
+echo "             Builder for the"
+echo "      Alternate Open Source Firmware"
+echo "        for Miniware + Pine64"
+echo "                                     by Ralim"
+echo "                                             "
+echo "*********************************************"
+
+# Calculate available languages
+for f in "$TRANSLATION_DIR"/translation_*.json; do
+    AVAILABLE_LANGUAGES+=("$(echo "$f" | tr "[:lower:]" "[:upper:]" | sed "s/[^_]*_//" | sed "s/\.JSON//g")")
+done
 
 # Checking requested language
-echo -n "Available languages :"
+echo "Available languages :"
-echo " ${AVAILABLE_LANGUAGES[*]}"
+echo "    ${AVAILABLE_LANGUAGES[*]}"
-echo -n "Requested languages : "
+echo "Requested languages :"
-if ((${#largs[@]})); then
+if [ -n "$LANGUAGEREQ" ]; then
-    for i in "${largs[@]}"; do
+    if isInArray "$LANGUAGEREQ" "${AVAILABLE_LANGUAGES[@]}"; then
-        i=$(echo "${i}" | tr '[:lower:]' '[:upper:]')
+        echo "    $LANGUAGEREQ"
-        if isInArray "$i" "${AVAILABLE_LANGUAGES[@]}"; then
+        BUILD_LANGUAGES+=("$LANGUAGEREQ")
-            echo -n "$i "
+    else
-            BUILD_LANGUAGES+=("$i")
+        echo "    $LANGUAGEREQ doesn't exist"
-        else
+        forceExit
-            forceExit "Language '$i' is unknown. Check and use only from the available languages."
+    fi
-        fi
+else
-    done
+    echo "    [ALL LANGUAGES]"
-    echo ""
-fi
-if [ -z "$BUILD_LANGUAGES" ]; then
-    echo "    No custom languages selected."
-    echo "    Building: [ALL LANGUAGES]"
     BUILD_LANGUAGES+=("${AVAILABLE_LANGUAGES[@]}")
 fi
-echo "********************************************"
+echo "*********************************************"
 
 # Checking requested model
-echo -n "Available models :"
+echo "Available models :"
-echo " ${AVAILABLE_MODELS[*]}"
+echo "    ${AVAILABLE_MODELS[*]}"
-echo -n "Requested models : "
+echo "Requested models :"
-if ((${#margs[@]})); then
+if [ -n "$MODEL" ]; then
-    for i in "${margs[@]}"; do
+    if isInArray "$MODEL" "${AVAILABLE_MODELS[@]}"; then
-        
+        echo "    $MODEL"
-        if [[ "$i" != "Pinecil" ]] && [[ "$i" != "Pinecilv2" ]]; then # Dirty. Need to adapt the Build process to use upper cases only
+        BUILD_MODELS+=("$MODEL")
-            i=$(echo "${i}" | tr '[:lower:]' '[:upper:]')
+    else
-        fi
+        echo "    $MODEL doesn't exist"
-        
+        forceExit
-        if isInArray "$i" "${AVAILABLE_MODELS[@]}"; then
+    fi
-            echo -n "$i "
+else
-            BUILD_MODELS+=("$i")
+    echo "    [ALL MODELS]"
-        else
-            forceExit "Model '$i' is unknown. Check and use only from the available models."
-        fi
-    done
-    echo ""
-fi
-
-if [ -z "$BUILD_MODELS" ]; then
-    echo "    No custom models selected."
-    echo "    Building: [ALL MODELS]"
     BUILD_MODELS+=("${AVAILABLE_MODELS[@]}")
 fi
-
+echo "*********************************************"
-echo "********************************************"
-
-##
-#StartBuild
 
 if [ ${#BUILD_LANGUAGES[@]} -gt 0 ] && [ ${#BUILD_MODELS[@]} -gt 0 ]; then
     echo "Cleaning previous builds"
@@ -176,7 +129,8 @@ if [ ${#BUILD_LANGUAGES[@]} -gt 0 ] && [ ${#BUILD_MODELS[@]} -gt 0 ]; then
         checkLastCommand
     done
 else
-    forceExit "Nothing to build. (no model or language specified)"
+    echo "Nothing to build. (no model or language specified)"
+    forceExit
 fi
 echo " -- Firmwares successfully generated --"
 echo "End..."

source/version.h

@@ -4,4 +4,4 @@
  * i.e.: BUILD_VERSION = 'Rel. v2.08' --> Will generated to: 'v2.08.1a2b3c4'
  */
 
-#define BUILD_VERSION "v2.21"
+#define BUILD_VERSION "v2.20"