Updated Overall French Translations (#2085)

* 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>

Translations/translation_BE.json

@@ -272,13 +272,9 @@
       "description": "Хуткасць гартання тэксту (М=марудна | Х=хутка)"
     },
     "ReverseButtonTempChange": {
-      "displayText": "Інвертаваць\nкнопкі +/-",
+      "displayText": "Інвертаваць\nкнопкі",
       "description": "Інвертаваць кнопкі вымярэння тэмпературы"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Інвертаваць\nкнопкі A/B",
-      "description": "Інвертаваць кнопкі навігацыі ў меню"
-    },
     "AnimSpeed": {
       "displayText": "Хуткасць\nанімацыі",
       "description": "Хуткасць анімацыі гузікаў у галоўным меню (Мілісекунды) (Н=Нізкая | С=Сярэдняя | В=Высокая)"

Translations/translation_BG.json

@@ -275,10 +275,6 @@
       "displayText": "Размяна\nбутони +/-",
       "description": "Обръщане на бутоните + и - за промяна на температурата на човка на поялника"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Размяна\nбутони А/В",
-      "description": "Обръщане бутоните А и В за навигация в менютата"
-    },
     "AnimSpeed": {
       "displayText": "Скорост на\nанимацията",
       "description": "Скорост на анимация на иконата в главното меню (Н=Ниска | C=Средна | B=Висока)"

Translations/translation_CS.json

@@ -275,10 +275,6 @@
       "displayText": "Prohodit\ntl. +-?",
       "description": "Prohodit tlačítka pro změnu teploty"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nrychlost",
       "description": "Tempo animace ikon v menu (P=pomalu | S=středně | R=rychle)"

Translations/translation_DA.json

@@ -275,10 +275,6 @@
       "displayText": "Skift\n+ - tasterne",
       "description": "Skift tildeling af knapper til temperaturjustering"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nHastighed",
       "description": "Hastigheden for ikonanimationer i menuen (S=langsomt | M=medium | F=hurtigt)"

Translations/translation_DE.json

@@ -275,10 +275,6 @@
       "displayText": "+- Tasten\numkehren",
       "description": "Tastenbelegung zur Temperaturänderung umkehren"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nGeschw.",
       "description": "Geschwindigkeit der Icon-Animationen im Menü (L=langsam | M=mittel | S=schnell)"

Translations/translation_EL.json

@@ -275,10 +275,6 @@
       "displayText": "Αντιστροφή\nπλήκτρων + -",
       "description": "Αντιστροφή διάταξης πλήκτρων στη ρύθμιση θερμοκρασίας"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Ταχύτητα\nκιν. εικονιδ.",
       "description": "Ρυθμός κίνησης εικονιδίων στο μενού (Α=αργός | Μ=μέτριος | Γ=γρήγορος)"

Translations/translation_EN.json

@@ -272,13 +272,9 @@
       "description": "Scrolling speed of info text (S=slow | F=fast)"
     },
     "ReverseButtonTempChange": {
-      "displayText": "Swap\n+/- keys",
+      "displayText": "Swap\n+ - keys",
       "description": "Reverse assignment of buttons for temperature adjustment"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",
       "description": "Pace of icon animations in menu (S=slow | M=medium | F=fast)"

Translations/translation_ES.json

@@ -275,10 +275,6 @@
       "displayText": "Invertir\nbotones +/-",
       "description": "Invertir botones de ajuste de temperatura"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nvelocidad",
       "description": "Velocidad de animaciones de iconos en el menú (L=baja | M=media | R=alta)"

Translations/translation_ET.json

@@ -275,10 +275,6 @@
       "displayText": "Vaheta\n+ - nupud",
       "description": "Temperatuurinuppude asukohtade vahetus"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nkiirus",
       "description": "Menüüikoonide animatsiooni kiirus (A=aeglane | K=keskmine | T=tempokas)"

Translations/translation_FI.json

@@ -275,10 +275,6 @@
       "displayText": "Suunnanvaihto\n+ - näppäimille",
       "description": "Lämpötilapainikkeiden suunnan vaihtaminen"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Animaation\nnopeus",
       "description": "Animaatioiden nopeus valikossa (A=alhainen | K=keskiverto | S=suuri)"

Translations/translation_FR.json

@@ -4,7 +4,7 @@
   "tempUnitFahrenheit": false,
   "messagesWarn": {
     "CalibrationDone": {
-      "message": "Étalonnage\nterminé!"
+      "message": "Étalonnage\nterminé !"
     },
     "ResetOKMessage": {
       "message": "Reset OK"
@@ -19,37 +19,37 @@
       "message": "USB-PD\nnon détecté !"
     },
     "LockingKeysString": {
-      "message": "VERROUIL"
+      "message": "VERROUILLÉ"
     },
     "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 !"
@@ -107,22 +107,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,11 +137,11 @@
   "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",
-      "description": "Tension minimale autorisée par cellule (3S: 3 - 3.7V | 4-6S: 2.4 - 3.7V)"
+      "description": "Tension minimale autorisée par cellule (3S : 3 - 3.7V | 4-6S : 2.4 - 3.7V)"
     },
     "QCMaxVoltage": {
       "displayText": "Tension\nQC",
@@ -149,18 +149,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 négociation PD par paliers de 100ms pour la compatibilité avec certains chargeurs QC"
     },
     "USBPDMode": {
-      "displayText": "PD\nMode",
+      "displayText": "Mode\nPD",
-      "description": "No Dynamic disables EPR & PPS, Safe mode does not use padding resistance"
+      "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 +177,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",
+      "displayText": "Temp.\nPréchauffage",
-      "description": "Preheat to this temperature at the start of profile mode"
+      "description": "Préchauffer à cette température au début du mode de profile"
     },
     "ProfilePreheatSpeed": {
-      "displayText": "Preheat\nSpeed",
+      "displayText": "Vitesse\nPréchauffage",
-      "description": "Preheat at this rate (degrees per second)"
+      "description": "Préchauffer à cette vitesse (degrés par seconde)"
     },
     "ProfilePhase1Temp": {
-      "displayText": "Phase 1\nTemp",
+      "displayText": "Temp.\nPhase 1",
-      "description": "Target temperature for the end of this phase"
+      "description": "Température séléctionnée pour la fin de cette phase"
     },
     "ProfilePhase1Duration": {
-      "displayText": "Phase 1\nDuration",
+      "displayText": "Durée\nPhase 1",
-      "description": "Target duration of this phase (seconds)"
+      "description": "Durée séléctionnée pour cette phase (secondes)"
     },
     "ProfilePhase2Temp": {
       "displayText": "Phase 2\nTemp",
@@ -228,12 +228,12 @@
       "description": ""
     },
     "ProfileCooldownSpeed": {
-      "displayText": "Cooldown\nSpeed",
+      "displayText": "Vitesse de\nRefroidissement",
-      "description": "Cooldown at this rate at the end of profile mode (degrees per second)"
+      "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 +252,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,19 +268,15 @@
       "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": {
-      "displayText": "Inverser les\ntouches +/-",
+      "displayText": "Inverser les\ntouches + -",
       "description": "Inverser les boutons d'ajustement de température"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Inverser les\ntouches A/B",
-      "description": "Inverser les boutons de navigation du menu"
-    },
     "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": {
@@ -344,8 +340,8 @@
       "description": ""
     },
     "SolderingTipType": {
-      "displayText": "Soldering\nTip Type",
+      "displayText": "Soudure\nType de panne",
-      "description": "Select the tip type fitted"
+      "description": "Séléctionner le type de panne utilisé"
     }
   }
 }

