From 26c7d0f2cbc6190b828c10f0ba50220d48065df8 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Wed, 5 Jan 2022 20:41:38 +1100
Subject: [PATCH] Clean up soldering temp adjust button handling

---
 source/Core/Src/Settings.cpp      |  2 +-
 source/Core/Threads/GUIThread.cpp | 24 +++++++-----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp
index 8beb8c9c..e09501c3 100644
--- a/source/Core/Src/Settings.cpp
+++ b/source/Core/Src/Settings.cpp
@@ -29,7 +29,7 @@ typedef struct {
   uint16_t versionMarker;
   uint16_t length; // Length of valid bytes following
   uint16_t settingsValues[SettingsOptionsLength];
-  // used to make this nicely "good enough" aligned to 32 butes to make driver code trivial
+  // used to make this nicely "good enough" aligned to 32 bytes to make driver code trivial
   uint32_t padding;
 
 } systemSettingsType;
diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp
index 1359fe57..054940bc 100644
--- a/source/Core/Threads/GUIThread.cpp
+++ b/source/Core/Threads/GUIThread.cpp
@@ -202,36 +202,23 @@ static void gui_solderingTempAdjust() {
       break;
     case BUTTON_B_LONG:
       if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) {
-        if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
-          delta = getSettingValue(SettingsOptions::TempChangeLongStep);
-        } else
-          delta = -getSettingValue(SettingsOptions::TempChangeLongStep);
-
+        delta           = -getSettingValue(SettingsOptions::TempChangeLongStep);
         autoRepeatTimer = xTaskGetTickCount();
         autoRepeatAcceleration += PRESS_ACCEL_STEP;
       }
       break;
     case BUTTON_B_SHORT:
-      if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
-        delta = getSettingValue(SettingsOptions::TempChangeShortStep);
-      } else
-        delta = -getSettingValue(SettingsOptions::TempChangeShortStep);
+      delta = -getSettingValue(SettingsOptions::TempChangeShortStep);
       break;
     case BUTTON_F_LONG:
       if (xTaskGetTickCount() - autoRepeatTimer + autoRepeatAcceleration > PRESS_ACCEL_INTERVAL_MAX) {
-        if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
-          delta = -getSettingValue(SettingsOptions::TempChangeLongStep);
-        } else
-          delta = getSettingValue(SettingsOptions::TempChangeLongStep);
+        delta           = getSettingValue(SettingsOptions::TempChangeLongStep);
         autoRepeatTimer = xTaskGetTickCount();
         autoRepeatAcceleration += PRESS_ACCEL_STEP;
       }
       break;
     case BUTTON_F_SHORT:
-      if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
-        delta = -getSettingValue(SettingsOptions::TempChangeShortStep);
-      } else
-        delta = getSettingValue(SettingsOptions::TempChangeShortStep);
+      delta = getSettingValue(SettingsOptions::TempChangeShortStep);
       break;
     default:
       break;
@@ -239,6 +226,9 @@ static void gui_solderingTempAdjust() {
     if ((PRESS_ACCEL_INTERVAL_MAX - autoRepeatAcceleration) < PRESS_ACCEL_INTERVAL_MIN) {
       autoRepeatAcceleration = PRESS_ACCEL_INTERVAL_MAX - PRESS_ACCEL_INTERVAL_MIN;
     }
+    if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) {
+      delta = -delta;
+    }
     // constrain between 10-450 C
     uint16_t newTemp = getSettingValue(SettingsOptions::SolderingTemp);
     newTemp += delta;