Compare commits

...

65 Commits

Author SHA1 Message Date
nonokirby
cc0dcbdcc2 Merge 14cca01f78 into 40655a9501 2025-02-25 22:01:44 +01:00
Leska
40655a9501 Updated Overall French Translations (#2085)
Some checks failed
Docs / deploy-docs (push) Has been cancelled
CI / build (MHP30) (push) Has been cancelled
CI / build (Pinecil) (push) Has been cancelled
CI / build (Pinecilv2) (push) Has been cancelled
CI / build (S60) (push) Has been cancelled
CI / build (S60P) (push) Has been cancelled
CI / build (T55) (push) Has been cancelled
CI / build (TS100) (push) Has been cancelled
CI / build (TS101) (push) Has been cancelled
CI / build (TS80) (push) Has been cancelled
CI / build (TS80P) (push) Has been cancelled
CI / build_multi-lang (Pinecil) (push) Has been cancelled
CI / build_multi-lang (Pinecilv2) (push) Has been cancelled
CI / tests (push) Has been cancelled
CI / check_c-cpp (push) Has been cancelled
CI / check_python (push) Has been cancelled
CI / check_shell (push) Has been cancelled
CI / check_docs (push) Has been cancelled
CI / upload_metadata (push) Has been cancelled
* Updated French translation.

* Updated

* Update Translations/translation_FR.json (discip)

Co-authored-by: discip <53649486+discip@users.noreply.github.com>

* added missing options

For some reason the following options were missing:
* Cool Down Blink
* Reverse Temp Change Buttons

* Update translation_FR.json

* Update translation_FR.json

---------

Co-authored-by: discip <53649486+discip@users.noreply.github.com>
2025-02-25 18:09:15 +01:00
nonokirby
14cca01f78 Update Soldering.cpp to enable standard locking for testing 2025-01-29 11:21:17 -05:00
Ivan Zorin
6a549b6acc Sync 2025-01-29 01:13:03 +03:00
Ivan Zorin
911ef59da4 Enable TEMP locking as option 2025-01-26 03:35:15 +03:00
Ivan Zorin
7e1dfc05a3 Sync 2025-01-26 02:00:28 +03:00
Ivan Zorin
7bf9620eb7 Help to Unify descriptions for new locking mode in definitions.json and in Settings.h 2025-01-24 23:42:43 +03:00
nonokirby
a712e8d478 Apply suggestions from code review to clean up wording and typos 2025-01-23 21:21:08 -05:00
nonokirby
d6c04a090b Update Soldering.cpp to fix formatting (again.....) 2025-01-21 22:10:51 -05:00
nonokirby
7869b28736 Update Soldering.cpp Fix formatting 2025-01-21 22:09:23 -05:00
nonokirby
06629c6d87 Update Soldering.cpp 2025-01-21 21:58:21 -05:00
nonokirby
98755f06a1 Update translation_ZH_TW.json 2025-01-21 21:42:36 -05:00
nonokirby
82a032819a Update translation_ZH_CN.json 2025-01-21 21:42:29 -05:00
nonokirby
daca0e66f8 Update translation_YUE_HK.json 2025-01-21 21:42:22 -05:00
nonokirby
e1340adf13 Update translation_VI.json 2025-01-21 21:42:14 -05:00
nonokirby
1b45b363f2 Update translation_UZ.json 2025-01-21 21:42:07 -05:00
nonokirby
78686a8e51 Update translation_UK.json 2025-01-21 21:41:54 -05:00
nonokirby
4286358d1d Update translation_TR.json 2025-01-21 21:41:46 -05:00
nonokirby
60e3f1d5af Update translation_SV.json 2025-01-21 21:41:36 -05:00
nonokirby
d9d421fe8f Update translation_SR_LATN.json 2025-01-21 21:41:27 -05:00
nonokirby
30c9ac805a Update translation_SR_CYRL.json 2025-01-21 21:41:19 -05:00
nonokirby
52c4087d3f Update translation_SL.json 2025-01-21 21:41:07 -05:00
nonokirby
a5259448b9 Update translation_SK.json 2025-01-21 21:40:57 -05:00
nonokirby
7c2664797e Update translation_RU.json 2025-01-21 21:40:46 -05:00
nonokirby
6e30c78c9d Update translation_RO.json 2025-01-21 21:40:36 -05:00
nonokirby
d7a58e50d4 Update translation_PT.json 2025-01-21 21:40:28 -05:00
nonokirby
050fa824c0 Update translation_PL.json 2025-01-21 21:40:19 -05:00
nonokirby
509e6a8ef4 Update translation_NL_BE.json 2025-01-21 21:40:11 -05:00
nonokirby
1e756b4b4a Update translation_NL.json 2025-01-21 21:39:59 -05:00
nonokirby
ea14714b36 Update translation_NB.json 2025-01-21 21:39:47 -05:00
nonokirby
67ecb2d766 Update translation_LT.json 2025-01-21 21:39:38 -05:00
nonokirby
32d9577e48 Update translation_JA_JP.json 2025-01-21 21:39:31 -05:00
nonokirby
0fa48ed345 Update translation_IT.json 2025-01-21 21:39:19 -05:00
nonokirby
211c172103 Update translation_HU.json 2025-01-21 21:39:13 -05:00
nonokirby
058f04f0cd Update translation_HR.json 2025-01-21 21:39:03 -05:00
nonokirby
84c61aa62a Update translation_FR.json 2025-01-21 21:38:50 -05:00
nonokirby
5a67f060d4 Update translation_FI.json 2025-01-21 21:38:31 -05:00
nonokirby
9d26f8b1b5 Update translation_ET.json 2025-01-21 21:38:13 -05:00
nonokirby
72a7cf3de2 Update translation_ES.json 2025-01-21 21:38:03 -05:00
nonokirby
0fdc05257a Update translation_EN.json 2025-01-21 21:37:51 -05:00
nonokirby
8c538a2ab0 Update translation_EN.json 2025-01-21 21:37:37 -05:00
nonokirby
f6c864d3b6 Update translation_EL.json 2025-01-21 21:37:27 -05:00
nonokirby
c2c1cab283 Update translation_DE.json 2025-01-21 21:37:12 -05:00
nonokirby
522822b268 Update translation_DA.json 2025-01-21 21:37:00 -05:00
nonokirby
b37c4209af Update translation_CS.json 2025-01-21 21:36:50 -05:00
nonokirby
eca4a230bc Update translation_BG.json 2025-01-21 21:36:27 -05:00
nonokirby
ff213aa06f Update translation_BE.json 2025-01-21 21:36:07 -05:00
nonokirby
4a1e946e25 Update translations_definitions.json 2025-01-21 20:55:41 -05:00
nonokirby
b005870033 Update Soldering.cpp to fix build complaining 2025-01-21 20:48:30 -05:00
nonokirby
07457af576 Update Soldering.cpp because i used the wrong symbol 2025-01-21 20:21:38 -05:00
nonokirby
7fc12dafbf Update Soldering.cpp to fix broken logic 2025-01-21 20:19:12 -05:00
nonokirby
cb667874b6 Update Settings.cpp 2025-01-21 20:05:41 -05:00
nonokirby
f759195339 Update translation_EN.json 2025-01-21 19:30:40 -05:00
nonokirby
5e8cd339ed Update Translation.h 2025-01-21 19:25:44 -05:00
nonokirby
ab5f5b23a6 Update settingsGUI.cpp to change display for locking mode 2025-01-21 19:17:30 -05:00
nonokirby
5b5200a8d8 Update Settings.cpp to revert addition of new setting 2025-01-21 18:41:39 -05:00
nonokirby
9e8bd8e790 Update Settings.h to add better descriptions 2025-01-21 18:40:14 -05:00
nonokirby
6632065ade Update Settings.h to change locking mode 2025-01-21 18:21:31 -05:00
nonokirby
fc7aaf2b56 Update Settings.cpp add BoostButtonTe 2025-01-21 17:51:32 -05:00
nonokirby
95493b48e7 Update Soldering.cpp to disable + activating temp only while boost mode setting is on 2025-01-21 00:04:48 -05:00
nonokirby
27de7f5db1 Update Settings.cpp 2025-01-21 00:03:46 -05:00
nonokirby
450d129d15 Update Settings.cpp 2025-01-21 00:01:08 -05:00
nonokirby
9b3effeaa6 Update Soldering.cpp with call to setting BoostButtonTempChange 2025-01-20 23:43:32 -05:00
nonokirby
2bd7b81589 Soldering Control Changes
Updated the readme file to reflect the changes to A/+ in soldering mode.
2025-01-20 18:30:50 -05:00
nonokirby
933e2ccd7f Disable change temp with B/+ in soldering mode
Disabled the change temp menu appearing when + is pressed in soldering mode to prevent accidental changes of temperature while using boost mode.
2025-01-20 17:56:49 -05:00
41 changed files with 130 additions and 81 deletions

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Ч",
"SettingStartSleepOffChar": "К",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "П",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "M",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "U"
"SettingLockFullChar": "U",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "K",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Ζ",
"SettingStartSleepOffChar": "Υ",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "Π"
"SettingLockFullChar": "Π",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "F",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "P",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "T"
"SettingLockFullChar": "T",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "L",
"SettingStartSleepOffChar": "H",
"SettingLockBoostChar": "V",
"SettingLockFullChar": "K"
"SettingLockFullChar": "K",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -19,37 +19,37 @@
"message": "USB-PD\nnon détecté !"
},
"LockingKeysString": {
"message": "VERROUIL"
"message": "VERROUIL"
},
"UnlockingKeysString": {
"message": "DEVERROU"
"message": "DEVERROUILLÉ"
},
"WarningKeysLockedString": {
"message": "! VERR. !"
},
"WarningThermalRunaway": {
"message": "Emballement\nthermique"
"message": "Surchauffe\ncritique"
},
"WarningTipShorted": {
"message": "!Tip Shorted!"
"message": "!Court-circuit Panne!"
},
"SettingsCalibrationWarning": {
"message": "Avant de redémarrer, assurez-vous que la panne et la poignée sont à température ambiante !"
},
"CJCCalibrating": {
"message": "Etalonnage\n"
"message": "Étalonnage\n"
},
"SettingsResetWarning": {
"message": "Voulez-vous vraiment réinitialiser les paramètres aux valeurs par défaut ?"
},
"UVLOWarningString": {
"message": "DC FAIBL"
"message": "TENSION FAIBLE"
},
"UndervoltageString": {
"message": "Sous-tension\n"
},
"InputVoltageString": {
"message": "V d'entrée: \n"
"message": "Tension d'entrée:\n"
},
"SleepingAdvancedString": {
"message": "En veille...\n"
@@ -58,10 +58,10 @@
"message": "Panne: \n"
},
"ProfilePreheatString": {
"message": "Preheat\n"
"message": "Préchauffage\n"
},
"ProfileCooldownString": {
"message": "Cooldown\n"
"message": "Refroidissement\n"
},
"DeviceFailedValidationWarning": {
"message": "Votre appareil semble être une contrefaçon !"
@@ -81,7 +81,8 @@
"SettingStartSleepChar": "V",
"SettingStartSleepOffChar": "O",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {
@@ -107,22 +108,22 @@
},
"menuValues": {
"USBPDModeDefault": {
"displayText": "Default\nMode"
"displayText": "Mode\npar Défaut"
},
"USBPDModeNoDynamic": {
"displayText": "No\nDynamic"
"displayText": "Non\nDynamique"
},
"USBPDModeSafe": {
"displayText": "Safe\nMode"
"displayText": "Mode\nSafe"
},
"TipTypeAuto": {
"displayText": "Auto\nSense"
"displayText": "Détéction\nAuto."
},
"TipTypeT12Long": {
"displayText": "TS100\nLong"
},
"TipTypeT12Short": {
"displayText": "Pine\nShort"
"displayText": "Pine\nCourt"
},
"TipTypeT12PTS": {
"displayText": "PTS\n200"
@@ -137,7 +138,7 @@
"menuOptions": {
"DCInCutoff": {
"displayText": "Source\nd'alim.",
"description": "Source d'alimentation. Règle la tension de coupure (DC 10V) (S 3.3V par cellules, désactive la limite de puissance)"
"description": "Source d'alimentation. Définit la tension de coupure (DC 10V) (S 3.3V par cellule, désactive la limite de puissance)"
},
"MinVolCell": {
"displayText": "Tension\nminimale",
@@ -149,18 +150,18 @@
},
"PDNegTimeout": {
"displayText": "Délai\nexpir. PD",
"description": "Délai de la negociation PD par étapes de 100ms pour la compatiblité avec certains chargeurs QC"
"description": "Délai de gociation PD par paliers de 100ms pour la compatibilité avec certains chargeurs QC"
},
"USBPDMode": {
"displayText": "PD\nMode",
"description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
"displayText": "Mode\nPD",
"description": "Aucune dynamique ne désactive EPR & PPS, le mode sécurisé n'utilise pas de résistance de protection"
},
"BoostTemperature": {
"displayText": "Temp.\nboost",
"description": "Température utilisée en \"mode boost\""
},
"AutoStart": {
"displayText": "Chauffer au\ndémarrage",
"displayText": "Chauffer audémarrage",
"description": "A=activé | V=mode veille | O=mode veille à température ambiante"
},
"TempChangeShortStep": {
@@ -177,23 +178,23 @@
},
"ProfilePhases": {
"displayText": "Profile\nPhases",
"description": "Number of phases in profile mode"
"description": "Nombre de phases dans le mode de profile"
},
"ProfilePreheatTemp": {
"displayText": "Preheat\nTemp",
"description": "Preheat to this temperature at the start of profile mode"
"displayText": "Temp.\nPréchauffage",
"description": "Préchauffer à cette température au début du mode de profile"
},
"ProfilePreheatSpeed": {
"displayText": "Preheat\nSpeed",
"description": "Preheat at this rate (degrees per second)"
"displayText": "Vitesse\nPréchauffage",
"description": "Préchauffer à cette vitesse (degrés par seconde)"
},
"ProfilePhase1Temp": {
"displayText": "Phase 1\nTemp",
"description": "Target temperature for the end of this phase"
"displayText": "Temp.\nPhase 1",
"description": "Température séléctionnée pour la fin de cette phase"
},
"ProfilePhase1Duration": {
"displayText": "Phase 1\nDuration",
"description": "Target duration of this phase (seconds)"
"displayText": "Durée\nPhase 1",
"description": "Durée séléctionnée pour cette phase (secondes)"
},
"ProfilePhase2Temp": {
"displayText": "Phase 2\nTemp",
@@ -228,12 +229,12 @@
"description": ""
},
"ProfileCooldownSpeed": {
"displayText": "Cooldown\nSpeed",
"description": "Cooldown at this rate at the end of profile mode (degrees per second)"
"displayText": "Vitesse de\nRefroidissement",
"description": "Refroidissement à ce rythme à la fin du mode profil (degrés par seconde)"
},
"MotionSensitivity": {
"displayText": "Sensibilité\nau mouvement",
"description": "1=peu sensible | ... | 9=très sensible"
"description": "1=très peu sensible | ... | 9=extrêmement sensible"
},
"SleepTemperature": {
"displayText": "Temp.\nveille",
@@ -252,15 +253,15 @@
"description": "Sensibilité du capteur à effet Hall pour la mise en veille (1=peu sensible | ... | 9=très sensible)"
},
"HallEffSleepTimeout": {
"displayText": "HallSensor\nSleepTime",
"displayText": "TempsVeille\nCapteurHall",
"description": "Intervalle avant le démarrage du \"mode veille\" lorsque l'effet Hall est supérieur au seuil"
},
"TemperatureUnit": {
"displayText": "Unité de\ntempérature",
"displayText": "Unité de température",
"description": "C=Celsius | F=Fahrenheit"
},
"DisplayRotation": {
"displayText": "Orientation\nde l'écran",
"displayText": "Orientation de l'écran",
"description": "D=droitier | G=gaucher | A=automatique"
},
"CooldownBlink": {
@@ -268,7 +269,7 @@
"description": "Faire clignoter la température lors du refroidissement tant que la panne est chaude"
},
"ScrollingSpeed": {
"displayText": "Vitesse de\ndéfilement",
"displayText": "Vitesse de défilement",
"description": "Vitesse de défilement du texte (R=rapide | L=lent)"
},
"ReverseButtonTempChange": {
@@ -276,7 +277,7 @@
"description": "Inverser les boutons d'ajustement de température"
},
"AnimSpeed": {
"displayText": "Vitesse\nanim. icônes",
"displayText": "Vitesse anim. icônes",
"description": "Vitesse des animations des icônes dans le menu (L=lente | M=moyenne | R=rapide)"
},
"AnimLoop": {
@@ -340,8 +341,8 @@
"description": ""
},
"SolderingTipType": {
"displayText": "Soldering\nTip Type",
"description": "Select the tip type fitted"
"displayText": "Soudure\nType de panne",
"description": "Séléctionner le type de panne utilisé"
}
}
}

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "T",
"SettingStartSleepOffChar": "H",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "Z"
"SettingLockFullChar": "Z",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "A",
"SettingStartSleepOffChar": "Sz",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "T"
"SettingLockFullChar": "T",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "R",
"SettingStartSleepOffChar": "A",
"SettingLockBoostChar": "T",
"SettingLockFullChar": "C"
"SettingLockFullChar": "C",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "ブ",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "M",
"SettingStartSleepOffChar": "K",
"SettingLockBoostChar": "T",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "D",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "Z",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "V"
"SettingLockFullChar": "V",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "K",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "O",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "P"
"SettingLockFullChar": "P",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "H",
"SettingStartSleepOffChar": "A",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "К",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "I",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "P"
"SettingLockFullChar": "P",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "V",
"SettingLockBoostChar": "L",
"SettingLockFullChar": "P"
"SettingLockFullChar": "P",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "X",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "S",
"SettingStartSleepOffChar": "X",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "V",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "T",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "U",
"SettingStartSleepOffChar": "S",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "С",
"SettingStartSleepOffChar": "К",
"SettingLockBoostChar": "Т",
"SettingLockFullChar": "П"
"SettingLockFullChar": "П",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "U",
"SettingStartSleepOffChar": "X",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "T"
"SettingLockFullChar": "T",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "Z",
"SettingStartSleepOffChar": "R",
"SettingLockBoostChar": "B",
"SettingLockFullChar": "F"
"SettingLockFullChar": "F",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "增",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "增",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -81,7 +81,8 @@
"SettingStartSleepChar": "待",
"SettingStartSleepOffChar": "室",
"SettingLockBoostChar": "增",
"SettingLockFullChar": "全"
"SettingLockFullChar": "全",
"SettingLockTempChar": "T"
},
"menuGroups": {
"PowerMenu": {

View File

@@ -165,6 +165,12 @@
"len": 1,
"default": "F",
"description": "Shown when the locking mode is set to lock all buttons."
},
{
"id": "SettingLockTempChar",
"len": 1,
"default": "T",
"description": "Shown when the locking mode is set to lock all buttons except for -/B to change the temperature."
}
],
"menuGroups": [

View File

@@ -114,9 +114,10 @@ typedef enum {
} usbpdMode_t;
typedef enum {
DISABLED = 0, // Locking buttons is disabled
BOOST = 1, // Locking buttons for Boost mode only
FULL = 2, // Locking buttons for Boost mode AND for Soldering mode
DISABLED = 0, // All buttons are unlocked
BOOST = 1, // All buttons are locked except boost
FULL = 2, // All buttons are locked
TEMP = 3, // All buttons are locked except -/B to change the temperature
} lockingMode_t;
/* Selection of the soldering tip

View File

@@ -147,6 +147,7 @@ struct TranslationIndexTable {
uint16_t SettingStartSleepOffChar;
uint16_t SettingLockBoostChar;
uint16_t SettingLockFullChar;
uint16_t SettingLockTempChar;
uint16_t USBPDModeDefault;
uint16_t USBPDModeNoDynamic;
uint16_t USBPDModeSafe;

View File

@@ -72,7 +72,7 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
{ 0, 1, 1, DETAILED_SOLDERING}, // DetailedSoldering
{ 0, (uint16_t)(HasFahrenheit ? 1 : 0), 1, TEMPERATURE_INF}, // TemperatureInF
{ 0, 1, 1, DESCRIPTION_SCROLL_SPEED}, // DescriptionScrollSpeed
{ 0, 2, 1, LOCKING_MODE}, // LockingMode
{ 0, 3, 1, LOCKING_MODE}, // LockingMode
{ 0, 99, 1, POWER_PULSE_DEFAULT}, // KeepAwakePulse
{ 1, POWER_PULSE_WAIT_MAX, 1, POWER_PULSE_WAIT_DEFAULT}, // KeepAwakePulseWait
{ 1, POWER_PULSE_DURATION_MAX, 1, POWER_PULSE_DURATION_DEFAULT}, // KeepAwakePulseDuration

View File

@@ -635,6 +635,9 @@ static void displayLockingMode(void) {
case lockingMode_t::FULL:
OLED::print(translatedString(Tr->SettingLockFullChar), FontStyle::LARGE);
break;
case lockingMode_t::TEMP:
OLED::print(translatedString(Tr->SettingLockTempChar), FontStyle::LARGE);
break;
default:
OLED::drawUnavailableIcon();
break;

View File

@@ -35,7 +35,7 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
cxt->scratch_state.state1 = 3;
break;
case BUTTON_F_LONG:
if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::BOOST)) {
if (getSettingValue(SettingsOptions::BoostTemp) && (getSettingValue(SettingsOptions::LockingMode) >= lockingMode_t::BOOST ||)) {
cxt->scratch_state.state2 = 1;
break;
}
@@ -65,6 +65,9 @@ OperatingMode handleSolderingButtons(const ButtonState buttons, guiContext *cxt)
}
break;
case BUTTON_F_SHORT:
if (getSettingValue(SettingsOptions::LockingMode) == lockingMode_t::TEMP) {
break;
}
case BUTTON_B_SHORT:
cxt->transitionMode = TransitionAnimation::Left;
return OperatingMode::TemperatureAdjust;