Translations/translation_HR.json

@@ -275,10 +275,6 @@
       "displayText": "Zamjena\n+ - tipki",
       "description": "Zamjenjuje funkciju gornje i donje tipke za podešavanje temperature"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Brzina\nanimacije",
       "description": "Brzina animacije ikona u menijima (S=sporo | M=srednje | B=brzo)"

Translations/translation_HU.json

@@ -275,10 +275,6 @@
       "displayText": "+/- gomb\nmegfordítása",
       "description": "Forrasztó hegy hőmérsékletállító gombok felcserélése"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Animáció\nsebessége",
       "description": "Menüikonok animációjának sebessége (L=lassú | K=közepes | Gy=gyors)"

Translations/translation_IT.json

@@ -272,13 +272,9 @@
       "description": "Imposta la velocità di scorrimento del testo [L: lenta; V: veloce]"
     },
     "ReverseButtonTempChange": {
-      "displayText": "Inversione\ntasti +/-",
+      "displayText": "Inversione\ntasti",
       "description": "Inverti i tasti per aumentare o diminuire la temperatura della punta"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Inversione\ntasti A/B",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Velocità\nanimazioni",
       "description": "Imposta la velocità di riproduzione delle animazioni del menù principale [L: lenta; M: media; V: veloce]"

Translations/translation_JA_JP.json

@@ -275,10 +275,6 @@
       "displayText": "キー入れ替え",
       "description": "温度設定時に+ボタンと-ボタンを入れ替える"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "動画の速度",
       "description": "メニューアイコンのアニメーションの速さ <遅=低速 | 中=中速 | 速=高速>"

Translations/translation_LT.json

@@ -275,10 +275,6 @@
       "displayText": "Sukeisti + -\nmygtukus?",
       "description": "Sukeisti + - temperatūros keitimo mygtukus vietomis"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Animacijų\ngreitis",
       "description": "Paveiksliukų animacijų greitis meniu punktuose (L=Lėtas | V=Vidutinis | G=Greitas)"

Translations/translation_NB.json

@@ -275,10 +275,6 @@
       "displayText": "Bytt\n+ - kn.",
       "description": "Bytt om på knappene for å stille temperatur"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nhastighet",
       "description": "Hastigheten til animasjonene i menyen (S=slow | M=medium | F=fast)"

Translations/translation_NL.json

@@ -275,10 +275,6 @@
       "displayText": "Wissel\n+ - knoppen",
       "description": "Wissel de knoppen voor temperatuur controle om"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nsnelheid",
       "description": "Snelheid van de icoon animaties in het menu (Langzaam | Middel | Snel)"

Translations/translation_NL_BE.json

@@ -275,10 +275,6 @@
       "displayText": "Wissel\n+ - knoppen",
       "description": "Wissel de knoppen voor temperatuur controle"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nsnelheid",
       "description": "Snelheid van de icoon animaties in het menu (T=sloom | M=middel | S=snel)"

Translations/translation_PL.json

@@ -272,13 +272,9 @@
       "description": "Szybkość przewijania tekstu"
     },
     "ReverseButtonTempChange": {
-      "displayText": "Zamień przyc.\n+/-",
+      "displayText": "Zamień przyc.\n+ -",
       "description": "Zamienia działanie przycisków zmiany temperatury grotu"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Zamień przyc.\nA/B",
-      "description": "Zamienia działanie przycisków nawigacyjne menu"
-    },
     "AnimSpeed": {
       "displayText": "Prędkosć\nanimacji",
       "description": "Prędkość animacji ikon w menu (W: mała | M: średnia | S: duża)"

Translations/translation_PT.json

@@ -272,13 +272,9 @@
       "description": "Velocidade a que o texto de ajuda é apresentado"
     },
     "ReverseButtonTempChange": {
-      "displayText": "Trocar\nbotões +/-",
+      "displayText": "Trocar\nbotões + -",
       "description": "Inverte o funcionamento dos botões de ajuste da temperatura"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Velocidade\nde animação",
       "description": "Velocidade das animações no menu (S=lenta | M=média | F=rápida)"

Translations/translation_RO.json

@@ -272,13 +272,9 @@
       "description": "Viteză derulare text cu informatii la (S=lent | F=rapid)"
     },
     "ReverseButtonTempChange": {
-      "displayText": "Inversare\n+/- butoane",
+      "displayText": "Inversare\n+ - butoane",
       "description": "Inversarea butoanelor de reglare a temperaturii"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Animaţii\nviteză",
       "description": "Ritmul animaţiilor pictogramei din meniu (Î=încet | M=mediu | R=rapid)"

Translations/translation_RU.json

@@ -275,10 +275,6 @@
       "displayText": "Поменять\nкнопки +/-",
       "description": "Поменять кнопки изменения температуры"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Скорость\nанимации",
       "description": "Скорость анимации иконок в главном меню (М=Медленная| С=Средняя | Б=Быстрая)"

Translations/translation_SK.json

@@ -275,10 +275,6 @@
       "displayText": "Otočenie\ntlačidiel +/-",
       "description": "Prehodenie tlačidiel na nastavovanie teploty"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Rýchlosť\nanimácií",
       "description": "Rýchlosť animácií ikoniek v menu (P=pomaly | S=stredne | R=rýchlo)"

Translations/translation_SL.json

@@ -275,10 +275,6 @@
       "displayText": "Obrni\ntipki + -?",
       "description": "Zamenjaj funkciji gumbov."
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",
       "description": "Pace of icon animations in menu (P=slow | M=medium | H=fast)"

Translations/translation_SR_CYRL.json

@@ -275,10 +275,6 @@
       "displayText": "Swap\n+ - keys",
       "description": "Reverse assignment of buttons for temperature adjustment"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",
       "description": "Pace of icon animations in menu (С=slow | M=medium | Б=fast)"

Translations/translation_SR_LATN.json

@@ -275,10 +275,6 @@
       "displayText": "Swap\n+ - keys",
       "description": "Reverse assignment of buttons for temperature adjustment"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",
       "description": "Pace of icon animations in menu (S=slow | M=medium | B=fast)"

Translations/translation_SV.json

@@ -275,10 +275,6 @@
       "displayText": "Omvända\n+- knappar",
       "description": "Omvänd ordning för temperaturjustering via plus/minus knapparna"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.-\nhastighet",
       "description": "Animationshastighet för ikoner i menyer (L=långsam | M=medel | S=snabb)"

Translations/translation_TR.json

@@ -275,10 +275,6 @@
       "displayText": "Düğme Yerleri\nRotasyonu",
       "description": "\"Düğme Yerleri Rotasyonu\" Sıcaklık ayar düğmelerinin yerini değiştirin"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Animasyon\nHızı",
       "description": "Menüdeki simge animasyonlarının hızı (Y=Yavaş | O=Orta | H=Hızlı)"

Translations/translation_UK.json

@@ -34,7 +34,7 @@
       "message": "!Жало закорочено!"
     },
     "SettingsCalibrationWarning": {
-      "message": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну t°!"
+      "message": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну температуру!"
     },
     "CJCCalibrating": {
       "message": "калібрування\n"
@@ -97,7 +97,7 @@
       "description": ""
     },
     "UIMenu": {
-      "displayText": "Параметри\nвзаємодії",
+      "displayText": "Параметри\nінтерфейсу",
       "description": ""
     },
     "AdvancedMenu": {
@@ -153,23 +153,23 @@
     },
     "USBPDMode": {
       "displayText": "PD\nРежим",
-      "description": "Вмикає режими PPS & EPR"
+      "description": "Вмикає режими PPS & EPR."
     },
     "BoostTemperature": {
       "displayText": "Темпер.\nТурбо",
-      "description": "t° у \"Турбо\" режимі"
+      "description": "Температура \"Турбо\" режиму"
     },
     "AutoStart": {
       "displayText": "Гарячий\nстарт",
       "description": "Режим запуску паяльника (П=Пайка | С=Сон | К=Сон при кімн. темп.)"
     },
     "TempChangeShortStep": {
-      "displayText": "Зміна t°\nкоротким",
+      "displayText": "Зміна темп.\nкоротким",
-      "description": "Крок t° при короткому натисканні:"
+      "description": "Зміна температуру при короткому натисканні!"
     },
     "TempChangeLongStep": {
-      "displayText": "Зміна t°\nдовгим",
+      "displayText": "Зміна темп.\nдовгим",
-      "description": "Крок t° при довгому натисканні:"
+      "description": "Зміна температуру при довгому натисканні!"
     },
     "LockingMode": {
       "displayText": "Дозволити\nблок. кнопок",
@@ -180,8 +180,8 @@
       "description": "Кількість етапів в режимі профілів"
     },
     "ProfilePreheatTemp": {
-      "displayText": "t° Поперед.\nРозігріву",
+      "displayText": "Температура\nПоп.Розігріву",
-      "description": "Попередньо розігріти до цієї t° на початку режимку профілів"
+      "description": "Попередньо розігріти до цієї температури на початку режимку профілів"
     },
     "ProfilePreheatSpeed": {
       "displayText": "Швидкість\nПоп.Розігріву",
@@ -189,7 +189,7 @@
     },
     "ProfilePhase1Temp": {
       "displayText": "Етап 1\nТемпература",
-      "description": "t° на кінці цього етапу"
+      "description": "Температура на кінці цього етапу"
     },
     "ProfilePhase1Duration": {
       "displayText": "Етап 1\nТривалість",
@@ -233,11 +233,11 @@
     },
     "MotionSensitivity": {
       "displayText": "Чутливість\nдатчику руху",
-      "description": "Акселерометр (1=мін. чутливість | ... | 9=макс. чутливість)"
+      "description": "Акселерометр (1=мін. чутливості | ... | 9=макс. чутливість)"
     },
     "SleepTemperature": {
       "displayText": "Темпер.\nсну",
-      "description": "t° у режимі сну"
+      "description": "Температура режиму сну (C° | F°)"
     },
     "SleepTimeout": {
       "displayText": "Тайм-аут\nсну",
@@ -256,8 +256,8 @@
       "description": "Проміжок часу до \"часу сну\" за умови спрацювання датчику Холла"
     },
     "TemperatureUnit": {
-      "displayText": "Формат темпе-\nратури(°C/°F)",
+      "displayText": "Формат темпе-\nратури(C°/F°)",
-      "description": "Одиниця виміру t° (C=Цельсій | F=Фаренгейт)"
+      "description": "Одиниця виміру температури (C=Цельсій | F=Фаренгейт)"
     },
     "DisplayRotation": {
       "displayText": "Обертання\nекрану",
@@ -265,19 +265,15 @@
     },
     "CooldownBlink": {
       "displayText": "Показ t° при\nохолодженні",
-      "description": "Показувати t° на екрані охолодження, доки жало залишається гарячим, при цьому екран мерехтить"
+      "description": "Показувати температуру на екрані охолодження, поки жало залишається гарячим, при цьому екран мерехтить"
     },
     "ScrollingSpeed": {
       "displayText": "Швидкість\nтексту",
       "description": "Швидкість прокрутки тексту (Н=Низькa | М=Максимальна)"
     },
     "ReverseButtonTempChange": {
-      "displayText": "Обернути\nкнопки +/-?",
+      "displayText": "Інвертувати\nкнопки +-?",
-      "description": "Обернути кнопки зміни t°"
+      "description": "Інвертувати кнопки зміни температури."
-    },
-    "ReverseButtonMenu": {
-      "displayText": "Обернути\nкнопки A/B?",
-      "description": "Обернути кнопки навігації"
     },
     "AnimSpeed": {
       "displayText": "Швидкість\nанімації",
@@ -292,20 +288,20 @@
       "description": "Налаштування контрасту/яскравості OLED екрану"
     },
     "ColourInversion": {
-      "displayText": "Обернути\nкольори",
+      "displayText": "Інверт\nекрану",
-      "description": "Обернути кольори на OLED екрані"
+      "description": "Інвертувати кольори на OLED екрані"
     },
     "LOGOTime": {
-      "displayText": "Тривалість\nекр лого",
+      "displayText": "Тривалість\nлоготипу при запуску",
-      "description": "Поточна тривалість лого при запуску (сек)"
+      "description": "Поточна тривалість показу лого при запуску (сек)"
     },
     "AdvancedIdle": {
-      "displayText": "Детальний\nрежим сну",
+      "displayText": "Детальний ре-\nжим очікуван.",
-      "description": "Показувати детальну інформацію дрібним шрифтом на домашньому екрані"
+      "description": "Показувати детальну інформацію маленьким шрифтом на домашньому екрані"
     },
     "AdvancedSoldering": {
       "displayText": "Детальний\nрежим пайки",
-      "description": "Показувати детальну інформацію при пайці"
+      "description": "Показувати детальну інформацію при пайці."
     },
     "BluetoothLE": {
       "displayText": "Bluetooth\n",
@@ -313,19 +309,19 @@
     },
     "PowerLimit": {
       "displayText": "Макс.\nпотуж.",
-      "description": "Макс. потужність живлення паяльника (Ватт)"
+      "description": "Макс. потужність, яку може використовувати паяльник (Ватт)"
     },
     "CalibrateCJC": {
-      "displayText": "Калібрація КХС\n",
+      "displayText": "Калібрувати КХС\nпри наступному запуску",
-      "description": "При наступному запуску буде відкалібровано Компенсацію Холодного Спаю жала (непотрібне при Δt° < 5°C)"
+      "description": "При наступному запуску буде відкалібровано Компенсацію Холодного Спаю жала (непотрібне при різниці температур < 5°C)"
     },
     "VoltageCalibration": {
       "displayText": "Калібрування\nнапруги",
-      "description": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити"
+      "description": "Калібрування напруги входу. Налаштувати кнопками, натиснути і утримати щоб завершити."
     },
     "PowerPulsePower": {
       "displayText": "Пульс.\nНавантаж.",
-      "description": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає замало енергії)"
+      "description": "Деякі PowerBank-и з часом вимк. живлення, якщо пристрій споживає дуже мало енергії)"
     },
     "PowerPulseWait": {
       "displayText": "Час між імп.\nнапруги",
@@ -337,14 +333,14 @@
     },
     "SettingsReset": {
       "displayText": "Скинути всі\nналаштування?",
-      "description": "Скидання всіх параметрів до стандартних значень"
+      "description": "Скидання всіх параметрів до стандартних значень."
     },
     "LanguageSwitch": {
       "displayText": "Мова:\n UK  Українська",
       "description": ""
     },
     "SolderingTipType": {
-      "displayText": "Тип\nЖала",
+      "displayText": "Тип Жала",
       "description": "Оберіть відповідний тип жала"
     }
   }

