Release 2.19

* Bug-fix Infinite Boot Logo * Shutdown settings for MHP30 * Accelerometer sensitivity for MHP30 * Allow showing unique device ID * Bug-fix power pulse at device boot
Ralim · Jul 13, 2022 · a3bbabc · a3bbabc
2 parents 4e36ee8 + 8db0bbf
commit a3bbabc
Show file tree

Hide file tree

Showing 26 changed files with 496 additions and 407 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: alpine:3.15
+      image: alpine:3.16
     strategy:
       matrix:
         model: ["TS100", "TS80", "TS80P", "Pinecil", "MHP30"]
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-          
+
       - name: Git ownership exception
         run: git config --global --add safe.directory /__w/IronOS/IronOS && git config --global safe.directory "$GITHUB_WORKSPACE"
 
@@ -57,7 +57,7 @@ jobs:
   build_multi-lang:
     runs-on: ubuntu-20.04
     container:
-      image: alpine:3.15
+      image: alpine:3.16
     strategy:
       matrix:
         model: ["Pinecil"]
@@ -72,10 +72,10 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      
+
       - name: Git ownership exception
         run: git config --global --add safe.directory /__w/IronOS/IronOS && git config --global safe.directory "$GITHUB_WORKSPACE"
-      
+
       - name: build ${{ matrix.model }}
         run: cd source && make -j$(nproc) model="${{ matrix.model }}" firmware-multi_compressed_European firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian firmware-multi_Chinese+Japanese
 
@@ -107,7 +107,7 @@ jobs:
   tests:
     runs-on: ubuntu-20.04
     container:
-      image: alpine:3.15
+      image: alpine:3.16
 
     steps:
       - name: deps
@@ -134,7 +134,7 @@ jobs:
   check_formatting:
     runs-on: ubuntu-20.04
     container:
-      image: alpine:3.15
+      image: alpine:3.16
 
     steps:
       - name: deps

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.15
+FROM alpine:3.16
 LABEL maintainer="Ben V. Brown <[email protected]>"
 
 WORKDIR /build
@@ -14,6 +14,8 @@ RUN apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-el
 # Install Python3 packages
 
 RUN python3 -m pip install bdflib black
+# Git trust
+RUN git config --global --add safe.directory /build/source
 
 COPY . /build/source
 COPY ./ci /build/ci
diff --git a/README.md b/README.md
@@ -20,6 +20,15 @@ This project is considered feature complete for use as a soldering iron, _so ple
 
 _This firmware does **NOT** support the USB port while running for changing settings. This is done through the onscreen menu only. Logos are edited using the tool or python script and uploaded in DFU mode._
 
+
+|  Device 	| DC Supported 	| QC Supported 	| PD Supported 	| Reccomended 	|
+|--------:	|:------------:	|:------------:	|:------------:	|:-----------:	|
+|   MHP30 	|      ❌       |      ❌      |      ✔️      |      ✔️       |
+| Pinecil 	|      ✔️       |      ✔️      |      ✔️      |      ✔️       |
+|   TS100 	|      ✔️       |      ❌      |      ❌      |      ❌       |
+|    TS80 	|      ❌       |      ✔️      |      ❌      |      ❌       |
+|   TS80P 	|      ❌       |      ✔️      |      ✔️      |      ✔️       |
+
 ## Getting Started
 
 To get started with IronOS firmware, please jump to [Getting Started Guide](Documentation/GettingStarted.md).

diff --git a/Translations/make_translation.py b/Translations/make_translation.py
@@ -120,9 +120,6 @@ def get_constants(build_version: str) -> List[Tuple[str, str]]:
 def get_debug_menu() -> List[str]:
     return [
         datetime.today().strftime("%d-%m-%y"),
-        "HW G ",
-        "HW M ",
-        "HW P ",
         "Time ",
         "Move ",
         "RTip ",
@@ -131,7 +128,11 @@ def get_debug_menu() -> List[str]:
         "Vin  ",
         "ACC  ",
         "PWR  ",
+        "ID   ",
         "Max  ",
+        "HW G ",
+        "HW M ",
+        "HW P ",
         "Hall ",
     ]
 
@@ -429,7 +430,24 @@ def get_font_map_per_font(text_list: List[str], fonts: List[str]) -> FontMapsPer
 
 
 def get_forced_first_symbols() -> List[str]:
