From dfce09413fee30ca2866b4ee3f19e217d2445287 Mon Sep 17 00:00:00 2001 From: Leo Date: Sun, 26 Jan 2025 16:51:44 +0200 Subject: [PATCH] Removed edits from TemperatureAdjust.cpp, so less code will have changes --- source/Core/Threads/GUIThread.cpp | 2 +- source/Core/Threads/UI/logic/TemperatureAdjust.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp index a6bcac80..b83e53c1 100644 --- a/source/Core/Threads/GUIThread.cpp +++ b/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(getSettingValue(SettingsOptions::ReverseButtonNavEnabled)); + ButtonState buttons = getButtonState(getSettingValue(SettingsOptions::ReverseButtonNavEnabled) and !(currentOperatingMode == OperatingMode::TemperatureAdjust)); // Enforce screen on if buttons pressed, movement, hot tip etc if (buttons != BUTTON_NONE) { OLED::setDisplayState(OLED::DisplayState::ON); diff --git a/source/Core/Threads/UI/logic/TemperatureAdjust.cpp b/source/Core/Threads/UI/logic/TemperatureAdjust.cpp index 4a8b76e3..34a896c3 100644 --- a/source/Core/Threads/UI/logic/TemperatureAdjust.cpp +++ b/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) xor getSettingValue(SettingsOptions::ReverseButtonNavEnabled)) { + if (getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled)) { delta = -delta; } if (delta != 0) {