Translations/translation_UZ.json

@@ -275,10 +275,6 @@
       "displayText": "(+) va (-) tugmalarni\nalmashtirish",
       "description": "Harorat o'zgarishi uchun tugmachalarni vazifasini almashish"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Anim.\ntezligi",
       "description": "Menyudagi ikonka animatsiyalari tezligini sozlash (S=sekin | O=o'rtacha | T=tez)"

Translations/translation_VI.json

@@ -275,10 +275,6 @@
       "displayText": "Đao nguoc\nnút + -",
       "description": "Đao nguoc chuc năng các nút đieu chinh nhiet đo"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "Toc đo\nhoat anh",
       "description": "Toc đo cua hoat anh menu (S=cham | M=trung bình | F=nhanh)"

Translations/translation_YUE_HK.json

@@ -275,10 +275,6 @@
       "displayText": "反轉加減掣",
       "description": "反轉調校温度時加減掣嘅方向"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "動畫速度",
       "description": "功能表圖示動畫嘅速度 <慢=慢速 | 中=中速 | 快=快速>"

Translations/translation_ZH_CN.json

@@ -275,10 +275,6 @@
       "displayText": "调换加减键",
       "description": "调校温度时更换加减键的方向"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "动画速度",
       "description": "主菜单中功能图标动画的播放速度 <慢=慢速 | 中=中速 | 快=快速>"

