me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring: replace variables with one-letter names

Browse Source
This commit is contained in:
Ivan Zorin
2025-02-17 19:21:34 +03:00
parent 035f3dd205
commit a7985095ff
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/Core/Threads/GUIThread.cpp
View File

@@ -41,14 +41,15 @@ OperatingMode currentOperatingMode = OperatingMode::InitialisationDone; // Curre
guiContext context; // Context passed to functions to aid in state during render passes guiContext context; // Context passed to functions to aid in state during render passes
OperatingMode handle_post_init_state(); OperatingMode handle_post_init_state();
OperatingMode guiHandleDraw(void) { OperatingMode guiHandleDraw(void) {
OLED::clearScreen(); // Clear ready for render pass OLED::clearScreen(); // Clear ready for render pass
bool d = getSettingValue(SettingsOptions::ReverseButtonMenu); bool swapButtonMenu = getSettingValue(SettingsOptions::ReverseButtonMenu);
bool e = getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled); bool swapButtonTemp = getSettingValue(SettingsOptions::ReverseButtonTempChangeEnabled);
#ifdef OPT_FULL_BUTTON_REVERSE #ifdef OPT_FULL_BUTTON_REVERSE
bool f = currentOperatingMode == OperatingMode::TemperatureAdjust; bool isTempAdjust = currentOperatingMode == OperatingMode::TemperatureAdjust;
// Read button state // Read button state
ButtonState buttons = getButtonState((e && f) || (d && !e && !f) || (d && e && !f)); ButtonState buttons = getButtonState((swapButtonTemp && isTempAdjust) || (swapButtonMenu && !swapButtonTemp && !isTempAdjust) || (swapButtonMenu && swapButtonTemp && !isTempAdjust));
#else #else
ButtonState buttons = getButtonState(); ButtonState buttons = getButtonState();
#endif #endif
@@ -120,7 +121,7 @@ OperatingMode guiHandleDraw(void) {
#ifdef OPT_FULL_BUTTON_REVERSE #ifdef OPT_FULL_BUTTON_REVERSE
newMode = gui_solderingTempAdjust(getButtonState(), &context); newMode = gui_solderingTempAdjust(getButtonState(), &context);
#else #else
newMode = gui_solderingTempAdjust(getButtonState(e), &context); newMode = gui_solderingTempAdjust(getButtonState(swapButtonTemp), &context);
#endif #endif
break; break;
case OperatingMode::DebugMenuReadout: case OperatingMode::DebugMenuReadout:
@@ -133,7 +134,7 @@ OperatingMode guiHandleDraw(void) {
#ifdef OPT_FULL_BUTTON_REVERSE #ifdef OPT_FULL_BUTTON_REVERSE
newMode = gui_SettingsMenu(getButtonState(), &context); newMode = gui_SettingsMenu(getButtonState(), &context);
#else #else
newMode = gui_SettingsMenu(getButtonState(d), &context); newMode = gui_SettingsMenu(getButtonState(swapButtonMenu), &context);
#endif #endif
break; break;
case OperatingMode::InitialisationDone: case OperatingMode::InitialisationDone:
@@ -153,6 +154,7 @@ OperatingMode guiHandleDraw(void) {
}; };
return newMode; return newMode;
} }
void guiRenderLoop(void) { void guiRenderLoop(void) {
OperatingMode newMode = guiHandleDraw(); // This does the screen drawing OperatingMode newMode = guiHandleDraw(); // This does the screen drawing