Merge branch 'dev' into epr-pinecil-og

* Root directory refactoring: - move info about Bootup Logo from a sepatate README to main README; - replace separate root scripts build.sh and start_dev.sh by root Makefile; - make Scripts directory and move there: flash_ts100_linux.sh script, ci/ directory, dockerfile, LICENSE_RELEASE, and PULL_REQUEST_TEMPLATE; - reconfigure build & deploy scripts according to changes

* Scripts => scripts

* Scripts -> scripts: re-add missing renamed files

* Directories refactoring: add top-level Makefile, add scripts/deploy.sh script, move github templates from top-level dir to .github, organize files inside Development Resources

* Update scripts/deploy.sh accroding to codestyle syntax shellcheck

* Makefile: add docs-deploy target for mkdocs gh-deploy

* Rename IronOS.yml > Env.yml, update related files

* Docs configs: remove empty characters

* docs/devel: update usage of new script

.github/workflows/docs.yml

@@ -35,6 +35,6 @@ jobs:
               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 -f scripts/IronOS-mkdocs.yml -d ../site

.github/workflows/push.yml

@@ -9,7 +9,7 @@ jobs:
       image: alpine:3.16
     strategy:
       matrix:
-        model: ["TS100", "TS80", "TS80P", "Pinecil", "MHP30", "Pinecilv2"]
+        model: ["TS100", "TS80", "TS80P", "Pinecil", "MHP30", "Pinecilv2", "S60", "TS101"]
       fail-fast: true
 
     steps:
@@ -32,7 +32,7 @@ jobs:
       - name: copy license text
         run: |
           cp LICENSE source/Hexfile/LICENSE
-          cp LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md
+          cp scripts/LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md
 
       - name: Archive ${{ matrix.model }} artifacts
         uses: actions/upload-artifact@v3
@@ -83,7 +83,7 @@ jobs:
       - name: copy license text
         run: |
           cp LICENSE source/Hexfile/LICENSE
-          cp LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md
+          cp scripts/LICENSE_RELEASE.md source/Hexfile/LICENSE_RELEASE.md
 
       - name: Archive ${{ matrix.model }} artifacts
         uses: actions/upload-artifact@v3

Bootup Logo/README.md

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

Documentation/Development.md

@@ -125,7 +125,7 @@ On Windows follow the instructions on the official documentation to install 'Win
 
     ```sh
     cd IronOS
-    ./start_dev.sh
+    ./scripts/deploy.sh
     ```
 
     This script will build a Docker image and run a container with the necessary tools to build the firmware.

Documentation/Flashing/MHP30.md