Translations/translation_ZH_TW.json

@@ -275,10 +275,6 @@
       "displayText": "調換加減鍵",
       "description": "調校溫度時調換加減鍵的方向"
     },
-    "ReverseButtonMenu": {
-      "displayText": "Swap\nA/B keys",
-      "description": "Reverse assignment of buttons for Settings menu"
-    },
     "AnimSpeed": {
       "displayText": "動畫速度",
       "description": "功能表圖示動畫的速度 <慢=慢速 | 中=中速 | 快=快速>"

Translations/translations_definitions.json

@@ -473,12 +473,6 @@
       "maxLen2": 15,
       "description": "Swaps which button increments and decrements on temperature change screens."
     },
-    {
-      "id": "ReverseButtonMenu",
-      "maxLen": 6,
-      "maxLen2": 15,
-      "description": "Swaps which buttons are used as Enter/Change and which as Scroll/Back in the settings menu."
-    },
     {
       "id": "AnimSpeed",
       "maxLen": 6,

source/Core/BSP/MHP30/configuration.h

@@ -53,18 +53,15 @@
 
 /**
  * OLED Orientation
+ *
  */
 #define ORIENTATION_MODE           0 // 0: Right 1:Left 2:Automatic - Default right
 #define MAX_ORIENTATION_MODE       1 // Unlikely to ever change
-
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
-/**
- * Buttons handling
- */
-#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
-#define REVERSE_BUTTON_MENU        0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
 
 /**
  * OLED Brightness
+ *
  */
 #define MIN_BRIGHTNESS     0   // Min OLED brightness selectable
 #define MAX_BRIGHTNESS     100 // Max OLED brightness selectable

source/Core/BSP/Miniware/configuration.h

@@ -53,18 +53,15 @@
 
 /**
  * OLED Orientation
+ *
  */
 #define ORIENTATION_MODE           2 // 0: Right 1:Left 2:Automatic - Default Automatic
 #define MAX_ORIENTATION_MODE       2 // Up to auto
-
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
-/**
- * Buttons handling
- */
-#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
-#define REVERSE_BUTTON_MENU        0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
 
 /**
  * OLED Brightness
+ *
  */
 #if defined(MODEL_TS101)
   #define MIN_BRIGHTNESS     1   // Min OLED brightness selectable

source/Core/BSP/Pinecil/configuration.h

@@ -53,18 +53,15 @@
 
 /**
  * OLED Orientation
+ *
  */
 #define ORIENTATION_MODE           2 // 0: Right 1:Left 2:Automatic - Default Automatic
 #define MAX_ORIENTATION_MODE       2 // Up to auto
-
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
-/**
- * Buttons handling
- */
-#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
-#define REVERSE_BUTTON_MENU        0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
 
 /**
  * OLED Brightness
+ *
  */
 #define MIN_BRIGHTNESS     0   // Min OLED brightness selectable
 #define MAX_BRIGHTNESS     100 // Max OLED brightness selectable

source/Core/BSP/Pinecilv2/BSP.cpp

@@ -10,6 +10,7 @@
 #include "TipThermoModel.h"
 #include "USBPD.h"
 #include "Utils.hpp"
+#include "bflb_platform.h"
 #include "bl702_adc.h"
 #include "configuration.h"
 #include "crc32.h"
@@ -282,16 +283,3 @@ void showBootLogo(void) {
 
   BootLogo::handleShowingLogo(scratch);
 }
-
-TemperatureType_t getCustomTipMaxInC() {
-  // have to lookup the max temp while being aware of the coe scaling value
-  float max_reading = ADC_MAX_READING - 1.0;
-
-  if (adcGainCoeffCal.adcGainCoeffEnable) {
-    max_reading /= adcGainCoeffCal.coe;
-  }
-
-  TemperatureType_t maximumTipTemp = TipThermoModel::convertTipRawADCToDegC(max_reading);
-  maximumTipTemp += getHandleTemperature(0) / 10; // Add handle offset
-  return maximumTipTemp - 1;
-}

source/Core/BSP/Pinecilv2/configuration.h

@@ -53,18 +53,15 @@
 
 /**
  * OLED Orientation
+ *
  */
 #define ORIENTATION_MODE           2 // 0: Right 1:Left 2:Automatic - Default Automatic
 #define MAX_ORIENTATION_MODE       2 // Up to auto
-
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
-/**
- * Buttons handling
- */
-#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
-#define REVERSE_BUTTON_MENU        0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
 
 /**
  * OLED Brightness
+ *
  */
 #define MIN_BRIGHTNESS     1   // Min OLED brightness selectable
 #define MAX_BRIGHTNESS     101 // Max OLED brightness selectable
@@ -164,7 +161,6 @@
 #define OLED_96x16 1
 #define TEMP_NTC
 #define ACCEL_BMA
-#define CUSTOM_MAX_TEMP_C 1 // Uses custom max temp lookup
 #define ACCEL_SC7
 #define HALL_SENSOR
 #define HALL_SI7210

source/Core/BSP/Sequre/configuration.h

@@ -4,6 +4,7 @@
 /**
  * Configuration.h
  * Define here your default pre settings for S60
+ *
  */
 
 //===========================================================================
@@ -20,6 +21,7 @@
 
 /**
  * OLED Brightness
+ *
  */
 #define MIN_BRIGHTNESS     1   // Min OLED brightness selectable
 #define MAX_BRIGHTNESS     101 // Max OLED brightness selectable
@@ -60,15 +62,11 @@
 
 /**
  * OLED Orientation
+ *
  */
 #define ORIENTATION_MODE           0 // 0: Right 1:Left (2:Automatic N/A)
 #define MAX_ORIENTATION_MODE       1 // Disable auto mode
-
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assigment for temperature change
-/**
- * Buttons handling
- */
-#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
-#define REVERSE_BUTTON_MENU        0 // 0:Default 1:Reverse - Reverse the A and B button assignment for Settings menu only
 
 /**
  * Temp change settings

source/Core/Drivers/Buttons.cpp

@@ -11,7 +11,7 @@
 #include <Buttons.hpp>
 TickType_t lastButtonTime = 0;
 
-ButtonState getButtonState(bool swapButtonMenu) {
+ButtonState getButtonState() {
   /*
    * Read in the buttons and then determine if a state change needs to occur
    */
@@ -28,8 +28,8 @@ ButtonState getButtonState(bool swapButtonMenu) {
   static TickType_t previousStateChange = 0;
   const TickType_t  timeout             = TICKS_100MS * 4;
   uint8_t           currentState;
-  currentState = (getButtonA()) << (0 xor swapButtonMenu);
+  currentState = (getButtonA()) << 0;
-  currentState |= (getButtonB()) << (1 xor swapButtonMenu);
+  currentState |= (getButtonB()) << 1;
 
   if (currentState) {
     lastButtonTime = xTaskGetTickCount();

source/Core/Drivers/Buttons.hpp

@@ -27,8 +27,7 @@ enum ButtonState {
 };
 
 // Returns what buttons are pressed (if any)
-ButtonState getButtonState(bool swapButtonMenu = 0);
+ButtonState getButtonState();
-
 // Helpers
 void waitForButtonPressOrTimeout(TickType_t timeout);
 void waitForButtonPress();

source/Core/Inc/Settings.h

@@ -76,9 +76,8 @@ enum SettingsOptions {
   ProfileCooldownSpeed           = 52, // Maximum allowed cooldown speed in degrees per second
   HallEffectSleepTime            = 53, // Seconds (/5) timeout to sleep when hall effect over threshold
   SolderingTipType               = 54, // Selecting the type of soldering tip fitted
-  ReverseButtonMenu              = 55, // Change the A and B button assigment in menus
   //
-  SettingsOptionsLength = 56, // End marker
+  SettingsOptionsLength = 55, // End marker
 };
 
 typedef enum {

source/Core/Inc/Translation.h

@@ -54,11 +54,6 @@ extern const char *DebugMenu[];
 extern const char *AccelTypeNames[];
 extern const char *PowerSourceNames[];
 
-/* !
- * The order of the items inside this enum class SettingsItemIndex
- * must be the same as the order of the related items
- * in the "menuOptions" section of translations_definitions.json file.
- */
 enum class SettingsItemIndex : uint8_t {
   DCInCutoff,
   MinVolCell,
@@ -95,7 +90,6 @@ enum class SettingsItemIndex : uint8_t {
   CooldownBlink,
   ScrollingSpeed,
   ReverseButtonTempChange,
-  ReverseButtonMenu,
   AnimSpeed,
   AnimLoop,
   Brightness,

source/Core/Src/Settings.cpp

@@ -54,7 +54,7 @@ typedef struct {
 } SettingConstants;
 
 static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOptionsLength] = {
-  //                    MIN,                                                                   MAX,         INCREMENT,                      DEFAULT
+  //{                   min,                               max,         increment,                      default}
     {            MIN_TEMP_C,                                                            MAX_TEMP_F,                 5,               SOLDERING_TEMP}, // SolderingTemp
     {            MIN_TEMP_C,                                                            MAX_TEMP_F,                 5,                          150}, // SleepTemp
     {                     0,                                                                    15,                 1,                   SLEEP_TIME}, // SleepTime
@@ -110,8 +110,6 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
     {                     1,                                                                    10,                 1,                            2}, // ProfileCooldownSpeed
     {                     0,                                                                    12,                 1,                            0}, // HallEffectSleepTime
     {                     0, (tipType_t::TIP_TYPE_MAX - 1) > 0 ? (tipType_t::TIP_TYPE_MAX - 1) : 0,                 1,                            0}, // SolderingTipType
-    {                     0,                                                                     1,                 1,          REVERSE_BUTTON_MENU}, // ReverseButtonMenu
-  //                    MIN,                                                                   MAX,         INCREMENT,                      DEFAULT
 };
 static_assert((sizeof(settingsConstants) / sizeof(SettingConstants)) == ((int)SettingsOptions::SettingsOptionsLength));
 

source/Core/Src/settingsGUI.cpp

@@ -47,7 +47,6 @@ static void displayAdvancedSolderingScreens(void);
 static void displayAdvancedIDLEScreens(void);
 static void displayScrollSpeed(void);
 static void displayReverseButtonTempChangeEnabled(void);
-static void displayReverseButtonMenu(void);
 static void displayPowerLimit(void);
 
 #ifdef BLE_ENABLED
@@ -396,8 +395,6 @@ const menuitem UIMenu[] = {
   {SETTINGS_DESC(SettingsItemIndex::ScrollingSpeed), nullptr, displayScrollSpeed, nullptr, SettingsOptions::DescriptionScrollSpeed, SettingsItemIndex::ScrollingSpeed, 7},
   /* Reverse Temp change buttons +/- */
   {SETTINGS_DESC(SettingsItemIndex::ReverseButtonTempChange), nullptr, displayReverseButtonTempChangeEnabled, nullptr, SettingsOptions::ReverseButtonTempChangeEnabled, SettingsItemIndex::ReverseButtonTempChange, 7},
-  /* Reverse menu nav buttons A/B */
-  {SETTINGS_DESC(SettingsItemIndex::ReverseButtonMenu), nullptr, displayReverseButtonMenu, nullptr, SettingsOptions::ReverseButtonMenu, SettingsItemIndex::ReverseButtonMenu, 7},
   /* Animation Speed adjustment */
   {SETTINGS_DESC(SettingsItemIndex::AnimSpeed), nullptr, displayAnimationSpeed, nullptr, SettingsOptions::AnimationSpeed, SettingsItemIndex::AnimSpeed, 7},
   /* Animation Loop switch */
@@ -483,7 +480,7 @@ static int userConfirmation(const char *message) {
   for (;;) {
     drawScrollingText(message, xTaskGetTickCount() - tickStart);
 
-    ButtonState buttons = getButtonState(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled));
+    ButtonState buttons = getButtonState();
     switch (buttons) {
     case BUTTON_F_SHORT:
       // User confirmed
@@ -856,8 +853,6 @@ static void displayScrollSpeed(void) { OLED::print(translatedString((getSettingV
 
 static void displayReverseButtonTempChangeEnabled(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)); }
 
-static void displayReverseButtonMenu(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::ReverseButtonMenu)); }
-
 static void displayAnimationSpeed(void) {
   switch (getSettingValue(SettingsOptions::AnimationSpeed)) {
   case settingOffSpeed_t::SLOW:
@@ -953,7 +948,7 @@ static void setCalibrateVIN(void) {
     OLED::setCursor(0, 8);
     OLED::printNumber(getSettingValue(SettingsOptions::VoltageDiv), 3, FontStyle::SMALL);
 
-    switch (getButtonState(getSettingValue(SettingsOptions::ReverseButtonMenu))) {
+    switch (getButtonState()) {
     case BUTTON_F_SHORT:
       prevSettingValue(SettingsOptions::VoltageDiv);
       break;

source/Core/Threads/GUIThread.cpp

@@ -41,18 +41,10 @@ OperatingMode currentOperatingMode = OperatingMode::InitialisationDone; // Curre
 guiContext    context;                                                  // Context passed to functions to aid in state during render passes
 
 OperatingMode handle_post_init_state();
-
 OperatingMode guiHandleDraw(void) {
   OLED::clearScreen(); // Clear ready for render pass
-  bool swapButtonMenu = getSettingValue(SettingsOptions::ReverseButtonMenu);
-  bool swapButtonTemp = getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled);
-#ifdef OPT_FULL_BUTTON_REVERSE
-  bool isTempAdjust = currentOperatingMode == OperatingMode::TemperatureAdjust;
   // Read button state
-  ButtonState buttons = getButtonState((swapButtonTemp && isTempAdjust) || (swapButtonMenu && !swapButtonTemp && !isTempAdjust) || (swapButtonMenu && swapButtonTemp && !isTempAdjust));
-#else
   ButtonState buttons = getButtonState();
-#endif
   // Enforce screen on if buttons pressed, movement, hot tip etc
   if (buttons != BUTTON_NONE) {
     OLED::setDisplayState(OLED::DisplayState::ON);
@@ -118,11 +110,7 @@ OperatingMode guiHandleDraw(void) {
     newMode = gui_SolderingSleepingMode(buttons, &context);
     break;
   case OperatingMode::TemperatureAdjust:
-#ifdef OPT_FULL_BUTTON_REVERSE
+    newMode = gui_solderingTempAdjust(buttons, &context);
-    newMode = gui_solderingTempAdjust(getButtonState(), &context);
-#else
-    newMode = gui_solderingTempAdjust(getButtonState(swapButtonTemp), &context);
-#endif
     break;
   case OperatingMode::DebugMenuReadout:
     newMode = showDebugMenu(buttons, &context);
@@ -131,11 +119,7 @@ OperatingMode guiHandleDraw(void) {
     newMode = performCJCC(buttons, &context);
     break;
   case OperatingMode::SettingsMenu:
-#ifdef OPT_FULL_BUTTON_REVERSE
+    newMode = gui_SettingsMenu(buttons, &context);
-    newMode = gui_SettingsMenu(getButtonState(), &context);
-#else
-    newMode = gui_SettingsMenu(getButtonState(swapButtonMenu), &context);
-#endif
     break;
   case OperatingMode::InitialisationDone:
     newMode = handle_post_init_state();
@@ -154,7 +138,6 @@ OperatingMode guiHandleDraw(void) {
   };
   return newMode;
 }
-
 void guiRenderLoop(void) {
   OperatingMode newMode = guiHandleDraw(); // This does the screen drawing
 

source/Core/Threads/UI/drawing/mono_128x32/draw_homescreen_simplified.cpp

@@ -7,49 +7,56 @@ extern uint8_t buttonBF[sizeof(buttonB)];
 extern uint8_t disconnectedTipF[sizeof(disconnectedTip)];
 
 void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
-  bool isFlipped       = OLED::getRotation();
+  bool tempOnDisplay          = false;
-  bool tipDisconnected = isTipDisconnected();
+  bool tipDisconnectedDisplay = false;
-#ifdef OPT_FULL_BUTTON_REVERSE
+  if (OLED::getRotation()) {
-  bool swapButtonMenu = getSettingValue(SettingsOptions::ReverseButtonMenu);
+    OLED::drawArea(68, 0, 56, 32, buttonAF);
-#endif
+    OLED::drawArea(12, 0, 56, 32, buttonBF);
-
+    OLED::setCursor(0, 0);
-  // Flip and switch buttons accordingly
+    ui_draw_power_source_icon();
-#ifdef OPT_FULL_BUTTON_REVERSE
+  } else {
-  OLED::drawArea(isFlipped ? 68 : 0, 0, 56, 32, isFlipped ? (swapButtonMenu ? buttonBF : buttonAF) : (swapButtonMenu ? buttonB : buttonA));
+    OLED::drawArea(0, 0, 56, 32, buttonA);  // Needs to be flipped so button ends up
-  OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? (swapButtonMenu ? buttonAF : buttonBF) : (swapButtonMenu ? buttonA : buttonB));
+    OLED::drawArea(58, 0, 56, 32, buttonB); // on right side of screen
-#else
+    OLED::setCursor(116, 0);
-  OLED::drawArea(isFlipped ? 68 : 0, 0, 56, 32, isFlipped ? buttonAF : buttonA);
+    ui_draw_power_source_icon();
-  OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? buttonBF : buttonB);
+  }
-#endif
+  tipDisconnectedDisplay = false;
-
+  if (tipTemp > 55) {
-  if ((tipTemp > 55) || tipDisconnected) {
+    tempOnDisplay = true;
+  } else if (tipTemp < 45) {
+    tempOnDisplay = false;
+  }
+  if (isTipDisconnected()) {
+    tempOnDisplay          = false;
+    tipDisconnectedDisplay = true;
+  }
+  if (tempOnDisplay || tipDisconnectedDisplay) {
     // draw temp over the start soldering button
-    // Location changes on screen rotation and due to button swapping
+    // Location changes on screen rotation
-    // in right handed mode we want to draw over the first part
+    if (OLED::getRotation()) {
-#ifdef OPT_FULL_BUTTON_REVERSE
+      // in right handed mode we want to draw over the first part
-    OLED::fillArea(swapButtonMenu ? (isFlipped ? 26 : 58) : (isFlipped ? 68 : 0), 0, 56, 32, 0); // clear the area
+      OLED::fillArea(68, 0, 56, 32, 0); // clear the area for the temp
-    OLED::setCursor(swapButtonMenu ? (isFlipped ? 27 : 59) : (isFlipped ? 56 : 0), 0);
+      OLED::setCursor(56, 0);
-#else
+    } else {
-    OLED::fillArea(isFlipped ? 68 : 0, 0, 56, 32, 0); // clear the area
+      OLED::fillArea(0, 0, 56, 32, 0); // clear the area
-    OLED::setCursor(isFlipped ? 56 : 0, 0);
+      OLED::setCursor(0, 0);
-#endif
+    }
-    // If tip is disconnected draw the notification, otherwise - the temp
+    // If we have a tip connected draw the temp, if not we leave it blank
-    if (tipDisconnected) {
+    if (!tipDisconnectedDisplay) {
-      // Draw-in the missing tip symbol
+      // draw in the temp
-#ifdef OPT_FULL_BUTTON_REVERSE
+      if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) {
-      if (swapButtonMenu) {
+        ui_draw_tip_temperature(false, FontStyle::LARGE); // draw in the temp
-        OLED::drawArea(isFlipped ? 20 : 54, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip);
+      }
-      } else {
+    } else {
-#endif
+      // Draw in missing tip symbol
-        OLED::drawArea(isFlipped ? 54 : 0, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip);
+      if (OLED::getRotation()) {
-#ifdef OPT_FULL_BUTTON_REVERSE
+        // in right handed mode we want to draw over the first part
+        OLED::drawArea(54, 0, 56, 32, disconnectedTipF);
+      } else {
+        OLED::drawArea(0, 0, 56, 32, disconnectedTip);
       }
-#endif
-    } else if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) {
-      ui_draw_tip_temperature(false, FontStyle::LARGE); // Draw-in the temp
     }
   }
-  OLED::setCursor(isFlipped ? 0 : 116, 0);
-  ui_draw_power_source_icon();
 }
-#endif
+
+#endif

source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_simplified.cpp

@@ -6,49 +6,57 @@ extern uint8_t buttonBF[sizeof(buttonB)];
 extern uint8_t disconnectedTipF[sizeof(disconnectedTip)];
 
 void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
-  bool isFlipped       = OLED::getRotation();
+  bool tempOnDisplay          = false;
-  bool tipDisconnected = isTipDisconnected();
+  bool tipDisconnectedDisplay = false;
-#ifdef OPT_FULL_BUTTON_REVERSE
+  if (OLED::getRotation()) {
-  bool swapButtonMenu = getSettingValue(SettingsOptions::ReverseButtonMenu);
+    OLED::drawArea(54, 0, 42, 16, buttonAF);
-#endif
+    OLED::drawArea(12, 0, 42, 16, buttonBF);
-
+    OLED::setCursor(0, 0);
-  // Flip and switch buttons accordingly
+    ui_draw_power_source_icon();
-#ifdef OPT_FULL_BUTTON_REVERSE
+  } else {
-  OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? (swapButtonMenu ? buttonBF : buttonAF) : (swapButtonMenu ? buttonB : buttonA));
+    OLED::drawArea(0, 0, 42, 16, buttonA);  // Needs to be flipped so button ends up
-  OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? (swapButtonMenu ? buttonAF : buttonBF) : (swapButtonMenu ? buttonA : buttonB));
+    OLED::drawArea(42, 0, 42, 16, buttonB); // on right side of screen
-#else
+    OLED::setCursor(84, 0);
-  OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? buttonAF : buttonA);
+    ui_draw_power_source_icon();
-  OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? buttonBF : buttonB);
+  }
-#endif
+  tipDisconnectedDisplay = false;
-
+  if (tipTemp > 55) {
-  if ((tipTemp > 55) || tipDisconnected) {
+    tempOnDisplay = true;
+  } else if (tipTemp < 45) {
+    tempOnDisplay = false;
+  }
+  if (isTipDisconnected()) {
+    tempOnDisplay          = false;
+    tipDisconnectedDisplay = true;
+  }
+  if (tempOnDisplay || tipDisconnectedDisplay) {
     // draw temp over the start soldering button
-    // Location changes on screen rotation and due to button swapping
+    // Location changes on screen rotation
-    // in right handed mode we want to draw over the first part
+    if (OLED::getRotation()) {
-#ifdef OPT_FULL_BUTTON_REVERSE
+      // in right handed mode we want to draw over the first part
-    OLED::fillArea(swapButtonMenu ? (isFlipped ? 14 : 42) : (isFlipped ? 55 : 0), 0, 41, 16, 0); // clear the area
+      OLED::fillArea(55, 0, 41, 16, 0); // clear the area for the temp
-    OLED::setCursor(swapButtonMenu ? (isFlipped ? 15 : 43) : (isFlipped ? 56 : 0), 0);
+      OLED::setCursor(56, 0);
-#else
+    } else {
-    OLED::fillArea(isFlipped ? 55 : 0, 0, 41, 16, 0); // clear the area
+      OLED::fillArea(0, 0, 41, 16, 0); // clear the area
-    OLED::setCursor(isFlipped ? 56 : 0, 0);
+      OLED::setCursor(0, 0);
-#endif
+    }
-    // If tip is disconnected draw the notification, otherwise - the temp
+    // If we have a tip connected draw the temp, if not we leave it blank
-    if (tipDisconnected) {
+    if (!tipDisconnectedDisplay) {
-      // Draw-in the missing tip symbol
+      // draw in the temp
-#ifdef OPT_FULL_BUTTON_REVERSE
+      if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) {
-      if (swapButtonMenu) {
+        ui_draw_tip_temperature(false, FontStyle::LARGE); // draw in the temp
-        OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip);
+      }
-      } else {
+    } else {
-#endif
+      // Draw in missing tip symbol
-        OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip);
+
-#ifdef OPT_FULL_BUTTON_REVERSE
+      if (OLED::getRotation()) {
+        // in right handed mode we want to draw over the first part
+        OLED::drawArea(54, 0, 42, 16, disconnectedTipF);
+      } else {
+        OLED::drawArea(0, 0, 42, 16, disconnectedTip);
       }
-#endif
-    } else if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) {
-      ui_draw_tip_temperature(false, FontStyle::LARGE); // Draw-in the temp
     }
   }
-  OLED::setCursor(isFlipped ? 0 : 84, 0);
-  ui_draw_power_source_icon();
 }
-#endif
+
+#endif

source/Core/Threads/UI/logic/TemperatureAdjust.cpp

@@ -54,6 +54,10 @@ OperatingMode gui_solderingTempAdjust(const ButtonState buttonIn, guiContext *cx
   if ((PRESS_ACCEL_INTERVAL_MAX - (*autoRepeatAcceleration)) < PRESS_ACCEL_INTERVAL_MIN) {
     (*autoRepeatAcceleration) = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
   }
+  // If buttons are flipped; flip the delta
+  if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
+    delta = -delta;
+  }
   if (delta != 0) {
     // constrain between the set temp limits, i.e. 10-450 C
     int16_t newTemp = getSettingValue(SettingsOptions::SolderingTemp);

source/Core/Threads/UI/logic/utils/shouldDeviceShutdown.cpp

@@ -17,11 +17,7 @@ bool shouldShutdown(void) {
       }
     }
   }
-#ifdef OPT_FULL_BUTTON_REVERSE
-  if (getButtonState(getSettingValue(SettingsOptions::ReverseButtonMenu) == BUTTON_B_LONG) { // allow also if back button is pressed long
-#else
   if (getButtonState() == BUTTON_B_LONG) { // allow also if back button is pressed long
-#endif
     return true;
   }
   return false;