-    forced_first_symbols = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
+    forced_first_symbols = [
+        "0",
+        "1",
+        "2",
+        "3",
+        "4",
+        "5",
+        "6",
+        "7",
+        "8",
+        "9",
+        "a",
+        "b",
+        "c",
+        "d",
+        "e",
+        "f",
+    ]
     return forced_first_symbols
 
 

diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json
@@ -80,8 +80,8 @@
       "desc": "Délai avant mise en veille (s=secondes | m=minutes)"
     },
     "ShutdownTimeout": {
-      "text2": ["Délai", "extinction"],
-      "desc": "Délai avant extinction (m=minutes)"
+      "text2": ["Délai", "arrêt"],
+      "desc": "Délai avant l'arrêt du fer à souder (m=minutes)"
     },
     "MotionSensitivity": {
       "text2": ["Sensibilité", "au mouvement"],
@@ -136,7 +136,7 @@
       "desc": "Tension maximale désirée avec une alimentation QC"
     },
     "PDNegTimeout": {
-      "text2": ["Délai", "expiration PD"],
+      "text2": ["Délai", "expir. PD"],
       "desc": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC"
     },
     "PowerLimit": {
@@ -156,17 +156,17 @@
       "desc": "Incrément de changement de température sur appui long"
     },
     "PowerPulsePower": {
-      "text2": ["Puissance des", "impulsions"],
+      "text2": ["Puissance", "impulsions"],
       "desc": "Puissance des impulsions pour éviter la mise en veille des batteries (watts)"
     },
-    "LockingMode": {
-      "text2": ["Verrouiller", "les boutons"],
-      "desc": "Pendant la soudure, appuyer sur les deux boutons pour les verrouiller (D=désactivé | B=boost seulement | V=verr. total)"
-    },
     "HallEffSensitivity": {
       "text2": ["Sensibilité", "capteur effet hall"],
       "desc": "Sensibilité du capteur à effet Hall pour la mise en veille (0=désactivé | 1=peu sensible | ... | 9=très sensible)"
     },
+    "LockingMode": {
+      "text2": ["Verrouiller", "les boutons"],
+      "desc": "Pendant la soudure, appuyer sur les deux boutons pour les verrouiller (D=désactivé | B=boost seulement | V=verr. total)"
+    },
     "MinVolCell": {
       "text2": ["Tension", "minimale"],
       "desc": "Tension minimale autorisée par cellule (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
@@ -193,15 +193,15 @@
     },
     "Brightness": {
       "text2": ["Luminosité", "de l'écran"],
-      "desc": "Ajuster le contraste/luminosité de l'écran OLED"
+      "desc": "Ajuster la luminosité de l'écran OLED"
     },
     "ColourInversion": {
       "text2": ["Inverser", "les couleurs"],
       "desc": "Inverser les couleurs de l'écran OLED"
     },
     "LOGOTime": {
-      "text2": ["Boot logo", "duration"],
-      "desc": "Sets the duration for the boot logo (s=seconds)"
+      "text2": ["Durée logo", "au démarrage"],
+      "desc": "Définit la durée d'affichage du logo au démarrage (s=secondes)"
     }
   }
 }
diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json
@@ -132,8 +132,8 @@
       "desc": "Szybkość przewijania tekstu"
     },
     "QCMaxVoltage": {
-      "text2": ["Moc", "w W"],
-      "desc": "Moc używanego zasilacza w (W)"
+      "text2": ["QC", "napięcie"],
+      "desc": "Maksymalne napięcie, które lutownica będzie próbowała wynegocjować z ładowarką Quick Charge (V)"
     },
     "PDNegTimeout": {
       "text2": ["Limit czasu", "PD"],

diff --git a/source/Core/BSP/BSP.h b/source/Core/BSP/BSP.h
@@ -74,6 +74,9 @@ void log_system_state(int32_t PWMWattsx10);
 // Returns true if the tip is disconnected
 bool isTipDisconnected();
 
+// Return hardware unique ID if possible
+uint64_t getDeviceID();
+
 // Status LED controls
 
 enum StatusLED {
@@ -86,6 +89,10 @@ enum StatusLED {
 };
 void setStatusLED(const enum StatusLED state);
 
+// preStartChecks are run until they return 0
+// By the PID, after each ADC sample comes in
+// For example, on the MHP30 this is used to figure out the resistance of the hotplate
+uint8_t preStartChecks();
 #ifdef __cplusplus
 }
 #endif