@@ -55,7 +55,7 @@ sgr1ff1n (Shane) commented in [issue 11](https://github.com/Ralim/IronOS/issues/
 
 While in the past there were reports of unreliable upgrades, the consensus in [issue 11](https://github.com/Ralim/IronOS/issues/11) is that things work mostly as expected in Linux.
 
-@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/master/Flashing/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.
+@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/dev/scripts/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.
 
 If you want to do it manually (or if the script does not work for some reason) the general procedure is the same as for Windows, the differences are in the way to mount the unit and copy the firmware.
 Remember that after flashing, the firmware filename will have changed to end in `.RDY` or `.ERR` or `.NOT` and only `.RDY` means the flashing was successful!

Documentation/Flashing/TS100.md

@@ -55,7 +55,7 @@ sgr1ff1n (Shane) commented in [issue 11](https://github.com/Ralim/IronOS/issues/
 
 While in the past there were reports of unreliable upgrades, the consensus in [issue 11](https://github.com/Ralim/IronOS/issues/11) is that things work mostly as expected in Linux.
 
-@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/master/Flashing/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.
+@awigen has contributed a script [flash_ts100_linux.sh](https://raw.githubusercontent.com/Ralim/IronOS/dev/scripts/flash_ts100_linux.sh) that works on Ubuntu 16.04 as well as other distros.
 
 If you want to do it manually (or if the script does not work for some reason) the general procedure is the same as for Windows, the differences are in the way to mount the unit and copy the firmware.
 Remember that after flashing, the firmware filename will have changed to end in `.RDY` or `.ERR` or `.NOT` and only `.RDY` means the flashing was successful!

Documentation/GettingStarted.md

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

Documentation/Menu.md

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

Env.yml

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

Makefile

@@ -0,0 +1,125 @@
+#!/usr/bin/env make
+INFO:=top-level Makefile for IronOS - Soldering Iron Open Source Firmware Project.
+
+
+### global adjustable variables
+
+# command for "docker compose" from DOCKER env. var.
+ifdef DOCKER
+DOCKER_BIN:=$(DOCKER)
+else
+DOCKER_BIN:=
+endif
+
+# detect availability of docker
+ifndef DOCKER_BIN
+DOCKER_COMPOSE:=$(shell command -v docker-compose 2>/dev/null)
+DOCKER_TOOL:=$(shell command -v docker 2>/dev/null)
+ifdef DOCKER_COMPOSE
+DOCKER_BIN:=$(DOCKER_COMPOSE)
+else ifdef DOCKER_TOOL
+DOCKER_BIN:=$(DOCKER_TOOL) compose
+else
+$(error ERROR: Can't find docker-compose nor docker tool. Please, install docker and try again)
+endif # DOCKER_* checks
+endif # DOCKER_BIN
+
+# command for python-based mkdocs tool
+ifndef MKDOCS
+MKDOCS:=mkdocs
+endif
+
+
+### global static variables
+
+# docker-related files
+DOCKER_YML=$(CURDIR)/Env.yml
+DOCKER_FILE=$(CURDIR)/scripts/IronOS.Dockerfile
+
+# docker dependencies
+DOCKER_DEPS=$(DOCKER_YML) $(DOCKER_FILE)
+
+# compose docker-compose command
+DOCKER_CMD=$(DOCKER_BIN)  -f $(DOCKER_YML)  run  --rm  builder
+
+# MkDocs config
+MKDOCS_YML=$(CURDIR)/scripts/IronOS-mkdocs.yml
+
+
+### targets
+
+# default target to show help
+help:
+	@echo
+	@echo "Welcome!\nThis is $(INFO)"
+	@echo "To read more about supported commands (aka \"targets\"), type \"make list\"."
+	@echo "But if you're impatient then just type \"make docker-build\" - it will:"
+	@echo "\t * download, configure & start docker container"
+	@echo "\t * compile builds of IronOS firmware for all supported models inside that container"
+	@echo "\t * export generated binaries to \"scripts/ci/artefacts/\" local directory"
+	@echo "Patches are welcome. Happy Hacking!"
+	@echo
+
+# target to list supported targets with additional info
+list:
+	@echo ""
+	@echo "Supported top-level targets:"
+	@echo "\t * help - shows short basic help"
+	@echo "\t * list - this output"
+	@echo "\t * docker-shell - start docker container with shell inside to work on IronOS with all tools needed"
+	@echo "\t * docker-build - compile builds of IronOS for supported models inside docker container and place them to \"scripts/ci/artefacts/\""
+	@echo "\t * docker-clean - delete created docker container (but not pre-downloaded data for it)"
+	@echo "\t * docs - generate \"site\"/ directory with documentation in a form of static html files using ReadTheDocs framework and $(MKDOCS_YML) local config file"
+	@echo "\t * docs-deploy - generate & deploy docs online to gh-pages branch of current github repo"
+	@echo "\t * clean-full - delete files & directories generated by all the targets above "
+	@echo ""
+	@echo "NOTES on supported pass-trough targets:"
+	@echo "\t * main Makefile is located in source/ directory and used to build the firmware itself;"
+	@echo "\t * this top-level Makefile supports to call targets from source/Makefile;"
+	@echo "\t * if you set up development environment right on your host, then to build firmware locally, you can just type right from here:"
+	@echo
+	@echo "\t> make firmware-LANG_ID model=MODEL_ID"
+	@echo
+	@echo "Full list of current supported IDs:"
+	@echo "\t * LANG_ID: BE BG CS DA DE EL EN ES FI FR HR HU IT JA_JP LT NB NL_BE NL PL PT RO RU SK SL SR_CYRL SR_LATN SV TR UK VI YUE_HK ZH_CN ZH_TW"
+	@echo "\t * MODEL_ID: TS100 TS101 TS80 TS80P MHP30 Pinecil Pinecilv2 S60"
+	@echo
+	@echo "For example, to make a local build of IronOS firmware for TS100 with English language, just type:"
+	@echo "\n\t> make firmware-EN model=TS100"
+	@echo
+
+# bash one-liner to generate langs for "make list":
+# echo "`ls Translations/ | grep -e "^translation_.*.json$" | sed -e 's,^translation_,,g; s,\.json$,,g; ' | tr '\n' ' '`"
+
+# former start_dev.sh
+docker-shell: $(DOCKER_DEPS)
+	$(DOCKER_CMD)
+
+# former build.sh
+docker-build: $(DOCKER_DEPS)
+	$(DOCKER_CMD)  /bin/bash  /build/ci/buildAll.sh
+
+# delete container
+docker-clean:
+	-docker  rmi  ironos-builder:latest
+
+# generate docs in site/ directory (DIR for -d is relative to mkdocs.yml file location, hence use default name/location site by setting up ../site)
+docs: $(MKDOCS_YML)  Documentation/*  Documentation/Flashing/*  Documentation/images/*
+	$(MKDOCS)  build  -f $(MKDOCS_YML)  -d ../site
+
+# deploy docs to gh-pages branch of current repo automagically using ReadTheDocs framework
+docs-deploy: $(MKDOCS_YML)  Documentation/*  Documentation/Flashing/*  Documentation/images/*
+	$(MKDOCS)  gh-deploy  -f $(MKDOCS_YML)  -d ../site
+
+# pass-through target for Makefile inside source/ dir
+%:
+	make  -C source/  $@
+
+# global clean-up target
+clean-full: docker-clean
+	make  -C source/  clean-all
+	rm  -Rf  site
+	rm  -Rf  scripts/ci/artefacts
+
+.PHONY:  docker-shell  docker-build  docker-clean  docs  clean-full
+

README.md

@@ -67,9 +67,15 @@ For notes on installation for your device, please refer to the flashing guide fo
 - Boost mode lets you temporarily change the temperature when soldering (i.e. raise the temperature for short periods)
 - (TS100/Pinecil) Battery charge level indicator if power source set to a lipo cell count
 - (TS80/TS80P/Pinecil) Power bank operating voltage is displayed
-- [Custom boot up logo support](https://ralim.github.io/IronOS/Logo/)
+- [Custom boot up logo support](https://ralim.github.io/IronOS/Logo/)[^bootlogo]
 - Automatic LCD rotation based on the orientation
 
+
+[^bootlogo]: **BOOTUP LOGO NOTICE**:
+  IronOS supports both a bootup logo _AND_ bootup animations.
+  However, _**they are no longer included in this repo**_.
+  **Please, [read the docs](https://ralim.github.io/IronOS/Logo/) for more information**.
+
 ## Menu System
 
 This new firmware uses a new menu system to allow access to the settings on the device.

Translations/make_translation.py

@@ -66,6 +66,29 @@ def read_translation(json_root: Union[str, Path], lang_code: str) -> dict:
     return lang
 
 
+def filter_translation(lang: dict, defs: dict, macros: frozenset):
+    def check_excluded(record):
+        if "include" in record and not any(m in macros for m in record["include"]):
+            return True
+
+        if "exclude" in record and any(m in macros for m in record["exclude"]):
+            return True
+
+        return False
+
+    for category in ("menuOptions", "menuGroups"):
+        for index, record in enumerate(defs[category]):
+            if check_excluded(record):
+                lang[category][record["id"]]["displayText"] = ""
+                lang[category][record["id"]]["description"] = ""
+
+    for index, record in enumerate(defs["messagesWarn"]):
+        if check_excluded(record):
+            lang["messagesWarn"][record["id"]]["message"] = ""
+
+    return lang
+
+
 def validate_langcode_matches_content(filename: str, content: dict) -> None:
     # Extract lang code from file name
     lang_code = filename[12:-5].upper()
@@ -101,6 +124,8 @@ def get_constants() -> List[Tuple[str, str]]:
         ("SmallSymbolSpace", " "),
         ("LargeSymbolDot", "."),
         ("SmallSymbolDot", "."),
+        ("SmallSymbolSlash", "/"),
+        ("SmallSymbolColon", ":"),
         ("LargeSymbolDegC", "C"),
         ("SmallSymbolDegC", "C"),
         ("LargeSymbolDegF", "F"),
@@ -155,6 +180,8 @@ def get_accel_names_list() -> List[str]:
         "BMA223",
         "MSA301",
         "SC7A20",
+        "GPIO",
+        "LIS2 CLONE",
     ]
 
 
@@ -162,8 +189,8 @@ def get_power_source_list() -> List[str]:
     return [
         "DC",
         "QC",
-        "PD W. VBus",
-        "PD No VBus",
+        "PV:PDwVBus",
+        "PD:No VBus",
     ]
 
 
@@ -250,7 +277,6 @@ def get_letter_counts(defs: dict, lang: dict, build_version: str) -> Dict:
     # collapse all strings down into the composite letters and store totals for these
     # Doing this seperately for small and big font
     def sort_and_count(list_in: List[str]):
-
         symbol_counts: dict[str, int] = {}
         for line in list_in:
             line = line.replace("\n", "").replace("\r", "")
@@ -439,7 +465,6 @@ class FontMapsPerFont:
 def get_font_map_per_font(
     text_list_small_font: List[str], text_list_large_font: List[str]
 ) -> FontMapsPerFont:
-
     pending_small_symbols = set(text_list_small_font)
     pending_large_symbols = set(text_list_large_font)
 
@@ -1029,7 +1054,6 @@ def get_translation_strings_and_indices_text(
     large_font_symbol_conversion_table: Dict[str, bytes],
     suffix: str = "",
 ) -> str:
-
     # For all strings; we want to convert them to their byte encoded form (using font index lookups)
     # Then we want to sort by their reversed format to see if we can remove any duplicates by combining the tails (last n bytes;n>0)
     # Finally we look for any that are contained inside one another, and if they are we update them to point to this
@@ -1118,7 +1142,6 @@ def get_translation_strings_and_indices_text(
     translation_strings_text = "  /* .strings = */ {\n"
 
     for i, encoded_bytes in enumerate(byte_encoded_strings):
-
         if i > 0:
             translation_strings_text += ' "\\0"\n'
 
@@ -1285,6 +1308,13 @@ def parse_args() -> argparse.Namespace:
         required=False,
         dest="compress_font",
     )
+    parser.add_argument(
+        "--macros",
+        help="Extracted macros to filter translation strings by",
+        type=argparse.FileType("r"),
+        required=True,
+        dest="macros",
+    )
     parser.add_argument(
         "--output", "-o", help="Target file", type=argparse.FileType("w"), required=True
     )
@@ -1305,6 +1335,12 @@ def main() -> None:
         logging.error("error: Both --output-pickled and --input-pickled are specified")
         sys.exit(1)
 
+    macros = (
+        frozenset(re.findall(r"#define ([^ ]+)", args.macros.read()))
+        if args.macros
+        else frozenset()
+    )
+
     language_data: LanguageData
     if args.input_pickled:
         logging.info(f"Reading pickled language data from {args.input_pickled.name}...")
@@ -1329,11 +1365,13 @@ def main() -> None:
 
         defs_ = load_json(os.path.join(json_dir, "translations_definitions.json"))
         if len(args.languageCodes) == 1:
-            lang_ = read_translation(json_dir, args.languageCodes[0])
+            lang_ = filter_translation(
+                read_translation(json_dir, args.languageCodes[0]), defs_, macros
+            )
             language_data = prepare_language(lang_, defs_, build_version)
         else:
             langs_ = [
-                read_translation(json_dir, lang_code)
+                filter_translation(read_translation(json_dir, lang_code), defs_, macros)
                 for lang_code in args.languageCodes
             ]
             language_data = prepare_languages(langs_, defs_, build_version)

Translations/translation_BE.json

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

Translations/translation_BG.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Изкл."
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Allow locking\nbuttons",
             "description": "While soldering, hold down both buttons to toggle locking them (D=disable | B=boost mode only | F=full locking)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Усещане\nза движение",
             "description": "Усещане за движение (0=Изключено | 1=Слабо | ... | 9=Силно)"

Translations/translation_CS.json

@@ -4,7 +4,7 @@
     "tempUnitFahrenheit": false,
     "messagesWarn": {
         "CJCCalibrationDone": {
-            "message": "Calibration\ndone!"
+            "message": "Kalibrace\ndokončena!"
         },
         "ResetOKMessage": {
             "message": "Reset OK"
@@ -31,10 +31,10 @@
             "message": "Teplotní\nOchrana"
         },
         "SettingsCalibrationWarning": {
-            "message": "Before rebooting, make sure tip & handle are at room temperature!"
+            "message": "Před restartem se ujistěte, že hrot a držák mají pokojovou teplotu!"
         },
         "CJCCalibrating": {
-            "message": "calibrating\n"
+            "message": "kalibrování\n"
         },
         "SettingsResetWarning": {
             "message": "Opravdu chcete resetovat zařízení do továrního nastavení?"
@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Vyp"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
-            "message": "Your device is most likely a counterfeit!"
+            "message": "Vaše zařízení je s nejvyšší pravděpodobností padělek!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -121,7 +130,7 @@
         },
         "PDVpdo": {
             "displayText": "PD\nVPDO",
-            "description": "Enables PPS & EPR modes"
+            "description": "Povoluje režimy PPS & EPR"
         },
         "BoostTemperature": {
             "displayText": "Teplota\nboostu",
@@ -143,6 +152,62 @@
             "displayText": "Povolit zamč.\ntlačítek",
             "description": "Při pájení podržte obě tlačítka pro jejich zamčení (Z=zakázáno | B=pouze v režimu boost | U=úplné zamčení)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Citlivost\nna pohyb",
             "description": "0=vyp | 1=nejméně citlivé | ... | 9=nejvíce citlivé"
@@ -213,15 +278,15 @@
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Povoluje BLE"
         },
         "PowerLimit": {
             "displayText": "Omezení\nVýkonu",
             "description": "Maximální příkon páječky (W=watt)"
         },
         "CalibrateCJC": {
-            "displayText": "Calibrate CJC\nat next boot",
-            "description": "At next boot tip Cold Junction Compensation will be calibrated (not required if Delta T is < 5°C)"
+            "displayText": "Kalibrovat CJC\npři příštím startu",
+            "description": "Při příštím startu bude kalibrována kompenzace studeného spoje (není třeba pokud Delta T je < 5°C)"
         },
         "VoltageCalibration": {
             "displayText": "Kalibrovat\nvstupní napětí?",

Translations/translation_DA.json

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

Translations/translation_DE.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Aus"
         },
+        "ProfilePreheatString": {
+            "message": "Vorwärmen\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Abkühlen\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Höchstwahrscheinlich ist das Gerät eine Fälschung!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Zu heiß für\nProfilstart!"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Tasten-\nsperre",
             "description": "Langes drücken beider Tasten im Lötmodus sperrt diese (A=aus | B=nur Boost | V=vollständig)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhasen",
+            "description": "Anzahl an Phasen im Profilmodus"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Vorheiz-\ntemperatur",
+            "description": "Zu Beginn des Profilmodus auf diese Temperatur vorheizen"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Vorheiz-\nrate",
+            "description": "Mit dieser Geschwindigkeit vorheizen (Grad pro Sekunde)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemperatur",
+            "description": "Zieltemperatur zum Ende dieser Phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDauer",
+            "description": "Zieldauer dieser Phase (Sekunden)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemperatur",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDauer",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemperatur",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDauer",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemperatur",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDauer",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemperatur",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDauer",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Abkühl-\nrate",
+            "description": "Am Ende des Profilmodus mit dieser Geschwindigkeit abkühlen (Grad pro Sekunde)"
+        },
         "MotionSensitivity": {
             "displayText": "Bewegungs-\nempfindlichk.",
             "description": "0=aus | 1=minimal | ... | 9=maximal"
@@ -217,7 +282,7 @@
         },
         "PowerLimit": {
             "displayText": "Leistungs-\nmaximum",
-            "description": "Maximal zulässige Leistungsaufnahme des Lötkolbens (W=Watt)"
+            "description": "Durchschnittliche maximal zulässige Leistungsaufnahme des Lötkolbens (W=Watt)"
         },
         "CalibrateCJC": {
             "displayText": "Temperatur\nkalibrieren",

Translations/translation_EL.json

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

Translations/translation_EN.json

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

Translations/translation_ES.json

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

Translations/translation_FI.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Salli nappien\nlukitus",
             "description": "Kolvatessa paina molempia näppäimiä lukitaksesi ne (P=pois | V=vain tehostus | K=kaikki)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Liikkeen\nherkkyys",
             "description": "0=pois päältä | 1=vähäinen herkkyys | ... | 9=suurin herkkyys"

Translations/translation_FR.json

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

Translations/translation_HR.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Vaš uređaj je najvjerojatnije krivotvoren!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Zaključavanje\ntipki",
             "description": "Tokom lemljenja, držite obje tipke kako biste ih zaključali ili otključali (O=otključano | B=zaključan boost | Z=zaključano sve)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Osjetljivost\npokreta",
             "description": "Osjetljivost prepoznavanja pokreta. (0=ugašeno | 1=najmanje osjetljivo | ... | 9=najosjetljivije)"

Translations/translation_HU.json

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

Translations/translation_IT.json

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

Translations/translation_JA_JP.json

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

Translations/translation_LT.json

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

Translations/translation_NB.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Av"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Enheten din er sannsynligvis en forfalskning!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Tillat å låse\nknapper",
             "description": "Mens du lodder, hold nede begge knapper for å bytte mellom låsemodus (D=deaktiver | B=kun boost | F=full lås)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "BSensr\n",
             "description": "Bevegelsesfølsomhet (0=Inaktiv | 1=Minst følsom | ... | 9=Mest følsom)"

Translations/translation_NL.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Uit"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Jouw toestel is wellicht een namaak-versie!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Knopblokkering\ninschakelen",
             "description": "Tijdens solderen lang op beide knoppen drukken blokkeert de knoppen (U=Uit | B=Alleen boost mode | V=Volledig blokkeren)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Bewegings-\ngevoeligheid",
             "description": "Bewegingsgevoeligheid (0=uit | 1=minst gevoelig | ... | 9=meest gevoelig)"

Translations/translation_NL_BE.json

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

Translations/translation_PL.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Wył"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Twoje urządzenie jest najprawdopodobniej podróbką!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Blokada\nprzycisków",
             "description": "W trybie lutowania, wciśnij oba przyciski aby je zablokować (O=Wyłączona | B=tylko Boost | P=pełna blokada)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Czułość\nwykr. ruchu",
             "description": "Czułość wykrywania ruchu (0: Wyłączona | 1: Minimalna | ... | 9: Maksymalna)"

Translations/translation_PT.json

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

Translations/translation_RO.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Nu"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Dispozitivul dvs. este cel mai probabil un fals!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Blocare\nbutoane",
             "description": "Când lipiţi, apăsaţi lung ambele butoane, pentru a le bloca (D=dezactivare | B=numai \"modul boost\" | F=blocare completă)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Sensibilitate\nla miscare",
             "description": "Sensibilitate senzor miscare (0=oprit | 1=puţin sensibil | ... | 9=cel mai sensibil)"

Translations/translation_RU.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Вык"
         },
+        "ProfilePreheatString": {
+            "message": "Преднагрев\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Остывание\n"
+        },
         "DeviceFailedValidationWarning": {
-            "message": "Скорее всего, это устройство подделка!"
+            "message": "Вероятно, это устройство подделка!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Слишком горячо для\nстарта профиля"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Разрешить\nблок. кнопок",
             "description": "При работе длинное нажатие обеих кнопок блокирует их (О=Отключено | Т=Только турбо | П=Полная блокировка)"
         },
+        "ProfilePhases": {
+            "displayText": "Профиль\nЭтапы",
+            "description": "Количество этапов в режиме профиля"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Преднагрев\nТемпература",
+            "description": "Разогреть до этой температуры в начале режима профиля"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Преднагрев\nСкорость",
+            "description": "Предварительный нагрев с этой скоростью (градусов в секунду)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Этап 1\nТемпература",
+            "description": "Целевая температура в конце этого эатпа"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Этап 1\nДлительность",
+            "description": "Целевая длительность этого этапа (секунды)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Этап 2\nТемпература",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Этап 2\nДлительность",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Этап 3\nТемпература",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Этап 3\nДлительность",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Этап 4\nТемпература",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Этап 4\nДлительность",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Этап 5\nТемпература",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Этап 5\nДлительность",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Остывание\nСкорость",
+            "description": "Остывать с такой скоростью в конце режима профиля (градусов в секунду)"
+        },
         "MotionSensitivity": {
             "displayText": "Чувствительн.\nакселерометра",
             "description": "Чувствительность акселерометра (0=Выкл. | 1=мин. | ... | 9=макс.)"
@@ -177,7 +242,7 @@
         },
         "ScrollingSpeed": {
             "displayText": "Скорость\nтекста",
-            "description": "Скорость прокрутки текста (М=медленно | Б=быстро)"
+            "description": "Скорость прокрутки текста (М=Медленная | Б=Быстрая)"
         },
         "ReverseButtonTempChange": {
             "displayText": "Поменять\nкнопки+-",
@@ -185,7 +250,7 @@
         },
         "AnimSpeed": {
             "displayText": "Скорость\nанимации",
-            "description": "Скорость анимации иконок в главном меню (Милисекунды) (О=Отключено | Н=Низкий | С=Средний | В=Высокий)"
+            "description": "Скорость анимации иконок в главном меню (О=Отключено | М=Медленная| С=Средняя | Б=Быстрая)"
         },
         "AnimLoop": {
             "displayText": "Зацикленная\nанимация",
@@ -213,7 +278,7 @@
         },
         "BluetoothLE": {
             "displayText": "Bluetooth\n",
-            "description": "Enables BLE"
+            "description": "Активирует BLE"
         },
         "PowerLimit": {
             "displayText": "Предел\nмощности",

Translations/translation_SK.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Vyp"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Vaše zariadenie je pravdepodobne falzifikát!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Povoliť zámok\ntlačidiel",
             "description": "Zamknutie tlačidiel - dlhé stlačenie oboch naraz počas spájkovania (Z=Zakázať | B=Okrem boost | P=Plné zamknutie)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Citlivosť\npohybu",
             "description": "Citlivosť detekcie pohybu (0=Vyp | 1=Min | ... | 9=Max)"

Translations/translation_SL.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Off"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Omogoči\nzaklep gumbov",
             "description": "Za zaklep med spajkanjem drži oba gumba (O=onemogoči | L=le pospešeno | P=polno)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Občutljivost\npremikanja",
             "description": "0=izklopljeno | 1=najmanjša | ... | 9=največja"

Translations/translation_SR_CYRL.json

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

Translations/translation_SR_LATN.json

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

Translations/translation_SV.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Av"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Tillåt lås\nvia knappar",
             "description": "Vid lödning, håll nere bägge knappar för att slå på lås (A=Av | T=Bara turbo | F=Fullt lås)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Rörelse-\nkänslighet",
             "description": "Rörelsekänslighet (0=Av | 1=minst känslig | ... | 9=mest känslig)"

Translations/translation_TR.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Kapalı"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Allow locking\nbuttons",
             "description": "While soldering, hold down both buttons to toggle locking them (K=Kapalı | B=boost mode only | F=full locking)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "HARHAS\n",
             "description": "Hareket Hassasiyeti (0=Kapalı | 1=En az duyarlı | ... | 9=En duyarlı)"

Translations/translation_UK.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Вимк"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Вірогідно ваш пристрій підробний!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -70,7 +79,7 @@
         "SettingAutoChar": "A",
         "SettingOffChar": "B",
         "SettingSlowChar": "Н",
-        "SettingMediumChar": "M",
+        "SettingMediumChar": "С",
         "SettingFastChar": "М",
         "SettingStartNoneChar": "В",
         "SettingStartSolderingChar": "П",
@@ -143,6 +152,62 @@
             "displayText": "Дозволити\nблок. кнопок",
             "description": "Під час пайки тривале натискання обох кнопок заблокує їх (В=Вимк | Т=Тільки турбо | П=Повне)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Чутливість\nсенсору руху",
             "description": "Акселерометр (0=Вимк. | 1=мін. чутливості | ... | 9=макс. чутливості)"
@@ -177,7 +242,7 @@
         },
         "ScrollingSpeed": {
             "displayText": "Швидкість\nтексту",
-            "description": "Швидкість прокрутки тексту (П=повільно | Ш=швидко)"
+            "description": "Швидкість прокрутки тексту (Н=Низькa | М=Максимальна)"
         },
         "ReverseButtonTempChange": {
             "displayText": "Інвертувати\nкнопки +-?",
@@ -185,7 +250,7 @@
         },
         "AnimSpeed": {
             "displayText": "Швидкість\nанімації",
-            "description": "Швидкість анімації іконок у головному меню (Мілісекунди) (В=Вимк | Н=Низькa | С=Середня | М=Макс)"
+            "description": "Швидкість анімації іконок у головному меню (В=Вимк | Н=Низькa | С=Середня | М=Максимальна)"
         },
         "AnimLoop": {
             "displayText": "Циклічна\nанімація",

Translations/translation_VI.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "Tat"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat\n"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown\n"
+        },
         "DeviceFailedValidationWarning": {
             "message": "Your device is most likely a counterfeit!"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to\nstart profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "Cho phép khóa\ncác nút",
             "description": "Trong khi hàn, giu ca 2 nút đe khóa(D=tat | B=chi che đo tăng cuong | F=khóa hoàn toàn)"
         },
+        "ProfilePhases": {
+            "displayText": "Profile\nPhases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat\nTemp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat\nSpeed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1\nTemp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1\nDuration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2\nTemp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2\nDuration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3\nTemp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3\nDuration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4\nTemp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4\nDuration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5\nTemp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5\nDuration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown\nSpeed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "Cam bien\ncu đong",
             "description": "- 0=tat | 1=đo nhay thap nhat| ... | 9=đo nhay cao nhat"

Translations/translation_YUE_HK.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "關"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown"
+        },
         "DeviceFailedValidationWarning": {
             "message": "依支焫雞好有可能係冒牌貨！"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to start profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "撳掣鎖定",
             "description": "喺焊接模式時，同時長撳兩粒掣啓用撳掣鎖定 <無=停用 | 增=淨係容許增熱模式 | 全=鎖定全部>"
         },
+        "ProfilePhases": {
+            "displayText": "Profile Phases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat Temp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat Speed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1 Temp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1 Duration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2 Temp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2 Duration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3 Temp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3 Duration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4 Temp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4 Duration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5 Temp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5 Duration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown Speed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "動作敏感度",
             "description": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"

Translations/translation_ZH_CN.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "关"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown"
+        },
         "DeviceFailedValidationWarning": {
             "message": "这支电烙铁很有可能是冒牌货！"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to start profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "按键锁定",
             "description": "焊接模式时，同时长按两个按键启用按键锁定 <无=禁用 | 增=只容许增热模式 | 全=完全锁定>"
         },
+        "ProfilePhases": {
+            "displayText": "Profile Phases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat Temp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat Speed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1 Temp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1 Duration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2 Temp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2 Duration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3 Temp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3 Duration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4 Temp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4 Duration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5 Temp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5 Duration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown Speed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "动作灵敏度",
             "description": "0=禁用 | 1=最低灵敏度 | ... | 9=最高灵敏度"

Translations/translation_ZH_TW.json

@@ -60,8 +60,17 @@
         "OffString": {
             "message": "關"
         },
+        "ProfilePreheatString": {
+            "message": "Preheat"
+        },
+        "ProfileCooldownString": {
+            "message": "Cooldown"
+        },
         "DeviceFailedValidationWarning": {
             "message": "這支電烙鐵很有可能是冒牌貨！"
+        },
+        "TooHotToStartProfileWarning": {
+            "message": "Too hot to start profile"
         }
     },
     "characters": {
@@ -143,6 +152,62 @@
             "displayText": "按鍵鎖定",
             "description": "於焊接模式時，同時長按兩個按鍵啟用按鍵鎖定 <無=停用 | 增=只容許增熱模式 | 全=鎖定全部>"
         },
+        "ProfilePhases": {
+            "displayText": "Profile Phases",
+            "description": "Number of phases in profile mode"
+        },
+        "ProfilePreheatTemp": {
+            "displayText": "Preheat Temp",
+            "description": "Preheat to this temperature at the start of profile mode"
+        },
+        "ProfilePreheatSpeed": {
+            "displayText": "Preheat Speed",
+            "description": "Preheat at this rate (degrees per second)"
+        },
+        "ProfilePhase1Temp": {
+            "displayText": "Phase 1 Temp",
+            "description": "Target temperature for the end of this phase"
+        },
+        "ProfilePhase1Duration": {
+            "displayText": "Phase 1 Duration",
+            "description": "Target duration of this phase (seconds)"
+        },
+        "ProfilePhase2Temp": {
+            "displayText": "Phase 2 Temp",
+            "description": ""
+        },
+        "ProfilePhase2Duration": {
+            "displayText": "Phase 2 Duration",
+            "description": ""
+        },
+        "ProfilePhase3Temp": {
+            "displayText": "Phase 3 Temp",
+            "description": ""
+        },
+        "ProfilePhase3Duration": {
+            "displayText": "Phase 3 Duration",
+            "description": ""
+        },
+        "ProfilePhase4Temp": {
+            "displayText": "Phase 4 Temp",
+            "description": ""
+        },
+        "ProfilePhase4Duration": {
+            "displayText": "Phase 4 Duration",
+            "description": ""
+        },
+        "ProfilePhase5Temp": {
+            "displayText": "Phase 5 Temp",
+            "description": ""
+        },
+        "ProfilePhase5Duration": {
+            "displayText": "Phase 5 Duration",
+            "description": ""
+        },
+        "ProfileCooldownSpeed": {
+            "displayText": "Cooldown Speed",
+            "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+        },
         "MotionSensitivity": {
             "displayText": "動作敏感度",
             "description": "0=停用 | 1=最低敏感度 | ... | 9=最高敏感度"

Translations/translations_definitions.json

@@ -17,6 +17,7 @@
         },
         {
             "id": "NoPowerDeliveryMessage",
+            "include": ["POW_PD"],
             "description": "The IC required for USB-PD could not be communicated with. This is an error warning that USB-PD WILL NOT FUNCTION. Generally indicative of either a hardware or software issues."
         },
         {
@@ -49,32 +50,50 @@
         {
             "id": "UVLOWarningString",
             "maxLen": 8,
+            "include": ["POW_DC"],
             "description": "Warning text shown when the unit turns off due to undervoltage in simple mode."
         },
         {
             "id": "UndervoltageString",
             "maxLen": 15,
+            "include": ["POW_DC"],
             "description": "Warning text shown when the unit turns off due to undervoltage in advanced mode."
         },
         {
             "id": "InputVoltageString",
             "maxLen": 11,
             "note": "Preferably end with a space",
+            "include": ["POW_DC"],
             "description": "Prefix text for 'Input Voltage' shown before showing the input voltage reading."
         },
+        {
+            "id": "ProfilePreheatString",
+            "maxLen": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Shown in profile mode while preheating"
+        },
+        {
+            "id": "ProfileCooldownString",
+            "maxLen": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Shown in profile mode while cooling down"
+        },
         {
             "id": "SleepingSimpleString",
             "maxLen": 4,
+            "exclude": ["NO_SLEEP_MODE"],
             "description": "The text shown to indicate the unit is in sleep mode when the advanced view is NOT on."
         },
         {
             "id": "SleepingAdvancedString",
             "maxLen": 15,
+            "exclude": ["NO_SLEEP_MODE"],
             "description": "The text shown to indicate the unit is in sleep mode when the advanced view is turned on."
         },
         {
             "id": "SleepingTipAdvancedString",
             "maxLen": 6,
+            "exclude": ["NO_SLEEP_MODE"],
             "description": "The prefix text shown before tip temperature when the unit is sleeping with advanced view on."
         },
         {
@@ -86,6 +105,12 @@
             "id": "DeviceFailedValidationWarning",
             "default": "Device may be\ncounterfeit",
             "description": "Warning shown if the device may be a clone or counterfeit unit."
+        },
+        {
+            "id": "TooHotToStartProfileWarning",
+            "default": "Too hot to\nstart profile",
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Shown when profile mode is started while the device is too hot."
         }
     ],
     "characters": [{
@@ -166,6 +191,7 @@
             "id": "PowerMenu",
             "maxLen": 5,
             "maxLen2": 11,
+            "include": ["POW_DC", "POW_QC"],
             "description": "Menu for settings related to power. Main settings to do with the input voltage."
         },
         {
@@ -197,30 +223,35 @@
             "id": "DCInCutoff",
             "maxLen": 5,
             "maxLen2": 11,
+            "include": ["POW_DC"],
             "description": "When the device is powered by a battery, this adjusts the low voltage threshold for when the unit should turn off the heater to protect the battery."
         },
         {
             "id": "MinVolCell",
             "maxLen": 4,
             "maxLen2": 9,
+            "include": ["POW_DC"],
             "description": "When powered by a battery, this adjusts the minimum voltage per cell before shutdown. (This is multiplied by the cell count.)"
         },
         {
             "id": "QCMaxVoltage",
             "maxLen": 8,
             "maxLen2": 15,
+            "include": ["POW_QC"],
             "description": "This adjusts the maximum voltage the QC negotiation will adjust to. Does NOT affect USB-PD. Should be set safely based on the current rating of your power supply."
         },
         {
             "id": "PDNegTimeout",
             "maxLen": 8,
             "maxLen2": 15,
+            "include": ["POW_PD"],
             "description": "How long until firmware stops trying to negotiate for USB-PD and tries QC instead. Longer times may help dodgy / old PD adapters, faster times move onto PD quickly. Units of 100ms. Recommended to keep small values."
         },
         {
             "id": "PDVpdo",
             "maxLen": 7,
             "maxLen2": 15,
+            "include": ["POW_PD"],
             "description": "Enabled PPS & EPR modes."
         },
         {
@@ -253,6 +284,104 @@
             "maxLen2": 13,
             "description": "If locking the buttons against accidental presses is enabled."
         },
+        {
+            "id": "ProfilePhases",
+            "maxLen": 6,
+            "maxLen2": 13,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "set the number of phases for profile mode."
+        },
+        {
+            "id": "ProfilePreheatTemp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Preheat to this temperature at the start of profile mode."
+        },
+        {
+            "id": "ProfilePreheatSpeed",
+            "maxLen": 5,
+            "maxLen2": 11,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "How fast the temperature is allowed to rise during the preheat phase at the start of profile mode."
+        },
+        {
+            "id": "ProfilePhase1Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Target temperature for the end of phase 1 of profile mode."
+        },
+        {
+            "id": "ProfilePhase1Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Duration of phase 1 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfilePhase2Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Target temperature for the end of phase 2 of profile mode."
+        },
+        {
+            "id": "ProfilePhase2Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Duration of phase 2 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfilePhase3Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Target temperature for the end of phase 3 of profile mode."
+        },
+        {
+            "id": "ProfilePhase3Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Duration of phase 3 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfilePhase4Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Target temperature for the end of phase 5 of profile mode."
+        },
+        {
+            "id": "ProfilePhase4Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfilePhase5Temp",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Target temperature for the end of phase 5 of profile mode."
+        },
+        {
+            "id": "ProfilePhase5Duration",
+            "maxLen": 4,
+            "maxLen2": 9,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "Duration of phase 5 of profile mode. The phase might actually take longer if it takes longer to reach the target temperature."
+        },
+        {
+            "id": "ProfileCooldownSpeed",
+            "maxLen": 5,
+            "maxLen2": 11,
+            "include": ["PROFILE_SUPPORT"],
+            "description": "How fast the temperature is allowed to drop during the cooldown phase at the end of profile mode."
+        },
         {
             "id": "MotionSensitivity",
             "maxLen": 6,
@@ -263,12 +392,14 @@
             "id": "SleepTemperature",
             "maxLen": 4,
             "maxLen2": 9,
+            "exclude": ["NO_SLEEP_MODE"],
             "description": "Temperature the device will drop down to while asleep. Typically around halfway between off and soldering temperature."
         },
         {
             "id": "SleepTimeout",
             "maxLen": 4,
             "maxLen2": 9,
+            "exclude": ["NO_SLEEP_MODE"],
             "description": "How long of a period without movement / button-pressing is required before the device drops down to the sleep temperature."
         },
         {
@@ -281,6 +412,7 @@
             "id": "HallEffSensitivity",
             "maxLen": 6,
             "maxLen2": 13,
+            "include": ["HALL_SENSOR"],
             "description": "If the unit has a hall effect sensor (Pinecil), this adjusts how sensitive it is at detecting a magnet to put the device into sleep mode."
         },
         {
@@ -293,6 +425,7 @@
             "id": "DisplayRotation",
             "maxLen": 6,
             "maxLen2": 13,
+            "exclude": ["NO_DISPLAY_ROTATE"],
             "description": "If the display should rotate automatically or if it should be fixed for left- or right-handed mode."
         },
         {
@@ -359,6 +492,7 @@
             "id": "BluetoothLE",
             "maxLen": 7,
             "maxLen2": 15,
+            "include": ["BLE_ENABLED"],
             "description": "Should BLE be enabled at boot time."
         },
         {

build.sh

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

scripts/IronOS-mkdocs.yml

@@ -6,7 +6,7 @@ site_description: "IronOS Open Source Soldering Iron firmware for Miniware and P
 # repo config
 repo_url: https://github.com/ralim/IronOS/
 
-docs_dir: Documentation
+docs_dir: ../Documentation
 edit_uri: edit/dev/Documentation/
 
 # Theme and config
@@ -46,8 +46,8 @@ plugins:
   - autolinks
   - awesome-pages
   - git-revision-date
-  
-  
+
+
 # Markdown Extensions
 markdown_extensions:
   - attr_list

scripts/IronOS.Dockerfile

@@ -26,4 +26,4 @@ RUN python3 -m pip install ${PIP_PKGS}
 RUN git config --global --add safe.directory /build/source
 
 COPY . /build/source
-COPY ./ci /build/ci
+COPY ./scripts/ci /build/ci

scripts/deploy.sh

@@ -0,0 +1,90 @@
+#!/usr/bin/env bash
+
+# little helper for docker deployment to:
+# - start development environment for IronOS ("shell" sub-command)
+# - generate full set of builds ("build" sub-command)
+
+#set -x
+#set -e
+
+usage()
+{
+	echo -e "\nUsage: ${0} [CMD]\n"
+	echo "CMD:"
+	echo -e "\tshell - start docker container with shell inside to work on IronOS with all tools needed"
+	echo -e "\tbuild - compile builds of IronOS inside docker container for supported hardware"
+	echo -e "\tclean - delete created docker container (but not pre-downloaded data for it)\n"
+	echo -e "STORAGE NOTICE: for \"shell\" and \"build\" commands extra files will be downloaded so make sure that you have ~5GB of free space.\n"
+}
+
+### main
+
+docker_conf="Env.yml"
+
+# allow providing custom path to docker tool using DOCKER_BIN external env. var.
+# (compose sub-command must be included, i.e. DOCKER_BIN="/usr/local/bin/docker compose" ./deploy.sh)
+
+if [ -z "${DOCKER_BIN}" ]; then
+	docker_bin=""
+else
+	docker_bin="${DOCKER_BIN}"
+fi;
+
+# detect availability of docker
+
+docker_compose="$(command -v docker-compose)"
+if [ -n "${docker_compose}" ] && [ -z "${docker_bin}" ]; then
+	docker_bin="${docker_compose}"
+fi;
+
+docker_tool="$(command -v docker)"
+if [ -n "${docker_tool}" ] && [ -z "${docker_bin}" ]; then
+	docker_bin="${docker_tool}  compose"
+fi;
+
+if [ -z "${docker_bin}" ]; then
+	echo "ERROR: Can't find docker-compose nor docker tool. Please, install docker and try again."
+	exit 1
+fi;
+
+# construct command to run
+
+cmd="${1}"
+if [ -z "${cmd}" ] || [ "${cmd}" = "shell" ]; then
+	docker_cmd="run  --rm  builder"
+elif [ "${cmd}" = "build" ]; then
+	docker_cmd="run  --rm  builder  /bin/bash /build/ci/buildAll.sh"
+elif [ "${cmd}" = "clean" ]; then
+	docker  rmi  ironos-builder:latest
+	exit "${?}"
+else
+	usage
+	exit 1
+fi;
+
+# get absolute location of project root dir to make docker happy with config(s)
+# (successfully tested on relatively POSIX-compliant Dash shell)
+
+# this script
+script_file="/deploy.sh"
+# IronOS/scripts/deploy.sh
+script_path="${PWD}"/"${0}"
+# IronOS/scripts/
+script_dir=${script_path%"${script_file}"}
+# IronOS/
+root_dir="${script_dir}/.."
+# IronOS/Env.yml
+docker_file="-f ${root_dir}/${docker_conf}"
+
+# change dir to project root dir & run constructed command
+
+cd "${root_dir}" || exit 1
+echo -e "\n====>>>> Firing up & starting container..."
+if [ "${cmd}" = "shell" ]; then
+echo -e "\t* type \"exit\" to end the session when done;"
+fi;
+echo -e "\t* type \"${0} clean\" to delete created container (but not cached data)"
+echo -e "\n====>>>> ${docker_bin}  ${docker_file}  ${docker_cmd}\n"
+eval "${docker_bin}  ${docker_file}  ${docker_cmd}"
+exit "${?}"
+

source/Core/BSP/BSP.h

@@ -94,6 +94,8 @@ enum StatusLED {
 };
 void setStatusLED(const enum StatusLED state);
 
+void setBuzzer(bool on);
+
 // preStartChecks are run until they return 0
 // By the PID, after each ADC sample comes in
 // For example, on the MHP30 this is used to figure out the resistance of the hotplate

source/Core/BSP/BSP_Power.h

@@ -20,6 +20,8 @@ void power_check();
 uint8_t getTipResistanceX10();
 
 uint8_t getTipThermalMass();
+uint8_t getTipInertia();
+
 
 #ifdef __cplusplus
 }

source/Core/BSP/MHP30/BSP.cpp

@@ -455,8 +455,6 @@ void setStatusLED(const enum StatusLED state) {
     } break;
     case LED_HOT:
       ws2812.led_set_color(0, 0xFF, 0, 0); // red
-      // We have hit the right temp, run buzzer for a short period
-      buzzerEnd = xTaskGetTickCount() + TICKS_SECOND / 3;
       break;
     case LED_COOLING_STILL_HOT:
       ws2812.led_set_color(0, 0xFF, 0x8C, 0x00); // Orange
@@ -465,11 +463,6 @@ void setStatusLED(const enum StatusLED state) {
     ws2812.led_update();
     lastState = state;
   }
-  if (state == LED_HOT && xTaskGetTickCount() < buzzerEnd) {
-    setBuzzer(true);
-  } else {
-    setBuzzer(false);
-  }
 }
 uint64_t getDeviceID() {
   //
@@ -478,4 +471,5 @@ uint64_t getDeviceID() {
 
 uint8_t preStartChecksDone() { return 1; }
 
-uint8_t getTipThermalMass() { return TIP_THERMAL_MASS; }
+uint8_t getTipThermalMass() { return TIP_THERMAL_MASS; }
+uint8_t getTipInertia() { return TIP_THERMAL_MASS; }

source/Core/BSP/MHP30/FreeRTOSConfig.h

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

source/Core/BSP/MHP30/IRQ.cpp

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

source/Core/BSP/MHP30/Power.cpp

@@ -7,7 +7,7 @@
 #include "configuration.h"
 
 void power_check() {
-#if POW_PD
+#ifdef POW_PD
 
   // Cant start QC until either PD works or fails
   if (USBPowerDelivery::negotiationComplete()) {

source/Core/BSP/MHP30/Software_I2C.h

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

source/Core/BSP/MHP30/configuration.h

@@ -1,11 +1,10 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
 #include "Settings.h"
-#include "configuration.h"
 #include <stdint.h>
 /**
  * Configuration.h
- * Define here your default pre settings for TS80 or TS100
+ * Define here your default pre settings for MHP30
  *
  */
 
@@ -64,10 +63,10 @@
  * 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
+#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
@@ -86,13 +85,9 @@
 #define ADC_MAX_READING (4096 * 8) // Maximum reading of the adc
 #define ADC_VDD_MV      3300       // ADC max reading millivolts
 
-#ifdef MODEL_TS100
-#define POWER_PULSE_DEFAULT 0
-#else
-#define POWER_PULSE_DEFAULT 5
-#endif
 #define POWER_PULSE_WAIT_DEFAULT     4 // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s
 #define POWER_PULSE_DURATION_DEFAULT 1 // Default duration of the power pulse: 1*250 = 250 ms
+#define POWER_PULSE_DEFAULT          5
 
 /**
  * OLED Orientation Sensitivity on Automatic mode!
@@ -155,22 +150,27 @@
 #define ACCEL_SC7
 #define ACCEL_MSA
 
-#define POW_PD 1
+#define PROFILE_SUPPORT
+
+#define POW_PD     1
+#define POW_PD_EXT 0
 #define TEMP_NTC
-#define I2C_SOFT
+#define I2C_SOFT_BUS_2
 #define BATTFILTERDEPTH 8
-#define OLED_I2CBB
+#define OLED_I2CBB2
 #define ACCEL_EXITS_ON_MOVEMENT
 #define NEEDS_VBUS_PROBE 0
 
 #define HARDWARE_MAX_WATTAGE_X10 650
 #define TIP_THERMAL_MASS         65 // TODO, needs refinement
 #define TIP_RESISTANCE           60 // x10 ohms, ~6 typical
-#endif
+#endif /* MHP30 */
 
 #ifdef ACCEL_EXITS_ON_MOVEMENT
 #define NO_SLEEP_MODE
 #endif
-#endif
 
 #define FLASH_LOGOADDR (0x08000000 + (62 * 1024))
+#define SETTINGS_START_PAGE (0x08000000 + (127 * 1024))
+
+#endif /* CONFIGURATION_H_ */

source/Core/BSP/MHP30/flash.c

@@ -10,9 +10,6 @@
 #include "stm32f1xx_hal.h"
 #include "string.h"
 
-#define SETTINGS_START_PAGE (0x08000000 + (127 * 1024))
-
-
 void flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
   FLASH_EraseInitTypeDef pEraseInit;
   pEraseInit.TypeErase    = FLASH_TYPEERASE_PAGES;

source/Core/BSP/MHP30/fusb_user.cpp

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

source/Core/BSP/MHP30/preRTOS.cpp

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

source/Core/BSP/Miniware/BSP.cpp

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

source/Core/BSP/Miniware/FreeRTOSConfig.h

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

source/Core/BSP/Miniware/IRQ.cpp

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

source/Core/BSP/Miniware/Pins.h

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

source/Core/BSP/Miniware/Power.cpp

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

source/Core/BSP/Miniware/Setup.cpp

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

source/Core/BSP/Miniware/Setup.h

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

source/Core/BSP/Miniware/Software_I2C.h

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

source/Core/BSP/Miniware/configuration.h

@@ -4,7 +4,7 @@
 #include <stdint.h>
 /**
  * Configuration.h
- * Define here your default pre settings for TS80(P) or TS100
+ * Define here your default pre settings for TS80(P) or TS10(0/1)
  *
  */
 
@@ -63,10 +63,10 @@
  * 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
+#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
@@ -86,7 +86,7 @@
 #define POWER_PULSE_DEFAULT 0
 #else
 #define POWER_PULSE_DEFAULT 5
-#endif
+#endif /* TS100 */
 #define POWER_PULSE_WAIT_DEFAULT     4 // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s
 #define POWER_PULSE_DURATION_DEFAULT 1 // Default duration of the power pulse: 1*250 = 250 ms
 
@@ -126,13 +126,15 @@
 #define ADC_MAX_READING (4096 * 8) // Maximum reading of the adc
 #define ADC_VDD_MV      3300       // ADC max reading millivolts
 
+#define POW_PD_EXT 0
+
 // Deriving the Voltage div:
 // Vin_max = (3.3*(r1+r2))/(r2)
 // vdiv = (32768*4)/(vin_max*10)
 
-#if defined(MODEL_TS100) + defined(MODEL_TS80) + defined(MODEL_TS80P) > 1
+#if defined(MODEL_TS100) + defined(MODEL_TS80) + defined(MODEL_TS80P) + defined(MODEL_TS101) > 1
 #error "Multiple models defined!"
-#elif defined(MODEL_TS100) + defined(MODEL_TS80) + defined(MODEL_TS80P) == 0
+#elif defined(MODEL_TS100) + defined(MODEL_TS80) + defined(MODEL_TS80P) + defined(MODEL_TS101) == 0
 #error "No model defined!"
 #endif
 #define NEEDS_VBUS_PROBE 0
@@ -170,9 +172,42 @@
 #define TIP_RESISTANCE           75 // x10 ohms, 7.5 typical for ts100 tips
 
 #define POW_DC
-#define POW_PD 0
+
 #define TEMP_TMP36
-#endif
+#endif /* TS100 */
+
+#ifdef MODEL_TS101
+#define VOLTAGE_DIV        700 // 700 - Default divider from schematic
+#define CALIBRATION_OFFSET 900 // 900 - Default adc offset in uV
+#define PID_POWER_LIMIT    100 // Sets the max pwm power limit
+#define POWER_LIMIT        0   // 0 watts default limit
+#define MAX_POWER_LIMIT    100
+#define POWER_LIMIT_STEPS  5
+#define OP_AMP_GAIN_STAGE  OP_AMP_GAIN_STAGE_TS100
+#define TEMP_uV_LOOKUP_HAKKO
+
+#define HARDWARE_MAX_WATTAGE_X10 1000
+#define TIP_THERMAL_MASS         65 // X10 watts to raise 1 deg C in 1 second
+#define TIP_RESISTANCE           75 // x10 ohms, 7.5 typical for ts100 tips
+
+#define TIP_HAS_DIRECT_PWM   1
+#define POW_DC               1
+#define POW_PD               1
+#define I2C_SOFT_BUS_2       1
+#define I2C_SOFT_BUS_1       1
+#define OLED_I2CBB1          1
+#define USB_PD_I2CBB2        1
+#define USB_PD_VMAX          28 // Device supposedly can do 28V; looks like vmax is 33 ish
+#define OLED_128x32          1
+#define OLED_FLIP            1
+#define HAS_SPLIT_POWER_PATH 1
+#define TEMP_NTC             1
+#define ACCEL_I2CBB1         1
+#define POW_EPR              1
+#define HAS_POWER_DEBUG_MENU
+#define DEBUG_POWER_MENU_BUTTON_B
+
+#endif /* TS101 */
 
 #if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0
 #define MAX_POWER_LIMIT   40
@@ -186,35 +221,42 @@
 
 #define LIS_ORI_FLIP
 #define OLED_FLIP
-#endif
+#endif /* TS80(P) */
 
 #ifdef MODEL_TS80
 #define VOLTAGE_DIV        780 // Default divider from schematic
 #define CALIBRATION_OFFSET 900 // the adc offset in uV
-#define PID_POWER_LIMIT    24  // Sets the max pwm power limit
-#define POWER_LIMIT        24  // 24 watts default power limit
+#define PID_POWER_LIMIT    35  // Sets the max pwm power limit
+#define POWER_LIMIT        32  // 24 watts default power limit
 
-#define HARDWARE_MAX_WATTAGE_X10 180
+#define HARDWARE_MAX_WATTAGE_X10 320
 
 #define POW_QC
-#define POW_PD 0
+
 #define TEMP_TMP36
-#endif
+#endif /* TS80 */
 
 #ifdef MODEL_TS80P
 #define VOLTAGE_DIV        650  // Default for TS80P with slightly different resistors
 #define CALIBRATION_OFFSET 1500 // the adc offset in uV
 #define PID_POWER_LIMIT    35   // Sets the max pwm power limit
-#define POWER_LIMIT        30   // 30 watts default power limit
+#define POWER_LIMIT        32   // 30 watts default power limit
 
-#define HARDWARE_MAX_WATTAGE_X10 300
+#define HARDWARE_MAX_WATTAGE_X10 320
 
 #define POW_PD 1
 #define POW_QC 1
 #define TEMP_NTC
-#define I2C_SOFT
+#define I2C_SOFT_BUS_2 1
 #define SC7_ORI_FLIP
-#endif
-#endif
+#endif /* TS80P */
 
-#define FLASH_LOGOADDR (0x08000000 + (62 * 1024))
+#ifdef MODEL_TS101
+#define FLASH_LOGOADDR      (0x08000000 + (126 * 1024))
+#define SETTINGS_START_PAGE (0x08000000 + (127 * 1024))
+#else
+#define FLASH_LOGOADDR      (0x08000000 +  (62 * 1024))
+#define SETTINGS_START_PAGE (0x08000000 +  (63 * 1024))
+#endif /* TS101 */
+
+#endif /* CONFIGURATION_H_ */

source/Core/BSP/Miniware/flash.c

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

source/Core/BSP/Miniware/fusb_user.cpp

@@ -1,12 +1,12 @@
 #include "configuration.h"
-#if POW_PD
+#ifdef POW_PD
 #include "BSP.h"
-#include "I2CBB.hpp"
+#include "I2CBB2.hpp"
 #include "Setup.h"
 
-bool fusb_read_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB::Mem_Read(deviceAddr, registerAdd, buf, size); }
+bool fusb_read_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB2::Mem_Read(deviceAddr, registerAdd, buf, size); }
 
-bool fusb_write_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB::Mem_Write(deviceAddr, registerAdd, buf, size); }
+bool fusb_write_buf(const uint8_t deviceAddr, const uint8_t registerAdd, const uint8_t size, uint8_t *buf) { return I2CBB2::Mem_Write(deviceAddr, registerAdd, buf, size); }
 
 void setupFUSBIRQ() {
   GPIO_InitTypeDef GPIO_InitStruct;

source/Core/BSP/Miniware/preRTOS.cpp

@@ -6,20 +6,27 @@
  */
 
 #include "BSP.h"
-#include "I2CBB.hpp"
+#include "I2CBB1.hpp"
+#include "I2CBB2.hpp"
 #include "Pins.h"
 #include "Setup.h"
+#include "configuration.h"
 #include <I2C_Wrapper.hpp>
 
+
 void preRToSInit() {
   /* Reset of all peripherals, Initializes the Flash interface and the Systick.
    */
   HAL_Init();
   Setup_HAL(); // Setup all the HAL objects
   BSPInit();
-#ifdef I2C_SOFT
-  I2CBB::init();
+#ifdef I2C_SOFT_BUS_2
+  I2CBB2::init();
 #endif
+#ifdef I2C_SOFT_BUS_1
+  I2CBB1::init();
+#endif
+
   /* Init the IPC objects */
   FRToSI2C::FRToSInit();
 }

source/Core/BSP/Miniware/stm32f1xx_hal_msp.c

@@ -58,14 +58,23 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc) {
      */
     GPIO_InitStruct.Pin  = TIP_TEMP_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(TIP_TEMP_GPIO_Port, &GPIO_InitStruct);
+
     GPIO_InitStruct.Pin  = TMP36_INPUT_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
     HAL_GPIO_Init(TMP36_INPUT_GPIO_Port, &GPIO_InitStruct);
+
     GPIO_InitStruct.Pin  = VIN_Pin;
     GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
     HAL_GPIO_Init(VIN_GPIO_Port, &GPIO_InitStruct);
 
+#ifdef PD_VIN_Pin
+
+    GPIO_InitStruct.Pin  = PD_VIN_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+    HAL_GPIO_Init(PD_VIN_GPIO_Port, &GPIO_InitStruct);
+#endif
     /* ADC2 interrupt Init */
     HAL_NVIC_SetPriority(ADC1_2_IRQn, 15, 0);
     HAL_NVIC_EnableIRQ(ADC1_2_IRQn);
@@ -83,7 +92,7 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c) {
   GPIO_InitStruct.Mode  = GPIO_MODE_AF_OD;
   GPIO_InitStruct.Pull  = GPIO_PULLUP;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-  HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+  HAL_GPIO_Init(SCL_GPIO_Port, &GPIO_InitStruct);
 
   /* Peripheral clock enable */
   __HAL_RCC_I2C1_CLK_ENABLE();
@@ -128,5 +137,8 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef *htim_base) {
   } else if (htim_base->Instance == TIM2) {
     /* Peripheral clock enable */
     __HAL_RCC_TIM2_CLK_ENABLE();
+  } else if (htim_base->Instance == TIM4) {
+    /* Peripheral clock enable */
+    __HAL_RCC_TIM4_CLK_ENABLE();
   }
 }

source/Core/BSP/Miniware/stm32f1xx_it.c

@@ -1,5 +1,6 @@
 // This is the stock standard STM interrupt file full of handlers
 #include "stm32f1xx_it.h"
+#include "Pins.h"
 #include "Setup.h"
 #include "cmsis_os.h"
 #include "stm32f1xx.h"
@@ -11,7 +12,6 @@ extern TIM_HandleTypeDef htim1; // used for the systick
 /*            Cortex-M3 Processor Interruption and Exception Handlers         */
 /******************************************************************************/
 
-
 // Systick is used by FreeRTOS tick
 void SysTick_Handler(void) { osSystickHandler(); }
 
@@ -29,11 +29,33 @@ void ADC1_2_IRQHandler(void) { HAL_ADC_IRQHandler(&hadc1); }
 
 // Timer 1 has overflowed, used for HAL ticks
 void TIM1_UP_IRQHandler(void) { HAL_TIM_IRQHandler(&htim1); }
+
 // Timer 3 is used for the PWM output to the tip
-void TIM3_IRQHandler(void) { HAL_TIM_IRQHandler(&htim3); }
+void TIM3_IRQHandler(void) {
+  TIM_HandleTypeDef *handle = &htimADC;
+  if (htimTip.Instance == TIM3) {
+    handle = &htimTip;
+  }
+  HAL_TIM_IRQHandler(handle);
+}
 
 // Timer 2 is used for co-ordination of PWM & ADC
-void TIM2_IRQHandler(void) { HAL_TIM_IRQHandler(&htim2); }
+void TIM2_IRQHandler(void) {
+  TIM_HandleTypeDef *handle = &htimADC;
+  if (htimTip.Instance == TIM2) {
+    handle = &htimTip;
+  }
+  HAL_TIM_IRQHandler(handle);
+}
+
+// Timer 2 is used for co-ordination of PWM & ADC
+void TIM4_IRQHandler(void) {
+  TIM_HandleTypeDef *handle = &htimADC;
+  if (htimTip.Instance == TIM4) {
+    handle = &htimTip;
+  }
+  HAL_TIM_IRQHandler(handle);
+}
 
 void I2C1_EV_IRQHandler(void) { HAL_I2C_EV_IRQHandler(&hi2c1); }
 void I2C1_ER_IRQHandler(void) { HAL_I2C_ER_IRQHandler(&hi2c1); }
@@ -41,4 +63,9 @@ void I2C1_ER_IRQHandler(void) { HAL_I2C_ER_IRQHandler(&hi2c1); }
 void DMA1_Channel6_IRQHandler(void) { HAL_DMA_IRQHandler(&hdma_i2c1_tx); }
 
 void DMA1_Channel7_IRQHandler(void) { HAL_DMA_IRQHandler(&hdma_i2c1_rx); }
-void EXTI9_5_IRQHandler(void) { HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_9); }
+
+void EXTI9_5_IRQHandler(void) {
+#ifdef INT_PD_Pin
+  HAL_GPIO_EXTI_IRQHandler(INT_PD_Pin);
+#endif
+}

source/Core/BSP/Miniware/system_stm32f1xx.c

@@ -12,12 +12,8 @@
 #if defined(STM32F100xE) || defined(STM32F101xE) || defined(STM32F101xG) || defined(STM32F103xE) || defined(STM32F103xG)
 /* #define DATA_IN_ExtSRAM */
 #endif /* STM32F100xE || STM32F101xE || STM32F101xG || STM32F103xE || STM32F103xG */
-
 #ifndef VECT_TAB_OFFSET
-#define VECT_TAB_OFFSET                            \
-  0x00004000U /*!< Vector Table base offset field. \
-           This value must be a multiple of 0x200. */
-// We offset this by 0x4000 to because of the bootloader
+#error VECT_TAB_OFFSET
 #endif
 
 /*******************************************************************************

source/Core/BSP/Pinecil/BSP.cpp

@@ -87,6 +87,7 @@ bool isTipDisconnected() {
 }
 
 void setStatusLED(const enum StatusLED state) {}
+void setBuzzer(bool on) {}
 
 uint8_t  preStartChecks() { return 1; }
 uint64_t getDeviceID() { return dbg_id_get(); }
@@ -95,4 +96,5 @@ uint8_t getTipResistanceX10() { return TIP_RESISTANCE; }
 
 uint8_t preStartChecksDone() { return 1; }
 
-uint8_t getTipThermalMass() { return TIP_THERMAL_MASS; }
+uint8_t getTipThermalMass() { return TIP_THERMAL_MASS; }
+uint8_t getTipInertia() { return TIP_THERMAL_MASS; }

source/Core/BSP/Pinecil/IRQ.cpp

@@ -93,7 +93,7 @@ void setTipPWM(const uint8_t pulse, const bool shouldUseFastModePWM) {
 extern osThreadId POWTaskHandle;
 
 void EXTI5_9_IRQHandler(void) {
-#if POW_PD
+#ifdef POW_PD
   if (RESET != exti_interrupt_flag_get(EXTI_5)) {
     exti_interrupt_flag_clear(EXTI_5);
 

source/Core/BSP/Pinecil/Power.cpp

@@ -7,7 +7,7 @@
 #include "configuration.h"
 
 void power_check() {
-#if POW_PD
+#ifdef POW_PD
   // Cant start QC until either PD works or fails
   if (!USBPowerDelivery::negotiationComplete()) {
     return;
@@ -22,7 +22,7 @@ void power_check() {
 }
 
 bool getIsPoweredByDCIN() {
-#if POW_PD
+#ifdef POW_PD
   if (!USBPowerDelivery::negotiationComplete()) {
     return false; // We are assuming not dc while negotiating
   }

source/Core/BSP/Pinecil/configuration.h

@@ -63,10 +63,10 @@
  * 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
+#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
@@ -86,7 +86,7 @@
 #define POWER_PULSE_DEFAULT 0
 #else
 #define POWER_PULSE_DEFAULT 5
-#endif
+#endif /* Pinecil */
 #define POWER_PULSE_WAIT_DEFAULT     4 // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s
 #define POWER_PULSE_DURATION_DEFAULT 1 // Default duration of the power pulse: 1*250 = 250 ms
 
@@ -136,7 +136,8 @@
 #define POWER_LIMIT_STEPS      5                         //
 #define OP_AMP_GAIN_STAGE      OP_AMP_GAIN_STAGE_PINECIL // Uses TS100 resistors
 #define TEMP_uV_LOOKUP_HAKKO                             // Use Hakko lookup table
-#define USB_PD_VMAX            20                        // Maximum voltage for PD to negotiate
+#define USB_PD_VMAX            24                        // Maximum voltage for PD to negotiate
+#define POW_EPR 1                                        // EPR mode is tentatively enabled
 #define PID_TIM_HZ             (8)                       // Tick rate of the PID loop
 #define MAX_TEMP_C             450                       // Max soldering temp selectable °C
 #define MAX_TEMP_F             850                       // Max soldering temp selectable °F
@@ -146,6 +147,7 @@
 #define MIN_BOOST_TEMP_F       480                       // The min settable temp for boost mode °F
 
 #define POW_PD     1
+#define POW_PD_EXT 0
 #define POW_QC     1
 #define POW_DC     1
 #define POW_QC_20V 1
@@ -162,9 +164,12 @@
 #define HARDWARE_MAX_WATTAGE_X10 750
 #define TIP_THERMAL_MASS         65 // X10 watts to raise 1 deg C in 1 second
 #define TIP_RESISTANCE           75 // x10 ohms, 7.5 typical for Pinecil tips
-#endif
-#endif
+#define CANT_DIRECT_READ_SETTINGS
+#endif /* Pinecil */
 
-#define FLASH_LOGOADDR (0x08000000 + (126 * 1024))
+#define FLASH_LOGOADDR      (0x08000000 + (126 * 1024))
+#define SETTINGS_START_PAGE (0x08000000 + (127 * 1024))
 
 #define HAS_POWER_DEBUG_MENU
+
+#endif /* CONFIGURATION_H_ */

source/Core/BSP/Pinecil/flash.c

@@ -10,7 +10,7 @@
 #include "gd32vf103_libopt.h"
 #include "string.h"
 #define FMC_PAGE_SIZE ((uint16_t)0x400U)
-#define SETTINGS_START_PAGE (0x08000000 + (127 * 1024))
+
 void flash_save_buffer(const uint8_t *buffer, const uint16_t length) {
 
   /* unlock the flash program/erase controller */

source/Core/BSP/Pinecil/fusb_user.cpp

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

source/Core/BSP/Pinecilv2/BSP.cpp

@@ -21,7 +21,7 @@ const uint8_t  tempMeasureTicks = 25;
 uint16_t totalPWM = 255; // Total length of the cycle's ticks
 
 void resetWatchdog() {
-  //#TODO
+  // #TODO
 }
 
 #ifdef TEMP_NTC
@@ -125,9 +125,7 @@ uint8_t getButtonB() {
   return val;
 }
 
-void reboot() {
-  hal_system_reset();
-}
+void reboot() { hal_system_reset(); }
 
 void delay_ms(uint16_t count) {
   // delay_1ms(count);
@@ -148,6 +146,7 @@ bool isTipDisconnected() {
 void setStatusLED(const enum StatusLED state) {
   // Dont have one
 }
+void setBuzzer(bool on) {}
 
 uint8_t       lastTipResistance        = 0; // default to unknown
 const uint8_t numTipResistanceReadings = 3;
@@ -163,7 +162,13 @@ uint8_t getTipThermalMass() {
   if (lastTipResistance >= 80) {
     return TIP_THERMAL_MASS;
   }
-  return (TIP_THERMAL_MASS * 25) / 10;
+  return 45;
+}
+uint8_t getTipInertia() {
+  if (lastTipResistance >= 80) {
+    return TIP_THERMAL_MASS;
+  }
+  return 10;
 }
 // We want to calculate lastTipResistance
 // If tip is connected, and the tip is cold and the tip is not being heated

source/Core/BSP/Pinecilv2/IRQ.cpp

@@ -151,7 +151,7 @@ extern osThreadId POWTaskHandle;
 void GPIO_IRQHandler(void) {
   if (SET == GLB_Get_GPIO_IntStatus(FUSB302_IRQ_GLB_Pin)) {
     GLB_GPIO_IntClear(FUSB302_IRQ_GLB_Pin, SET);
-#if POW_PD
+#ifdef POW_PD
     if (POWTaskHandle != nullptr) {
       BaseType_t xHigherPriorityTaskWoken = pdFALSE;
       xTaskNotifyFromISR(POWTaskHandle, 1, eSetBits, &xHigherPriorityTaskWoken);

source/Core/BSP/Pinecilv2/Power.cpp

@@ -7,7 +7,7 @@
 #include "configuration.h"
 
 void power_check() {
-#if POW_PD
+#ifdef POW_PD
   // Cant start QC until either PD works or fails
   if (!USBPowerDelivery::negotiationComplete()) {
     return;
@@ -22,7 +22,7 @@ void power_check() {
 }
 
 bool getIsPoweredByDCIN() {
-#if POW_PD
+#ifdef POW_PD
   if (!USBPowerDelivery::negotiationComplete()) {
     return false; // We are assuming not dc while negotiating
   }

source/Core/BSP/Pinecilv2/Setup.cpp

@@ -19,10 +19,11 @@ uint16_t ADCReadings[ADC_NORM_SAMPLES]; // room for 32 lots of the pair of readi
 
 // Heap
 
-extern uint8_t      _heap_start;
-extern uint8_t      _heap_size; // @suppress("Type cannot be resolved")
+extern uint8_t      __HeapBase;
+extern uint8_t      __HeapLimit; // @suppress("Type cannot be resolved")
+const uint32_t      _heap_size     = ((&__HeapLimit) - (&__HeapBase));
 static HeapRegion_t xHeapRegions[] = {
-    {&_heap_start, (unsigned int)&_heap_size},
+    {&__HeapBase, (unsigned int)_heap_size},
     {NULL, 0}, /* Terminates the array. */
     {NULL, 0}  /* Terminates the array. */
 };

source/Core/BSP/Pinecilv2/bl_mcu_sdk/common/misc/compiler/common.h

@@ -12,13 +12,13 @@
 #define BL_WR_BYTE(addr, val)  ((*(volatile uint8_t *)(uintptr_t)(addr)) = (val))
 #define BL_RDWD_FRM_BYTEP(p)   ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | (p[0]))
 
-#define BL_WRWD_TO_BYTEP(p, val)   \
-    {                              \
-        p[0] = val & 0xff;         \
-        p[1] = (val >> 8) & 0xff;  \
-        p[2] = (val >> 16) & 0xff; \
-        p[3] = (val >> 24) & 0xff; \
-    }
+#define BL_WRWD_TO_BYTEP(p, val) \
+  {                              \
+    p[0] = val & 0xff;           \
+    p[1] = (val >> 8) & 0xff;    \
+    p[2] = (val >> 16) & 0xff;   \
+    p[3] = (val >> 24) & 0xff;   \
+  }
 /**
  * @brief Register access macro
  */
@@ -31,25 +31,25 @@
 #define BL_GET_REG_BITS_VAL(val, bitname)         (((val)&bitname##_MSK) >> bitname##_POS)
 #define BL_SET_REG_BITS_VAL(val, bitname, bitval) (((val)&bitname##_UMSK) | ((uint32_t)(bitval) << bitname##_POS))
 #define BL_IS_REG_BIT_SET(val, bitname)           (((val) & (1U << (bitname##_POS))) != 0)
-#define BL_DRV_DUMMY           \
-    {                          \
-        __ASM volatile("nop"); \
-        __ASM volatile("nop"); \
-        __ASM volatile("nop"); \
-        __ASM volatile("nop"); \
-    }
+#define BL_DRV_DUMMY       \
+  {                        \
+    __ASM volatile("nop"); \
+    __ASM volatile("nop"); \
+    __ASM volatile("nop"); \
+    __ASM volatile("nop"); \
+  }
 
 /* Std driver attribute macro*/
 #ifndef BFLB_USE_CUSTOM_LD_SECTIONS
-//#define ATTR_UNI_SYMBOL
-#define ATTR_STRINGIFY(x)               #x
-#define ATTR_TOSTRING(x)                ATTR_STRINGIFY(x)
-#define ATTR_UNI_SYMBOL                 __FILE__ ATTR_TOSTRING(__LINE__)
-#define ATTR_CLOCK_SECTION              __attribute__((section(".sclock_rlt_code." ATTR_UNI_SYMBOL)))
-#define ATTR_CLOCK_CONST_SECTION        __attribute__((section(".sclock_rlt_const." ATTR_UNI_SYMBOL)))
-#define ATTR_TCM_SECTION                __attribute__((section(".tcm_code." ATTR_UNI_SYMBOL)))
-#define ATTR_TCM_CONST_SECTION          __attribute__((section(".tcm_const." ATTR_UNI_SYMBOL)))
-#define ATTR_DTCM_SECTION               __attribute__((section(".tcm_data")))
+// #define ATTR_UNI_SYMBOL
+#define ATTR_STRINGIFY(x)        #x
+#define ATTR_TOSTRING(x)         ATTR_STRINGIFY(x)
+#define ATTR_UNI_SYMBOL          __FILE__ ATTR_TOSTRING(__LINE__)
+#define ATTR_CLOCK_SECTION       __attribute__((section(".sclock_rlt_code." ATTR_UNI_SYMBOL)))
+#define ATTR_CLOCK_CONST_SECTION __attribute__((section(".sclock_rlt_const." ATTR_UNI_SYMBOL)))
+#define ATTR_TCM_SECTION         __attribute__((section(".tcm_code." ATTR_UNI_SYMBOL)))
+#define ATTR_TCM_CONST_SECTION   __attribute__((section(".tcm_const." ATTR_UNI_SYMBOL)))
+// #define ATTR_DTCM_SECTION               __attribute__((section(".tcm_data")))
 #define ATTR_HSRAM_SECTION              __attribute__((section(".hsram_code")))
 #define ATTR_DMA_RAM_SECTION            __attribute__((section(".system_ram")))
 #define ATTR_NOCACHE_RAM_SECTION        __attribute__((section(".nocache_ram")))