Merge branch 'dev' into dev

Ralim · Aug 24, 2024 · 7a32f48 · 7a32f48
2 parents d3edb58 + 11beddf
commit 7a32f48
Show file tree

Hide file tree

Showing 46 changed files with 152 additions and 6 deletions.
diff --git a/Documentation/Logo.md b/Documentation/Logo.md
@@ -38,7 +38,7 @@ The model should be replaced by one of the following options:
 - `miniware` for older Miniware Irons -> TS100, TS80, TS80P
 - `pinecilv1` for the Pinecil V1
 - `pinecilv2` for the Pinecil V2
-- `ts101` for the Miniware TS101 [^1]
+- `ts101` for the Miniware TS101 [^1] [^2]
 - `s60` for the Squire S60 [^1]
 - `mhp30` for the Miniware MHP30
 
@@ -50,6 +50,28 @@ After processing its expected to have a `.hex` and `.dfu` file created to be use
 Note: make sure your image file is in the same folder as script files (img2logo.py, output_dfu.py, output_hex.py).
 
 [^1] Note that these devices have larger resolution screens that the logo system supports right now. Fixes are coming for this soon, roughly scheduled for 2.23.
+[^2] The TS101 requires extra steps, see below.
+
+### TS101 Quirks
+
+When Miniware designed the TS101 they cut cost by using an STM32 clone with some odd quirks. They also re-wrote their USB bootloader, which has introduced new bugs for us to deal with.
+Their bootloader appears to have kept the existing limit of not being able to flash small hex files, but they no longer fall for the older "just repeat the content" trick and instead reject the file.
+Additionally, while the MCU in use has 128K of flash, their bootloader (at least for me) fails to write to anything above 99K. It _looks_ like a watchdog reset or hard crash. Unsure.
+
+This has flow on effects, where the settings can still be located in the upper ~28K of flash, but it cant be used for anything we flash over USB.
+Of that 100K we can use, they waste 32K of it for their bootloader (Old bootloaders were 16K).
+This means the main "app" of IronOS is limited to around 67K (100K-32K for bootloader, -1K for logo).
+
+For this device the Logo is not located at the end of flash but instead at the last writable page (99K).
+
+Additionally, as we need to do a large write, to avoid having to waste more flash space; the logo is merged with the normal firmware. This means that the firmware and logo are flashed together once.
+Future updates can be done without merging as it will leave the logo data there as normal firmware doesnt touch that area of flash.
+
+To do this, download the latest version of IronOS and merge it with the logo using the `--merge` command line argument.
+
+To create the logo file for a TS101 the full command looks like `python3 img2logo.py <image file path> <output folder path> -m ts101 --merge <Path to main firmware>`.
+
+For this reason, there are no TS101 logo's generated by the IronOS-Meta repo.
 
 ## Flashing the Logo
 

diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json
@@ -233,6 +233,8 @@
       "displayText": "Эфект Хола\nадчувальнасць",
       "description": "Узровень адчувальнасці датчыка хола ў рэжыме сну (1=Мін. | ... | 9=Макс.)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Адзінкі\nтэмпературы",
       "description": "Адзінкі вымярэння тэмпературы (C=Цэльcія | F=Фарэнгейта)"

diff --git a/Translations/translation_BG.json b/Translations/translation_BG.json
@@ -233,6 +233,8 @@
       "displayText": "Датчик\nна Хол",
       "description": "Чувствителност на сензора към магнитно поле (1=Слабо | ... | 9=Силно)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Единици за\nтемпературата",
       "description": "Единици за температурата (C=Целзии | F=Фаренхайт)"

diff --git a/Translations/translation_CS.json b/Translations/translation_CS.json
@@ -233,6 +233,8 @@
       "displayText": "Citlivost\nHall. čidla",
       "description": "Citlivost Hallova čidla pro detekci spánku (1=nejméně citlivé | ... | 9=nejvíce citlivé)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Jednotka\nteploty",
       "description": "C=Celsius | F=Fahrenheit"

diff --git a/Translations/translation_DA.json b/Translations/translation_DA.json
@@ -233,6 +233,8 @@
       "displayText": "Hall sensor\nfølsomhed",
       "description": "følsomhed overfor magneten (1=Mindst følsom | ... | 9=Mest følsom)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Temperatur\nEnhed",
       "description": "Temperatur Enhed (C=Celsius | F=Fahrenheit)"

diff --git a/Translations/translation_DE.json b/Translations/translation_DE.json
@@ -233,6 +233,8 @@
       "displayText": "Empfindlichkeit\nder Hall-Sonde",
       "description": "Empfindlichkeit der Hall-Sonde um den Ruhemodus auszulösen (1=minimal | ... | 9=maximal)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Temperatur-\neinheit",
       "description": "C=°Celsius | F=°Fahrenheit"

diff --git a/Translations/translation_EL.json b/Translations/translation_EL.json
@@ -233,6 +233,8 @@
       "displayText": "Ευαισθ. αισθ. \nφαιν. Hall",
       "description": "Ευαισθησία του αισθητήρα φαινομένου Hall για εντοπισμό αδράνειας (1=λιγότερο ευαίσθητο | ... | 9=περισσότερο ευαίσθητο)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Μονάδες\nθερμοκρασίας",
       "description": "C=Κελσίου | F=Φαρενάιτ"

diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json
@@ -233,6 +233,10 @@
       "displayText": "Hall sensor\nsensitivity",
       "description": "Sensitivity to magnets (1=least sensitive | ... | 9=most sensitive)"
     },
+    "HallEffSleepTimeout": {
+      "displayText": "HallSensor\nSleepTime",
+      "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Temperature\nunit",
       "description": "C=°Celsius | F=°Fahrenheit"

diff --git a/Translations/translation_ES.json b/Translations/translation_ES.json
@@ -233,6 +233,8 @@
       "displayText": "Hall Eff\nSensibilidad",
       "description": "Sensibilidad del sensor de efecto Hall en la detección de reposo (1=menos sensible | ... | 9=más sensible)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Unidad de\ntemperatura",
       "description": "Unidad de temperatura (C=entígrados | F=Fahrenheit)"

diff --git a/Translations/translation_ET.json b/Translations/translation_ET.json
@@ -233,6 +233,8 @@
       "displayText": "Halli anduri\ntundlikkus",
       "description": "Tundlikkus magnetite suhtes (1=vähetundlikum | ... | 9=kõige tundlikum)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Temperatuuri\nühik",
       "description": "C=°Celsius | F=°Fahrenheit"

diff --git a/Translations/translation_FI.json b/Translations/translation_FI.json
@@ -233,6 +233,8 @@
       "displayText": "Hall-\nherk.",
       "description": "Hall-efektianturin herkkyys lepotilan tunnistuksessa (1=vähäinen herkkyys | ... | 9=suurin herkkyys)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Lämpötilan\nyksikkö",
       "description": "C=celsius, F=fahrenheit"

diff --git a/Translations/translation_FR.json b/Translations/translation_FR.json
@@ -233,6 +233,8 @@
       "displayText": "Sensibilité\ncapteur effet hall",
       "description": "Sensibilité du capteur à effet Hall pour la mise en veille (1=peu sensible | ... | 9=très sensible)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Unité de\ntempérature",
       "description": "C=Celsius | F=Fahrenheit"

diff --git a/Translations/translation_HR.json b/Translations/translation_HR.json
@@ -233,6 +233,8 @@
       "displayText": "Osjetljivost\nHall senzora",
       "description": "Osjetljivost senzora magnetskog polja za detekciju spavanja (N=Najmanja | S=Srednja | V=Visoka)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Jedinica\ntemperature",
       "description": "Jedinica temperature (C=Celzij | F=Fahrenheit)"

diff --git a/Translations/translation_HU.json b/Translations/translation_HU.json
@@ -233,6 +233,8 @@
       "displayText": "Alvásérzékelő\nérzékenység",
       "description": "Alvásérzékelő gyorsulásmérő érzékenysége (1=legkevésbé érzékeny | ... | 9=legérzékenyebb)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Hőmérséklet\nmértékegysége",
       "description": "Hőmérséklet mértékegysége (C=Celsius | F=Fahrenheit)"

diff --git a/Translations/translation_IT.json b/Translations/translation_IT.json
@@ -233,6 +233,8 @@
       "displayText": "Sensore\nHall",
       "description": "Regola la sensibilità del sensore ad effetto Hall per entrare in modalità riposo [1: minima; 9: massima]"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Unità di\ntemperatura",
       "description": "Scegli l'unità di misura per la temperatura [C: grado Celsius; F: grado Farenheit]"

diff --git a/Translations/translation_JA_JP.json b/Translations/translation_JA_JP.json
@@ -233,6 +233,8 @@
       "displayText": "磁界感度",
       "description": "スタンバイモードに入るのに使用される磁場センサーの感度 <1=最低感度 | ... | 9=最高感度>"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "温度単位",
       "description": "C=摂氏 | F=華氏"

diff --git a/Translations/translation_LT.json b/Translations/translation_LT.json
@@ -233,6 +233,8 @@
       "displayText": "Holo\njutiklis",
       "description": "Holo jutiklio jautrumas nustatant miegą (1=Mažiausias | ... | 9=Didžiausias)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Temperatūros\nvienetai",
       "description": "Temperatūros vienetai (C=Celsijus | F=Farenheitas)"

diff --git a/Translations/translation_NB.json b/Translations/translation_NB.json
@@ -233,6 +233,8 @@
       "displayText": "Hall-sensor\nfølsomhet",
       "description": "Sensitiviteten til Hall-effekt-sensoren for å detektere inaktivitet (1=Minst følsom | ... | 9=Mest følsom)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "TmpEnh\n",
       "description": "Temperaturskala (C=Celsius | F=Fahrenheit)"

diff --git a/Translations/translation_NL.json b/Translations/translation_NL.json
@@ -233,6 +233,8 @@
       "displayText": "Hall sensor\ngevoeligheid",
       "description": "Gevoeligheid naar de magneten (1=minst gevoelig | ... | 9=meest gevoelig)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Temperatuur\neenheid",
       "description": "C=°Celsius | F=°Fahrenheit"

diff --git a/Translations/translation_NL_BE.json b/Translations/translation_NL_BE.json
@@ -233,6 +233,8 @@
       "displayText": "Hall sensor\ngevoeligheid",
       "description": "Gevoeligheid naar de magneten (1=minst gevoelig | ... | 9=meest gevoelig)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Temperatuur\nschaal",
       "description": "Temperatuurschaal (°C=Celsius | °F=Fahrenheit)"

diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json
@@ -233,6 +233,8 @@
       "displayText": "Czułość\ncz. Halla",
       "description": "Czułość czujnika Halla, używanego do przechodznia w tryb uśpienia (1: Minimalna | ... | 9: Maksymalna)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Jednostka\ntemperatury",
       "description": "Jednostka temperatury (C: Celciusz | F: Fahrenheit)"

diff --git a/Translations/translation_PT.json b/Translations/translation_PT.json
@@ -233,6 +233,8 @@
       "displayText": "Sensibilidade de\nmagnetismo",
       "description": "Sensibilidade de magnetismo (1=Menor | ... | 9=Maior)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Unidade\ntemperatura",
       "description": "Unidade de temperatura (C=Celsius | F=Fahrenheit)"

diff --git a/Translations/translation_RO.json b/Translations/translation_RO.json
@@ -233,6 +233,8 @@
       "displayText": "Sensibilitate\nsenzor Hall",
       "description": "Sensibilitate senzor cu efect Hall pentru a detecta repausul (1=putin sensibil | ... | 9=cel mai sensibil)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Unitate de\ntemperatură",
       "description": "C=Celsius | F=Fahrenheit"

diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json
@@ -233,6 +233,8 @@
       "displayText": "Датчик\nХолла",
       "description": "Чувствительность датчика Холла к магнитному полю (1=мин. | ... | 9=макс.)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Единицы\nизмерения",
       "description": "Единицы измерения температуры (C=°Цельcия | F=°Фаренгейта)"

diff --git a/Translations/translation_SK.json b/Translations/translation_SK.json
@@ -233,6 +233,8 @@
       "displayText": "Citliv.\nHall",
       "description": "Citlivosť Hallovho senzora pre detekciu spánku (1=Min | ... | 9=Max)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Jednotka\nteploty",
       "description": "Jednotky merania teploty (C=stupne Celzia | F=stupne Fahrenheita)"

diff --git a/Translations/translation_SL.json b/Translations/translation_SL.json
@@ -233,6 +233,8 @@
       "displayText": "Občut.\nHall son",
       "description": "Občutljivost Hallove sonde za zaznavanje spanja (1=najmanjša | ... | 9=največja)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Enota za\ntemperaturo",
       "description": "Enota za temperaturo (C=celzij | F=fahrenheit)"

diff --git a/Translations/translation_SR_CYRL.json b/Translations/translation_SR_CYRL.json
@@ -233,6 +233,8 @@
       "displayText": "Hall sensor\nsensitivity",
       "description": "Sensitivity to magnets (1=најмање осетљиво | ... | 9=најосетљивије)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Јединица\nтемпературе",
       "description": "Јединице у којима се приказује температура. (C=целзијус | F=фаренхајт)"

diff --git a/Translations/translation_SR_LATN.json b/Translations/translation_SR_LATN.json
@@ -233,6 +233,8 @@
       "displayText": "Hall sensor\nsensitivity",
       "description": "Sensitivity to magnets (1=najmanje osetljivo | ... | 9=najosetljivije)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Jedinica\ntemperature",
       "description": "Jedinice u kojima se prikazuje temperatura. (C=celzijus | F=farenhajt)"

diff --git a/Translations/translation_SV.json b/Translations/translation_SV.json
@@ -233,6 +233,8 @@
       "displayText": "Sensor-\nkänslght",
       "description": "Känslighet för halleffekt-sensorn för viloläges-detektering (1=minst känslig | ... | 9=mest känslig)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Temperatur-\nenheter",
       "description": "Temperaturenhet (C=Celsius | F=Fahrenheit)"

diff --git a/Translations/translation_TR.json b/Translations/translation_TR.json
@@ -233,6 +233,8 @@
       "displayText": "Hall Sensör\nHassasiyeti",
       "description": "Mıknatıslara duyarlılık (1=En az duyarlı | ... | 9=En duyarlı)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "SCKBRM\n",
       "description": "Sıcaklık Birimi (C=Celsius | F=Fahrenheit)"

diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json
@@ -233,6 +233,8 @@
       "displayText": "Чутливість\nЕфекту Холла",
       "description": "Чутливість датчика ефекту Холла при виявленні сну (1=мін. чутливості | ... | 9=макс. чутливості)"
     },
+    "HallEffSleepTimeout": {                                            "displayText": "HallSensor\nSleepTime",                           "description": "Interval before \"sleep mode\" starts when hall effect is above threshold"
+    },
     "TemperatureUnit": {
       "displayText": "Формат темпе-\nратури(C°/F°)",
       "description": "Одиниця виміру температури (C=Цельсій | F=Фаренгейт)"