Implemented switching A and B buttons, closing #2034

getButtonState() now have an option int/bool argument to swap the result via XOR

Translations/translation_BE.json

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

Translations/translation_BG.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Размяна\nбутони +/-",
       "description": "Обръщане на бутоните + и - за промяна на температурата на човка на поялника"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Размяна\nбутони А/В",
+      "description": "Обръщане бутоните А и В за навигация в менютата"
     },
     "AnimSpeed": {
       "displayText": "Скорост на\nанимацията",

Translations/translation_CS.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Prohodit\ntl. +-?",
       "description": "Prohodit tlačítka pro změnu teploty"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nrychlost",

Translations/translation_DA.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Skift\n+ - tasterne",
       "description": "Skift tildeling af knapper til temperaturjustering"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nHastighed",

Translations/translation_DE.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "+- Tasten\numkehren",
       "description": "Tastenbelegung zur Temperaturänderung umkehren"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nGeschw.",

Translations/translation_EL.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Αντιστροφή\nπλήκτρων + -",
       "description": "Αντιστροφή διάταξης πλήκτρων στη ρύθμιση θερμοκρασίας"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Ταχύτητα\nκιν. εικονιδ.",

Translations/translation_EN.json

@@ -272,8 +272,12 @@
       "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"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",

Translations/translation_ES.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Invertir\nbotones +/-",
       "description": "Invertir botones de ajuste de temperatura"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nvelocidad",

Translations/translation_ET.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Vaheta\n+ - nupud",
       "description": "Temperatuurinuppude asukohtade vahetus"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nkiirus",

Translations/translation_FI.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Suunnanvaihto\n+ - näppäimille",
       "description": "Lämpötilapainikkeiden suunnan vaihtaminen"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Animaation\nnopeus",

Translations/translation_FR.json

@@ -272,8 +272,12 @@
       "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"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Inverser les\ntouches A/B",
+      "description": "Inverser les boutons de navigation du menu"
     },
     "AnimSpeed": {
       "displayText": "Vitesse\nanim. icônes",

Translations/translation_HR.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Zamjena\n+ - tipki",
       "description": "Zamjenjuje funkciju gornje i donje tipke za podešavanje temperature"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Brzina\nanimacije",

Translations/translation_HU.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "+/- gomb\nmegfordítása",
       "description": "Forrasztó hegy hőmérsékletállító gombok felcserélése"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Animáció\nsebessége",

Translations/translation_IT.json

@@ -272,8 +272,12 @@
       "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"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Inversione\ntasti A/B",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Velocità\nanimazioni",

Translations/translation_JA_JP.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "キー入れ替え",
       "description": "温度設定時に+ボタンと-ボタンを入れ替える"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "動画の速度",

Translations/translation_LT.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Sukeisti + -\nmygtukus?",
       "description": "Sukeisti + - temperatūros keitimo mygtukus vietomis"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Animacijų\ngreitis",

Translations/translation_NB.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Bytt\n+ - kn.",
       "description": "Bytt om på knappene for å stille temperatur"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nhastighet",

Translations/translation_NL.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Wissel\n+ - knoppen",
       "description": "Wissel de knoppen voor temperatuur controle om"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nsnelheid",

Translations/translation_NL_BE.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Wissel\n+ - knoppen",
       "description": "Wissel de knoppen voor temperatuur controle"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nsnelheid",

Translations/translation_PL.json

@@ -272,8 +272,12 @@
       "description": "Szybkość przewijania tekstu"
     },
     "ReverseButtonTempChange": {
-      "displayText": "Zamień przyc.\n+ -",
+      "displayText": "Zamień przyc.\n+/-",
       "description": "Zamienia działanie przycisków zmiany temperatury grotu"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Zamień przyc.\nA/B",
+      "description": "Zamienia działanie przycisków nawigacyjne menu"
     },
     "AnimSpeed": {
       "displayText": "Prędkosć\nanimacji",

Translations/translation_PT.json

@@ -272,8 +272,12 @@
       "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"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Velocidade\nde animação",

Translations/translation_RO.json

@@ -272,8 +272,12 @@
       "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"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Animaţii\nviteză",

Translations/translation_RU.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Поменять\nкнопки +/-",
       "description": "Поменять кнопки изменения температуры"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Скорость\nанимации",

Translations/translation_SK.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Otočenie\ntlačidiel +/-",
       "description": "Prehodenie tlačidiel na nastavovanie teploty"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Rýchlosť\nanimácií",

Translations/translation_SL.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Obrni\ntipki + -?",
       "description": "Zamenjaj funkciji gumbov."
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",

Translations/translation_SR_CYRL.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Swap\n+ - keys",
       "description": "Reverse assignment of buttons for temperature adjustment"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",

Translations/translation_SR_LATN.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Swap\n+ - keys",
       "description": "Reverse assignment of buttons for temperature adjustment"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\nspeed",

Translations/translation_SV.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Omvända\n+- knappar",
       "description": "Omvänd ordning för temperaturjustering via plus/minus knapparna"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.-\nhastighet",

Translations/translation_TR.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Düğme Yerleri\nRotasyonu",
       "description": "\"Düğme Yerleri Rotasyonu\" Sıcaklık ayar düğmelerinin yerini değiştirin"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Animasyon\nHızı",

Translations/translation_UK.json

@@ -97,7 +97,7 @@
       "description": ""
     },
     "UIMenu": {
-      "displayText": "Параметри\nінтерфейсу",
+      "displayText": "Параметри\nвзаємодії",
       "description": ""
     },
     "AdvancedMenu": {
@@ -276,7 +276,11 @@
       "description": "Обернути кнопки зміни t°"
     },
 	"ReverseButtonNav": {
-      "displayText": "Обернути\nкнопки AB?",
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Обернути\nкнопки A B?",
       "description": "Обернути кнопки навігації"
     },
     "AnimSpeed": {

Translations/translation_UZ.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "(+) va (-) tugmalarni\nalmashtirish",
       "description": "Harorat o'zgarishi uchun tugmachalarni vazifasini almashish"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Anim.\ntezligi",

Translations/translation_VI.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "Đao nguoc\nnút + -",
       "description": "Đao nguoc chuc năng các nút đieu chinh nhiet đo"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "Toc đo\nhoat anh",

Translations/translation_YUE_HK.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "反轉加減掣",
       "description": "反轉調校温度時加減掣嘅方向"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "動畫速度",

Translations/translation_ZH_CN.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "调换加减键",
       "description": "调校温度时更换加减键的方向"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "动画速度",

Translations/translation_ZH_TW.json

@@ -274,6 +274,10 @@
     "ReverseButtonTempChange": {
       "displayText": "調換加減鍵",
       "description": "調校溫度時調換加減鍵的方向"
+    },
+	"ReverseButtonNav": {
+      "displayText": "Swap\nA/B keys",
+      "description": "Reverse assignment of buttons for menu navigation"
     },
     "AnimSpeed": {
       "displayText": "動畫速度",

Translations/translations_definitions.json

@@ -472,6 +472,12 @@
       "maxLen": 6,
       "maxLen2": 15,
       "description": "Swaps which button increments and decrements on temperature change screens."
+    },
+	{
+      "id": "ReverseButtonNav",
+      "maxLen": 6,
+      "maxLen2": 15,
+      "description": "Swaps which button are used as Select and which as Scroll/Go-back on menu screens."
     },
     {
       "id": "AnimSpeed",

source/Core/BSP/MHP30/configuration.h

@@ -57,7 +57,8 @@
  */
 #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
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
+#define REVERSE_BUTTON_NAV         0 // 0:Default 1:Reverse - Reverse the A and B button assignment in the menus
 
 /**
  * OLED Brightness

source/Core/BSP/Miniware/configuration.h

@@ -57,7 +57,8 @@
  */
 #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
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
+#define REVERSE_BUTTON_NAV         0 // 0:Default 1:Reverse - Reverse the A and B button assignment in the menus
 
 /**
  * OLED Brightness

source/Core/BSP/Pinecil/configuration.h

@@ -57,7 +57,8 @@
  */
 #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
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
+#define REVERSE_BUTTON_NAV         0 // 0:Default 1:Reverse - Reverse the A and B button assignment in the menus
 
 /**
  * OLED Brightness

source/Core/BSP/Pinecilv2/configuration.h

@@ -57,7 +57,8 @@
  */
 #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
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
+#define REVERSE_BUTTON_NAV         0 // 0:Default 1:Reverse - Reverse the A and B button assignment in the menus
 
 /**
  * OLED Brightness

source/Core/BSP/Sequre/configuration.h

@@ -66,7 +66,8 @@
  */
 #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
+#define REVERSE_BUTTON_TEMP_CHANGE 0 // 0:Default 1:Reverse - Reverse the plus and minus button assignment for temperature change
+#define REVERSE_BUTTON_NAV         0 // 0:Default 1:Reverse - Reverse the A and B button assignment in the menus
 
 /**
  * Temp change settings

source/Core/Drivers/Buttons.cpp

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

source/Core/Drivers/Buttons.hpp

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

source/Core/Inc/Settings.h

@@ -47,37 +47,38 @@ enum SettingsOptions {
   CalibrationOffset              = 23, // This stores the temperature offset for this tip in the iron.
   PowerLimit                     = 24, // Maximum power iron allowed to output
   ReverseButtonTempChangeEnabled = 25, // Change the plus and minus button assigment
-  TempChangeLongStep             = 26, // Temperature-change-increment on long button press
+  ReverseButtonNavEnabled        = 26, // Change the A and B button assigment in menus
-  TempChangeShortStep            = 27, // Temperature-change-increment on short button press
+  TempChangeLongStep             = 27, // Temperature-change-increment on long button press
-  HallEffectSensitivity          = 28, // Operating mode of the hall effect sensor
+  TempChangeShortStep            = 28, // Temperature-change-increment on short button press
-  AccelMissingWarningCounter     = 29, // Counter of how many times we have warned we cannot detect the accelerometer
+  HallEffectSensitivity          = 29, // Operating mode of the hall effect sensor
-  PDMissingWarningCounter        = 30, // Counter of how many times we have warned we cannot detect the pd interface
+  AccelMissingWarningCounter     = 30, // Counter of how many times we have warned we cannot detect the accelerometer
-  UILanguage                     = 31, // Selected UI Language code, null-terminated *only if* the length is less than 8 chars
+  PDMissingWarningCounter        = 31, // Counter of how many times we have warned we cannot detect the pd interface
-  PDNegTimeout                   = 32, // PD timeout in 100ms steps
+  UILanguage                     = 32, // Selected UI Language code, null-terminated *only if* the length is less than 8 chars
-  OLEDInversion                  = 33, // Invert the colours on the display
+  PDNegTimeout                   = 33, // PD timeout in 100ms steps
-  OLEDBrightness                 = 34, // Brightness for the OLED display
+  OLEDInversion                  = 34, // Invert the colours on the display
-  LOGOTime                       = 35, // Duration the logo will be displayed for
+  OLEDBrightness                 = 35, // Brightness for the OLED display
-  CalibrateCJC                   = 36, // Toggle calibrate CJC at next boot
+  LOGOTime                       = 36, // Duration the logo will be displayed for
-  BluetoothLE                    = 37, // Toggle BLE if present
+  CalibrateCJC                   = 37, // Toggle calibrate CJC at next boot
-  USBPDMode                      = 38, // Toggle PPS & EPR
+  BluetoothLE                    = 38, // Toggle BLE if present
-  ProfilePhases                  = 39, // Number of profile mode phases
+  USBPDMode                      = 39, // Toggle PPS & EPR
-  ProfilePreheatTemp             = 40, // Temperature to preheat to before the first phase
+  ProfilePhases                  = 40, // Number of profile mode phases
-  ProfilePreheatSpeed            = 41, // Maximum allowed preheat speed in degrees per second
+  ProfilePreheatTemp             = 41, // Temperature to preheat to before the first phase
-  ProfilePhase1Temp              = 42, // Temperature to target for the end of phase 1
+  ProfilePreheatSpeed            = 42, // Maximum allowed preheat speed in degrees per second
-  ProfilePhase1Duration          = 43, // Target duration for phase 1
+  ProfilePhase1Temp              = 43, // Temperature to target for the end of phase 1
-  ProfilePhase2Temp              = 44, // Temperature to target for the end of phase 2
+  ProfilePhase1Duration          = 44, // Target duration for phase 1
-  ProfilePhase2Duration          = 45, // Target duration for phase 2
+  ProfilePhase2Temp              = 45, // Temperature to target for the end of phase 2
-  ProfilePhase3Temp              = 46, // Temperature to target for the end of phase 3
+  ProfilePhase2Duration          = 46, // Target duration for phase 2
-  ProfilePhase3Duration          = 47, // Target duration for phase 3
+  ProfilePhase3Temp              = 47, // Temperature to target for the end of phase 3
-  ProfilePhase4Temp              = 48, // Temperature to target for the end of phase 4
+  ProfilePhase3Duration          = 48, // Target duration for phase 3
-  ProfilePhase4Duration          = 49, // Target duration for phase 4
+  ProfilePhase4Temp              = 49, // Temperature to target for the end of phase 4
-  ProfilePhase5Temp              = 50, // Temperature to target for the end of phase 5
+  ProfilePhase4Duration          = 50, // Target duration for phase 4
-  ProfilePhase5Duration          = 51, // Target duration for phase 5
+  ProfilePhase5Temp              = 51, // Temperature to target for the end of phase 5
-  ProfileCooldownSpeed           = 52, // Maximum allowed cooldown speed in degrees per second
+  ProfilePhase5Duration          = 52, // Target duration for phase 5
-  HallEffectSleepTime            = 53, // Seconds (/5) timeout to sleep when hall effect over threshold
+  ProfileCooldownSpeed           = 53, // Maximum allowed cooldown speed in degrees per second
-  SolderingTipType               = 54, // Selecting the type of soldering tip fitted
+  HallEffectSleepTime            = 54, // Seconds (/5) timeout to sleep when hall effect over threshold
+  SolderingTipType               = 55, // Selecting the type of soldering tip fitted
   //
-  SettingsOptionsLength = 55, // End marker
+  SettingsOptionsLength = 56, // End marker
 };
 
 typedef enum {

source/Core/Inc/Translation.h

@@ -90,6 +90,7 @@ enum class SettingsItemIndex : uint8_t {
   CooldownBlink,
   ScrollingSpeed,
   ReverseButtonTempChange,
+  ReverseButtonNav,
   AnimSpeed,
   AnimLoop,
   Brightness,

source/Core/Src/Settings.cpp

@@ -81,6 +81,8 @@ static const SettingConstants settingsConstants[(int)SettingsOptions::SettingsOp
     {MIN_CALIBRATION_OFFSET,                                                                  2500,                 1,           CALIBRATION_OFFSET}, // CalibrationOffset
     {                     0,                                                       MAX_POWER_LIMIT, POWER_LIMIT_STEPS,                  POWER_LIMIT}, // PowerLimit
     {                     0,                                                                     1,                 1,   REVERSE_BUTTON_TEMP_CHANGE}, // ReverseButtonTempChangeEnabled
+	{                     0,                                                                     1,                 1,
+	REVERSE_BUTTON_NAV}, // ReverseButtonNavEnabled
     {                     5,                                             TEMP_CHANGE_LONG_STEP_MAX,                 5,        TEMP_CHANGE_LONG_STEP}, // TempChangeLongStep
     {                     1,                                            TEMP_CHANGE_SHORT_STEP_MAX,                 1,       TEMP_CHANGE_SHORT_STEP}, // TempChangeShortStep
     {                     0,                                                                     9,                 1,                            7}, // HallEffectSensitivity

source/Core/Src/settingsGUI.cpp

@@ -47,6 +47,7 @@ static void displayAdvancedSolderingScreens(void);
 static void displayAdvancedIDLEScreens(void);
 static void displayScrollSpeed(void);
 static void displayReverseButtonTempChangeEnabled(void);
+static void displayReverseButtonNavEnabled(void);
 static void displayPowerLimit(void);
 
 #ifdef BLE_ENABLED
@@ -395,6 +396,8 @@ 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::ReverseButtonNav), nullptr, displayReverseButtonNavEnabled, nullptr, SettingsOptions::ReverseButtonNavEnabled, SettingsItemIndex::ReverseButtonNav, 7},
   /* Animation Speed adjustment */
   {SETTINGS_DESC(SettingsItemIndex::AnimSpeed), nullptr, displayAnimationSpeed, nullptr, SettingsOptions::AnimationSpeed, SettingsItemIndex::AnimSpeed, 7},
   /* Animation Loop switch */
@@ -480,7 +483,7 @@ static int userConfirmation(const char *message) {
   for (;;) {
     drawScrollingText(message, xTaskGetTickCount() - tickStart);
 
-    ButtonState buttons = getButtonState();
+    ButtonState buttons = getButtonState(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled));
     switch (buttons) {
     case BUTTON_F_SHORT:
       // User confirmed
@@ -856,6 +859,7 @@ static void displayCoolingBlinkEnabled(void) { OLED::drawCheckbox(getSettingValu
 static void displayScrollSpeed(void) { OLED::print(translatedString((getSettingValue(SettingsOptions::DescriptionScrollSpeed)) ? Tr->SettingFastChar : Tr->SettingSlowChar), FontStyle::LARGE); }
 
 static void displayReverseButtonTempChangeEnabled(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)); }
+static void displayReverseButtonNavEnabled(void) { OLED::drawCheckbox(getSettingValue(SettingsOptions::ReverseButtonNavEnabled)); }
 
 static void displayAnimationSpeed(void) {
   switch (getSettingValue(SettingsOptions::AnimationSpeed)) {
@@ -952,7 +956,7 @@ static void setCalibrateVIN(void) {
     OLED::setCursor(0, 8);
     OLED::printNumber(getSettingValue(SettingsOptions::VoltageDiv), 3, FontStyle::SMALL);
 
-    switch (getButtonState()) {
+    switch (getButtonState(getSettingValue(SettingsOptions::ReverseButtonNavEnabled))) {
     case BUTTON_F_SHORT:
       prevSettingValue(SettingsOptions::VoltageDiv);
       break;

source/Core/Threads/GUIThread.cpp

@@ -44,7 +44,7 @@ OperatingMode handle_post_init_state();
 OperatingMode guiHandleDraw(void) {
   OLED::clearScreen(); // Clear ready for render pass
   // Read button state
-  ButtonState buttons = getButtonState();
+  ButtonState buttons = getButtonState(getSettingValue(SettingsOptions::ReverseButtonNavEnabled));
   // Enforce screen on if buttons pressed, movement, hot tip etc
   if (buttons != BUTTON_NONE) {
     OLED::setDisplayState(OLED::DisplayState::ON);

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

@@ -55,7 +55,7 @@ OperatingMode gui_solderingTempAdjust(const ButtonState buttonIn, guiContext *cx
     (*autoRepeatAcceleration) = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
   }
   // If buttons are flipped; flip the delta
-  if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
+  if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled) xor getSettingValue(SettingsOptions::ReverseButtonNavEnabled)) {
     delta = -delta;
   }
   if (delta != 0) {

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

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